From 031b1027b3c1bf974f4b94b734202a6c5f27193e Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Thu, 26 Apr 2018 10:07:28 -0700 Subject: [PATCH 01/65] Adding base GCS CMEK implementation from rossjudson@ --- .../java/com/google/cloud/storage/Blob.java | 6 ++++ .../com/google/cloud/storage/BlobInfo.java | 25 +++++++++++++++ .../java/com/google/cloud/storage/Bucket.java | 6 ++++ .../com/google/cloud/storage/BucketInfo.java | 31 ++++++++++++++++++- 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java index 887ab004944d..14959a2c58ca 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java @@ -403,6 +403,12 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) { return this; } + @Override + Builder setKmsKey(String kmsKey) { + infoBuilder.setKmsKey(kmsKey); + return this; + } + @Override public Blob build() { return new Blob(storage, infoBuilder); diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java index a903500455de..b5f6674046e8 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java @@ -83,6 +83,7 @@ public StorageObject apply(BlobInfo blobInfo) { private final Integer componentCount; private final boolean isDirectory; private final CustomerEncryption customerEncryption; + private final String kmsKey; /** * This class is meant for internal use only. Users are discouraged from using this class. @@ -266,6 +267,8 @@ public abstract static class Builder { abstract Builder setCustomerEncryption(CustomerEncryption customerEncryption); + abstract Builder setKmsKey(String kmsKey); + /** * Creates a {@code BlobInfo} object. */ @@ -298,6 +301,7 @@ static final class BuilderImpl extends Builder { private Boolean isDirectory; private CustomerEncryption customerEncryption; private StorageClass storageClass; + private String kmsKey; BuilderImpl(BlobId blobId) { this.blobId = blobId; @@ -328,6 +332,7 @@ static final class BuilderImpl extends Builder { createTime = blobInfo.createTime; isDirectory = blobInfo.isDirectory; storageClass = blobInfo.storageClass; + kmsKey = blobInfo.kmsKey; } @Override @@ -475,6 +480,12 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) { return this; } + @Override + Builder setKmsKey(String kmsKey) { + this.kmsKey = kmsKey; + return this; + } + @Override public BlobInfo build() { checkNotNull(blobId); @@ -507,6 +518,7 @@ public BlobInfo build() { createTime = builder.createTime; isDirectory = firstNonNull(builder.isDirectory, Boolean.FALSE); storageClass = builder.storageClass; + kmsKey = builder.kmsKey; } /** @@ -737,6 +749,13 @@ public StorageClass getStorageClass() { return storageClass; } + /** + * Returns the Cloud KMS key used to encrypt the blob, if any. + */ + public String getKmsKey() { + return kmsKey; + } + /** * Returns a builder for the current blob. */ @@ -809,6 +828,9 @@ public ObjectAccessControl apply(Acl acl) { if (customerEncryption != null) { storageObject.setCustomerEncryption(customerEncryption.toPb()); } + if (kmsKey != null) { + storageObject.setKmsKeyName(kmsKey); + } storageObject.setMetadata(pbMetadata); storageObject.setCacheControl(cacheControl); storageObject.setContentEncoding(contentEncoding); @@ -939,6 +961,9 @@ public Acl apply(ObjectAccessControl objectAccessControl) { if (storageObject.getStorageClass() != null) { builder.setStorageClass(StorageClass.valueOf(storageObject.getStorageClass())); } + if (storageObject.getKmsKeyName() != null) { + builder.setKmsKey(storageObject.getKmsKeyName()); + } return builder.build(); } } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java index b4855e96a411..9b07f4567f1a 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java @@ -615,6 +615,12 @@ public Builder setLabels(Map labels) { return this; } + @Override + public Builder setDefaultKmsKeyName(String defaultKmsKeyName) { + infoBuilder.setDefaultKmsKeyName(defaultKmsKeyName); + return this; + } + @Override public Bucket build() { return new Bucket(storage, infoBuilder); diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java index 82a98a75ad82..bfdce530aac0 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java @@ -25,6 +25,7 @@ import com.google.api.client.util.DateTime; import com.google.api.services.storage.model.*; import com.google.api.services.storage.model.Bucket; +import com.google.api.services.storage.model.Bucket.Encryption; import com.google.api.services.storage.model.Bucket.Lifecycle; import com.google.api.services.storage.model.Bucket.Lifecycle.Rule; import com.google.api.services.storage.model.Bucket.Owner; @@ -85,6 +86,7 @@ public com.google.api.services.storage.model.Bucket apply(BucketInfo bucketInfo) private final String location; private final StorageClass storageClass; private final Map labels; + private final String defaultKmsKeyName; /** * Base class for bucket's delete rules. Allows to configure automatic deletion of blobs and blobs @@ -423,6 +425,11 @@ public abstract static class Builder { */ public abstract Builder setLabels(Map labels); + /** + * Sets the default Cloud KMS key name for this bucket. + */ + public abstract Builder setDefaultKmsKeyName(String defaultKmsKeyName); + /** * Creates a {@code BucketInfo} object. */ @@ -449,6 +456,7 @@ static final class BuilderImpl extends Builder { private List acl; private List defaultAcl; private Map labels; + private String defaultKmsKeyName; BuilderImpl(String name) { this.name = name; @@ -473,6 +481,7 @@ static final class BuilderImpl extends Builder { deleteRules = bucketInfo.deleteRules; labels = bucketInfo.labels; requesterPays = bucketInfo.requesterPays; + defaultKmsKeyName = bucketInfo.defaultKmsKeyName; } @Override @@ -584,6 +593,12 @@ public Builder setLabels(Map labels) { return this; } + @Override + public Builder setDefaultKmsKeyName(String defaultKmsKeyName) { + this.defaultKmsKeyName = defaultKmsKeyName; + return this; + } + @Override public BucketInfo build() { checkNotNull(name); @@ -610,6 +625,7 @@ public BucketInfo build() { deleteRules = builder.deleteRules; labels = builder.labels; requesterPays = builder.requesterPays; + defaultKmsKeyName = builder.defaultKmsKeyName; } /** @@ -762,6 +778,13 @@ public Map getLabels() { return labels; } + /** + * Returns the default Cloud KMS key to be applied to newly inserted objects in this bucket. + */ + public String getDefaultKmsKeyName() { + return defaultKmsKeyName; + } + /** * Returns a builder for the current bucket. */ @@ -857,7 +880,9 @@ public Rule apply(DeleteRule deleteRule) { if (labels != null) { bucketPb.setLabels(labels); } - + if (defaultKmsKeyName != null) { + bucketPb.setEncryption(new Encryption().setDefaultKmsKeyName(defaultKmsKeyName)); + } return bucketPb; } @@ -945,6 +970,10 @@ public DeleteRule apply(Rule rule) { if (billing != null) { builder.setRequesterPays(billing.getRequesterPays()); } + Encryption encryption = bucketPb.getEncryption(); + if (encryption != null && encryption.getDefaultKmsKeyName() != null && !encryption.getDefaultKmsKeyName().isEmpty()) { + builder.setDefaultKmsKeyName(encryption.getDefaultKmsKeyName()); + } return builder.build(); } } From 56b34dfb1ac66b12ba8c3d13aa9147501e8692b6 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Tue, 1 May 2018 01:14:00 -0700 Subject: [PATCH 02/65] Adding Integration tests and partial unit test coverage --- .../java/com/google/cloud/storage/Blob.java | 5 +- .../com/google/cloud/storage/BlobInfo.java | 28 +++-- .../java/com/google/cloud/storage/Bucket.java | 3 - .../com/google/cloud/storage/BucketInfo.java | 6 +- .../com/google/cloud/storage/Storage.java | 18 +-- .../google/cloud/storage/BlobInfoTest.java | 7 ++ .../google/cloud/storage/BucketInfoTest.java | 4 + .../com/google/cloud/storage/BucketTest.java | 2 + .../cloud/storage/it/ITStorageTest.java | 119 ++++++++++++++++++ 9 files changed, 155 insertions(+), 37 deletions(-) diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java index 14959a2c58ca..0f6a8e379485 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java @@ -184,7 +184,6 @@ public static BlobSourceOption decryptionKey(String key) { * Returns an option for blob's billing user project. This option is used only if the blob's * bucket has requester_pays flag enabled. */ - @GcpLaunchStage.Alpha public static BlobSourceOption userProject(String userProject) { return new BlobSourceOption(StorageRpc.Option.USER_PROJECT, userProject); } @@ -404,8 +403,8 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) { } @Override - Builder setKmsKey(String kmsKey) { - infoBuilder.setKmsKey(kmsKey); + public Builder setKmsKeyName(String kmsKeyName) { + infoBuilder.setKmsKeyName(kmsKeyName); return this; } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java index b5f6674046e8..85df1f6f150e 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java @@ -83,7 +83,7 @@ public StorageObject apply(BlobInfo blobInfo) { private final Integer componentCount; private final boolean isDirectory; private final CustomerEncryption customerEncryption; - private final String kmsKey; + private final String kmsKeyName; /** * This class is meant for internal use only. Users are discouraged from using this class. @@ -267,7 +267,11 @@ public abstract static class Builder { abstract Builder setCustomerEncryption(CustomerEncryption customerEncryption); - abstract Builder setKmsKey(String kmsKey); + /** + * + * Sets the blob's kmsKeyName. + */ + public abstract Builder setKmsKeyName(String kmsKeyName); /** * Creates a {@code BlobInfo} object. @@ -301,7 +305,7 @@ static final class BuilderImpl extends Builder { private Boolean isDirectory; private CustomerEncryption customerEncryption; private StorageClass storageClass; - private String kmsKey; + private String kmsKeyName; BuilderImpl(BlobId blobId) { this.blobId = blobId; @@ -332,7 +336,7 @@ static final class BuilderImpl extends Builder { createTime = blobInfo.createTime; isDirectory = blobInfo.isDirectory; storageClass = blobInfo.storageClass; - kmsKey = blobInfo.kmsKey; + kmsKeyName = blobInfo.kmsKeyName; } @Override @@ -481,8 +485,8 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) { } @Override - Builder setKmsKey(String kmsKey) { - this.kmsKey = kmsKey; + public Builder setKmsKeyName(String kmsKeyName) { + this.kmsKeyName = kmsKeyName; return this; } @@ -518,7 +522,7 @@ public BlobInfo build() { createTime = builder.createTime; isDirectory = firstNonNull(builder.isDirectory, Boolean.FALSE); storageClass = builder.storageClass; - kmsKey = builder.kmsKey; + kmsKeyName = builder.kmsKeyName; } /** @@ -752,8 +756,8 @@ public StorageClass getStorageClass() { /** * Returns the Cloud KMS key used to encrypt the blob, if any. */ - public String getKmsKey() { - return kmsKey; + public String getKmsKeyName() { + return kmsKeyName; } /** @@ -828,8 +832,8 @@ public ObjectAccessControl apply(Acl acl) { if (customerEncryption != null) { storageObject.setCustomerEncryption(customerEncryption.toPb()); } - if (kmsKey != null) { - storageObject.setKmsKeyName(kmsKey); + if (kmsKeyName != null) { + storageObject.setKmsKeyName(kmsKeyName); } storageObject.setMetadata(pbMetadata); storageObject.setCacheControl(cacheControl); @@ -962,7 +966,7 @@ public Acl apply(ObjectAccessControl objectAccessControl) { builder.setStorageClass(StorageClass.valueOf(storageObject.getStorageClass())); } if (storageObject.getKmsKeyName() != null) { - builder.setKmsKey(storageObject.getKmsKeyName()); + builder.setKmsKeyName(storageObject.getKmsKeyName()); } return builder.build(); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java index 9b07f4567f1a..07254e1185f6 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java @@ -118,7 +118,6 @@ public static BucketSourceOption metagenerationNotMatch() { * Returns an option for blob's billing user project. This option is only used by the buckets with * 'requester_pays' flag. */ - @GcpLaunchStage.Alpha public static BucketSourceOption userProject(String userProject) { return new BucketSourceOption(StorageRpc.Option.USER_PROJECT, userProject); } @@ -271,7 +270,6 @@ public static BlobTargetOption encryptionKey(String key) { * Returns an option for blob's billing user project. This option is only used by the buckets with * 'requester_pays' flag. */ - @GcpLaunchStage.Alpha public static BlobTargetOption userProject(String userProject) { return new BlobTargetOption(StorageRpc.Option.USER_PROJECT, userProject); } @@ -468,7 +466,6 @@ public static BlobWriteOption encryptionKey(String key) { * Returns an option for blob's billing user project. This option is only used by the buckets with * 'requester_pays' flag. */ - @GcpLaunchStage.Alpha public static BlobWriteOption userProject(String userProject) { return new BlobWriteOption(Storage.BlobWriteOption.Option.USER_PROJECT, userProject); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java index bfdce530aac0..79b6a89b2830 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java @@ -880,9 +880,9 @@ public Rule apply(DeleteRule deleteRule) { if (labels != null) { bucketPb.setLabels(labels); } - if (defaultKmsKeyName != null) { - bucketPb.setEncryption(new Encryption().setDefaultKmsKeyName(defaultKmsKeyName)); - } + // default kms key name can be null. + bucketPb.setEncryption(new Encryption().setDefaultKmsKeyName(defaultKmsKeyName)); + return bucketPb; } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java index 728438145493..232051fd8e99 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java @@ -94,7 +94,7 @@ enum BucketField implements FieldSelector { CORS("cors"), STORAGE_CLASS("storageClass"), ETAG("etag"), - @GcpLaunchStage.Alpha + DEFAULT_KMS_KEY_NAME("defaultKmsKeyName"), BILLING("billing"); static final List REQUIRED_FIELDS = ImmutableList.of(NAME); @@ -136,6 +136,7 @@ enum BlobField implements FieldSelector { SIZE("size"), STORAGE_CLASS("storageClass"), TIME_DELETED("timeDeleted"), + KMS_KEY_NAME("kmsKeyName"), UPDATED("updated"); static final List REQUIRED_FIELDS = ImmutableList.of(BUCKET, NAME); @@ -203,7 +204,6 @@ public static BucketTargetOption metagenerationNotMatch() { * Returns an option to define the billing user project. This option is required by buckets with * `requester_pays` flag enabled to assign operation costs. */ - @GcpLaunchStage.Alpha public static BucketTargetOption userProject(String userProject) { return new BucketTargetOption(StorageRpc.Option.USER_PROJECT, userProject); } @@ -240,7 +240,6 @@ public static BucketSourceOption metagenerationNotMatch(long metageneration) { * Returns an option for bucket's billing user project. This option is only used by the buckets with * 'requester_pays' flag. */ - @GcpLaunchStage.Alpha public static BucketSourceOption userProject(String userProject) { return new BucketSourceOption(StorageRpc.Option.USER_PROJECT, userProject); } @@ -281,7 +280,6 @@ public static BucketGetOption metagenerationNotMatch(long metageneration) { * Returns an option for bucket's billing user project. This option is only used by the buckets with * 'requester_pays' flag. */ - @GcpLaunchStage.Alpha public static BucketGetOption userProject(String userProject) { return new BucketGetOption(StorageRpc.Option.USER_PROJECT, userProject); } @@ -372,7 +370,6 @@ public static BlobTargetOption encryptionKey(Key key) { * Returns an option for blob's billing user project. This option is only used by the buckets with * 'requester_pays' flag. */ - @GcpLaunchStage.Alpha public static BlobTargetOption userProject(String userProject) { return new BlobTargetOption(StorageRpc.Option.USER_PROJECT, userProject); } @@ -542,7 +539,6 @@ public static BlobWriteOption encryptionKey(String key) { * Returns an option for blob's billing user project. This option is only used by the buckets with * 'requester_pays' flag. */ - @GcpLaunchStage.Alpha public static BlobWriteOption userProject(String userProject) { return new BlobWriteOption(Option.USER_PROJECT, userProject); } @@ -636,7 +632,6 @@ public static BlobSourceOption decryptionKey(String key) { * Returns an option for blob's billing user project. This option is only used by the buckets with * 'requester_pays' flag. */ - @GcpLaunchStage.Alpha public static BlobSourceOption userProject(String userProject) { return new BlobSourceOption(StorageRpc.Option.USER_PROJECT, userProject); } @@ -726,7 +721,6 @@ public static BlobGetOption fields(BlobField... fields) { * Returns an option for blob's billing user project. This option is only used by the buckets with * 'requester_pays' flag. */ - @GcpLaunchStage.Alpha public static BlobGetOption userProject(String userProject) { return new BlobGetOption(StorageRpc.Option.USER_PROJECT, userProject); } @@ -769,7 +763,6 @@ public static BucketListOption prefix(String prefix) { * Returns an option for bucket's billing user project. This option is only used by the buckets with * 'requester_pays' flag. */ - @GcpLaunchStage.Alpha public static BucketListOption userProject(String userProject) { return new BucketListOption(StorageRpc.Option.USER_PROJECT, userProject); } @@ -840,7 +833,6 @@ public static BlobListOption currentDirectory() { * * @param userProject projectId of the billing user project. */ - @GcpLaunchStage.Alpha public static BlobListOption userProject(String userProject) { return new BlobListOption(StorageRpc.Option.USER_PROJECT, userProject); } @@ -2587,8 +2579,6 @@ public static Builder newBuilder() { * @param options extra parameters to apply to this operation * @throws StorageException upon failure */ - @BetaApi - @GcpLaunchStage.Alpha Policy getIamPolicy(String bucket, BucketSourceOption... options); /** @@ -2612,8 +2602,6 @@ public static Builder newBuilder() { * @param options extra parameters to apply to this operation * @throws StorageException upon failure */ - @BetaApi - @GcpLaunchStage.Alpha Policy setIamPolicy(String bucket, Policy policy, BucketSourceOption... options); /** @@ -2637,8 +2625,6 @@ public static Builder newBuilder() { * @param options extra parameters to apply to this operation * @throws StorageException upon failure */ - @BetaApi - @GcpLaunchStage.Alpha List testIamPermissions(String bucket, List permissions, BucketSourceOption... options); /** diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java index 16accd0e4a93..508c03574815 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java @@ -66,8 +66,11 @@ public class BlobInfoTest { private static final String KEY_SHA256 = "keySha"; private static final CustomerEncryption CUSTOMER_ENCRYPTION = new CustomerEncryption(ENCRYPTION_ALGORITHM, KEY_SHA256); + private static final String KMS_KEY_NAME = "projects/p/keyRings/kr/location/kr-loc/cryptoKey/key"; private static final StorageClass STORAGE_CLASS = StorageClass.COLDLINE; + // Unit tests include Customer Supplied encryption which may be confusing with the KMS KEY NAME + // as both can't be set at the same time. At least not right now. private static final BlobInfo BLOB_INFO = BlobInfo.newBuilder("b", "n", GENERATION) .setAcl(ACL) .setComponentCount(COMPONENT_COUNT) @@ -91,6 +94,7 @@ public class BlobInfoTest { .setUpdateTime(UPDATE_TIME) .setCreateTime(CREATE_TIME) .setStorageClass(STORAGE_CLASS) + .setKmsKeyName(KMS_KEY_NAME) .build(); private static final BlobInfo DIRECTORY_INFO = BlobInfo.newBuilder("b", "n/") .setSize(0L) @@ -153,6 +157,7 @@ public void testBuilder() { assertEquals(UPDATE_TIME, BLOB_INFO.getUpdateTime()); assertEquals(CREATE_TIME, BLOB_INFO.getCreateTime()); assertEquals(STORAGE_CLASS, BLOB_INFO.getStorageClass()); + assertEquals(KMS_KEY_NAME, BLOB_INFO.getKmsKeyName()); assertFalse(BLOB_INFO.isDirectory()); assertEquals("b", DIRECTORY_INFO.getBucket()); assertEquals("n/", DIRECTORY_INFO.getName()); @@ -208,6 +213,7 @@ private void compareBlobs(BlobInfo expected, BlobInfo value) { assertEquals(expected.getSize(), value.getSize()); assertEquals(expected.getUpdateTime(), value.getUpdateTime()); assertEquals(expected.getStorageClass(), value.getStorageClass()); + assertEquals(expected.getKmsKeyName(), value.getKmsKeyName()); } private void compareCustomerEncryptions(CustomerEncryption expected, CustomerEncryption value) { @@ -255,6 +261,7 @@ public void testToPbAndFromPb() { assertEquals(0L, (long) blobInfo.getSize()); assertNull(blobInfo.getUpdateTime()); assertNull(blobInfo.getStorageClass()); + assertNull(blobInfo.getKmsKeyName()); assertTrue(blobInfo.isDirectory()); } diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java index 49010ef181db..117673e51943 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java @@ -60,6 +60,7 @@ public class BucketInfoTest { private static final String NOT_FOUND_PAGE = "error.html"; private static final String LOCATION = "ASIA"; private static final StorageClass STORAGE_CLASS = StorageClass.STANDARD; + private static final String DEFAULT_KMS_KEY_NAME = "projects/p/keyRings/kr/location/kr-loc/cryptoKey/key"; private static final Boolean VERSIONING_ENABLED = true; private static final Map BUCKET_LABELS = ImmutableMap.of("label1", "value1"); private static final Boolean REQUESTER_PAYS = true; @@ -81,6 +82,7 @@ public class BucketInfoTest { .setVersioningEnabled(VERSIONING_ENABLED) .setLabels(BUCKET_LABELS) .setRequesterPays(REQUESTER_PAYS) + .setDefaultKmsKeyName(DEFAULT_KMS_KEY_NAME) .build(); @Test @@ -122,6 +124,7 @@ public void testBuilder() { assertEquals(NOT_FOUND_PAGE, BUCKET_INFO.getNotFoundPage()); assertEquals(LOCATION, BUCKET_INFO.getLocation()); assertEquals(STORAGE_CLASS, BUCKET_INFO.getStorageClass()); + assertEquals(DEFAULT_KMS_KEY_NAME, BUCKET_INFO.getDefaultKmsKeyName()); assertEquals(VERSIONING_ENABLED, BUCKET_INFO.versioningEnabled()); assertEquals(BUCKET_LABELS, BUCKET_INFO.getLabels()); assertEquals(REQUESTER_PAYS, BUCKET_INFO.requesterPays()); @@ -151,6 +154,7 @@ private void compareBuckets(BucketInfo expected, BucketInfo value) { assertEquals(expected.getNotFoundPage(), value.getNotFoundPage()); assertEquals(expected.getLocation(), value.getLocation()); assertEquals(expected.getStorageClass(), value.getStorageClass()); + assertEquals(expected.getDefaultKmsKeyName(), value.getDefaultKmsKeyName()); assertEquals(expected.versioningEnabled(), value.versioningEnabled()); assertEquals(expected.getLabels(), value.getLabels()); assertEquals(expected.requesterPays(), value.requesterPays()); diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java index 2b46316f3614..05edb3b26af5 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java @@ -77,6 +77,7 @@ public class BucketTest { private static final String NOT_FOUND_PAGE = "error.html"; private static final String LOCATION = "ASIA"; private static final StorageClass STORAGE_CLASS = StorageClass.STANDARD; + private static final String DEFAULT_KMS_KEY_NAME = "projects/p/keyRings/kr/location/kr-loc/cryptoKey/key"; private static final Boolean VERSIONING_ENABLED = true; private static final Map BUCKET_LABELS = ImmutableMap.of("label1", "value1"); private static final Boolean REQUESTER_PAYS = true; @@ -96,6 +97,7 @@ public class BucketTest { .setNotFoundPage(NOT_FOUND_PAGE) .setLocation(LOCATION) .setStorageClass(STORAGE_CLASS) + .setDefaultKmsKeyName(DEFAULT_KMS_KEY_NAME) .setVersioningEnabled(VERSIONING_ENABLED) .setLabels(BUCKET_LABELS) .setRequesterPays(REQUESTER_PAYS) diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java index 9f6272b87bf2..3ebd0150e365 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java @@ -108,6 +108,7 @@ public class ITStorageTest { .decode("H4sIAAAAAAAAAPNIzcnJV3DPz0/PSVVwzskvTVEILskvSkxPVQQA/LySchsAAAA="); private static final Map BUCKET_LABELS = ImmutableMap.of("label1", "value1"); private static final String SERVICE_ACCOUNT_EMAIL = "gcloud-devel@gs-project-accounts.iam.gserviceaccount.com"; + private static final String KMS_KEY_NAME = ""; // use real KMS KEY associated to the test project. @BeforeClass public static void beforeClass() throws NoSuchAlgorithmException, InvalidKeySpecException { @@ -177,6 +178,21 @@ public void testGetBucketEmptyFields() { assertNull(remoteBucket.getSelfLink()); } + @Test + public void testClearBucketDefaultKmsKeyName() throws ExecutionException, InterruptedException { + String bucketName = RemoteStorageHelper.generateBucketName(); + Bucket remoteBucket = storage.create(BucketInfo.newBuilder(bucketName).setDefaultKmsKeyName(KMS_KEY_NAME).build()); + + try { + assertEquals(KMS_KEY_NAME, remoteBucket.getDefaultKmsKeyName()); + remoteBucket = remoteBucket.toBuilder().setDefaultKmsKeyName(null).build(); + Bucket updatedBucket = storage.update(remoteBucket); + assertEquals(null, updatedBucket.getDefaultKmsKeyName()); + } finally { + RemoteStorageHelper.forceDelete(storage, bucketName, 5, TimeUnit.SECONDS); + } + } + @Test public void testCreateBlob() { String blobName = "test-create-blob"; @@ -204,6 +220,39 @@ public void testCreateBlobWithEncryptionKey() { assertArrayEquals(BLOB_BYTE_CONTENT, readBytes); } + @Test + public void testCreateBlobWithKmsKeyName() { + String blobName = "test-create-with-kms-key-name-blob"; + BlobInfo blob = BlobInfo.newBuilder(BUCKET, blobName).setKmsKeyName(KMS_KEY_NAME).build(); + Blob remoteBlob = storage.create(blob, BLOB_BYTE_CONTENT); + assertNotNull(remoteBlob); + assertEquals(blob.getBucket(), remoteBlob.getBucket()); + assertEquals(blob.getName(), remoteBlob.getName()); + assertEquals(blob.getKmsKeyName(), remoteBlob.getKmsKeyName()); + byte[] readBytes = storage.readAllBytes(BUCKET, blobName); + assertArrayEquals(BLOB_BYTE_CONTENT, readBytes); + } + + @Test + public void testCreateBlobWithDefaultKmsKeyName() throws ExecutionException, InterruptedException { + String bucketName = RemoteStorageHelper.generateBucketName(); + Bucket bucket = storage.create(BucketInfo.newBuilder(bucketName).setDefaultKmsKeyName(KMS_KEY_NAME).build()); + + try { + String blobName = "test-create-with-default-kms-key-name-blob"; + BlobInfo blob = BlobInfo.newBuilder(bucket, blobName).build(); + Blob remoteBlob = storage.create(blob, BLOB_BYTE_CONTENT); + assertNotNull(remoteBlob); + assertEquals(blob.getBucket(), remoteBlob.getBucket()); + assertEquals(blob.getName(), remoteBlob.getName()); + assertEquals(blob.getKmsKeyName(), remoteBlob.getKmsKeyName()); + byte[] readBytes = storage.readAllBytes(BUCKET, blobName); + assertArrayEquals(BLOB_BYTE_CONTENT, readBytes); + } finally { + RemoteStorageHelper.forceDelete(storage, bucketName, 5, TimeUnit.SECONDS); + } + } + @Test public void testCreateEmptyBlob() { String blobName = "test-create-empty-blob"; @@ -373,6 +422,44 @@ public void testListBlobsSelectedFields() throws InterruptedException { } } + @Test(timeout = 5000) + public void testListBlobsKmsKeySelectedFields() throws InterruptedException { + String[] blobNames = {"test-list-blobs-selected-field-kms-key-name-blob1", + "test-list-blobs-selected-field-kms-key-name-blob2"}; + BlobInfo blob1 = BlobInfo.newBuilder(BUCKET, blobNames[0]) + .setContentType(CONTENT_TYPE) + .setKmsKeyName(KMS_KEY_NAME) + .build(); + BlobInfo blob2 = BlobInfo.newBuilder(BUCKET, blobNames[1]) + .setContentType(CONTENT_TYPE) + .setKmsKeyName(KMS_KEY_NAME) + .build(); + Blob remoteBlob1 = storage.create(blob1); + Blob remoteBlob2 = storage.create(blob2); + assertNotNull(remoteBlob1); + assertNotNull(remoteBlob2); + Page page = storage.list(BUCKET, + Storage.BlobListOption.prefix("test-list-blobs-selected-field-kms-key-name-blob"), + Storage.BlobListOption.fields(BlobField.KMS_KEY_NAME)); + // Listing blobs is eventually consistent, we loop until the list is of the expected size. The + // test fails if timeout is reached. + while (Iterators.size(page.iterateAll().iterator()) != 2) { + Thread.sleep(500); + page = storage.list(BUCKET, + Storage.BlobListOption.prefix("test-list-blobs-selected-field-kms-key-name-blob"), + Storage.BlobListOption.fields(BlobField.KMS_KEY_NAME)); + } + Set blobSet = ImmutableSet.of(blobNames[0], blobNames[1]); + Iterator iterator = page.iterateAll().iterator(); + while (iterator.hasNext()) { + Blob remoteBlob = iterator.next(); + assertEquals(BUCKET, remoteBlob.getBucket()); + assertTrue(blobSet.contains(remoteBlob.getName())); + assertEquals(KMS_KEY_NAME, remoteBlob.getKmsKeyName()); + assertNull(remoteBlob.getContentType()); + } + } + @Test(timeout = 5000) public void testListBlobsEmptySelectedFields() throws InterruptedException { String[] blobNames = {"test-list-blobs-empty-selected-fields-blob1", @@ -452,6 +539,8 @@ public void testListBlobRequesterPays() throws InterruptedException { } } + + @Test(timeout = 15000) public void testListBlobsVersioned() throws ExecutionException, InterruptedException { String bucketName = RemoteStorageHelper.generateBucketName(); @@ -806,6 +895,36 @@ public void testCopyBlobWithEncryptionKeys() { assertTrue(storage.delete(BUCKET, targetBlobName)); } + @Test + public void testRotateFromCustomerEncryptionToKmsKey() { + String sourceBlobName = "test-copy-blob-encryption-key-source"; + BlobId source = BlobId.of(BUCKET, sourceBlobName); + ImmutableMap metadata = ImmutableMap.of("k", "v"); + Blob remoteBlob = storage.create(BlobInfo.newBuilder(source).build(), BLOB_BYTE_CONTENT, + Storage.BlobTargetOption.encryptionKey(KEY)); + assertNotNull(remoteBlob); + String targetBlobName = "test-copy-blob-kms-key-target"; + BlobInfo target = BlobInfo.newBuilder(BUCKET, targetBlobName) + .setContentType(CONTENT_TYPE) + .setMetadata(metadata) + .setKmsKeyName(KMS_KEY_NAME) + .build(); + Storage.CopyRequest req = Storage.CopyRequest.newBuilder() + .setSource(source) + .setSourceOptions(Storage.BlobSourceOption.decryptionKey(BASE64_KEY)) + .setTarget(target) + .build(); + CopyWriter copyWriter = storage.copy(req); + assertEquals(BUCKET, copyWriter.getResult().getBucket()); + assertEquals(targetBlobName, copyWriter.getResult().getName()); + assertEquals(CONTENT_TYPE, copyWriter.getResult().getContentType()); + assertEquals(KMS_KEY_NAME, copyWriter.getResult().getKmsKeyName()); + assertArrayEquals(BLOB_BYTE_CONTENT, copyWriter.getResult().getContent()); + assertEquals(metadata, copyWriter.getResult().getMetadata()); + assertTrue(copyWriter.isDone()); + assertTrue(storage.delete(BUCKET, targetBlobName)); + } + @Test public void testCopyBlobUpdateMetadata() { String sourceBlobName = "test-copy-blob-update-metadata-source"; From 47701ed4c644a4c19b99ebe8aaef1e896b533f0d Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Tue, 1 May 2018 01:42:34 -0700 Subject: [PATCH 03/65] Fix kms key reosurce name --- .../src/test/java/com/google/cloud/storage/BlobInfoTest.java | 2 +- .../src/test/java/com/google/cloud/storage/BucketInfoTest.java | 2 +- .../src/test/java/com/google/cloud/storage/BucketTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java index 508c03574815..3160af0cc8da 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java @@ -66,7 +66,7 @@ public class BlobInfoTest { private static final String KEY_SHA256 = "keySha"; private static final CustomerEncryption CUSTOMER_ENCRYPTION = new CustomerEncryption(ENCRYPTION_ALGORITHM, KEY_SHA256); - private static final String KMS_KEY_NAME = "projects/p/keyRings/kr/location/kr-loc/cryptoKey/key"; + private static final String KMS_KEY_NAME = "projects/p/locations/kr-loc/keyRings/kr/cryptoKeys/key"; private static final StorageClass STORAGE_CLASS = StorageClass.COLDLINE; // Unit tests include Customer Supplied encryption which may be confusing with the KMS KEY NAME diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java index 117673e51943..d31dd0246e0b 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java @@ -60,7 +60,7 @@ public class BucketInfoTest { private static final String NOT_FOUND_PAGE = "error.html"; private static final String LOCATION = "ASIA"; private static final StorageClass STORAGE_CLASS = StorageClass.STANDARD; - private static final String DEFAULT_KMS_KEY_NAME = "projects/p/keyRings/kr/location/kr-loc/cryptoKey/key"; + private static final String DEFAULT_KMS_KEY_NAME = "projects/p/locations/kr-loc/keyRings/kr/cryptoKeys/key"; private static final Boolean VERSIONING_ENABLED = true; private static final Map BUCKET_LABELS = ImmutableMap.of("label1", "value1"); private static final Boolean REQUESTER_PAYS = true; diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java index 05edb3b26af5..34c14781857a 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java @@ -77,7 +77,7 @@ public class BucketTest { private static final String NOT_FOUND_PAGE = "error.html"; private static final String LOCATION = "ASIA"; private static final StorageClass STORAGE_CLASS = StorageClass.STANDARD; - private static final String DEFAULT_KMS_KEY_NAME = "projects/p/keyRings/kr/location/kr-loc/cryptoKey/key"; + private static final String DEFAULT_KMS_KEY_NAME = "projects/p/locations/kr-loc/keyRings/kr/cryptoKeys/key"; private static final Boolean VERSIONING_ENABLED = true; private static final Map BUCKET_LABELS = ImmutableMap.of("label1", "value1"); private static final Boolean REQUESTER_PAYS = true; From 3973c4d3896cc3af936a2d1df6b732174dbd8235 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Thu, 3 May 2018 15:12:49 -0700 Subject: [PATCH 04/65] BigQuery: Add "managing datasets" snippets. Add update ACLs sample. Add update dataset expiration sample. --- .../google/cloud/bigquery/DatasetInfo.java | 26 ++++++ .../snippets/DatasetInfoSnippets.java | 81 +++++++++++++++++++ .../snippets/ITDatasetInfoSnippets.java | 79 ++++++++++++++++++ utilities/add_snippets_to_file.py | 3 + 4 files changed, 189 insertions(+) create mode 100644 google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetInfoSnippets.java create mode 100644 google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITDatasetInfoSnippets.java diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetInfo.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetInfo.java index 6ff92fdd2a51..702b8360b251 100644 --- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetInfo.java +++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetInfo.java @@ -318,6 +318,20 @@ public DatasetId getDatasetId() { /** * Returns the dataset's access control configuration. * + *

Update the ACLs for a dataset. + * 

 {@code
+   * Dataset dataset = bigquery.getDataset(DatasetId.of("my_dataset"));
+   * List beforeAcls = dataset.getAcl();
+   * 
+   * // Make a copy of the ACLs so that they can be modified.
+   * ArrayList acls = new ArrayList<>(beforeAcls);
+   * acls.add(Acl.of(new Acl.User("sample.bigquery.dev@gmail.com"), Acl.Role.READER));
+   * Dataset.Builder builder = dataset.toBuilder();
+   * builder.setAcl(acls);
+   * 
+   * bigquery.update(builder.build());  // API request.
+   * }
+ * * @see Access Control */ public List getAcl() { @@ -341,6 +355,18 @@ public Long getCreationTime() { * will be deleted automatically. If a table's expirationTime is modified or removed before the * table expires, or if you provide an explicit expirationTime when creating a table, that value * takes precedence over the default expiration time indicated by this property. + * + *

Update the default table expiration time for a dataset. + * 

 {@code
+   * Dataset dataset = bigquery.getDataset(DatasetId.of("my_dataset"));
+   * Long beforeExpiration = dataset.getDefaultTableLifetime();
+   * 
+   * Long oneDayMilliseconds = 24 * 60 * 60 * 1000L;
+   * Dataset.Builder builder = dataset.toBuilder();
+   * builder.setDefaultTableLifetime(oneDayMilliseconds);
+   * bigquery.update(builder.build());  // API request.
+   * }
+ * */ public Long getDefaultTableLifetime() { return defaultTableLifetime; diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetInfoSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetInfoSnippets.java new file mode 100644 index 000000000000..120f51bbf9c3 --- /dev/null +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetInfoSnippets.java @@ -0,0 +1,81 @@ +/* + * Copyright 2018 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ + +/* + * EDITING INSTRUCTIONS + * This file is referenced in DatasetInfo’s javadoc. Any change to this file should be reflected in + * DatasetInfo’s javadoc. Use utilities/add_snipptets_to_file.py to copy. + */ + +package com.google.cloud.examples.bigquery.snippets; + +import com.google.api.gax.paging.Page; +import com.google.cloud.bigquery.*; +import com.google.cloud.bigquery.DatasetInfo.Builder; + +import java.util.ArrayList; +import java.util.List; + +/** + * This class contains a number of snippets for the {@link DatasetInfo} interface. + */ +public class DatasetInfoSnippets { + + private final BigQuery bigquery; + + public DatasetInfoSnippets(BigQuery bigquery) { + this.bigquery = bigquery; + } + + /** + * Update the ACLs for a dataset. + */ + // [TARGET getAcl()] + // [VARIABLE bigquery.getDataset(DatasetId.of("my_dataset"))] + public List updateDatasetAccess(Dataset dataset) { + // [START bigquery_update_dataset_access] + List beforeAcls = dataset.getAcl(); + + // Make a copy of the ACLs so that they can be modified. + ArrayList acls = new ArrayList<>(beforeAcls); + acls.add(Acl.of(new Acl.User("sample.bigquery.dev@gmail.com"), Acl.Role.READER)); + Dataset.Builder builder = dataset.toBuilder(); + builder.setAcl(acls); + + bigquery.update(builder.build()); // API request. + // [END bigquery_update_dataset_access] + + return beforeAcls; + } + + /** + * Update the default table expiration time for a dataset. + */ + // [TARGET getDefaultTableLifetime()] + // [VARIABLE bigquery.getDataset(DatasetId.of("my_dataset"))] + public Long updateDatasetExpiration(Dataset dataset) { + // [START bigquery_update_dataset_expiration] + Long beforeExpiration = dataset.getDefaultTableLifetime(); + + Long oneDayMilliseconds = 24 * 60 * 60 * 1000L; + Dataset.Builder builder = dataset.toBuilder(); + builder.setDefaultTableLifetime(oneDayMilliseconds); + bigquery.update(builder.build()); // API request. + // [END bigquery_update_dataset_expiration] + + return beforeExpiration; + } +} diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITDatasetInfoSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITDatasetInfoSnippets.java new file mode 100644 index 000000000000..b8468b0adfb4 --- /dev/null +++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITDatasetInfoSnippets.java @@ -0,0 +1,79 @@ +/* + * Copyright 2018 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ + +package com.google.cloud.examples.bigquery.snippets; + +import com.google.cloud.bigquery.*; +import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption; +import com.google.cloud.bigquery.testing.RemoteBigQueryHelper; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.Timeout; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.List; +import java.util.concurrent.ExecutionException; + +import static org.junit.Assert.*; + +public class ITDatasetInfoSnippets { + + private static final String DATASET = RemoteBigQueryHelper.generateDatasetName(); + + private static BigQuery bigquery; + private static DatasetInfoSnippets datasetInfoSnippets; + private static ByteArrayOutputStream bout; + private static PrintStream out; + + @Rule public Timeout globalTimeout = Timeout.seconds(300); + + @BeforeClass + public static void beforeClass() { + bigquery = RemoteBigQueryHelper.create().getOptions().getService(); + datasetInfoSnippets = new DatasetInfoSnippets(bigquery); + bigquery.create(DatasetInfo.newBuilder(DATASET).build()); + bout = new ByteArrayOutputStream(); + out = new PrintStream(bout); + System.setOut(out); + } + + @AfterClass + public static void afterClass() throws ExecutionException, InterruptedException { + bigquery.delete(DATASET, DatasetDeleteOption.deleteContents()); + System.setOut(null); + } + + @Test + public void testUpdateDatasetAccess() throws InterruptedException { + Dataset dataset = bigquery.getDataset(DATASET); + List beforeAcls = datasetInfoSnippets.updateDatasetAccess(dataset); + dataset = bigquery.getDataset(DATASET); + List afterAcls = dataset.getAcl(); + assertEquals(beforeAcls.size() + 1, afterAcls.size()); + } + + @Test + public void testUpdateDatasetExpiration() throws InterruptedException { + Dataset dataset = bigquery.getDataset(DATASET); + Long beforeExpiration = datasetInfoSnippets.updateDatasetExpiration(dataset); + dataset = bigquery.getDataset(DATASET); + Long afterExpiration = dataset.getDefaultTableLifetime(); + assertNotEquals(beforeExpiration, afterExpiration); + } +} diff --git a/utilities/add_snippets_to_file.py b/utilities/add_snippets_to_file.py index 5044eb1ea265..43d5c424715a 100644 --- a/utilities/add_snippets_to_file.py +++ b/utilities/add_snippets_to_file.py @@ -330,6 +330,9 @@ def __init__(self, data, methods): for match in pattern.finditer(data): line_number = len(NEWLINE_PATTERN.findall(data[:match.start()])) + 1 signature = method.signature + if signature in self.line_numbers: + LOGGER.warning('Method %s duplicate at line %d.', signature, line_number) + continue LOGGER.info('Method %s found at line %d.', signature, line_number) self.line_numbers[signature] = line_number From 1985805b51f02c4b72696db0165f4ede10dfdbfc Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Thu, 3 May 2018 15:32:12 -0700 Subject: [PATCH 05/65] Remove unused imports. --- .../bigquery/snippets/DatasetInfoSnippets.java | 14 +++++++------- .../bigquery/snippets/ITDatasetInfoSnippets.java | 5 ++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetInfoSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetInfoSnippets.java index 120f51bbf9c3..614ac564cf3f 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetInfoSnippets.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/DatasetInfoSnippets.java @@ -22,9 +22,9 @@ package com.google.cloud.examples.bigquery.snippets; -import com.google.api.gax.paging.Page; -import com.google.cloud.bigquery.*; -import com.google.cloud.bigquery.DatasetInfo.Builder; +import com.google.cloud.bigquery.Acl; +import com.google.cloud.bigquery.BigQuery; +import com.google.cloud.bigquery.DatasetInfo; import java.util.ArrayList; import java.util.List; @@ -45,14 +45,14 @@ public DatasetInfoSnippets(BigQuery bigquery) { */ // [TARGET getAcl()] // [VARIABLE bigquery.getDataset(DatasetId.of("my_dataset"))] - public List updateDatasetAccess(Dataset dataset) { + public List updateDatasetAccess(DatasetInfo dataset) { // [START bigquery_update_dataset_access] List beforeAcls = dataset.getAcl(); // Make a copy of the ACLs so that they can be modified. ArrayList acls = new ArrayList<>(beforeAcls); acls.add(Acl.of(new Acl.User("sample.bigquery.dev@gmail.com"), Acl.Role.READER)); - Dataset.Builder builder = dataset.toBuilder(); + DatasetInfo.Builder builder = dataset.toBuilder(); builder.setAcl(acls); bigquery.update(builder.build()); // API request. @@ -66,12 +66,12 @@ public List updateDatasetAccess(Dataset dataset) { */ // [TARGET getDefaultTableLifetime()] // [VARIABLE bigquery.getDataset(DatasetId.of("my_dataset"))] - public Long updateDatasetExpiration(Dataset dataset) { + public Long updateDatasetExpiration(DatasetInfo dataset) { // [START bigquery_update_dataset_expiration] Long beforeExpiration = dataset.getDefaultTableLifetime(); Long oneDayMilliseconds = 24 * 60 * 60 * 1000L; - Dataset.Builder builder = dataset.toBuilder(); + DatasetInfo.Builder builder = dataset.toBuilder(); builder.setDefaultTableLifetime(oneDayMilliseconds); bigquery.update(builder.build()); // API request. // [END bigquery_update_dataset_expiration] diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITDatasetInfoSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITDatasetInfoSnippets.java index b8468b0adfb4..815d07583fd0 100644 --- a/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITDatasetInfoSnippets.java +++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/bigquery/snippets/ITDatasetInfoSnippets.java @@ -16,8 +16,11 @@ package com.google.cloud.examples.bigquery.snippets; -import com.google.cloud.bigquery.*; +import com.google.cloud.bigquery.Acl; +import com.google.cloud.bigquery.BigQuery; import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption; +import com.google.cloud.bigquery.Dataset; +import com.google.cloud.bigquery.DatasetInfo; import com.google.cloud.bigquery.testing.RemoteBigQueryHelper; import org.junit.AfterClass; import org.junit.BeforeClass; From 86830e59f66d58dcd6a9552510509561a006cf62 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Sun, 6 May 2018 23:06:21 -0700 Subject: [PATCH 06/65] Intermediate stage with WriteOptions --- google-cloud-storage/pom.xml | 1 + .../com/google/cloud/storage/BlobInfo.java | 5 +- .../java/com/google/cloud/storage/Bucket.java | 19 +++++ .../com/google/cloud/storage/BucketInfo.java | 9 +-- .../com/google/cloud/storage/Storage.java | 27 ++++++- .../com/google/cloud/storage/StorageImpl.java | 2 + .../cloud/storage/spi/v1/HttpStorageRpc.java | 10 ++- .../cloud/storage/spi/v1/StorageRpc.java | 3 +- .../google/cloud/storage/BlobInfoTest.java | 2 - .../com/google/cloud/storage/BlobTest.java | 1 + .../com/google/cloud/storage/BucketTest.java | 17 +++-- .../google/cloud/storage/StorageImplTest.java | 2 + .../cloud/storage/it/ITStorageTest.java | 71 ++++++++++++++----- 13 files changed, 133 insertions(+), 36 deletions(-) diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml index c88f3ba7ba30..d7765f318844 100644 --- a/google-cloud-storage/pom.xml +++ b/google-cloud-storage/pom.xml @@ -29,6 +29,7 @@ com.google.apis google-api-services-storage + v1-rev125-1.23.0 compile diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java index 85df1f6f150e..71e711ee95c7 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java @@ -832,9 +832,8 @@ public ObjectAccessControl apply(Acl acl) { if (customerEncryption != null) { storageObject.setCustomerEncryption(customerEncryption.toPb()); } - if (kmsKeyName != null) { - storageObject.setKmsKeyName(kmsKeyName); - } + + storageObject.setKmsKeyName(kmsKeyName); storageObject.setMetadata(pbMetadata); storageObject.setCacheControl(cacheControl); storageObject.setContentEncoding(contentEncoding); diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java index 07254e1185f6..c5a399391de9 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java @@ -190,6 +190,9 @@ private Tuple toTargetOption(BlobInfo blobIn case USER_PROJECT: return Tuple.of(blobInfo, Storage.BlobTargetOption.userProject((String) getValue())); + case KMS_KEY_NAME: + return Tuple.of(blobInfo, + Storage.BlobTargetOption.kmsKeyName((String) getValue())); default: throw new AssertionError("Unexpected enum value"); } @@ -274,6 +277,13 @@ public static BlobTargetOption userProject(String userProject) { return new BlobTargetOption(StorageRpc.Option.USER_PROJECT, userProject); } + /** + * Returns an option for blob's kms key name. + */ + public static BlobTargetOption kmsKeyName(String kmsKeyName) { + return new BlobTargetOption(StorageRpc.Option.KMS_KEY_NAME, kmsKeyName); + } + static Tuple toTargetOptions( BlobInfo info, BlobTargetOption... options) { Set optionSet = @@ -345,6 +355,8 @@ private Tuple toWriteOption(BlobInfo blobInfo Storage.BlobWriteOption.encryptionKey((String) value)); case USER_PROJECT: return Tuple.of(blobInfo, Storage.BlobWriteOption.userProject((String) value)); + case KMS_KEY_NAME: + return Tuple.of(blobInfo, Storage.BlobWriteOption.kmsKeyName((String) value)); default: throw new AssertionError("Unexpected enum value"); } @@ -470,6 +482,13 @@ public static BlobWriteOption userProject(String userProject) { return new BlobWriteOption(Storage.BlobWriteOption.Option.USER_PROJECT, userProject); } + /** + * Returns an option for blob's kms key name. + */ + public static BlobWriteOption kmsKeyName(String kmsKeyName) { + return new BlobWriteOption(Storage.BlobWriteOption.Option.KMS_KEY_NAME, kmsKeyName); + } + static Tuple toWriteOptions( BlobInfo info, BlobWriteOption... options) { Set optionSet = diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java index 79b6a89b2830..8a0a24ef610e 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java @@ -595,7 +595,8 @@ public Builder setLabels(Map labels) { @Override public Builder setDefaultKmsKeyName(String defaultKmsKeyName) { - this.defaultKmsKeyName = defaultKmsKeyName; + this.defaultKmsKeyName = defaultKmsKeyName != null + ? new String(defaultKmsKeyName) : Data.nullOf(String.class); return this; } @@ -880,9 +881,9 @@ public Rule apply(DeleteRule deleteRule) { if (labels != null) { bucketPb.setLabels(labels); } - // default kms key name can be null. - bucketPb.setEncryption(new Encryption().setDefaultKmsKeyName(defaultKmsKeyName)); - + if (defaultKmsKeyName != null) { + bucketPb.setEncryption(new Encryption().setDefaultKmsKeyName(defaultKmsKeyName)); + } return bucketPb; } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java index 232051fd8e99..8d6e85c06204 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java @@ -19,6 +19,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.api.client.util.Data; import com.google.api.core.BetaApi; import com.google.api.gax.paging.Page; import com.google.auth.ServiceAccountSigner; @@ -94,7 +95,7 @@ enum BucketField implements FieldSelector { CORS("cors"), STORAGE_CLASS("storageClass"), ETAG("etag"), - DEFAULT_KMS_KEY_NAME("defaultKmsKeyName"), + ENCRYPTION("encryption"), BILLING("billing"); static final List REQUIRED_FIELDS = ImmutableList.of(NAME); @@ -207,6 +208,15 @@ public static BucketTargetOption metagenerationNotMatch() { public static BucketTargetOption userProject(String userProject) { return new BucketTargetOption(StorageRpc.Option.USER_PROJECT, userProject); } + +// /** +// * Returns an option to define the defaultKmsKeyName. +// */ +// public static BucketTargetOption defaultKmsKeyName(String defaultKmsKeyName) { +// defaultKmsKeyName = defaultKmsKeyName != null +// ? new String(defaultKmsKeyName) : Data.nullOf(String.class); +// return new BucketTargetOption(StorageRpc.Option.KMS_KEY_NAME, defaultKmsKeyName); +// } } /** @@ -384,6 +394,15 @@ public static BlobTargetOption encryptionKey(String key) { return new BlobTargetOption(StorageRpc.Option.CUSTOMER_SUPPLIED_KEY, key); } + /** + * Returns an option to set a KMS key resource name of the blob. + * + * @param kmsKeyName the KMS crypto key resource name + */ + public static BlobTargetOption kmsKeyName(String kmsKeyName) { + return new BlobTargetOption(StorageRpc.Option.KMS_KEY_NAME, kmsKeyName); + } + static Tuple convert(BlobInfo info, BlobWriteOption... options) { BlobInfo.Builder infoBuilder = info.toBuilder().setCrc32c(null).setMd5(null); List targetOptions = Lists.newArrayListWithCapacity(options.length); @@ -417,7 +436,7 @@ class BlobWriteOption implements Serializable { enum Option { PREDEFINED_ACL, IF_GENERATION_MATCH, IF_GENERATION_NOT_MATCH, IF_METAGENERATION_MATCH, - IF_METAGENERATION_NOT_MATCH, IF_MD5_MATCH, IF_CRC32C_MATCH, CUSTOMER_SUPPLIED_KEY, USER_PROJECT; + IF_METAGENERATION_NOT_MATCH, IF_MD5_MATCH, IF_CRC32C_MATCH, CUSTOMER_SUPPLIED_KEY, USER_PROJECT, KMS_KEY_NAME; StorageRpc.Option toRpcOption() { return StorageRpc.Option.valueOf(this.name()); @@ -542,6 +561,10 @@ public static BlobWriteOption encryptionKey(String key) { public static BlobWriteOption userProject(String userProject) { return new BlobWriteOption(Option.USER_PROJECT, userProject); } + + public static BlobWriteOption kmsKeyName(String kmsKeyName) { + return new BlobWriteOption(Option.KMS_KEY_NAME, kmsKeyName); + } } /** diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java index e49445d13646..20ebab1f2174 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java @@ -437,9 +437,11 @@ public CopyWriter copy(final CopyRequest copyRequest) { RewriteResponse rewriteResponse = runWithRetries(new Callable() { @Override public RewriteResponse call() { + return storageRpc.openRewrite(new StorageRpc.RewriteRequest(source, sourceOptions, copyRequest.overrideInfo(), targetObject, targetOptions, copyRequest.getMegabytesCopiedPerChunk())); + } }, getOptions().getRetrySettings(), EXCEPTION_HANDLER, getOptions().getClock()); return new CopyWriter(getOptions(), rewriteResponse); diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java index b0a71387690a..19b03d113a5f 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java @@ -426,6 +426,7 @@ public StorageObject get(StorageObject object, Map options) { public Bucket patch(Bucket bucket, Map options) { Span span = startSpan(HttpStorageRpcSpans.SPAN_NAME_PATCH_BUCKET); Scope scope = tracer.withSpan(span); + try { return storage.buckets() .patch(bucket.getName(), bucket) @@ -790,6 +791,11 @@ private RewriteResponse rewrite(RewriteRequest req, String token) { userProject = Option.USER_PROJECT.getString(req.targetOptions); } + String kmsKeyName = Option.KMS_KEY_NAME.getString(req.targetOptions); + if (kmsKeyName == null) { + kmsKeyName = req.target.getKmsKeyName(); + } + Long maxBytesRewrittenPerCall = req.megabytesRewrittenPerCall != null ? req.megabytesRewrittenPerCall * MEGABYTE : null; Storage.Objects.Rewrite rewrite = storage.objects() @@ -808,7 +814,9 @@ private RewriteResponse rewrite(RewriteRequest req, String token) { .setIfMetagenerationNotMatch(Option.IF_METAGENERATION_NOT_MATCH.getLong(req.targetOptions)) .setIfGenerationMatch(Option.IF_GENERATION_MATCH.getLong(req.targetOptions)) .setIfGenerationNotMatch(Option.IF_GENERATION_NOT_MATCH.getLong(req.targetOptions)) - .setUserProject(userProject); + .setUserProject(userProject) + .setDestinationKmsKeyName(kmsKeyName); + HttpHeaders requestHeaders = rewrite.getRequestHeaders(); setEncryptionHeaders(requestHeaders, SOURCE_ENCRYPTION_KEY_PREFIX, req.sourceOptions); setEncryptionHeaders(requestHeaders, ENCRYPTION_KEY_PREFIX, req.targetOptions); diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java index e8645b3eb384..ef0ffcd06cce 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java @@ -55,7 +55,8 @@ enum Option { VERSIONS("versions"), FIELDS("fields"), CUSTOMER_SUPPLIED_KEY("customerSuppliedKey"), - USER_PROJECT("userProject"); + USER_PROJECT("userProject"), + KMS_KEY_NAME("kmsKeyName"); private final String value; diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java index 3160af0cc8da..460bdb1ea811 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java @@ -69,8 +69,6 @@ public class BlobInfoTest { private static final String KMS_KEY_NAME = "projects/p/locations/kr-loc/keyRings/kr/cryptoKeys/key"; private static final StorageClass STORAGE_CLASS = StorageClass.COLDLINE; - // Unit tests include Customer Supplied encryption which may be confusing with the KMS KEY NAME - // as both can't be set at the same time. At least not right now. private static final BlobInfo BLOB_INFO = BlobInfo.newBuilder("b", "n", GENERATION) .setAcl(ACL) .setComponentCount(COMPONENT_COUNT) diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java index b49d16fbc340..644a887b93ec 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java @@ -91,6 +91,7 @@ public class BlobTest { private static final String KEY_SHA256 = "keySha"; private static final BlobInfo.CustomerEncryption CUSTOMER_ENCRYPTION = new BlobInfo.CustomerEncryption(ENCRYPTION_ALGORITHM, KEY_SHA256); + // TODO: Figure out CMEK + CSEK world private static final BlobInfo FULL_BLOB_INFO = BlobInfo.newBuilder("b", "n", GENERATION) .setAcl(ACLS) .setComponentCount(COMPONENT_COUNT) diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java index 34c14781857a..8f4097a48535 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java @@ -41,6 +41,7 @@ import com.google.common.collect.Lists; import com.google.common.io.BaseEncoding; +import com.sun.net.ssl.KeyManagerFactorySpi; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -97,10 +98,10 @@ public class BucketTest { .setNotFoundPage(NOT_FOUND_PAGE) .setLocation(LOCATION) .setStorageClass(STORAGE_CLASS) - .setDefaultKmsKeyName(DEFAULT_KMS_KEY_NAME) .setVersioningEnabled(VERSIONING_ENABLED) .setLabels(BUCKET_LABELS) .setRequesterPays(REQUESTER_PAYS) + .setDefaultKmsKeyName(DEFAULT_KMS_KEY_NAME) .build(); private static final BucketInfo BUCKET_INFO = BucketInfo.newBuilder("b").setMetageneration(42L).build(); @@ -134,12 +135,12 @@ private void initializeExpectedBucket(int optionsCalls) { replay(serviceMockReturnsOptions); expectedBucket = new Bucket(serviceMockReturnsOptions, new BucketInfo.BuilderImpl(BUCKET_INFO)); blobResults = ImmutableList.of( - new Blob(serviceMockReturnsOptions, - new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n1").build())), - new Blob(serviceMockReturnsOptions, - new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n2").build())), - new Blob(serviceMockReturnsOptions, - new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n3").build()))); + new Blob(serviceMockReturnsOptions, + new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n1").build())), + new Blob(serviceMockReturnsOptions, + new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n2").build())), + new Blob(serviceMockReturnsOptions, + new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n3").build()))); } private void initializeBucket() { @@ -677,6 +678,7 @@ public void testBuilder() { .setVersioningEnabled(VERSIONING_ENABLED) .setLabels(BUCKET_LABELS) .setRequesterPays(REQUESTER_PAYS) + .setDefaultKmsKeyName(DEFAULT_KMS_KEY_NAME) .build(); assertEquals("b", bucket.getName()); assertEquals(ACLS, bucket.getAcl()); @@ -696,6 +698,7 @@ public void testBuilder() { assertEquals(VERSIONING_ENABLED, bucket.versioningEnabled()); assertEquals(BUCKET_LABELS, bucket.getLabels()); assertEquals(REQUESTER_PAYS, bucket.requesterPays()); + assertEquals(DEFAULT_KMS_KEY_NAME, bucket.getDefaultKmsKeyName()); assertEquals(storage.getOptions(), bucket.getStorage().getOptions()); } } diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java index dbab8bc4ad83..b2635726f382 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java @@ -561,6 +561,8 @@ public void testCreateBlobWithEncryptionKey() throws IOException { assertEquals(-1, byteStream.read(streamBytes)); } + // TODO: Add tests for KMS Key name + @Test public void testCreateBlobFromStream() throws IOException { Capture capturedStream = Capture.newInstance(); diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java index 3ebd0150e365..034bb6f8dc2e 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java @@ -27,11 +27,7 @@ import static org.junit.Assert.fail; import com.google.api.gax.paging.Page; -import com.google.cloud.Identity; -import com.google.cloud.Policy; -import com.google.cloud.ReadChannel; -import com.google.cloud.RestorableState; -import com.google.cloud.WriteChannel; +import com.google.cloud.*; import com.google.cloud.storage.Acl; import com.google.cloud.storage.Acl.Role; import com.google.cloud.storage.Acl.User; @@ -107,8 +103,8 @@ public class ITStorageTest { private static final byte[] COMPRESSED_CONTENT = BaseEncoding.base64() .decode("H4sIAAAAAAAAAPNIzcnJV3DPz0/PSVVwzskvTVEILskvSkxPVQQA/LySchsAAAA="); private static final Map BUCKET_LABELS = ImmutableMap.of("label1", "value1"); - private static final String SERVICE_ACCOUNT_EMAIL = "gcloud-devel@gs-project-accounts.iam.gserviceaccount.com"; - private static final String KMS_KEY_NAME = ""; // use real KMS KEY associated to the test project. + private static final String SERVICE_ACCOUNT_EMAIL = "spec-test-ruby-samples@gs-project-accounts.iam.gserviceaccount.com"; + private static final String KMS_KEY_NAME = "projects/spec-test-ruby-samples/locations/global/keyRings/a-key-ring-list-spec-test-ruby-samples/cryptoKeys/test"; // use real KMS KEY associated to the test project. @BeforeClass public static void beforeClass() throws NoSuchAlgorithmException, InvalidKeySpecException { @@ -185,14 +181,27 @@ public void testClearBucketDefaultKmsKeyName() throws ExecutionException, Interr try { assertEquals(KMS_KEY_NAME, remoteBucket.getDefaultKmsKeyName()); - remoteBucket = remoteBucket.toBuilder().setDefaultKmsKeyName(null).build(); - Bucket updatedBucket = storage.update(remoteBucket); - assertEquals(null, updatedBucket.getDefaultKmsKeyName()); + Bucket updatedBucket = remoteBucket.toBuilder().setDefaultKmsKeyName(null).build().update(); + assertNull(updatedBucket.getDefaultKmsKeyName()); } finally { RemoteStorageHelper.forceDelete(storage, bucketName, 5, TimeUnit.SECONDS); } } +// @Test +// public void testClearBucketDefaultKmsKeyNameTargetOptions() throws ExecutionException, InterruptedException { +// String bucketName = RemoteStorageHelper.generateBucketName(); +// Bucket remoteBucket = storage.create(BucketInfo.newBuilder(bucketName).setDefaultKmsKeyName(KMS_KEY_NAME).build()); +// +// try { +// assertEquals(KMS_KEY_NAME, remoteBucket.getDefaultKmsKeyName()); +// Bucket updatedBucket = remoteBucket.toBuilder().build().update(); +// assertNull(updatedBucket.getDefaultKmsKeyName()); +// } finally { +// RemoteStorageHelper.forceDelete(storage, bucketName, 5, TimeUnit.SECONDS); +// } +// } + @Test public void testCreateBlob() { String blobName = "test-create-blob"; @@ -228,7 +237,7 @@ public void testCreateBlobWithKmsKeyName() { assertNotNull(remoteBlob); assertEquals(blob.getBucket(), remoteBlob.getBucket()); assertEquals(blob.getName(), remoteBlob.getName()); - assertEquals(blob.getKmsKeyName(), remoteBlob.getKmsKeyName()); + assertTrue(remoteBlob.getKmsKeyName().startsWith(blob.getKmsKeyName())); byte[] readBytes = storage.readAllBytes(BUCKET, blobName); assertArrayEquals(BLOB_BYTE_CONTENT, readBytes); } @@ -237,6 +246,7 @@ public void testCreateBlobWithKmsKeyName() { public void testCreateBlobWithDefaultKmsKeyName() throws ExecutionException, InterruptedException { String bucketName = RemoteStorageHelper.generateBucketName(); Bucket bucket = storage.create(BucketInfo.newBuilder(bucketName).setDefaultKmsKeyName(KMS_KEY_NAME).build()); + assertEquals(bucket.getDefaultKmsKeyName(), KMS_KEY_NAME); try { String blobName = "test-create-with-default-kms-key-name-blob"; @@ -245,8 +255,9 @@ public void testCreateBlobWithDefaultKmsKeyName() throws ExecutionException, Int assertNotNull(remoteBlob); assertEquals(blob.getBucket(), remoteBlob.getBucket()); assertEquals(blob.getName(), remoteBlob.getName()); - assertEquals(blob.getKmsKeyName(), remoteBlob.getKmsKeyName()); - byte[] readBytes = storage.readAllBytes(BUCKET, blobName); + assertNotNull(remoteBlob.getKmsKeyName()); + assertTrue(remoteBlob.getKmsKeyName().startsWith(KMS_KEY_NAME)); + byte[] readBytes = storage.readAllBytes(bucketName, blobName); assertArrayEquals(BLOB_BYTE_CONTENT, readBytes); } finally { RemoteStorageHelper.forceDelete(storage, bucketName, 5, TimeUnit.SECONDS); @@ -455,7 +466,7 @@ public void testListBlobsKmsKeySelectedFields() throws InterruptedException { Blob remoteBlob = iterator.next(); assertEquals(BUCKET, remoteBlob.getBucket()); assertTrue(blobSet.contains(remoteBlob.getName())); - assertEquals(KMS_KEY_NAME, remoteBlob.getKmsKeyName()); + assertTrue(remoteBlob.getKmsKeyName().startsWith(KMS_KEY_NAME)); assertNull(remoteBlob.getContentType()); } } @@ -918,7 +929,8 @@ public void testRotateFromCustomerEncryptionToKmsKey() { assertEquals(BUCKET, copyWriter.getResult().getBucket()); assertEquals(targetBlobName, copyWriter.getResult().getName()); assertEquals(CONTENT_TYPE, copyWriter.getResult().getContentType()); - assertEquals(KMS_KEY_NAME, copyWriter.getResult().getKmsKeyName()); + assertNotNull(copyWriter.getResult().getKmsKeyName()); + assertTrue(copyWriter.getResult().getKmsKeyName().startsWith(KMS_KEY_NAME)); assertArrayEquals(BLOB_BYTE_CONTENT, copyWriter.getResult().getContent()); assertEquals(metadata, copyWriter.getResult().getMetadata()); assertTrue(copyWriter.isDone()); @@ -949,7 +961,7 @@ public void testCopyBlobUpdateMetadata() { } //Re-enable this test when it stops failing - //@Test + @Test public void testCopyBlobUpdateStorageClass() { String sourceBlobName = "test-copy-blob-update-storage-class-source"; BlobId source = BlobId.of(BUCKET, sourceBlobName); @@ -964,6 +976,7 @@ public void testCopyBlobUpdateStorageClass() { .newBuilder(BUCKET, targetBlobName).setStorageClass(StorageClass.COLDLINE).build(); Storage.CopyRequest req = Storage.CopyRequest.of(source, targetInfo); CopyWriter copyWriter = storage.copy(req); + Blob test = storage.get(source); assertEquals(BUCKET, copyWriter.getResult().getBucket()); assertEquals(targetBlobName, copyWriter.getResult().getName()); assertEquals(StorageClass.COLDLINE, copyWriter.getResult().getStorageClass()); @@ -1231,6 +1244,32 @@ public void testReadAndWriteChannelWithEncryptionKey() throws IOException { assertTrue(storage.delete(BUCKET, blobName)); } + @Test + public void testReadAndWriteChannelWithKmsKey() throws IOException { + String blobName = "test-read-write-channel-with-customer-kms-key-blob"; + BlobInfo blob = BlobInfo.newBuilder(BUCKET, blobName).build(); + byte[] stringBytes; + try (WriteChannel writer = storage.writer(blob, + Storage.BlobWriteOption.kmsKeyName(KMS_KEY_NAME))) { + stringBytes = BLOB_STRING_CONTENT.getBytes(UTF_8); + writer.write(ByteBuffer.wrap(BLOB_BYTE_CONTENT)); + writer.write(ByteBuffer.wrap(stringBytes)); + } + ByteBuffer readBytes; + ByteBuffer readStringBytes; + try (ReadChannel reader = + storage.reader(blob.getBlobId())) { + readBytes = ByteBuffer.allocate(BLOB_BYTE_CONTENT.length); + readStringBytes = ByteBuffer.allocate(stringBytes.length); + reader.read(readBytes); + reader.read(readStringBytes); + } + assertArrayEquals(BLOB_BYTE_CONTENT, readBytes.array()); + assertEquals(BLOB_STRING_CONTENT, new String(readStringBytes.array(), UTF_8)); + assertTrue(storage.get(blob.getBlobId()).getKmsKeyName().startsWith(KMS_KEY_NAME)); + assertTrue(storage.delete(BUCKET, blobName)); + } + @Test public void testReadAndWriteChannelsWithDifferentFileSize() throws IOException { String blobNamePrefix = "test-read-and-write-channels-blob-"; From 8d042d2544d4d22ebd8d4564074a68a39722d698 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Mon, 7 May 2018 00:16:35 -0700 Subject: [PATCH 07/65] Clean up and add tests --- .../java/com/google/cloud/storage/Bucket.java | 19 --- .../com/google/cloud/storage/Storage.java | 24 +--- .../com/google/cloud/storage/StorageImpl.java | 2 - .../cloud/storage/spi/v1/HttpStorageRpc.java | 10 +- .../com/google/cloud/storage/BlobTest.java | 1 - .../com/google/cloud/storage/BucketTest.java | 13 +- .../google/cloud/storage/StorageImplTest.java | 2 - .../cloud/storage/it/ITStorageTest.java | 133 ++++++++++-------- 8 files changed, 86 insertions(+), 118 deletions(-) diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java index c5a399391de9..07254e1185f6 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java @@ -190,9 +190,6 @@ private Tuple toTargetOption(BlobInfo blobIn case USER_PROJECT: return Tuple.of(blobInfo, Storage.BlobTargetOption.userProject((String) getValue())); - case KMS_KEY_NAME: - return Tuple.of(blobInfo, - Storage.BlobTargetOption.kmsKeyName((String) getValue())); default: throw new AssertionError("Unexpected enum value"); } @@ -277,13 +274,6 @@ public static BlobTargetOption userProject(String userProject) { return new BlobTargetOption(StorageRpc.Option.USER_PROJECT, userProject); } - /** - * Returns an option for blob's kms key name. - */ - public static BlobTargetOption kmsKeyName(String kmsKeyName) { - return new BlobTargetOption(StorageRpc.Option.KMS_KEY_NAME, kmsKeyName); - } - static Tuple toTargetOptions( BlobInfo info, BlobTargetOption... options) { Set optionSet = @@ -355,8 +345,6 @@ private Tuple toWriteOption(BlobInfo blobInfo Storage.BlobWriteOption.encryptionKey((String) value)); case USER_PROJECT: return Tuple.of(blobInfo, Storage.BlobWriteOption.userProject((String) value)); - case KMS_KEY_NAME: - return Tuple.of(blobInfo, Storage.BlobWriteOption.kmsKeyName((String) value)); default: throw new AssertionError("Unexpected enum value"); } @@ -482,13 +470,6 @@ public static BlobWriteOption userProject(String userProject) { return new BlobWriteOption(Storage.BlobWriteOption.Option.USER_PROJECT, userProject); } - /** - * Returns an option for blob's kms key name. - */ - public static BlobWriteOption kmsKeyName(String kmsKeyName) { - return new BlobWriteOption(Storage.BlobWriteOption.Option.KMS_KEY_NAME, kmsKeyName); - } - static Tuple toWriteOptions( BlobInfo info, BlobWriteOption... options) { Set optionSet = diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java index 8d6e85c06204..1249493a71e9 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java @@ -208,15 +208,6 @@ public static BucketTargetOption metagenerationNotMatch() { public static BucketTargetOption userProject(String userProject) { return new BucketTargetOption(StorageRpc.Option.USER_PROJECT, userProject); } - -// /** -// * Returns an option to define the defaultKmsKeyName. -// */ -// public static BucketTargetOption defaultKmsKeyName(String defaultKmsKeyName) { -// defaultKmsKeyName = defaultKmsKeyName != null -// ? new String(defaultKmsKeyName) : Data.nullOf(String.class); -// return new BucketTargetOption(StorageRpc.Option.KMS_KEY_NAME, defaultKmsKeyName); -// } } /** @@ -394,15 +385,6 @@ public static BlobTargetOption encryptionKey(String key) { return new BlobTargetOption(StorageRpc.Option.CUSTOMER_SUPPLIED_KEY, key); } - /** - * Returns an option to set a KMS key resource name of the blob. - * - * @param kmsKeyName the KMS crypto key resource name - */ - public static BlobTargetOption kmsKeyName(String kmsKeyName) { - return new BlobTargetOption(StorageRpc.Option.KMS_KEY_NAME, kmsKeyName); - } - static Tuple convert(BlobInfo info, BlobWriteOption... options) { BlobInfo.Builder infoBuilder = info.toBuilder().setCrc32c(null).setMd5(null); List targetOptions = Lists.newArrayListWithCapacity(options.length); @@ -436,7 +418,7 @@ class BlobWriteOption implements Serializable { enum Option { PREDEFINED_ACL, IF_GENERATION_MATCH, IF_GENERATION_NOT_MATCH, IF_METAGENERATION_MATCH, - IF_METAGENERATION_NOT_MATCH, IF_MD5_MATCH, IF_CRC32C_MATCH, CUSTOMER_SUPPLIED_KEY, USER_PROJECT, KMS_KEY_NAME; + IF_METAGENERATION_NOT_MATCH, IF_MD5_MATCH, IF_CRC32C_MATCH, CUSTOMER_SUPPLIED_KEY, USER_PROJECT; StorageRpc.Option toRpcOption() { return StorageRpc.Option.valueOf(this.name()); @@ -561,10 +543,6 @@ public static BlobWriteOption encryptionKey(String key) { public static BlobWriteOption userProject(String userProject) { return new BlobWriteOption(Option.USER_PROJECT, userProject); } - - public static BlobWriteOption kmsKeyName(String kmsKeyName) { - return new BlobWriteOption(Option.KMS_KEY_NAME, kmsKeyName); - } } /** diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java index 20ebab1f2174..e49445d13646 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java @@ -437,11 +437,9 @@ public CopyWriter copy(final CopyRequest copyRequest) { RewriteResponse rewriteResponse = runWithRetries(new Callable() { @Override public RewriteResponse call() { - return storageRpc.openRewrite(new StorageRpc.RewriteRequest(source, sourceOptions, copyRequest.overrideInfo(), targetObject, targetOptions, copyRequest.getMegabytesCopiedPerChunk())); - } }, getOptions().getRetrySettings(), EXCEPTION_HANDLER, getOptions().getClock()); return new CopyWriter(getOptions(), rewriteResponse); diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java index 19b03d113a5f..e88f43bdf31f 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java @@ -81,6 +81,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; + +import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException; import org.apache.http.HttpStatus; public class HttpStorageRpc implements StorageRpc { @@ -426,7 +428,6 @@ public StorageObject get(StorageObject object, Map options) { public Bucket patch(Bucket bucket, Map options) { Span span = startSpan(HttpStorageRpcSpans.SPAN_NAME_PATCH_BUCKET); Scope scope = tracer.withSpan(span); - try { return storage.buckets() .patch(bucket.getName(), bucket) @@ -790,11 +791,7 @@ private RewriteResponse rewrite(RewriteRequest req, String token) { if (userProject == null) { userProject = Option.USER_PROJECT.getString(req.targetOptions); } - - String kmsKeyName = Option.KMS_KEY_NAME.getString(req.targetOptions); - if (kmsKeyName == null) { - kmsKeyName = req.target.getKmsKeyName(); - } + String kmsKeyName = req.target.getKmsKeyName(); Long maxBytesRewrittenPerCall = req.megabytesRewrittenPerCall != null ? req.megabytesRewrittenPerCall * MEGABYTE : null; @@ -816,7 +813,6 @@ private RewriteResponse rewrite(RewriteRequest req, String token) { .setIfGenerationNotMatch(Option.IF_GENERATION_NOT_MATCH.getLong(req.targetOptions)) .setUserProject(userProject) .setDestinationKmsKeyName(kmsKeyName); - HttpHeaders requestHeaders = rewrite.getRequestHeaders(); setEncryptionHeaders(requestHeaders, SOURCE_ENCRYPTION_KEY_PREFIX, req.sourceOptions); setEncryptionHeaders(requestHeaders, ENCRYPTION_KEY_PREFIX, req.targetOptions); diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java index 644a887b93ec..b49d16fbc340 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java @@ -91,7 +91,6 @@ public class BlobTest { private static final String KEY_SHA256 = "keySha"; private static final BlobInfo.CustomerEncryption CUSTOMER_ENCRYPTION = new BlobInfo.CustomerEncryption(ENCRYPTION_ALGORITHM, KEY_SHA256); - // TODO: Figure out CMEK + CSEK world private static final BlobInfo FULL_BLOB_INFO = BlobInfo.newBuilder("b", "n", GENERATION) .setAcl(ACLS) .setComponentCount(COMPONENT_COUNT) diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java index 8f4097a48535..94c8ad715a0a 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java @@ -41,7 +41,6 @@ import com.google.common.collect.Lists; import com.google.common.io.BaseEncoding; -import com.sun.net.ssl.KeyManagerFactorySpi; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -135,12 +134,12 @@ private void initializeExpectedBucket(int optionsCalls) { replay(serviceMockReturnsOptions); expectedBucket = new Bucket(serviceMockReturnsOptions, new BucketInfo.BuilderImpl(BUCKET_INFO)); blobResults = ImmutableList.of( - new Blob(serviceMockReturnsOptions, - new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n1").build())), - new Blob(serviceMockReturnsOptions, - new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n2").build())), - new Blob(serviceMockReturnsOptions, - new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n3").build()))); + new Blob(serviceMockReturnsOptions, + new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n1").build())), + new Blob(serviceMockReturnsOptions, + new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n2").build())), + new Blob(serviceMockReturnsOptions, + new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n3").build()))); } private void initializeBucket() { diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java index b2635726f382..dbab8bc4ad83 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java @@ -561,8 +561,6 @@ public void testCreateBlobWithEncryptionKey() throws IOException { assertEquals(-1, byteStream.read(streamBytes)); } - // TODO: Add tests for KMS Key name - @Test public void testCreateBlobFromStream() throws IOException { Capture capturedStream = Capture.newInstance(); diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java index 034bb6f8dc2e..64efc81f1f05 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java @@ -27,7 +27,11 @@ import static org.junit.Assert.fail; import com.google.api.gax.paging.Page; -import com.google.cloud.*; +import com.google.cloud.Identity; +import com.google.cloud.Policy; +import com.google.cloud.ReadChannel; +import com.google.cloud.RestorableState; +import com.google.cloud.WriteChannel; import com.google.cloud.storage.Acl; import com.google.cloud.storage.Acl.Role; import com.google.cloud.storage.Acl.User; @@ -103,8 +107,9 @@ public class ITStorageTest { private static final byte[] COMPRESSED_CONTENT = BaseEncoding.base64() .decode("H4sIAAAAAAAAAPNIzcnJV3DPz0/PSVVwzskvTVEILskvSkxPVQQA/LySchsAAAA="); private static final Map BUCKET_LABELS = ImmutableMap.of("label1", "value1"); - private static final String SERVICE_ACCOUNT_EMAIL = "spec-test-ruby-samples@gs-project-accounts.iam.gserviceaccount.com"; - private static final String KMS_KEY_NAME = "projects/spec-test-ruby-samples/locations/global/keyRings/a-key-ring-list-spec-test-ruby-samples/cryptoKeys/test"; // use real KMS KEY associated to the test project. + private static final String SERVICE_ACCOUNT_EMAIL = "gcloud-devel@gs-project-accounts.iam.gserviceaccount.com"; + private static final String KMS_KEY_NAME_1 = "projects/gcloud-devel/locations/us/keyRings/gcs_kms_key_ring_us/cryptoKeys/key"; + private static final String KMS_KEY_NAME_2 = "projects/gcloud-devel/locations/us/keyRings/gcs_kms_key_ring_us/cryptoKeys/key2"; @BeforeClass public static void beforeClass() throws NoSuchAlgorithmException, InvalidKeySpecException { @@ -177,10 +182,11 @@ public void testGetBucketEmptyFields() { @Test public void testClearBucketDefaultKmsKeyName() throws ExecutionException, InterruptedException { String bucketName = RemoteStorageHelper.generateBucketName(); - Bucket remoteBucket = storage.create(BucketInfo.newBuilder(bucketName).setDefaultKmsKeyName(KMS_KEY_NAME).build()); + Bucket remoteBucket = storage.create(BucketInfo.newBuilder(bucketName) + .setDefaultKmsKeyName(KMS_KEY_NAME_1).setLocation("US").build()); try { - assertEquals(KMS_KEY_NAME, remoteBucket.getDefaultKmsKeyName()); + assertEquals(KMS_KEY_NAME_1, remoteBucket.getDefaultKmsKeyName()); Bucket updatedBucket = remoteBucket.toBuilder().setDefaultKmsKeyName(null).build().update(); assertNull(updatedBucket.getDefaultKmsKeyName()); } finally { @@ -188,19 +194,20 @@ public void testClearBucketDefaultKmsKeyName() throws ExecutionException, Interr } } -// @Test -// public void testClearBucketDefaultKmsKeyNameTargetOptions() throws ExecutionException, InterruptedException { -// String bucketName = RemoteStorageHelper.generateBucketName(); -// Bucket remoteBucket = storage.create(BucketInfo.newBuilder(bucketName).setDefaultKmsKeyName(KMS_KEY_NAME).build()); -// -// try { -// assertEquals(KMS_KEY_NAME, remoteBucket.getDefaultKmsKeyName()); -// Bucket updatedBucket = remoteBucket.toBuilder().build().update(); -// assertNull(updatedBucket.getDefaultKmsKeyName()); -// } finally { -// RemoteStorageHelper.forceDelete(storage, bucketName, 5, TimeUnit.SECONDS); -// } -// } + @Test + public void testUpdateBucketDefaultKmsKeyName() throws ExecutionException, InterruptedException { + String bucketName = RemoteStorageHelper.generateBucketName(); + Bucket remoteBucket = storage.create(BucketInfo.newBuilder(bucketName) + .setDefaultKmsKeyName(KMS_KEY_NAME_1).setLocation("US").build()); + + try { + assertEquals(KMS_KEY_NAME_1, remoteBucket.getDefaultKmsKeyName()); + Bucket updatedBucket = remoteBucket.toBuilder().setDefaultKmsKeyName(KMS_KEY_NAME_2).build().update(); + assertEquals(KMS_KEY_NAME_2, updatedBucket.getDefaultKmsKeyName()); + } finally { + RemoteStorageHelper.forceDelete(storage, bucketName, 5, TimeUnit.SECONDS); + } + } @Test public void testCreateBlob() { @@ -232,7 +239,7 @@ public void testCreateBlobWithEncryptionKey() { @Test public void testCreateBlobWithKmsKeyName() { String blobName = "test-create-with-kms-key-name-blob"; - BlobInfo blob = BlobInfo.newBuilder(BUCKET, blobName).setKmsKeyName(KMS_KEY_NAME).build(); + BlobInfo blob = BlobInfo.newBuilder(BUCKET, blobName).setKmsKeyName(KMS_KEY_NAME_1).build(); Blob remoteBlob = storage.create(blob, BLOB_BYTE_CONTENT); assertNotNull(remoteBlob); assertEquals(blob.getBucket(), remoteBlob.getBucket()); @@ -242,11 +249,24 @@ public void testCreateBlobWithKmsKeyName() { assertArrayEquals(BLOB_BYTE_CONTENT, readBytes); } + @Test + public void testCreateBlobWithKmsKeyNameAndCustomerSuppliedKey() { + try { + String blobName = "test-create-with-kms-key-name-blob"; + BlobInfo blob = BlobInfo.newBuilder(BUCKET, blobName).setKmsKeyName(KMS_KEY_NAME_1).build(); + storage.create(blob, BLOB_BYTE_CONTENT, Storage.BlobTargetOption.encryptionKey(KEY)); + fail("StorageException was expected"); // can't supply both. + } catch (StorageException ex) { + // expected + } + } + @Test public void testCreateBlobWithDefaultKmsKeyName() throws ExecutionException, InterruptedException { String bucketName = RemoteStorageHelper.generateBucketName(); - Bucket bucket = storage.create(BucketInfo.newBuilder(bucketName).setDefaultKmsKeyName(KMS_KEY_NAME).build()); - assertEquals(bucket.getDefaultKmsKeyName(), KMS_KEY_NAME); + Bucket bucket = storage.create(BucketInfo.newBuilder(bucketName) + .setDefaultKmsKeyName(KMS_KEY_NAME_1).setLocation("US").build()); + assertEquals(bucket.getDefaultKmsKeyName(), KMS_KEY_NAME_1); try { String blobName = "test-create-with-default-kms-key-name-blob"; @@ -256,7 +276,7 @@ public void testCreateBlobWithDefaultKmsKeyName() throws ExecutionException, Int assertEquals(blob.getBucket(), remoteBlob.getBucket()); assertEquals(blob.getName(), remoteBlob.getName()); assertNotNull(remoteBlob.getKmsKeyName()); - assertTrue(remoteBlob.getKmsKeyName().startsWith(KMS_KEY_NAME)); + assertTrue(remoteBlob.getKmsKeyName().startsWith(KMS_KEY_NAME_1)); byte[] readBytes = storage.readAllBytes(bucketName, blobName); assertArrayEquals(BLOB_BYTE_CONTENT, readBytes); } finally { @@ -439,11 +459,11 @@ public void testListBlobsKmsKeySelectedFields() throws InterruptedException { "test-list-blobs-selected-field-kms-key-name-blob2"}; BlobInfo blob1 = BlobInfo.newBuilder(BUCKET, blobNames[0]) .setContentType(CONTENT_TYPE) - .setKmsKeyName(KMS_KEY_NAME) + .setKmsKeyName(KMS_KEY_NAME_1) .build(); BlobInfo blob2 = BlobInfo.newBuilder(BUCKET, blobNames[1]) .setContentType(CONTENT_TYPE) - .setKmsKeyName(KMS_KEY_NAME) + .setKmsKeyName(KMS_KEY_NAME_1) .build(); Blob remoteBlob1 = storage.create(blob1); Blob remoteBlob2 = storage.create(blob2); @@ -466,7 +486,7 @@ public void testListBlobsKmsKeySelectedFields() throws InterruptedException { Blob remoteBlob = iterator.next(); assertEquals(BUCKET, remoteBlob.getBucket()); assertTrue(blobSet.contains(remoteBlob.getName())); - assertTrue(remoteBlob.getKmsKeyName().startsWith(KMS_KEY_NAME)); + assertTrue(remoteBlob.getKmsKeyName().startsWith(KMS_KEY_NAME_1)); assertNull(remoteBlob.getContentType()); } } @@ -550,8 +570,6 @@ public void testListBlobRequesterPays() throws InterruptedException { } } - - @Test(timeout = 15000) public void testListBlobsVersioned() throws ExecutionException, InterruptedException { String bucketName = RemoteStorageHelper.generateBucketName(); @@ -918,7 +936,7 @@ public void testRotateFromCustomerEncryptionToKmsKey() { BlobInfo target = BlobInfo.newBuilder(BUCKET, targetBlobName) .setContentType(CONTENT_TYPE) .setMetadata(metadata) - .setKmsKeyName(KMS_KEY_NAME) + .setKmsKeyName(KMS_KEY_NAME_1) .build(); Storage.CopyRequest req = Storage.CopyRequest.newBuilder() .setSource(source) @@ -930,13 +948,41 @@ public void testRotateFromCustomerEncryptionToKmsKey() { assertEquals(targetBlobName, copyWriter.getResult().getName()); assertEquals(CONTENT_TYPE, copyWriter.getResult().getContentType()); assertNotNull(copyWriter.getResult().getKmsKeyName()); - assertTrue(copyWriter.getResult().getKmsKeyName().startsWith(KMS_KEY_NAME)); + assertTrue(copyWriter.getResult().getKmsKeyName().startsWith(KMS_KEY_NAME_1)); assertArrayEquals(BLOB_BYTE_CONTENT, copyWriter.getResult().getContent()); assertEquals(metadata, copyWriter.getResult().getMetadata()); assertTrue(copyWriter.isDone()); assertTrue(storage.delete(BUCKET, targetBlobName)); } + @Test + public void testRotateFromCustomerEncryptionToKmsKeyWithCustomerEncrytion() { + String sourceBlobName = "test-copy-blob-encryption-key-source"; + BlobId source = BlobId.of(BUCKET, sourceBlobName); + ImmutableMap metadata = ImmutableMap.of("k", "v"); + Blob remoteBlob = storage.create(BlobInfo.newBuilder(source).build(), BLOB_BYTE_CONTENT, + Storage.BlobTargetOption.encryptionKey(KEY)); + assertNotNull(remoteBlob); + String targetBlobName = "test-copy-blob-kms-key-target"; + BlobInfo target = BlobInfo.newBuilder(BUCKET, targetBlobName) + .setContentType(CONTENT_TYPE) + .setMetadata(metadata) + .setKmsKeyName(KMS_KEY_NAME_1) + .build(); + try { + Storage.CopyRequest req = Storage.CopyRequest.newBuilder() + .setSource(source) + .setSourceOptions(Storage.BlobSourceOption.decryptionKey(BASE64_KEY)) + .setTarget(target, Storage.BlobTargetOption.encryptionKey(KEY)) + .build(); + storage.copy(req); + fail("StorageException was expected"); + } catch (StorageException ex) { + // expected + } + } + + @Test public void testCopyBlobUpdateMetadata() { String sourceBlobName = "test-copy-blob-update-metadata-source"; @@ -961,7 +1007,7 @@ public void testCopyBlobUpdateMetadata() { } //Re-enable this test when it stops failing - @Test + //@Test public void testCopyBlobUpdateStorageClass() { String sourceBlobName = "test-copy-blob-update-storage-class-source"; BlobId source = BlobId.of(BUCKET, sourceBlobName); @@ -976,7 +1022,6 @@ public void testCopyBlobUpdateStorageClass() { .newBuilder(BUCKET, targetBlobName).setStorageClass(StorageClass.COLDLINE).build(); Storage.CopyRequest req = Storage.CopyRequest.of(source, targetInfo); CopyWriter copyWriter = storage.copy(req); - Blob test = storage.get(source); assertEquals(BUCKET, copyWriter.getResult().getBucket()); assertEquals(targetBlobName, copyWriter.getResult().getName()); assertEquals(StorageClass.COLDLINE, copyWriter.getResult().getStorageClass()); @@ -1244,32 +1289,6 @@ public void testReadAndWriteChannelWithEncryptionKey() throws IOException { assertTrue(storage.delete(BUCKET, blobName)); } - @Test - public void testReadAndWriteChannelWithKmsKey() throws IOException { - String blobName = "test-read-write-channel-with-customer-kms-key-blob"; - BlobInfo blob = BlobInfo.newBuilder(BUCKET, blobName).build(); - byte[] stringBytes; - try (WriteChannel writer = storage.writer(blob, - Storage.BlobWriteOption.kmsKeyName(KMS_KEY_NAME))) { - stringBytes = BLOB_STRING_CONTENT.getBytes(UTF_8); - writer.write(ByteBuffer.wrap(BLOB_BYTE_CONTENT)); - writer.write(ByteBuffer.wrap(stringBytes)); - } - ByteBuffer readBytes; - ByteBuffer readStringBytes; - try (ReadChannel reader = - storage.reader(blob.getBlobId())) { - readBytes = ByteBuffer.allocate(BLOB_BYTE_CONTENT.length); - readStringBytes = ByteBuffer.allocate(stringBytes.length); - reader.read(readBytes); - reader.read(readStringBytes); - } - assertArrayEquals(BLOB_BYTE_CONTENT, readBytes.array()); - assertEquals(BLOB_STRING_CONTENT, new String(readStringBytes.array(), UTF_8)); - assertTrue(storage.get(blob.getBlobId()).getKmsKeyName().startsWith(KMS_KEY_NAME)); - assertTrue(storage.delete(BUCKET, blobName)); - } - @Test public void testReadAndWriteChannelsWithDifferentFileSize() throws IOException { String blobNamePrefix = "test-read-and-write-channels-blob-"; From 116220c0220e49220883975c20f809acde68fcf9 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Mon, 7 May 2018 10:28:27 -0700 Subject: [PATCH 08/65] Address comments --- google-cloud-storage/pom.xml | 1 - .../src/main/java/com/google/cloud/storage/Blob.java | 1 + .../src/main/java/com/google/cloud/storage/BlobInfo.java | 4 ++++ .../src/main/java/com/google/cloud/storage/Bucket.java | 1 + .../src/main/java/com/google/cloud/storage/BucketInfo.java | 4 ++++ .../java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java | 1 - 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml index d7765f318844..c88f3ba7ba30 100644 --- a/google-cloud-storage/pom.xml +++ b/google-cloud-storage/pom.xml @@ -29,7 +29,6 @@ com.google.apis google-api-services-storage - v1-rev125-1.23.0 compile diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java index 0f6a8e379485..e7ffbc7515d6 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java @@ -402,6 +402,7 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) { return this; } + @GcpLaunchStage.Beta @Override public Builder setKmsKeyName(String kmsKeyName) { infoBuilder.setKmsKeyName(kmsKeyName); diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java index 71e711ee95c7..17e92fa96586 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java @@ -24,6 +24,7 @@ import com.google.api.services.storage.model.ObjectAccessControl; import com.google.api.services.storage.model.StorageObject; import com.google.api.services.storage.model.StorageObject.Owner; +import com.google.cloud.GcpLaunchStage; import com.google.cloud.storage.Blob.Builder; import com.google.common.base.Function; import com.google.common.base.MoreObjects; @@ -271,6 +272,7 @@ public abstract static class Builder { * * Sets the blob's kmsKeyName. */ + @GcpLaunchStage.Beta public abstract Builder setKmsKeyName(String kmsKeyName); /** @@ -484,6 +486,7 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) { return this; } + @GcpLaunchStage.Beta @Override public Builder setKmsKeyName(String kmsKeyName) { this.kmsKeyName = kmsKeyName; @@ -756,6 +759,7 @@ public StorageClass getStorageClass() { /** * Returns the Cloud KMS key used to encrypt the blob, if any. */ + @GcpLaunchStage.Beta public String getKmsKeyName() { return kmsKeyName; } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java index 07254e1185f6..046977707d34 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java @@ -612,6 +612,7 @@ public Builder setLabels(Map labels) { return this; } + @GcpLaunchStage.Beta @Override public Builder setDefaultKmsKeyName(String defaultKmsKeyName) { infoBuilder.setDefaultKmsKeyName(defaultKmsKeyName); diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java index 8a0a24ef610e..e2fe369aa375 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java @@ -31,6 +31,7 @@ import com.google.api.services.storage.model.Bucket.Owner; import com.google.api.services.storage.model.Bucket.Versioning; import com.google.api.services.storage.model.Bucket.Website; +import com.google.cloud.GcpLaunchStage; import com.google.cloud.storage.Acl.Entity; import com.google.common.base.Function; import com.google.common.base.MoreObjects; @@ -428,6 +429,7 @@ public abstract static class Builder { /** * Sets the default Cloud KMS key name for this bucket. */ + @GcpLaunchStage.Beta public abstract Builder setDefaultKmsKeyName(String defaultKmsKeyName); /** @@ -593,6 +595,7 @@ public Builder setLabels(Map labels) { return this; } + @GcpLaunchStage.Beta @Override public Builder setDefaultKmsKeyName(String defaultKmsKeyName) { this.defaultKmsKeyName = defaultKmsKeyName != null @@ -782,6 +785,7 @@ public Map getLabels() { /** * Returns the default Cloud KMS key to be applied to newly inserted objects in this bucket. */ + @GcpLaunchStage.Beta public String getDefaultKmsKeyName() { return defaultKmsKeyName; } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java index e88f43bdf31f..d9717d3c8ac9 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java @@ -82,7 +82,6 @@ import java.util.List; import java.util.Map; -import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException; import org.apache.http.HttpStatus; public class HttpStorageRpc implements StorageRpc { From afd6eb39cb087a1b86e57bd0439396a3808a5ccb Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Mon, 7 May 2018 11:04:11 -0700 Subject: [PATCH 09/65] Update storage apiary client library version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 53d7a154231e..58edfcabf648 100644 --- a/pom.xml +++ b/pom.xml @@ -196,7 +196,7 @@ com.google.apis google-api-services-storage - v1-rev114-1.23.0 + v1-rev125-1.23.0 com.google.apis From 188e477de53143ceae21397b25f97e2fa4f735ea Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Mon, 7 May 2018 16:19:11 -0700 Subject: [PATCH 10/65] Bach client regen and add Redis client (#3237) --- TESTING.md | 4 + .../stub/BigtableTableAdminStubSettings.java | 26 +- google-cloud-bom/pom.xml | 26 +- google-cloud-redis/README.md | 118 ++ google-cloud-redis/pom.xml | 92 ++ .../cloud/redis/v1beta1/CloudRedisClient.java | 1057 +++++++++++++++++ .../redis/v1beta1/CloudRedisSettings.java | 259 ++++ .../cloud/redis/v1beta1/package-info.java | 49 + .../redis/v1beta1/stub/CloudRedisStub.java | 90 ++ .../v1beta1/stub/CloudRedisStubSettings.java | 566 +++++++++ .../stub/GrpcCloudRedisCallableFactory.java | 114 ++ .../v1beta1/stub/GrpcCloudRedisStub.java | 288 +++++ .../redis/v1beta1/CloudRedisClientTest.java | 411 +++++++ .../cloud/redis/v1beta1/MockCloudRedis.java | 57 + .../redis/v1beta1/MockCloudRedisImpl.java | 133 +++ pom.xml | 1 + 16 files changed, 3287 insertions(+), 4 deletions(-) create mode 100644 google-cloud-redis/README.md create mode 100644 google-cloud-redis/pom.xml create mode 100644 google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java create mode 100644 google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java create mode 100644 google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/package-info.java create mode 100644 google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java create mode 100644 google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java create mode 100644 google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java create mode 100644 google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java create mode 100644 google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java create mode 100644 google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java create mode 100644 google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java diff --git a/TESTING.md b/TESTING.md index f5a8242b6cae..ce8a7f2641f8 100644 --- a/TESTING.md +++ b/TESTING.md @@ -200,6 +200,10 @@ try { } ``` +### Testing code that uses Redis + +Currently, there isn't an emulator for Redis. An alternative is to create a test project. + ### Testing code that uses Resource Manager #### On your machine diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java index f3b5ad7e0065..b8450494aa27 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java @@ -482,6 +482,28 @@ public static class Builder .setTotalTimeout(Duration.ofMillis(600000L)) .build(); definitions.put("default", settings); + settings = + RetrySettings.newBuilder() + .setInitialRetryDelay(Duration.ofMillis(100L)) + .setRetryDelayMultiplier(1.3) + .setMaxRetryDelay(Duration.ofMillis(60000L)) + .setInitialRpcTimeout(Duration.ofMillis(130000L)) + .setRpcTimeoutMultiplier(1.0) + .setMaxRpcTimeout(Duration.ofMillis(130000L)) + .setTotalTimeout(Duration.ofMillis(3600000L)) + .build(); + definitions.put("create_table", settings); + settings = + RetrySettings.newBuilder() + .setInitialRetryDelay(Duration.ofMillis(100L)) + .setRetryDelayMultiplier(1.3) + .setMaxRetryDelay(Duration.ofMillis(60000L)) + .setInitialRpcTimeout(Duration.ofMillis(900000L)) + .setRpcTimeoutMultiplier(1.0) + .setMaxRpcTimeout(Duration.ofMillis(900000L)) + .setTotalTimeout(Duration.ofMillis(3600000L)) + .build(); + definitions.put("drop_row_range", settings); RETRY_PARAM_DEFINITIONS = definitions.build(); } @@ -555,7 +577,7 @@ private static Builder initDefaults(Builder builder) { builder .createTableSettings() .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("create_table")); builder .createTableFromSnapshotSettings() @@ -585,7 +607,7 @@ private static Builder initDefaults(Builder builder) { builder .dropRowRangeSettings() .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) - .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("drop_row_range")); builder .generateConsistencyTokenSettings() diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index ede88cfa398c..6af4e7df70d0 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -151,6 +151,7 @@ 0.46.1-beta-SNAPSHOT 0.46.1-alpha-SNAPSHOT 0.46.1-beta-SNAPSHOT + 0.46.1-alpha-SNAPSHOT 0.46.1-alpha-SNAPSHOT 0.46.1-beta-SNAPSHOT 0.46.1-alpha-SNAPSHOT @@ -173,8 +174,8 @@ 1.25.0 1.25.0 0.42.0 - 0.11.0 - 1.10.0 + 0.12.0 + 1.11.0 @@ -624,6 +625,27 @@ grpc-google-cloud-pubsub-v1 ${generated-proto-beta.version} + + com.google.cloud + google-cloud-redis + ${redis.version} + + + com.google.cloud + google-cloud-redis + ${redis.version} + test-jar + + + com.google.api.grpc + proto-google-cloud-redis-v1beta1 + ${generated-proto-beta.version} + + + com.google.api.grpc + grpc-google-cloud-redis-v1beta1 + ${generated-proto-beta.version} + com.google.cloud google-cloud-resourcemanager diff --git a/google-cloud-redis/README.md b/google-cloud-redis/README.md new file mode 100644 index 000000000000..6a9920d2028d --- /dev/null +++ b/google-cloud-redis/README.md @@ -0,0 +1,118 @@ +Google Cloud Java Client for Redis +================================== + +Java idiomatic client for [Google Cloud Redis][cloud-redis]. + +[![CircleCI](https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java/tree/master.svg?style=shield)](https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java/tree/master) +[![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/google-cloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/google-cloud-java?branch=master) +[![Maven](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-redis.svg)]( https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-redis.svg) +[![Codacy Badge](https://api.codacy.com/project/badge/grade/9da006ad7c3a4fe1abd142e77c003917)](https://www.codacy.com/app/mziccard/google-cloud-java) +[![Dependency Status](https://www.versioneye.com/user/projects/58fe4c8d6ac171426c414772/badge.svg?style=flat)](https://www.versioneye.com/user/projects/58fe4c8d6ac171426c414772) + +- [Product Documentation][redis-product-docs] +- [Client Library Documentation][redis-client-lib-docs] + +> Note: This client is a work-in-progress, and may occasionally +> make backwards-incompatible changes. + +Quickstart +---------- + +[//]: # ({x-version-update-start:google-cloud-redis:released}) +Add this to your pom.xml file +```xml + + com.google.cloud + google-cloud-redis + 0.46.0-beta + +``` +If you are using Gradle, add this to your dependencies +```Groovy +compile 'com.google.cloud:google-cloud-redis:0.46.0-beta' +``` +If you are using SBT, add this to your dependencies +```Scala +libraryDependencies += "com.google.cloud" % "google-cloud-redis" % "0.46.0-beta" +``` +[//]: # ({x-version-update-end}) + +Authentication +-------------- + +See the [Authentication](https://github.com/GoogleCloudPlatform/google-cloud-java#authentication) section in the base directory's README. + +About Google Cloud Redis +-------------------------- + +[Google Cloud Redis API][cloud-redis] transfers data from partner +SaaS applications to Google BigQuery on a scheduled, managed basis. + +See the [Redis client library docs][redis-client-lib-docs] to learn how to interact with the +Cloud Redis using this Client Library. + +Getting Started +--------------- +#### Prerequisites +For this tutorial, you will need a +[Google Developers Console](https://console.developers.google.com/) project with the Redis API +enabled. You will need to [enable billing](https://support.google.com/cloud/answer/6158867?hl=en) to +use Google Cloud Redis. +[Follow these instructions](https://cloud.google.com/docs/authentication#preparation) to get your +project set up. You will also need to set up the local development environment by [installing the +Google Cloud SDK](https://cloud.google.com/sdk/) and running the following commands in command line: +`gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`. + +#### Installation and setup +You'll need to obtain the `google-cloud-redis` library. See the [Quickstart](#quickstart) section +to add `google-cloud-redis` as a dependency in your code. + +Transport +--------- +Redis uses gRPC for the transport layer. + +Java Versions +------------- + +Java 7 or above is required for using this client. + +Testing +------- + +This library has tools to help make tests for code using Cloud Redis. + +See [TESTING] to read more about testing. + +Versioning +---------- + +This library follows [Semantic Versioning](http://semver.org/). + +It is currently in major version zero (``0.y.z``), which means that anything +may change at any time and the public API should not be considered +stable. + +Contributing +------------ + +Contributions to this library are always welcome and highly encouraged. + +See `google-cloud`'s [CONTRIBUTING] documentation and the [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started. + +Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information. + +License +------- + +Apache 2.0 - See [LICENSE] for more information. + + +[CONTRIBUTING]:https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/CONTRIBUTING.md +[code-of-conduct]:https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[LICENSE]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/LICENSE +[TESTING]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/TESTING.md#testing-code-that-uses-redis + + +[cloud-redis]: https://cloud.google.com/ +[redis-product-docs]: https://cloud.google.com/ +[redis-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/redis/v1/package-summary.html diff --git a/google-cloud-redis/pom.xml b/google-cloud-redis/pom.xml new file mode 100644 index 000000000000..086607f3959a --- /dev/null +++ b/google-cloud-redis/pom.xml @@ -0,0 +1,92 @@ + + + 4.0.0 + google-cloud-redis + 0.46.1-alpha-SNAPSHOT + jar + Google Cloud Redis + https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-redis + + Java idiomatic client for Google Cloud Redis. + + + com.google.cloud + google-cloud-pom + 0.46.1-alpha-SNAPSHOT + + + google-cloud-redis + + + + ${project.groupId} + google-cloud-core + + + ${project.groupId} + google-cloud-core-grpc + + + com.google.api.grpc + proto-google-cloud-redis-v1beta1 + + + com.google.api.grpc + grpc-google-cloud-redis-v1beta1 + + + io.grpc + grpc-netty-shaded + + + io.grpc + grpc-stub + + + io.grpc + grpc-auth + + + com.google.auto.value + auto-value + compile + + + ${project.groupId} + google-cloud-core + test-jar + test + + + junit + junit + test + + + org.easymock + easymock + test + + + org.objenesis + objenesis + test + + + com.google.truth + truth + test + + + com.google.api.grpc + grpc-google-iam-v1 + test + + + com.google.api + gax-grpc + testlib + test + + + diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java new file mode 100644 index 000000000000..c12db4788193 --- /dev/null +++ b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java @@ -0,0 +1,1057 @@ +/* + * Copyright 2018 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ +package com.google.cloud.redis.v1beta1; + +import com.google.api.core.ApiFunction; +import com.google.api.core.ApiFuture; +import com.google.api.core.ApiFutures; +import com.google.api.core.BetaApi; +import com.google.api.gax.core.BackgroundResource; +import com.google.api.gax.longrunning.OperationFuture; +import com.google.api.gax.paging.AbstractFixedSizeCollection; +import com.google.api.gax.paging.AbstractPage; +import com.google.api.gax.paging.AbstractPagedListResponse; +import com.google.api.gax.rpc.OperationCallable; +import com.google.api.gax.rpc.PageContext; +import com.google.api.gax.rpc.UnaryCallable; +import com.google.cloud.redis.v1beta1.stub.CloudRedisStub; +import com.google.cloud.redis.v1beta1.stub.CloudRedisStubSettings; +import com.google.longrunning.Operation; +import com.google.longrunning.OperationsClient; +import com.google.protobuf.Any; +import com.google.protobuf.Empty; +import com.google.protobuf.FieldMask; +import java.io.IOException; +import java.util.List; +import java.util.concurrent.TimeUnit; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND SERVICE +/** + * Service Description: Configures and manages Cloud Memorystore for Redis instances + * + *

Google Cloud Memorystore for Redis v1beta1 + * + *

The `redis.googleapis.com` service implements the Google Cloud Memorystore for Redis API and + * defines the following resource model for managing Redis instances: * The service works with a + * collection of cloud projects, named: `/projects/*` * Each project has a collection of + * available locations, named: `/locations/*` * Each location has a collection of Redis + * instances, named: `/instances/*` * As such, Redis instances are resources of the form: + * `/projects/{project_id}/locations/{location_id}/instances/{instance_id}` + * + *

Note that location_id must be refering to a GCP `region`; for example: * + * `projects/redpepper-1290/locations/us-central1/instances/my-redis` + * + *

This class provides the ability to make remote calls to the backing service through method + * calls that map to API methods. Sample code to get started: + * + * 

+ * 
+ * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+ *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+ *   Instance response = cloudRedisClient.getInstance(name);
+ * }
+ * 
+ *
+ * + *

Note: close() needs to be called on the cloudRedisClient object to clean up resources such as + * threads. In the example above, try-with-resources is used, which automatically calls close(). + * + *

The surface of this class includes several types of Java methods for each of the API's + * methods: + * + *

    + *
  1. A "flattened" method. With this type of method, the fields of the request type have been + * converted into function parameters. It may be the case that not all fields are available as + * parameters, and not every API method will have a flattened method entry point. + *
  2. A "request object" method. This type of method only takes one parameter, a request object, + * which must be constructed before the call. Not every API method will have a request object + * method. + *
  3. A "callable" method. This type of method takes no parameters and returns an immutable API + * callable object, which can be used to initiate calls to the service. + *
+ * + *

See the individual methods for example code. + * + *

Many parameters require resource names to be formatted in a particular way. To assist with + * these names, this class includes a format method for each type of name, and additionally a parse + * method to extract the individual identifiers contained within names that are returned. + * + *

This class can be customized by passing in a custom instance of CloudRedisSettings to + * create(). For example: + * + *

To customize credentials: + * + * 

+ * 
+ * CloudRedisSettings cloudRedisSettings =
+ *     CloudRedisSettings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .build();
+ * CloudRedisClient cloudRedisClient =
+ *     CloudRedisClient.create(cloudRedisSettings);
+ * 
+ *
+ * + * To customize the endpoint: + * + * 
+ * 
+ * CloudRedisSettings cloudRedisSettings =
+ *     CloudRedisSettings.newBuilder().setEndpoint(myEndpoint).build();
+ * CloudRedisClient cloudRedisClient =
+ *     CloudRedisClient.create(cloudRedisSettings);
+ * 
+ *
+ */ +@Generated("by gapic-generator") +@BetaApi +public class CloudRedisClient implements BackgroundResource { + private final CloudRedisSettings settings; + private final CloudRedisStub stub; + private final OperationsClient operationsClient; + + /** Constructs an instance of CloudRedisClient with default settings. */ + public static final CloudRedisClient create() throws IOException { + return create(CloudRedisSettings.newBuilder().build()); + } + + /** + * Constructs an instance of CloudRedisClient, using the given settings. The channels are created + * based on the settings passed in, or defaults for any settings that are not set. + */ + public static final CloudRedisClient create(CloudRedisSettings settings) throws IOException { + return new CloudRedisClient(settings); + } + + /** + * Constructs an instance of CloudRedisClient, using the given stub for making calls. This is for + * advanced usage - prefer to use CloudRedisSettings}. + */ + @BetaApi("A restructuring of stub classes is planned, so this may break in the future") + public static final CloudRedisClient create(CloudRedisStub stub) { + return new CloudRedisClient(stub); + } + + /** + * Constructs an instance of CloudRedisClient, using the given settings. This is protected so that + * it is easy to make a subclass, but otherwise, the static factory methods should be preferred. + */ + protected CloudRedisClient(CloudRedisSettings settings) throws IOException { + this.settings = settings; + this.stub = ((CloudRedisStubSettings) settings.getStubSettings()).createStub(); + this.operationsClient = OperationsClient.create(this.stub.getOperationsStub()); + } + + @BetaApi("A restructuring of stub classes is planned, so this may break in the future") + protected CloudRedisClient(CloudRedisStub stub) { + this.settings = null; + this.stub = stub; + this.operationsClient = OperationsClient.create(this.stub.getOperationsStub()); + } + + public final CloudRedisSettings getSettings() { + return settings; + } + + @BetaApi("A restructuring of stub classes is planned, so this may break in the future") + public CloudRedisStub getStub() { + return stub; + } + + /** + * Returns the OperationsClient that can be used to query the status of a long-running operation + * returned by another API method call. + */ + public final OperationsClient getOperationsClient() { + return operationsClient; + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Lists all Redis instances owned by a project in either the specified location (region) or all + * locations. + * + *

The location should have the following format: * + * `projects/{project_id}/locations/{location_id}` + * + *

If `location_id` is specified as `-` (wildcard), then all regions available to the project + * are queried, and the results are aggregated. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   for (Instance element : cloudRedisClient.listInstances(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   *
+ * + * @param parent Required. The resource name of the instance location using the form: + * `projects/{project_id}/locations/{location_id}` where `location_id` refers to a GCP region + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final ListInstancesPagedResponse listInstances(LocationName parent) { + ListInstancesRequest request = + ListInstancesRequest.newBuilder() + .setParent(parent == null ? null : parent.toString()) + .build(); + return listInstances(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Lists all Redis instances owned by a project in either the specified location (region) or all + * locations. + * + *

The location should have the following format: * + * `projects/{project_id}/locations/{location_id}` + * + *

If `location_id` is specified as `-` (wildcard), then all regions available to the project + * are queried, and the results are aggregated. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   for (Instance element : cloudRedisClient.listInstances(parent.toString()).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   *
+ * + * @param parent Required. The resource name of the instance location using the form: + * `projects/{project_id}/locations/{location_id}` where `location_id` refers to a GCP region + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final ListInstancesPagedResponse listInstances(String parent) { + ListInstancesRequest request = ListInstancesRequest.newBuilder().setParent(parent).build(); + return listInstances(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Lists all Redis instances owned by a project in either the specified location (region) or all + * locations. + * + *

The location should have the following format: * + * `projects/{project_id}/locations/{location_id}` + * + *

If `location_id` is specified as `-` (wildcard), then all regions available to the project + * are queried, and the results are aggregated. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ListInstancesRequest request = ListInstancesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   for (Instance element : cloudRedisClient.listInstances(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   *
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final ListInstancesPagedResponse listInstances(ListInstancesRequest request) { + return listInstancesPagedCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Lists all Redis instances owned by a project in either the specified location (region) or all + * locations. + * + *

The location should have the following format: * + * `projects/{project_id}/locations/{location_id}` + * + *

If `location_id` is specified as `-` (wildcard), then all regions available to the project + * are queried, and the results are aggregated. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ListInstancesRequest request = ListInstancesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   ApiFuture<ListInstancesPagedResponse> future = cloudRedisClient.listInstancesPagedCallable().futureCall(request);
+   *   // Do something
+   *   for (Instance element : future.get().iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   *
+ */ + public final UnaryCallable + listInstancesPagedCallable() { + return stub.listInstancesPagedCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Lists all Redis instances owned by a project in either the specified location (region) or all + * locations. + * + *

The location should have the following format: * + * `projects/{project_id}/locations/{location_id}` + * + *

If `location_id` is specified as `-` (wildcard), then all regions available to the project + * are queried, and the results are aggregated. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ListInstancesRequest request = ListInstancesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   while (true) {
+   *     ListInstancesResponse response = cloudRedisClient.listInstancesCallable().call(request);
+   *     for (Instance element : response.getInstancesList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
+   * }
+   *
+ */ + public final UnaryCallable listInstancesCallable() { + return stub.listInstancesCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Gets the details of a specific Redis instance. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   Instance response = cloudRedisClient.getInstance(name);
+   * }
+   *
+ * + * @param name Required. Redis instance resource name using the form: + * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` + * refers to a GCP region + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final Instance getInstance(InstanceName name) { + + GetInstanceRequest request = + GetInstanceRequest.newBuilder().setName(name == null ? null : name.toString()).build(); + return getInstance(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Gets the details of a specific Redis instance. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   Instance response = cloudRedisClient.getInstance(name.toString());
+   * }
+   *
+ * + * @param name Required. Redis instance resource name using the form: + * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` + * refers to a GCP region + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final Instance getInstance(String name) { + + GetInstanceRequest request = GetInstanceRequest.newBuilder().setName(name).build(); + return getInstance(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Gets the details of a specific Redis instance. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   GetInstanceRequest request = GetInstanceRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   Instance response = cloudRedisClient.getInstance(request);
+   * }
+   *
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + private final Instance getInstance(GetInstanceRequest request) { + return getInstanceCallable().call(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Gets the details of a specific Redis instance. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   GetInstanceRequest request = GetInstanceRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture<Instance> future = cloudRedisClient.getInstanceCallable().futureCall(request);
+   *   // Do something
+   *   Instance response = future.get();
+   * }
+   *
+ */ + public final UnaryCallable getInstanceCallable() { + return stub.getInstanceCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Creates a Redis instance based on the specified tier and memory size. + * + *

By default, the instance is peered to the project's [default + * network](/compute/docs/networks-and-firewalls#networks). + * + *

The creation is executed asynchronously and callers may check the returned operation to + * track its progress. Once the operation is completed the Redis instance will be fully + * functional. Completed longrunning.Operation will contain the new instance object in the + * response field. + * + *

The returned operation is automatically deleted after a few hours, so there is no need to + * call DeleteOperation. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   String instanceId = "test_instance";
+   *   Instance.Tier tier = Instance.Tier.BASIC;
+   *   int memorySizeGb = 1;
+   *   Instance instance = Instance.newBuilder()
+   *     .setTier(tier)
+   *     .setMemorySizeGb(memorySizeGb)
+   *     .build();
+   *   Instance response = cloudRedisClient.createInstanceAsync(parent, instanceId, instance).get();
+   * }
+   *
+ * + * @param parent Required. The resource name of the instance location using the form: + * `projects/{project_id}/locations/{location_id}` where `location_id` refers to a GCP region + * @param instanceId Required. The logical name of the Redis instance in the customer project with + * the following restrictions: + *

* Must contain only lowercase letters, numbers, and hyphens. * Must start with a + * letter. * Must be between 1-40 characters. * Must end with a number or a letter. + * * Must be unique within the customer project / location + * @param instance Required. A Redis [Instance] resource + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final OperationFuture createInstanceAsync( + LocationName parent, String instanceId, Instance instance) { + + CreateInstanceRequest request = + CreateInstanceRequest.newBuilder() + .setParent(parent == null ? null : parent.toString()) + .setInstanceId(instanceId) + .setInstance(instance) + .build(); + return createInstanceAsync(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Creates a Redis instance based on the specified tier and memory size. + * + *

By default, the instance is peered to the project's [default + * network](/compute/docs/networks-and-firewalls#networks). + * + *

The creation is executed asynchronously and callers may check the returned operation to + * track its progress. Once the operation is completed the Redis instance will be fully + * functional. Completed longrunning.Operation will contain the new instance object in the + * response field. + * + *

The returned operation is automatically deleted after a few hours, so there is no need to + * call DeleteOperation. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   String instanceId = "test_instance";
+   *   Instance.Tier tier = Instance.Tier.BASIC;
+   *   int memorySizeGb = 1;
+   *   Instance instance = Instance.newBuilder()
+   *     .setTier(tier)
+   *     .setMemorySizeGb(memorySizeGb)
+   *     .build();
+   *   Instance response = cloudRedisClient.createInstanceAsync(parent.toString(), instanceId, instance).get();
+   * }
+   *
+ * + * @param parent Required. The resource name of the instance location using the form: + * `projects/{project_id}/locations/{location_id}` where `location_id` refers to a GCP region + * @param instanceId Required. The logical name of the Redis instance in the customer project with + * the following restrictions: + *

* Must contain only lowercase letters, numbers, and hyphens. * Must start with a + * letter. * Must be between 1-40 characters. * Must end with a number or a letter. + * * Must be unique within the customer project / location + * @param instance Required. A Redis [Instance] resource + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final OperationFuture createInstanceAsync( + String parent, String instanceId, Instance instance) { + + CreateInstanceRequest request = + CreateInstanceRequest.newBuilder() + .setParent(parent) + .setInstanceId(instanceId) + .setInstance(instance) + .build(); + return createInstanceAsync(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Creates a Redis instance based on the specified tier and memory size. + * + *

By default, the instance is peered to the project's [default + * network](/compute/docs/networks-and-firewalls#networks). + * + *

The creation is executed asynchronously and callers may check the returned operation to + * track its progress. Once the operation is completed the Redis instance will be fully + * functional. Completed longrunning.Operation will contain the new instance object in the + * response field. + * + *

The returned operation is automatically deleted after a few hours, so there is no need to + * call DeleteOperation. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   String instanceId = "test_instance";
+   *   Instance.Tier tier = Instance.Tier.BASIC;
+   *   int memorySizeGb = 1;
+   *   Instance instance = Instance.newBuilder()
+   *     .setTier(tier)
+   *     .setMemorySizeGb(memorySizeGb)
+   *     .build();
+   *   CreateInstanceRequest request = CreateInstanceRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setInstanceId(instanceId)
+   *     .setInstance(instance)
+   *     .build();
+   *   Instance response = cloudRedisClient.createInstanceAsync(request).get();
+   * }
+   *
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final OperationFuture createInstanceAsync(CreateInstanceRequest request) { + return createInstanceOperationCallable().futureCall(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Creates a Redis instance based on the specified tier and memory size. + * + *

By default, the instance is peered to the project's [default + * network](/compute/docs/networks-and-firewalls#networks). + * + *

The creation is executed asynchronously and callers may check the returned operation to + * track its progress. Once the operation is completed the Redis instance will be fully + * functional. Completed longrunning.Operation will contain the new instance object in the + * response field. + * + *

The returned operation is automatically deleted after a few hours, so there is no need to + * call DeleteOperation. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   String instanceId = "test_instance";
+   *   Instance.Tier tier = Instance.Tier.BASIC;
+   *   int memorySizeGb = 1;
+   *   Instance instance = Instance.newBuilder()
+   *     .setTier(tier)
+   *     .setMemorySizeGb(memorySizeGb)
+   *     .build();
+   *   CreateInstanceRequest request = CreateInstanceRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setInstanceId(instanceId)
+   *     .setInstance(instance)
+   *     .build();
+   *   OperationFuture<Operation> future = cloudRedisClient.createInstanceOperationCallable().futureCall(request);
+   *   // Do something
+   *   Instance response = future.get();
+   * }
+   *
+ */ + public final OperationCallable + createInstanceOperationCallable() { + return stub.createInstanceOperationCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Creates a Redis instance based on the specified tier and memory size. + * + *

By default, the instance is peered to the project's [default + * network](/compute/docs/networks-and-firewalls#networks). + * + *

The creation is executed asynchronously and callers may check the returned operation to + * track its progress. Once the operation is completed the Redis instance will be fully + * functional. Completed longrunning.Operation will contain the new instance object in the + * response field. + * + *

The returned operation is automatically deleted after a few hours, so there is no need to + * call DeleteOperation. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   String instanceId = "test_instance";
+   *   Instance.Tier tier = Instance.Tier.BASIC;
+   *   int memorySizeGb = 1;
+   *   Instance instance = Instance.newBuilder()
+   *     .setTier(tier)
+   *     .setMemorySizeGb(memorySizeGb)
+   *     .build();
+   *   CreateInstanceRequest request = CreateInstanceRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setInstanceId(instanceId)
+   *     .setInstance(instance)
+   *     .build();
+   *   ApiFuture<Operation> future = cloudRedisClient.createInstanceCallable().futureCall(request);
+   *   // Do something
+   *   Operation response = future.get();
+   * }
+   *
+ */ + public final UnaryCallable createInstanceCallable() { + return stub.createInstanceCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Updates the metadata and configuration of a specific Redis instance. + * + *

Completed longrunning.Operation will contain the new instance object in the response field. + * The returned operation is automatically deleted after a few hours, so there is no need to call + * DeleteOperation. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   String pathsElement = "display_name";
+   *   String pathsElement2 = "memory_size_gb";
+   *   List<String> paths = Arrays.asList(pathsElement, pathsElement2);
+   *   FieldMask updateMask = FieldMask.newBuilder()
+   *     .addAllPaths(paths)
+   *     .build();
+   *   String displayName = "UpdatedDisplayName";
+   *   int memorySizeGb = 4;
+   *   Instance instance = Instance.newBuilder()
+   *     .setDisplayName(displayName)
+   *     .setMemorySizeGb(memorySizeGb)
+   *     .build();
+   *   Instance response = cloudRedisClient.updateInstanceAsync(updateMask, instance).get();
+   * }
+   *
+ * + * @param updateMask Required. Mask of fields to update. At least one path must be supplied in + * this field. The elements of the repeated paths field may only include these fields from + * [Instance][CloudRedis.Instance]: * `display_name` * `labels` * `memory_size_gb` + * * `redis_config` + * @param instance Required. Update description. Only fields specified in update_mask are updated. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final OperationFuture updateInstanceAsync( + FieldMask updateMask, Instance instance) { + + UpdateInstanceRequest request = + UpdateInstanceRequest.newBuilder().setUpdateMask(updateMask).setInstance(instance).build(); + return updateInstanceAsync(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Updates the metadata and configuration of a specific Redis instance. + * + *

Completed longrunning.Operation will contain the new instance object in the response field. + * The returned operation is automatically deleted after a few hours, so there is no need to call + * DeleteOperation. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   String pathsElement = "display_name";
+   *   String pathsElement2 = "memory_size_gb";
+   *   List<String> paths = Arrays.asList(pathsElement, pathsElement2);
+   *   FieldMask updateMask = FieldMask.newBuilder()
+   *     .addAllPaths(paths)
+   *     .build();
+   *   String displayName = "UpdatedDisplayName";
+   *   int memorySizeGb = 4;
+   *   Instance instance = Instance.newBuilder()
+   *     .setDisplayName(displayName)
+   *     .setMemorySizeGb(memorySizeGb)
+   *     .build();
+   *   UpdateInstanceRequest request = UpdateInstanceRequest.newBuilder()
+   *     .setUpdateMask(updateMask)
+   *     .setInstance(instance)
+   *     .build();
+   *   Instance response = cloudRedisClient.updateInstanceAsync(request).get();
+   * }
+   *
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final OperationFuture updateInstanceAsync(UpdateInstanceRequest request) { + return updateInstanceOperationCallable().futureCall(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Updates the metadata and configuration of a specific Redis instance. + * + *

Completed longrunning.Operation will contain the new instance object in the response field. + * The returned operation is automatically deleted after a few hours, so there is no need to call + * DeleteOperation. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   String pathsElement = "display_name";
+   *   String pathsElement2 = "memory_size_gb";
+   *   List<String> paths = Arrays.asList(pathsElement, pathsElement2);
+   *   FieldMask updateMask = FieldMask.newBuilder()
+   *     .addAllPaths(paths)
+   *     .build();
+   *   String displayName = "UpdatedDisplayName";
+   *   int memorySizeGb = 4;
+   *   Instance instance = Instance.newBuilder()
+   *     .setDisplayName(displayName)
+   *     .setMemorySizeGb(memorySizeGb)
+   *     .build();
+   *   UpdateInstanceRequest request = UpdateInstanceRequest.newBuilder()
+   *     .setUpdateMask(updateMask)
+   *     .setInstance(instance)
+   *     .build();
+   *   OperationFuture<Operation> future = cloudRedisClient.updateInstanceOperationCallable().futureCall(request);
+   *   // Do something
+   *   Instance response = future.get();
+   * }
+   *
+ */ + public final OperationCallable + updateInstanceOperationCallable() { + return stub.updateInstanceOperationCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Updates the metadata and configuration of a specific Redis instance. + * + *

Completed longrunning.Operation will contain the new instance object in the response field. + * The returned operation is automatically deleted after a few hours, so there is no need to call + * DeleteOperation. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   String pathsElement = "display_name";
+   *   String pathsElement2 = "memory_size_gb";
+   *   List<String> paths = Arrays.asList(pathsElement, pathsElement2);
+   *   FieldMask updateMask = FieldMask.newBuilder()
+   *     .addAllPaths(paths)
+   *     .build();
+   *   String displayName = "UpdatedDisplayName";
+   *   int memorySizeGb = 4;
+   *   Instance instance = Instance.newBuilder()
+   *     .setDisplayName(displayName)
+   *     .setMemorySizeGb(memorySizeGb)
+   *     .build();
+   *   UpdateInstanceRequest request = UpdateInstanceRequest.newBuilder()
+   *     .setUpdateMask(updateMask)
+   *     .setInstance(instance)
+   *     .build();
+   *   ApiFuture<Operation> future = cloudRedisClient.updateInstanceCallable().futureCall(request);
+   *   // Do something
+   *   Operation response = future.get();
+   * }
+   *
+ */ + public final UnaryCallable updateInstanceCallable() { + return stub.updateInstanceCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes a specific Redis instance. Instance stops serving and data is deleted. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   Empty response = cloudRedisClient.deleteInstanceAsync(name).get();
+   * }
+   *
+ * + * @param name Required. Redis instance resource name using the form: + * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` + * refers to a GCP region + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final OperationFuture deleteInstanceAsync(InstanceName name) { + + DeleteInstanceRequest request = + DeleteInstanceRequest.newBuilder().setName(name == null ? null : name.toString()).build(); + return deleteInstanceAsync(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes a specific Redis instance. Instance stops serving and data is deleted. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   Empty response = cloudRedisClient.deleteInstanceAsync(name.toString()).get();
+   * }
+   *
+ * + * @param name Required. Redis instance resource name using the form: + * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` + * refers to a GCP region + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final OperationFuture deleteInstanceAsync(String name) { + + DeleteInstanceRequest request = DeleteInstanceRequest.newBuilder().setName(name).build(); + return deleteInstanceAsync(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes a specific Redis instance. Instance stops serving and data is deleted. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   DeleteInstanceRequest request = DeleteInstanceRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   Empty response = cloudRedisClient.deleteInstanceAsync(request).get();
+   * }
+   *
+ * + * @param request The request object containing all of the parameters for the API call. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + private final OperationFuture deleteInstanceAsync(DeleteInstanceRequest request) { + return deleteInstanceOperationCallable().futureCall(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes a specific Redis instance. Instance stops serving and data is deleted. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   DeleteInstanceRequest request = DeleteInstanceRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   OperationFuture<Operation> future = cloudRedisClient.deleteInstanceOperationCallable().futureCall(request);
+   *   // Do something
+   *   Empty response = future.get();
+   * }
+   *
+ */ + public final OperationCallable + deleteInstanceOperationCallable() { + return stub.deleteInstanceOperationCallable(); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD + /** + * Deletes a specific Redis instance. Instance stops serving and data is deleted. + * + *

Sample code: + * + * 


+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   DeleteInstanceRequest request = DeleteInstanceRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture<Operation> future = cloudRedisClient.deleteInstanceCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   *
+ */ + public final UnaryCallable deleteInstanceCallable() { + return stub.deleteInstanceCallable(); + } + + @Override + public final void close() { + stub.close(); + } + + @Override + public void shutdown() { + stub.shutdown(); + } + + @Override + public boolean isShutdown() { + return stub.isShutdown(); + } + + @Override + public boolean isTerminated() { + return stub.isTerminated(); + } + + @Override + public void shutdownNow() { + stub.shutdownNow(); + } + + @Override + public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException { + return stub.awaitTermination(duration, unit); + } + + public static class ListInstancesPagedResponse + extends AbstractPagedListResponse< + ListInstancesRequest, ListInstancesResponse, Instance, ListInstancesPage, + ListInstancesFixedSizeCollection> { + + public static ApiFuture createAsync( + PageContext context, + ApiFuture futureResponse) { + ApiFuture futurePage = + ListInstancesPage.createEmptyPage().createPageAsync(context, futureResponse); + return ApiFutures.transform( + futurePage, + new ApiFunction() { + @Override + public ListInstancesPagedResponse apply(ListInstancesPage input) { + return new ListInstancesPagedResponse(input); + } + }); + } + + private ListInstancesPagedResponse(ListInstancesPage page) { + super(page, ListInstancesFixedSizeCollection.createEmptyCollection()); + } + } + + public static class ListInstancesPage + extends AbstractPage< + ListInstancesRequest, ListInstancesResponse, Instance, ListInstancesPage> { + + private ListInstancesPage( + PageContext context, + ListInstancesResponse response) { + super(context, response); + } + + private static ListInstancesPage createEmptyPage() { + return new ListInstancesPage(null, null); + } + + @Override + protected ListInstancesPage createPage( + PageContext context, + ListInstancesResponse response) { + return new ListInstancesPage(context, response); + } + + @Override + public ApiFuture createPageAsync( + PageContext context, + ApiFuture futureResponse) { + return super.createPageAsync(context, futureResponse); + } + } + + public static class ListInstancesFixedSizeCollection + extends AbstractFixedSizeCollection< + ListInstancesRequest, ListInstancesResponse, Instance, ListInstancesPage, + ListInstancesFixedSizeCollection> { + + private ListInstancesFixedSizeCollection(List pages, int collectionSize) { + super(pages, collectionSize); + } + + private static ListInstancesFixedSizeCollection createEmptyCollection() { + return new ListInstancesFixedSizeCollection(null, 0); + } + + @Override + protected ListInstancesFixedSizeCollection createCollection( + List pages, int collectionSize) { + return new ListInstancesFixedSizeCollection(pages, collectionSize); + } + } +} diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java new file mode 100644 index 000000000000..1d853addbaa8 --- /dev/null +++ b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java @@ -0,0 +1,259 @@ +/* + * Copyright 2018 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ +package com.google.cloud.redis.v1beta1; + +import static com.google.cloud.redis.v1beta1.CloudRedisClient.ListInstancesPagedResponse; + +import com.google.api.core.ApiFunction; +import com.google.api.core.BetaApi; +import com.google.api.gax.core.GoogleCredentialsProvider; +import com.google.api.gax.core.InstantiatingExecutorProvider; +import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; +import com.google.api.gax.rpc.ApiClientHeaderProvider; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.ClientSettings; +import com.google.api.gax.rpc.OperationCallSettings; +import com.google.api.gax.rpc.PagedCallSettings; +import com.google.api.gax.rpc.TransportChannelProvider; +import com.google.api.gax.rpc.UnaryCallSettings; +import com.google.cloud.redis.v1beta1.stub.CloudRedisStubSettings; +import com.google.longrunning.Operation; +import com.google.protobuf.Any; +import com.google.protobuf.Empty; +import java.io.IOException; +import java.util.List; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS +/** + * Settings class to configure an instance of {@link CloudRedisClient}. + * + *

The default instance has everything set to sensible defaults: + * + *

    + *
  • The default service address (redis.googleapis.com) and default port (443) are used. + *
  • Credentials are acquired automatically through Application Default Credentials. + *
  • Retries are configured for idempotent methods but not for non-idempotent methods. + *
+ * + *

The builder of this class is recursive, so contained classes are themselves builders. When + * build() is called, the tree of builders is called to create the complete settings object. For + * example, to set the total timeout of getInstance to 30 seconds: + * + * 

+ * 
+ * CloudRedisSettings.Builder cloudRedisSettingsBuilder =
+ *     CloudRedisSettings.newBuilder();
+ * cloudRedisSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
+ *     .setTotalTimeout(Duration.ofSeconds(30));
+ * CloudRedisSettings cloudRedisSettings = cloudRedisSettingsBuilder.build();
+ * 
+ *
+ */ +@Generated("by gapic-generator") +@BetaApi +public class CloudRedisSettings extends ClientSettings { + /** Returns the object with the settings used for calls to listInstances. */ + public PagedCallSettings + listInstancesSettings() { + return ((CloudRedisStubSettings) getStubSettings()).listInstancesSettings(); + } + + /** Returns the object with the settings used for calls to getInstance. */ + public UnaryCallSettings getInstanceSettings() { + return ((CloudRedisStubSettings) getStubSettings()).getInstanceSettings(); + } + + /** Returns the object with the settings used for calls to createInstance. */ + public UnaryCallSettings createInstanceSettings() { + return ((CloudRedisStubSettings) getStubSettings()).createInstanceSettings(); + } + + /** Returns the object with the settings used for calls to createInstance. */ + public OperationCallSettings + createInstanceOperationSettings() { + return ((CloudRedisStubSettings) getStubSettings()).createInstanceOperationSettings(); + } + + /** Returns the object with the settings used for calls to updateInstance. */ + public UnaryCallSettings updateInstanceSettings() { + return ((CloudRedisStubSettings) getStubSettings()).updateInstanceSettings(); + } + + /** Returns the object with the settings used for calls to updateInstance. */ + public OperationCallSettings + updateInstanceOperationSettings() { + return ((CloudRedisStubSettings) getStubSettings()).updateInstanceOperationSettings(); + } + + /** Returns the object with the settings used for calls to deleteInstance. */ + public UnaryCallSettings deleteInstanceSettings() { + return ((CloudRedisStubSettings) getStubSettings()).deleteInstanceSettings(); + } + + /** Returns the object with the settings used for calls to deleteInstance. */ + public OperationCallSettings + deleteInstanceOperationSettings() { + return ((CloudRedisStubSettings) getStubSettings()).deleteInstanceOperationSettings(); + } + + public static final CloudRedisSettings create(CloudRedisStubSettings stub) throws IOException { + return new CloudRedisSettings.Builder(stub.toBuilder()).build(); + } + + /** Returns a builder for the default ExecutorProvider for this service. */ + public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() { + return CloudRedisStubSettings.defaultExecutorProviderBuilder(); + } + + /** Returns the default service endpoint. */ + public static String getDefaultEndpoint() { + return CloudRedisStubSettings.getDefaultEndpoint(); + } + + /** Returns the default service scopes. */ + public static List getDefaultServiceScopes() { + return CloudRedisStubSettings.getDefaultServiceScopes(); + } + + /** Returns a builder for the default credentials for this service. */ + public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { + return CloudRedisStubSettings.defaultCredentialsProviderBuilder(); + } + + /** Returns a builder for the default ChannelProvider for this service. */ + public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() { + return CloudRedisStubSettings.defaultGrpcTransportProviderBuilder(); + } + + public static TransportChannelProvider defaultTransportChannelProvider() { + return CloudRedisStubSettings.defaultTransportChannelProvider(); + } + + @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") + public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() { + return CloudRedisStubSettings.defaultApiClientHeaderProviderBuilder(); + } + + /** Returns a new builder for this class. */ + public static Builder newBuilder() { + return Builder.createDefault(); + } + + /** Returns a new builder for this class. */ + public static Builder newBuilder(ClientContext clientContext) { + return new Builder(clientContext); + } + + /** Returns a builder containing all the values of this settings class. */ + public Builder toBuilder() { + return new Builder(this); + } + + protected CloudRedisSettings(Builder settingsBuilder) throws IOException { + super(settingsBuilder); + } + + /** Builder for CloudRedisSettings. */ + public static class Builder extends ClientSettings.Builder { + protected Builder() throws IOException { + this((ClientContext) null); + } + + protected Builder(ClientContext clientContext) { + super(CloudRedisStubSettings.newBuilder(clientContext)); + } + + private static Builder createDefault() { + return new Builder(CloudRedisStubSettings.newBuilder()); + } + + protected Builder(CloudRedisSettings settings) { + super(settings.getStubSettings().toBuilder()); + } + + protected Builder(CloudRedisStubSettings.Builder stubSettings) { + super(stubSettings); + } + + public CloudRedisStubSettings.Builder getStubSettingsBuilder() { + return ((CloudRedisStubSettings.Builder) getStubSettings()); + } + + // NEXT_MAJOR_VER: remove 'throws Exception' + /** + * Applies the given settings updater function to all of the unary API methods in this service. + * + *

Note: This method does not support applying settings to streaming methods. + */ + public Builder applyToAllUnaryMethods( + ApiFunction, Void> settingsUpdater) throws Exception { + super.applyToAllUnaryMethods( + getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); + return this; + } + + /** Returns the builder for the settings used for calls to listInstances. */ + public PagedCallSettings.Builder< + ListInstancesRequest, ListInstancesResponse, ListInstancesPagedResponse> + listInstancesSettings() { + return getStubSettingsBuilder().listInstancesSettings(); + } + + /** Returns the builder for the settings used for calls to getInstance. */ + public UnaryCallSettings.Builder getInstanceSettings() { + return getStubSettingsBuilder().getInstanceSettings(); + } + + /** Returns the builder for the settings used for calls to createInstance. */ + public UnaryCallSettings.Builder createInstanceSettings() { + return getStubSettingsBuilder().createInstanceSettings(); + } + + /** Returns the builder for the settings used for calls to createInstance. */ + public OperationCallSettings.Builder + createInstanceOperationSettings() { + return getStubSettingsBuilder().createInstanceOperationSettings(); + } + + /** Returns the builder for the settings used for calls to updateInstance. */ + public UnaryCallSettings.Builder updateInstanceSettings() { + return getStubSettingsBuilder().updateInstanceSettings(); + } + + /** Returns the builder for the settings used for calls to updateInstance. */ + public OperationCallSettings.Builder + updateInstanceOperationSettings() { + return getStubSettingsBuilder().updateInstanceOperationSettings(); + } + + /** Returns the builder for the settings used for calls to deleteInstance. */ + public UnaryCallSettings.Builder deleteInstanceSettings() { + return getStubSettingsBuilder().deleteInstanceSettings(); + } + + /** Returns the builder for the settings used for calls to deleteInstance. */ + public OperationCallSettings.Builder + deleteInstanceOperationSettings() { + return getStubSettingsBuilder().deleteInstanceOperationSettings(); + } + + @Override + public CloudRedisSettings build() throws IOException { + return new CloudRedisSettings(this); + } + } +} diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/package-info.java b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/package-info.java new file mode 100644 index 000000000000..417e81179934 --- /dev/null +++ b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/package-info.java @@ -0,0 +1,49 @@ +/* + * Copyright 2018 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ + +/** + * A client to Google Cloud Memorystore for Redis API. + * + *

The interfaces provided are listed below, along with usage samples. + * + *

================ CloudRedisClient ================ + * + *

Service Description: Configures and manages Cloud Memorystore for Redis instances + * + *

Google Cloud Memorystore for Redis v1beta1 + * + *

The `redis.googleapis.com` service implements the Google Cloud Memorystore for Redis API and + * defines the following resource model for managing Redis instances: * The service works with a + * collection of cloud projects, named: `/projects/*` * Each project has a collection of + * available locations, named: `/locations/*` * Each location has a collection of Redis + * instances, named: `/instances/*` * As such, Redis instances are resources of the form: + * `/projects/{project_id}/locations/{location_id}/instances/{instance_id}` + * + *

Note that location_id must be refering to a GCP `region`; for example: * + * `projects/redpepper-1290/locations/us-central1/instances/my-redis` + * + *

Sample for CloudRedisClient: + * + * 

+ * 
+ * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+ *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+ *   Instance response = cloudRedisClient.getInstance(name);
+ * }
+ * 
+ *
+ */ +package com.google.cloud.redis.v1beta1; diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java new file mode 100644 index 000000000000..4043840bf60c --- /dev/null +++ b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java @@ -0,0 +1,90 @@ +/* + * Copyright 2018 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ +package com.google.cloud.redis.v1beta1.stub; + +import static com.google.cloud.redis.v1beta1.CloudRedisClient.ListInstancesPagedResponse; + +import com.google.api.core.BetaApi; +import com.google.api.gax.core.BackgroundResource; +import com.google.api.gax.rpc.OperationCallable; +import com.google.api.gax.rpc.UnaryCallable; +import com.google.cloud.redis.v1beta1.CreateInstanceRequest; +import com.google.cloud.redis.v1beta1.DeleteInstanceRequest; +import com.google.cloud.redis.v1beta1.GetInstanceRequest; +import com.google.cloud.redis.v1beta1.Instance; +import com.google.cloud.redis.v1beta1.ListInstancesRequest; +import com.google.cloud.redis.v1beta1.ListInstancesResponse; +import com.google.cloud.redis.v1beta1.UpdateInstanceRequest; +import com.google.longrunning.Operation; +import com.google.longrunning.stub.OperationsStub; +import com.google.protobuf.Any; +import com.google.protobuf.Empty; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS +/** + * Base stub class for Google Cloud Memorystore for Redis API. + * + *

This class is for advanced usage and reflects the underlying API directly. + */ +@Generated("by gapic-generator") +@BetaApi("A restructuring of stub classes is planned, so this may break in the future") +public abstract class CloudRedisStub implements BackgroundResource { + + public OperationsStub getOperationsStub() { + throw new UnsupportedOperationException("Not implemented: getOperationsStub()"); + } + + public UnaryCallable + listInstancesPagedCallable() { + throw new UnsupportedOperationException("Not implemented: listInstancesPagedCallable()"); + } + + public UnaryCallable listInstancesCallable() { + throw new UnsupportedOperationException("Not implemented: listInstancesCallable()"); + } + + public UnaryCallable getInstanceCallable() { + throw new UnsupportedOperationException("Not implemented: getInstanceCallable()"); + } + + public OperationCallable createInstanceOperationCallable() { + throw new UnsupportedOperationException("Not implemented: createInstanceOperationCallable()"); + } + + public UnaryCallable createInstanceCallable() { + throw new UnsupportedOperationException("Not implemented: createInstanceCallable()"); + } + + public OperationCallable updateInstanceOperationCallable() { + throw new UnsupportedOperationException("Not implemented: updateInstanceOperationCallable()"); + } + + public UnaryCallable updateInstanceCallable() { + throw new UnsupportedOperationException("Not implemented: updateInstanceCallable()"); + } + + public OperationCallable deleteInstanceOperationCallable() { + throw new UnsupportedOperationException("Not implemented: deleteInstanceOperationCallable()"); + } + + public UnaryCallable deleteInstanceCallable() { + throw new UnsupportedOperationException("Not implemented: deleteInstanceCallable()"); + } + + @Override + public abstract void close(); +} diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java new file mode 100644 index 000000000000..3b9b51a26deb --- /dev/null +++ b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java @@ -0,0 +1,566 @@ +/* + * Copyright 2018 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ +package com.google.cloud.redis.v1beta1.stub; + +import static com.google.cloud.redis.v1beta1.CloudRedisClient.ListInstancesPagedResponse; + +import com.google.api.core.ApiFunction; +import com.google.api.core.ApiFuture; +import com.google.api.core.BetaApi; +import com.google.api.gax.core.GaxProperties; +import com.google.api.gax.core.GoogleCredentialsProvider; +import com.google.api.gax.core.InstantiatingExecutorProvider; +import com.google.api.gax.grpc.GaxGrpcProperties; +import com.google.api.gax.grpc.GrpcTransportChannel; +import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; +import com.google.api.gax.grpc.ProtoOperationTransformers; +import com.google.api.gax.longrunning.OperationSnapshot; +import com.google.api.gax.longrunning.OperationTimedPollAlgorithm; +import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.ApiCallContext; +import com.google.api.gax.rpc.ApiClientHeaderProvider; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.OperationCallSettings; +import com.google.api.gax.rpc.PageContext; +import com.google.api.gax.rpc.PagedCallSettings; +import com.google.api.gax.rpc.PagedListDescriptor; +import com.google.api.gax.rpc.PagedListResponseFactory; +import com.google.api.gax.rpc.StatusCode; +import com.google.api.gax.rpc.StubSettings; +import com.google.api.gax.rpc.TransportChannelProvider; +import com.google.api.gax.rpc.UnaryCallSettings; +import com.google.api.gax.rpc.UnaryCallable; +import com.google.cloud.redis.v1beta1.CreateInstanceRequest; +import com.google.cloud.redis.v1beta1.DeleteInstanceRequest; +import com.google.cloud.redis.v1beta1.GetInstanceRequest; +import com.google.cloud.redis.v1beta1.Instance; +import com.google.cloud.redis.v1beta1.ListInstancesRequest; +import com.google.cloud.redis.v1beta1.ListInstancesResponse; +import com.google.cloud.redis.v1beta1.UpdateInstanceRequest; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.longrunning.Operation; +import com.google.protobuf.Any; +import com.google.protobuf.Empty; +import java.io.IOException; +import java.util.List; +import javax.annotation.Generated; +import org.threeten.bp.Duration; + +// AUTO-GENERATED DOCUMENTATION AND CLASS +/** + * Settings class to configure an instance of {@link CloudRedisStub}. + * + *

The default instance has everything set to sensible defaults: + * + *

    + *
  • The default service address (redis.googleapis.com) and default port (443) are used. + *
  • Credentials are acquired automatically through Application Default Credentials. + *
  • Retries are configured for idempotent methods but not for non-idempotent methods. + *
+ * + *

The builder of this class is recursive, so contained classes are themselves builders. When + * build() is called, the tree of builders is called to create the complete settings object. For + * example, to set the total timeout of getInstance to 30 seconds: + * + * 

+ * 
+ * CloudRedisStubSettings.Builder cloudRedisSettingsBuilder =
+ *     CloudRedisStubSettings.newBuilder();
+ * cloudRedisSettingsBuilder.getInstanceSettings().getRetrySettings().toBuilder()
+ *     .setTotalTimeout(Duration.ofSeconds(30));
+ * CloudRedisStubSettings cloudRedisSettings = cloudRedisSettingsBuilder.build();
+ * 
+ *
+ */ +@Generated("by gapic-generator") +@BetaApi +public class CloudRedisStubSettings extends StubSettings { + /** The default scopes of the service. */ + private static final ImmutableList DEFAULT_SERVICE_SCOPES = + ImmutableList.builder().add("https://www.googleapis.com/auth/cloud-platform").build(); + + private final PagedCallSettings< + ListInstancesRequest, ListInstancesResponse, ListInstancesPagedResponse> + listInstancesSettings; + private final UnaryCallSettings getInstanceSettings; + private final UnaryCallSettings createInstanceSettings; + private final OperationCallSettings + createInstanceOperationSettings; + private final UnaryCallSettings updateInstanceSettings; + private final OperationCallSettings + updateInstanceOperationSettings; + private final UnaryCallSettings deleteInstanceSettings; + private final OperationCallSettings + deleteInstanceOperationSettings; + + /** Returns the object with the settings used for calls to listInstances. */ + public PagedCallSettings + listInstancesSettings() { + return listInstancesSettings; + } + + /** Returns the object with the settings used for calls to getInstance. */ + public UnaryCallSettings getInstanceSettings() { + return getInstanceSettings; + } + + /** Returns the object with the settings used for calls to createInstance. */ + public UnaryCallSettings createInstanceSettings() { + return createInstanceSettings; + } + + /** Returns the object with the settings used for calls to createInstance. */ + public OperationCallSettings + createInstanceOperationSettings() { + return createInstanceOperationSettings; + } + + /** Returns the object with the settings used for calls to updateInstance. */ + public UnaryCallSettings updateInstanceSettings() { + return updateInstanceSettings; + } + + /** Returns the object with the settings used for calls to updateInstance. */ + public OperationCallSettings + updateInstanceOperationSettings() { + return updateInstanceOperationSettings; + } + + /** Returns the object with the settings used for calls to deleteInstance. */ + public UnaryCallSettings deleteInstanceSettings() { + return deleteInstanceSettings; + } + + /** Returns the object with the settings used for calls to deleteInstance. */ + public OperationCallSettings + deleteInstanceOperationSettings() { + return deleteInstanceOperationSettings; + } + + @BetaApi("A restructuring of stub classes is planned, so this may break in the future") + public CloudRedisStub createStub() throws IOException { + if (getTransportChannelProvider() + .getTransportName() + .equals(GrpcTransportChannel.getGrpcTransportName())) { + return GrpcCloudRedisStub.create(this); + } else { + throw new UnsupportedOperationException( + "Transport not supported: " + getTransportChannelProvider().getTransportName()); + } + } + + /** Returns a builder for the default ExecutorProvider for this service. */ + public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() { + return InstantiatingExecutorProvider.newBuilder(); + } + + /** Returns the default service endpoint. */ + public static String getDefaultEndpoint() { + return "redis.googleapis.com:443"; + } + + /** Returns the default service scopes. */ + public static List getDefaultServiceScopes() { + return DEFAULT_SERVICE_SCOPES; + } + + /** Returns a builder for the default credentials for this service. */ + public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { + return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + } + + /** Returns a builder for the default ChannelProvider for this service. */ + public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() { + return InstantiatingGrpcChannelProvider.newBuilder(); + } + + public static TransportChannelProvider defaultTransportChannelProvider() { + return defaultGrpcTransportProviderBuilder().build(); + } + + @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") + public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() { + return ApiClientHeaderProvider.newBuilder() + .setGeneratedLibToken( + "gapic", GaxProperties.getLibraryVersion(CloudRedisStubSettings.class)) + .setTransportToken( + GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion()); + } + + /** Returns a new builder for this class. */ + public static Builder newBuilder() { + return Builder.createDefault(); + } + + /** Returns a new builder for this class. */ + public static Builder newBuilder(ClientContext clientContext) { + return new Builder(clientContext); + } + + /** Returns a builder containing all the values of this settings class. */ + public Builder toBuilder() { + return new Builder(this); + } + + protected CloudRedisStubSettings(Builder settingsBuilder) throws IOException { + super(settingsBuilder); + + listInstancesSettings = settingsBuilder.listInstancesSettings().build(); + getInstanceSettings = settingsBuilder.getInstanceSettings().build(); + createInstanceSettings = settingsBuilder.createInstanceSettings().build(); + createInstanceOperationSettings = settingsBuilder.createInstanceOperationSettings().build(); + updateInstanceSettings = settingsBuilder.updateInstanceSettings().build(); + updateInstanceOperationSettings = settingsBuilder.updateInstanceOperationSettings().build(); + deleteInstanceSettings = settingsBuilder.deleteInstanceSettings().build(); + deleteInstanceOperationSettings = settingsBuilder.deleteInstanceOperationSettings().build(); + } + + private static final PagedListDescriptor + LIST_INSTANCES_PAGE_STR_DESC = + new PagedListDescriptor() { + @Override + public String emptyToken() { + return ""; + } + + @Override + public ListInstancesRequest injectToken(ListInstancesRequest payload, String token) { + return ListInstancesRequest.newBuilder(payload).setPageToken(token).build(); + } + + @Override + public ListInstancesRequest injectPageSize(ListInstancesRequest payload, int pageSize) { + return ListInstancesRequest.newBuilder(payload).setPageSize(pageSize).build(); + } + + @Override + public Integer extractPageSize(ListInstancesRequest payload) { + return payload.getPageSize(); + } + + @Override + public String extractNextToken(ListInstancesResponse payload) { + return payload.getNextPageToken(); + } + + @Override + public Iterable extractResources(ListInstancesResponse payload) { + return payload.getInstancesList(); + } + }; + + private static final PagedListResponseFactory< + ListInstancesRequest, ListInstancesResponse, ListInstancesPagedResponse> + LIST_INSTANCES_PAGE_STR_FACT = + new PagedListResponseFactory< + ListInstancesRequest, ListInstancesResponse, ListInstancesPagedResponse>() { + @Override + public ApiFuture getFuturePagedResponse( + UnaryCallable callable, + ListInstancesRequest request, + ApiCallContext context, + ApiFuture futureResponse) { + PageContext pageContext = + PageContext.create(callable, LIST_INSTANCES_PAGE_STR_DESC, request, context); + return ListInstancesPagedResponse.createAsync(pageContext, futureResponse); + } + }; + + /** Builder for CloudRedisStubSettings. */ + public static class Builder extends StubSettings.Builder { + private final ImmutableList> unaryMethodSettingsBuilders; + + private final PagedCallSettings.Builder< + ListInstancesRequest, ListInstancesResponse, ListInstancesPagedResponse> + listInstancesSettings; + private final UnaryCallSettings.Builder getInstanceSettings; + private final UnaryCallSettings.Builder + createInstanceSettings; + private final OperationCallSettings.Builder + createInstanceOperationSettings; + private final UnaryCallSettings.Builder + updateInstanceSettings; + private final OperationCallSettings.Builder + updateInstanceOperationSettings; + private final UnaryCallSettings.Builder + deleteInstanceSettings; + private final OperationCallSettings.Builder + deleteInstanceOperationSettings; + + private static final ImmutableMap> + RETRYABLE_CODE_DEFINITIONS; + + static { + ImmutableMap.Builder> definitions = + ImmutableMap.builder(); + definitions.put( + "idempotent", + ImmutableSet.copyOf( + Lists.newArrayList( + StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE))); + definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList())); + RETRYABLE_CODE_DEFINITIONS = definitions.build(); + } + + private static final ImmutableMap RETRY_PARAM_DEFINITIONS; + + static { + ImmutableMap.Builder definitions = ImmutableMap.builder(); + RetrySettings settings = null; + settings = + RetrySettings.newBuilder() + .setInitialRetryDelay(Duration.ofMillis(100L)) + .setRetryDelayMultiplier(1.3) + .setMaxRetryDelay(Duration.ofMillis(60000L)) + .setInitialRpcTimeout(Duration.ofMillis(20000L)) + .setRpcTimeoutMultiplier(1.0) + .setMaxRpcTimeout(Duration.ofMillis(20000L)) + .setTotalTimeout(Duration.ofMillis(600000L)) + .build(); + definitions.put("default", settings); + RETRY_PARAM_DEFINITIONS = definitions.build(); + } + + protected Builder() { + this((ClientContext) null); + } + + protected Builder(ClientContext clientContext) { + super(clientContext); + + listInstancesSettings = PagedCallSettings.newBuilder(LIST_INSTANCES_PAGE_STR_FACT); + + getInstanceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + + createInstanceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + + createInstanceOperationSettings = OperationCallSettings.newBuilder(); + + updateInstanceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + + updateInstanceOperationSettings = OperationCallSettings.newBuilder(); + + deleteInstanceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder(); + + deleteInstanceOperationSettings = OperationCallSettings.newBuilder(); + + unaryMethodSettingsBuilders = + ImmutableList.>of( + listInstancesSettings, + getInstanceSettings, + createInstanceSettings, + updateInstanceSettings, + deleteInstanceSettings); + + initDefaults(this); + } + + private static Builder createDefault() { + Builder builder = new Builder((ClientContext) null); + builder.setTransportChannelProvider(defaultTransportChannelProvider()); + builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); + builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); + builder.setEndpoint(getDefaultEndpoint()); + return initDefaults(builder); + } + + private static Builder initDefaults(Builder builder) { + + builder + .listInstancesSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + + builder + .getInstanceSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + + builder + .createInstanceSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + + builder + .updateInstanceSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + + builder + .deleteInstanceSettings() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")); + builder + .createInstanceOperationSettings() + .setInitialCallSettings( + UnaryCallSettings + .newUnaryCallSettingsBuilder() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")) + .build()) + .setResponseTransformer( + ProtoOperationTransformers.ResponseTransformer.create(Instance.class)) + .setMetadataTransformer(ProtoOperationTransformers.MetadataTransformer.create(Any.class)) + .setPollingAlgorithm( + OperationTimedPollAlgorithm.create( + RetrySettings.newBuilder() + .setInitialRetryDelay(Duration.ofMillis(60000L)) + .setRetryDelayMultiplier(1.5) + .setMaxRetryDelay(Duration.ofMillis(360000L)) + .setInitialRpcTimeout(Duration.ZERO) // ignored + .setRpcTimeoutMultiplier(1.0) // ignored + .setMaxRpcTimeout(Duration.ZERO) // ignored + .setTotalTimeout(Duration.ofMillis(1200000L)) + .build())); + builder + .updateInstanceOperationSettings() + .setInitialCallSettings( + UnaryCallSettings + .newUnaryCallSettingsBuilder() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")) + .build()) + .setResponseTransformer( + ProtoOperationTransformers.ResponseTransformer.create(Instance.class)) + .setMetadataTransformer(ProtoOperationTransformers.MetadataTransformer.create(Any.class)) + .setPollingAlgorithm( + OperationTimedPollAlgorithm.create( + RetrySettings.newBuilder() + .setInitialRetryDelay(Duration.ofMillis(60000L)) + .setRetryDelayMultiplier(1.5) + .setMaxRetryDelay(Duration.ofMillis(360000L)) + .setInitialRpcTimeout(Duration.ZERO) // ignored + .setRpcTimeoutMultiplier(1.0) // ignored + .setMaxRpcTimeout(Duration.ZERO) // ignored + .setTotalTimeout(Duration.ofMillis(1200000L)) + .build())); + builder + .deleteInstanceOperationSettings() + .setInitialCallSettings( + UnaryCallSettings + .newUnaryCallSettingsBuilder() + .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent")) + .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default")) + .build()) + .setResponseTransformer( + ProtoOperationTransformers.ResponseTransformer.create(Empty.class)) + .setMetadataTransformer(ProtoOperationTransformers.MetadataTransformer.create(Any.class)) + .setPollingAlgorithm( + OperationTimedPollAlgorithm.create( + RetrySettings.newBuilder() + .setInitialRetryDelay(Duration.ofMillis(60000L)) + .setRetryDelayMultiplier(1.5) + .setMaxRetryDelay(Duration.ofMillis(360000L)) + .setInitialRpcTimeout(Duration.ZERO) // ignored + .setRpcTimeoutMultiplier(1.0) // ignored + .setMaxRpcTimeout(Duration.ZERO) // ignored + .setTotalTimeout(Duration.ofMillis(1200000L)) + .build())); + + return builder; + } + + protected Builder(CloudRedisStubSettings settings) { + super(settings); + + listInstancesSettings = settings.listInstancesSettings.toBuilder(); + getInstanceSettings = settings.getInstanceSettings.toBuilder(); + createInstanceSettings = settings.createInstanceSettings.toBuilder(); + createInstanceOperationSettings = settings.createInstanceOperationSettings.toBuilder(); + updateInstanceSettings = settings.updateInstanceSettings.toBuilder(); + updateInstanceOperationSettings = settings.updateInstanceOperationSettings.toBuilder(); + deleteInstanceSettings = settings.deleteInstanceSettings.toBuilder(); + deleteInstanceOperationSettings = settings.deleteInstanceOperationSettings.toBuilder(); + + unaryMethodSettingsBuilders = + ImmutableList.>of( + listInstancesSettings, + getInstanceSettings, + createInstanceSettings, + updateInstanceSettings, + deleteInstanceSettings); + } + + // NEXT_MAJOR_VER: remove 'throws Exception' + /** + * Applies the given settings updater function to all of the unary API methods in this service. + * + *

Note: This method does not support applying settings to streaming methods. + */ + public Builder applyToAllUnaryMethods( + ApiFunction, Void> settingsUpdater) throws Exception { + super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); + return this; + } + + public ImmutableList> unaryMethodSettingsBuilders() { + return unaryMethodSettingsBuilders; + } + + /** Returns the builder for the settings used for calls to listInstances. */ + public PagedCallSettings.Builder< + ListInstancesRequest, ListInstancesResponse, ListInstancesPagedResponse> + listInstancesSettings() { + return listInstancesSettings; + } + + /** Returns the builder for the settings used for calls to getInstance. */ + public UnaryCallSettings.Builder getInstanceSettings() { + return getInstanceSettings; + } + + /** Returns the builder for the settings used for calls to createInstance. */ + public UnaryCallSettings.Builder createInstanceSettings() { + return createInstanceSettings; + } + + /** Returns the builder for the settings used for calls to createInstance. */ + public OperationCallSettings.Builder + createInstanceOperationSettings() { + return createInstanceOperationSettings; + } + + /** Returns the builder for the settings used for calls to updateInstance. */ + public UnaryCallSettings.Builder updateInstanceSettings() { + return updateInstanceSettings; + } + + /** Returns the builder for the settings used for calls to updateInstance. */ + public OperationCallSettings.Builder + updateInstanceOperationSettings() { + return updateInstanceOperationSettings; + } + + /** Returns the builder for the settings used for calls to deleteInstance. */ + public UnaryCallSettings.Builder deleteInstanceSettings() { + return deleteInstanceSettings; + } + + /** Returns the builder for the settings used for calls to deleteInstance. */ + public OperationCallSettings.Builder + deleteInstanceOperationSettings() { + return deleteInstanceOperationSettings; + } + + @Override + public CloudRedisStubSettings build() throws IOException { + return new CloudRedisStubSettings(this); + } + } +} diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java new file mode 100644 index 000000000000..0e35704c894a --- /dev/null +++ b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java @@ -0,0 +1,114 @@ +/* + * Copyright 2018 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ +package com.google.cloud.redis.v1beta1.stub; + +import com.google.api.core.BetaApi; +import com.google.api.gax.grpc.GrpcCallSettings; +import com.google.api.gax.grpc.GrpcCallableFactory; +import com.google.api.gax.grpc.GrpcStubCallableFactory; +import com.google.api.gax.rpc.BatchingCallSettings; +import com.google.api.gax.rpc.BidiStreamingCallable; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.ClientStreamingCallable; +import com.google.api.gax.rpc.OperationCallSettings; +import com.google.api.gax.rpc.OperationCallable; +import com.google.api.gax.rpc.PagedCallSettings; +import com.google.api.gax.rpc.ServerStreamingCallSettings; +import com.google.api.gax.rpc.ServerStreamingCallable; +import com.google.api.gax.rpc.StreamingCallSettings; +import com.google.api.gax.rpc.UnaryCallSettings; +import com.google.api.gax.rpc.UnaryCallable; +import com.google.longrunning.Operation; +import com.google.longrunning.stub.OperationsStub; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS +/** + * gRPC callable factory implementation for Google Cloud Memorystore for Redis API. + * + *

This class is for advanced usage. + */ +@Generated("by gapic-generator") +@BetaApi("The surface for use by generated code is not stable yet and may change in the future.") +public class GrpcCloudRedisCallableFactory implements GrpcStubCallableFactory { + @Override + public UnaryCallable createUnaryCallable( + GrpcCallSettings grpcCallSettings, + UnaryCallSettings callSettings, + ClientContext clientContext) { + return GrpcCallableFactory.createUnaryCallable(grpcCallSettings, callSettings, clientContext); + } + + @Override + public + UnaryCallable createPagedCallable( + GrpcCallSettings grpcCallSettings, + PagedCallSettings pagedCallSettings, + ClientContext clientContext) { + return GrpcCallableFactory.createPagedCallable( + grpcCallSettings, pagedCallSettings, clientContext); + } + + @Override + public UnaryCallable createBatchingCallable( + GrpcCallSettings grpcCallSettings, + BatchingCallSettings batchingCallSettings, + ClientContext clientContext) { + return GrpcCallableFactory.createBatchingCallable( + grpcCallSettings, batchingCallSettings, clientContext); + } + + @Override + public + OperationCallable createOperationCallable( + GrpcCallSettings grpcCallSettings, + OperationCallSettings operationCallSettings, + ClientContext clientContext, + OperationsStub operationsStub) { + return GrpcCallableFactory.createOperationCallable( + grpcCallSettings, operationCallSettings, clientContext, operationsStub); + } + + @Override + public + BidiStreamingCallable createBidiStreamingCallable( + GrpcCallSettings grpcCallSettings, + StreamingCallSettings streamingCallSettings, + ClientContext clientContext) { + return GrpcCallableFactory.createBidiStreamingCallable( + grpcCallSettings, streamingCallSettings, clientContext); + } + + @Override + public + ServerStreamingCallable createServerStreamingCallable( + GrpcCallSettings grpcCallSettings, + ServerStreamingCallSettings streamingCallSettings, + ClientContext clientContext) { + return GrpcCallableFactory.createServerStreamingCallable( + grpcCallSettings, streamingCallSettings, clientContext); + } + + @Override + public + ClientStreamingCallable createClientStreamingCallable( + GrpcCallSettings grpcCallSettings, + StreamingCallSettings streamingCallSettings, + ClientContext clientContext) { + return GrpcCallableFactory.createClientStreamingCallable( + grpcCallSettings, streamingCallSettings, clientContext); + } +} diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java new file mode 100644 index 000000000000..37e23a4e5990 --- /dev/null +++ b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java @@ -0,0 +1,288 @@ +/* + * Copyright 2018 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ +package com.google.cloud.redis.v1beta1.stub; + +import static com.google.cloud.redis.v1beta1.CloudRedisClient.ListInstancesPagedResponse; + +import com.google.api.core.BetaApi; +import com.google.api.gax.core.BackgroundResource; +import com.google.api.gax.core.BackgroundResourceAggregation; +import com.google.api.gax.grpc.GrpcCallSettings; +import com.google.api.gax.grpc.GrpcStubCallableFactory; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.OperationCallable; +import com.google.api.gax.rpc.UnaryCallable; +import com.google.cloud.redis.v1beta1.CreateInstanceRequest; +import com.google.cloud.redis.v1beta1.DeleteInstanceRequest; +import com.google.cloud.redis.v1beta1.GetInstanceRequest; +import com.google.cloud.redis.v1beta1.Instance; +import com.google.cloud.redis.v1beta1.ListInstancesRequest; +import com.google.cloud.redis.v1beta1.ListInstancesResponse; +import com.google.cloud.redis.v1beta1.UpdateInstanceRequest; +import com.google.longrunning.Operation; +import com.google.longrunning.stub.GrpcOperationsStub; +import com.google.protobuf.Any; +import com.google.protobuf.Empty; +import io.grpc.MethodDescriptor; +import io.grpc.protobuf.ProtoUtils; +import java.io.IOException; +import java.util.concurrent.TimeUnit; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS +/** + * gRPC stub implementation for Google Cloud Memorystore for Redis API. + * + *

This class is for advanced usage and reflects the underlying API directly. + */ +@Generated("by gapic-generator") +@BetaApi("A restructuring of stub classes is planned, so this may break in the future") +public class GrpcCloudRedisStub extends CloudRedisStub { + + private static final MethodDescriptor + listInstancesMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.cloud.redis.v1beta1.CloudRedis/ListInstances") + .setRequestMarshaller( + ProtoUtils.marshaller(ListInstancesRequest.getDefaultInstance())) + .setResponseMarshaller( + ProtoUtils.marshaller(ListInstancesResponse.getDefaultInstance())) + .build(); + private static final MethodDescriptor getInstanceMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.cloud.redis.v1beta1.CloudRedis/GetInstance") + .setRequestMarshaller(ProtoUtils.marshaller(GetInstanceRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(Instance.getDefaultInstance())) + .build(); + private static final MethodDescriptor + createInstanceMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.cloud.redis.v1beta1.CloudRedis/CreateInstance") + .setRequestMarshaller( + ProtoUtils.marshaller(CreateInstanceRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .build(); + private static final MethodDescriptor + updateInstanceMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.cloud.redis.v1beta1.CloudRedis/UpdateInstance") + .setRequestMarshaller( + ProtoUtils.marshaller(UpdateInstanceRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .build(); + private static final MethodDescriptor + deleteInstanceMethodDescriptor = + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.cloud.redis.v1beta1.CloudRedis/DeleteInstance") + .setRequestMarshaller( + ProtoUtils.marshaller(DeleteInstanceRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .build(); + + private final BackgroundResource backgroundResources; + private final GrpcOperationsStub operationsStub; + + private final UnaryCallable listInstancesCallable; + private final UnaryCallable + listInstancesPagedCallable; + private final UnaryCallable getInstanceCallable; + private final UnaryCallable createInstanceCallable; + private final OperationCallable + createInstanceOperationCallable; + private final UnaryCallable updateInstanceCallable; + private final OperationCallable + updateInstanceOperationCallable; + private final UnaryCallable deleteInstanceCallable; + private final OperationCallable + deleteInstanceOperationCallable; + + private final GrpcStubCallableFactory callableFactory; + + public static final GrpcCloudRedisStub create(CloudRedisStubSettings settings) + throws IOException { + return new GrpcCloudRedisStub(settings, ClientContext.create(settings)); + } + + public static final GrpcCloudRedisStub create(ClientContext clientContext) throws IOException { + return new GrpcCloudRedisStub(CloudRedisStubSettings.newBuilder().build(), clientContext); + } + + public static final GrpcCloudRedisStub create( + ClientContext clientContext, GrpcStubCallableFactory callableFactory) throws IOException { + return new GrpcCloudRedisStub( + CloudRedisStubSettings.newBuilder().build(), clientContext, callableFactory); + } + + /** + * Constructs an instance of GrpcCloudRedisStub, using the given settings. This is protected so + * that it is easy to make a subclass, but otherwise, the static factory methods should be + * preferred. + */ + protected GrpcCloudRedisStub(CloudRedisStubSettings settings, ClientContext clientContext) + throws IOException { + this(settings, clientContext, new GrpcCloudRedisCallableFactory()); + } + + /** + * Constructs an instance of GrpcCloudRedisStub, using the given settings. This is protected so + * that it is easy to make a subclass, but otherwise, the static factory methods should be + * preferred. + */ + protected GrpcCloudRedisStub( + CloudRedisStubSettings settings, + ClientContext clientContext, + GrpcStubCallableFactory callableFactory) + throws IOException { + this.callableFactory = callableFactory; + this.operationsStub = GrpcOperationsStub.create(clientContext, callableFactory); + + GrpcCallSettings listInstancesTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(listInstancesMethodDescriptor) + .build(); + GrpcCallSettings getInstanceTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(getInstanceMethodDescriptor) + .build(); + GrpcCallSettings createInstanceTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(createInstanceMethodDescriptor) + .build(); + GrpcCallSettings updateInstanceTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(updateInstanceMethodDescriptor) + .build(); + GrpcCallSettings deleteInstanceTransportSettings = + GrpcCallSettings.newBuilder() + .setMethodDescriptor(deleteInstanceMethodDescriptor) + .build(); + + this.listInstancesCallable = + callableFactory.createUnaryCallable( + listInstancesTransportSettings, settings.listInstancesSettings(), clientContext); + this.listInstancesPagedCallable = + callableFactory.createPagedCallable( + listInstancesTransportSettings, settings.listInstancesSettings(), clientContext); + this.getInstanceCallable = + callableFactory.createUnaryCallable( + getInstanceTransportSettings, settings.getInstanceSettings(), clientContext); + this.createInstanceCallable = + callableFactory.createUnaryCallable( + createInstanceTransportSettings, settings.createInstanceSettings(), clientContext); + this.createInstanceOperationCallable = + callableFactory.createOperationCallable( + createInstanceTransportSettings, + settings.createInstanceOperationSettings(), + clientContext, + this.operationsStub); + this.updateInstanceCallable = + callableFactory.createUnaryCallable( + updateInstanceTransportSettings, settings.updateInstanceSettings(), clientContext); + this.updateInstanceOperationCallable = + callableFactory.createOperationCallable( + updateInstanceTransportSettings, + settings.updateInstanceOperationSettings(), + clientContext, + this.operationsStub); + this.deleteInstanceCallable = + callableFactory.createUnaryCallable( + deleteInstanceTransportSettings, settings.deleteInstanceSettings(), clientContext); + this.deleteInstanceOperationCallable = + callableFactory.createOperationCallable( + deleteInstanceTransportSettings, + settings.deleteInstanceOperationSettings(), + clientContext, + this.operationsStub); + + backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources()); + } + + public GrpcOperationsStub getOperationsStub() { + return operationsStub; + } + + public UnaryCallable + listInstancesPagedCallable() { + return listInstancesPagedCallable; + } + + public UnaryCallable listInstancesCallable() { + return listInstancesCallable; + } + + public UnaryCallable getInstanceCallable() { + return getInstanceCallable; + } + + public OperationCallable createInstanceOperationCallable() { + return createInstanceOperationCallable; + } + + public UnaryCallable createInstanceCallable() { + return createInstanceCallable; + } + + public OperationCallable updateInstanceOperationCallable() { + return updateInstanceOperationCallable; + } + + public UnaryCallable updateInstanceCallable() { + return updateInstanceCallable; + } + + public OperationCallable deleteInstanceOperationCallable() { + return deleteInstanceOperationCallable; + } + + public UnaryCallable deleteInstanceCallable() { + return deleteInstanceCallable; + } + + @Override + public final void close() { + shutdown(); + } + + @Override + public void shutdown() { + backgroundResources.shutdown(); + } + + @Override + public boolean isShutdown() { + return backgroundResources.isShutdown(); + } + + @Override + public boolean isTerminated() { + return backgroundResources.isTerminated(); + } + + @Override + public void shutdownNow() { + backgroundResources.shutdownNow(); + } + + @Override + public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException { + return backgroundResources.awaitTermination(duration, unit); + } +} diff --git a/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java b/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java new file mode 100644 index 000000000000..29c1bd58e2bb --- /dev/null +++ b/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java @@ -0,0 +1,411 @@ +/* + * Copyright 2018 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ +package com.google.cloud.redis.v1beta1; + +import static com.google.cloud.redis.v1beta1.CloudRedisClient.ListInstancesPagedResponse; + +import com.google.api.gax.core.NoCredentialsProvider; +import com.google.api.gax.grpc.GaxGrpcProperties; +import com.google.api.gax.grpc.testing.LocalChannelProvider; +import com.google.api.gax.grpc.testing.MockGrpcService; +import com.google.api.gax.grpc.testing.MockServiceHelper; +import com.google.api.gax.rpc.ApiClientHeaderProvider; +import com.google.api.gax.rpc.InvalidArgumentException; +import com.google.api.gax.rpc.StatusCode; +import com.google.cloud.redis.v1beta1.Instance.Tier; +import com.google.common.collect.Lists; +import com.google.longrunning.Operation; +import com.google.protobuf.Any; +import com.google.protobuf.Empty; +import com.google.protobuf.FieldMask; +import com.google.protobuf.GeneratedMessageV3; +import io.grpc.Status; +import io.grpc.StatusRuntimeException; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.ExecutionException; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +@javax.annotation.Generated("by GAPIC") +public class CloudRedisClientTest { + private static MockCloudRedis mockCloudRedis; + private static MockServiceHelper serviceHelper; + private CloudRedisClient client; + private LocalChannelProvider channelProvider; + + @BeforeClass + public static void startStaticServer() { + mockCloudRedis = new MockCloudRedis(); + serviceHelper = + new MockServiceHelper("in-process-1", Arrays.asList(mockCloudRedis)); + serviceHelper.start(); + } + + @AfterClass + public static void stopServer() { + serviceHelper.stop(); + } + + @Before + public void setUp() throws IOException { + serviceHelper.reset(); + channelProvider = serviceHelper.createChannelProvider(); + CloudRedisSettings settings = + CloudRedisSettings.newBuilder() + .setTransportChannelProvider(channelProvider) + .setCredentialsProvider(NoCredentialsProvider.create()) + .build(); + client = CloudRedisClient.create(settings); + } + + @After + public void tearDown() throws Exception { + client.close(); + } + + @Test + @SuppressWarnings("all") + public void listInstancesTest() { + String nextPageToken = ""; + Instance instancesElement = Instance.newBuilder().build(); + List instances = Arrays.asList(instancesElement); + ListInstancesResponse expectedResponse = + ListInstancesResponse.newBuilder() + .setNextPageToken(nextPageToken) + .addAllInstances(instances) + .build(); + mockCloudRedis.addResponse(expectedResponse); + + LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]"); + + ListInstancesPagedResponse pagedListResponse = client.listInstances(parent); + + List resources = Lists.newArrayList(pagedListResponse.iterateAll()); + Assert.assertEquals(1, resources.size()); + Assert.assertEquals(expectedResponse.getInstancesList().get(0), resources.get(0)); + + List actualRequests = mockCloudRedis.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + ListInstancesRequest actualRequest = (ListInstancesRequest) actualRequests.get(0); + + Assert.assertEquals(parent, LocationName.parse(actualRequest.getParent())); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void listInstancesExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockCloudRedis.addException(exception); + + try { + LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]"); + + client.listInstances(parent); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } + + @Test + @SuppressWarnings("all") + public void getInstanceTest() { + String name2 = "name2-1052831874"; + String displayName = "displayName1615086568"; + String locationId = "locationId552319461"; + String alternativeLocationId = "alternativeLocationId-718920621"; + String redisVersion = "redisVersion-685310444"; + String reservedIpRange = "reservedIpRange-1082940580"; + String host = "host3208616"; + int port = 3446913; + String currentLocationId = "currentLocationId1312712735"; + String statusMessage = "statusMessage-239442758"; + int memorySizeGb = 34199707; + String authorizedNetwork = "authorizedNetwork-1733809270"; + Instance expectedResponse = + Instance.newBuilder() + .setName(name2) + .setDisplayName(displayName) + .setLocationId(locationId) + .setAlternativeLocationId(alternativeLocationId) + .setRedisVersion(redisVersion) + .setReservedIpRange(reservedIpRange) + .setHost(host) + .setPort(port) + .setCurrentLocationId(currentLocationId) + .setStatusMessage(statusMessage) + .setMemorySizeGb(memorySizeGb) + .setAuthorizedNetwork(authorizedNetwork) + .build(); + mockCloudRedis.addResponse(expectedResponse); + + InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]"); + + Instance actualResponse = client.getInstance(name); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockCloudRedis.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + GetInstanceRequest actualRequest = (GetInstanceRequest) actualRequests.get(0); + + Assert.assertEquals(name, InstanceName.parse(actualRequest.getName())); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void getInstanceExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockCloudRedis.addException(exception); + + try { + InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]"); + + client.getInstance(name); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } + + @Test + @SuppressWarnings("all") + public void createInstanceTest() throws Exception { + String name = "name3373707"; + String displayName = "displayName1615086568"; + String locationId = "locationId552319461"; + String alternativeLocationId = "alternativeLocationId-718920621"; + String redisVersion = "redisVersion-685310444"; + String reservedIpRange = "reservedIpRange-1082940580"; + String host = "host3208616"; + int port = 3446913; + String currentLocationId = "currentLocationId1312712735"; + String statusMessage = "statusMessage-239442758"; + int memorySizeGb2 = 1493816946; + String authorizedNetwork = "authorizedNetwork-1733809270"; + Instance expectedResponse = + Instance.newBuilder() + .setName(name) + .setDisplayName(displayName) + .setLocationId(locationId) + .setAlternativeLocationId(alternativeLocationId) + .setRedisVersion(redisVersion) + .setReservedIpRange(reservedIpRange) + .setHost(host) + .setPort(port) + .setCurrentLocationId(currentLocationId) + .setStatusMessage(statusMessage) + .setMemorySizeGb(memorySizeGb2) + .setAuthorizedNetwork(authorizedNetwork) + .build(); + Operation resultOperation = + Operation.newBuilder() + .setName("createInstanceTest") + .setDone(true) + .setResponse(Any.pack(expectedResponse)) + .build(); + mockCloudRedis.addResponse(resultOperation); + + LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]"); + String instanceId = "test_instance"; + Instance.Tier tier = Instance.Tier.BASIC; + int memorySizeGb = 1; + Instance instance = Instance.newBuilder().setTier(tier).setMemorySizeGb(memorySizeGb).build(); + + Instance actualResponse = client.createInstanceAsync(parent, instanceId, instance).get(); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockCloudRedis.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + CreateInstanceRequest actualRequest = (CreateInstanceRequest) actualRequests.get(0); + + Assert.assertEquals(parent, LocationName.parse(actualRequest.getParent())); + Assert.assertEquals(instanceId, actualRequest.getInstanceId()); + Assert.assertEquals(instance, actualRequest.getInstance()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void createInstanceExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockCloudRedis.addException(exception); + + try { + LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]"); + String instanceId = "test_instance"; + Instance.Tier tier = Instance.Tier.BASIC; + int memorySizeGb = 1; + Instance instance = Instance.newBuilder().setTier(tier).setMemorySizeGb(memorySizeGb).build(); + + client.createInstanceAsync(parent, instanceId, instance).get(); + Assert.fail("No exception raised"); + } catch (ExecutionException e) { + Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass()); + InvalidArgumentException apiException = (InvalidArgumentException) e.getCause(); + Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode()); + } + } + + @Test + @SuppressWarnings("all") + public void updateInstanceTest() throws Exception { + String name = "name3373707"; + String displayName2 = "displayName21615000987"; + String locationId = "locationId552319461"; + String alternativeLocationId = "alternativeLocationId-718920621"; + String redisVersion = "redisVersion-685310444"; + String reservedIpRange = "reservedIpRange-1082940580"; + String host = "host3208616"; + int port = 3446913; + String currentLocationId = "currentLocationId1312712735"; + String statusMessage = "statusMessage-239442758"; + int memorySizeGb2 = 1493816946; + String authorizedNetwork = "authorizedNetwork-1733809270"; + Instance expectedResponse = + Instance.newBuilder() + .setName(name) + .setDisplayName(displayName2) + .setLocationId(locationId) + .setAlternativeLocationId(alternativeLocationId) + .setRedisVersion(redisVersion) + .setReservedIpRange(reservedIpRange) + .setHost(host) + .setPort(port) + .setCurrentLocationId(currentLocationId) + .setStatusMessage(statusMessage) + .setMemorySizeGb(memorySizeGb2) + .setAuthorizedNetwork(authorizedNetwork) + .build(); + Operation resultOperation = + Operation.newBuilder() + .setName("updateInstanceTest") + .setDone(true) + .setResponse(Any.pack(expectedResponse)) + .build(); + mockCloudRedis.addResponse(resultOperation); + + String pathsElement = "display_name"; + String pathsElement2 = "memory_size_gb"; + List paths = Arrays.asList(pathsElement, pathsElement2); + FieldMask updateMask = FieldMask.newBuilder().addAllPaths(paths).build(); + String displayName = "UpdatedDisplayName"; + int memorySizeGb = 4; + Instance instance = + Instance.newBuilder().setDisplayName(displayName).setMemorySizeGb(memorySizeGb).build(); + + Instance actualResponse = client.updateInstanceAsync(updateMask, instance).get(); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockCloudRedis.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + UpdateInstanceRequest actualRequest = (UpdateInstanceRequest) actualRequests.get(0); + + Assert.assertEquals(updateMask, actualRequest.getUpdateMask()); + Assert.assertEquals(instance, actualRequest.getInstance()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void updateInstanceExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockCloudRedis.addException(exception); + + try { + String pathsElement = "display_name"; + String pathsElement2 = "memory_size_gb"; + List paths = Arrays.asList(pathsElement, pathsElement2); + FieldMask updateMask = FieldMask.newBuilder().addAllPaths(paths).build(); + String displayName = "UpdatedDisplayName"; + int memorySizeGb = 4; + Instance instance = + Instance.newBuilder().setDisplayName(displayName).setMemorySizeGb(memorySizeGb).build(); + + client.updateInstanceAsync(updateMask, instance).get(); + Assert.fail("No exception raised"); + } catch (ExecutionException e) { + Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass()); + InvalidArgumentException apiException = (InvalidArgumentException) e.getCause(); + Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode()); + } + } + + @Test + @SuppressWarnings("all") + public void deleteInstanceTest() throws Exception { + Empty expectedResponse = Empty.newBuilder().build(); + Operation resultOperation = + Operation.newBuilder() + .setName("deleteInstanceTest") + .setDone(true) + .setResponse(Any.pack(expectedResponse)) + .build(); + mockCloudRedis.addResponse(resultOperation); + + InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]"); + + Empty actualResponse = client.deleteInstanceAsync(name).get(); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockCloudRedis.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + DeleteInstanceRequest actualRequest = (DeleteInstanceRequest) actualRequests.get(0); + + Assert.assertEquals(name, InstanceName.parse(actualRequest.getName())); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void deleteInstanceExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockCloudRedis.addException(exception); + + try { + InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]"); + + client.deleteInstanceAsync(name).get(); + Assert.fail("No exception raised"); + } catch (ExecutionException e) { + Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass()); + InvalidArgumentException apiException = (InvalidArgumentException) e.getCause(); + Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode()); + } + } +} diff --git a/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java b/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java new file mode 100644 index 000000000000..56635c7a71fd --- /dev/null +++ b/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java @@ -0,0 +1,57 @@ +/* + * Copyright 2018 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ +package com.google.cloud.redis.v1beta1; + +import com.google.api.core.BetaApi; +import com.google.api.gax.grpc.testing.MockGrpcService; +import com.google.protobuf.GeneratedMessageV3; +import io.grpc.ServerServiceDefinition; +import java.util.List; + +@javax.annotation.Generated("by GAPIC") +@BetaApi +public class MockCloudRedis implements MockGrpcService { + private final MockCloudRedisImpl serviceImpl; + + public MockCloudRedis() { + serviceImpl = new MockCloudRedisImpl(); + } + + @Override + public List getRequests() { + return serviceImpl.getRequests(); + } + + @Override + public void addResponse(GeneratedMessageV3 response) { + serviceImpl.addResponse(response); + } + + @Override + public void addException(Exception exception) { + serviceImpl.addException(exception); + } + + @Override + public ServerServiceDefinition getServiceDefinition() { + return serviceImpl.bindService(); + } + + @Override + public void reset() { + serviceImpl.reset(); + } +} diff --git a/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java b/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java new file mode 100644 index 000000000000..9728915a135b --- /dev/null +++ b/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java @@ -0,0 +1,133 @@ +/* + * Copyright 2018 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. + */ +package com.google.cloud.redis.v1beta1; + +import com.google.api.core.BetaApi; +import com.google.cloud.redis.v1beta1.CloudRedisGrpc.CloudRedisImplBase; +import com.google.longrunning.Operation; +import com.google.protobuf.GeneratedMessageV3; +import io.grpc.stub.StreamObserver; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Queue; + +@javax.annotation.Generated("by GAPIC") +@BetaApi +public class MockCloudRedisImpl extends CloudRedisImplBase { + private ArrayList requests; + private Queue responses; + + public MockCloudRedisImpl() { + requests = new ArrayList<>(); + responses = new LinkedList<>(); + } + + public List getRequests() { + return requests; + } + + public void addResponse(GeneratedMessageV3 response) { + responses.add(response); + } + + public void setResponses(List responses) { + this.responses = new LinkedList(responses); + } + + public void addException(Exception exception) { + responses.add(exception); + } + + public void reset() { + requests = new ArrayList<>(); + responses = new LinkedList<>(); + } + + @Override + public void listInstances( + ListInstancesRequest request, StreamObserver responseObserver) { + Object response = responses.remove(); + if (response instanceof ListInstancesResponse) { + requests.add(request); + responseObserver.onNext((ListInstancesResponse) response); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError((Exception) response); + } else { + responseObserver.onError(new IllegalArgumentException("Unrecognized response type")); + } + } + + @Override + public void getInstance(GetInstanceRequest request, StreamObserver responseObserver) { + Object response = responses.remove(); + if (response instanceof Instance) { + requests.add(request); + responseObserver.onNext((Instance) response); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError((Exception) response); + } else { + responseObserver.onError(new IllegalArgumentException("Unrecognized response type")); + } + } + + @Override + public void createInstance( + CreateInstanceRequest request, StreamObserver responseObserver) { + Object response = responses.remove(); + if (response instanceof Operation) { + requests.add(request); + responseObserver.onNext((Operation) response); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError((Exception) response); + } else { + responseObserver.onError(new IllegalArgumentException("Unrecognized response type")); + } + } + + @Override + public void updateInstance( + UpdateInstanceRequest request, StreamObserver responseObserver) { + Object response = responses.remove(); + if (response instanceof Operation) { + requests.add(request); + responseObserver.onNext((Operation) response); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError((Exception) response); + } else { + responseObserver.onError(new IllegalArgumentException("Unrecognized response type")); + } + } + + @Override + public void deleteInstance( + DeleteInstanceRequest request, StreamObserver responseObserver) { + Object response = responses.remove(); + if (response instanceof Operation) { + requests.add(request); + responseObserver.onNext((Operation) response); + responseObserver.onCompleted(); + } else if (response instanceof Exception) { + responseObserver.onError((Exception) response); + } else { + responseObserver.onError(new IllegalArgumentException("Unrecognized response type")); + } + } +} diff --git a/pom.xml b/pom.xml index a8a072be542e..174358355d82 100644 --- a/pom.xml +++ b/pom.xml @@ -436,6 +436,7 @@ google-cloud-notification google-cloud-os-login google-cloud-pubsub + google-cloud-redis google-cloud-resourcemanager google-cloud-spanner google-cloud-speech From 2e8688416bcae6150c0fa59936103554dbbe3821 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Mon, 7 May 2018 17:06:46 -0700 Subject: [PATCH 11/65] Release 0.47.0/1.29.0 (#3239) Also fix javadoc --- README.md | 8 +- google-cloud-bigquery/README.md | 6 +- google-cloud-bigquery/pom.xml | 4 +- .../google/cloud/bigquery/TimelineSample.java | 2 +- google-cloud-bigquerydatatransfer/README.md | 6 +- google-cloud-bigquerydatatransfer/pom.xml | 4 +- google-cloud-bigtable/README.md | 6 +- google-cloud-bigtable/pom.xml | 4 +- google-cloud-bom/README.md | 2 +- google-cloud-bom/pom.xml | 90 +++++++++--------- google-cloud-compute/README.md | 6 +- google-cloud-compute/pom.xml | 4 +- google-cloud-container/README.md | 6 +- google-cloud-container/pom.xml | 4 +- google-cloud-contrib/README.md | 6 +- .../google-cloud-logging-logback/README.md | 6 +- .../google-cloud-logging-logback/pom.xml | 4 +- .../google-cloud-nio-examples/README.md | 4 +- .../google-cloud-nio-examples/pom.xml | 4 +- .../google-cloud-nio/README.md | 6 +- google-cloud-contrib/google-cloud-nio/pom.xml | 4 +- google-cloud-contrib/pom.xml | 4 +- google-cloud-core-grpc/pom.xml | 4 +- google-cloud-core-http/pom.xml | 4 +- google-cloud-core/README.md | 6 +- google-cloud-core/pom.xml | 4 +- google-cloud-dataproc/README.md | 6 +- google-cloud-dataproc/pom.xml | 4 +- google-cloud-datastore/README.md | 6 +- google-cloud-datastore/pom.xml | 4 +- google-cloud-dialogflow/README.md | 6 +- google-cloud-dialogflow/pom.xml | 4 +- google-cloud-dlp/README.md | 6 +- google-cloud-dlp/pom.xml | 4 +- google-cloud-dns/README.md | 6 +- google-cloud-dns/pom.xml | 4 +- google-cloud-errorreporting/README.md | 6 +- google-cloud-errorreporting/pom.xml | 4 +- google-cloud-examples/README.md | 6 +- google-cloud-examples/pom.xml | 4 +- google-cloud-firestore/README.md | 6 +- google-cloud-firestore/pom.xml | 4 +- google-cloud-language/README.md | 6 +- google-cloud-language/pom.xml | 4 +- google-cloud-logging/README.md | 6 +- google-cloud-logging/pom.xml | 4 +- google-cloud-monitoring/README.md | 6 +- google-cloud-monitoring/pom.xml | 4 +- google-cloud-notification/README.md | 6 +- google-cloud-notification/pom.xml | 4 +- google-cloud-os-login/README.md | 6 +- google-cloud-os-login/pom.xml | 4 +- google-cloud-pubsub/README.md | 6 +- google-cloud-pubsub/pom.xml | 4 +- google-cloud-redis/README.md | 6 +- google-cloud-redis/pom.xml | 4 +- google-cloud-resourcemanager/README.md | 6 +- google-cloud-resourcemanager/pom.xml | 4 +- google-cloud-spanner/README.md | 6 +- google-cloud-spanner/pom.xml | 4 +- google-cloud-speech/README.md | 6 +- google-cloud-speech/pom.xml | 4 +- google-cloud-storage/README.md | 6 +- google-cloud-storage/pom.xml | 4 +- .../google-cloud-appengineflexcompat/pom.xml | 4 +- .../google-cloud-appengineflexcustom/pom.xml | 4 +- .../google-cloud-appengineflexjava/pom.xml | 4 +- .../google-cloud-appenginejava8/pom.xml | 4 +- .../google-cloud-managedtest/pom.xml | 4 +- google-cloud-testing/pom.xml | 4 +- google-cloud-texttospeech/README.md | 6 +- google-cloud-texttospeech/pom.xml | 4 +- google-cloud-trace/README.md | 6 +- google-cloud-trace/pom.xml | 4 +- google-cloud-translate/README.md | 6 +- google-cloud-translate/pom.xml | 4 +- .../google-cloud-compat-checker/pom.xml | 4 +- google-cloud-util/pom.xml | 4 +- google-cloud-video-intelligence/README.md | 6 +- google-cloud-video-intelligence/pom.xml | 4 +- google-cloud-vision/README.md | 6 +- google-cloud-vision/pom.xml | 4 +- google-cloud/README.md | 6 +- google-cloud/pom.xml | 4 +- pom.xml | 4 +- versions.txt | 93 ++++++++++--------- 86 files changed, 294 insertions(+), 293 deletions(-) diff --git a/README.md b/README.md index f50c39292508..8ec0a4b2688d 100644 --- a/README.md +++ b/README.md @@ -59,16 +59,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud:0.46.0-alpha' +compile 'com.google.cloud:google-cloud:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) @@ -292,7 +292,7 @@ The easiest way to solve version conflicts is to use google-cloud's BOM. In Mave com.google.cloud google-cloud-bom - 0.46.0-alpha + 0.47.0-alpha pom import diff --git a/google-cloud-bigquery/README.md b/google-cloud-bigquery/README.md index 272ec6293946..075ea091617a 100644 --- a/google-cloud-bigquery/README.md +++ b/google-cloud-bigquery/README.md @@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-bigquery - 1.28.0 + 1.29.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-bigquery:1.28.0' +compile 'com.google.cloud:google-cloud-bigquery:1.29.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "1.28.0" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "1.29.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml index 5c2a8ad93475..9eee99beb5b1 100644 --- a/google-cloud-bigquery/pom.xml +++ b/google-cloud-bigquery/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigquery - 1.28.1-SNAPSHOT + 1.29.0 jar Google Cloud BigQuery https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquery @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-bigquery diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TimelineSample.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TimelineSample.java index ddc7cf289f32..84c2145d4b54 100644 --- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TimelineSample.java +++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TimelineSample.java @@ -77,7 +77,7 @@ public abstract static class Builder { public abstract Long getSlotMillis(); /** - * return a builder for the {@TimelineSample} object. + * return a builder for the {@code TimelineSample} object. */ public abstract Builder toBuilder(); diff --git a/google-cloud-bigquerydatatransfer/README.md b/google-cloud-bigquerydatatransfer/README.md index 3efde978c1c4..ebdf732a4151 100644 --- a/google-cloud-bigquerydatatransfer/README.md +++ b/google-cloud-bigquerydatatransfer/README.md @@ -25,16 +25,16 @@ Add this to your pom.xml file com.google.cloud google-cloud-bigquerydatatransfer - 0.46.0-beta + 0.47.0-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-bigquerydatatransfer:0.46.0-beta' +compile 'com.google.cloud:google-cloud-bigquerydatatransfer:0.47.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerydatatransfer" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerydatatransfer" % "0.47.0-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-bigquerydatatransfer/pom.xml index 38dd082094de..653348e48610 100644 --- a/google-cloud-bigquerydatatransfer/pom.xml +++ b/google-cloud-bigquerydatatransfer/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigquerydatatransfer - 0.46.1-beta-SNAPSHOT + 0.47.0-beta jar Google Cloud Bigquery Data Transfer https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquerydatatransfer @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-bigquerydatatransfer diff --git a/google-cloud-bigtable/README.md b/google-cloud-bigtable/README.md index 0de1676cf168..5361b7bd1bb0 100644 --- a/google-cloud-bigtable/README.md +++ b/google-cloud-bigtable/README.md @@ -23,16 +23,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-bigtable - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-bigtable:0.46.0-alpha' +compile 'com.google.cloud:google-cloud-bigtable:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index b7d76446b52e..7de45bc0d56e 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud Bigtable https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigtable @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-bigtable diff --git a/google-cloud-bom/README.md b/google-cloud-bom/README.md index cca14d3e6e76..502c2b80f990 100644 --- a/google-cloud-bom/README.md +++ b/google-cloud-bom/README.md @@ -13,7 +13,7 @@ To use it in Maven, add the following to your POM: com.google.cloud google-cloud-bom - 0.46.0-alpha + 0.47.0-alpha pom import diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index 6af4e7df70d0..28468afe2f51 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bom pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha Google Cloud Java BOM https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bom @@ -124,51 +124,51 @@ - 0.46.1-alpha-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 1.28.1-SNAPSHOT - 0.46.1-beta-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-beta-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 1.28.1-SNAPSHOT - 1.28.1-SNAPSHOT - 1.28.1-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 1.28.1-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-beta-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-beta-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-beta-SNAPSHOT - 1.28.1-SNAPSHOT - 1.28.1-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-beta-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-beta-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-beta-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-beta-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 1.28.1-SNAPSHOT - 0.46.1-beta-SNAPSHOT - 0.46.1-beta-SNAPSHOT - 1.28.1-SNAPSHOT - 0.46.1-beta-SNAPSHOT - 1.28.1-SNAPSHOT + 0.47.0-alpha + 0.47.0-alpha + 1.29.0 + 0.47.0-beta + 0.47.0-alpha + 0.47.0-beta + 0.47.0-alpha + 1.29.0 + 1.29.0 + 1.29.0 + 0.47.0-alpha + 1.29.0 + 0.47.0-alpha + 0.47.0-beta + 0.47.0-alpha + 0.47.0-beta + 0.47.0-alpha + 0.47.0-beta + 1.29.0 + 1.29.0 + 0.47.0-alpha + 0.47.0-beta + 0.47.0-alpha + 0.47.0-alpha + 0.47.0-beta + 0.47.0-alpha + 0.47.0-beta + 0.47.0-alpha + 0.47.0-alpha + 0.47.0-beta + 0.47.0-alpha + 1.29.0 + 0.47.0-beta + 0.47.0-beta + 1.29.0 + 0.47.0-beta + 1.29.0 - 0.46.1-alpha-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-alpha-SNAPSHOT - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha + 0.47.0-alpha + 0.47.0-alpha + 0.47.0-alpha + 0.47.0-alpha + 0.47.0-alpha + 0.47.0-alpha 1.5.0 1.25.0 diff --git a/google-cloud-compute/README.md b/google-cloud-compute/README.md index fe91a8903470..6966d5959415 100644 --- a/google-cloud-compute/README.md +++ b/google-cloud-compute/README.md @@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-compute - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-compute:0.46.0-alpha' +compile 'com.google.cloud:google-cloud-compute:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-compute/pom.xml b/google-cloud-compute/pom.xml index 42b154a1534e..93c5879cd27e 100644 --- a/google-cloud-compute/pom.xml +++ b/google-cloud-compute/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-compute - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud Compute https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-compute @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-compute diff --git a/google-cloud-container/README.md b/google-cloud-container/README.md index 792ecbb93c41..abd4f8e15d03 100644 --- a/google-cloud-container/README.md +++ b/google-cloud-container/README.md @@ -24,16 +24,16 @@ Add this to your pom.xml file com.google.cloud google-cloud-container - 0.46.0-beta + 0.47.0-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-container:0.46.0-beta' +compile 'com.google.cloud:google-cloud-container:0.47.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-container" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-container" % "0.47.0-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-container/pom.xml b/google-cloud-container/pom.xml index acf68fb31a3f..96e4e6718bfa 100644 --- a/google-cloud-container/pom.xml +++ b/google-cloud-container/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-container - 0.46.1-beta-SNAPSHOT + 0.47.0-beta jar Google Cloud Container https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-container @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-container diff --git a/google-cloud-contrib/README.md b/google-cloud-contrib/README.md index e18f1248b9eb..52997e476460 100644 --- a/google-cloud-contrib/README.md +++ b/google-cloud-contrib/README.md @@ -26,16 +26,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-contrib - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-contrib:0.46.0-alpha' +compile 'com.google.cloud:google-cloud-contrib:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-contrib" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-contrib" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-contrib/google-cloud-logging-logback/README.md b/google-cloud-contrib/google-cloud-logging-logback/README.md index 9152cf54b435..08d19e8885fe 100644 --- a/google-cloud-contrib/google-cloud-logging-logback/README.md +++ b/google-cloud-contrib/google-cloud-logging-logback/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-logging-logback - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-logging-logback:0.46.0-alpha' +compile 'com.google.cloud:google-cloud-logging-logback:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-contrib/google-cloud-logging-logback/pom.xml b/google-cloud-contrib/google-cloud-logging-logback/pom.xml index 888344f1e7bb..294fa8612d67 100644 --- a/google-cloud-contrib/google-cloud-logging-logback/pom.xml +++ b/google-cloud-contrib/google-cloud-logging-logback/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud Logging Logback Appender https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-logging-logback @@ -20,7 +20,7 @@ com.google.cloud google-cloud-contrib - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha diff --git a/google-cloud-contrib/google-cloud-nio-examples/README.md b/google-cloud-contrib/google-cloud-nio-examples/README.md index 33fd545ecd02..0f38bd24525b 100644 --- a/google-cloud-contrib/google-cloud-nio-examples/README.md +++ b/google-cloud-contrib/google-cloud-nio-examples/README.md @@ -23,12 +23,12 @@ To run this example: [//]: # ({x-version-update-start:google-cloud-nio:current}) ``` - java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.46.1-alpha-SNAPSHOT.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.46.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems + java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.47.0-alpha.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.47.0-alpha.jar com.google.cloud.nio.examples.ListFilesystems ``` Notice that it lists Google Cloud Storage, which it wouldn't if you ran it without the NIO jar: ``` - java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.46.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems + java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.47.0-alpha.jar com.google.cloud.nio.examples.ListFilesystems ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-contrib/google-cloud-nio-examples/pom.xml b/google-cloud-contrib/google-cloud-nio-examples/pom.xml index 5f4111911bfc..1b1d7b4bed8f 100644 --- a/google-cloud-contrib/google-cloud-nio-examples/pom.xml +++ b/google-cloud-contrib/google-cloud-nio-examples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-nio-examples - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud NIO Examples https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio-examples @@ -12,7 +12,7 @@ com.google.cloud google-cloud-contrib - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-nio-examples diff --git a/google-cloud-contrib/google-cloud-nio/README.md b/google-cloud-contrib/google-cloud-nio/README.md index 2c50db249af6..d6318612c79e 100644 --- a/google-cloud-contrib/google-cloud-nio/README.md +++ b/google-cloud-contrib/google-cloud-nio/README.md @@ -28,16 +28,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-nio - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-nio:0.46.0-alpha' +compile 'com.google.cloud:google-cloud-nio:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-nio" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-nio" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-contrib/google-cloud-nio/pom.xml index 060c00b8a3b9..3a7b3deaf783 100644 --- a/google-cloud-contrib/google-cloud-nio/pom.xml +++ b/google-cloud-contrib/google-cloud-nio/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-nio - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud NIO https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio @@ -12,7 +12,7 @@ com.google.cloud google-cloud-contrib - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-nio diff --git a/google-cloud-contrib/pom.xml b/google-cloud-contrib/pom.xml index 365e43e967fa..a9d222bf3932 100644 --- a/google-cloud-contrib/pom.xml +++ b/google-cloud-contrib/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-contrib - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha pom Google Cloud Contributions https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-contrib diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml index 0ce6d4399726..ca5e706cf1bf 100644 --- a/google-cloud-core-grpc/pom.xml +++ b/google-cloud-core-grpc/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-core-grpc - 1.28.1-SNAPSHOT + 1.29.0 jar Google Cloud Core gRPC https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-core-grpc diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml index 62df304f171d..2a86af060fa2 100644 --- a/google-cloud-core-http/pom.xml +++ b/google-cloud-core-http/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-core-http - 1.28.1-SNAPSHOT + 1.29.0 jar Google Cloud Core HTTP https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-core-http diff --git a/google-cloud-core/README.md b/google-cloud-core/README.md index 715d0f82f7c8..45e4450e1795 100644 --- a/google-cloud-core/README.md +++ b/google-cloud-core/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-core - 1.28.0 + 1.29.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-core:1.28.0' +compile 'com.google.cloud:google-cloud-core:1.29.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-core" % "1.28.0" +libraryDependencies += "com.google.cloud" % "google-cloud-core" % "1.29.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml index 3524de45780a..d66fc8832eba 100644 --- a/google-cloud-core/pom.xml +++ b/google-cloud-core/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-core - 1.28.1-SNAPSHOT + 1.29.0 jar Google Cloud Core https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-core diff --git a/google-cloud-dataproc/README.md b/google-cloud-dataproc/README.md index 317a20d91464..64f7588325f4 100644 --- a/google-cloud-dataproc/README.md +++ b/google-cloud-dataproc/README.md @@ -24,16 +24,16 @@ Add this to your pom.xml file com.google.cloud google-cloud-dataproc - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-dataproc:0.46.0-alpha' +compile 'com.google.cloud:google-cloud-dataproc:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-dataproc" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-dataproc" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-dataproc/pom.xml b/google-cloud-dataproc/pom.xml index c270b28eefc5..f4325ea4c498 100644 --- a/google-cloud-dataproc/pom.xml +++ b/google-cloud-dataproc/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-dataproc - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud Dataproc https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dataproc @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-dataproc diff --git a/google-cloud-datastore/README.md b/google-cloud-datastore/README.md index 1f71712447ae..9ef5db4378fa 100644 --- a/google-cloud-datastore/README.md +++ b/google-cloud-datastore/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-datastore - 1.28.0 + 1.29.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datastore:1.28.0' +compile 'com.google.cloud:google-cloud-datastore:1.29.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.28.0" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.29.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index 7e901aba7460..c62650cb23ab 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.28.1-SNAPSHOT + 1.29.0 jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-datastore diff --git a/google-cloud-dialogflow/README.md b/google-cloud-dialogflow/README.md index 1c88f1a123fc..13ea8e47777e 100644 --- a/google-cloud-dialogflow/README.md +++ b/google-cloud-dialogflow/README.md @@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-dialogflow - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-dialogflow:0.46.0-alpha' +compile 'com.google.cloud:google-cloud-dialogflow:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-dialogflow/pom.xml b/google-cloud-dialogflow/pom.xml index 755a01c0f050..3003ff2b4590 100644 --- a/google-cloud-dialogflow/pom.xml +++ b/google-cloud-dialogflow/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-dialogflow - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud Dialog Flow API https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dialogflow @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-dialogflow diff --git a/google-cloud-dlp/README.md b/google-cloud-dlp/README.md index 41a14b359196..04b83735457b 100644 --- a/google-cloud-dlp/README.md +++ b/google-cloud-dlp/README.md @@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-dlp - 0.46.0-beta + 0.47.0-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-dlp:0.46.0-beta' +compile 'com.google.cloud:google-cloud-dlp:0.47.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-dlp" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-dlp" % "0.47.0-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-dlp/pom.xml b/google-cloud-dlp/pom.xml index 5bf41d32a2ec..f85fcfc00f49 100644 --- a/google-cloud-dlp/pom.xml +++ b/google-cloud-dlp/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-dlp - 0.46.1-beta-SNAPSHOT + 0.47.0-beta jar Google Cloud Data Loss Prevention API https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dlp @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-dlp-v2beta1 diff --git a/google-cloud-dns/README.md b/google-cloud-dns/README.md index 71d5bdaff866..d69aa1485ce9 100644 --- a/google-cloud-dns/README.md +++ b/google-cloud-dns/README.md @@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-dns - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-dns:0.46.0-alpha' +compile 'com.google.cloud:google-cloud-dns:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-dns" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-dns" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-dns/pom.xml b/google-cloud-dns/pom.xml index 5fc97e34f6a1..b16c62edafd6 100644 --- a/google-cloud-dns/pom.xml +++ b/google-cloud-dns/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-dns - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud DNS https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dns @@ -14,7 +14,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-dns diff --git a/google-cloud-errorreporting/README.md b/google-cloud-errorreporting/README.md index 432c76070d90..a339b80fa6bf 100644 --- a/google-cloud-errorreporting/README.md +++ b/google-cloud-errorreporting/README.md @@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-errorreporting - 0.46.0-beta + 0.47.0-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-errorreporting:0.46.0-beta' +compile 'com.google.cloud:google-cloud-errorreporting:0.47.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.47.0-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml index e49e6ed6afb6..523eb9f8a20e 100644 --- a/google-cloud-errorreporting/pom.xml +++ b/google-cloud-errorreporting/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-errorreporting - 0.46.1-beta-SNAPSHOT + 0.47.0-beta jar Google Cloud Error Reporting https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-errorreporting @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-errorreporting diff --git a/google-cloud-examples/README.md b/google-cloud-examples/README.md index 767b319f00c0..89650c1a3d84 100644 --- a/google-cloud-examples/README.md +++ b/google-cloud-examples/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-examples - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-examples:0.46.0-alpha' +compile 'com.google.cloud:google-cloud-examples:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-examples" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-examples" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml index dfbd306d73bc..5c3796b0521b 100644 --- a/google-cloud-examples/pom.xml +++ b/google-cloud-examples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-examples - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud Examples https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-examples @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-examples diff --git a/google-cloud-firestore/README.md b/google-cloud-firestore/README.md index 8e4080443c01..6d06c59d671e 100644 --- a/google-cloud-firestore/README.md +++ b/google-cloud-firestore/README.md @@ -14,16 +14,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-firestore - 0.46.0-beta + 0.47.0-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-firestore:0.46.0-beta' +compile 'com.google.cloud:google-cloud-firestore:0.47.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "0.47.0-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index fa43b032d8d4..77cfe9584c7c 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-firestore - 0.46.1-beta-SNAPSHOT + 0.47.0-beta jar Google Cloud Firestore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-firestore @@ -15,7 +15,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-firestore diff --git a/google-cloud-language/README.md b/google-cloud-language/README.md index 31072d655bf7..fd8289bdaac6 100644 --- a/google-cloud-language/README.md +++ b/google-cloud-language/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-language - 1.28.0 + 1.29.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-language:1.28.0' +compile 'com.google.cloud:google-cloud-language:1.29.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-language" % "1.28.0" +libraryDependencies += "com.google.cloud" % "google-cloud-language" % "1.29.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml index 149781c46590..edef12fddbf7 100644 --- a/google-cloud-language/pom.xml +++ b/google-cloud-language/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-language - 1.28.1-SNAPSHOT + 1.29.0 jar Google Cloud Natural Language https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-language @@ -15,7 +15,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-language diff --git a/google-cloud-logging/README.md b/google-cloud-logging/README.md index c5fa58ab5125..7de8bf97c1c4 100644 --- a/google-cloud-logging/README.md +++ b/google-cloud-logging/README.md @@ -21,16 +21,16 @@ Add this to your pom.xml file com.google.cloud google-cloud-logging - 1.28.0 + 1.29.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-logging:1.28.0' +compile 'com.google.cloud:google-cloud-logging:1.29.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "1.28.0" +libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "1.29.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index 56e43f108432..196070f3d31e 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-logging - 1.28.1-SNAPSHOT + 1.29.0 jar Google Cloud Logging https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-logging diff --git a/google-cloud-monitoring/README.md b/google-cloud-monitoring/README.md index c62ad335fc0d..970abea33a77 100644 --- a/google-cloud-monitoring/README.md +++ b/google-cloud-monitoring/README.md @@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-monitoring - 0.46.0-beta + 0.47.0-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-monitoring:0.46.0-beta' +compile 'com.google.cloud:google-cloud-monitoring:0.47.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-monitoring" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-monitoring" % "0.47.0-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml index b68980ffaec9..1236338fae30 100644 --- a/google-cloud-monitoring/pom.xml +++ b/google-cloud-monitoring/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-monitoring - 0.46.1-beta-SNAPSHOT + 0.47.0-beta jar Google Cloud Monitoring https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-monitoring @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-monitoring diff --git a/google-cloud-notification/README.md b/google-cloud-notification/README.md index 506b3d04e54b..5022ae6b24f9 100644 --- a/google-cloud-notification/README.md +++ b/google-cloud-notification/README.md @@ -14,16 +14,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-notification - 0.46.0-beta + 0.47.0-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-notification:0.46.0-beta' +compile 'com.google.cloud:google-cloud-notification:0.47.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-notification" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-notification" % "0.47.0-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-notification/pom.xml b/google-cloud-notification/pom.xml index 59a5ba2cebdb..73781f36e131 100644 --- a/google-cloud-notification/pom.xml +++ b/google-cloud-notification/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-notification - 0.46.1-beta-SNAPSHOT + 0.47.0-beta jar Google Cloud Pub/Sub Notifications for GCS https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-notification @@ -15,7 +15,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-notification diff --git a/google-cloud-os-login/README.md b/google-cloud-os-login/README.md index 3027dd5a2806..8b257905526d 100644 --- a/google-cloud-os-login/README.md +++ b/google-cloud-os-login/README.md @@ -24,16 +24,16 @@ Add this to your pom.xml file com.google.cloud google-cloud-os-login - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-os-login:0.46.0-alpha' +compile 'com.google.cloud:google-cloud-os-login:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-os-login" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-os-login" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml index 38d881e4ec07..5261fa5d4cad 100644 --- a/google-cloud-os-login/pom.xml +++ b/google-cloud-os-login/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-os-login - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud OS Login https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-os-login @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-os-login diff --git a/google-cloud-pubsub/README.md b/google-cloud-pubsub/README.md index 0c6b09f3693b..dd6cb3b0b6c3 100644 --- a/google-cloud-pubsub/README.md +++ b/google-cloud-pubsub/README.md @@ -24,16 +24,16 @@ Add this to your pom.xml file com.google.cloud google-cloud-pubsub - 0.46.0-beta + 0.47.0-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-pubsub:0.46.0-beta' +compile 'com.google.cloud:google-cloud-pubsub:0.47.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "0.47.0-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 396d6fc9a6b3..15c6080c4591 100644 --- a/google-cloud-pubsub/pom.xml +++ b/google-cloud-pubsub/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-pubsub - 0.46.1-beta-SNAPSHOT + 0.47.0-beta jar Google Cloud Pub/Sub https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-pubsub @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-pubsub diff --git a/google-cloud-redis/README.md b/google-cloud-redis/README.md index 6a9920d2028d..dc95a552cfb8 100644 --- a/google-cloud-redis/README.md +++ b/google-cloud-redis/README.md @@ -24,16 +24,16 @@ Add this to your pom.xml file com.google.cloud google-cloud-redis - 0.46.0-beta + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-redis:0.46.0-beta' +compile 'com.google.cloud:google-cloud-redis:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-redis" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-redis" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-redis/pom.xml b/google-cloud-redis/pom.xml index 086607f3959a..1d799d6d2729 100644 --- a/google-cloud-redis/pom.xml +++ b/google-cloud-redis/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-redis - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud Redis https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-redis @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-redis diff --git a/google-cloud-resourcemanager/README.md b/google-cloud-resourcemanager/README.md index d5a0c1e927e2..6fb8de503522 100644 --- a/google-cloud-resourcemanager/README.md +++ b/google-cloud-resourcemanager/README.md @@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-resourcemanager - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-resourcemanager:0.46.0-alpha' +compile 'com.google.cloud:google-cloud-resourcemanager:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-resourcemanager" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-resourcemanager" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-resourcemanager/pom.xml b/google-cloud-resourcemanager/pom.xml index c25518a3a4cc..dc2e7637f20d 100644 --- a/google-cloud-resourcemanager/pom.xml +++ b/google-cloud-resourcemanager/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-resourcemanager - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud Resource Manager https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-resourcemanager @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-resourcemanager diff --git a/google-cloud-spanner/README.md b/google-cloud-spanner/README.md index 58508ef8eb07..ec6305b47c2b 100644 --- a/google-cloud-spanner/README.md +++ b/google-cloud-spanner/README.md @@ -22,16 +22,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-spanner - 0.46.0-beta + 0.47.0-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-spanner:0.46.0-beta' +compile 'com.google.cloud:google-cloud-spanner:0.47.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "0.47.0-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index f8c0e3516f0f..184e3eda31c7 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -4,7 +4,7 @@ http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 google-cloud-spanner - 0.46.1-beta-SNAPSHOT + 0.47.0-beta jar Google Cloud Spanner https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-spanner @@ -14,7 +14,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-spanner diff --git a/google-cloud-speech/README.md b/google-cloud-speech/README.md index 80323a23e3db..a72232aa441c 100644 --- a/google-cloud-speech/README.md +++ b/google-cloud-speech/README.md @@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-speech - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-speech:0.46.0-alpha' +compile 'com.google.cloud:google-cloud-speech:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-speech" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-speech" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-speech/pom.xml b/google-cloud-speech/pom.xml index 54fc2e3fac43..f4a4e2c4ea85 100644 --- a/google-cloud-speech/pom.xml +++ b/google-cloud-speech/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-speech - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud Speech https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-speech @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-speech diff --git a/google-cloud-storage/README.md b/google-cloud-storage/README.md index d9b1ef144b01..532ed9b9cacc 100644 --- a/google-cloud-storage/README.md +++ b/google-cloud-storage/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-storage - 1.28.0 + 1.29.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-storage:1.28.0' +compile 'com.google.cloud:google-cloud-storage:1.29.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.28.0" +libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.29.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml index c6a02b520f07..bb72e9d73f60 100644 --- a/google-cloud-storage/pom.xml +++ b/google-cloud-storage/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-storage - 1.28.1-SNAPSHOT + 1.29.0 jar Google Cloud Storage https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-storage @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-storage diff --git a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml index 5e6401ddf084..92b7b0400de9 100644 --- a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml +++ b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-appengineflexcompat - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha war google-cloud-testing com.google.cloud - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha diff --git a/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml b/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml index 344c947c9bcb..c060934ec9d5 100644 --- a/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml +++ b/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-appengineflexcustom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha war google-cloud-testing com.google.cloud - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha diff --git a/google-cloud-testing/google-cloud-appengineflexjava/pom.xml b/google-cloud-testing/google-cloud-appengineflexjava/pom.xml index f84100ab2aad..ea6ded9a8522 100644 --- a/google-cloud-testing/google-cloud-appengineflexjava/pom.xml +++ b/google-cloud-testing/google-cloud-appengineflexjava/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-appengineflexjava - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha war google-cloud-testing com.google.cloud - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha diff --git a/google-cloud-testing/google-cloud-appenginejava8/pom.xml b/google-cloud-testing/google-cloud-appenginejava8/pom.xml index c2a60507c599..2f661d7cbed1 100644 --- a/google-cloud-testing/google-cloud-appenginejava8/pom.xml +++ b/google-cloud-testing/google-cloud-appenginejava8/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-appenginejava8 - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha war google-cloud-testing com.google.cloud - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha diff --git a/google-cloud-testing/google-cloud-managedtest/pom.xml b/google-cloud-testing/google-cloud-managedtest/pom.xml index 40a49e97023a..ee8452177c05 100644 --- a/google-cloud-testing/google-cloud-managedtest/pom.xml +++ b/google-cloud-testing/google-cloud-managedtest/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-managedtest - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar google-cloud-testing com.google.cloud - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml index 03fa93d8c9ca..290af23c70c2 100644 --- a/google-cloud-testing/pom.xml +++ b/google-cloud-testing/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-testing - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha pom Google Cloud Testing @@ -13,7 +13,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-testing diff --git a/google-cloud-texttospeech/README.md b/google-cloud-texttospeech/README.md index 3aa938167733..69a80b0a11e9 100644 --- a/google-cloud-texttospeech/README.md +++ b/google-cloud-texttospeech/README.md @@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-texttospeech - 0.46.0-beta + 0.47.0-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-texttospeech:0.46.0-beta' +compile 'com.google.cloud:google-cloud-texttospeech:0.47.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-texttospeech" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-texttospeech" % "0.47.0-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-texttospeech/pom.xml b/google-cloud-texttospeech/pom.xml index 7ad6f827fbf1..bbcf1df3de46 100644 --- a/google-cloud-texttospeech/pom.xml +++ b/google-cloud-texttospeech/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-texttospeech - 0.46.1-beta-SNAPSHOT + 0.47.0-beta jar Google Cloud Text-to-Speech https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-texttospeech @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-texttospeech-v1beta1 diff --git a/google-cloud-trace/README.md b/google-cloud-trace/README.md index a496fd90cdd3..77868b9be635 100644 --- a/google-cloud-trace/README.md +++ b/google-cloud-trace/README.md @@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-trace - 0.46.0-beta + 0.47.0-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-trace:0.46.0-beta' +compile 'com.google.cloud:google-cloud-trace:0.47.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-trace" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-trace" % "0.47.0-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-trace/pom.xml b/google-cloud-trace/pom.xml index 0fa61f3796ca..764ce35acec0 100644 --- a/google-cloud-trace/pom.xml +++ b/google-cloud-trace/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-trace - 0.46.1-beta-SNAPSHOT + 0.47.0-beta jar Google Cloud Trace https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-trace @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-trace diff --git a/google-cloud-translate/README.md b/google-cloud-translate/README.md index fe4d02475cad..eff5c713e3ea 100644 --- a/google-cloud-translate/README.md +++ b/google-cloud-translate/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-translate - 1.28.0 + 1.29.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-translate:1.28.0' +compile 'com.google.cloud:google-cloud-translate:1.29.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-translate" % "1.28.0" +libraryDependencies += "com.google.cloud" % "google-cloud-translate" % "1.29.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-translate/pom.xml b/google-cloud-translate/pom.xml index 699cf9183a18..cf987dffdbca 100644 --- a/google-cloud-translate/pom.xml +++ b/google-cloud-translate/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-translate - 1.28.1-SNAPSHOT + 1.29.0 jar Google Cloud Translation https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-translate @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-translate diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml index 1b17ba91e759..f2ca024d7c7e 100644 --- a/google-cloud-util/google-cloud-compat-checker/pom.xml +++ b/google-cloud-util/google-cloud-compat-checker/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-compat-checker - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud Java Compatibility Checker https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util/google-cloud-compat-checker @@ -12,7 +12,7 @@ com.google.cloud google-cloud-util - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-compat-checker diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml index 7053cf712fd7..aa7ab7804793 100644 --- a/google-cloud-util/pom.xml +++ b/google-cloud-util/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-util - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha pom Google Cloud Util https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util @@ -13,7 +13,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-compat-checker diff --git a/google-cloud-video-intelligence/README.md b/google-cloud-video-intelligence/README.md index 8265e61e0eb0..3affa412863b 100644 --- a/google-cloud-video-intelligence/README.md +++ b/google-cloud-video-intelligence/README.md @@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-video-intelligence - 0.46.0-beta + 0.47.0-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-video-intelligence:0.46.0-beta' +compile 'com.google.cloud:google-cloud-video-intelligence:0.47.0-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-video-intelligence" % "0.46.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-video-intelligence" % "0.47.0-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-video-intelligence/pom.xml b/google-cloud-video-intelligence/pom.xml index 92fbddeed024..479c0c2af7ab 100644 --- a/google-cloud-video-intelligence/pom.xml +++ b/google-cloud-video-intelligence/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-video-intelligence - 0.46.1-beta-SNAPSHOT + 0.47.0-beta jar Google Cloud Video Intelligence https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-video-intelligence @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-video-intelligence diff --git a/google-cloud-vision/README.md b/google-cloud-vision/README.md index 0e151555bef1..8585256e639f 100644 --- a/google-cloud-vision/README.md +++ b/google-cloud-vision/README.md @@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-vision - 1.28.0 + 1.29.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-vision:1.28.0' +compile 'com.google.cloud:google-cloud-vision:1.29.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-vision" % "1.28.0" +libraryDependencies += "com.google.cloud" % "google-cloud-vision" % "1.29.0" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-vision/pom.xml b/google-cloud-vision/pom.xml index b79dd8eadd59..a2e5166703b6 100644 --- a/google-cloud-vision/pom.xml +++ b/google-cloud-vision/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-vision - 1.28.1-SNAPSHOT + 1.29.0 jar Google Cloud Vision https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-vision @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha google-cloud-vision diff --git a/google-cloud/README.md b/google-cloud/README.md index 7f4f1b70571e..d7a843a7fb72 100644 --- a/google-cloud/README.md +++ b/google-cloud/README.md @@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud - 0.46.0-alpha + 0.47.0-alpha ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud:0.46.0-alpha' +compile 'com.google.cloud:google-cloud:0.47.0-alpha' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud" % "0.46.0-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud" % "0.47.0-alpha" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud/pom.xml b/google-cloud/pom.xml index 1e2d5227a2c6..5c5875aaa485 100644 --- a/google-cloud/pom.xml +++ b/google-cloud/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha jar Google Cloud https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha diff --git a/pom.xml b/pom.xml index 174358355d82..798e80d7724f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-pom pom - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha Google Cloud https://github.com/GoogleCloudPlatform/google-cloud-java @@ -154,7 +154,7 @@ UTF-8 github google-cloud - 0.46.1-alpha-SNAPSHOT + 0.47.0-alpha 1.23.0 1.25.0 0.9.1 diff --git a/versions.txt b/versions.txt index d5706d3062ce..d9cca0efc7e0 100644 --- a/versions.txt +++ b/versions.txt @@ -1,48 +1,49 @@ # Format: # module:released-version:current-version -google-cloud-appengineflexcompat:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-appengineflexcustom:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-appengineflexjava:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-appenginejava8:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-bigquery:1.28.0:1.28.1-SNAPSHOT -google-cloud-bigquerydatatransfer:0.46.0-beta:0.46.1-beta-SNAPSHOT -google-cloud-bigtable:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-bom:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-compat-checker:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-compute:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-container:0.46.0-beta:0.46.1-beta-SNAPSHOT -google-cloud-contrib:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-core:1.28.0:1.28.1-SNAPSHOT -google-cloud-core-grpc:1.28.0:1.28.1-SNAPSHOT -google-cloud-core-http:1.28.0:1.28.1-SNAPSHOT -google-cloud-dataproc:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-datastore:1.28.0:1.28.1-SNAPSHOT -google-cloud-dialogflow:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-dlp:0.46.0-beta:0.46.1-beta-SNAPSHOT -google-cloud-dns:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-errorreporting:0.46.0-beta:0.46.1-beta-SNAPSHOT -google-cloud-examples:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-firestore:0.46.0-beta:0.46.1-beta-SNAPSHOT -google-cloud-language:1.28.0:1.28.1-SNAPSHOT -google-cloud-logging:1.28.0:1.28.1-SNAPSHOT -google-cloud-logging-logback:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-managedtest:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-monitoring:0.46.0-beta:0.46.1-beta-SNAPSHOT -google-cloud-nio:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-nio-examples:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-notification:0.46.0-beta:0.46.1-beta-SNAPSHOT -google-cloud-os-login:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-pom:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-pubsub:0.46.0-beta:0.46.1-beta-SNAPSHOT -google-cloud-resourcemanager:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-spanner:0.46.0-beta:0.46.1-beta-SNAPSHOT -google-cloud-speech:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-storage:1.28.0:1.28.1-SNAPSHOT -google-cloud-texttospeech:0.46.0-beta:0.46.1-beta-SNAPSHOT -google-cloud-testing:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-trace:0.46.0-beta:0.46.1-beta-SNAPSHOT -google-cloud-translate:1.28.0:1.28.1-SNAPSHOT -google-cloud-util:0.46.0-alpha:0.46.1-alpha-SNAPSHOT -google-cloud-video-intelligence:0.46.0-beta:0.46.1-beta-SNAPSHOT -google-cloud-vision:1.28.0:1.28.1-SNAPSHOT +google-cloud-appengineflexcompat:0.47.0-alpha:0.47.0-alpha +google-cloud-appengineflexcustom:0.47.0-alpha:0.47.0-alpha +google-cloud-appengineflexjava:0.47.0-alpha:0.47.0-alpha +google-cloud-appenginejava8:0.47.0-alpha:0.47.0-alpha +google-cloud:0.47.0-alpha:0.47.0-alpha +google-cloud-bigquery:1.29.0:1.29.0 +google-cloud-bigquerydatatransfer:0.47.0-beta:0.47.0-beta +google-cloud-bigtable:0.47.0-alpha:0.47.0-alpha +google-cloud-bom:0.47.0-alpha:0.47.0-alpha +google-cloud-compat-checker:0.47.0-alpha:0.47.0-alpha +google-cloud-compute:0.47.0-alpha:0.47.0-alpha +google-cloud-container:0.47.0-beta:0.47.0-beta +google-cloud-contrib:0.47.0-alpha:0.47.0-alpha +google-cloud-core:1.29.0:1.29.0 +google-cloud-core-grpc:1.29.0:1.29.0 +google-cloud-core-http:1.29.0:1.29.0 +google-cloud-dataproc:0.47.0-alpha:0.47.0-alpha +google-cloud-datastore:1.29.0:1.29.0 +google-cloud-dialogflow:0.47.0-alpha:0.47.0-alpha +google-cloud-dlp:0.47.0-beta:0.47.0-beta +google-cloud-dns:0.47.0-alpha:0.47.0-alpha +google-cloud-errorreporting:0.47.0-beta:0.47.0-beta +google-cloud-examples:0.47.0-alpha:0.47.0-alpha +google-cloud-firestore:0.47.0-beta:0.47.0-beta +google-cloud-language:1.29.0:1.29.0 +google-cloud-logging:1.29.0:1.29.0 +google-cloud-logging-logback:0.47.0-alpha:0.47.0-alpha +google-cloud-managedtest:0.47.0-alpha:0.47.0-alpha +google-cloud-monitoring:0.47.0-beta:0.47.0-beta +google-cloud-nio:0.47.0-alpha:0.47.0-alpha +google-cloud-nio-examples:0.47.0-alpha:0.47.0-alpha +google-cloud-notification:0.47.0-beta:0.47.0-beta +google-cloud-os-login:0.47.0-alpha:0.47.0-alpha +google-cloud-pom:0.47.0-alpha:0.47.0-alpha +google-cloud-pubsub:0.47.0-beta:0.47.0-beta +google-cloud-redis:0.47.0-alpha:0.47.0-alpha +google-cloud-resourcemanager:0.47.0-alpha:0.47.0-alpha +google-cloud-spanner:0.47.0-beta:0.47.0-beta +google-cloud-speech:0.47.0-alpha:0.47.0-alpha +google-cloud-storage:1.29.0:1.29.0 +google-cloud-texttospeech:0.47.0-beta:0.47.0-beta +google-cloud-testing:0.47.0-alpha:0.47.0-alpha +google-cloud-trace:0.47.0-beta:0.47.0-beta +google-cloud-translate:1.29.0:1.29.0 +google-cloud-util:0.47.0-alpha:0.47.0-alpha +google-cloud-video-intelligence:0.47.0-beta:0.47.0-beta +google-cloud-vision:1.29.0:1.29.0 From 15fb17da5b7fd8d0f3c0baadc62afb94dacfc123 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Mon, 7 May 2018 17:26:52 -0700 Subject: [PATCH 12/65] Bump snapshot version (#3240) --- versions.txt | 94 ++++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/versions.txt b/versions.txt index d9cca0efc7e0..9f5adc3f844f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,49 +1,49 @@ # Format: # module:released-version:current-version -google-cloud-appengineflexcompat:0.47.0-alpha:0.47.0-alpha -google-cloud-appengineflexcustom:0.47.0-alpha:0.47.0-alpha -google-cloud-appengineflexjava:0.47.0-alpha:0.47.0-alpha -google-cloud-appenginejava8:0.47.0-alpha:0.47.0-alpha -google-cloud:0.47.0-alpha:0.47.0-alpha -google-cloud-bigquery:1.29.0:1.29.0 -google-cloud-bigquerydatatransfer:0.47.0-beta:0.47.0-beta -google-cloud-bigtable:0.47.0-alpha:0.47.0-alpha -google-cloud-bom:0.47.0-alpha:0.47.0-alpha -google-cloud-compat-checker:0.47.0-alpha:0.47.0-alpha -google-cloud-compute:0.47.0-alpha:0.47.0-alpha -google-cloud-container:0.47.0-beta:0.47.0-beta -google-cloud-contrib:0.47.0-alpha:0.47.0-alpha -google-cloud-core:1.29.0:1.29.0 -google-cloud-core-grpc:1.29.0:1.29.0 -google-cloud-core-http:1.29.0:1.29.0 -google-cloud-dataproc:0.47.0-alpha:0.47.0-alpha -google-cloud-datastore:1.29.0:1.29.0 -google-cloud-dialogflow:0.47.0-alpha:0.47.0-alpha -google-cloud-dlp:0.47.0-beta:0.47.0-beta -google-cloud-dns:0.47.0-alpha:0.47.0-alpha -google-cloud-errorreporting:0.47.0-beta:0.47.0-beta -google-cloud-examples:0.47.0-alpha:0.47.0-alpha -google-cloud-firestore:0.47.0-beta:0.47.0-beta -google-cloud-language:1.29.0:1.29.0 -google-cloud-logging:1.29.0:1.29.0 -google-cloud-logging-logback:0.47.0-alpha:0.47.0-alpha -google-cloud-managedtest:0.47.0-alpha:0.47.0-alpha -google-cloud-monitoring:0.47.0-beta:0.47.0-beta -google-cloud-nio:0.47.0-alpha:0.47.0-alpha -google-cloud-nio-examples:0.47.0-alpha:0.47.0-alpha -google-cloud-notification:0.47.0-beta:0.47.0-beta -google-cloud-os-login:0.47.0-alpha:0.47.0-alpha -google-cloud-pom:0.47.0-alpha:0.47.0-alpha -google-cloud-pubsub:0.47.0-beta:0.47.0-beta -google-cloud-redis:0.47.0-alpha:0.47.0-alpha -google-cloud-resourcemanager:0.47.0-alpha:0.47.0-alpha -google-cloud-spanner:0.47.0-beta:0.47.0-beta -google-cloud-speech:0.47.0-alpha:0.47.0-alpha -google-cloud-storage:1.29.0:1.29.0 -google-cloud-texttospeech:0.47.0-beta:0.47.0-beta -google-cloud-testing:0.47.0-alpha:0.47.0-alpha -google-cloud-trace:0.47.0-beta:0.47.0-beta -google-cloud-translate:1.29.0:1.29.0 -google-cloud-util:0.47.0-alpha:0.47.0-alpha -google-cloud-video-intelligence:0.47.0-beta:0.47.0-beta -google-cloud-vision:1.29.0:1.29.0 +google-cloud-appengineflexcompat:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-appengineflexcustom:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-appengineflexjava:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-appenginejava8:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-bigquery:1.29.0:1.29.1-SNAPSHOT +google-cloud-bigquerydatatransfer:0.47.0-beta:0.47.1-beta-SNAPSHOT +google-cloud-bigtable:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-bom:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-compat-checker:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-compute:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-container:0.47.0-beta:0.47.1-beta-SNAPSHOT +google-cloud-contrib:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-core:1.29.0:1.29.1-SNAPSHOT +google-cloud-core-grpc:1.29.0:1.29.1-SNAPSHOT +google-cloud-core-http:1.29.0:1.29.1-SNAPSHOT +google-cloud-dataproc:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-datastore:1.29.0:1.29.1-SNAPSHOT +google-cloud-dialogflow:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-dlp:0.47.0-beta:0.47.1-beta-SNAPSHOT +google-cloud-dns:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-errorreporting:0.47.0-beta:0.47.1-beta-SNAPSHOT +google-cloud-examples:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-firestore:0.47.0-beta:0.47.1-beta-SNAPSHOT +google-cloud-language:1.29.0:1.29.1-SNAPSHOT +google-cloud-logging:1.29.0:1.29.1-SNAPSHOT +google-cloud-logging-logback:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-managedtest:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-monitoring:0.47.0-beta:0.47.1-beta-SNAPSHOT +google-cloud-nio:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-nio-examples:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-notification:0.47.0-beta:0.47.1-beta-SNAPSHOT +google-cloud-os-login:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-pom:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-pubsub:0.47.0-beta:0.47.1-beta-SNAPSHOT +google-cloud-redis:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-resourcemanager:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-spanner:0.47.0-beta:0.47.1-beta-SNAPSHOT +google-cloud-speech:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-storage:1.29.0:1.29.1-SNAPSHOT +google-cloud-texttospeech:0.47.0-beta:0.47.1-beta-SNAPSHOT +google-cloud-testing:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-trace:0.47.0-beta:0.47.1-beta-SNAPSHOT +google-cloud-translate:1.29.0:1.29.1-SNAPSHOT +google-cloud-util:0.47.0-alpha:0.47.1-alpha-SNAPSHOT +google-cloud-video-intelligence:0.47.0-beta:0.47.1-beta-SNAPSHOT +google-cloud-vision:1.29.0:1.29.1-SNAPSHOT From fa6b526dea6437aaf463cf9876823d494ac867d1 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Tue, 8 May 2018 08:08:22 -0700 Subject: [PATCH 13/65] Use BlobTargetOption and BlobWriteOption --- .../com/google/cloud/storage/BlobInfo.java | 2 +- .../java/com/google/cloud/storage/Bucket.java | 16 +++++ .../com/google/cloud/storage/Storage.java | 31 ++++++--- .../cloud/storage/spi/v1/HttpStorageRpc.java | 3 +- .../com/google/cloud/storage/BlobTest.java | 4 ++ .../google/cloud/storage/StorageImplTest.java | 5 ++ .../cloud/storage/it/ITStorageTest.java | 63 ++++++++++++++----- 7 files changed, 98 insertions(+), 26 deletions(-) diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java index 17e92fa96586..c31b61edfe5c 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java @@ -273,7 +273,7 @@ public abstract static class Builder { * Sets the blob's kmsKeyName. */ @GcpLaunchStage.Beta - public abstract Builder setKmsKeyName(String kmsKeyName); + abstract Builder setKmsKeyName(String kmsKeyName); /** * Creates a {@code BlobInfo} object. diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java index 046977707d34..179e8a5cbfef 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java @@ -187,6 +187,9 @@ private Tuple toTargetOption(BlobInfo blobIn case CUSTOMER_SUPPLIED_KEY: return Tuple.of(blobInfo, Storage.BlobTargetOption.encryptionKey((String) getValue())); + case KMS_KEY_NAME: + return Tuple.of(blobInfo, + Storage.BlobTargetOption.kmsKeyName((String) getValue())); case USER_PROJECT: return Tuple.of(blobInfo, Storage.BlobTargetOption.userProject((String) getValue())); @@ -266,6 +269,16 @@ public static BlobTargetOption encryptionKey(String key) { return new BlobTargetOption(StorageRpc.Option.CUSTOMER_SUPPLIED_KEY, key); } + /** + * Returns an option to set a customer-managed KMS key for server-side encryption of the + * blob. + * + * @param kmsKeyName the KMS key resource id + */ + public static BlobTargetOption kmsKeyName(String kmsKeyName) { + return new BlobTargetOption(StorageRpc.Option.KMS_KEY_NAME, kmsKeyName); + } + /** * Returns an option for blob's billing user project. This option is only used by the buckets with * 'requester_pays' flag. @@ -343,6 +356,9 @@ private Tuple toWriteOption(BlobInfo blobInfo case CUSTOMER_SUPPLIED_KEY: return Tuple.of(blobInfo, Storage.BlobWriteOption.encryptionKey((String) value)); + case KMS_KEY_NAME: + return Tuple.of(blobInfo, + Storage.BlobWriteOption.kmsKeyName((String) value)); case USER_PROJECT: return Tuple.of(blobInfo, Storage.BlobWriteOption.userProject((String) value)); default: diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java index 1249493a71e9..194b10fea07e 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java @@ -19,19 +19,11 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.api.client.util.Data; -import com.google.api.core.BetaApi; import com.google.api.gax.paging.Page; import com.google.auth.ServiceAccountSigner; import com.google.auth.ServiceAccountSigner.SigningException; -import com.google.cloud.FieldSelector; +import com.google.cloud.*; import com.google.cloud.FieldSelector.Helper; -import com.google.cloud.GcpLaunchStage; -import com.google.cloud.Policy; -import com.google.cloud.ReadChannel; -import com.google.cloud.Service; -import com.google.cloud.Tuple; -import com.google.cloud.WriteChannel; import com.google.cloud.storage.Acl.Entity; import com.google.cloud.storage.spi.v1.StorageRpc; import com.google.common.collect.ImmutableList; @@ -385,6 +377,14 @@ public static BlobTargetOption encryptionKey(String key) { return new BlobTargetOption(StorageRpc.Option.CUSTOMER_SUPPLIED_KEY, key); } + /** + * Returns an option to set a customer-managed key for server-side encryption of the blob. + */ + @GcpLaunchStage.Beta + public static BlobTargetOption kmsKeyName(String kmsKeyName) { + return new BlobTargetOption(StorageRpc.Option.KMS_KEY_NAME, kmsKeyName); + } + static Tuple convert(BlobInfo info, BlobWriteOption... options) { BlobInfo.Builder infoBuilder = info.toBuilder().setCrc32c(null).setMd5(null); List targetOptions = Lists.newArrayListWithCapacity(options.length); @@ -418,7 +418,7 @@ class BlobWriteOption implements Serializable { enum Option { PREDEFINED_ACL, IF_GENERATION_MATCH, IF_GENERATION_NOT_MATCH, IF_METAGENERATION_MATCH, - IF_METAGENERATION_NOT_MATCH, IF_MD5_MATCH, IF_CRC32C_MATCH, CUSTOMER_SUPPLIED_KEY, USER_PROJECT; + IF_METAGENERATION_NOT_MATCH, IF_MD5_MATCH, IF_CRC32C_MATCH, CUSTOMER_SUPPLIED_KEY, KMS_KEY_NAME, USER_PROJECT; StorageRpc.Option toRpcOption() { return StorageRpc.Option.valueOf(this.name()); @@ -536,6 +536,17 @@ public static BlobWriteOption encryptionKey(String key) { return new BlobWriteOption(Option.CUSTOMER_SUPPLIED_KEY, key); } + /** + * Returns an option to set a customer-managed KMS key for server-side encryption of the + * blob. + * + * @param kmsKeyName the KMS key resource id + */ + @GcpLaunchStage.Beta + public static BlobWriteOption kmsKeyName(String kmsKeyName) { + return new BlobWriteOption(Option.KMS_KEY_NAME, kmsKeyName); + } + /** * Returns an option for blob's billing user project. This option is only used by the buckets with * 'requester_pays' flag. diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java index d9717d3c8ac9..68a2e888d29e 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java @@ -286,6 +286,7 @@ public StorageObject create(StorageObject storageObject, final InputStream conte .setIfGenerationMatch(Option.IF_GENERATION_MATCH.getLong(options)) .setIfGenerationNotMatch(Option.IF_GENERATION_NOT_MATCH.getLong(options)) .setUserProject(Option.USER_PROJECT.getString(options)) + .setKmsKeyName(Option.KMS_KEY_NAME.getString(options)) .execute(); } catch (IOException ex) { span.setStatus(Status.UNKNOWN.withDescription(ex.getMessage())); @@ -790,7 +791,7 @@ private RewriteResponse rewrite(RewriteRequest req, String token) { if (userProject == null) { userProject = Option.USER_PROJECT.getString(req.targetOptions); } - String kmsKeyName = req.target.getKmsKeyName(); + String kmsKeyName = Option.KMS_KEY_NAME.getString(req.targetOptions); Long maxBytesRewrittenPerCall = req.megabytesRewrittenPerCall != null ? req.megabytesRewrittenPerCall * MEGABYTE : null; diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java index b49d16fbc340..a15544f68959 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java @@ -91,6 +91,7 @@ public class BlobTest { private static final String KEY_SHA256 = "keySha"; private static final BlobInfo.CustomerEncryption CUSTOMER_ENCRYPTION = new BlobInfo.CustomerEncryption(ENCRYPTION_ALGORITHM, KEY_SHA256); + private static final String KMS_KEY_NAME = "projects/p/locations/kr-loc/keyRings/kr/cryptoKeys/key"; private static final BlobInfo FULL_BLOB_INFO = BlobInfo.newBuilder("b", "n", GENERATION) .setAcl(ACLS) .setComponentCount(COMPONENT_COUNT) @@ -113,6 +114,7 @@ public class BlobTest { .setUpdateTime(UPDATE_TIME) .setCreateTime(CREATE_TIME) .setCustomerEncryption(CUSTOMER_ENCRYPTION) + .setKmsKeyName(KMS_KEY_NAME) .build(); private static final BlobInfo BLOB_INFO = BlobInfo.newBuilder("b", "n") .setMetageneration(42L) @@ -457,6 +459,7 @@ public void testBuilder() { .setCrc32c(CRC32) .setCreateTime(CREATE_TIME) .setCustomerEncryption(CUSTOMER_ENCRYPTION) + .setKmsKeyName(KMS_KEY_NAME) .setDeleteTime(DELETE_TIME) .setEtag(ETAG) .setGeneratedId(GENERATED_ID) @@ -511,6 +514,7 @@ public void testBuilder() { assertNull(blob.getCrc32c()); assertNull(blob.getCreateTime()); assertNull(blob.getCustomerEncryption()); + assertNull(blob.getKmsKeyName()); assertNull(blob.getDeleteTime()); assertNull(blob.getEtag()); assertNull(blob.getGeneratedId()); diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java index dbab8bc4ad83..cb5dd63d1adb 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java @@ -102,6 +102,8 @@ public class StorageImplTest { private static final String BASE64_KEY = "JVzfVl8NLD9FjedFuStegjRfES5ll5zc59CIXw572OA="; private static final Key KEY = new SecretKeySpec(BaseEncoding.base64().decode(BASE64_KEY), "AES256"); + private static final String KMS_KEY_NAME = + "projects/gcloud-devel/locations/us/keyRings/gcs_kms_key_ring_us/cryptoKeys/key"; // BucketInfo objects private static final BucketInfo BUCKET_INFO1 = @@ -245,6 +247,9 @@ public class StorageImplTest { private static final Map ENCRYPTION_KEY_OPTIONS = ImmutableMap.of(StorageRpc.Option.CUSTOMER_SUPPLIED_KEY, BASE64_KEY); + // Customer managed encryption key options + private static final Map KMS_KEY_NAME_OPTIONS = + ImmutableMap.of(StorageRpc.Option.KMS_KEY_NAME, KMS_KEY_NAME); // IAM policies private static final String POLICY_ETAG1 = "CAE="; private static final String POLICY_ETAG2 = "CAI="; diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java index 64efc81f1f05..09360efe2a4f 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java @@ -239,12 +239,13 @@ public void testCreateBlobWithEncryptionKey() { @Test public void testCreateBlobWithKmsKeyName() { String blobName = "test-create-with-kms-key-name-blob"; - BlobInfo blob = BlobInfo.newBuilder(BUCKET, blobName).setKmsKeyName(KMS_KEY_NAME_1).build(); - Blob remoteBlob = storage.create(blob, BLOB_BYTE_CONTENT); + BlobInfo blob = BlobInfo.newBuilder(BUCKET, blobName).build(); + Blob remoteBlob = storage.create(blob, BLOB_BYTE_CONTENT, Storage.BlobTargetOption.kmsKeyName(KMS_KEY_NAME_1)); assertNotNull(remoteBlob); assertEquals(blob.getBucket(), remoteBlob.getBucket()); assertEquals(blob.getName(), remoteBlob.getName()); - assertTrue(remoteBlob.getKmsKeyName().startsWith(blob.getKmsKeyName())); + assertNotNull(remoteBlob.getKmsKeyName()); + assertTrue(remoteBlob.getKmsKeyName().startsWith(KMS_KEY_NAME_1)); byte[] readBytes = storage.readAllBytes(BUCKET, blobName); assertArrayEquals(BLOB_BYTE_CONTENT, readBytes); } @@ -253,8 +254,9 @@ public void testCreateBlobWithKmsKeyName() { public void testCreateBlobWithKmsKeyNameAndCustomerSuppliedKey() { try { String blobName = "test-create-with-kms-key-name-blob"; - BlobInfo blob = BlobInfo.newBuilder(BUCKET, blobName).setKmsKeyName(KMS_KEY_NAME_1).build(); - storage.create(blob, BLOB_BYTE_CONTENT, Storage.BlobTargetOption.encryptionKey(KEY)); + BlobInfo blob = BlobInfo.newBuilder(BUCKET, blobName).build(); + storage.create(blob, BLOB_BYTE_CONTENT, Storage.BlobTargetOption.encryptionKey(KEY), + Storage.BlobTargetOption.kmsKeyName(KMS_KEY_NAME_1)); fail("StorageException was expected"); // can't supply both. } catch (StorageException ex) { // expected @@ -367,6 +369,20 @@ public void testGetBlobSelectedFields() { assertNull(remoteBlob.getContentType()); } + @Test + public void testGetBlobKmsKeyNameField() { + String blobName = "test-get-selected-kms-key-name-field-blob"; + BlobInfo blob = BlobInfo.newBuilder(BUCKET, blobName) + .setContentType(CONTENT_TYPE) + .build(); + assertNotNull(storage.create(blob, Storage.BlobTargetOption.kmsKeyName(KMS_KEY_NAME_1))); + Blob remoteBlob = storage.get(blob.getBlobId(), Storage.BlobGetOption.fields( + BlobField.KMS_KEY_NAME)); + assertEquals(blob.getBlobId(), remoteBlob.getBlobId()); + assertTrue(remoteBlob.getKmsKeyName().startsWith(KMS_KEY_NAME_1)); + assertNull(remoteBlob.getContentType()); + } + @Test public void testGetBlobAllSelectedFields() { String blobName = "test-get-all-selected-fields-blob"; @@ -459,14 +475,12 @@ public void testListBlobsKmsKeySelectedFields() throws InterruptedException { "test-list-blobs-selected-field-kms-key-name-blob2"}; BlobInfo blob1 = BlobInfo.newBuilder(BUCKET, blobNames[0]) .setContentType(CONTENT_TYPE) - .setKmsKeyName(KMS_KEY_NAME_1) .build(); BlobInfo blob2 = BlobInfo.newBuilder(BUCKET, blobNames[1]) .setContentType(CONTENT_TYPE) - .setKmsKeyName(KMS_KEY_NAME_1) .build(); - Blob remoteBlob1 = storage.create(blob1); - Blob remoteBlob2 = storage.create(blob2); + Blob remoteBlob1 = storage.create(blob1, Storage.BlobTargetOption.kmsKeyName(KMS_KEY_NAME_1)); + Blob remoteBlob2 = storage.create(blob2, Storage.BlobTargetOption.kmsKeyName(KMS_KEY_NAME_1)); assertNotNull(remoteBlob1); assertNotNull(remoteBlob2); Page page = storage.list(BUCKET, @@ -936,12 +950,11 @@ public void testRotateFromCustomerEncryptionToKmsKey() { BlobInfo target = BlobInfo.newBuilder(BUCKET, targetBlobName) .setContentType(CONTENT_TYPE) .setMetadata(metadata) - .setKmsKeyName(KMS_KEY_NAME_1) .build(); Storage.CopyRequest req = Storage.CopyRequest.newBuilder() .setSource(source) .setSourceOptions(Storage.BlobSourceOption.decryptionKey(BASE64_KEY)) - .setTarget(target) + .setTarget(target, Storage.BlobTargetOption.kmsKeyName(KMS_KEY_NAME_1)) .build(); CopyWriter copyWriter = storage.copy(req); assertEquals(BUCKET, copyWriter.getResult().getBucket()); @@ -967,13 +980,13 @@ public void testRotateFromCustomerEncryptionToKmsKeyWithCustomerEncrytion() { BlobInfo target = BlobInfo.newBuilder(BUCKET, targetBlobName) .setContentType(CONTENT_TYPE) .setMetadata(metadata) - .setKmsKeyName(KMS_KEY_NAME_1) .build(); try { Storage.CopyRequest req = Storage.CopyRequest.newBuilder() .setSource(source) .setSourceOptions(Storage.BlobSourceOption.decryptionKey(BASE64_KEY)) - .setTarget(target, Storage.BlobTargetOption.encryptionKey(KEY)) + .setTarget(target, Storage.BlobTargetOption.encryptionKey(KEY), + Storage.BlobTargetOption.kmsKeyName(KMS_KEY_NAME_1)) .build(); storage.copy(req); fail("StorageException was expected"); @@ -982,7 +995,6 @@ public void testRotateFromCustomerEncryptionToKmsKeyWithCustomerEncrytion() { } } - @Test public void testCopyBlobUpdateMetadata() { String sourceBlobName = "test-copy-blob-update-metadata-source"; @@ -1847,6 +1859,29 @@ public void testListBucketRequesterPaysFails() throws InterruptedException { } } + @Test + public void testListBucketDefaultKmsKeyName() throws InterruptedException { + Bucket remoteBucket = storage.get(BUCKET, Storage.BucketGetOption.fields(BucketField.ENCRYPTION)); + assertNull(remoteBucket.getDefaultKmsKeyName()); + remoteBucket = remoteBucket.toBuilder().setDefaultKmsKeyName(KMS_KEY_NAME_1).build().update(); + assertTrue(remoteBucket.getDefaultKmsKeyName().startsWith(KMS_KEY_NAME_1)); + Iterator bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET), + Storage.BucketListOption.fields(BucketField.ENCRYPTION)).iterateAll().iterator(); + while (!bucketIterator.hasNext()) { + Thread.sleep(500); + bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET), + Storage.BucketListOption.fields(BucketField.ENCRYPTION)).iterateAll().iterator(); + } + while (bucketIterator.hasNext()) { + Bucket bucket = bucketIterator.next(); + assertTrue(bucket.getName().startsWith(BUCKET)); + assertNotNull(bucket.getDefaultKmsKeyName()); + assertTrue(bucket.getDefaultKmsKeyName().startsWith(KMS_KEY_NAME_1)); + assertNull(bucket.getCreateTime()); + assertNull(bucket.getSelfLink()); + } + } + @Test public void testGetServiceAccount() throws InterruptedException { String projectId = remoteStorageHelper.getOptions().getProjectId(); From 4da3796f6978eda777b9f3d300bf286d8cb92482 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Tue, 8 May 2018 08:15:50 -0700 Subject: [PATCH 14/65] Make setKmsKeyName private --- .../src/main/java/com/google/cloud/storage/Blob.java | 2 +- .../src/main/java/com/google/cloud/storage/BlobInfo.java | 2 +- .../src/main/java/com/google/cloud/storage/Storage.java | 8 +++++++- .../com/google/cloud/storage/spi/v1/HttpStorageRpc.java | 1 - 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java index e7ffbc7515d6..a5d14126e0f6 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java @@ -404,7 +404,7 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) { @GcpLaunchStage.Beta @Override - public Builder setKmsKeyName(String kmsKeyName) { + Builder setKmsKeyName(String kmsKeyName) { infoBuilder.setKmsKeyName(kmsKeyName); return this; } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java index c31b61edfe5c..386daa63390a 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java @@ -488,7 +488,7 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) { @GcpLaunchStage.Beta @Override - public Builder setKmsKeyName(String kmsKeyName) { + Builder setKmsKeyName(String kmsKeyName) { this.kmsKeyName = kmsKeyName; return this; } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java index 194b10fea07e..d710c59a0d67 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java @@ -22,8 +22,14 @@ import com.google.api.gax.paging.Page; import com.google.auth.ServiceAccountSigner; import com.google.auth.ServiceAccountSigner.SigningException; -import com.google.cloud.*; +import com.google.cloud.FieldSelector; import com.google.cloud.FieldSelector.Helper; +import com.google.cloud.GcpLaunchStage; +import com.google.cloud.Policy; +import com.google.cloud.ReadChannel; +import com.google.cloud.Service; +import com.google.cloud.Tuple; +import com.google.cloud.WriteChannel; import com.google.cloud.storage.Acl.Entity; import com.google.cloud.storage.spi.v1.StorageRpc; import com.google.common.collect.ImmutableList; diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java index 68a2e888d29e..1ce683e7aab4 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java @@ -81,7 +81,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; - import org.apache.http.HttpStatus; public class HttpStorageRpc implements StorageRpc { From a1b0087ae33739e9eb741680824fba3bb37bd678 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Tue, 8 May 2018 10:49:23 -0700 Subject: [PATCH 15/65] Adding unit tests --- .../com/google/cloud/storage/BlobTest.java | 12 +++ .../com/google/cloud/storage/BucketTest.java | 16 ++++ .../google/cloud/storage/StorageImplTest.java | 87 +++++++++++++++++++ 3 files changed, 115 insertions(+) diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java index a15544f68959..f1b52a526b71 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java @@ -367,6 +367,18 @@ public void testWriterWithEncryptionKey() throws Exception { assertSame(channel, blob.writer(BlobWriteOption.encryptionKey(KEY))); } + @Test + public void testWriterWithKmsKeyName() throws Exception { + initializeExpectedBlob(2); + BlobWriteChannel channel = createMock(BlobWriteChannel.class); + expect(storage.getOptions()).andReturn(mockOptions); + expect(storage.writer(eq(expectedBlob), eq(BlobWriteOption.kmsKeyName(KMS_KEY_NAME)))) + .andReturn(channel); + replay(storage); + initializeBlob(); + assertSame(channel, blob.writer(BlobWriteOption.kmsKeyName(KMS_KEY_NAME))); + } + @Test public void testSignUrl() throws Exception { initializeExpectedBlob(2); diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java index 94c8ad715a0a..707a9f3c7565 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java @@ -366,6 +366,22 @@ public void testCreateWithEncryptionKey() throws Exception { assertEquals(expectedBlob, blob); } + @Test + public void testCreateWithKmsKeyName() throws Exception { + initializeExpectedBucket(5); + BlobInfo info = BlobInfo.newBuilder(BlobId.of("b", "n")).setContentType(CONTENT_TYPE).build(); + Blob expectedBlob = new Blob(serviceMockReturnsOptions, new BlobInfo.BuilderImpl(info)); + byte[] content = {0xD, 0xE, 0xA, 0xD}; + expect(storage.getOptions()).andReturn(mockOptions); + expect(storage.create(info, content, Storage.BlobTargetOption.kmsKeyName(DEFAULT_KMS_KEY_NAME))) + .andReturn(expectedBlob); + replay(storage); + initializeBucket(); + Blob blob = + bucket.create("n", content, CONTENT_TYPE, Bucket.BlobTargetOption.kmsKeyName(DEFAULT_KMS_KEY_NAME)); + assertEquals(expectedBlob, blob); + } + @Test public void testCreateNotExists() throws Exception { initializeExpectedBucket(5); diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java index cb5dd63d1adb..9fea3887c464 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java @@ -566,6 +566,40 @@ public void testCreateBlobWithEncryptionKey() throws IOException { assertEquals(-1, byteStream.read(streamBytes)); } + @Test + public void testCreateBlobWithKmsKeyName() throws IOException { + Capture capturedStream = Capture.newInstance(); + EasyMock.expect( + storageRpcMock.create( + EasyMock.eq( + BLOB_INFO1 + .toBuilder() + .setMd5(CONTENT_MD5) + .setCrc32c(CONTENT_CRC32C) + .build() + .toPb()), + EasyMock.capture(capturedStream), + EasyMock.eq(KMS_KEY_NAME_OPTIONS))) + .andReturn(BLOB_INFO1.toPb()) + .times(2); + EasyMock.replay(storageRpcMock); + initializeService(); + Blob blob = storage.create(BLOB_INFO1, BLOB_CONTENT, BlobTargetOption.kmsKeyName(KMS_KEY_NAME)); + assertEquals(expectedBlob1, blob); + ByteArrayInputStream byteStream = capturedStream.getValue(); + byte[] streamBytes = new byte[BLOB_CONTENT.length]; + assertEquals(BLOB_CONTENT.length, byteStream.read(streamBytes)); + assertArrayEquals(BLOB_CONTENT, streamBytes); + assertEquals(-1, byteStream.read(streamBytes)); + blob = storage.create(BLOB_INFO1, BLOB_CONTENT, BlobTargetOption.kmsKeyName(KMS_KEY_NAME)); + assertEquals(expectedBlob1, blob); + byteStream = capturedStream.getValue(); + streamBytes = new byte[BLOB_CONTENT.length]; + assertEquals(BLOB_CONTENT.length, byteStream.read(streamBytes)); + assertArrayEquals(BLOB_CONTENT, streamBytes); + assertEquals(-1, byteStream.read(streamBytes)); + } + @Test public void testCreateBlobFromStream() throws IOException { Capture capturedStream = Capture.newInstance(); @@ -1243,6 +1277,43 @@ public void testCopyWithEncryptionKey() { assertTrue(!writer.isDone()); } + @Test + public void testCopyFromEncryptionKeyToKmsKeyName() { + CopyRequest request = + Storage.CopyRequest.newBuilder() + .setSource(BLOB_INFO2.getBlobId()) + .setSourceOptions(BlobSourceOption.decryptionKey(KEY)) + .setTarget(BLOB_INFO1, BlobTargetOption.kmsKeyName(KMS_KEY_NAME)) + .build(); + StorageRpc.RewriteRequest rpcRequest = + new StorageRpc.RewriteRequest( + request.getSource().toPb(), + ENCRYPTION_KEY_OPTIONS, + true, + request.getTarget().toPb(), + KMS_KEY_NAME_OPTIONS, + null); + StorageRpc.RewriteResponse rpcResponse = + new StorageRpc.RewriteResponse(rpcRequest, null, 42L, false, "token", 21L); + EasyMock.expect(storageRpcMock.openRewrite(rpcRequest)).andReturn(rpcResponse).times(2); + EasyMock.replay(storageRpcMock); + initializeService(); + CopyWriter writer = storage.copy(request); + assertEquals(42L, writer.getBlobSize()); + assertEquals(21L, writer.getTotalBytesCopied()); + assertTrue(!writer.isDone()); + request = + Storage.CopyRequest.newBuilder() + .setSource(BLOB_INFO2.getBlobId()) + .setSourceOptions(BlobSourceOption.decryptionKey(BASE64_KEY)) + .setTarget(BLOB_INFO1, BlobTargetOption.kmsKeyName(KMS_KEY_NAME)) + .build(); + writer = storage.copy(request); + assertEquals(42L, writer.getBlobSize()); + assertEquals(21L, writer.getTotalBytesCopied()); + assertTrue(!writer.isDone()); + } + @Test public void testCopyWithOptionsFromBlobId() { CopyRequest request = @@ -1494,6 +1565,22 @@ public void testWriterWithEncryptionKey() { assertTrue(channel.isOpen()); } + @Test + public void testWriterWithKmsKeyName() { + BlobInfo info = BLOB_INFO1.toBuilder().setMd5(null).setCrc32c(null).build(); + EasyMock.expect(storageRpcMock.open(info.toPb(), KMS_KEY_NAME_OPTIONS)) + .andReturn("upload-id") + .times(2); + EasyMock.replay(storageRpcMock); + initializeService(); + WriteChannel channel = storage.writer(info, BlobWriteOption.kmsKeyName(KMS_KEY_NAME)); + assertNotNull(channel); + assertTrue(channel.isOpen()); + channel = storage.writer(info, BlobWriteOption.kmsKeyName(KMS_KEY_NAME)); + assertNotNull(channel); + assertTrue(channel.isOpen()); + } + @Test public void testSignUrl() throws NoSuchAlgorithmException, InvalidKeyException, SignatureException, From 619c6e41b95666fb2fdd612b57b1f24420400756 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Tue, 8 May 2018 11:03:38 -0700 Subject: [PATCH 16/65] Adding launch stage annotation to Fields --- .../src/main/java/com/google/cloud/storage/Storage.java | 2 ++ .../main/java/com/google/cloud/storage/spi/v1/StorageRpc.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java index d710c59a0d67..b49d48c70b08 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java @@ -93,6 +93,7 @@ enum BucketField implements FieldSelector { CORS("cors"), STORAGE_CLASS("storageClass"), ETAG("etag"), + @GcpLaunchStage.Beta ENCRYPTION("encryption"), BILLING("billing"); @@ -135,6 +136,7 @@ enum BlobField implements FieldSelector { SIZE("size"), STORAGE_CLASS("storageClass"), TIME_DELETED("timeDeleted"), + @GcpLaunchStage.Beta KMS_KEY_NAME("kmsKeyName"), UPDATED("updated"); diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java index ef0ffcd06cce..780d8b864cfd 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java @@ -25,6 +25,7 @@ import com.google.api.services.storage.model.ServiceAccount; import com.google.api.services.storage.model.StorageObject; import com.google.api.services.storage.model.TestIamPermissionsResponse; +import com.google.cloud.GcpLaunchStage; import com.google.cloud.ServiceRpc; import com.google.cloud.Tuple; import com.google.cloud.storage.StorageException; @@ -56,6 +57,7 @@ enum Option { FIELDS("fields"), CUSTOMER_SUPPLIED_KEY("customerSuppliedKey"), USER_PROJECT("userProject"), + @GcpLaunchStage.Beta KMS_KEY_NAME("kmsKeyName"); private final String value; From 260e93d6d3144256ae6418487e04dd5d4f916be7 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Tue, 8 May 2018 11:17:06 -0700 Subject: [PATCH 17/65] spanner: fix log syntax (#3241) Fixes #3235. --- .../src/main/java/com/google/cloud/spanner/SessionPool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java index 3f21e28bd8ac..80e4d67eb664 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java @@ -599,7 +599,7 @@ private void closeIdleSessions(Instant currTime) { } } for (PooledSession sess : sessionsToClose) { - logger.log(Level.FINE, "Closing session %s", sess.getName()); + logger.log(Level.FINE, "Closing session {0}", sess.getName()); closeSession(sess); } } From 40a0012c998c8e7ebd0a049686f3cc074e273366 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Tue, 8 May 2018 11:41:55 -0700 Subject: [PATCH 18/65] bump to snapshot version (#3245) --- google-cloud-bigquery/pom.xml | 4 +- google-cloud-bigquerydatatransfer/pom.xml | 4 +- google-cloud-bigtable/pom.xml | 4 +- google-cloud-bom/pom.xml | 90 +++++++++---------- google-cloud-compute/pom.xml | 4 +- google-cloud-container/pom.xml | 4 +- .../google-cloud-logging-logback/pom.xml | 4 +- .../google-cloud-nio-examples/README.md | 4 +- .../google-cloud-nio-examples/pom.xml | 4 +- google-cloud-contrib/google-cloud-nio/pom.xml | 4 +- google-cloud-contrib/pom.xml | 4 +- google-cloud-core-grpc/pom.xml | 4 +- google-cloud-core-http/pom.xml | 4 +- google-cloud-core/pom.xml | 4 +- google-cloud-dataproc/pom.xml | 4 +- google-cloud-datastore/pom.xml | 4 +- google-cloud-dialogflow/pom.xml | 4 +- google-cloud-dlp/pom.xml | 4 +- google-cloud-dns/pom.xml | 4 +- google-cloud-errorreporting/pom.xml | 4 +- google-cloud-examples/pom.xml | 4 +- google-cloud-firestore/pom.xml | 4 +- google-cloud-language/pom.xml | 4 +- google-cloud-logging/pom.xml | 4 +- google-cloud-monitoring/pom.xml | 4 +- google-cloud-notification/pom.xml | 4 +- google-cloud-os-login/pom.xml | 4 +- google-cloud-pubsub/pom.xml | 4 +- google-cloud-redis/pom.xml | 4 +- google-cloud-resourcemanager/pom.xml | 4 +- google-cloud-spanner/pom.xml | 4 +- google-cloud-speech/pom.xml | 4 +- google-cloud-storage/pom.xml | 4 +- .../google-cloud-appengineflexcompat/pom.xml | 4 +- .../google-cloud-appengineflexcustom/pom.xml | 4 +- .../google-cloud-appengineflexjava/pom.xml | 4 +- .../google-cloud-appenginejava8/pom.xml | 4 +- .../google-cloud-managedtest/pom.xml | 4 +- google-cloud-testing/pom.xml | 4 +- google-cloud-texttospeech/pom.xml | 4 +- google-cloud-trace/pom.xml | 4 +- google-cloud-translate/pom.xml | 4 +- .../google-cloud-compat-checker/pom.xml | 4 +- google-cloud-util/pom.xml | 4 +- google-cloud-video-intelligence/pom.xml | 4 +- google-cloud-vision/pom.xml | 4 +- google-cloud/pom.xml | 4 +- pom.xml | 4 +- 48 files changed, 139 insertions(+), 139 deletions(-) diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml index 9eee99beb5b1..603d3192d4e5 100644 --- a/google-cloud-bigquery/pom.xml +++ b/google-cloud-bigquery/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigquery - 1.29.0 + 1.29.1-SNAPSHOT jar Google Cloud BigQuery https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquery @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-bigquery diff --git a/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-bigquerydatatransfer/pom.xml index 653348e48610..b2b4f2f7f2a2 100644 --- a/google-cloud-bigquerydatatransfer/pom.xml +++ b/google-cloud-bigquerydatatransfer/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigquerydatatransfer - 0.47.0-beta + 0.47.1-beta-SNAPSHOT jar Google Cloud Bigquery Data Transfer https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquerydatatransfer @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-bigquerydatatransfer diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 7de45bc0d56e..e5e1daf3d704 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud Bigtable https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigtable @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-bigtable diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index 28468afe2f51..01474752a808 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bom pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT Google Cloud Java BOM https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bom @@ -124,51 +124,51 @@ - 0.47.0-alpha - 0.47.0-alpha - 1.29.0 - 0.47.0-beta - 0.47.0-alpha - 0.47.0-beta - 0.47.0-alpha - 1.29.0 - 1.29.0 - 1.29.0 - 0.47.0-alpha - 1.29.0 - 0.47.0-alpha - 0.47.0-beta - 0.47.0-alpha - 0.47.0-beta - 0.47.0-alpha - 0.47.0-beta - 1.29.0 - 1.29.0 - 0.47.0-alpha - 0.47.0-beta - 0.47.0-alpha - 0.47.0-alpha - 0.47.0-beta - 0.47.0-alpha - 0.47.0-beta - 0.47.0-alpha - 0.47.0-alpha - 0.47.0-beta - 0.47.0-alpha - 1.29.0 - 0.47.0-beta - 0.47.0-beta - 1.29.0 - 0.47.0-beta - 1.29.0 + 0.47.1-alpha-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 1.29.1-SNAPSHOT + 0.47.1-beta-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-beta-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 1.29.1-SNAPSHOT + 1.29.1-SNAPSHOT + 1.29.1-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 1.29.1-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-beta-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-beta-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-beta-SNAPSHOT + 1.29.1-SNAPSHOT + 1.29.1-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-beta-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-beta-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-beta-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-beta-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 1.29.1-SNAPSHOT + 0.47.1-beta-SNAPSHOT + 0.47.1-beta-SNAPSHOT + 1.29.1-SNAPSHOT + 0.47.1-beta-SNAPSHOT + 1.29.1-SNAPSHOT - 0.47.0-alpha - 0.47.0-alpha - 0.47.0-alpha - 0.47.0-alpha - 0.47.0-alpha - 0.47.0-alpha - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-alpha-SNAPSHOT + 0.47.1-alpha-SNAPSHOT 1.5.0 1.25.0 diff --git a/google-cloud-compute/pom.xml b/google-cloud-compute/pom.xml index 93c5879cd27e..838b5aa4ec28 100644 --- a/google-cloud-compute/pom.xml +++ b/google-cloud-compute/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-compute - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud Compute https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-compute @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-compute diff --git a/google-cloud-container/pom.xml b/google-cloud-container/pom.xml index 96e4e6718bfa..2510281a5580 100644 --- a/google-cloud-container/pom.xml +++ b/google-cloud-container/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-container - 0.47.0-beta + 0.47.1-beta-SNAPSHOT jar Google Cloud Container https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-container @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-container diff --git a/google-cloud-contrib/google-cloud-logging-logback/pom.xml b/google-cloud-contrib/google-cloud-logging-logback/pom.xml index 294fa8612d67..aedd1459a507 100644 --- a/google-cloud-contrib/google-cloud-logging-logback/pom.xml +++ b/google-cloud-contrib/google-cloud-logging-logback/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud Logging Logback Appender https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-logging-logback @@ -20,7 +20,7 @@ com.google.cloud google-cloud-contrib - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT diff --git a/google-cloud-contrib/google-cloud-nio-examples/README.md b/google-cloud-contrib/google-cloud-nio-examples/README.md index 0f38bd24525b..f545bfb2b405 100644 --- a/google-cloud-contrib/google-cloud-nio-examples/README.md +++ b/google-cloud-contrib/google-cloud-nio-examples/README.md @@ -23,12 +23,12 @@ To run this example: [//]: # ({x-version-update-start:google-cloud-nio:current}) ``` - java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.47.0-alpha.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.47.0-alpha.jar com.google.cloud.nio.examples.ListFilesystems + java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.47.1-alpha-SNAPSHOT.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.47.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems ``` Notice that it lists Google Cloud Storage, which it wouldn't if you ran it without the NIO jar: ``` - java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.47.0-alpha.jar com.google.cloud.nio.examples.ListFilesystems + java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.47.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-contrib/google-cloud-nio-examples/pom.xml b/google-cloud-contrib/google-cloud-nio-examples/pom.xml index 1b1d7b4bed8f..4316725b2fe8 100644 --- a/google-cloud-contrib/google-cloud-nio-examples/pom.xml +++ b/google-cloud-contrib/google-cloud-nio-examples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-nio-examples - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud NIO Examples https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio-examples @@ -12,7 +12,7 @@ com.google.cloud google-cloud-contrib - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-nio-examples diff --git a/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-contrib/google-cloud-nio/pom.xml index 3a7b3deaf783..79b6b9b85b2c 100644 --- a/google-cloud-contrib/google-cloud-nio/pom.xml +++ b/google-cloud-contrib/google-cloud-nio/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-nio - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud NIO https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio @@ -12,7 +12,7 @@ com.google.cloud google-cloud-contrib - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-nio diff --git a/google-cloud-contrib/pom.xml b/google-cloud-contrib/pom.xml index a9d222bf3932..9c78c8381cdd 100644 --- a/google-cloud-contrib/pom.xml +++ b/google-cloud-contrib/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-contrib - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT pom Google Cloud Contributions https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-contrib diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml index ca5e706cf1bf..bbd1adb19f0a 100644 --- a/google-cloud-core-grpc/pom.xml +++ b/google-cloud-core-grpc/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-core-grpc - 1.29.0 + 1.29.1-SNAPSHOT jar Google Cloud Core gRPC https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-core-grpc diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml index 2a86af060fa2..44f19bce2aad 100644 --- a/google-cloud-core-http/pom.xml +++ b/google-cloud-core-http/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-core-http - 1.29.0 + 1.29.1-SNAPSHOT jar Google Cloud Core HTTP https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-core-http diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml index d66fc8832eba..583c810cfbfc 100644 --- a/google-cloud-core/pom.xml +++ b/google-cloud-core/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-core - 1.29.0 + 1.29.1-SNAPSHOT jar Google Cloud Core https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-core diff --git a/google-cloud-dataproc/pom.xml b/google-cloud-dataproc/pom.xml index f4325ea4c498..451b84bbcbdb 100644 --- a/google-cloud-dataproc/pom.xml +++ b/google-cloud-dataproc/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-dataproc - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud Dataproc https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dataproc @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-dataproc diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index c62650cb23ab..c3cba7785987 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 1.29.0 + 1.29.1-SNAPSHOT jar Google Cloud Datastore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-datastore diff --git a/google-cloud-dialogflow/pom.xml b/google-cloud-dialogflow/pom.xml index 3003ff2b4590..84305502dfc6 100644 --- a/google-cloud-dialogflow/pom.xml +++ b/google-cloud-dialogflow/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-dialogflow - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud Dialog Flow API https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dialogflow @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-dialogflow diff --git a/google-cloud-dlp/pom.xml b/google-cloud-dlp/pom.xml index f85fcfc00f49..ac626f19908f 100644 --- a/google-cloud-dlp/pom.xml +++ b/google-cloud-dlp/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-dlp - 0.47.0-beta + 0.47.1-beta-SNAPSHOT jar Google Cloud Data Loss Prevention API https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dlp @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-dlp-v2beta1 diff --git a/google-cloud-dns/pom.xml b/google-cloud-dns/pom.xml index b16c62edafd6..2c1e1b8d25cf 100644 --- a/google-cloud-dns/pom.xml +++ b/google-cloud-dns/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-dns - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud DNS https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dns @@ -14,7 +14,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-dns diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml index 523eb9f8a20e..7b0a9f2e6636 100644 --- a/google-cloud-errorreporting/pom.xml +++ b/google-cloud-errorreporting/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-errorreporting - 0.47.0-beta + 0.47.1-beta-SNAPSHOT jar Google Cloud Error Reporting https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-errorreporting @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-errorreporting diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml index 5c3796b0521b..7f70ae22d9f4 100644 --- a/google-cloud-examples/pom.xml +++ b/google-cloud-examples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-examples - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud Examples https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-examples @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-examples diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index 77cfe9584c7c..1bd29eb3e7ae 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-firestore - 0.47.0-beta + 0.47.1-beta-SNAPSHOT jar Google Cloud Firestore https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-firestore @@ -15,7 +15,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-firestore diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml index edef12fddbf7..f392b39bd37b 100644 --- a/google-cloud-language/pom.xml +++ b/google-cloud-language/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-language - 1.29.0 + 1.29.1-SNAPSHOT jar Google Cloud Natural Language https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-language @@ -15,7 +15,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-language diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index 196070f3d31e..0147f1dba7af 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-logging - 1.29.0 + 1.29.1-SNAPSHOT jar Google Cloud Logging https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-logging diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml index 1236338fae30..3448997b7475 100644 --- a/google-cloud-monitoring/pom.xml +++ b/google-cloud-monitoring/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-monitoring - 0.47.0-beta + 0.47.1-beta-SNAPSHOT jar Google Cloud Monitoring https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-monitoring @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-monitoring diff --git a/google-cloud-notification/pom.xml b/google-cloud-notification/pom.xml index 73781f36e131..a9a099550619 100644 --- a/google-cloud-notification/pom.xml +++ b/google-cloud-notification/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-notification - 0.47.0-beta + 0.47.1-beta-SNAPSHOT jar Google Cloud Pub/Sub Notifications for GCS https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-notification @@ -15,7 +15,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-notification diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml index 5261fa5d4cad..d7f4f129a2ee 100644 --- a/google-cloud-os-login/pom.xml +++ b/google-cloud-os-login/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-os-login - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud OS Login https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-os-login @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-os-login diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index 15c6080c4591..17c18a562680 100644 --- a/google-cloud-pubsub/pom.xml +++ b/google-cloud-pubsub/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-pubsub - 0.47.0-beta + 0.47.1-beta-SNAPSHOT jar Google Cloud Pub/Sub https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-pubsub @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-pubsub diff --git a/google-cloud-redis/pom.xml b/google-cloud-redis/pom.xml index 1d799d6d2729..238ea4703767 100644 --- a/google-cloud-redis/pom.xml +++ b/google-cloud-redis/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-redis - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud Redis https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-redis @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-redis diff --git a/google-cloud-resourcemanager/pom.xml b/google-cloud-resourcemanager/pom.xml index dc2e7637f20d..571830b1288b 100644 --- a/google-cloud-resourcemanager/pom.xml +++ b/google-cloud-resourcemanager/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-resourcemanager - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud Resource Manager https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-resourcemanager @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-resourcemanager diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 184e3eda31c7..8524590c2884 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -4,7 +4,7 @@ http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 google-cloud-spanner - 0.47.0-beta + 0.47.1-beta-SNAPSHOT jar Google Cloud Spanner https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-spanner @@ -14,7 +14,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-spanner diff --git a/google-cloud-speech/pom.xml b/google-cloud-speech/pom.xml index f4a4e2c4ea85..8a9df6aa3005 100644 --- a/google-cloud-speech/pom.xml +++ b/google-cloud-speech/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-speech - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud Speech https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-speech @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-speech diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml index bb72e9d73f60..479f02dba01b 100644 --- a/google-cloud-storage/pom.xml +++ b/google-cloud-storage/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-storage - 1.29.0 + 1.29.1-SNAPSHOT jar Google Cloud Storage https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-storage @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-storage diff --git a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml index 92b7b0400de9..d9fc20c4e505 100644 --- a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml +++ b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-appengineflexcompat - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT war google-cloud-testing com.google.cloud - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT diff --git a/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml b/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml index c060934ec9d5..aaf75038c8a8 100644 --- a/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml +++ b/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-appengineflexcustom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT war google-cloud-testing com.google.cloud - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT diff --git a/google-cloud-testing/google-cloud-appengineflexjava/pom.xml b/google-cloud-testing/google-cloud-appengineflexjava/pom.xml index ea6ded9a8522..33c71a555a1b 100644 --- a/google-cloud-testing/google-cloud-appengineflexjava/pom.xml +++ b/google-cloud-testing/google-cloud-appengineflexjava/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-appengineflexjava - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT war google-cloud-testing com.google.cloud - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT diff --git a/google-cloud-testing/google-cloud-appenginejava8/pom.xml b/google-cloud-testing/google-cloud-appenginejava8/pom.xml index 2f661d7cbed1..fc507b820b75 100644 --- a/google-cloud-testing/google-cloud-appenginejava8/pom.xml +++ b/google-cloud-testing/google-cloud-appenginejava8/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-appenginejava8 - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT war google-cloud-testing com.google.cloud - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT diff --git a/google-cloud-testing/google-cloud-managedtest/pom.xml b/google-cloud-testing/google-cloud-managedtest/pom.xml index ee8452177c05..ded4ef93af7c 100644 --- a/google-cloud-testing/google-cloud-managedtest/pom.xml +++ b/google-cloud-testing/google-cloud-managedtest/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-managedtest - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar google-cloud-testing com.google.cloud - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml index 290af23c70c2..02cd611796fc 100644 --- a/google-cloud-testing/pom.xml +++ b/google-cloud-testing/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-testing - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT pom Google Cloud Testing @@ -13,7 +13,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-testing diff --git a/google-cloud-texttospeech/pom.xml b/google-cloud-texttospeech/pom.xml index bbcf1df3de46..a67efe71d541 100644 --- a/google-cloud-texttospeech/pom.xml +++ b/google-cloud-texttospeech/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-texttospeech - 0.47.0-beta + 0.47.1-beta-SNAPSHOT jar Google Cloud Text-to-Speech https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-texttospeech @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-texttospeech-v1beta1 diff --git a/google-cloud-trace/pom.xml b/google-cloud-trace/pom.xml index 764ce35acec0..004844f0a3a1 100644 --- a/google-cloud-trace/pom.xml +++ b/google-cloud-trace/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-trace - 0.47.0-beta + 0.47.1-beta-SNAPSHOT jar Google Cloud Trace https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-trace @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-trace diff --git a/google-cloud-translate/pom.xml b/google-cloud-translate/pom.xml index cf987dffdbca..018c11b7e3c6 100644 --- a/google-cloud-translate/pom.xml +++ b/google-cloud-translate/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-translate - 1.29.0 + 1.29.1-SNAPSHOT jar Google Cloud Translation https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-translate @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-translate diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml index f2ca024d7c7e..bcb585c2ef6c 100644 --- a/google-cloud-util/google-cloud-compat-checker/pom.xml +++ b/google-cloud-util/google-cloud-compat-checker/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-compat-checker - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud Java Compatibility Checker https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util/google-cloud-compat-checker @@ -12,7 +12,7 @@ com.google.cloud google-cloud-util - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-compat-checker diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml index aa7ab7804793..8cb99f51f192 100644 --- a/google-cloud-util/pom.xml +++ b/google-cloud-util/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-util - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT pom Google Cloud Util https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util @@ -13,7 +13,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-compat-checker diff --git a/google-cloud-video-intelligence/pom.xml b/google-cloud-video-intelligence/pom.xml index 479c0c2af7ab..7450c9d7709c 100644 --- a/google-cloud-video-intelligence/pom.xml +++ b/google-cloud-video-intelligence/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-video-intelligence - 0.47.0-beta + 0.47.1-beta-SNAPSHOT jar Google Cloud Video Intelligence https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-video-intelligence @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-video-intelligence diff --git a/google-cloud-vision/pom.xml b/google-cloud-vision/pom.xml index a2e5166703b6..a9c62e19f88f 100644 --- a/google-cloud-vision/pom.xml +++ b/google-cloud-vision/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-vision - 1.29.0 + 1.29.1-SNAPSHOT jar Google Cloud Vision https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-vision @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT google-cloud-vision diff --git a/google-cloud/pom.xml b/google-cloud/pom.xml index 5c5875aaa485..992be0d7674c 100644 --- a/google-cloud/pom.xml +++ b/google-cloud/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT jar Google Cloud https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud @@ -12,7 +12,7 @@ com.google.cloud google-cloud-pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT diff --git a/pom.xml b/pom.xml index 798e80d7724f..fde14b1386b6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-pom pom - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT Google Cloud https://github.com/GoogleCloudPlatform/google-cloud-java @@ -154,7 +154,7 @@ UTF-8 github google-cloud - 0.47.0-alpha + 0.47.1-alpha-SNAPSHOT 1.23.0 1.25.0 0.9.1 From 4b6e1cbe806eb88607fb955efa32eaa50e6aab43 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Tue, 8 May 2018 11:54:06 -0700 Subject: [PATCH 19/65] bigquery: let users contruct TableResult for testing (#3242) Fixes #3228. --- .../main/java/com/google/cloud/bigquery/TableResult.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableResult.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableResult.java index fd5e653798d6..a7be10d7d2ad 100644 --- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableResult.java +++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableResult.java @@ -18,6 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; +import com.google.api.core.InternalApi; import com.google.api.gax.paging.Page; import com.google.common.base.Function; import com.google.common.base.MoreObjects; @@ -35,7 +36,12 @@ public class TableResult implements Page, Serializable { private final long totalRows; private final Page pageNoSchema; - TableResult(Schema schema, long totalRows, Page pageNoSchema) { + /** + * If {@code schema} is non-null, {@code TableResult} adds the schema to {@code FieldValueList}s + * when iterating through them. {@code pageNoSchema} must not be null. + */ + @InternalApi("Exposed for testing") + public TableResult(Schema schema, long totalRows, Page pageNoSchema) { this.schema = schema; this.totalRows = totalRows; this.pageNoSchema = checkNotNull(pageNoSchema); From b39160046ed9103f8b847db56743db5f86bfd08a Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Wed, 9 May 2018 12:05:52 -0700 Subject: [PATCH 20/65] remove dead assignment (#3247) --- utilities/bump_versions.py | 1 - 1 file changed, 1 deletion(-) diff --git a/utilities/bump_versions.py b/utilities/bump_versions.py index a086cf8619c7..774d48b9da1f 100644 --- a/utilities/bump_versions.py +++ b/utilities/bump_versions.py @@ -96,7 +96,6 @@ def bump_versions(next_version_type, bump_type): (module, released_version_str, current_version_str) = version_line.split(':') released_version = Version(released_version_str) - current_version = Version(current_version_str) if next_version_type == 'next_release': released_version.bump(bump_type) From 1b3da96af65496c9a8c085d9cf85fd521416833b Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Wed, 9 May 2018 12:06:09 -0700 Subject: [PATCH 21/65] bigquery: unbox Boolean in examples (#3248) --- .../java/com/google/cloud/bigquery/BigQuery.java | 8 ++++---- .../bigquery/snippets/BigQuerySnippets.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java index d229a26b5bae..bab3d3370518 100644 --- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java +++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java @@ -671,7 +671,7 @@ public int hashCode() { *

Example of deleting a dataset from its id, even if non-empty. * 

 {@code
    * String datasetName = "my_dataset_name";
-   * Boolean deleted = bigquery.delete(datasetName, DatasetDeleteOption.deleteContents());
+   * boolean deleted = bigquery.delete(datasetName, DatasetDeleteOption.deleteContents());
    * if (deleted) {
    *   // the dataset was deleted
    * } else {
@@ -692,7 +692,7 @@ public int hashCode() {
    * String projectId = "my_project_id";
    * String datasetName = "my_dataset_name";
    * DatasetId datasetId = DatasetId.of(projectId, datasetName);
-   * Boolean deleted = bigquery.delete(datasetId, DatasetDeleteOption.deleteContents());
+   * boolean deleted = bigquery.delete(datasetId, DatasetDeleteOption.deleteContents());
    * if (deleted) {
    *   // the dataset was deleted
    * } else {
@@ -712,7 +712,7 @@ public int hashCode() {
    * 
 {@code
    * String datasetName = "my_dataset_name";
    * String tableName = "my_table_name";
-   * Boolean deleted = bigquery.delete(datasetName, tableName);
+   * boolean deleted = bigquery.delete(datasetName, tableName);
    * if (deleted) {
    *   // the table was deleted
    * } else {
@@ -734,7 +734,7 @@ public int hashCode() {
    * String datasetName = "my_dataset_name";
    * String tableName = "my_table_name";
    * TableId tableId = TableId.of(projectId, datasetName, tableName);
-   * Boolean deleted = bigquery.delete(tableId);
+   * boolean deleted = bigquery.delete(tableId);
    * if (deleted) {
    *   // the table was deleted
    * } else {
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java
index 2763493c1a3a..ab491ff2a5e3 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/BigQuerySnippets.java
@@ -168,9 +168,9 @@ public Page listDatasets(String projectId) {
    */
   // [TARGET delete(String, DatasetDeleteOption...)]
   // [VARIABLE "my_dataset_name"]
-  public Boolean deleteDataset(String datasetName) {
+  public boolean deleteDataset(String datasetName) {
     // [START ]
-    Boolean deleted = bigquery.delete(datasetName, DatasetDeleteOption.deleteContents());
+    boolean deleted = bigquery.delete(datasetName, DatasetDeleteOption.deleteContents());
     if (deleted) {
       // the dataset was deleted
     } else {
@@ -186,10 +186,10 @@ public Boolean deleteDataset(String datasetName) {
   // [TARGET delete(DatasetId, DatasetDeleteOption...)]
   // [VARIABLE "my_project_id"]
   // [VARIABLE "my_dataset_name"]
-  public Boolean deleteDatasetFromId(String projectId, String datasetName) {
+  public boolean deleteDatasetFromId(String projectId, String datasetName) {
     // [START bigquery_delete_dataset]
     DatasetId datasetId = DatasetId.of(projectId, datasetName);
-    Boolean deleted = bigquery.delete(datasetId, DatasetDeleteOption.deleteContents());
+    boolean deleted = bigquery.delete(datasetId, DatasetDeleteOption.deleteContents());
     if (deleted) {
       // the dataset was deleted
     } else {
@@ -205,9 +205,9 @@ public Boolean deleteDatasetFromId(String projectId, String datasetName) {
   // [TARGET delete(String, String)]
   // [VARIABLE "my_dataset_name"]
   // [VARIABLE "my_table_name"]
-  public Boolean deleteTable(String datasetName, String tableName) {
+  public boolean deleteTable(String datasetName, String tableName) {
     // [START ]
-    Boolean deleted = bigquery.delete(datasetName, tableName);
+    boolean deleted = bigquery.delete(datasetName, tableName);
     if (deleted) {
       // the table was deleted
     } else {
@@ -224,10 +224,10 @@ public Boolean deleteTable(String datasetName, String tableName) {
   // [VARIABLE "my_project_id"]
   // [VARIABLE "my_dataset_name"]
   // [VARIABLE "my_table_name"]
-  public Boolean deleteTableFromId(String projectId, String datasetName, String tableName) {
+  public boolean deleteTableFromId(String projectId, String datasetName, String tableName) {
     // [START bigquery_delete_table]
     TableId tableId = TableId.of(projectId, datasetName, tableName);
-    Boolean deleted = bigquery.delete(tableId);
+    boolean deleted = bigquery.delete(tableId);
     if (deleted) {
       // the table was deleted
     } else {

From 27c90f1298bb27a618ff59b3cd17321c577f3a6b Mon Sep 17 00:00:00 2001
From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com>
Date: Thu, 10 May 2018 10:54:50 -0700
Subject: [PATCH 22/65] Move grpc and proto artifacts to google-cloud-java from
 api-client-staging (second part) (#3251)

1) Radically change the structure of the repo. Now the root `pom.xml` file is not deployed to maven and is not a parent pom for any of the other modules, but is simply an aggregator pom, which aggregates other mostly independent of each other modules.
2) Update proto and grpc artifact to the latest generated versions as of time of this PR.
3) Add `cloudiot-v1` and `websecurityscanner-v1alpha` proto and grp artifacts (not released yet even in api-client-staging). Note, gapic clients for this apis are not added yet.
4) Rename `google-cloud-pom` parent artifact (for manual and gapic clients) to `google-cloud-clients`.
5) Move all manual and gapic clients from root directory to `google-cloud-clients` sub directory.
6) Make `google-cloud-bom` not a child of `google-cloud-clients` (former `google-cloud-pom`) anymore, keep it on root level so it becomes a sibling of `google-cloud-clients` (module which used to be its parent).
7) Similarly make `google-cloud-examples`, `google-cloud-testing` and `google-cloud-util` not children of `google-cloud-clients` and keep them on root level. Make these three modules also excluded from maven deployment (they will not be published to maven anymore).

After this PR is done, additional work is required to fix circleci individual IT tests runs (should be trivial). Also deployment and documentation scripts must be modified accordingly (will be done right after pushing this PR).
---
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../grpc-google-cloud-bigtable-v2/pom.xml     |    6 +-
 .../grpc-google-cloud-cloudiot-v1/pom.xml     |   31 +
 .../cloud/iot/v1/DeviceManagerGrpc.java       | 1734 +++++
 .../grpc-google-cloud-container-v1/pom.xml    |    6 +-
 .../grpc-google-cloud-dataproc-v1/pom.xml     |    6 +-
 .../grpc-google-cloud-dialogflow-v2/pom.xml   |    6 +-
 .../pom.xml                                   |    6 +-
 .../grpc-google-cloud-dlp-v2/pom.xml          |    6 +-
 .../grpc-google-cloud-dlp-v2beta1/pom.xml     |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../grpc-google-cloud-language-v1/pom.xml     |    6 +-
 .../pom.xml                                   |    6 +-
 .../grpc-google-cloud-logging-v2/pom.xml      |    6 +-
 .../grpc-google-cloud-monitoring-v3/pom.xml   |    6 +-
 .../grpc-google-cloud-os-login-v1/pom.xml     |    6 +-
 .../grpc-google-cloud-pubsub-v1/pom.xml       |    6 +-
 .../grpc-google-cloud-redis-v1beta1/pom.xml   |   31 +
 .../cloud/redis/v1beta1/CloudRedisGrpc.java   |  804 +++
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../grpc-google-cloud-spanner-v1/pom.xml      |    6 +-
 .../grpc-google-cloud-speech-v1/pom.xml       |    6 +-
 .../grpc-google-cloud-speech-v1beta1/pom.xml  |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../grpc-google-cloud-trace-v1/pom.xml        |    6 +-
 .../grpc-google-cloud-trace-v2/pom.xml        |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../grpc-google-cloud-vision-v1/pom.xml       |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |   31 +
 .../v1alpha/WebSecurityScannerGrpc.java       | 1431 ++++
 google-api-grpc/pom.xml                       |  184 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../proto-google-cloud-bigtable-v2/pom.xml    |    6 +-
 .../proto-google-cloud-cloudiot-v1/pom.xml    |   36 +
 .../iot/v1/CreateDeviceRegistryRequest.java   |  812 +++
 .../CreateDeviceRegistryRequestOrBuilder.java |   60 +
 .../cloud/iot/v1/CreateDeviceRequest.java     |  819 +++
 .../iot/v1/CreateDeviceRequestOrBuilder.java  |   62 +
 .../iot/v1/DeleteDeviceRegistryRequest.java   |  559 ++
 .../DeleteDeviceRegistryRequestOrBuilder.java |   29 +
 .../cloud/iot/v1/DeleteDeviceRequest.java     |  566 ++
 .../iot/v1/DeleteDeviceRequestOrBuilder.java  |   31 +
 .../java/com/google/cloud/iot/v1/Device.java  | 4188 ++++++++++++
 .../com/google/cloud/iot/v1/DeviceConfig.java | 1127 +++
 .../cloud/iot/v1/DeviceConfigOrBuilder.java   |  107 +
 .../google/cloud/iot/v1/DeviceCredential.java | 1090 +++
 .../iot/v1/DeviceCredentialOrBuilder.java     |   97 +
 .../cloud/iot/v1/DeviceManagerProto.java      |  390 ++
 .../com/google/cloud/iot/v1/DeviceName.java   |  244 +
 .../google/cloud/iot/v1/DeviceOrBuilder.java  |  530 ++
 .../google/cloud/iot/v1/DeviceRegistry.java   | 2727 ++++++++
 .../cloud/iot/v1/DeviceRegistryOrBuilder.java |  310 +
 .../com/google/cloud/iot/v1/DeviceState.java  |  715 ++
 .../cloud/iot/v1/DeviceStateOrBuilder.java    |   46 +
 .../cloud/iot/v1/EventNotificationConfig.java |  735 ++
 .../v1/EventNotificationConfigOrBuilder.java  |   53 +
 .../iot/v1/GetDeviceRegistryRequest.java      |  559 ++
 .../v1/GetDeviceRegistryRequestOrBuilder.java |   29 +
 .../google/cloud/iot/v1/GetDeviceRequest.java |  807 +++
 .../iot/v1/GetDeviceRequestOrBuilder.java     |   59 +
 .../com/google/cloud/iot/v1/HttpConfig.java   |  515 ++
 .../cloud/iot/v1/HttpConfigOrBuilder.java     |   28 +
 .../com/google/cloud/iot/v1/HttpState.java    |  143 +
 .../v1/ListDeviceConfigVersionsRequest.java   |  648 ++
 ...tDeviceConfigVersionsRequestOrBuilder.java |   42 +
 .../v1/ListDeviceConfigVersionsResponse.java  |  857 +++
 ...DeviceConfigVersionsResponseOrBuilder.java |   58 +
 .../iot/v1/ListDeviceRegistriesRequest.java   |  814 +++
 .../ListDeviceRegistriesRequestOrBuilder.java |   63 +
 .../iot/v1/ListDeviceRegistriesResponse.java  | 1006 +++
 ...ListDeviceRegistriesResponseOrBuilder.java |   75 +
 .../cloud/iot/v1/ListDeviceStatesRequest.java |  648 ++
 .../v1/ListDeviceStatesRequestOrBuilder.java  |   42 +
 .../iot/v1/ListDeviceStatesResponse.java      |  857 +++
 .../v1/ListDeviceStatesResponseOrBuilder.java |   58 +
 .../cloud/iot/v1/ListDevicesRequest.java      | 1529 +++++
 .../iot/v1/ListDevicesRequestOrBuilder.java   |  165 +
 .../cloud/iot/v1/ListDevicesResponse.java     |  999 +++
 .../iot/v1/ListDevicesResponseOrBuilder.java  |   73 +
 .../com/google/cloud/iot/v1/LocationName.java |  198 +
 .../v1/ModifyCloudToDeviceConfigRequest.java  |  734 ++
 ...fyCloudToDeviceConfigRequestOrBuilder.java |   53 +
 .../com/google/cloud/iot/v1/MqttConfig.java   |  515 ++
 .../cloud/iot/v1/MqttConfigOrBuilder.java     |   28 +
 .../com/google/cloud/iot/v1/MqttState.java    |  141 +
 .../cloud/iot/v1/PublicKeyCertificate.java    |  892 +++
 .../iot/v1/PublicKeyCertificateFormat.java    |  129 +
 .../iot/v1/PublicKeyCertificateOrBuilder.java |   69 +
 .../cloud/iot/v1/PublicKeyCredential.java     |  663 ++
 .../iot/v1/PublicKeyCredentialOrBuilder.java  |   44 +
 .../google/cloud/iot/v1/PublicKeyFormat.java  |  198 +
 .../cloud/iot/v1/RegistryCredential.java      |  717 ++
 .../iot/v1/RegistryCredentialOrBuilder.java   |   36 +
 .../com/google/cloud/iot/v1/RegistryName.java |  221 +
 .../google/cloud/iot/v1/ResourcesProto.java   |  278 +
 .../cloud/iot/v1/StateNotificationConfig.java |  559 ++
 .../v1/StateNotificationConfigOrBuilder.java  |   29 +
 .../iot/v1/UpdateDeviceRegistryRequest.java   |  927 +++
 .../UpdateDeviceRegistryRequestOrBuilder.java |   77 +
 .../cloud/iot/v1/UpdateDeviceRequest.java     |  927 +++
 .../iot/v1/UpdateDeviceRequestOrBuilder.java  |   77 +
 .../cloud/iot/v1/X509CertificateDetails.java  | 1475 ++++
 .../v1/X509CertificateDetailsOrBuilder.java   |  131 +
 .../google/cloud/iot/v1/device_manager.proto  |  419 ++
 .../proto/google/cloud/iot/v1/resources.proto |  385 ++
 .../proto-google-cloud-container-v1/pom.xml   |    6 +-
 .../proto-google-cloud-dataproc-v1/pom.xml    |    6 +-
 .../proto-google-cloud-datastore-v1/pom.xml   |    6 +-
 .../proto-google-cloud-dialogflow-v2/pom.xml  |    6 +-
 .../pom.xml                                   |    6 +-
 .../v2beta1/EnvironmentContextName.java       |    2 +-
 .../proto-google-cloud-dlp-v2/pom.xml         |    6 +-
 .../proto-google-cloud-dlp-v2beta1/pom.xml    |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../proto-google-cloud-language-v1/pom.xml    |    6 +-
 .../pom.xml                                   |    6 +-
 .../proto-google-cloud-logging-v2/pom.xml     |    6 +-
 .../proto-google-cloud-monitoring-v3/pom.xml  |    6 +-
 .../proto-google-cloud-os-login-v1/pom.xml    |    6 +-
 .../proto-google-cloud-pubsub-v1/pom.xml      |    6 +-
 .../proto-google-cloud-redis-v1beta1/pom.xml  |   31 +
 .../v1beta1/CloudRedisServiceBetaProto.java   |  258 +
 .../redis/v1beta1/CreateInstanceRequest.java  |  992 +++
 .../CreateInstanceRequestOrBuilder.java       |   86 +
 .../redis/v1beta1/DeleteInstanceRequest.java  |  566 ++
 .../DeleteInstanceRequestOrBuilder.java       |   31 +
 .../redis/v1beta1/GetInstanceRequest.java     |  566 ++
 .../v1beta1/GetInstanceRequestOrBuilder.java  |   31 +
 .../google/cloud/redis/v1beta1/Instance.java  | 3726 ++++++++++
 .../cloud/redis/v1beta1/InstanceName.java     |  221 +
 .../redis/v1beta1/InstanceOrBuilder.java      |  446 ++
 .../redis/v1beta1/ListInstancesRequest.java   |  822 +++
 .../ListInstancesRequestOrBuilder.java        |   65 +
 .../redis/v1beta1/ListInstancesResponse.java  | 1183 ++++
 .../ListInstancesResponseOrBuilder.java       |  113 +
 .../cloud/redis/v1beta1/LocationMetadata.java |  754 +++
 .../v1beta1/LocationMetadataOrBuilder.java    |   78 +
 .../cloud/redis/v1beta1/LocationName.java     |  198 +
 .../redis/v1beta1/UpdateInstanceRequest.java  |  939 +++
 .../UpdateInstanceRequestOrBuilder.java       |   80 +
 .../cloud/redis/v1beta1/ZoneMetadata.java     |  398 ++
 .../redis/v1beta1/ZoneMetadataOrBuilder.java  |    9 +
 .../cloud/redis/v1beta1/cloud_redis.proto     |  340 +
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../proto-google-cloud-spanner-v1/pom.xml     |    6 +-
 .../proto-google-cloud-speech-v1/pom.xml      |    6 +-
 .../proto-google-cloud-speech-v1beta1/pom.xml |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../proto-google-cloud-trace-v1/pom.xml       |    6 +-
 .../proto-google-cloud-trace-v2/pom.xml       |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../proto-google-cloud-vision-v1/pom.xml      |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |    6 +-
 .../pom.xml                                   |   31 +
 .../v1alpha/CrawledUrl.java                   |  894 +++
 .../v1alpha/CrawledUrlOrBuilder.java          |   71 +
 .../v1alpha/CrawledUrlProto.java              |   64 +
 .../v1alpha/CreateScanConfigRequest.java      |  807 +++
 .../CreateScanConfigRequestOrBuilder.java     |   59 +
 .../v1alpha/DeleteScanConfigRequest.java      |  566 ++
 .../DeleteScanConfigRequestOrBuilder.java     |   31 +
 .../websecurityscanner/v1alpha/Finding.java   | 3259 +++++++++
 .../v1alpha/FindingAddonProto.java            |  102 +
 .../v1alpha/FindingName.java                  |  244 +
 .../v1alpha/FindingOrBuilder.java             |  340 +
 .../v1alpha/FindingProto.java                 |   85 +
 .../v1alpha/FindingTypeStats.java             |  595 ++
 .../v1alpha/FindingTypeStatsOrBuilder.java    |   38 +
 .../v1alpha/FindingTypeStatsProto.java        |   70 +
 .../v1alpha/GetFindingRequest.java            |  573 ++
 .../v1alpha/GetFindingRequestOrBuilder.java   |   33 +
 .../v1alpha/GetScanConfigRequest.java         |  566 ++
 .../GetScanConfigRequestOrBuilder.java        |   31 +
 .../v1alpha/GetScanRunRequest.java            |  573 ++
 .../v1alpha/GetScanRunRequestOrBuilder.java   |   33 +
 .../v1alpha/ListCrawledUrlsRequest.java       |  824 +++
 .../ListCrawledUrlsRequestOrBuilder.java      |   66 +
 .../v1alpha/ListCrawledUrlsResponse.java      |  999 +++
 .../ListCrawledUrlsResponseOrBuilder.java     |   73 +
 .../v1alpha/ListFindingTypeStatsRequest.java  |  573 ++
 .../ListFindingTypeStatsRequestOrBuilder.java |   33 +
 .../v1alpha/ListFindingTypeStatsResponse.java |  834 +++
 ...ListFindingTypeStatsResponseOrBuilder.java |   53 +
 .../v1alpha/ListFindingsRequest.java          | 1000 +++
 .../v1alpha/ListFindingsRequestOrBuilder.java |   90 +
 .../v1alpha/ListFindingsResponse.java         |  999 +++
 .../ListFindingsResponseOrBuilder.java        |   73 +
 .../v1alpha/ListScanConfigsRequest.java       |  817 +++
 .../ListScanConfigsRequestOrBuilder.java      |   64 +
 .../v1alpha/ListScanConfigsResponse.java      |  999 +++
 .../ListScanConfigsResponseOrBuilder.java     |   73 +
 .../v1alpha/ListScanRunsRequest.java          |  817 +++
 .../v1alpha/ListScanRunsRequestOrBuilder.java |   64 +
 .../v1alpha/ListScanRunsResponse.java         |  999 +++
 .../ListScanRunsResponseOrBuilder.java        |   73 +
 .../v1alpha/OutdatedLibrary.java              |  934 +++
 .../v1alpha/OutdatedLibraryOrBuilder.java     |   80 +
 .../v1alpha/ProjectName.java                  |  175 +
 .../v1alpha/ScanConfig.java                   | 6017 +++++++++++++++++
 .../v1alpha/ScanConfigName.java               |  198 +
 .../v1alpha/ScanConfigOrBuilder.java          |  258 +
 .../v1alpha/ScanConfigProto.java              |  138 +
 .../websecurityscanner/v1alpha/ScanRun.java   | 1961 ++++++
 .../v1alpha/ScanRunName.java                  |  221 +
 .../v1alpha/ScanRunOrBuilder.java             |  179 +
 .../v1alpha/ScanRunProto.java                 |   80 +
 .../v1alpha/StartScanRunRequest.java          |  566 ++
 .../v1alpha/StartScanRunRequestOrBuilder.java |   31 +
 .../v1alpha/StopScanRunRequest.java           |  573 ++
 .../v1alpha/StopScanRunRequestOrBuilder.java  |   33 +
 .../v1alpha/UpdateScanConfigRequest.java      |  927 +++
 .../UpdateScanConfigRequestOrBuilder.java     |   77 +
 .../v1alpha/ViolatingResource.java            |  709 ++
 .../v1alpha/ViolatingResourceOrBuilder.java   |   45 +
 .../v1alpha/VulnerableParameters.java         |  621 ++
 .../VulnerableParametersOrBuilder.java        |   44 +
 .../v1alpha/WebSecurityScannerProto.java      |  381 ++
 .../cloud/websecurityscanner/v1alpha/Xss.java |  779 +++
 .../v1alpha/XssOrBuilder.java                 |   62 +
 .../v1alpha/crawled_url.proto                 |   43 +
 .../websecurityscanner/v1alpha/finding.proto  |  141 +
 .../v1alpha/finding_addon.proto               |   62 +
 .../v1alpha/finding_type_stats.proto          |   38 +
 .../v1alpha/scan_config.proto                 |  150 +
 .../websecurityscanner/v1alpha/scan_run.proto |  108 +
 .../v1alpha/web_security_scanner.proto        |  346 +
 google-cloud-bigtable/.gitignore              |    1 -
 google-cloud-bom/pom.xml                      |  494 +-
 .../google-cloud-bigquery}/README.md          |    0
 .../google-cloud-bigquery}/pom.xml            |    4 +-
 .../cloud/bigquery/benchmark/Benchmark.java   |    0
 .../google/cloud/bigquery/benchmark/README.md |    0
 .../cloud/bigquery/benchmark/queries.json     |    0
 .../java/com/google/cloud/bigquery/Acl.java   |    0
 .../com/google/cloud/bigquery/BigQuery.java   |    0
 .../google/cloud/bigquery/BigQueryError.java  |    0
 .../cloud/bigquery/BigQueryException.java     |    0
 .../cloud/bigquery/BigQueryFactory.java       |    0
 .../google/cloud/bigquery/BigQueryImpl.java   |    0
 .../cloud/bigquery/BigQueryOptions.java       |    0
 .../cloud/bigquery/CopyJobConfiguration.java  |    0
 .../com/google/cloud/bigquery/CsvOptions.java |    0
 .../com/google/cloud/bigquery/Dataset.java    |    0
 .../com/google/cloud/bigquery/DatasetId.java  |    0
 .../google/cloud/bigquery/DatasetInfo.java    |    0
 .../bigquery/DatastoreBackupOptions.java      |    0
 .../bigquery/EncryptionConfiguration.java     |    0
 .../bigquery/ExternalTableDefinition.java     |    0
 .../bigquery/ExtractJobConfiguration.java     |    0
 .../java/com/google/cloud/bigquery/Field.java |    0
 .../com/google/cloud/bigquery/FieldList.java  |    0
 .../com/google/cloud/bigquery/FieldValue.java |    0
 .../google/cloud/bigquery/FieldValueList.java |    0
 .../google/cloud/bigquery/FormatOptions.java  |    0
 .../cloud/bigquery/GoogleSheetsOptions.java   |    0
 .../cloud/bigquery/InsertAllRequest.java      |    0
 .../cloud/bigquery/InsertAllResponse.java     |    0
 .../java/com/google/cloud/bigquery/Job.java   |    0
 .../cloud/bigquery/JobConfiguration.java      |    0
 .../google/cloud/bigquery/JobException.java   |    0
 .../java/com/google/cloud/bigquery/JobId.java |    0
 .../com/google/cloud/bigquery/JobInfo.java    |    0
 .../google/cloud/bigquery/JobStatistics.java  |    0
 .../com/google/cloud/bigquery/JobStatus.java  |    0
 .../com/google/cloud/bigquery/Labels.java     |    0
 .../cloud/bigquery/LegacySQLTypeName.java     |    0
 .../cloud/bigquery/LoadConfiguration.java     |    0
 .../cloud/bigquery/LoadJobConfiguration.java  |    0
 .../com/google/cloud/bigquery/Option.java     |    0
 .../cloud/bigquery/QueryJobConfiguration.java |    0
 .../cloud/bigquery/QueryParameterValue.java   |    0
 .../google/cloud/bigquery/QueryResponse.java  |    0
 .../com/google/cloud/bigquery/QueryStage.java |    0
 .../com/google/cloud/bigquery/Schema.java     |    0
 .../cloud/bigquery/StandardSQLTypeName.java   |    0
 .../bigquery/StandardTableDefinition.java     |    0
 .../java/com/google/cloud/bigquery/Table.java |    0
 .../cloud/bigquery/TableDataWriteChannel.java |    0
 .../cloud/bigquery/TableDefinition.java       |    0
 .../com/google/cloud/bigquery/TableId.java    |    0
 .../com/google/cloud/bigquery/TableInfo.java  |    0
 .../google/cloud/bigquery/TableResult.java    |    0
 .../cloud/bigquery/TimePartitioning.java      |    0
 .../google/cloud/bigquery/TimelineSample.java |    0
 .../cloud/bigquery/UserDefinedFunction.java   |    0
 .../google/cloud/bigquery/ViewDefinition.java |    0
 .../bigquery/WriteChannelConfiguration.java   |    0
 .../google/cloud/bigquery/package-info.java   |    0
 .../bigquery/spi/BigQueryRpcFactory.java      |    0
 .../cloud/bigquery/spi/v2/BigQueryRpc.java    |    0
 .../bigquery/spi/v2/HttpBigQueryRpc.java      |    0
 .../testing/RemoteBigQueryHelper.java         |    0
 .../cloud/bigquery/testing/package-info.java  |    0
 .../com/google/cloud/bigquery/AclTest.java    |    0
 .../cloud/bigquery/BigQueryErrorTest.java     |    0
 .../cloud/bigquery/BigQueryExceptionTest.java |    0
 .../cloud/bigquery/BigQueryImplTest.java      |    0
 .../cloud/bigquery/BigQueryOptionsTest.java   |    0
 .../bigquery/CopyJobConfigurationTest.java    |    0
 .../google/cloud/bigquery/CsvOptionsTest.java |    0
 .../google/cloud/bigquery/DatasetIdTest.java  |    0
 .../cloud/bigquery/DatasetInfoTest.java       |    0
 .../google/cloud/bigquery/DatasetTest.java    |    0
 .../bigquery/DatastoreBackupOptionsTest.java  |    0
 .../bigquery/ExternalTableDefinitionTest.java |    0
 .../bigquery/ExtractJobConfigurationTest.java |    0
 .../google/cloud/bigquery/FieldListTest.java  |    0
 .../com/google/cloud/bigquery/FieldTest.java  |    0
 .../cloud/bigquery/FieldValueListTest.java    |    0
 .../google/cloud/bigquery/FieldValueTest.java |    0
 .../cloud/bigquery/FormatOptionsTest.java     |    0
 .../bigquery/GoogleSheetsOptionsTest.java     |    0
 .../cloud/bigquery/InsertAllRequestTest.java  |    0
 .../cloud/bigquery/InsertAllResponseTest.java |    0
 .../com/google/cloud/bigquery/JobIdTest.java  |    0
 .../google/cloud/bigquery/JobInfoTest.java    |    0
 .../cloud/bigquery/JobStatisticsTest.java     |    0
 .../google/cloud/bigquery/JobStatusTest.java  |    0
 .../com/google/cloud/bigquery/JobTest.java    |    0
 .../com/google/cloud/bigquery/LabelsTest.java |    0
 .../bigquery/LoadJobConfigurationTest.java    |    0
 .../com/google/cloud/bigquery/OptionTest.java |    0
 .../bigquery/QueryJobConfigurationTest.java   |    0
 .../bigquery/QueryParameterValueTest.java     |    0
 .../google/cloud/bigquery/QueryStageTest.java |    0
 .../com/google/cloud/bigquery/SchemaTest.java |    0
 .../cloud/bigquery/SerializationTest.java     |    0
 .../bigquery/StandardTableDefinitionTest.java |    0
 .../bigquery/TableDataWriteChannelTest.java   |    0
 .../google/cloud/bigquery/TableIdTest.java    |    0
 .../google/cloud/bigquery/TableInfoTest.java  |    0
 .../cloud/bigquery/TableResultTest.java       |    0
 .../com/google/cloud/bigquery/TableTest.java  |    0
 .../cloud/bigquery/TimePartitioningTest.java  |    0
 .../cloud/bigquery/TimelineSampleTest.java    |    0
 .../bigquery/UserDefinedFunctionTest.java     |    0
 .../cloud/bigquery/ViewDefinitionTest.java    |    0
 .../WriteChannelConfigurationTest.java        |    0
 .../cloud/bigquery/it/ITBigQueryTest.java     |    0
 .../bigquery/spi/v2/HttpBigQueryRpcTest.java  |    0
 .../testing/RemoteBigQueryHelperTest.java     |    0
 .../README.md                                 |    0
 .../pom.xml                                   |    4 +-
 .../v1/DataTransferServiceClient.java         |    0
 .../v1/DataTransferServiceSettings.java       |    0
 .../bigquery/datatransfer/v1/SampleApp.java   |    0
 .../datatransfer/v1/package-info.java         |    0
 .../v1/stub/DataTransferServiceStub.java      |    0
 .../stub/DataTransferServiceStubSettings.java |    0
 ...rpcDataTransferServiceCallableFactory.java |    0
 .../v1/stub/GrpcDataTransferServiceStub.java  |    0
 .../v1/DataTransferServiceClientTest.java     |    0
 .../v1/DataTransferServiceSmokeTest.java      |    0
 .../v1/MockDataTransferService.java           |    0
 .../v1/MockDataTransferServiceImpl.java       |    0
 .../google-cloud-bigtable}/DEVELOPING.md      |    0
 .../google-cloud-bigtable}/README.md          |    0
 .../google-cloud-bigtable}/autogen_files.lst  |    0
 .../handwritten_files.lst                     |    0
 .../google-cloud-bigtable}/pom.xml            |    4 +-
 .../google-cloud-bigtable}/scripts/README.md  |    0
 .../scripts/regenerate.sh                     |    0
 .../scripts/setup-test-table.sh               |    0
 .../scripts/update-deps.sh                    |    0
 .../admin/v2/BigtableInstanceAdminClient.java |    0
 .../v2/BigtableInstanceAdminSettings.java     |    0
 .../admin/v2/BigtableTableAdminClient.java    |    0
 .../admin/v2/BigtableTableAdminSettings.java  |    0
 .../cloud/bigtable/admin/v2/package-info.java |    0
 .../v2/stub/BigtableInstanceAdminStub.java    |    0
 .../BigtableInstanceAdminStubSettings.java    |    0
 .../admin/v2/stub/BigtableTableAdminStub.java |    0
 .../stub/BigtableTableAdminStubSettings.java  |    0
 ...cBigtableInstanceAdminCallableFactory.java |    0
 .../stub/GrpcBigtableInstanceAdminStub.java   |    0
 ...GrpcBigtableTableAdminCallableFactory.java |    0
 .../v2/stub/GrpcBigtableTableAdminStub.java   |    0
 .../data/v2/BaseBigtableDataClient.java       |    0
 .../data/v2/BaseBigtableDataSettings.java     |    0
 .../bigtable/data/v2/BigtableDataClient.java  |    0
 .../data/v2/BigtableDataSettings.java         |    0
 .../v2/internal/ByteStringComparator.java     |    0
 .../v2/internal/DummyBatchingDescriptor.java  |    0
 .../bigtable/data/v2/internal/RegexUtil.java  |    0
 .../data/v2/internal/RequestContext.java      |    0
 .../bigtable/data/v2/models/BulkMutation.java |    0
 .../data/v2/models/BulkMutationBatcher.java   |    0
 .../v2/models/ConditionalRowMutation.java     |    0
 .../data/v2/models/DefaultRowAdapter.java     |    0
 .../bigtable/data/v2/models/Filters.java      |    0
 .../bigtable/data/v2/models/InstanceName.java |    0
 .../bigtable/data/v2/models/KeyOffset.java    |    0
 .../data/v2/models/MutateRowsException.java   |    0
 .../bigtable/data/v2/models/Mutation.java     |    0
 .../bigtable/data/v2/models/MutationApi.java  |    0
 .../cloud/bigtable/data/v2/models/Query.java  |    0
 .../cloud/bigtable/data/v2/models/Range.java  |    0
 .../data/v2/models/ReadModifyWriteRow.java    |    0
 .../cloud/bigtable/data/v2/models/Row.java    |    0
 .../bigtable/data/v2/models/RowAdapter.java   |    0
 .../bigtable/data/v2/models/RowCell.java      |    0
 .../bigtable/data/v2/models/RowMutation.java  |    0
 .../bigtable/data/v2/models/Validations.java  |    0
 .../cloud/bigtable/data/v2/package-info.java  |    0
 .../bigtable/data/v2/stub/BigtableStub.java   |    0
 .../data/v2/stub/BigtableStubSettings.java    |    0
 .../v2/stub/CheckAndMutateRowCallable.java    |    0
 .../data/v2/stub/EnhancedBigtableStub.java    |    0
 .../v2/stub/EnhancedBigtableStubSettings.java |    0
 .../v2/stub/GrpcBigtableCallableFactory.java  |    0
 .../data/v2/stub/GrpcBigtableStub.java        |    0
 .../data/v2/stub/MutateRowCallable.java       |    0
 .../v2/stub/ReadModifyWriteRowCallable.java   |    0
 .../data/v2/stub/SampleRowKeysCallable.java   |    0
 .../BulkMutateRowsUserFacingCallable.java     |    0
 .../mutaterows/MutateRowsAttemptCallable.java |    0
 .../MutateRowsBatchingDescriptor.java         |    0
 .../MutateRowsRetryingCallable.java           |    0
 .../MutateRowsUserFacingCallable.java         |    0
 .../data/v2/stub/mutaterows/package-info.java |    0
 .../readrows/FilterMarkerRowsCallable.java    |    0
 .../stub/readrows/ReadRowsFirstCallable.java  |    0
 .../readrows/ReadRowsResumptionStrategy.java  |    0
 .../ReadRowsRetryCompletedCallable.java       |    0
 .../stub/readrows/ReadRowsUserCallable.java   |    0
 .../data/v2/stub/readrows/RowMerger.java      |    0
 .../v2/stub/readrows/RowMergingCallable.java  |    0
 .../data/v2/stub/readrows/StateMachine.java   |    0
 .../data/v2/stub/readrows/package-info.java   |    0
 .../cloud/bigtable/gaxx/package-info.java     |    0
 .../reframing/IncompleteStreamException.java  |    0
 .../bigtable/gaxx/reframing/Reframer.java     |    0
 .../reframing/ReframingResponseObserver.java  |    0
 .../bigtable/gaxx/reframing/package-info.java |    0
 .../retrying/ApiResultRetryAlgorithm.java     |    0
 .../gaxx/retrying/NonCancellableFuture.java   |    0
 .../google/cloud/bigtable/package-info.java   |    0
 .../v2/BigtableInstanceAdminClientTest.java   |    0
 .../v2/BigtableTableAdminClientTest.java      |    0
 .../admin/v2/MockBigtableInstanceAdmin.java   |    0
 .../v2/MockBigtableInstanceAdminImpl.java     |    0
 .../admin/v2/MockBigtableTableAdmin.java      |    0
 .../admin/v2/MockBigtableTableAdminImpl.java  |    0
 .../data/v2/BaseBigtableDataClientTest.java   |    0
 .../data/v2/BigtableDataClientTest.java       |    0
 .../cloud/bigtable/data/v2/MockBigtable.java  |    0
 .../bigtable/data/v2/MockBigtableImpl.java    |    0
 .../v2/internal/ByteStringComparatorTest.java |    0
 .../data/v2/internal/RegexUtilTest.java       |    0
 .../data/v2/it/BulkMutationBatcherIT.java     |    0
 .../bigtable/data/v2/it/CheckAndMutateIT.java |    0
 .../bigtable/data/v2/it/MutateRowIT.java      |    0
 .../cloud/bigtable/data/v2/it/ReadIT.java     |    0
 .../data/v2/it/ReadModifyWriteIT.java         |    0
 .../bigtable/data/v2/it/SampleRowsIT.java     |    0
 .../bigtable/data/v2/it/env/Emulator.java     |    0
 .../bigtable/data/v2/it/env/EmulatorEnv.java  |    0
 .../bigtable/data/v2/it/env/ProdEnv.java      |    0
 .../bigtable/data/v2/it/env/TestEnv.java      |    0
 .../bigtable/data/v2/it/env/TestEnvRule.java  |    0
 .../data/v2/models/BulkMutationTest.java      |    0
 .../v2/models/ConditionalRowMutationTest.java |    0
 .../data/v2/models/DefaultRowAdapterTest.java |    0
 .../bigtable/data/v2/models/FiltersTest.java  |    0
 .../bigtable/data/v2/models/MutationTest.java |    0
 .../bigtable/data/v2/models/QueryTest.java    |    0
 .../bigtable/data/v2/models/RangeTest.java    |    0
 .../v2/models/ReadModifyWriteRowTest.java     |    0
 .../data/v2/models/RowMutationTest.java       |    0
 .../bigtable/data/v2/models/RowTest.java      |    0
 .../stub/CheckAndMutateRowCallableTest.java   |    0
 .../EnhancedBigtableStubSettingsTest.java     |    0
 .../data/v2/stub/MutateRowCallableTest.java   |    0
 .../stub/ReadModifyWriteRowCallableTest.java  |    0
 .../data/v2/stub/ResourceHeaderTest.java      |    0
 .../v2/stub/SampleRowKeysCallableTest.java    |    0
 .../mutaterows/BulkMutateRowsRetryTest.java   |    0
 .../MutateRowsAttemptCallableTest.java        |    0
 .../MutateRowsBatchingDescriptorTest.java     |    0
 .../FilterMarkerRowsCallableTest.java         |    0
 .../readrows/ReadRowsFirstCallableTest.java   |    0
 .../ReadRowsMergingAcceptanceTest.java        |    0
 .../v2/stub/readrows/ReadRowsRetryTest.java   |    0
 .../readrows/ReadRowsUserCallableTest.java    |    0
 .../stub/readrows/RowMergingCallableTest.java |    0
 .../ReframingResponseObserverTest.java        |    0
 .../bigtable/gaxx/testing/FakeStatusCode.java |    0
 .../gaxx/testing/FakeStreamingApi.java        |    0
 .../gaxx/testing/MockStreamingApi.java        |    0
 .../bigtable/gaxx/testing/package-info.java   |    0
 .../readrows/read-rows-acceptance-test.json   |    0
 .../google-cloud-compute}/README.md           |    0
 .../google-cloud-compute}/pom.xml             |    4 +-
 .../cloud/compute/deprecated/Address.java     |    0
 .../cloud/compute/deprecated/AddressId.java   |    0
 .../cloud/compute/deprecated/AddressInfo.java |    0
 .../compute/deprecated/AttachedDisk.java      |    0
 .../cloud/compute/deprecated/Compute.java     |    0
 .../compute/deprecated/ComputeException.java  |    0
 .../compute/deprecated/ComputeFactory.java    |    0
 .../cloud/compute/deprecated/ComputeImpl.java |    0
 .../compute/deprecated/ComputeOptions.java    |    0
 .../compute/deprecated/DeprecationStatus.java |    0
 .../google/cloud/compute/deprecated/Disk.java |    0
 .../compute/deprecated/DiskConfiguration.java |    0
 .../cloud/compute/deprecated/DiskId.java      |    0
 .../deprecated/DiskImageConfiguration.java    |    0
 .../cloud/compute/deprecated/DiskInfo.java    |    0
 .../cloud/compute/deprecated/DiskType.java    |    0
 .../cloud/compute/deprecated/DiskTypeId.java  |    0
 .../compute/deprecated/ForwardingRuleId.java  |    0
 .../compute/deprecated/GlobalAddressId.java   |    0
 .../deprecated/GlobalForwardingRuleId.java    |    0
 .../compute/deprecated/GlobalOperationId.java |    0
 .../cloud/compute/deprecated/Image.java       |    0
 .../deprecated/ImageConfiguration.java        |    0
 .../deprecated/ImageDiskConfiguration.java    |    0
 .../cloud/compute/deprecated/ImageId.java     |    0
 .../cloud/compute/deprecated/ImageInfo.java   |    0
 .../cloud/compute/deprecated/Instance.java    |    0
 .../cloud/compute/deprecated/InstanceId.java  |    0
 .../compute/deprecated/InstanceInfo.java      |    0
 .../cloud/compute/deprecated/License.java     |    0
 .../cloud/compute/deprecated/LicenseId.java   |    0
 .../cloud/compute/deprecated/MachineType.java |    0
 .../compute/deprecated/MachineTypeId.java     |    0
 .../cloud/compute/deprecated/Metadata.java    |    0
 .../cloud/compute/deprecated/Network.java     |    0
 .../deprecated/NetworkConfiguration.java      |    0
 .../cloud/compute/deprecated/NetworkId.java   |    0
 .../cloud/compute/deprecated/NetworkInfo.java |    0
 .../compute/deprecated/NetworkInterface.java  |    0
 .../cloud/compute/deprecated/Operation.java   |    0
 .../cloud/compute/deprecated/OperationId.java |    0
 .../cloud/compute/deprecated/Option.java      |    0
 .../cloud/compute/deprecated/Region.java      |    0
 .../compute/deprecated/RegionAddressId.java   |    0
 .../deprecated/RegionForwardingRuleId.java    |    0
 .../cloud/compute/deprecated/RegionId.java    |    0
 .../compute/deprecated/RegionOperationId.java |    0
 .../cloud/compute/deprecated/ResourceId.java  |    0
 .../compute/deprecated/SchedulingOptions.java |    0
 .../compute/deprecated/ServiceAccount.java    |    0
 .../cloud/compute/deprecated/Snapshot.java    |    0
 .../deprecated/SnapshotDiskConfiguration.java |    0
 .../cloud/compute/deprecated/SnapshotId.java  |    0
 .../compute/deprecated/SnapshotInfo.java      |    0
 .../deprecated/StandardDiskConfiguration.java |    0
 .../StandardNetworkConfiguration.java         |    0
 .../deprecated/StorageImageConfiguration.java |    0
 .../SubnetNetworkConfiguration.java           |    0
 .../cloud/compute/deprecated/Subnetwork.java  |    0
 .../compute/deprecated/SubnetworkId.java      |    0
 .../compute/deprecated/SubnetworkInfo.java    |    0
 .../google/cloud/compute/deprecated/Tags.java |    0
 .../google/cloud/compute/deprecated/Zone.java |    0
 .../cloud/compute/deprecated/ZoneId.java      |    0
 .../compute/deprecated/ZoneOperationId.java   |    0
 .../compute/deprecated/package-info.java      |    0
 .../deprecated/spi/ComputeRpcFactory.java     |    0
 .../compute/deprecated/spi/v1/ComputeRpc.java |    0
 .../deprecated/spi/v1/HttpComputeRpc.java     |    0
 .../testing/RemoteComputeHelper.java          |    0
 .../deprecated/testing/ResourceCleaner.java   |    0
 .../deprecated/testing/package-info.java      |    0
 .../compute/deprecated/AddressIdTest.java     |    0
 .../compute/deprecated/AddressInfoTest.java   |    0
 .../cloud/compute/deprecated/AddressTest.java |    0
 .../compute/deprecated/AttachedDiskTest.java  |    0
 .../deprecated/ComputeExceptionTest.java      |    0
 .../compute/deprecated/ComputeImplTest.java   |    0
 .../deprecated/ComputeOptionsTest.java        |    0
 .../deprecated/DeprecationStatusTest.java     |    0
 .../cloud/compute/deprecated/DiskIdTest.java  |    0
 .../DiskImageConfigurationTest.java           |    0
 .../compute/deprecated/DiskInfoTest.java      |    0
 .../cloud/compute/deprecated/DiskTest.java    |    0
 .../compute/deprecated/DiskTypeIdTest.java    |    0
 .../compute/deprecated/DiskTypeTest.java      |    0
 .../deprecated/ForwardingRuleIdTest.java      |    0
 .../ImageDiskConfigurationTest.java           |    0
 .../cloud/compute/deprecated/ImageIdTest.java |    0
 .../compute/deprecated/ImageInfoTest.java     |    0
 .../cloud/compute/deprecated/ImageTest.java   |    0
 .../compute/deprecated/InstanceIdTest.java    |    0
 .../compute/deprecated/InstanceInfoTest.java  |    0
 .../compute/deprecated/InstanceTest.java      |    0
 .../compute/deprecated/LicenseIdTest.java     |    0
 .../cloud/compute/deprecated/LicenseTest.java |    0
 .../compute/deprecated/MachineTypeIdTest.java |    0
 .../compute/deprecated/MachineTypeTest.java   |    0
 .../compute/deprecated/MetadataTest.java      |    0
 .../compute/deprecated/NetworkIdTest.java     |    0
 .../compute/deprecated/NetworkInfoTest.java   |    0
 .../deprecated/NetworkInterfaceTest.java      |    0
 .../cloud/compute/deprecated/NetworkTest.java |    0
 .../compute/deprecated/OperationIdTest.java   |    0
 .../compute/deprecated/OperationTest.java     |    0
 .../compute/deprecated/RegionIdTest.java      |    0
 .../cloud/compute/deprecated/RegionTest.java  |    0
 .../deprecated/SchedulingOptionsTest.java     |    0
 .../compute/deprecated/SerializationTest.java |    0
 .../deprecated/ServiceAccountTest.java        |    0
 .../SnapshotDiskConfigurationTest.java        |    0
 .../compute/deprecated/SnapshotIdTest.java    |    0
 .../compute/deprecated/SnapshotInfoTest.java  |    0
 .../compute/deprecated/SnapshotTest.java      |    0
 .../StandardDiskConfigurationTest.java        |    0
 .../StandardNetworkConfigurationTest.java     |    0
 .../StorageImageConfigurationTest.java        |    0
 .../SubnetNetworkConfigurationTest.java       |    0
 .../compute/deprecated/SubnetworkIdTest.java  |    0
 .../deprecated/SubnetworkInfoTest.java        |    0
 .../compute/deprecated/SubnetworkTest.java    |    0
 .../cloud/compute/deprecated/TagsTest.java    |    0
 .../cloud/compute/deprecated/ZoneIdTest.java  |    0
 .../cloud/compute/deprecated/ZoneTest.java    |    0
 .../compute/deprecated/it/ITComputeTest.java  |    0
 .../testing/RemoteComputeHelperTest.java      |    0
 .../google-cloud-container}/README.md         |    0
 .../google-cloud-container}/pom.xml           |    4 +-
 .../container/v1/ClusterManagerClient.java    |    0
 .../container/v1/ClusterManagerSettings.java  |    0
 .../google/cloud/container/v1/SampleApp.java  |    0
 .../cloud/container/v1/package-info.java      |    0
 .../container/v1/stub/ClusterManagerStub.java |    0
 .../v1/stub/ClusterManagerStubSettings.java   |    0
 .../GrpcClusterManagerCallableFactory.java    |    0
 .../v1/stub/GrpcClusterManagerStub.java       |    0
 .../v1/ClusterManagerClientTest.java          |    0
 .../container/v1/ClusterManagerSmokeTest.java |    0
 .../container/v1/MockClusterManager.java      |    0
 .../container/v1/MockClusterManagerImpl.java  |    0
 .../google-cloud-contrib}/README.md           |    0
 .../google-cloud-logging-logback/README.md    |    0
 .../google-cloud-logging-logback/pom.xml      |    0
 .../logging/logback/LoggingAppender.java      |    0
 .../logging/logback/LoggingEventEnhancer.java |    0
 .../enhancers/AnotherTestLoggingEnhancer.java |    0
 .../enhancers/TestLoggingEnhancer.java        |    0
 .../logging/logback/LoggingAppenderTest.java  |    0
 .../cloud/logging/logback/StackTraceTest.java |    0
 .../google-cloud-nio-examples/README.md       |    0
 .../google-cloud-nio-examples/pom.xml         |    0
 .../cloud/nio/examples/ListFilesystems.java   |    0
 .../google-cloud-nio/README.md                |    0
 .../google-cloud-nio/pom.xml                  |    2 +-
 .../nio/CloudStorageConfiguration.java        |    0
 .../nio/CloudStorageFileAttributeView.java    |    0
 .../nio/CloudStorageFileAttributes.java       |    0
 .../contrib/nio/CloudStorageFileSystem.java   |    0
 .../nio/CloudStorageFileSystemProvider.java   |    0
 .../nio/CloudStorageObjectAttributes.java     |    0
 .../CloudStorageObjectImmutableException.java |    0
 .../contrib/nio/CloudStorageOption.java       |    0
 .../contrib/nio/CloudStorageOptions.java      |    0
 .../storage/contrib/nio/CloudStoragePath.java |    0
 ...CloudStoragePseudoDirectoryAttributes.java |    0
 .../CloudStoragePseudoDirectoryException.java |    0
 .../contrib/nio/CloudStorageReadChannel.java  |    0
 .../contrib/nio/CloudStorageRetryHandler.java |    0
 .../storage/contrib/nio/CloudStorageUtil.java |    0
 .../contrib/nio/CloudStorageWriteChannel.java |    0
 .../cloud/storage/contrib/nio/OptionAcl.java  |    0
 .../storage/contrib/nio/OptionBlockSize.java  |    0
 .../contrib/nio/OptionCacheControl.java       |    0
 .../contrib/nio/OptionContentDisposition.java |    0
 .../contrib/nio/OptionContentEncoding.java    |    0
 .../contrib/nio/OptionMaxChannelReopens.java  |    0
 .../storage/contrib/nio/OptionMimeType.java   |    0
 .../contrib/nio/OptionUserMetadata.java       |    0
 .../nio/SeekableByteChannelPrefetcher.java    |    0
 .../cloud/storage/contrib/nio/UnixPath.java   |    0
 .../storage/contrib/nio/package-info.java     |    0
 .../contrib/nio/testing/FakeStorageRpc.java   |    0
 .../nio/testing/LocalStorageHelper.java       |    0
 .../nio/CloudStorageConfigurationTest.java    |    0
 .../CloudStorageFileAttributeViewTest.java    |    0
 .../nio/CloudStorageFileAttributesTest.java   |    0
 .../CloudStorageFileSystemProviderTest.java   |    0
 .../nio/CloudStorageFileSystemTest.java       |    0
 .../CloudStorageLateInitializationTest.java   |    0
 .../contrib/nio/CloudStorageOptionsTest.java  |    0
 .../contrib/nio/CloudStoragePathTest.java     |    0
 .../nio/CloudStorageReadChannelTest.java      |    0
 .../contrib/nio/CloudStorageReadTest.java     |    0
 .../nio/CloudStorageWriteChannelTest.java     |    0
 .../SeekableByteChannelPrefetcherTest.java    |    0
 .../storage/contrib/nio/UnixPathTest.java     |    0
 .../storage/contrib/nio/it/ITGcsNio.java      |    0
 .../google-cloud-contrib}/pom.xml             |    4 +-
 .../google-cloud-core-grpc}/pom.xml           |    4 +-
 .../cloud/grpc/BaseGrpcServiceException.java  |    0
 .../cloud/grpc/GrpcTransportOptions.java      |    0
 .../grpc/BaseGrpcServiceExceptionTest.java    |    0
 .../cloud/grpc/GrpcTransportOptionsTest.java  |    0
 .../google-cloud-core-http}/pom.xml           |    4 +-
 .../cloud/http/BaseHttpServiceException.java  |    0
 .../google/cloud/http/CensusHttpModule.java   |    0
 .../cloud/http/HttpTransportOptions.java      |    0
 .../http/BaseHttpServiceExceptionTest.java    |    0
 .../cloud/http/CensusHttpModuleTest.java      |    0
 .../cloud/http/HttpTransportOptionsTest.java  |    0
 .../google-cloud-core}/README.md              |    0
 .../google-cloud-core}/pom.xml                |    4 +-
 .../java/com/google/cloud/AsyncPageImpl.java  |    0
 .../java/com/google/cloud/BaseService.java    |    0
 .../google/cloud/BaseServiceException.java    |    0
 .../com/google/cloud/BaseWriteChannel.java    |    0
 .../java/com/google/cloud/BatchResult.java    |    0
 .../java/com/google/cloud/BillingName.java    |    0
 .../main/java/com/google/cloud/ByteArray.java |    0
 .../src/main/java/com/google/cloud/Date.java  |    0
 .../com/google/cloud/ExceptionHandler.java    |    0
 .../java/com/google/cloud/FieldSelector.java  |    0
 .../java/com/google/cloud/FolderName.java     |    0
 .../java/com/google/cloud/GcpLaunchStage.java |    0
 .../main/java/com/google/cloud/Identity.java  |    0
 .../java/com/google/cloud/MetadataConfig.java |    0
 .../com/google/cloud/MonitoredResource.java   |    0
 .../cloud/MonitoredResourceDescriptor.java    |    0
 .../java/com/google/cloud/NoCredentials.java  |    0
 .../com/google/cloud/OrganizationName.java    |    0
 .../main/java/com/google/cloud/PageImpl.java  |    0
 .../java/com/google/cloud/ParentName.java     |    0
 .../java/com/google/cloud/ParentNames.java    |    0
 .../com/google/cloud/PlatformInformation.java |    0
 .../main/java/com/google/cloud/Policy.java    |    0
 .../java/com/google/cloud/ProjectName.java    |    0
 .../java/com/google/cloud/ReadChannel.java    |    0
 .../java/com/google/cloud/Restorable.java     |    0
 .../com/google/cloud/RestorableState.java     |    0
 .../java/com/google/cloud/RetryHelper.java    |    0
 .../java/com/google/cloud/RetryOption.java    |    0
 .../src/main/java/com/google/cloud/Role.java  |    0
 .../main/java/com/google/cloud/Service.java   |    0
 .../com/google/cloud/ServiceDefaults.java     |    0
 .../java/com/google/cloud/ServiceFactory.java |    0
 .../java/com/google/cloud/ServiceOptions.java |    0
 .../java/com/google/cloud/ServiceRpc.java     |    0
 .../java/com/google/cloud/StringEnumType.java |    0
 .../com/google/cloud/StringEnumValue.java     |    0
 .../main/java/com/google/cloud/Timestamp.java |    0
 .../com/google/cloud/TransportOptions.java    |    0
 .../src/main/java/com/google/cloud/Tuple.java |    0
 .../com/google/cloud/UntypedParentName.java   |    0
 .../java/com/google/cloud/WriteChannel.java   |    0
 .../java/com/google/cloud/package-info.java   |    0
 .../google/cloud/spi/ServiceRpcFactory.java   |    0
 .../cloud/testing/BaseEmulatorHelper.java     |    0
 .../testing/BlockingProcessStreamReader.java  |    0
 .../google/cloud/testing/CommandWrapper.java  |    0
 .../com/google/cloud/testing/Version.java     |    0
 .../com/google/cloud/AsyncPageImplTest.java   |    0
 .../google/cloud/BaseSerializationTest.java   |    0
 .../cloud/BaseServiceExceptionTest.java       |    0
 .../google/cloud/BaseWriteChannelTest.java    |    0
 .../com/google/cloud/BatchResultTest.java     |    0
 .../java/com/google/cloud/ByteArrayTest.java  |    0
 .../test/java/com/google/cloud/DateTest.java  |    0
 .../google/cloud/ExceptionHandlerTest.java    |    0
 .../google/cloud/FieldSelectorHelperTest.java |    0
 .../java/com/google/cloud/IdentityTest.java   |    0
 .../MonitoredResourceDescriptorTest.java      |    0
 .../google/cloud/MonitoredResourceTest.java   |    0
 .../java/com/google/cloud/PageImplTest.java   |    0
 .../java/com/google/cloud/PolicyTest.java     |    0
 .../com/google/cloud/RetryOptionTest.java     |    0
 .../test/java/com/google/cloud/RoleTest.java  |    0
 .../com/google/cloud/SerializationTest.java   |    0
 .../com/google/cloud/ServiceOptionsTest.java  |    0
 .../java/com/google/cloud/StringEnumTest.java |    0
 .../java/com/google/cloud/TimestampTest.java  |    0
 .../cloud/testing/BaseEmulatorHelperTest.java |    0
 .../BlockingProcessStreamReaderTest.java      |    0
 .../cloud/testing/CommandWrapperTest.java     |    0
 .../com/google/cloud/testing/VersionTest.java |    0
 .../google-cloud-dataproc}/README.md          |    0
 .../google-cloud-dataproc}/pom.xml            |    4 +-
 .../dataproc/v1/ClusterControllerClient.java  |    0
 .../v1/ClusterControllerSettings.java         |    0
 .../dataproc/v1/JobControllerClient.java      |    0
 .../dataproc/v1/JobControllerSettings.java    |    0
 .../cloud/dataproc/v1/package-info.java       |    0
 .../v1/stub/ClusterControllerStub.java        |    0
 .../stub/ClusterControllerStubSettings.java   |    0
 .../GrpcClusterControllerCallableFactory.java |    0
 .../v1/stub/GrpcClusterControllerStub.java    |    0
 .../GrpcJobControllerCallableFactory.java     |    0
 .../v1/stub/GrpcJobControllerStub.java        |    0
 .../dataproc/v1/stub/JobControllerStub.java   |    0
 .../v1/stub/JobControllerStubSettings.java    |    0
 .../v1/ClusterControllerClientTest.java       |    0
 .../v1/ClusterControllerSmokeTest.java        |    0
 .../dataproc/v1/JobControllerClientTest.java  |    0
 .../dataproc/v1/MockClusterController.java    |    0
 .../v1/MockClusterControllerImpl.java         |    0
 .../cloud/dataproc/v1/MockJobController.java  |    0
 .../dataproc/v1/MockJobControllerImpl.java    |    0
 .../google-cloud-datastore}/README.md         |    0
 .../google-cloud-datastore}/pom.xml           |    4 +-
 .../datastore/BaseDatastoreBatchWriter.java   |    0
 .../google/cloud/datastore/BaseEntity.java    |    0
 .../com/google/cloud/datastore/BaseKey.java   |    0
 .../com/google/cloud/datastore/Batch.java     |    0
 .../com/google/cloud/datastore/BatchImpl.java |    0
 .../java/com/google/cloud/datastore/Blob.java |    0
 .../com/google/cloud/datastore/BlobValue.java |    0
 .../google/cloud/datastore/BooleanValue.java  |    0
 .../com/google/cloud/datastore/Cursor.java    |    0
 .../com/google/cloud/datastore/Datastore.java |    0
 .../cloud/datastore/DatastoreBatchWriter.java |    0
 .../cloud/datastore/DatastoreException.java   |    0
 .../cloud/datastore/DatastoreFactory.java     |    0
 .../cloud/datastore/DatastoreHelper.java      |    0
 .../google/cloud/datastore/DatastoreImpl.java |    0
 .../cloud/datastore/DatastoreOptions.java     |    0
 .../cloud/datastore/DatastoreReader.java      |    0
 .../datastore/DatastoreReaderWriter.java      |    0
 .../cloud/datastore/DatastoreWriter.java      |    0
 .../google/cloud/datastore/DoubleValue.java   |    0
 .../com/google/cloud/datastore/Entity.java    |    0
 .../google/cloud/datastore/EntityQuery.java   |    0
 .../google/cloud/datastore/EntityValue.java   |    0
 .../google/cloud/datastore/FullEntity.java    |    0
 .../com/google/cloud/datastore/GqlQuery.java  |    0
 .../google/cloud/datastore/IncompleteKey.java |    0
 .../java/com/google/cloud/datastore/Key.java  |    0
 .../google/cloud/datastore/KeyFactory.java    |    0
 .../com/google/cloud/datastore/KeyQuery.java  |    0
 .../com/google/cloud/datastore/KeyValue.java  |    0
 .../com/google/cloud/datastore/LatLng.java    |    0
 .../google/cloud/datastore/LatLngValue.java   |    0
 .../com/google/cloud/datastore/ListValue.java |    0
 .../com/google/cloud/datastore/LongValue.java |    0
 .../com/google/cloud/datastore/NullValue.java |    0
 .../google/cloud/datastore/PathElement.java   |    0
 .../cloud/datastore/ProjectionEntity.java     |    0
 .../datastore/ProjectionEntityQuery.java      |    0
 .../com/google/cloud/datastore/Query.java     |    0
 .../google/cloud/datastore/QueryResults.java  |    0
 .../cloud/datastore/QueryResultsImpl.java     |    0
 .../com/google/cloud/datastore/RawValue.java  |    0
 .../google/cloud/datastore/ReadOption.java    |    0
 .../google/cloud/datastore/StringValue.java   |    0
 .../cloud/datastore/StructuredQuery.java      |    0
 .../cloud/datastore/TimestampValue.java       |    0
 .../google/cloud/datastore/Transaction.java   |    0
 .../TransactionExceptionHandler.java          |    0
 .../cloud/datastore/TransactionImpl.java      |    0
 .../com/google/cloud/datastore/Validator.java |    0
 .../com/google/cloud/datastore/Value.java     |    0
 .../google/cloud/datastore/ValueBuilder.java  |    0
 .../cloud/datastore/ValueMarshaller.java      |    0
 .../com/google/cloud/datastore/ValueType.java |    0
 .../google/cloud/datastore/package-info.java  |    0
 .../datastore/spi/DatastoreRpcFactory.java    |    0
 .../cloud/datastore/spi/v1/DatastoreRpc.java  |    0
 .../datastore/spi/v1/HttpDatastoreRpc.java    |    0
 .../testing/LocalDatastoreHelper.java         |    0
 .../testing/RemoteDatastoreHelper.java        |    0
 .../cloud/datastore/testing/package-info.java |    0
 .../BaseDatastoreBatchWriterTest.java         |    0
 .../cloud/datastore/BaseEntityTest.java       |    0
 .../google/cloud/datastore/BaseKeyTest.java   |    0
 .../com/google/cloud/datastore/BlobTest.java  |    0
 .../google/cloud/datastore/BlobValueTest.java |    0
 .../cloud/datastore/BooleanValueTest.java     |    0
 .../google/cloud/datastore/CursorTest.java    |    0
 .../datastore/DatastoreExceptionTest.java     |    0
 .../cloud/datastore/DatastoreHelperTest.java  |    0
 .../cloud/datastore/DatastoreOptionsTest.java |    0
 .../google/cloud/datastore/DatastoreTest.java |    0
 .../cloud/datastore/DoubleValueTest.java      |    0
 .../google/cloud/datastore/EntityTest.java    |    0
 .../cloud/datastore/EntityValueTest.java      |    0
 .../cloud/datastore/FullEntityTest.java       |    0
 .../cloud/datastore/IncompleteKeyTest.java    |    0
 .../cloud/datastore/KeyFactoryTest.java       |    0
 .../com/google/cloud/datastore/KeyTest.java   |    0
 .../google/cloud/datastore/KeyValueTest.java  |    0
 .../google/cloud/datastore/LatLngTest.java    |    0
 .../cloud/datastore/LatLngValueTest.java      |    0
 .../google/cloud/datastore/ListValueTest.java |    0
 .../google/cloud/datastore/LongValueTest.java |    0
 .../google/cloud/datastore/NullValueTest.java |    0
 .../cloud/datastore/PathElementTest.java      |    0
 .../cloud/datastore/ProjectionEntityTest.java |    0
 .../google/cloud/datastore/RawValueTest.java  |    0
 .../cloud/datastore/SerializationTest.java    |    0
 .../cloud/datastore/StringValueTest.java      |    0
 .../cloud/datastore/StructuredQueryTest.java  |    0
 .../cloud/datastore/TimestampValueTest.java   |    0
 .../TransactionExceptionHandlerTest.java      |    0
 .../com/google/cloud/datastore/ValueTest.java |    0
 .../cloud/datastore/it/ITDatastoreTest.java   |    0
 .../testing/LocalDatastoreHelperTest.java     |    0
 .../google-cloud-dialogflow}/README.md        |    0
 .../google-cloud-dialogflow}/pom.xml          |    4 +-
 .../cloud/dialogflow/v2/AgentsClient.java     |    0
 .../cloud/dialogflow/v2/AgentsSettings.java   |    0
 .../cloud/dialogflow/v2/ContextsClient.java   |    0
 .../cloud/dialogflow/v2/ContextsSettings.java |    0
 .../dialogflow/v2/EntityTypesClient.java      |    0
 .../dialogflow/v2/EntityTypesSettings.java    |    0
 .../cloud/dialogflow/v2/IntentsClient.java    |    0
 .../cloud/dialogflow/v2/IntentsSettings.java  |    0
 .../v2/SessionEntityTypesClient.java          |    0
 .../v2/SessionEntityTypesSettings.java        |    0
 .../cloud/dialogflow/v2/SessionsClient.java   |    0
 .../cloud/dialogflow/v2/SessionsSettings.java |    0
 .../cloud/dialogflow/v2/package-info.java     |    0
 .../cloud/dialogflow/v2/stub/AgentsStub.java  |    0
 .../v2/stub/AgentsStubSettings.java           |    0
 .../dialogflow/v2/stub/ContextsStub.java      |    0
 .../v2/stub/ContextsStubSettings.java         |    0
 .../dialogflow/v2/stub/EntityTypesStub.java   |    0
 .../v2/stub/EntityTypesStubSettings.java      |    0
 .../v2/stub/GrpcAgentsCallableFactory.java    |    0
 .../dialogflow/v2/stub/GrpcAgentsStub.java    |    0
 .../v2/stub/GrpcContextsCallableFactory.java  |    0
 .../dialogflow/v2/stub/GrpcContextsStub.java  |    0
 .../stub/GrpcEntityTypesCallableFactory.java  |    0
 .../v2/stub/GrpcEntityTypesStub.java          |    0
 .../v2/stub/GrpcIntentsCallableFactory.java   |    0
 .../dialogflow/v2/stub/GrpcIntentsStub.java   |    0
 ...GrpcSessionEntityTypesCallableFactory.java |    0
 .../v2/stub/GrpcSessionEntityTypesStub.java   |    0
 .../v2/stub/GrpcSessionsCallableFactory.java  |    0
 .../dialogflow/v2/stub/GrpcSessionsStub.java  |    0
 .../cloud/dialogflow/v2/stub/IntentsStub.java |    0
 .../v2/stub/IntentsStubSettings.java          |    0
 .../v2/stub/SessionEntityTypesStub.java       |    0
 .../stub/SessionEntityTypesStubSettings.java  |    0
 .../dialogflow/v2/stub/SessionsStub.java      |    0
 .../v2/stub/SessionsStubSettings.java         |    0
 .../dialogflow/v2beta1/AgentsClient.java      |    0
 .../dialogflow/v2beta1/AgentsSettings.java    |    0
 .../dialogflow/v2beta1/ContextsClient.java    |    0
 .../dialogflow/v2beta1/ContextsSettings.java  |    0
 .../dialogflow/v2beta1/EntityTypesClient.java |    0
 .../v2beta1/EntityTypesSettings.java          |    0
 .../dialogflow/v2beta1/IntentsClient.java     |    0
 .../dialogflow/v2beta1/IntentsSettings.java   |    0
 .../v2beta1/SessionEntityTypesClient.java     |    0
 .../v2beta1/SessionEntityTypesSettings.java   |    0
 .../dialogflow/v2beta1/SessionsClient.java    |    0
 .../dialogflow/v2beta1/SessionsSettings.java  |    0
 .../dialogflow/v2beta1/package-info.java      |    0
 .../dialogflow/v2beta1/stub/AgentsStub.java   |    0
 .../v2beta1/stub/AgentsStubSettings.java      |    0
 .../dialogflow/v2beta1/stub/ContextsStub.java |    0
 .../v2beta1/stub/ContextsStubSettings.java    |    0
 .../v2beta1/stub/EntityTypesStub.java         |    0
 .../v2beta1/stub/EntityTypesStubSettings.java |    0
 .../stub/GrpcAgentsCallableFactory.java       |    0
 .../v2beta1/stub/GrpcAgentsStub.java          |    0
 .../stub/GrpcContextsCallableFactory.java     |    0
 .../v2beta1/stub/GrpcContextsStub.java        |    0
 .../stub/GrpcEntityTypesCallableFactory.java  |    0
 .../v2beta1/stub/GrpcEntityTypesStub.java     |    0
 .../stub/GrpcIntentsCallableFactory.java      |    0
 .../v2beta1/stub/GrpcIntentsStub.java         |    0
 ...GrpcSessionEntityTypesCallableFactory.java |    0
 .../stub/GrpcSessionEntityTypesStub.java      |    0
 .../stub/GrpcSessionsCallableFactory.java     |    0
 .../v2beta1/stub/GrpcSessionsStub.java        |    0
 .../dialogflow/v2beta1/stub/IntentsStub.java  |    0
 .../v2beta1/stub/IntentsStubSettings.java     |    0
 .../v2beta1/stub/SessionEntityTypesStub.java  |    0
 .../stub/SessionEntityTypesStubSettings.java  |    0
 .../dialogflow/v2beta1/stub/SessionsStub.java |    0
 .../v2beta1/stub/SessionsStubSettings.java    |    0
 .../cloud/dialogflow/v2/AgentsClientTest.java |    0
 .../dialogflow/v2/ContextsClientTest.java     |    0
 .../dialogflow/v2/EntityTypesClientTest.java  |    0
 .../dialogflow/v2/IntentsClientTest.java      |    0
 .../cloud/dialogflow/v2/MockAgents.java       |    0
 .../cloud/dialogflow/v2/MockAgentsImpl.java   |    0
 .../cloud/dialogflow/v2/MockContexts.java     |    0
 .../cloud/dialogflow/v2/MockContextsImpl.java |    0
 .../cloud/dialogflow/v2/MockEntityTypes.java  |    0
 .../dialogflow/v2/MockEntityTypesImpl.java    |    0
 .../cloud/dialogflow/v2/MockIntents.java      |    0
 .../cloud/dialogflow/v2/MockIntentsImpl.java  |    0
 .../dialogflow/v2/MockSessionEntityTypes.java |    0
 .../v2/MockSessionEntityTypesImpl.java        |    0
 .../cloud/dialogflow/v2/MockSessions.java     |    0
 .../cloud/dialogflow/v2/MockSessionsImpl.java |    0
 .../v2/SessionEntityTypesClientTest.java      |    0
 .../dialogflow/v2/SessionsClientTest.java     |    0
 .../dialogflow/v2beta1/AgentsClientTest.java  |    0
 .../v2beta1/ContextsClientTest.java           |    0
 .../v2beta1/EntityTypesClientTest.java        |    0
 .../dialogflow/v2beta1/IntentsClientTest.java |    0
 .../cloud/dialogflow/v2beta1/MockAgents.java  |    0
 .../dialogflow/v2beta1/MockAgentsImpl.java    |    0
 .../dialogflow/v2beta1/MockContexts.java      |    0
 .../dialogflow/v2beta1/MockContextsImpl.java  |    0
 .../dialogflow/v2beta1/MockEntityTypes.java   |    0
 .../v2beta1/MockEntityTypesImpl.java          |    0
 .../cloud/dialogflow/v2beta1/MockIntents.java |    0
 .../dialogflow/v2beta1/MockIntentsImpl.java   |    0
 .../v2beta1/MockSessionEntityTypes.java       |    0
 .../v2beta1/MockSessionEntityTypesImpl.java   |    0
 .../dialogflow/v2beta1/MockSessions.java      |    0
 .../dialogflow/v2beta1/MockSessionsImpl.java  |    0
 .../v2beta1/SessionEntityTypesClientTest.java |    0
 .../v2beta1/SessionsClientTest.java           |    0
 .../google-cloud-dlp}/README.md               |    0
 .../google-cloud-dlp}/pom.xml                 |    4 +-
 .../google/cloud/dlp/v2/DlpServiceClient.java |    0
 .../cloud/dlp/v2/DlpServiceSettings.java      |    0
 .../com/google/cloud/dlp/v2/package-info.java |    0
 .../cloud/dlp/v2/stub/DlpServiceStub.java     |    0
 .../dlp/v2/stub/DlpServiceStubSettings.java   |    0
 .../stub/GrpcDlpServiceCallableFactory.java   |    0
 .../cloud/dlp/v2/stub/GrpcDlpServiceStub.java |    0
 .../com/google/cloud/dlp/v2beta1/Colors.java  |    0
 .../cloud/dlp/v2beta1/DlpServiceClient.java   |    0
 .../cloud/dlp/v2beta1/DlpServiceSettings.java |    0
 .../cloud/dlp/v2beta1/package-info.java       |    0
 .../dlp/v2beta1/stub/DlpServiceStub.java      |    0
 .../v2beta1/stub/DlpServiceStubSettings.java  |    0
 .../stub/GrpcDlpServiceCallableFactory.java   |    0
 .../dlp/v2beta1/stub/GrpcDlpServiceStub.java  |    0
 .../cloud/dlp/v2/DlpServiceClientTest.java    |    0
 .../google/cloud/dlp/v2/MockDlpService.java   |    0
 .../cloud/dlp/v2/MockDlpServiceImpl.java      |    0
 .../google/cloud/dlp/v2beta1/ColorTest.java   |    0
 .../dlp/v2beta1/DlpServiceClientTest.java     |    0
 .../dlp/v2beta1/DlpServiceSmokeTest.java      |    0
 .../cloud/dlp/v2beta1/MockDlpService.java     |    0
 .../cloud/dlp/v2beta1/MockDlpServiceImpl.java |    0
 .../google-cloud-dns}/README.md               |    0
 .../google-cloud-dns}/pom.xml                 |    4 +-
 .../com/google/cloud/dns/ChangeRequest.java   |    0
 .../google/cloud/dns/ChangeRequestInfo.java   |    0
 .../main/java/com/google/cloud/dns/Dns.java   |    0
 .../java/com/google/cloud/dns/DnsBatch.java   |    0
 .../com/google/cloud/dns/DnsBatchResult.java  |    0
 .../com/google/cloud/dns/DnsException.java    |    0
 .../java/com/google/cloud/dns/DnsFactory.java |    0
 .../java/com/google/cloud/dns/DnsImpl.java    |    0
 .../java/com/google/cloud/dns/DnsOptions.java |    0
 .../java/com/google/cloud/dns/Option.java     |    0
 .../com/google/cloud/dns/ProjectInfo.java     |    0
 .../java/com/google/cloud/dns/RecordSet.java  |    0
 .../main/java/com/google/cloud/dns/Zone.java  |    0
 .../java/com/google/cloud/dns/ZoneInfo.java   |    0
 .../com/google/cloud/dns/package-info.java    |    0
 .../google/cloud/dns/spi/DnsRpcFactory.java   |    0
 .../com/google/cloud/dns/spi/v1/DnsRpc.java   |    0
 .../google/cloud/dns/spi/v1/HttpDnsRpc.java   |    0
 .../com/google/cloud/dns/spi/v1/RpcBatch.java |    0
 .../cloud/dns/ChangeRequestInfoTest.java      |    0
 .../google/cloud/dns/ChangeRequestTest.java   |    0
 .../google/cloud/dns/DnsBatchResultTest.java  |    0
 .../com/google/cloud/dns/DnsBatchTest.java    |    0
 .../google/cloud/dns/DnsExceptionTest.java    |    0
 .../com/google/cloud/dns/DnsImplTest.java     |    0
 .../com/google/cloud/dns/DnsOptionsTest.java  |    0
 .../java/com/google/cloud/dns/DnsTest.java    |    0
 .../java/com/google/cloud/dns/OptionTest.java |    0
 .../com/google/cloud/dns/ProjectInfoTest.java |    0
 .../com/google/cloud/dns/RecordSetTest.java   |    0
 .../google/cloud/dns/SerializationTest.java   |    0
 .../com/google/cloud/dns/ZoneInfoTest.java    |    0
 .../java/com/google/cloud/dns/ZoneTest.java   |    0
 .../com/google/cloud/dns/it/ITDnsTest.java    |    0
 .../google-cloud-errorreporting}/README.md    |    0
 .../google-cloud-errorreporting}/pom.xml      |    4 +-
 .../v1beta1/ErrorGroupServiceClient.java      |    0
 .../v1beta1/ErrorGroupServiceSettings.java    |    0
 .../v1beta1/ErrorStatsServiceClient.java      |    0
 .../v1beta1/ErrorStatsServiceSettings.java    |    0
 .../v1beta1/ReportErrorsServiceClient.java    |    0
 .../v1beta1/ReportErrorsServiceSettings.java  |    0
 .../errorreporting/v1beta1/package-info.java  |    0
 .../v1beta1/stub/ErrorGroupServiceStub.java   |    0
 .../stub/ErrorGroupServiceStubSettings.java   |    0
 .../v1beta1/stub/ErrorStatsServiceStub.java   |    0
 .../stub/ErrorStatsServiceStubSettings.java   |    0
 .../GrpcErrorGroupServiceCallableFactory.java |    0
 .../stub/GrpcErrorGroupServiceStub.java       |    0
 .../GrpcErrorStatsServiceCallableFactory.java |    0
 .../stub/GrpcErrorStatsServiceStub.java       |    0
 ...rpcReportErrorsServiceCallableFactory.java |    0
 .../stub/GrpcReportErrorsServiceStub.java     |    0
 .../v1beta1/stub/ReportErrorsServiceStub.java |    0
 .../stub/ReportErrorsServiceStubSettings.java |    0
 .../v1beta1/ErrorGroupServiceClientTest.java  |    0
 .../v1beta1/ErrorStatsServiceClientTest.java  |    0
 .../v1beta1/MockErrorGroupService.java        |    0
 .../v1beta1/MockErrorGroupServiceImpl.java    |    0
 .../v1beta1/MockErrorStatsService.java        |    0
 .../v1beta1/MockErrorStatsServiceImpl.java    |    0
 .../v1beta1/MockReportErrorsService.java      |    0
 .../v1beta1/MockReportErrorsServiceImpl.java  |    0
 .../ReportErrorsServiceClientTest.java        |    0
 .../v1beta1/ReportErrorsServiceSmokeTest.java |    0
 .../google-cloud-firestore}/README.md         |    0
 .../google-cloud-firestore}/pom.xml           |    4 +-
 .../com/google/cloud/firestore/BasePath.java  |    0
 .../java/com/google/cloud/firestore/Blob.java |    0
 .../cloud/firestore/CollectionReference.java  |    0
 .../cloud/firestore/CustomClassMapper.java    |    0
 .../cloud/firestore/DocumentChange.java       |    0
 .../google/cloud/firestore/DocumentMask.java  |    0
 .../cloud/firestore/DocumentReference.java    |    0
 .../google/cloud/firestore/DocumentSet.java   |    0
 .../cloud/firestore/DocumentSnapshot.java     |    0
 .../cloud/firestore/DocumentTransform.java    |    0
 .../google/cloud/firestore/EventListener.java |    0
 .../com/google/cloud/firestore/FieldPath.java |    0
 .../google/cloud/firestore/FieldValue.java    |    0
 .../com/google/cloud/firestore/Firestore.java |    0
 .../cloud/firestore/FirestoreException.java   |    0
 .../cloud/firestore/FirestoreFactory.java     |    0
 .../google/cloud/firestore/FirestoreImpl.java |    0
 .../cloud/firestore/FirestoreOptions.java     |    0
 .../cloud/firestore/FirestoreRpcFactory.java  |    0
 .../com/google/cloud/firestore/GeoPoint.java  |    0
 .../cloud/firestore/ListenerRegistration.java |    0
 .../com/google/cloud/firestore/Order.java     |    0
 .../google/cloud/firestore/Precondition.java  |    0
 .../com/google/cloud/firestore/Query.java     |    0
 .../firestore/QueryDocumentSnapshot.java      |    0
 .../google/cloud/firestore/QuerySnapshot.java |    0
 .../google/cloud/firestore/ResourcePath.java  |    0
 .../google/cloud/firestore/SetOptions.java    |    0
 .../com/google/cloud/firestore/TraceUtil.java |    0
 .../google/cloud/firestore/Transaction.java   |    0
 .../cloud/firestore/TransactionOptions.java   |    0
 .../google/cloud/firestore/UpdateBuilder.java |    0
 .../cloud/firestore/UserDataConverter.java    |    0
 .../com/google/cloud/firestore/Watch.java     |    0
 .../google/cloud/firestore/WriteBatch.java    |    0
 .../google/cloud/firestore/WriteResult.java   |    0
 .../cloud/firestore/annotation/Exclude.java   |    0
 .../annotation/IgnoreExtraProperties.java     |    0
 .../firestore/annotation/PropertyName.java    |    0
 .../firestore/annotation/ServerTimestamp.java |    0
 .../annotation/ThrowOnExtraProperties.java    |    0
 .../firestore/collection/ArraySortedMap.java  |    0
 .../collection/ImmutableSortedMap.java        |    0
 .../ImmutableSortedMapIterator.java           |    0
 .../collection/ImmutableSortedSet.java        |    0
 .../collection/LLRBBlackValueNode.java        |    0
 .../firestore/collection/LLRBEmptyNode.java   |    0
 .../cloud/firestore/collection/LLRBNode.java  |    0
 .../collection/LLRBRedValueNode.java          |    0
 .../firestore/collection/LLRBValueNode.java   |    0
 .../firestore/collection/RBTreeSortedMap.java |    0
 .../collection/StandardComparator.java        |    0
 .../firestore/spi/v1beta1/FirestoreRpc.java   |    0
 .../spi/v1beta1/GrpcFirestoreRpc.java         |    0
 .../firestore/v1beta1/FirestoreClient.java    |    0
 .../firestore/v1beta1/FirestoreSettings.java  |    0
 .../cloud/firestore/v1beta1/package-info.java |    0
 .../firestore/v1beta1/stub/FirestoreStub.java |    0
 .../v1beta1/stub/FirestoreStubSettings.java   |    0
 .../stub/GrpcFirestoreCallableFactory.java    |    0
 .../v1beta1/stub/GrpcFirestoreStub.java       |    0
 .../firestore/CollectionReferenceTest.java    |    0
 .../cloud/firestore/ConformanceTest.java      |    0
 .../firestore/DocumentReferenceTest.java      |    0
 .../google/cloud/firestore/FirestoreTest.java |    0
 .../cloud/firestore/LocalFirestoreHelper.java |    0
 .../com/google/cloud/firestore/OrderTest.java |    0
 .../com/google/cloud/firestore/QueryTest.java |    0
 .../cloud/firestore/TransactionTest.java      |    0
 .../com/google/cloud/firestore/WatchTest.java |    0
 .../cloud/firestore/WriteBatchTest.java       |    0
 .../firestore/conformance/TestDefinition.java |    0
 .../cloud/firestore/it/ITSystemTest.java      |    0
 .../v1beta1/FirestoreClientTest.java          |    0
 .../firestore/v1beta1/MockFirestore.java      |    0
 .../firestore/v1beta1/MockFirestoreImpl.java  |    0
 .../src/test/resources/test-suite.binproto    |  Bin
 .../google-cloud-language}/README.md          |    0
 .../google-cloud-language}/pom.xml            |    4 +-
 .../language/v1/LanguageServiceClient.java    |    0
 .../language/v1/LanguageServiceSettings.java  |    0
 .../cloud/language/v1/package-info.java       |    0
 .../GrpcLanguageServiceCallableFactory.java   |    0
 .../v1/stub/GrpcLanguageServiceStub.java      |    0
 .../language/v1/stub/LanguageServiceStub.java |    0
 .../v1/stub/LanguageServiceStubSettings.java  |    0
 .../v1beta2/LanguageServiceClient.java        |    0
 .../v1beta2/LanguageServiceSettings.java      |    0
 .../cloud/language/v1beta2/package-info.java  |    0
 .../GrpcLanguageServiceCallableFactory.java   |    0
 .../v1beta2/stub/GrpcLanguageServiceStub.java |    0
 .../v1beta2/stub/LanguageServiceStub.java     |    0
 .../stub/LanguageServiceStubSettings.java     |    0
 .../v1/LanguageServiceClientTest.java         |    0
 .../language/v1/LanguageServiceSmokeTest.java |    0
 .../language/v1/MockLanguageService.java      |    0
 .../language/v1/MockLanguageServiceImpl.java  |    0
 .../v1beta2/LanguageServiceClientTest.java    |    0
 .../v1beta2/LanguageServiceSmokeTest.java     |    0
 .../language/v1beta2/MockLanguageService.java |    0
 .../v1beta2/MockLanguageServiceImpl.java      |    0
 .../google-cloud-logging}/README.md           |    0
 .../google-cloud-logging}/pom.xml             |    4 +-
 .../com/google/cloud/logging/HttpRequest.java |    0
 .../com/google/cloud/logging/LogEntry.java    |    0
 .../com/google/cloud/logging/Logging.java     |    0
 .../google/cloud/logging/LoggingConfig.java   |    0
 .../google/cloud/logging/LoggingEnhancer.java |    0
 .../cloud/logging/LoggingException.java       |    0
 .../google/cloud/logging/LoggingFactory.java  |    0
 .../google/cloud/logging/LoggingHandler.java  |    0
 .../com/google/cloud/logging/LoggingImpl.java |    0
 .../google/cloud/logging/LoggingLevel.java    |    0
 .../google/cloud/logging/LoggingOptions.java  |    0
 .../java/com/google/cloud/logging/Metric.java |    0
 .../com/google/cloud/logging/MetricInfo.java  |    0
 .../cloud/logging/MonitoredResourceUtil.java  |    0
 .../com/google/cloud/logging/Operation.java   |    0
 .../java/com/google/cloud/logging/Option.java |    0
 .../com/google/cloud/logging/Payload.java     |    0
 .../com/google/cloud/logging/Severity.java    |    0
 .../java/com/google/cloud/logging/Sink.java   |    0
 .../com/google/cloud/logging/SinkInfo.java    |    0
 .../google/cloud/logging/SourceLocation.java  |    0
 .../com/google/cloud/logging/Structs.java     |    0
 .../google/cloud/logging/Synchronicity.java   |    0
 .../cloud/logging/TraceLoggingEnhancer.java   |    0
 .../google/cloud/logging/package-info.java    |    0
 .../cloud/logging/spi/LoggingRpcFactory.java  |    0
 .../cloud/logging/spi/v2/GrpcLoggingRpc.java  |    0
 .../cloud/logging/spi/v2/LoggingRpc.java      |    0
 .../logging/testing/RemoteLoggingHelper.java  |    0
 .../cloud/logging/testing/package-info.java   |    0
 .../google/cloud/logging/v2/ConfigClient.java |    0
 .../cloud/logging/v2/ConfigSettings.java      |    0
 .../cloud/logging/v2/LoggingClient.java       |    0
 .../cloud/logging/v2/LoggingSettings.java     |    0
 .../cloud/logging/v2/MetricsClient.java       |    0
 .../cloud/logging/v2/MetricsSettings.java     |    0
 .../google/cloud/logging/v2/package-info.java |    0
 .../logging/v2/stub/ConfigServiceV2Stub.java  |    0
 .../v2/stub/ConfigServiceV2StubSettings.java  |    0
 .../GrpcConfigServiceV2CallableFactory.java   |    0
 .../v2/stub/GrpcConfigServiceV2Stub.java      |    0
 .../GrpcLoggingServiceV2CallableFactory.java  |    0
 .../v2/stub/GrpcLoggingServiceV2Stub.java     |    0
 .../GrpcMetricsServiceV2CallableFactory.java  |    0
 .../v2/stub/GrpcMetricsServiceV2Stub.java     |    0
 .../logging/v2/stub/LoggingServiceV2Stub.java |    0
 .../v2/stub/LoggingServiceV2StubSettings.java |    0
 .../logging/v2/stub/MetricsServiceV2Stub.java |    0
 .../v2/stub/MetricsServiceV2StubSettings.java |    0
 .../google/cloud/logging/BaseSystemTest.java  |    0
 .../google/cloud/logging/HttpRequestTest.java |    0
 .../google/cloud/logging/LogEntryTest.java    |    0
 .../cloud/logging/LoggingHandlerTest.java     |    0
 .../google/cloud/logging/LoggingImplTest.java |    0
 .../cloud/logging/LoggingLevelTest.java       |    0
 .../cloud/logging/LoggingOptionsTest.java     |    0
 .../com/google/cloud/logging/LoggingTest.java |    0
 .../google/cloud/logging/MetricInfoTest.java  |    0
 .../com/google/cloud/logging/MetricTest.java  |    0
 .../google/cloud/logging/OperationTest.java   |    0
 .../com/google/cloud/logging/OptionTest.java  |    0
 .../com/google/cloud/logging/PayloadTest.java |    0
 .../cloud/logging/SerializationTest.java      |    0
 .../google/cloud/logging/SinkInfoTest.java    |    0
 .../com/google/cloud/logging/SinkTest.java    |    0
 .../cloud/logging/SourceLocationTest.java     |    0
 .../com/google/cloud/logging/StructsTest.java |    0
 .../cloud/logging/it/ITLoggingTest.java       |    0
 .../cloud/logging/v2/ConfigClientTest.java    |    0
 .../cloud/logging/v2/LoggingClientTest.java   |    0
 .../cloud/logging/v2/LoggingSmokeTest.java    |    0
 .../cloud/logging/v2/MetricsClientTest.java   |    0
 .../cloud/logging/v2/MockConfigServiceV2.java |    0
 .../logging/v2/MockConfigServiceV2Impl.java   |    0
 .../logging/v2/MockLoggingServiceV2.java      |    0
 .../logging/v2/MockLoggingServiceV2Impl.java  |    0
 .../logging/v2/MockMetricsServiceV2.java      |    0
 .../logging/v2/MockMetricsServiceV2Impl.java  |    0
 .../v2/testing/LocalLoggingHelper.java        |    0
 .../logging/v2/testing/LocalLoggingImpl.java  |    0
 .../google-cloud-monitoring}/README.md        |    0
 .../google-cloud-monitoring}/pom.xml          |    4 +-
 .../v3/AlertPolicyServiceClient.java          |    0
 .../v3/AlertPolicyServiceSettings.java        |    0
 .../monitoring/v3/GroupServiceClient.java     |    0
 .../monitoring/v3/GroupServiceSettings.java   |    0
 .../monitoring/v3/MetricServiceClient.java    |    0
 .../monitoring/v3/MetricServiceSettings.java  |    0
 .../v3/NotificationChannelServiceClient.java  |    0
 .../NotificationChannelServiceSettings.java   |    0
 .../v3/UptimeCheckServiceClient.java          |    0
 .../v3/UptimeCheckServiceSettings.java        |    0
 .../cloud/monitoring/v3/package-info.java     |    0
 .../v3/stub/AlertPolicyServiceStub.java       |    0
 .../stub/AlertPolicyServiceStubSettings.java  |    0
 .../monitoring/v3/stub/GroupServiceStub.java  |    0
 .../v3/stub/GroupServiceStubSettings.java     |    0
 ...GrpcAlertPolicyServiceCallableFactory.java |    0
 .../v3/stub/GrpcAlertPolicyServiceStub.java   |    0
 .../stub/GrpcGroupServiceCallableFactory.java |    0
 .../v3/stub/GrpcGroupServiceStub.java         |    0
 .../GrpcMetricServiceCallableFactory.java     |    0
 .../v3/stub/GrpcMetricServiceStub.java        |    0
 ...ficationChannelServiceCallableFactory.java |    0
 .../GrpcNotificationChannelServiceStub.java   |    0
 ...GrpcUptimeCheckServiceCallableFactory.java |    0
 .../v3/stub/GrpcUptimeCheckServiceStub.java   |    0
 .../monitoring/v3/stub/MetricServiceStub.java |    0
 .../v3/stub/MetricServiceStubSettings.java    |    0
 .../stub/NotificationChannelServiceStub.java  |    0
 ...otificationChannelServiceStubSettings.java |    0
 .../v3/stub/UptimeCheckServiceStub.java       |    0
 .../stub/UptimeCheckServiceStubSettings.java  |    0
 .../v3/AlertPolicyServiceClientTest.java      |    0
 .../monitoring/v3/GroupServiceClientTest.java |    0
 .../v3/MetricServiceClientTest.java           |    0
 .../monitoring/v3/MetricServiceSmokeTest.java |    0
 .../monitoring/v3/MockAlertPolicyService.java |    0
 .../v3/MockAlertPolicyServiceImpl.java        |    0
 .../cloud/monitoring/v3/MockGroupService.java |    0
 .../monitoring/v3/MockGroupServiceImpl.java   |    0
 .../monitoring/v3/MockMetricService.java      |    0
 .../monitoring/v3/MockMetricServiceImpl.java  |    0
 .../v3/MockNotificationChannelService.java    |    0
 .../MockNotificationChannelServiceImpl.java   |    0
 .../monitoring/v3/MockUptimeCheckService.java |    0
 .../v3/MockUptimeCheckServiceImpl.java        |    0
 .../NotificationChannelServiceClientTest.java |    0
 .../v3/UptimeCheckServiceClientTest.java      |    0
 .../google-cloud-notification}/README.md      |    0
 .../google-cloud-notification}/pom.xml        |    4 +-
 .../cloud/notification/Notification.java      |    0
 .../cloud/notification/NotificationImpl.java  |    0
 .../cloud/notification/NotificationInfo.java  |    0
 .../notification/NotificationInfoTest.java    |    0
 .../cloud/notification/it/ITSystemTest.java   |    0
 .../google-cloud-os-login}/README.md          |    0
 .../google-cloud-os-login}/pom.xml            |    4 +-
 .../oslogin/v1/OsLoginServiceClient.java      |    0
 .../oslogin/v1/OsLoginServiceSettings.java    |    0
 .../google/cloud/oslogin/v1/package-info.java |    0
 .../GrpcOsLoginServiceCallableFactory.java    |    0
 .../v1/stub/GrpcOsLoginServiceStub.java       |    0
 .../oslogin/v1/stub/OsLoginServiceStub.java   |    0
 .../v1/stub/OsLoginServiceStubSettings.java   |    0
 .../cloud/oslogin/v1/MockOsLoginService.java  |    0
 .../oslogin/v1/MockOsLoginServiceImpl.java    |    0
 .../oslogin/v1/OsLoginServiceClientTest.java  |    0
 .../google-cloud-pubsub}/README.md            |    0
 .../google-cloud-pubsub}/pom.xml              |    4 +-
 .../cloud/pubsub/v1/AckReplyConsumer.java     |    0
 .../cloud/pubsub/v1/MessageDispatcher.java    |    0
 .../cloud/pubsub/v1/MessageReceiver.java      |    0
 .../google/cloud/pubsub/v1/MessageWaiter.java |    0
 .../com/google/cloud/pubsub/v1/Publisher.java |    0
 .../cloud/pubsub/v1/PublisherStats.java       |    0
 .../google/cloud/pubsub/v1/StatusUtil.java    |    0
 .../v1/StreamingSubscriberConnection.java     |    0
 .../google/cloud/pubsub/v1/Subscriber.java    |    0
 .../cloud/pubsub/v1/SubscriberStats.java      |    0
 .../pubsub/v1/SubscriptionAdminClient.java    |    0
 .../pubsub/v1/SubscriptionAdminSettings.java  |    0
 .../cloud/pubsub/v1/TopicAdminClient.java     |    0
 .../cloud/pubsub/v1/TopicAdminSettings.java   |    0
 .../google/cloud/pubsub/v1/package-info.java  |    0
 .../v1/stub/GrpcPublisherCallableFactory.java |    0
 .../pubsub/v1/stub/GrpcPublisherStub.java     |    0
 .../stub/GrpcSubscriberCallableFactory.java   |    0
 .../pubsub/v1/stub/GrpcSubscriberStub.java    |    0
 .../cloud/pubsub/v1/stub/PublisherStub.java   |    0
 .../pubsub/v1/stub/PublisherStubSettings.java |    0
 .../cloud/pubsub/v1/stub/SubscriberStub.java  |    0
 .../v1/stub/SubscriberStubSettings.java       |    0
 .../google/cloud/pubsub/it/ITPubSubTest.java  |    0
 .../com/google/cloud/pubsub/v1/FakeClock.java |    0
 .../pubsub/v1/FakePublisherServiceImpl.java   |    0
 .../v1/FakeScheduledExecutorService.java      |    0
 .../pubsub/v1/FakeSubscriberServiceImpl.java  |    0
 .../pubsub/v1/MessageDispatcherTest.java      |    0
 .../cloud/pubsub/v1/MessageWaiterTest.java    |    0
 .../google/cloud/pubsub/v1/MockIAMPolicy.java |    0
 .../cloud/pubsub/v1/MockIAMPolicyImpl.java    |    0
 .../google/cloud/pubsub/v1/MockPublisher.java |    0
 .../cloud/pubsub/v1/MockPublisherImpl.java    |    0
 .../cloud/pubsub/v1/MockSubscriber.java       |    0
 .../cloud/pubsub/v1/MockSubscriberImpl.java   |    0
 .../cloud/pubsub/v1/PublisherImplTest.java    |    0
 .../cloud/pubsub/v1/StatusUtilTest.java       |    0
 .../v1/StreamingSubscriberConnectionTest.java |    0
 .../cloud/pubsub/v1/SubscriberTest.java       |    0
 .../v1/SubscriptionAdminClientTest.java       |    0
 .../cloud/pubsub/v1/TopicAdminClientTest.java |    0
 .../cloud/pubsub/v1/TopicAdminSmokeTest.java  |    0
 .../google-cloud-redis}/README.md             |    0
 .../google-cloud-redis}/pom.xml               |    4 +-
 .../cloud/redis/v1beta1/CloudRedisClient.java |    0
 .../redis/v1beta1/CloudRedisSettings.java     |    0
 .../cloud/redis/v1beta1/package-info.java     |    0
 .../redis/v1beta1/stub/CloudRedisStub.java    |    0
 .../v1beta1/stub/CloudRedisStubSettings.java  |    0
 .../stub/GrpcCloudRedisCallableFactory.java   |    0
 .../v1beta1/stub/GrpcCloudRedisStub.java      |    0
 .../redis/v1beta1/CloudRedisClientTest.java   |    0
 .../cloud/redis/v1beta1/MockCloudRedis.java   |    0
 .../redis/v1beta1/MockCloudRedisImpl.java     |    0
 .../google-cloud-resourcemanager}/README.md   |    0
 .../google-cloud-resourcemanager}/pom.xml     |    4 +-
 .../google/cloud/resourcemanager/Option.java  |    0
 .../resourcemanager/PolicyMarshaller.java     |    0
 .../google/cloud/resourcemanager/Project.java |    0
 .../cloud/resourcemanager/ProjectInfo.java    |    0
 .../resourcemanager/ResourceManager.java      |    0
 .../ResourceManagerException.java             |    0
 .../ResourceManagerFactory.java               |    0
 .../resourcemanager/ResourceManagerImpl.java  |    0
 .../ResourceManagerOptions.java               |    0
 .../cloud/resourcemanager/package-info.java   |    0
 .../spi/ResourceManagerRpcFactory.java        |    0
 .../spi/v1beta1/HttpResourceManagerRpc.java   |    0
 .../spi/v1beta1/ResourceManagerRpc.java       |    0
 .../testing/LocalResourceManagerHelper.java   |    0
 .../resourcemanager/testing/package-info.java |    0
 .../cloud/resourcemanager/OptionTest.java     |    0
 .../resourcemanager/PolicyMarshallerTest.java |    0
 .../resourcemanager/ProjectInfoTest.java      |    0
 .../cloud/resourcemanager/ProjectTest.java    |    0
 .../ResourceManagerExceptionTest.java         |    0
 .../ResourceManagerImplTest.java              |    0
 .../ResourceManagerOptionsTest.java           |    0
 .../resourcemanager/SerializationTest.java    |    0
 .../LocalResourceManagerHelperTest.java       |    0
 .../google-cloud-spanner}/README.md           |    0
 .../google-cloud-spanner}/pom.xml             |    4 +-
 .../cloud/spanner/AbortedException.java       |    0
 .../cloud/spanner/AbstractStructReader.java   |    0
 .../com/google/cloud/spanner/BatchClient.java |    0
 .../google/cloud/spanner/BatchClientImpl.java |    0
 .../spanner/BatchReadOnlyTransaction.java     |    0
 .../cloud/spanner/BatchTransactionId.java     |    0
 .../com/google/cloud/spanner/Database.java    |    0
 .../cloud/spanner/DatabaseAdminClient.java    |    0
 .../google/cloud/spanner/DatabaseClient.java  |    0
 .../cloud/spanner/DatabaseClientImpl.java     |    0
 .../com/google/cloud/spanner/DatabaseId.java  |    0
 .../google/cloud/spanner/DatabaseInfo.java    |    0
 .../com/google/cloud/spanner/ErrorCode.java   |    0
 .../cloud/spanner/ForwardingResultSet.java    |    0
 .../cloud/spanner/ForwardingStructReader.java |    0
 .../com/google/cloud/spanner/Instance.java    |    0
 .../cloud/spanner/InstanceAdminClient.java    |    0
 .../google/cloud/spanner/InstanceConfig.java  |    0
 .../cloud/spanner/InstanceConfigId.java       |    0
 .../cloud/spanner/InstanceConfigInfo.java     |    0
 .../com/google/cloud/spanner/InstanceId.java  |    0
 .../google/cloud/spanner/InstanceInfo.java    |    0
 .../java/com/google/cloud/spanner/Key.java    |    0
 .../com/google/cloud/spanner/KeyRange.java    |    0
 .../java/com/google/cloud/spanner/KeySet.java |    0
 .../com/google/cloud/spanner/Mutation.java    |    0
 .../com/google/cloud/spanner/Operation.java   |    0
 .../com/google/cloud/spanner/Options.java     |    0
 .../com/google/cloud/spanner/Partition.java   |    0
 .../cloud/spanner/PartitionOptions.java       |    0
 .../com/google/cloud/spanner/ReadContext.java |    0
 .../cloud/spanner/ReadOnlyTransaction.java    |    0
 .../com/google/cloud/spanner/ResultSet.java   |    0
 .../com/google/cloud/spanner/ResultSets.java  |    0
 .../com/google/cloud/spanner/Session.java     |    0
 .../com/google/cloud/spanner/SessionPool.java |    0
 .../cloud/spanner/SessionPoolOptions.java     |    0
 .../com/google/cloud/spanner/Spanner.java     |    0
 .../cloud/spanner/SpannerException.java       |    0
 .../spanner/SpannerExceptionFactory.java      |    0
 .../google/cloud/spanner/SpannerFactory.java  |    0
 .../com/google/cloud/spanner/SpannerImpl.java |    0
 .../google/cloud/spanner/SpannerOptions.java  |    0
 .../com/google/cloud/spanner/Statement.java   |    0
 .../java/com/google/cloud/spanner/Struct.java |    0
 .../google/cloud/spanner/StructReader.java    |    0
 .../google/cloud/spanner/TimestampBound.java  |    0
 .../com/google/cloud/spanner/TraceUtil.java   |    0
 .../cloud/spanner/TransactionContext.java     |    0
 .../cloud/spanner/TransactionManager.java     |    0
 .../cloud/spanner/TransactionManagerImpl.java |    0
 .../cloud/spanner/TransactionRunner.java      |    0
 .../java/com/google/cloud/spanner/Type.java   |    0
 .../java/com/google/cloud/spanner/Value.java  |    0
 .../com/google/cloud/spanner/ValueBinder.java |    0
 .../database/v1/DatabaseAdminClient.java      |    0
 .../database/v1/DatabaseAdminSettings.java    |    0
 .../admin/database/v1/package-info.java       |    0
 .../database/v1/stub/DatabaseAdminStub.java   |    0
 .../v1/stub/DatabaseAdminStubSettings.java    |    0
 .../GrpcDatabaseAdminCallableFactory.java     |    0
 .../v1/stub/GrpcDatabaseAdminStub.java        |    0
 .../instance/v1/InstanceAdminClient.java      |    0
 .../instance/v1/InstanceAdminSettings.java    |    0
 .../admin/instance/v1/package-info.java       |    0
 .../GrpcInstanceAdminCallableFactory.java     |    0
 .../v1/stub/GrpcInstanceAdminStub.java        |    0
 .../instance/v1/stub/InstanceAdminStub.java   |    0
 .../v1/stub/InstanceAdminStubSettings.java    |    0
 .../google/cloud/spanner/package-info.java    |    0
 .../cloud/spanner/spi/SpannerRpcFactory.java  |    0
 .../cloud/spanner/spi/v1/GrpcSpannerRpc.java  |    0
 .../spi/v1/SpannerErrorInterceptor.java       |    0
 .../spi/v1/SpannerMetadataProvider.java       |    0
 .../cloud/spanner/spi/v1/SpannerRpc.java      |    0
 .../spanner/spi/v1/WatchdogInterceptor.java   |    0
 .../spanner/testing/RemoteSpannerHelper.java  |    0
 .../cloud/spanner/v1/SpannerClient.java       |    0
 .../cloud/spanner/v1/SpannerSettings.java     |    0
 .../google/cloud/spanner/v1/package-info.java |    0
 .../v1/stub/GrpcSpannerCallableFactory.java   |    0
 .../spanner/v1/stub/GrpcSpannerStub.java      |    0
 .../cloud/spanner/v1/stub/SpannerStub.java    |    0
 .../spanner/v1/stub/SpannerStubSettings.java  |    0
 .../AbstractStructReaderTypesTest.java        |    0
 .../cloud/spanner/BaseSessionPoolTest.java    |    0
 .../cloud/spanner/BatchClientImplTest.java    |    0
 .../cloud/spanner/BatchTransactionIdTest.java |    0
 .../spanner/DatabaseAdminClientImplTest.java  |    0
 .../google/cloud/spanner/DatabaseIdTest.java  |    0
 .../google/cloud/spanner/DatabaseTest.java    |    0
 .../com/google/cloud/spanner/FlakyTest.java   |    0
 .../cloud/spanner/GceTestEnvConfig.java       |    0
 .../cloud/spanner/GrpcResultSetTest.java      |    0
 .../spanner/InstanceAdminClientImplTest.java  |    0
 .../cloud/spanner/InstanceConfigIdTest.java   |    0
 .../google/cloud/spanner/InstanceIdTest.java  |    0
 .../google/cloud/spanner/InstanceTest.java    |    0
 .../google/cloud/spanner/IntegrationTest.java |    0
 .../cloud/spanner/IntegrationTestEnv.java     |    0
 .../google/cloud/spanner/KeyRangeTest.java    |    0
 .../com/google/cloud/spanner/KeySetTest.java  |    0
 .../com/google/cloud/spanner/KeyTest.java     |    0
 .../google/cloud/spanner/MutationTest.java    |    0
 .../google/cloud/spanner/OperationTest.java   |    0
 .../com/google/cloud/spanner/OptionsTest.java |    0
 .../cloud/spanner/PartitionOptionsTest.java   |    0
 .../google/cloud/spanner/PartitionTest.java   |    0
 .../google/cloud/spanner/ReadFormatTest.java  |    0
 .../cloud/spanner/ReadFormatTestRunner.java   |    0
 .../google/cloud/spanner/ResultSetsTest.java  |    0
 .../spanner/ResumableStreamIteratorTest.java  |    0
 .../google/cloud/spanner/SessionImplTest.java |    0
 .../spanner/SessionPoolIntegrationTest.java   |    0
 .../cloud/spanner/SessionPoolOptionsTest.java |    0
 .../cloud/spanner/SessionPoolStressTest.java  |    0
 .../google/cloud/spanner/SessionPoolTest.java |    0
 .../spanner/SpannerExceptionFactoryTest.java  |    0
 .../cloud/spanner/SpannerImplRetryTest.java   |    0
 .../google/cloud/spanner/SpannerImplTest.java |    0
 .../google/cloud/spanner/SpannerMatchers.java |    0
 .../cloud/spanner/SpannerOptionsTest.java     |    0
 .../google/cloud/spanner/StatementTest.java   |    0
 .../com/google/cloud/spanner/StructTest.java  |    0
 .../google/cloud/spanner/TestEnvConfig.java   |    0
 .../cloud/spanner/TimestampBoundTest.java     |    0
 .../spanner/TransactionManagerImplTest.java   |    0
 .../spanner/TransactionRunnerImplTest.java    |    0
 .../com/google/cloud/spanner/TypeTest.java    |    0
 .../google/cloud/spanner/ValueBinderTest.java |    0
 .../com/google/cloud/spanner/ValueTest.java   |    0
 .../database/v1/DatabaseAdminClientTest.java  |    0
 .../admin/database/v1/MockDatabaseAdmin.java  |    0
 .../database/v1/MockDatabaseAdminImpl.java    |    0
 .../instance/v1/InstanceAdminClientTest.java  |    0
 .../admin/instance/v1/MockInstanceAdmin.java  |    0
 .../instance/v1/MockInstanceAdminImpl.java    |    0
 .../cloud/spanner/it/ITBatchReadTest.java     |    0
 .../cloud/spanner/it/ITDatabaseAdminTest.java |    0
 .../cloud/spanner/it/ITDatabaseTest.java      |    0
 .../cloud/spanner/it/ITInstanceAdminTest.java |    0
 .../cloud/spanner/it/ITLargeReadTest.java     |    0
 .../google/cloud/spanner/it/ITQueryTest.java  |    0
 .../cloud/spanner/it/ITReadOnlyTxnTest.java   |    0
 .../google/cloud/spanner/it/ITReadTest.java   |    0
 .../spanner/it/ITTransactionManagerTest.java  |    0
 .../cloud/spanner/it/ITTransactionTest.java   |    0
 .../google/cloud/spanner/it/ITWriteTest.java  |    0
 .../spanner/spi/v1/RequestMetadataTest.java   |    0
 .../spi/v1/SpannerMetadataProviderTest.java   |    0
 .../spi/v1/WatchdogInterceptorTest.java       |    0
 .../google/cloud/spanner/v1/MockSpanner.java  |    0
 .../cloud/spanner/v1/MockSpannerImpl.java     |    0
 .../cloud/spanner/v1/SpannerClientTest.java   |    0
 .../com/google/cloud/spanner/read_tests.json  |    0
 .../google-cloud-speech}/README.md            |    0
 .../google-cloud-speech}/pom.xml              |    4 +-
 .../google/cloud/speech/v1/SpeechClient.java  |    0
 .../cloud/speech/v1/SpeechSettings.java       |    0
 .../google/cloud/speech/v1/package-info.java  |    0
 .../v1/stub/GrpcSpeechCallableFactory.java    |    0
 .../cloud/speech/v1/stub/GrpcSpeechStub.java  |    0
 .../cloud/speech/v1/stub/SpeechStub.java      |    0
 .../speech/v1/stub/SpeechStubSettings.java    |    0
 .../cloud/speech/v1beta1/SpeechClient.java    |    0
 .../cloud/speech/v1beta1/SpeechSettings.java  |    0
 .../cloud/speech/v1beta1/package-info.java    |    0
 .../stub/GrpcSpeechCallableFactory.java       |    0
 .../speech/v1beta1/stub/GrpcSpeechStub.java   |    0
 .../cloud/speech/v1beta1/stub/SpeechStub.java |    0
 .../v1beta1/stub/SpeechStubSettings.java      |    0
 .../cloud/speech/v1p1beta1/SpeechClient.java  |    0
 .../speech/v1p1beta1/SpeechSettings.java      |    0
 .../cloud/speech/v1p1beta1/package-info.java  |    0
 .../stub/GrpcSpeechCallableFactory.java       |    0
 .../speech/v1p1beta1/stub/GrpcSpeechStub.java |    0
 .../speech/v1p1beta1/stub/SpeechStub.java     |    0
 .../v1p1beta1/stub/SpeechStubSettings.java    |    0
 .../google/cloud/speech/v1/MockSpeech.java    |    0
 .../cloud/speech/v1/MockSpeechImpl.java       |    0
 .../cloud/speech/v1/SpeechClientTest.java     |    0
 .../cloud/speech/v1/SpeechSmokeTest.java      |    0
 .../cloud/speech/v1/it/ITSpeechTest.java      |    0
 .../cloud/speech/v1beta1/MockSpeech.java      |    0
 .../cloud/speech/v1beta1/MockSpeechImpl.java  |    0
 .../speech/v1beta1/SpeechClientTest.java      |    0
 .../cloud/speech/v1beta1/SpeechSmokeTest.java |    0
 .../cloud/speech/v1p1beta1/MockSpeech.java    |    0
 .../speech/v1p1beta1/MockSpeechImpl.java      |    0
 .../speech/v1p1beta1/SpeechClientTest.java    |    0
 .../speech/v1p1beta1/SpeechSmokeTest.java     |    0
 .../google-cloud-storage}/README.md           |    0
 .../google-cloud-storage}/pom.xml             |    4 +-
 .../java/com/google/cloud/storage/Acl.java    |    0
 .../java/com/google/cloud/storage/Blob.java   |    0
 .../java/com/google/cloud/storage/BlobId.java |    0
 .../com/google/cloud/storage/BlobInfo.java    |    0
 .../google/cloud/storage/BlobReadChannel.java |    0
 .../cloud/storage/BlobWriteChannel.java       |    0
 .../java/com/google/cloud/storage/Bucket.java |    0
 .../com/google/cloud/storage/BucketInfo.java  |    0
 .../CanonicalExtensionHeadersSerializer.java  |    0
 .../com/google/cloud/storage/CopyWriter.java  |    0
 .../java/com/google/cloud/storage/Cors.java   |    0
 .../com/google/cloud/storage/HttpMethod.java  |    0
 .../java/com/google/cloud/storage/Option.java |    0
 .../google/cloud/storage/PolicyHelper.java    |    0
 .../google/cloud/storage/ServiceAccount.java  |    0
 .../google/cloud/storage/SignatureInfo.java   |    0
 .../com/google/cloud/storage/Storage.java     |    0
 .../google/cloud/storage/StorageBatch.java    |    0
 .../cloud/storage/StorageBatchResult.java     |    0
 .../google/cloud/storage/StorageClass.java    |    0
 .../cloud/storage/StorageException.java       |    0
 .../google/cloud/storage/StorageFactory.java  |    0
 .../com/google/cloud/storage/StorageImpl.java |    0
 .../google/cloud/storage/StorageOptions.java  |    0
 .../google/cloud/storage/StorageRoles.java    |    0
 .../google/cloud/storage/package-info.java    |    0
 .../cloud/storage/spi/StorageRpcFactory.java  |    0
 .../cloud/storage/spi/v1/HttpStorageRpc.java  |    0
 .../storage/spi/v1/HttpStorageRpcSpans.java   |    0
 .../google/cloud/storage/spi/v1/RpcBatch.java |    0
 .../cloud/storage/spi/v1/StorageRpc.java      |    0
 .../storage/testing/RemoteStorageHelper.java  |    0
 .../cloud/storage/testing/package-info.java   |    0
 .../com/google/cloud/storage/AclTest.java     |    0
 .../com/google/cloud/storage/BlobIdTest.java  |    0
 .../google/cloud/storage/BlobInfoTest.java    |    0
 .../cloud/storage/BlobReadChannelTest.java    |    0
 .../com/google/cloud/storage/BlobTest.java    |    0
 .../cloud/storage/BlobWriteChannelTest.java   |    0
 .../google/cloud/storage/BucketInfoTest.java  |    0
 .../com/google/cloud/storage/BucketTest.java  |    0
 ...nonicalExtensionHeadersSerializerTest.java |    0
 .../google/cloud/storage/CopyRequestTest.java |    0
 .../google/cloud/storage/CopyWriterTest.java  |    0
 .../com/google/cloud/storage/CorsTest.java    |    0
 .../com/google/cloud/storage/OptionTest.java  |    0
 .../cloud/storage/PolicyHelperTest.java       |    0
 .../cloud/storage/SerializationTest.java      |    0
 .../cloud/storage/ServiceAccountTest.java     |    0
 .../cloud/storage/SignatureInfoTest.java      |    0
 .../cloud/storage/StorageBatchResultTest.java |    0
 .../cloud/storage/StorageBatchTest.java       |    0
 .../cloud/storage/StorageExceptionTest.java   |    0
 .../google/cloud/storage/StorageImplTest.java |    0
 .../cloud/storage/StorageOptionsTest.java     |    0
 .../cloud/storage/it/ITStorageTest.java       |    0
 .../storage/testing/ApiPolicyMatcher.java     |    0
 .../storage/testing/ApiPolicyMatcherTest.java |    0
 .../testing/RemoteStorageHelperTest.java      |    0
 .../google-cloud-texttospeech}/README.md      |    0
 .../google-cloud-texttospeech}/pom.xml        |    4 +-
 .../v1beta1/TextToSpeechClient.java           |    0
 .../v1beta1/TextToSpeechSettings.java         |    0
 .../texttospeech/v1beta1/package-info.java    |    0
 .../stub/GrpcTextToSpeechCallableFactory.java |    0
 .../v1beta1/stub/GrpcTextToSpeechStub.java    |    0
 .../v1beta1/stub/TextToSpeechStub.java        |    0
 .../stub/TextToSpeechStubSettings.java        |    0
 .../v1beta1/MockTextToSpeech.java             |    0
 .../v1beta1/MockTextToSpeechImpl.java         |    0
 .../v1beta1/TextToSpeechClientTest.java       |    0
 .../google-cloud-trace}/README.md             |    0
 .../google-cloud-trace}/pom.xml               |    4 +-
 .../cloud/trace/v1/TraceServiceClient.java    |    0
 .../cloud/trace/v1/TraceServiceSettings.java  |    0
 .../google/cloud/trace/v1/package-info.java   |    0
 .../stub/GrpcTraceServiceCallableFactory.java |    0
 .../trace/v1/stub/GrpcTraceServiceStub.java   |    0
 .../cloud/trace/v1/stub/TraceServiceStub.java |    0
 .../v1/stub/TraceServiceStubSettings.java     |    0
 .../cloud/trace/v2/TraceServiceClient.java    |    0
 .../cloud/trace/v2/TraceServiceSettings.java  |    0
 .../google/cloud/trace/v2/package-info.java   |    0
 .../stub/GrpcTraceServiceCallableFactory.java |    0
 .../trace/v2/stub/GrpcTraceServiceStub.java   |    0
 .../cloud/trace/v2/stub/TraceServiceStub.java |    0
 .../v2/stub/TraceServiceStubSettings.java     |    0
 .../cloud/trace/v1/MockTraceService.java      |    0
 .../cloud/trace/v1/MockTraceServiceImpl.java  |    0
 .../trace/v1/TraceServiceClientTest.java      |    0
 .../cloud/trace/v1/TraceServiceSmokeTest.java |    0
 .../cloud/trace/v2/MockTraceService.java      |    0
 .../cloud/trace/v2/MockTraceServiceImpl.java  |    0
 .../trace/v2/TraceServiceClientTest.java      |    0
 .../cloud/trace/v2/TraceServiceSmokeTest.java |    0
 .../google-cloud-translate}/README.md         |    0
 .../google-cloud-translate}/pom.xml           |    4 +-
 .../com/google/cloud/translate/Detection.java |    0
 .../com/google/cloud/translate/Language.java  |    0
 .../com/google/cloud/translate/Option.java    |    0
 .../com/google/cloud/translate/Translate.java |    0
 .../cloud/translate/TranslateException.java   |    0
 .../cloud/translate/TranslateFactory.java     |    0
 .../google/cloud/translate/TranslateImpl.java |    0
 .../cloud/translate/TranslateOptions.java     |    0
 .../google/cloud/translate/Translation.java   |    0
 .../google/cloud/translate/package-info.java  |    0
 .../translate/spi/TranslateRpcFactory.java    |    0
 .../translate/spi/v2/HttpTranslateRpc.java    |    0
 .../cloud/translate/spi/v2/TranslateRpc.java  |    0
 .../testing/RemoteTranslateHelper.java        |    0
 .../cloud/translate/testing/package-info.java |    0
 .../google/cloud/translate/DetectionTest.java |    0
 .../google/cloud/translate/LanguageTest.java  |    0
 .../google/cloud/translate/OptionTest.java    |    0
 .../cloud/translate/SerializationTest.java    |    0
 .../translate/TranslateExceptionTest.java     |    0
 .../cloud/translate/TranslateImplTest.java    |    0
 .../cloud/translate/TranslateOptionsTest.java |    0
 .../google/cloud/translate/TranslateTest.java |    0
 .../cloud/translate/TranslationTest.java      |    0
 .../cloud/translate/it/ITTranslateTest.java   |    0
 .../README.md                                 |    0
 .../google-cloud-video-intelligence}/pom.xml  |    4 +-
 .../v1/VideoIntelligenceServiceClient.java    |    0
 .../v1/VideoIntelligenceServiceSettings.java  |    0
 .../videointelligence/v1/package-info.java    |    0
 ...deoIntelligenceServiceCallableFactory.java |    0
 .../GrpcVideoIntelligenceServiceStub.java     |    0
 .../v1/stub/VideoIntelligenceServiceStub.java |    0
 .../VideoIntelligenceServiceStubSettings.java |    0
 .../VideoIntelligenceServiceClient.java       |    0
 .../VideoIntelligenceServiceSettings.java     |    0
 .../v1beta1/package-info.java                 |    0
 ...deoIntelligenceServiceCallableFactory.java |    0
 .../GrpcVideoIntelligenceServiceStub.java     |    0
 .../stub/VideoIntelligenceServiceStub.java    |    0
 .../VideoIntelligenceServiceStubSettings.java |    0
 .../VideoIntelligenceServiceClient.java       |    0
 .../VideoIntelligenceServiceSettings.java     |    0
 .../v1beta2/package-info.java                 |    0
 ...deoIntelligenceServiceCallableFactory.java |    0
 .../GrpcVideoIntelligenceServiceStub.java     |    0
 .../stub/VideoIntelligenceServiceStub.java    |    0
 .../VideoIntelligenceServiceStubSettings.java |    0
 .../VideoIntelligenceServiceClient.java       |    0
 .../VideoIntelligenceServiceSettings.java     |    0
 .../v1p1beta1/package-info.java               |    0
 ...deoIntelligenceServiceCallableFactory.java |    0
 .../GrpcVideoIntelligenceServiceStub.java     |    0
 .../stub/VideoIntelligenceServiceStub.java    |    0
 .../VideoIntelligenceServiceStubSettings.java |    0
 .../v1/MockVideoIntelligenceService.java      |    0
 .../v1/MockVideoIntelligenceServiceImpl.java  |    0
 .../VideoIntelligenceServiceClientTest.java   |    0
 .../v1/VideoIntelligenceServiceSmokeTest.java |    0
 .../v1beta1/MockVideoIntelligenceService.java |    0
 .../MockVideoIntelligenceServiceImpl.java     |    0
 .../VideoIntelligenceServiceClientTest.java   |    0
 .../v1beta2/MockVideoIntelligenceService.java |    0
 .../MockVideoIntelligenceServiceImpl.java     |    0
 .../VideoIntelligenceServiceClientTest.java   |    0
 .../MockVideoIntelligenceService.java         |    0
 .../MockVideoIntelligenceServiceImpl.java     |    0
 .../VideoIntelligenceServiceClientTest.java   |    0
 .../VideoIntelligenceServiceSmokeTest.java    |    0
 .../google-cloud-vision}/README.md            |    0
 .../google-cloud-vision}/pom.xml              |    4 +-
 .../cloud/vision/v1/ImageAnnotatorClient.java |    0
 .../vision/v1/ImageAnnotatorSettings.java     |    0
 .../google/cloud/vision/v1/package-info.java  |    0
 .../GrpcImageAnnotatorCallableFactory.java    |    0
 .../v1/stub/GrpcImageAnnotatorStub.java       |    0
 .../vision/v1/stub/ImageAnnotatorStub.java    |    0
 .../v1/stub/ImageAnnotatorStubSettings.java   |    0
 .../v1p1beta1/ImageAnnotatorClient.java       |    0
 .../v1p1beta1/ImageAnnotatorSettings.java     |    0
 .../cloud/vision/v1p1beta1/package-info.java  |    0
 .../GrpcImageAnnotatorCallableFactory.java    |    0
 .../stub/GrpcImageAnnotatorStub.java          |    0
 .../v1p1beta1/stub/ImageAnnotatorStub.java    |    0
 .../stub/ImageAnnotatorStubSettings.java      |    0
 .../v1p2beta1/ImageAnnotatorClient.java       |    0
 .../v1p2beta1/ImageAnnotatorSettings.java     |    0
 .../cloud/vision/v1p2beta1/package-info.java  |    0
 .../GrpcImageAnnotatorCallableFactory.java    |    0
 .../stub/GrpcImageAnnotatorStub.java          |    0
 .../v1p2beta1/stub/ImageAnnotatorStub.java    |    0
 .../stub/ImageAnnotatorStubSettings.java      |    0
 .../vision/v1/ImageAnnotatorClientTest.java   |    0
 .../vision/v1/ImageAnnotatorSmokeTest.java    |    0
 .../cloud/vision/v1/MockImageAnnotator.java   |    0
 .../vision/v1/MockImageAnnotatorImpl.java     |    0
 .../v1p1beta1/ImageAnnotatorClientTest.java   |    0
 .../v1p1beta1/ImageAnnotatorSmokeTest.java    |    0
 .../vision/v1p1beta1/MockImageAnnotator.java  |    0
 .../v1p1beta1/MockImageAnnotatorImpl.java     |    0
 .../v1p2beta1/ImageAnnotatorClientTest.java   |    0
 .../v1p2beta1/ImageAnnotatorSmokeTest.java    |    0
 .../vision/v1p2beta1/MockImageAnnotator.java  |    0
 .../v1p2beta1/MockImageAnnotatorImpl.java     |    0
 .../java.header                               |    0
 .../license-checks.xml                        |    0
 google-cloud-clients/pom.xml                  |  879 +++
 google-cloud-clients/src/site/site.xml        |   32 +
 google-cloud-examples/pom.xml                 |   95 +-
 .../google-cloud-managedtest/pom.xml          |   10 -
 google-cloud-testing/pom.xml                  |   74 +-
 .../google-cloud-compat-checker/pom.xml       |    9 +
 google-cloud-util/pom.xml                     |   17 +-
 google-cloud/README.md                        |   78 -
 google-cloud/pom.xml                          |   99 -
 pom.xml                                       |  839 +--
 versions.txt                                  |   89 +-
 1863 files changed, 87686 insertions(+), 1637 deletions(-)
 create mode 100644 google-api-grpc/grpc-google-cloud-cloudiot-v1/pom.xml
 create mode 100644 google-api-grpc/grpc-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerGrpc.java
 create mode 100644 google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
 create mode 100644 google-api-grpc/grpc-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisGrpc.java
 create mode 100644 google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
 create mode 100644 google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerGrpc.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/pom.xml
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/Device.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfigOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredentialOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceName.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistryOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceStateOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfigOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfigOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpState.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/LocationName.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfigOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttState.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateFormat.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredentialOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyFormat.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredentialOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryName.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfigOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetailsOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/proto/google/cloud/iot/v1/device_manager.proto
 create mode 100644 google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/proto/google/cloud/iot/v1/resources.proto
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceName.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadata.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadataOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationName.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadata.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadataOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/proto/google/cloud/redis/v1beta1/cloud_redis.proto
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrl.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrlOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrlProto.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Finding.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingAddonProto.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingName.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingProto.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStats.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsProto.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibrary.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibraryOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ProjectName.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfig.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigName.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigProto.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRun.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunName.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunProto.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResource.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResourceOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParameters.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParametersOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerProto.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Xss.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/XssOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/crawled_url.proto
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/finding.proto
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/finding_addon.proto
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/scan_config.proto
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/scan_run.proto
 create mode 100644 google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
 delete mode 100644 google-cloud-bigtable/.gitignore
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/README.md (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/pom.xml (97%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/benchmark/java/com/google/cloud/bigquery/benchmark/Benchmark.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/benchmark/java/com/google/cloud/bigquery/benchmark/README.md (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/benchmark/java/com/google/cloud/bigquery/benchmark/queries.json (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/Acl.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/BigQuery.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/BigQueryError.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/BigQueryException.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/BigQueryFactory.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/CopyJobConfiguration.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/CsvOptions.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/Dataset.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/DatasetId.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/DatasetInfo.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/DatastoreBackupOptions.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/EncryptionConfiguration.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/ExternalTableDefinition.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/ExtractJobConfiguration.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/Field.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/FieldList.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/FieldValue.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/FieldValueList.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/FormatOptions.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/GoogleSheetsOptions.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/InsertAllRequest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/InsertAllResponse.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/Job.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/JobConfiguration.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/JobException.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/JobId.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/JobInfo.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/JobStatistics.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/JobStatus.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/Labels.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/LegacySQLTypeName.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/LoadConfiguration.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/LoadJobConfiguration.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/Option.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/QueryResponse.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/QueryStage.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/Schema.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/StandardSQLTypeName.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/Table.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/TableDataWriteChannel.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/TableDefinition.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/TableId.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/TableInfo.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/TableResult.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/TimePartitioning.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/TimelineSample.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/ViewDefinition.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/WriteChannelConfiguration.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/package-info.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/spi/BigQueryRpcFactory.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/spi/v2/BigQueryRpc.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelper.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/main/java/com/google/cloud/bigquery/testing/package-info.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/AclTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/BigQueryExceptionTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/BigQueryOptionsTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/CopyJobConfigurationTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/CsvOptionsTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/DatasetIdTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/DatasetInfoTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/DatasetTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/DatastoreBackupOptionsTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/ExternalTableDefinitionTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/ExtractJobConfigurationTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/FieldListTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/FieldTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/FieldValueListTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/FieldValueTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/FormatOptionsTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/GoogleSheetsOptionsTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/InsertAllRequestTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/InsertAllResponseTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/JobIdTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/JobInfoTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/JobStatusTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/JobTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/LabelsTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/LoadJobConfigurationTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/OptionTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/QueryJobConfigurationTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/QueryStageTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/SchemaTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/SerializationTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/StandardTableDefinitionTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/TableDataWriteChannelTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/TableIdTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/TableInfoTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/TableResultTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/TableTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/TimePartitioningTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/TimelineSampleTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/UserDefinedFunctionTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/ViewDefinitionTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/WriteChannelConfigurationTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java (100%)
 rename {google-cloud-bigquery => google-cloud-clients/google-cloud-bigquery}/src/test/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelperTest.java (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/README.md (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/pom.xml (97%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClient.java (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSettings.java (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/src/main/java/com/google/cloud/bigquery/datatransfer/v1/SampleApp.java (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/src/main/java/com/google/cloud/bigquery/datatransfer/v1/package-info.java (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStub.java (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStubSettings.java (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceCallableFactory.java (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceStub.java (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSmokeTest.java (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferService.java (100%)
 rename {google-cloud-bigquerydatatransfer => google-cloud-clients/google-cloud-bigquerydatatransfer}/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferServiceImpl.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/DEVELOPING.md (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/README.md (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/autogen_files.lst (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/handwritten_files.lst (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/pom.xml (97%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/scripts/README.md (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/scripts/regenerate.sh (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/scripts/setup-test-table.sh (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/scripts/update-deps.sh (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataSettings.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparator.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/internal/DummyBatchingDescriptor.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/internal/RequestContext.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/BulkMutation.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/BulkMutationBatcher.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutation.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapter.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/InstanceName.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/KeyOffset.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/MutateRowsException.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/Mutation.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/Range.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRow.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/Row.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/RowAdapter.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/RowCell.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/RowMutation.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/models/Validations.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/package-info.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStub.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableCallableFactory.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/BulkMutateRowsUserFacingCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptor.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsRetryingCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsUserFacingCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/package-info.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsResumptionStrategy.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryCompletedCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMerger.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/StateMachine.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/package-info.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/gaxx/package-info.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/gaxx/reframing/IncompleteStreamException.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/gaxx/reframing/Reframer.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/gaxx/reframing/package-info.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/gaxx/retrying/ApiResultRetryAlgorithm.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/gaxx/retrying/NonCancellableFuture.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/main/java/com/google/cloud/bigtable/package-info.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdmin.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparatorTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/internal/RegexUtilTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/it/BulkMutationBatcherIT.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/it/CheckAndMutateIT.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/it/MutateRowIT.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/it/ReadIT.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/it/ReadModifyWriteIT.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/it/SampleRowsIT.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/it/env/Emulator.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/it/env/EmulatorEnv.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/it/env/ProdEnv.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/it/env/TestEnv.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/it/env/TestEnvRule.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/models/BulkMutationTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutationTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapterTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/models/RangeTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRowTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/models/RowMutationTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/models/RowTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallableTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettingsTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallableTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallableTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/ResourceHeaderTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallableTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/BulkMutateRowsRetryTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallableTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptorTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallableTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallableTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallableTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallableTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStatusCode.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStreamingApi.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/gaxx/testing/MockStreamingApi.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/java/com/google/cloud/bigtable/gaxx/testing/package-info.java (100%)
 rename {google-cloud-bigtable => google-cloud-clients/google-cloud-bigtable}/src/test/resources/com/google/cloud/bigtable/data/v2/stub/readrows/read-rows-acceptance-test.json (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/README.md (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/pom.xml (96%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Address.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/AddressId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/AddressInfo.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/AttachedDisk.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Compute.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ComputeException.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ComputeFactory.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ComputeImpl.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ComputeOptions.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/DeprecationStatus.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Disk.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/DiskConfiguration.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/DiskId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/DiskImageConfiguration.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/DiskInfo.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/DiskType.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/DiskTypeId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ForwardingRuleId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/GlobalAddressId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/GlobalForwardingRuleId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/GlobalOperationId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Image.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ImageConfiguration.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ImageDiskConfiguration.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ImageId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ImageInfo.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Instance.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/InstanceId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/InstanceInfo.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/License.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/LicenseId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/MachineType.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/MachineTypeId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Metadata.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Network.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/NetworkConfiguration.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/NetworkId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/NetworkInfo.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/NetworkInterface.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Operation.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/OperationId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Option.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Region.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/RegionAddressId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/RegionForwardingRuleId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/RegionId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/RegionOperationId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ResourceId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/SchedulingOptions.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ServiceAccount.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Snapshot.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/SnapshotDiskConfiguration.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/SnapshotId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/SnapshotInfo.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/StandardDiskConfiguration.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/StandardNetworkConfiguration.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/StorageImageConfiguration.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/SubnetNetworkConfiguration.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Subnetwork.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/SubnetworkId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/SubnetworkInfo.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Tags.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/Zone.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ZoneId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/ZoneOperationId.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/package-info.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/spi/ComputeRpcFactory.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/spi/v1/ComputeRpc.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/spi/v1/HttpComputeRpc.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/testing/RemoteComputeHelper.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/testing/ResourceCleaner.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/main/java/com/google/cloud/compute/deprecated/testing/package-info.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/AddressIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/AddressInfoTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/AddressTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/AttachedDiskTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/ComputeExceptionTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/ComputeImplTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/ComputeOptionsTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/DeprecationStatusTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/DiskIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/DiskImageConfigurationTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/DiskInfoTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/DiskTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/DiskTypeIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/DiskTypeTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/ForwardingRuleIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/ImageDiskConfigurationTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/ImageIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/ImageInfoTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/ImageTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/InstanceIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/InstanceInfoTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/InstanceTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/LicenseIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/LicenseTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/MachineTypeIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/MachineTypeTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/MetadataTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/NetworkIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/NetworkInfoTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/NetworkInterfaceTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/NetworkTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/OperationIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/OperationTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/RegionIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/RegionTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/SchedulingOptionsTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/SerializationTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/ServiceAccountTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/SnapshotDiskConfigurationTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/SnapshotIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/SnapshotInfoTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/SnapshotTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/StandardDiskConfigurationTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/StandardNetworkConfigurationTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/StorageImageConfigurationTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/SubnetNetworkConfigurationTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/SubnetworkIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/SubnetworkInfoTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/SubnetworkTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/TagsTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/ZoneIdTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/ZoneTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/it/ITComputeTest.java (100%)
 rename {google-cloud-compute => google-cloud-clients/google-cloud-compute}/src/test/java/com/google/cloud/compute/deprecated/testing/RemoteComputeHelperTest.java (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/README.md (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/pom.xml (97%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/src/main/java/com/google/cloud/container/v1/SampleApp.java (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/src/main/java/com/google/cloud/container/v1/package-info.java (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/src/test/java/com/google/cloud/container/v1/ClusterManagerSmokeTest.java (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/src/test/java/com/google/cloud/container/v1/MockClusterManager.java (100%)
 rename {google-cloud-container => google-cloud-clients/google-cloud-container}/src/test/java/com/google/cloud/container/v1/MockClusterManagerImpl.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/README.md (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-logging-logback/README.md (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-logging-logback/pom.xml (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-logging-logback/src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-logging-logback/src/test/java/com/example/enhancers/TestLoggingEnhancer.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/StackTraceTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio-examples/README.md (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio-examples/pom.xml (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio-examples/src/main/java/com/google/cloud/nio/examples/ListFilesystems.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/README.md (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/pom.xml (99%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageConfiguration.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeView.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectAttributes.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectImmutableException.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOption.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOptions.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePath.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryAttributes.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryException.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannel.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageRetryHandler.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageUtil.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannel.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionAcl.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionBlockSize.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionCacheControl.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentDisposition.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentEncoding.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMaxChannelReopens.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMimeType.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionUserMetadata.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/SeekableByteChannelPrefetcher.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/UnixPath.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/package-info.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelper.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageConfigurationTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageLateInitializationTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageOptionsTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannelTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannelTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/SeekableByteChannelPrefetcherTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/UnixPathTest.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java (100%)
 rename {google-cloud-contrib => google-cloud-clients/google-cloud-contrib}/pom.xml (94%)
 rename {google-cloud-core-grpc => google-cloud-clients/google-cloud-core-grpc}/pom.xml (97%)
 rename {google-cloud-core-grpc => google-cloud-clients/google-cloud-core-grpc}/src/main/java/com/google/cloud/grpc/BaseGrpcServiceException.java (100%)
 rename {google-cloud-core-grpc => google-cloud-clients/google-cloud-core-grpc}/src/main/java/com/google/cloud/grpc/GrpcTransportOptions.java (100%)
 rename {google-cloud-core-grpc => google-cloud-clients/google-cloud-core-grpc}/src/test/java/com/google/cloud/grpc/BaseGrpcServiceExceptionTest.java (100%)
 rename {google-cloud-core-grpc => google-cloud-clients/google-cloud-core-grpc}/src/test/java/com/google/cloud/grpc/GrpcTransportOptionsTest.java (100%)
 rename {google-cloud-core-http => google-cloud-clients/google-cloud-core-http}/pom.xml (98%)
 rename {google-cloud-core-http => google-cloud-clients/google-cloud-core-http}/src/main/java/com/google/cloud/http/BaseHttpServiceException.java (100%)
 rename {google-cloud-core-http => google-cloud-clients/google-cloud-core-http}/src/main/java/com/google/cloud/http/CensusHttpModule.java (100%)
 rename {google-cloud-core-http => google-cloud-clients/google-cloud-core-http}/src/main/java/com/google/cloud/http/HttpTransportOptions.java (100%)
 rename {google-cloud-core-http => google-cloud-clients/google-cloud-core-http}/src/test/java/com/google/cloud/http/BaseHttpServiceExceptionTest.java (100%)
 rename {google-cloud-core-http => google-cloud-clients/google-cloud-core-http}/src/test/java/com/google/cloud/http/CensusHttpModuleTest.java (100%)
 rename {google-cloud-core-http => google-cloud-clients/google-cloud-core-http}/src/test/java/com/google/cloud/http/HttpTransportOptionsTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/README.md (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/pom.xml (97%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/AsyncPageImpl.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/BaseService.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/BaseServiceException.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/BaseWriteChannel.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/BatchResult.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/BillingName.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/ByteArray.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/Date.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/ExceptionHandler.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/FieldSelector.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/FolderName.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/GcpLaunchStage.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/Identity.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/MetadataConfig.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/MonitoredResource.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/NoCredentials.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/OrganizationName.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/PageImpl.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/ParentName.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/ParentNames.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/PlatformInformation.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/Policy.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/ProjectName.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/ReadChannel.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/Restorable.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/RestorableState.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/RetryHelper.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/RetryOption.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/Role.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/Service.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/ServiceDefaults.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/ServiceFactory.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/ServiceOptions.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/ServiceRpc.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/StringEnumType.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/StringEnumValue.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/Timestamp.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/TransportOptions.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/Tuple.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/UntypedParentName.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/WriteChannel.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/package-info.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/spi/ServiceRpcFactory.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/testing/BlockingProcessStreamReader.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/testing/CommandWrapper.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/main/java/com/google/cloud/testing/Version.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/AsyncPageImplTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/BaseSerializationTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/BaseServiceExceptionTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/BaseWriteChannelTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/BatchResultTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/ByteArrayTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/DateTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/ExceptionHandlerTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/FieldSelectorHelperTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/IdentityTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/MonitoredResourceDescriptorTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/MonitoredResourceTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/PageImplTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/PolicyTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/RetryOptionTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/RoleTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/SerializationTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/ServiceOptionsTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/StringEnumTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/TimestampTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/testing/BlockingProcessStreamReaderTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/testing/CommandWrapperTest.java (100%)
 rename {google-cloud-core => google-cloud-clients/google-cloud-core}/src/test/java/com/google/cloud/testing/VersionTest.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/README.md (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/pom.xml (97%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/JobControllerClient.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/package-info.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStub.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerCallableFactory.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerCallableFactory.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerStub.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStub.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerSmokeTest.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/test/java/com/google/cloud/dataproc/v1/MockClusterController.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/test/java/com/google/cloud/dataproc/v1/MockClusterControllerImpl.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/test/java/com/google/cloud/dataproc/v1/MockJobController.java (100%)
 rename {google-cloud-dataproc => google-cloud-clients/google-cloud-dataproc}/src/test/java/com/google/cloud/dataproc/v1/MockJobControllerImpl.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/README.md (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/pom.xml (96%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/BaseEntity.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/BaseKey.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/Batch.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/BatchImpl.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/Blob.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/BlobValue.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/BooleanValue.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/Cursor.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/Datastore.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/DatastoreException.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/DatastoreFactory.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/DatastoreHelper.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/DatastoreImpl.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/DatastoreOptions.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/DatastoreReader.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/DatastoreWriter.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/DoubleValue.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/Entity.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/EntityQuery.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/EntityValue.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/FullEntity.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/GqlQuery.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/IncompleteKey.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/Key.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/KeyFactory.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/KeyQuery.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/KeyValue.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/LatLng.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/LatLngValue.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/ListValue.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/LongValue.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/NullValue.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/PathElement.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/ProjectionEntity.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/Query.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/QueryResults.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/RawValue.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/ReadOption.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/StringValue.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/StructuredQuery.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/TimestampValue.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/Transaction.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/TransactionImpl.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/Validator.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/Value.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/ValueBuilder.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/ValueMarshaller.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/ValueType.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/package-info.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/main/java/com/google/cloud/datastore/testing/package-info.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/BaseEntityTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/BaseKeyTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/BlobTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/BlobValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/BooleanValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/CursorTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/DatastoreTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/DoubleValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/EntityTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/EntityValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/FullEntityTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/KeyTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/KeyValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/LatLngTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/LatLngValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/ListValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/LongValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/NullValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/PathElementTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/RawValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/SerializationTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/StringValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/TimestampValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/ValueTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java (100%)
 rename {google-cloud-datastore => google-cloud-clients/google-cloud-datastore}/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/README.md (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/pom.xml (97%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/ContextsClient.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/ContextsSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/IntentsSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClient.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/SessionsSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/package-info.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStubSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsCallableFactory.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsCallableFactory.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesCallableFactory.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsCallableFactory.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesCallableFactory.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsCallableFactory.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStubSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionsStubSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsCallableFactory.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsCallableFactory.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesCallableFactory.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsCallableFactory.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesCallableFactory.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsCallableFactory.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStub.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStubSettings.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/ContextsClientTest.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/EntityTypesClientTest.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/IntentsClientTest.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/MockAgents.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/MockAgentsImpl.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/MockContexts.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/MockContextsImpl.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypes.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypesImpl.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/MockIntents.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/MockIntentsImpl.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypes.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypesImpl.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/MockSessions.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/MockSessionsImpl.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClientTest.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2/SessionsClientTest.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgents.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgentsImpl.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContexts.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContextsImpl.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypes.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypesImpl.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntents.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntentsImpl.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypes.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypesImpl.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessions.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionsImpl.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java (100%)
 rename {google-cloud-dialogflow => google-cloud-clients/google-cloud-dialogflow}/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/README.md (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/pom.xml (97%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2/DlpServiceClient.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2/DlpServiceSettings.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2/package-info.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStub.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStubSettings.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceCallableFactory.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceStub.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceClient.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceSettings.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2beta1/package-info.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStub.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStubSettings.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceCallableFactory.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceStub.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/test/java/com/google/cloud/dlp/v2/DlpServiceClientTest.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/test/java/com/google/cloud/dlp/v2/MockDlpService.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/test/java/com/google/cloud/dlp/v2/MockDlpServiceImpl.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceClientTest.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceSmokeTest.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpService.java (100%)
 rename {google-cloud-dlp => google-cloud-clients/google-cloud-dlp}/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpServiceImpl.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/README.md (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/pom.xml (96%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/ChangeRequest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/Dns.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/DnsBatch.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/DnsBatchResult.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/DnsException.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/DnsFactory.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/DnsImpl.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/DnsOptions.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/Option.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/ProjectInfo.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/RecordSet.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/Zone.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/ZoneInfo.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/package-info.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/spi/DnsRpcFactory.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/spi/v1/DnsRpc.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/spi/v1/HttpDnsRpc.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/main/java/com/google/cloud/dns/spi/v1/RpcBatch.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/ChangeRequestInfoTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/ChangeRequestTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/DnsBatchResultTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/DnsBatchTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/DnsExceptionTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/DnsImplTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/DnsOptionsTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/DnsTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/OptionTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/ProjectInfoTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/RecordSetTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/SerializationTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/ZoneInfoTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/ZoneTest.java (100%)
 rename {google-cloud-dns => google-cloud-clients/google-cloud-dns}/src/test/java/com/google/cloud/dns/it/ITDnsTest.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/README.md (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/pom.xml (96%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClient.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClient.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClient.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStub.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStubSettings.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStub.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceCallableFactory.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceStub.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceCallableFactory.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceStub.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceCallableFactory.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceStub.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStub.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStubSettings.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupService.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupServiceImpl.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsService.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsServiceImpl.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsService.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsServiceImpl.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java (100%)
 rename {google-cloud-errorreporting => google-cloud-clients/google-cloud-errorreporting}/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSmokeTest.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/README.md (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/pom.xml (97%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/BasePath.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/Blob.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/CollectionReference.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/CustomClassMapper.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/DocumentChange.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/DocumentMask.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/DocumentReference.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/DocumentSet.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/DocumentTransform.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/EventListener.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/FieldPath.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/FieldValue.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/Firestore.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/FirestoreException.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/FirestoreFactory.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/FirestoreImpl.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/FirestoreOptions.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/FirestoreRpcFactory.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/GeoPoint.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/ListenerRegistration.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/Order.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/Precondition.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/Query.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/QueryDocumentSnapshot.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/QuerySnapshot.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/ResourcePath.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/SetOptions.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/TraceUtil.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/Transaction.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/TransactionOptions.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/UpdateBuilder.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/UserDataConverter.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/Watch.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/WriteBatch.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/WriteResult.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/annotation/Exclude.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/annotation/IgnoreExtraProperties.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/annotation/PropertyName.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/annotation/ServerTimestamp.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/annotation/ThrowOnExtraProperties.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/collection/ArraySortedMap.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedMap.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedMapIterator.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedSet.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/collection/LLRBBlackValueNode.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/collection/LLRBEmptyNode.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/collection/LLRBNode.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/collection/LLRBRedValueNode.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/collection/LLRBValueNode.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/collection/RBTreeSortedMap.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/collection/StandardComparator.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/spi/v1beta1/FirestoreRpc.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/spi/v1beta1/GrpcFirestoreRpc.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreClient.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreSettings.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/v1beta1/package-info.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStub.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreStub.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/CollectionReferenceTest.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/ConformanceTest.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/FirestoreTest.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/OrderTest.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/QueryTest.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/TransactionTest.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/WatchTest.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/WriteBatchTest.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/conformance/TestDefinition.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java (100%)
 rename {google-cloud-firestore => google-cloud-clients/google-cloud-firestore}/src/test/resources/test-suite.binproto (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/README.md (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/pom.xml (97%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1/package-info.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceStub.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStub.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceClient.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceSettings.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1beta2/package-info.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceCallableFactory.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceStub.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStub.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStubSettings.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/test/java/com/google/cloud/language/v1/LanguageServiceSmokeTest.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/test/java/com/google/cloud/language/v1/MockLanguageService.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/test/java/com/google/cloud/language/v1/MockLanguageServiceImpl.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceSmokeTest.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/test/java/com/google/cloud/language/v1beta2/MockLanguageService.java (100%)
 rename {google-cloud-language => google-cloud-clients/google-cloud-language}/src/test/java/com/google/cloud/language/v1beta2/MockLanguageServiceImpl.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/README.md (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/pom.xml (97%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/HttpRequest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/LogEntry.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/Logging.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/LoggingConfig.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/LoggingEnhancer.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/LoggingException.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/LoggingFactory.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/LoggingHandler.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/LoggingImpl.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/LoggingLevel.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/LoggingOptions.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/Metric.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/MetricInfo.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/Operation.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/Option.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/Payload.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/Severity.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/Sink.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/SinkInfo.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/SourceLocation.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/Structs.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/Synchronicity.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/package-info.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/spi/LoggingRpcFactory.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/spi/v2/LoggingRpc.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/testing/package-info.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/ConfigClient.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/LoggingClient.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/LoggingSettings.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/MetricsClient.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/MetricsSettings.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/package-info.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2Stub.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2CallableFactory.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2Stub.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2CallableFactory.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2Stub.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2CallableFactory.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2Stub.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2Stub.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2Stub.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/BaseSystemTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/HttpRequestTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/LogEntryTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/LoggingImplTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/LoggingLevelTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/LoggingOptionsTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/LoggingTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/MetricInfoTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/MetricTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/OperationTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/OptionTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/PayloadTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/SerializationTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/SinkInfoTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/SinkTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/SourceLocationTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/StructsTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/it/ITLoggingTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/v2/LoggingSmokeTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingHelper.java (100%)
 rename {google-cloud-logging => google-cloud-clients/google-cloud-logging}/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingImpl.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/README.md (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/pom.xml (96%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClient.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/AlertPolicyServiceSettings.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/GroupServiceClient.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/GroupServiceSettings.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/MetricServiceClient.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/MetricServiceSettings.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClient.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceSettings.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClient.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/UptimeCheckServiceSettings.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/package-info.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStub.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStubSettings.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStub.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStubSettings.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceCallableFactory.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceStub.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceCallableFactory.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceStub.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceCallableFactory.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceStub.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceCallableFactory.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceStub.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceCallableFactory.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceStub.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStub.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStubSettings.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStub.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStubSettings.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStub.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStubSettings.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClientTest.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/GroupServiceClientTest.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/MetricServiceClientTest.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/MetricServiceSmokeTest.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyService.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyServiceImpl.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/MockGroupService.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/MockGroupServiceImpl.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/MockMetricService.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/MockMetricServiceImpl.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelService.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelServiceImpl.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckService.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckServiceImpl.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClientTest.java (100%)
 rename {google-cloud-monitoring => google-cloud-clients/google-cloud-monitoring}/src/test/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClientTest.java (100%)
 rename {google-cloud-notification => google-cloud-clients/google-cloud-notification}/README.md (100%)
 rename {google-cloud-notification => google-cloud-clients/google-cloud-notification}/pom.xml (97%)
 rename {google-cloud-notification => google-cloud-clients/google-cloud-notification}/src/main/java/com/google/cloud/notification/Notification.java (100%)
 rename {google-cloud-notification => google-cloud-clients/google-cloud-notification}/src/main/java/com/google/cloud/notification/NotificationImpl.java (100%)
 rename {google-cloud-notification => google-cloud-clients/google-cloud-notification}/src/main/java/com/google/cloud/notification/NotificationInfo.java (100%)
 rename {google-cloud-notification => google-cloud-clients/google-cloud-notification}/src/test/java/com/google/cloud/notification/NotificationInfoTest.java (100%)
 rename {google-cloud-notification => google-cloud-clients/google-cloud-notification}/src/test/java/com/google/cloud/notification/it/ITSystemTest.java (100%)
 rename {google-cloud-os-login => google-cloud-clients/google-cloud-os-login}/README.md (100%)
 rename {google-cloud-os-login => google-cloud-clients/google-cloud-os-login}/pom.xml (97%)
 rename {google-cloud-os-login => google-cloud-clients/google-cloud-os-login}/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceClient.java (100%)
 rename {google-cloud-os-login => google-cloud-clients/google-cloud-os-login}/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceSettings.java (100%)
 rename {google-cloud-os-login => google-cloud-clients/google-cloud-os-login}/src/main/java/com/google/cloud/oslogin/v1/package-info.java (100%)
 rename {google-cloud-os-login => google-cloud-clients/google-cloud-os-login}/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceCallableFactory.java (100%)
 rename {google-cloud-os-login => google-cloud-clients/google-cloud-os-login}/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceStub.java (100%)
 rename {google-cloud-os-login => google-cloud-clients/google-cloud-os-login}/src/main/java/com/google/cloud/oslogin/v1/stub/OsLoginServiceStub.java (100%)
 rename {google-cloud-os-login => google-cloud-clients/google-cloud-os-login}/src/main/java/com/google/cloud/oslogin/v1/stub/OsLoginServiceStubSettings.java (100%)
 rename {google-cloud-os-login => google-cloud-clients/google-cloud-os-login}/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginService.java (100%)
 rename {google-cloud-os-login => google-cloud-clients/google-cloud-os-login}/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginServiceImpl.java (100%)
 rename {google-cloud-os-login => google-cloud-clients/google-cloud-os-login}/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/README.md (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/pom.xml (97%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/MessageReceiver.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/MessageWaiter.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/Publisher.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/PublisherStats.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminSettings.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/TopicAdminSettings.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/package-info.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherCallableFactory.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberCallableFactory.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStub.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStub.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/FakeClock.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/FakePublisherServiceImpl.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/FakeSubscriberServiceImpl.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/MessageWaiterTest.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicy.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/MockPublisher.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/MockSubscriber.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java (100%)
 rename {google-cloud-pubsub => google-cloud-clients/google-cloud-pubsub}/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java (100%)
 rename {google-cloud-redis => google-cloud-clients/google-cloud-redis}/README.md (100%)
 rename {google-cloud-redis => google-cloud-clients/google-cloud-redis}/pom.xml (97%)
 rename {google-cloud-redis => google-cloud-clients/google-cloud-redis}/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java (100%)
 rename {google-cloud-redis => google-cloud-clients/google-cloud-redis}/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java (100%)
 rename {google-cloud-redis => google-cloud-clients/google-cloud-redis}/src/main/java/com/google/cloud/redis/v1beta1/package-info.java (100%)
 rename {google-cloud-redis => google-cloud-clients/google-cloud-redis}/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java (100%)
 rename {google-cloud-redis => google-cloud-clients/google-cloud-redis}/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java (100%)
 rename {google-cloud-redis => google-cloud-clients/google-cloud-redis}/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java (100%)
 rename {google-cloud-redis => google-cloud-clients/google-cloud-redis}/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java (100%)
 rename {google-cloud-redis => google-cloud-clients/google-cloud-redis}/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java (100%)
 rename {google-cloud-redis => google-cloud-clients/google-cloud-redis}/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java (100%)
 rename {google-cloud-redis => google-cloud-clients/google-cloud-redis}/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/README.md (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/pom.xml (96%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/Option.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/Project.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/package-info.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/OptionTest.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/PolicyMarshallerTest.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java (100%)
 rename {google-cloud-resourcemanager => google-cloud-clients/google-cloud-resourcemanager}/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/README.md (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/pom.xml (98%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/AbortedException.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/AbstractStructReader.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/BatchClient.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/BatchClientImpl.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/BatchReadOnlyTransaction.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/BatchTransactionId.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Database.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/DatabaseAdminClient.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/DatabaseClient.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/DatabaseId.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/DatabaseInfo.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/ErrorCode.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/ForwardingResultSet.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/ForwardingStructReader.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Instance.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/InstanceAdminClient.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/InstanceConfig.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/InstanceConfigId.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/InstanceConfigInfo.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/InstanceId.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/InstanceInfo.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Key.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/KeyRange.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/KeySet.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Mutation.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Operation.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Options.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Partition.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/PartitionOptions.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/ReadContext.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/ReadOnlyTransaction.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/ResultSet.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/ResultSets.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Session.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/SessionPool.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Spanner.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/SpannerException.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/SpannerFactory.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/SpannerImpl.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/SpannerOptions.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Statement.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Struct.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/StructReader.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/TimestampBound.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/TraceUtil.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/TransactionContext.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/TransactionManager.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/TransactionManagerImpl.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/TransactionRunner.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Type.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/Value.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/ValueBinder.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/database/v1/package-info.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminCallableFactory.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/instance/v1/package-info.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminCallableFactory.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStub.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/package-info.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/spi/SpannerRpcFactory.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/spi/v1/GrpcSpannerRpc.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/spi/v1/SpannerErrorInterceptor.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/spi/v1/SpannerMetadataProvider.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/spi/v1/SpannerRpc.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/spi/v1/WatchdogInterceptor.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/testing/RemoteSpannerHelper.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/v1/SpannerClient.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/v1/SpannerSettings.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/v1/package-info.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerCallableFactory.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerStub.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStub.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/BaseSessionPoolTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/BatchClientImplTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/BatchTransactionIdTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/DatabaseAdminClientImplTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/DatabaseIdTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/DatabaseTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/FlakyTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/InstanceAdminClientImplTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/InstanceConfigIdTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/InstanceIdTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/InstanceTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/IntegrationTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/KeyRangeTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/KeySetTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/KeyTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/MutationTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/OperationTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/OptionsTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/PartitionOptionsTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/PartitionTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/ReadFormatTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/ReadFormatTestRunner.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/ResultSetsTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/ResumableStreamIteratorTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/SessionImplTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/SessionPoolIntegrationTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/SessionPoolTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/SpannerExceptionFactoryTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/SpannerImplRetryTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/SpannerImplTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/SpannerMatchers.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/StatementTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/StructTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/TestEnvConfig.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/TypeTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/ValueBinderTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/ValueTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdmin.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdminImpl.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdmin.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdminImpl.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/it/ITReadTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/spi/v1/RequestMetadataTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/spi/v1/SpannerMetadataProviderTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/spi/v1/WatchdogInterceptorTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/v1/MockSpanner.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/v1/MockSpannerImpl.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java (100%)
 rename {google-cloud-spanner => google-cloud-clients/google-cloud-spanner}/src/test/resources/com/google/cloud/spanner/read_tests.json (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/README.md (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/pom.xml (97%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1/SpeechClient.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1/package-info.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1/stub/SpeechStubSettings.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1beta1/SpeechClient.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1beta1/SpeechSettings.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1beta1/package-info.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechCallableFactory.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechStub.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStub.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStubSettings.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechClient.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechSettings.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1p1beta1/package-info.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechCallableFactory.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechStub.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStub.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStubSettings.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1/MockSpeech.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1/MockSpeechImpl.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1/SpeechClientTest.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1/SpeechSmokeTest.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1/it/ITSpeechTest.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1beta1/MockSpeech.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1beta1/MockSpeechImpl.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1beta1/SpeechClientTest.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1beta1/SpeechSmokeTest.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeech.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeechImpl.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechClientTest.java (100%)
 rename {google-cloud-speech => google-cloud-clients/google-cloud-speech}/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechSmokeTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/README.md (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/pom.xml (96%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/Acl.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/Blob.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/BlobId.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/BlobInfo.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/BlobReadChannel.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/BlobWriteChannel.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/Bucket.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/BucketInfo.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializer.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/CopyWriter.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/Cors.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/HttpMethod.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/Option.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/PolicyHelper.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/ServiceAccount.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/SignatureInfo.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/Storage.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/StorageBatch.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/StorageBatchResult.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/StorageClass.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/StorageException.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/StorageFactory.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/StorageImpl.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/StorageOptions.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/StorageRoles.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/package-info.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/spi/StorageRpcFactory.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpcSpans.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/spi/v1/RpcBatch.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/testing/RemoteStorageHelper.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/main/java/com/google/cloud/storage/testing/package-info.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/AclTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/BlobIdTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/BlobInfoTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/BlobReadChannelTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/BlobTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/BlobWriteChannelTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/BucketInfoTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/BucketTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializerTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/CopyRequestTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/CopyWriterTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/CorsTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/OptionTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/PolicyHelperTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/SerializationTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/ServiceAccountTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/SignatureInfoTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/StorageBatchResultTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/StorageBatchTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/StorageExceptionTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/StorageImplTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/StorageOptionsTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/it/ITStorageTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/testing/ApiPolicyMatcher.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/testing/ApiPolicyMatcherTest.java (100%)
 rename {google-cloud-storage => google-cloud-clients/google-cloud-storage}/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java (100%)
 rename {google-cloud-texttospeech => google-cloud-clients/google-cloud-texttospeech}/README.md (100%)
 rename {google-cloud-texttospeech => google-cloud-clients/google-cloud-texttospeech}/pom.xml (96%)
 rename {google-cloud-texttospeech => google-cloud-clients/google-cloud-texttospeech}/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClient.java (100%)
 rename {google-cloud-texttospeech => google-cloud-clients/google-cloud-texttospeech}/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechSettings.java (100%)
 rename {google-cloud-texttospeech => google-cloud-clients/google-cloud-texttospeech}/src/main/java/com/google/cloud/texttospeech/v1beta1/package-info.java (100%)
 rename {google-cloud-texttospeech => google-cloud-clients/google-cloud-texttospeech}/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechCallableFactory.java (100%)
 rename {google-cloud-texttospeech => google-cloud-clients/google-cloud-texttospeech}/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechStub.java (100%)
 rename {google-cloud-texttospeech => google-cloud-clients/google-cloud-texttospeech}/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/TextToSpeechStub.java (100%)
 rename {google-cloud-texttospeech => google-cloud-clients/google-cloud-texttospeech}/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/TextToSpeechStubSettings.java (100%)
 rename {google-cloud-texttospeech => google-cloud-clients/google-cloud-texttospeech}/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeech.java (100%)
 rename {google-cloud-texttospeech => google-cloud-clients/google-cloud-texttospeech}/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeechImpl.java (100%)
 rename {google-cloud-texttospeech => google-cloud-clients/google-cloud-texttospeech}/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/README.md (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/pom.xml (97%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v1/TraceServiceClient.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v1/TraceServiceSettings.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v1/package-info.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceStub.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStub.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v2/TraceServiceClient.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v2/TraceServiceSettings.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v2/package-info.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceStub.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStub.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStubSettings.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/test/java/com/google/cloud/trace/v1/MockTraceService.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/test/java/com/google/cloud/trace/v1/TraceServiceSmokeTest.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/test/java/com/google/cloud/trace/v2/MockTraceService.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java (100%)
 rename {google-cloud-trace => google-cloud-clients/google-cloud-trace}/src/test/java/com/google/cloud/trace/v2/TraceServiceSmokeTest.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/README.md (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/pom.xml (96%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/Detection.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/Language.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/Option.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/Translate.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/TranslateException.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/TranslateFactory.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/TranslateImpl.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/TranslateOptions.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/Translation.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/package-info.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/spi/TranslateRpcFactory.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/spi/v2/HttpTranslateRpc.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/spi/v2/TranslateRpc.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/testing/RemoteTranslateHelper.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/main/java/com/google/cloud/translate/testing/package-info.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/test/java/com/google/cloud/translate/DetectionTest.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/test/java/com/google/cloud/translate/LanguageTest.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/test/java/com/google/cloud/translate/OptionTest.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/test/java/com/google/cloud/translate/SerializationTest.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/test/java/com/google/cloud/translate/TranslateExceptionTest.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/test/java/com/google/cloud/translate/TranslateImplTest.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/test/java/com/google/cloud/translate/TranslateOptionsTest.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/test/java/com/google/cloud/translate/TranslateTest.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/test/java/com/google/cloud/translate/TranslationTest.java (100%)
 rename {google-cloud-translate => google-cloud-clients/google-cloud-translate}/src/test/java/com/google/cloud/translate/it/ITTranslateTest.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/README.md (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/pom.xml (97%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1/package-info.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceCallableFactory.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta1/package-info.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta2/package-info.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceCallableFactory.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClient.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSettings.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1p1beta1/package-info.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceStub.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStub.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStubSettings.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceService.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceServiceImpl.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClientTest.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSmokeTest.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceService.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceServiceImpl.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClientTest.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceService.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceServiceImpl.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClientTest.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceService.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceServiceImpl.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClientTest.java (100%)
 rename {google-cloud-video-intelligence => google-cloud-clients/google-cloud-video-intelligence}/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSmokeTest.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/README.md (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/pom.xml (97%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1/package-info.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorCallableFactory.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStub.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClient.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p1beta1/package-info.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorCallableFactory.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStub.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClient.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p2beta1/package-info.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorCallableFactory.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStub.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorSmokeTest.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/test/java/com/google/cloud/vision/v1/MockImageAnnotator.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClientTest.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSmokeTest.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotator.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClientTest.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSmokeTest.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotator.java (100%)
 rename {google-cloud-vision => google-cloud-clients/google-cloud-vision}/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java (100%)
 rename java.header => google-cloud-clients/java.header (100%)
 rename license-checks.xml => google-cloud-clients/license-checks.xml (100%)
 create mode 100644 google-cloud-clients/pom.xml
 create mode 100644 google-cloud-clients/src/site/site.xml
 delete mode 100644 google-cloud/README.md
 delete mode 100644 google-cloud/pom.xml

diff --git a/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml b/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
index 562d0ac3b246..1142e6bbfdd7 100644
--- a/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigquerydatatransfer-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-bigquerydatatransfer-v1
   GRPC library for grpc-google-cloud-bigquerydatatransfer-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
index 9cae04fad27b..c97d11c58f86 100644
--- a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigtable-admin-v2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-bigtable-admin-v2
   GRPC library for grpc-google-cloud-bigtable-admin-v2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml b/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
index cef03bd8733a..cacb8d3a48b4 100644
--- a/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigtable-v2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-bigtable-v2
   GRPC library for grpc-google-cloud-bigtable-v2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-cloudiot-v1/pom.xml b/google-api-grpc/grpc-google-cloud-cloudiot-v1/pom.xml
new file mode 100644
index 000000000000..f17ba8986003
--- /dev/null
+++ b/google-api-grpc/grpc-google-cloud-cloudiot-v1/pom.xml
@@ -0,0 +1,31 @@
+
+  4.0.0
+  grpc-google-cloud-cloudiot-v1
+  0.12.1-SNAPSHOT
+  grpc-google-cloud-cloudiot-v1
+  GRPC library for grpc-google-cloud-cloudiot-v1
+  
+    com.google.api.grpc
+    google-api-grpc
+    0.12.1-SNAPSHOT
+  
+  
+    
+      io.grpc
+      grpc-stub
+      compile
+    
+    
+      io.grpc
+      grpc-protobuf
+      compile
+    
+    
+      com.google.api.grpc
+      proto-google-cloud-cloudiot-v1
+      compile
+    
+  
+
\ No newline at end of file
diff --git a/google-api-grpc/grpc-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerGrpc.java b/google-api-grpc/grpc-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerGrpc.java
new file mode 100644
index 000000000000..1a5f4b448423
--- /dev/null
+++ b/google-api-grpc/grpc-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerGrpc.java
@@ -0,0 +1,1734 @@
+package com.google.cloud.iot.v1;
+
+import static io.grpc.MethodDescriptor.generateFullMethodName;
+import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncUnaryCall;
+import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
+import static io.grpc.stub.ClientCalls.blockingUnaryCall;
+import static io.grpc.stub.ClientCalls.futureUnaryCall;
+import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnaryCall;
+import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
+
+/**
+ * 
+ * Internet of things (IoT) service. Allows to manipulate device registry
+ * instances and the registration of devices (Things) to the cloud.
+ * 

+ */
+@javax.annotation.Generated(
+    value = "by gRPC proto compiler (version 1.10.0)",
+    comments = "Source: google/cloud/iot/v1/device_manager.proto")
+public final class DeviceManagerGrpc {
+
+  private DeviceManagerGrpc() {}
+
+  public static final String SERVICE_NAME = "google.cloud.iot.v1.DeviceManager";
+
+  // Static method descriptors that strictly reflect the proto.
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getCreateDeviceRegistryMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_CREATE_DEVICE_REGISTRY = getCreateDeviceRegistryMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getCreateDeviceRegistryMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getCreateDeviceRegistryMethod() {
+    return getCreateDeviceRegistryMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getCreateDeviceRegistryMethodHelper() {
+    io.grpc.MethodDescriptor getCreateDeviceRegistryMethod;
+    if ((getCreateDeviceRegistryMethod = DeviceManagerGrpc.getCreateDeviceRegistryMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getCreateDeviceRegistryMethod = DeviceManagerGrpc.getCreateDeviceRegistryMethod) == null) {
+          DeviceManagerGrpc.getCreateDeviceRegistryMethod = getCreateDeviceRegistryMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "CreateDeviceRegistry"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.CreateDeviceRegistryRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("CreateDeviceRegistry"))
+                  .build();
+          }
+        }
+     }
+     return getCreateDeviceRegistryMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getGetDeviceRegistryMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_GET_DEVICE_REGISTRY = getGetDeviceRegistryMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getGetDeviceRegistryMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getGetDeviceRegistryMethod() {
+    return getGetDeviceRegistryMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getGetDeviceRegistryMethodHelper() {
+    io.grpc.MethodDescriptor getGetDeviceRegistryMethod;
+    if ((getGetDeviceRegistryMethod = DeviceManagerGrpc.getGetDeviceRegistryMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getGetDeviceRegistryMethod = DeviceManagerGrpc.getGetDeviceRegistryMethod) == null) {
+          DeviceManagerGrpc.getGetDeviceRegistryMethod = getGetDeviceRegistryMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "GetDeviceRegistry"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.GetDeviceRegistryRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("GetDeviceRegistry"))
+                  .build();
+          }
+        }
+     }
+     return getGetDeviceRegistryMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getUpdateDeviceRegistryMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_UPDATE_DEVICE_REGISTRY = getUpdateDeviceRegistryMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getUpdateDeviceRegistryMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getUpdateDeviceRegistryMethod() {
+    return getUpdateDeviceRegistryMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getUpdateDeviceRegistryMethodHelper() {
+    io.grpc.MethodDescriptor getUpdateDeviceRegistryMethod;
+    if ((getUpdateDeviceRegistryMethod = DeviceManagerGrpc.getUpdateDeviceRegistryMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getUpdateDeviceRegistryMethod = DeviceManagerGrpc.getUpdateDeviceRegistryMethod) == null) {
+          DeviceManagerGrpc.getUpdateDeviceRegistryMethod = getUpdateDeviceRegistryMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "UpdateDeviceRegistry"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.UpdateDeviceRegistryRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("UpdateDeviceRegistry"))
+                  .build();
+          }
+        }
+     }
+     return getUpdateDeviceRegistryMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getDeleteDeviceRegistryMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_DELETE_DEVICE_REGISTRY = getDeleteDeviceRegistryMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getDeleteDeviceRegistryMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getDeleteDeviceRegistryMethod() {
+    return getDeleteDeviceRegistryMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getDeleteDeviceRegistryMethodHelper() {
+    io.grpc.MethodDescriptor getDeleteDeviceRegistryMethod;
+    if ((getDeleteDeviceRegistryMethod = DeviceManagerGrpc.getDeleteDeviceRegistryMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getDeleteDeviceRegistryMethod = DeviceManagerGrpc.getDeleteDeviceRegistryMethod) == null) {
+          DeviceManagerGrpc.getDeleteDeviceRegistryMethod = getDeleteDeviceRegistryMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "DeleteDeviceRegistry"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.DeleteDeviceRegistryRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.protobuf.Empty.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("DeleteDeviceRegistry"))
+                  .build();
+          }
+        }
+     }
+     return getDeleteDeviceRegistryMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getListDeviceRegistriesMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_LIST_DEVICE_REGISTRIES = getListDeviceRegistriesMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getListDeviceRegistriesMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getListDeviceRegistriesMethod() {
+    return getListDeviceRegistriesMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getListDeviceRegistriesMethodHelper() {
+    io.grpc.MethodDescriptor getListDeviceRegistriesMethod;
+    if ((getListDeviceRegistriesMethod = DeviceManagerGrpc.getListDeviceRegistriesMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getListDeviceRegistriesMethod = DeviceManagerGrpc.getListDeviceRegistriesMethod) == null) {
+          DeviceManagerGrpc.getListDeviceRegistriesMethod = getListDeviceRegistriesMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "ListDeviceRegistries"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.ListDeviceRegistriesRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.ListDeviceRegistriesResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("ListDeviceRegistries"))
+                  .build();
+          }
+        }
+     }
+     return getListDeviceRegistriesMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getCreateDeviceMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_CREATE_DEVICE = getCreateDeviceMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getCreateDeviceMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getCreateDeviceMethod() {
+    return getCreateDeviceMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getCreateDeviceMethodHelper() {
+    io.grpc.MethodDescriptor getCreateDeviceMethod;
+    if ((getCreateDeviceMethod = DeviceManagerGrpc.getCreateDeviceMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getCreateDeviceMethod = DeviceManagerGrpc.getCreateDeviceMethod) == null) {
+          DeviceManagerGrpc.getCreateDeviceMethod = getCreateDeviceMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "CreateDevice"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.CreateDeviceRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.Device.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("CreateDevice"))
+                  .build();
+          }
+        }
+     }
+     return getCreateDeviceMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getGetDeviceMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_GET_DEVICE = getGetDeviceMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getGetDeviceMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getGetDeviceMethod() {
+    return getGetDeviceMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getGetDeviceMethodHelper() {
+    io.grpc.MethodDescriptor getGetDeviceMethod;
+    if ((getGetDeviceMethod = DeviceManagerGrpc.getGetDeviceMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getGetDeviceMethod = DeviceManagerGrpc.getGetDeviceMethod) == null) {
+          DeviceManagerGrpc.getGetDeviceMethod = getGetDeviceMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "GetDevice"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.GetDeviceRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.Device.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("GetDevice"))
+                  .build();
+          }
+        }
+     }
+     return getGetDeviceMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getUpdateDeviceMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_UPDATE_DEVICE = getUpdateDeviceMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getUpdateDeviceMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getUpdateDeviceMethod() {
+    return getUpdateDeviceMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getUpdateDeviceMethodHelper() {
+    io.grpc.MethodDescriptor getUpdateDeviceMethod;
+    if ((getUpdateDeviceMethod = DeviceManagerGrpc.getUpdateDeviceMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getUpdateDeviceMethod = DeviceManagerGrpc.getUpdateDeviceMethod) == null) {
+          DeviceManagerGrpc.getUpdateDeviceMethod = getUpdateDeviceMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "UpdateDevice"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.UpdateDeviceRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.Device.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("UpdateDevice"))
+                  .build();
+          }
+        }
+     }
+     return getUpdateDeviceMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getDeleteDeviceMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_DELETE_DEVICE = getDeleteDeviceMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getDeleteDeviceMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getDeleteDeviceMethod() {
+    return getDeleteDeviceMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getDeleteDeviceMethodHelper() {
+    io.grpc.MethodDescriptor getDeleteDeviceMethod;
+    if ((getDeleteDeviceMethod = DeviceManagerGrpc.getDeleteDeviceMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getDeleteDeviceMethod = DeviceManagerGrpc.getDeleteDeviceMethod) == null) {
+          DeviceManagerGrpc.getDeleteDeviceMethod = getDeleteDeviceMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "DeleteDevice"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.DeleteDeviceRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.protobuf.Empty.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("DeleteDevice"))
+                  .build();
+          }
+        }
+     }
+     return getDeleteDeviceMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getListDevicesMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_LIST_DEVICES = getListDevicesMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getListDevicesMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getListDevicesMethod() {
+    return getListDevicesMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getListDevicesMethodHelper() {
+    io.grpc.MethodDescriptor getListDevicesMethod;
+    if ((getListDevicesMethod = DeviceManagerGrpc.getListDevicesMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getListDevicesMethod = DeviceManagerGrpc.getListDevicesMethod) == null) {
+          DeviceManagerGrpc.getListDevicesMethod = getListDevicesMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "ListDevices"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.ListDevicesRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.ListDevicesResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("ListDevices"))
+                  .build();
+          }
+        }
+     }
+     return getListDevicesMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getModifyCloudToDeviceConfigMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_MODIFY_CLOUD_TO_DEVICE_CONFIG = getModifyCloudToDeviceConfigMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getModifyCloudToDeviceConfigMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getModifyCloudToDeviceConfigMethod() {
+    return getModifyCloudToDeviceConfigMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getModifyCloudToDeviceConfigMethodHelper() {
+    io.grpc.MethodDescriptor getModifyCloudToDeviceConfigMethod;
+    if ((getModifyCloudToDeviceConfigMethod = DeviceManagerGrpc.getModifyCloudToDeviceConfigMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getModifyCloudToDeviceConfigMethod = DeviceManagerGrpc.getModifyCloudToDeviceConfigMethod) == null) {
+          DeviceManagerGrpc.getModifyCloudToDeviceConfigMethod = getModifyCloudToDeviceConfigMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "ModifyCloudToDeviceConfig"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.DeviceConfig.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("ModifyCloudToDeviceConfig"))
+                  .build();
+          }
+        }
+     }
+     return getModifyCloudToDeviceConfigMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getListDeviceConfigVersionsMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_LIST_DEVICE_CONFIG_VERSIONS = getListDeviceConfigVersionsMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getListDeviceConfigVersionsMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getListDeviceConfigVersionsMethod() {
+    return getListDeviceConfigVersionsMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getListDeviceConfigVersionsMethodHelper() {
+    io.grpc.MethodDescriptor getListDeviceConfigVersionsMethod;
+    if ((getListDeviceConfigVersionsMethod = DeviceManagerGrpc.getListDeviceConfigVersionsMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getListDeviceConfigVersionsMethod = DeviceManagerGrpc.getListDeviceConfigVersionsMethod) == null) {
+          DeviceManagerGrpc.getListDeviceConfigVersionsMethod = getListDeviceConfigVersionsMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "ListDeviceConfigVersions"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("ListDeviceConfigVersions"))
+                  .build();
+          }
+        }
+     }
+     return getListDeviceConfigVersionsMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getListDeviceStatesMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_LIST_DEVICE_STATES = getListDeviceStatesMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getListDeviceStatesMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getListDeviceStatesMethod() {
+    return getListDeviceStatesMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getListDeviceStatesMethodHelper() {
+    io.grpc.MethodDescriptor getListDeviceStatesMethod;
+    if ((getListDeviceStatesMethod = DeviceManagerGrpc.getListDeviceStatesMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getListDeviceStatesMethod = DeviceManagerGrpc.getListDeviceStatesMethod) == null) {
+          DeviceManagerGrpc.getListDeviceStatesMethod = getListDeviceStatesMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "ListDeviceStates"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.ListDeviceStatesRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.iot.v1.ListDeviceStatesResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("ListDeviceStates"))
+                  .build();
+          }
+        }
+     }
+     return getListDeviceStatesMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getSetIamPolicyMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_SET_IAM_POLICY = getSetIamPolicyMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getSetIamPolicyMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getSetIamPolicyMethod() {
+    return getSetIamPolicyMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getSetIamPolicyMethodHelper() {
+    io.grpc.MethodDescriptor getSetIamPolicyMethod;
+    if ((getSetIamPolicyMethod = DeviceManagerGrpc.getSetIamPolicyMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getSetIamPolicyMethod = DeviceManagerGrpc.getSetIamPolicyMethod) == null) {
+          DeviceManagerGrpc.getSetIamPolicyMethod = getSetIamPolicyMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "SetIamPolicy"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.iam.v1.SetIamPolicyRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.iam.v1.Policy.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("SetIamPolicy"))
+                  .build();
+          }
+        }
+     }
+     return getSetIamPolicyMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getGetIamPolicyMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_GET_IAM_POLICY = getGetIamPolicyMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getGetIamPolicyMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getGetIamPolicyMethod() {
+    return getGetIamPolicyMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getGetIamPolicyMethodHelper() {
+    io.grpc.MethodDescriptor getGetIamPolicyMethod;
+    if ((getGetIamPolicyMethod = DeviceManagerGrpc.getGetIamPolicyMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getGetIamPolicyMethod = DeviceManagerGrpc.getGetIamPolicyMethod) == null) {
+          DeviceManagerGrpc.getGetIamPolicyMethod = getGetIamPolicyMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "GetIamPolicy"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.iam.v1.GetIamPolicyRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.iam.v1.Policy.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("GetIamPolicy"))
+                  .build();
+          }
+        }
+     }
+     return getGetIamPolicyMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getTestIamPermissionsMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_TEST_IAM_PERMISSIONS = getTestIamPermissionsMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getTestIamPermissionsMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getTestIamPermissionsMethod() {
+    return getTestIamPermissionsMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getTestIamPermissionsMethodHelper() {
+    io.grpc.MethodDescriptor getTestIamPermissionsMethod;
+    if ((getTestIamPermissionsMethod = DeviceManagerGrpc.getTestIamPermissionsMethod) == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        if ((getTestIamPermissionsMethod = DeviceManagerGrpc.getTestIamPermissionsMethod) == null) {
+          DeviceManagerGrpc.getTestIamPermissionsMethod = getTestIamPermissionsMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.iot.v1.DeviceManager", "TestIamPermissions"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.iam.v1.TestIamPermissionsRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.iam.v1.TestIamPermissionsResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new DeviceManagerMethodDescriptorSupplier("TestIamPermissions"))
+                  .build();
+          }
+        }
+     }
+     return getTestIamPermissionsMethod;
+  }
+
+  /**
+   * Creates a new async stub that supports all call types for the service
+   */
+  public static DeviceManagerStub newStub(io.grpc.Channel channel) {
+    return new DeviceManagerStub(channel);
+  }
+
+  /**
+   * Creates a new blocking-style stub that supports unary and streaming output calls on the service
+   */
+  public static DeviceManagerBlockingStub newBlockingStub(
+      io.grpc.Channel channel) {
+    return new DeviceManagerBlockingStub(channel);
+  }
+
+  /**
+   * Creates a new ListenableFuture-style stub that supports unary calls on the service
+   */
+  public static DeviceManagerFutureStub newFutureStub(
+      io.grpc.Channel channel) {
+    return new DeviceManagerFutureStub(channel);
+  }
+
+  /**
+   * 
+   * Internet of things (IoT) service. Allows to manipulate device registry
+   * instances and the registration of devices (Things) to the cloud.
+   * 

+   */
+  public static abstract class DeviceManagerImplBase implements io.grpc.BindableService {
+
+    /**
+     * 
+     * Creates a device registry that contains devices.
+     * 

+     */
+    public void createDeviceRegistry(com.google.cloud.iot.v1.CreateDeviceRegistryRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getCreateDeviceRegistryMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Gets a device registry configuration.
+     * 

+     */
+    public void getDeviceRegistry(com.google.cloud.iot.v1.GetDeviceRegistryRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getGetDeviceRegistryMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Updates a device registry configuration.
+     * 

+     */
+    public void updateDeviceRegistry(com.google.cloud.iot.v1.UpdateDeviceRegistryRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getUpdateDeviceRegistryMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Deletes a device registry configuration.
+     * 

+     */
+    public void deleteDeviceRegistry(com.google.cloud.iot.v1.DeleteDeviceRegistryRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getDeleteDeviceRegistryMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Lists device registries.
+     * 

+     */
+    public void listDeviceRegistries(com.google.cloud.iot.v1.ListDeviceRegistriesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getListDeviceRegistriesMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Creates a device in a device registry.
+     * 

+     */
+    public void createDevice(com.google.cloud.iot.v1.CreateDeviceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getCreateDeviceMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Gets details about a device.
+     * 

+     */
+    public void getDevice(com.google.cloud.iot.v1.GetDeviceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getGetDeviceMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Updates a device.
+     * 

+     */
+    public void updateDevice(com.google.cloud.iot.v1.UpdateDeviceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getUpdateDeviceMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Deletes a device.
+     * 

+     */
+    public void deleteDevice(com.google.cloud.iot.v1.DeleteDeviceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getDeleteDeviceMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * List devices in a device registry.
+     * 

+     */
+    public void listDevices(com.google.cloud.iot.v1.ListDevicesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getListDevicesMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Modifies the configuration for the device, which is eventually sent from
+     * the Cloud IoT Core servers. Returns the modified configuration version and
+     * its metadata.
+     * 

+     */
+    public void modifyCloudToDeviceConfig(com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getModifyCloudToDeviceConfigMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Lists the last few versions of the device configuration in descending
+     * order (i.e.: newest first).
+     * 

+     */
+    public void listDeviceConfigVersions(com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getListDeviceConfigVersionsMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Lists the last few versions of the device state in descending order (i.e.:
+     * newest first).
+     * 

+     */
+    public void listDeviceStates(com.google.cloud.iot.v1.ListDeviceStatesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getListDeviceStatesMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Sets the access control policy on the specified resource. Replaces any
+     * existing policy.
+     * 

+     */
+    public void setIamPolicy(com.google.iam.v1.SetIamPolicyRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getSetIamPolicyMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Gets the access control policy for a resource.
+     * Returns an empty policy if the resource exists and does not have a policy
+     * set.
+     * 

+     */
+    public void getIamPolicy(com.google.iam.v1.GetIamPolicyRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getGetIamPolicyMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Returns permissions that a caller has on the specified resource.
+     * If the resource does not exist, this will return an empty set of
+     * permissions, not a NOT_FOUND error.
+     * 

+     */
+    public void testIamPermissions(com.google.iam.v1.TestIamPermissionsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getTestIamPermissionsMethodHelper(), responseObserver);
+    }
+
+    @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
+      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+          .addMethod(
+            getCreateDeviceRegistryMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.CreateDeviceRegistryRequest,
+                com.google.cloud.iot.v1.DeviceRegistry>(
+                  this, METHODID_CREATE_DEVICE_REGISTRY)))
+          .addMethod(
+            getGetDeviceRegistryMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.GetDeviceRegistryRequest,
+                com.google.cloud.iot.v1.DeviceRegistry>(
+                  this, METHODID_GET_DEVICE_REGISTRY)))
+          .addMethod(
+            getUpdateDeviceRegistryMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.UpdateDeviceRegistryRequest,
+                com.google.cloud.iot.v1.DeviceRegistry>(
+                  this, METHODID_UPDATE_DEVICE_REGISTRY)))
+          .addMethod(
+            getDeleteDeviceRegistryMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.DeleteDeviceRegistryRequest,
+                com.google.protobuf.Empty>(
+                  this, METHODID_DELETE_DEVICE_REGISTRY)))
+          .addMethod(
+            getListDeviceRegistriesMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.ListDeviceRegistriesRequest,
+                com.google.cloud.iot.v1.ListDeviceRegistriesResponse>(
+                  this, METHODID_LIST_DEVICE_REGISTRIES)))
+          .addMethod(
+            getCreateDeviceMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.CreateDeviceRequest,
+                com.google.cloud.iot.v1.Device>(
+                  this, METHODID_CREATE_DEVICE)))
+          .addMethod(
+            getGetDeviceMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.GetDeviceRequest,
+                com.google.cloud.iot.v1.Device>(
+                  this, METHODID_GET_DEVICE)))
+          .addMethod(
+            getUpdateDeviceMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.UpdateDeviceRequest,
+                com.google.cloud.iot.v1.Device>(
+                  this, METHODID_UPDATE_DEVICE)))
+          .addMethod(
+            getDeleteDeviceMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.DeleteDeviceRequest,
+                com.google.protobuf.Empty>(
+                  this, METHODID_DELETE_DEVICE)))
+          .addMethod(
+            getListDevicesMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.ListDevicesRequest,
+                com.google.cloud.iot.v1.ListDevicesResponse>(
+                  this, METHODID_LIST_DEVICES)))
+          .addMethod(
+            getModifyCloudToDeviceConfigMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest,
+                com.google.cloud.iot.v1.DeviceConfig>(
+                  this, METHODID_MODIFY_CLOUD_TO_DEVICE_CONFIG)))
+          .addMethod(
+            getListDeviceConfigVersionsMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest,
+                com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse>(
+                  this, METHODID_LIST_DEVICE_CONFIG_VERSIONS)))
+          .addMethod(
+            getListDeviceStatesMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.iot.v1.ListDeviceStatesRequest,
+                com.google.cloud.iot.v1.ListDeviceStatesResponse>(
+                  this, METHODID_LIST_DEVICE_STATES)))
+          .addMethod(
+            getSetIamPolicyMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.iam.v1.SetIamPolicyRequest,
+                com.google.iam.v1.Policy>(
+                  this, METHODID_SET_IAM_POLICY)))
+          .addMethod(
+            getGetIamPolicyMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.iam.v1.GetIamPolicyRequest,
+                com.google.iam.v1.Policy>(
+                  this, METHODID_GET_IAM_POLICY)))
+          .addMethod(
+            getTestIamPermissionsMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.iam.v1.TestIamPermissionsRequest,
+                com.google.iam.v1.TestIamPermissionsResponse>(
+                  this, METHODID_TEST_IAM_PERMISSIONS)))
+          .build();
+    }
+  }
+
+  /**
+   * 
+   * Internet of things (IoT) service. Allows to manipulate device registry
+   * instances and the registration of devices (Things) to the cloud.
+   * 

+   */
+  public static final class DeviceManagerStub extends io.grpc.stub.AbstractStub {
+    private DeviceManagerStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private DeviceManagerStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected DeviceManagerStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new DeviceManagerStub(channel, callOptions);
+    }
+
+    /**
+     * 
+     * Creates a device registry that contains devices.
+     * 

+     */
+    public void createDeviceRegistry(com.google.cloud.iot.v1.CreateDeviceRegistryRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getCreateDeviceRegistryMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Gets a device registry configuration.
+     * 

+     */
+    public void getDeviceRegistry(com.google.cloud.iot.v1.GetDeviceRegistryRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getGetDeviceRegistryMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Updates a device registry configuration.
+     * 

+     */
+    public void updateDeviceRegistry(com.google.cloud.iot.v1.UpdateDeviceRegistryRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getUpdateDeviceRegistryMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Deletes a device registry configuration.
+     * 

+     */
+    public void deleteDeviceRegistry(com.google.cloud.iot.v1.DeleteDeviceRegistryRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getDeleteDeviceRegistryMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Lists device registries.
+     * 

+     */
+    public void listDeviceRegistries(com.google.cloud.iot.v1.ListDeviceRegistriesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getListDeviceRegistriesMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Creates a device in a device registry.
+     * 

+     */
+    public void createDevice(com.google.cloud.iot.v1.CreateDeviceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getCreateDeviceMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Gets details about a device.
+     * 

+     */
+    public void getDevice(com.google.cloud.iot.v1.GetDeviceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getGetDeviceMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Updates a device.
+     * 

+     */
+    public void updateDevice(com.google.cloud.iot.v1.UpdateDeviceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getUpdateDeviceMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Deletes a device.
+     * 

+     */
+    public void deleteDevice(com.google.cloud.iot.v1.DeleteDeviceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getDeleteDeviceMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * List devices in a device registry.
+     * 

+     */
+    public void listDevices(com.google.cloud.iot.v1.ListDevicesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getListDevicesMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Modifies the configuration for the device, which is eventually sent from
+     * the Cloud IoT Core servers. Returns the modified configuration version and
+     * its metadata.
+     * 

+     */
+    public void modifyCloudToDeviceConfig(com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getModifyCloudToDeviceConfigMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Lists the last few versions of the device configuration in descending
+     * order (i.e.: newest first).
+     * 

+     */
+    public void listDeviceConfigVersions(com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getListDeviceConfigVersionsMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Lists the last few versions of the device state in descending order (i.e.:
+     * newest first).
+     * 

+     */
+    public void listDeviceStates(com.google.cloud.iot.v1.ListDeviceStatesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getListDeviceStatesMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Sets the access control policy on the specified resource. Replaces any
+     * existing policy.
+     * 

+     */
+    public void setIamPolicy(com.google.iam.v1.SetIamPolicyRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getSetIamPolicyMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Gets the access control policy for a resource.
+     * Returns an empty policy if the resource exists and does not have a policy
+     * set.
+     * 

+     */
+    public void getIamPolicy(com.google.iam.v1.GetIamPolicyRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getGetIamPolicyMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Returns permissions that a caller has on the specified resource.
+     * If the resource does not exist, this will return an empty set of
+     * permissions, not a NOT_FOUND error.
+     * 

+     */
+    public void testIamPermissions(com.google.iam.v1.TestIamPermissionsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getTestIamPermissionsMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+  }
+
+  /**
+   * 
+   * Internet of things (IoT) service. Allows to manipulate device registry
+   * instances and the registration of devices (Things) to the cloud.
+   * 

+   */
+  public static final class DeviceManagerBlockingStub extends io.grpc.stub.AbstractStub {
+    private DeviceManagerBlockingStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private DeviceManagerBlockingStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected DeviceManagerBlockingStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new DeviceManagerBlockingStub(channel, callOptions);
+    }
+
+    /**
+     * 
+     * Creates a device registry that contains devices.
+     * 

+     */
+    public com.google.cloud.iot.v1.DeviceRegistry createDeviceRegistry(com.google.cloud.iot.v1.CreateDeviceRegistryRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getCreateDeviceRegistryMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Gets a device registry configuration.
+     * 

+     */
+    public com.google.cloud.iot.v1.DeviceRegistry getDeviceRegistry(com.google.cloud.iot.v1.GetDeviceRegistryRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getGetDeviceRegistryMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Updates a device registry configuration.
+     * 

+     */
+    public com.google.cloud.iot.v1.DeviceRegistry updateDeviceRegistry(com.google.cloud.iot.v1.UpdateDeviceRegistryRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getUpdateDeviceRegistryMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Deletes a device registry configuration.
+     * 

+     */
+    public com.google.protobuf.Empty deleteDeviceRegistry(com.google.cloud.iot.v1.DeleteDeviceRegistryRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getDeleteDeviceRegistryMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Lists device registries.
+     * 

+     */
+    public com.google.cloud.iot.v1.ListDeviceRegistriesResponse listDeviceRegistries(com.google.cloud.iot.v1.ListDeviceRegistriesRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getListDeviceRegistriesMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Creates a device in a device registry.
+     * 

+     */
+    public com.google.cloud.iot.v1.Device createDevice(com.google.cloud.iot.v1.CreateDeviceRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getCreateDeviceMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Gets details about a device.
+     * 

+     */
+    public com.google.cloud.iot.v1.Device getDevice(com.google.cloud.iot.v1.GetDeviceRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getGetDeviceMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Updates a device.
+     * 

+     */
+    public com.google.cloud.iot.v1.Device updateDevice(com.google.cloud.iot.v1.UpdateDeviceRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getUpdateDeviceMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Deletes a device.
+     * 

+     */
+    public com.google.protobuf.Empty deleteDevice(com.google.cloud.iot.v1.DeleteDeviceRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getDeleteDeviceMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * List devices in a device registry.
+     * 

+     */
+    public com.google.cloud.iot.v1.ListDevicesResponse listDevices(com.google.cloud.iot.v1.ListDevicesRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getListDevicesMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Modifies the configuration for the device, which is eventually sent from
+     * the Cloud IoT Core servers. Returns the modified configuration version and
+     * its metadata.
+     * 

+     */
+    public com.google.cloud.iot.v1.DeviceConfig modifyCloudToDeviceConfig(com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getModifyCloudToDeviceConfigMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Lists the last few versions of the device configuration in descending
+     * order (i.e.: newest first).
+     * 

+     */
+    public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse listDeviceConfigVersions(com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getListDeviceConfigVersionsMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Lists the last few versions of the device state in descending order (i.e.:
+     * newest first).
+     * 

+     */
+    public com.google.cloud.iot.v1.ListDeviceStatesResponse listDeviceStates(com.google.cloud.iot.v1.ListDeviceStatesRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getListDeviceStatesMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Sets the access control policy on the specified resource. Replaces any
+     * existing policy.
+     * 

+     */
+    public com.google.iam.v1.Policy setIamPolicy(com.google.iam.v1.SetIamPolicyRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getSetIamPolicyMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Gets the access control policy for a resource.
+     * Returns an empty policy if the resource exists and does not have a policy
+     * set.
+     * 

+     */
+    public com.google.iam.v1.Policy getIamPolicy(com.google.iam.v1.GetIamPolicyRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getGetIamPolicyMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Returns permissions that a caller has on the specified resource.
+     * If the resource does not exist, this will return an empty set of
+     * permissions, not a NOT_FOUND error.
+     * 

+     */
+    public com.google.iam.v1.TestIamPermissionsResponse testIamPermissions(com.google.iam.v1.TestIamPermissionsRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getTestIamPermissionsMethodHelper(), getCallOptions(), request);
+    }
+  }
+
+  /**
+   * 
+   * Internet of things (IoT) service. Allows to manipulate device registry
+   * instances and the registration of devices (Things) to the cloud.
+   * 

+   */
+  public static final class DeviceManagerFutureStub extends io.grpc.stub.AbstractStub {
+    private DeviceManagerFutureStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private DeviceManagerFutureStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected DeviceManagerFutureStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new DeviceManagerFutureStub(channel, callOptions);
+    }
+
+    /**
+     * 
+     * Creates a device registry that contains devices.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture createDeviceRegistry(
+        com.google.cloud.iot.v1.CreateDeviceRegistryRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getCreateDeviceRegistryMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Gets a device registry configuration.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture getDeviceRegistry(
+        com.google.cloud.iot.v1.GetDeviceRegistryRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getGetDeviceRegistryMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Updates a device registry configuration.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture updateDeviceRegistry(
+        com.google.cloud.iot.v1.UpdateDeviceRegistryRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getUpdateDeviceRegistryMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Deletes a device registry configuration.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture deleteDeviceRegistry(
+        com.google.cloud.iot.v1.DeleteDeviceRegistryRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getDeleteDeviceRegistryMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Lists device registries.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture listDeviceRegistries(
+        com.google.cloud.iot.v1.ListDeviceRegistriesRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getListDeviceRegistriesMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Creates a device in a device registry.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture createDevice(
+        com.google.cloud.iot.v1.CreateDeviceRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getCreateDeviceMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Gets details about a device.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture getDevice(
+        com.google.cloud.iot.v1.GetDeviceRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getGetDeviceMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Updates a device.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture updateDevice(
+        com.google.cloud.iot.v1.UpdateDeviceRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getUpdateDeviceMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Deletes a device.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture deleteDevice(
+        com.google.cloud.iot.v1.DeleteDeviceRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getDeleteDeviceMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * List devices in a device registry.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture listDevices(
+        com.google.cloud.iot.v1.ListDevicesRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getListDevicesMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Modifies the configuration for the device, which is eventually sent from
+     * the Cloud IoT Core servers. Returns the modified configuration version and
+     * its metadata.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture modifyCloudToDeviceConfig(
+        com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getModifyCloudToDeviceConfigMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Lists the last few versions of the device configuration in descending
+     * order (i.e.: newest first).
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture listDeviceConfigVersions(
+        com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getListDeviceConfigVersionsMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Lists the last few versions of the device state in descending order (i.e.:
+     * newest first).
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture listDeviceStates(
+        com.google.cloud.iot.v1.ListDeviceStatesRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getListDeviceStatesMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Sets the access control policy on the specified resource. Replaces any
+     * existing policy.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture setIamPolicy(
+        com.google.iam.v1.SetIamPolicyRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getSetIamPolicyMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Gets the access control policy for a resource.
+     * Returns an empty policy if the resource exists and does not have a policy
+     * set.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture getIamPolicy(
+        com.google.iam.v1.GetIamPolicyRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getGetIamPolicyMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Returns permissions that a caller has on the specified resource.
+     * If the resource does not exist, this will return an empty set of
+     * permissions, not a NOT_FOUND error.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture testIamPermissions(
+        com.google.iam.v1.TestIamPermissionsRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getTestIamPermissionsMethodHelper(), getCallOptions()), request);
+    }
+  }
+
+  private static final int METHODID_CREATE_DEVICE_REGISTRY = 0;
+  private static final int METHODID_GET_DEVICE_REGISTRY = 1;
+  private static final int METHODID_UPDATE_DEVICE_REGISTRY = 2;
+  private static final int METHODID_DELETE_DEVICE_REGISTRY = 3;
+  private static final int METHODID_LIST_DEVICE_REGISTRIES = 4;
+  private static final int METHODID_CREATE_DEVICE = 5;
+  private static final int METHODID_GET_DEVICE = 6;
+  private static final int METHODID_UPDATE_DEVICE = 7;
+  private static final int METHODID_DELETE_DEVICE = 8;
+  private static final int METHODID_LIST_DEVICES = 9;
+  private static final int METHODID_MODIFY_CLOUD_TO_DEVICE_CONFIG = 10;
+  private static final int METHODID_LIST_DEVICE_CONFIG_VERSIONS = 11;
+  private static final int METHODID_LIST_DEVICE_STATES = 12;
+  private static final int METHODID_SET_IAM_POLICY = 13;
+  private static final int METHODID_GET_IAM_POLICY = 14;
+  private static final int METHODID_TEST_IAM_PERMISSIONS = 15;
+
+  private static final class MethodHandlers implements
+      io.grpc.stub.ServerCalls.UnaryMethod,
+      io.grpc.stub.ServerCalls.ServerStreamingMethod,
+      io.grpc.stub.ServerCalls.ClientStreamingMethod,
+      io.grpc.stub.ServerCalls.BidiStreamingMethod {
+    private final DeviceManagerImplBase serviceImpl;
+    private final int methodId;
+
+    MethodHandlers(DeviceManagerImplBase serviceImpl, int methodId) {
+      this.serviceImpl = serviceImpl;
+      this.methodId = methodId;
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) {
+      switch (methodId) {
+        case METHODID_CREATE_DEVICE_REGISTRY:
+          serviceImpl.createDeviceRegistry((com.google.cloud.iot.v1.CreateDeviceRegistryRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_GET_DEVICE_REGISTRY:
+          serviceImpl.getDeviceRegistry((com.google.cloud.iot.v1.GetDeviceRegistryRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_UPDATE_DEVICE_REGISTRY:
+          serviceImpl.updateDeviceRegistry((com.google.cloud.iot.v1.UpdateDeviceRegistryRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_DELETE_DEVICE_REGISTRY:
+          serviceImpl.deleteDeviceRegistry((com.google.cloud.iot.v1.DeleteDeviceRegistryRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_LIST_DEVICE_REGISTRIES:
+          serviceImpl.listDeviceRegistries((com.google.cloud.iot.v1.ListDeviceRegistriesRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_CREATE_DEVICE:
+          serviceImpl.createDevice((com.google.cloud.iot.v1.CreateDeviceRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_GET_DEVICE:
+          serviceImpl.getDevice((com.google.cloud.iot.v1.GetDeviceRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_UPDATE_DEVICE:
+          serviceImpl.updateDevice((com.google.cloud.iot.v1.UpdateDeviceRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_DELETE_DEVICE:
+          serviceImpl.deleteDevice((com.google.cloud.iot.v1.DeleteDeviceRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_LIST_DEVICES:
+          serviceImpl.listDevices((com.google.cloud.iot.v1.ListDevicesRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_MODIFY_CLOUD_TO_DEVICE_CONFIG:
+          serviceImpl.modifyCloudToDeviceConfig((com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_LIST_DEVICE_CONFIG_VERSIONS:
+          serviceImpl.listDeviceConfigVersions((com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_LIST_DEVICE_STATES:
+          serviceImpl.listDeviceStates((com.google.cloud.iot.v1.ListDeviceStatesRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_SET_IAM_POLICY:
+          serviceImpl.setIamPolicy((com.google.iam.v1.SetIamPolicyRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_GET_IAM_POLICY:
+          serviceImpl.getIamPolicy((com.google.iam.v1.GetIamPolicyRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_TEST_IAM_PERMISSIONS:
+          serviceImpl.testIamPermissions((com.google.iam.v1.TestIamPermissionsRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        default:
+          throw new AssertionError();
+      }
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public io.grpc.stub.StreamObserver invoke(
+        io.grpc.stub.StreamObserver responseObserver) {
+      switch (methodId) {
+        default:
+          throw new AssertionError();
+      }
+    }
+  }
+
+  private static abstract class DeviceManagerBaseDescriptorSupplier
+      implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
+    DeviceManagerBaseDescriptorSupplier() {}
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.getDescriptor();
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
+      return getFileDescriptor().findServiceByName("DeviceManager");
+    }
+  }
+
+  private static final class DeviceManagerFileDescriptorSupplier
+      extends DeviceManagerBaseDescriptorSupplier {
+    DeviceManagerFileDescriptorSupplier() {}
+  }
+
+  private static final class DeviceManagerMethodDescriptorSupplier
+      extends DeviceManagerBaseDescriptorSupplier
+      implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
+    private final String methodName;
+
+    DeviceManagerMethodDescriptorSupplier(String methodName) {
+      this.methodName = methodName;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
+      return getServiceDescriptor().findMethodByName(methodName);
+    }
+  }
+
+  private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
+
+  public static io.grpc.ServiceDescriptor getServiceDescriptor() {
+    io.grpc.ServiceDescriptor result = serviceDescriptor;
+    if (result == null) {
+      synchronized (DeviceManagerGrpc.class) {
+        result = serviceDescriptor;
+        if (result == null) {
+          serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
+              .setSchemaDescriptor(new DeviceManagerFileDescriptorSupplier())
+              .addMethod(getCreateDeviceRegistryMethodHelper())
+              .addMethod(getGetDeviceRegistryMethodHelper())
+              .addMethod(getUpdateDeviceRegistryMethodHelper())
+              .addMethod(getDeleteDeviceRegistryMethodHelper())
+              .addMethod(getListDeviceRegistriesMethodHelper())
+              .addMethod(getCreateDeviceMethodHelper())
+              .addMethod(getGetDeviceMethodHelper())
+              .addMethod(getUpdateDeviceMethodHelper())
+              .addMethod(getDeleteDeviceMethodHelper())
+              .addMethod(getListDevicesMethodHelper())
+              .addMethod(getModifyCloudToDeviceConfigMethodHelper())
+              .addMethod(getListDeviceConfigVersionsMethodHelper())
+              .addMethod(getListDeviceStatesMethodHelper())
+              .addMethod(getSetIamPolicyMethodHelper())
+              .addMethod(getGetIamPolicyMethodHelper())
+              .addMethod(getTestIamPermissionsMethodHelper())
+              .build();
+        }
+      }
+    }
+    return result;
+  }
+}
diff --git a/google-api-grpc/grpc-google-cloud-container-v1/pom.xml b/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
index 7ac524e795d2..7f87f75e1434 100644
--- a/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-container-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-container-v1
   GRPC library for grpc-google-cloud-container-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml b/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
index aea05e8cc7ee..8202cd600ec6 100644
--- a/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dataproc-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-dataproc-v1
   GRPC library for grpc-google-cloud-dataproc-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml b/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
index b0625f760fec..669a6fcd94a3 100644
--- a/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dialogflow-v2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-dialogflow-v2
   GRPC library for grpc-google-cloud-dialogflow-v2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
index 88dfae11c59f..f46bac9d841a 100644
--- a/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dialogflow-v2beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-dialogflow-v2beta1
   GRPC library for grpc-google-cloud-dialogflow-v2beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml b/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
index 6877524734fd..f8e96658fa02 100644
--- a/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dlp-v2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-dlp-v2
   GRPC library for grpc-google-cloud-dlp-v2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dlp-v2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-dlp-v2beta1/pom.xml
index 003ca8d70f19..c5d0689e585b 100644
--- a/google-api-grpc/grpc-google-cloud-dlp-v2beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dlp-v2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dlp-v2beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-dlp-v2beta1
   GRPC library for grpc-google-cloud-dlp-v2beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
index 348a214f6b0e..33d136008180 100644
--- a/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-error-reporting-v1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-error-reporting-v1beta1
   GRPC library for grpc-google-cloud-error-reporting-v1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
index 26bd6a9a8cc9..6f14092bd6f3 100644
--- a/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-firestore-v1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-firestore-v1beta1
   GRPC library for grpc-google-cloud-firestore-v1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-language-v1/pom.xml b/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
index a13363a36fd3..d7c28cb01ef3 100644
--- a/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-language-v1
-  1.10.1-SNAPSHOT
+  1.11.1-SNAPSHOT
   grpc-google-cloud-language-v1
   GRPC library for grpc-google-cloud-language-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml b/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
index aa61710bbe54..bb743ac126fc 100644
--- a/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-language-v1beta2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-language-v1beta2
   GRPC library for grpc-google-cloud-language-v1beta2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml b/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
index e32bf29feb65..60d659911329 100644
--- a/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-logging-v2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-logging-v2
   GRPC library for grpc-google-cloud-logging-v2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml b/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
index 252e35c022d2..d4dc516d79bb 100644
--- a/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-monitoring-v3
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-monitoring-v3
   GRPC library for grpc-google-cloud-monitoring-v3
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml b/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
index 43be6d99e941..194d396f2b90 100644
--- a/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-os-login-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-os-login-v1
   GRPC library for grpc-google-cloud-os-login-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml b/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
index 59b104028970..6f254b8449a7 100644
--- a/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-pubsub-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-pubsub-v1
   GRPC library for grpc-google-cloud-pubsub-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
new file mode 100644
index 000000000000..dd0d57031dfb
--- /dev/null
+++ b/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
@@ -0,0 +1,31 @@
+
+  4.0.0
+  grpc-google-cloud-redis-v1beta1
+  0.12.1-SNAPSHOT
+  grpc-google-cloud-redis-v1beta1
+  GRPC library for grpc-google-cloud-redis-v1beta1
+  
+    com.google.api.grpc
+    google-api-grpc
+    0.12.1-SNAPSHOT
+  
+  
+    
+      io.grpc
+      grpc-stub
+      compile
+    
+    
+      io.grpc
+      grpc-protobuf
+      compile
+    
+    
+      com.google.api.grpc
+      proto-google-cloud-redis-v1beta1
+      compile
+    
+  
+
\ No newline at end of file
diff --git a/google-api-grpc/grpc-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisGrpc.java b/google-api-grpc/grpc-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisGrpc.java
new file mode 100644
index 000000000000..fad6f93de51f
--- /dev/null
+++ b/google-api-grpc/grpc-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisGrpc.java
@@ -0,0 +1,804 @@
+package com.google.cloud.redis.v1beta1;
+
+import static io.grpc.MethodDescriptor.generateFullMethodName;
+import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncUnaryCall;
+import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
+import static io.grpc.stub.ClientCalls.blockingUnaryCall;
+import static io.grpc.stub.ClientCalls.futureUnaryCall;
+import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnaryCall;
+import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
+
+/**
+ * 
+ * Configures and manages Cloud Memorystore for Redis instances
+ * Google Cloud Memorystore for Redis v1beta1
+ * The `redis.googleapis.com` service implements the Google Cloud Memorystore
+ * for Redis API and defines the following resource model for managing Redis
+ * instances:
+ * * The service works with a collection of cloud projects, named: `/projects/*`
+ * * Each project has a collection of available locations, named: `/locations/*`
+ * * Each location has a collection of Redis instances, named: `/instances/*`
+ * * As such, Redis instances are resources of the form:
+ *   `/projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+ * Note that location_id must be refering to a GCP `region`; for example:
+ * * `projects/redpepper-1290/locations/us-central1/instances/my-redis`
+ * 

+ */
+@javax.annotation.Generated(
+    value = "by gRPC proto compiler (version 1.10.0)",
+    comments = "Source: google/cloud/redis/v1beta1/cloud_redis.proto")
+public final class CloudRedisGrpc {
+
+  private CloudRedisGrpc() {}
+
+  public static final String SERVICE_NAME = "google.cloud.redis.v1beta1.CloudRedis";
+
+  // Static method descriptors that strictly reflect the proto.
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getListInstancesMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_LIST_INSTANCES = getListInstancesMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getListInstancesMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getListInstancesMethod() {
+    return getListInstancesMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getListInstancesMethodHelper() {
+    io.grpc.MethodDescriptor getListInstancesMethod;
+    if ((getListInstancesMethod = CloudRedisGrpc.getListInstancesMethod) == null) {
+      synchronized (CloudRedisGrpc.class) {
+        if ((getListInstancesMethod = CloudRedisGrpc.getListInstancesMethod) == null) {
+          CloudRedisGrpc.getListInstancesMethod = getListInstancesMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.redis.v1beta1.CloudRedis", "ListInstances"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.redis.v1beta1.ListInstancesRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.redis.v1beta1.ListInstancesResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new CloudRedisMethodDescriptorSupplier("ListInstances"))
+                  .build();
+          }
+        }
+     }
+     return getListInstancesMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getGetInstanceMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_GET_INSTANCE = getGetInstanceMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getGetInstanceMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getGetInstanceMethod() {
+    return getGetInstanceMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getGetInstanceMethodHelper() {
+    io.grpc.MethodDescriptor getGetInstanceMethod;
+    if ((getGetInstanceMethod = CloudRedisGrpc.getGetInstanceMethod) == null) {
+      synchronized (CloudRedisGrpc.class) {
+        if ((getGetInstanceMethod = CloudRedisGrpc.getGetInstanceMethod) == null) {
+          CloudRedisGrpc.getGetInstanceMethod = getGetInstanceMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.redis.v1beta1.CloudRedis", "GetInstance"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.redis.v1beta1.GetInstanceRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.redis.v1beta1.Instance.getDefaultInstance()))
+                  .setSchemaDescriptor(new CloudRedisMethodDescriptorSupplier("GetInstance"))
+                  .build();
+          }
+        }
+     }
+     return getGetInstanceMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getCreateInstanceMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_CREATE_INSTANCE = getCreateInstanceMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getCreateInstanceMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getCreateInstanceMethod() {
+    return getCreateInstanceMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getCreateInstanceMethodHelper() {
+    io.grpc.MethodDescriptor getCreateInstanceMethod;
+    if ((getCreateInstanceMethod = CloudRedisGrpc.getCreateInstanceMethod) == null) {
+      synchronized (CloudRedisGrpc.class) {
+        if ((getCreateInstanceMethod = CloudRedisGrpc.getCreateInstanceMethod) == null) {
+          CloudRedisGrpc.getCreateInstanceMethod = getCreateInstanceMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.redis.v1beta1.CloudRedis", "CreateInstance"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.redis.v1beta1.CreateInstanceRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.longrunning.Operation.getDefaultInstance()))
+                  .setSchemaDescriptor(new CloudRedisMethodDescriptorSupplier("CreateInstance"))
+                  .build();
+          }
+        }
+     }
+     return getCreateInstanceMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getUpdateInstanceMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_UPDATE_INSTANCE = getUpdateInstanceMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getUpdateInstanceMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getUpdateInstanceMethod() {
+    return getUpdateInstanceMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getUpdateInstanceMethodHelper() {
+    io.grpc.MethodDescriptor getUpdateInstanceMethod;
+    if ((getUpdateInstanceMethod = CloudRedisGrpc.getUpdateInstanceMethod) == null) {
+      synchronized (CloudRedisGrpc.class) {
+        if ((getUpdateInstanceMethod = CloudRedisGrpc.getUpdateInstanceMethod) == null) {
+          CloudRedisGrpc.getUpdateInstanceMethod = getUpdateInstanceMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.redis.v1beta1.CloudRedis", "UpdateInstance"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.redis.v1beta1.UpdateInstanceRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.longrunning.Operation.getDefaultInstance()))
+                  .setSchemaDescriptor(new CloudRedisMethodDescriptorSupplier("UpdateInstance"))
+                  .build();
+          }
+        }
+     }
+     return getUpdateInstanceMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getDeleteInstanceMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_DELETE_INSTANCE = getDeleteInstanceMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getDeleteInstanceMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getDeleteInstanceMethod() {
+    return getDeleteInstanceMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getDeleteInstanceMethodHelper() {
+    io.grpc.MethodDescriptor getDeleteInstanceMethod;
+    if ((getDeleteInstanceMethod = CloudRedisGrpc.getDeleteInstanceMethod) == null) {
+      synchronized (CloudRedisGrpc.class) {
+        if ((getDeleteInstanceMethod = CloudRedisGrpc.getDeleteInstanceMethod) == null) {
+          CloudRedisGrpc.getDeleteInstanceMethod = getDeleteInstanceMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.redis.v1beta1.CloudRedis", "DeleteInstance"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.redis.v1beta1.DeleteInstanceRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.longrunning.Operation.getDefaultInstance()))
+                  .setSchemaDescriptor(new CloudRedisMethodDescriptorSupplier("DeleteInstance"))
+                  .build();
+          }
+        }
+     }
+     return getDeleteInstanceMethod;
+  }
+
+  /**
+   * Creates a new async stub that supports all call types for the service
+   */
+  public static CloudRedisStub newStub(io.grpc.Channel channel) {
+    return new CloudRedisStub(channel);
+  }
+
+  /**
+   * Creates a new blocking-style stub that supports unary and streaming output calls on the service
+   */
+  public static CloudRedisBlockingStub newBlockingStub(
+      io.grpc.Channel channel) {
+    return new CloudRedisBlockingStub(channel);
+  }
+
+  /**
+   * Creates a new ListenableFuture-style stub that supports unary calls on the service
+   */
+  public static CloudRedisFutureStub newFutureStub(
+      io.grpc.Channel channel) {
+    return new CloudRedisFutureStub(channel);
+  }
+
+  /**
+   * 
+   * Configures and manages Cloud Memorystore for Redis instances
+   * Google Cloud Memorystore for Redis v1beta1
+   * The `redis.googleapis.com` service implements the Google Cloud Memorystore
+   * for Redis API and defines the following resource model for managing Redis
+   * instances:
+   * * The service works with a collection of cloud projects, named: `/projects/*`
+   * * Each project has a collection of available locations, named: `/locations/*`
+   * * Each location has a collection of Redis instances, named: `/instances/*`
+   * * As such, Redis instances are resources of the form:
+   *   `/projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * Note that location_id must be refering to a GCP `region`; for example:
+   * * `projects/redpepper-1290/locations/us-central1/instances/my-redis`
+   * 

+   */
+  public static abstract class CloudRedisImplBase implements io.grpc.BindableService {
+
+    /**
+     * 
+     * Lists all Redis instances owned by a project in either the specified
+     * location (region) or all locations.
+     * The location should have the following format:
+     * * `projects/{project_id}/locations/{location_id}`
+     * If `location_id` is specified as `-` (wildcard), then all regions
+     * available to the project are queried, and the results are aggregated.
+     * 

+     */
+    public void listInstances(com.google.cloud.redis.v1beta1.ListInstancesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getListInstancesMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Gets the details of a specific Redis instance.
+     * 

+     */
+    public void getInstance(com.google.cloud.redis.v1beta1.GetInstanceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getGetInstanceMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Creates a Redis instance based on the specified tier and memory size.
+     * By default, the instance is peered to the project's
+     * [default network](/compute/docs/networks-and-firewalls#networks).
+     * The creation is executed asynchronously and callers may check the returned
+     * operation to track its progress. Once the operation is completed the Redis
+     * instance will be fully functional. Completed longrunning.Operation will
+     * contain the new instance object in the response field.
+     * The returned operation is automatically deleted after a few hours, so there
+     * is no need to call DeleteOperation.
+     * 

+     */
+    public void createInstance(com.google.cloud.redis.v1beta1.CreateInstanceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getCreateInstanceMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Updates the metadata and configuration of a specific Redis instance.
+     * Completed longrunning.Operation will contain the new instance object
+     * in the response field. The returned operation is automatically deleted
+     * after a few hours, so there is no need to call DeleteOperation.
+     * 

+     */
+    public void updateInstance(com.google.cloud.redis.v1beta1.UpdateInstanceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getUpdateInstanceMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Deletes a specific Redis instance.  Instance stops serving and data is
+     * deleted.
+     * 

+     */
+    public void deleteInstance(com.google.cloud.redis.v1beta1.DeleteInstanceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getDeleteInstanceMethodHelper(), responseObserver);
+    }
+
+    @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
+      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+          .addMethod(
+            getListInstancesMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.redis.v1beta1.ListInstancesRequest,
+                com.google.cloud.redis.v1beta1.ListInstancesResponse>(
+                  this, METHODID_LIST_INSTANCES)))
+          .addMethod(
+            getGetInstanceMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.redis.v1beta1.GetInstanceRequest,
+                com.google.cloud.redis.v1beta1.Instance>(
+                  this, METHODID_GET_INSTANCE)))
+          .addMethod(
+            getCreateInstanceMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.redis.v1beta1.CreateInstanceRequest,
+                com.google.longrunning.Operation>(
+                  this, METHODID_CREATE_INSTANCE)))
+          .addMethod(
+            getUpdateInstanceMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.redis.v1beta1.UpdateInstanceRequest,
+                com.google.longrunning.Operation>(
+                  this, METHODID_UPDATE_INSTANCE)))
+          .addMethod(
+            getDeleteInstanceMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.redis.v1beta1.DeleteInstanceRequest,
+                com.google.longrunning.Operation>(
+                  this, METHODID_DELETE_INSTANCE)))
+          .build();
+    }
+  }
+
+  /**
+   * 
+   * Configures and manages Cloud Memorystore for Redis instances
+   * Google Cloud Memorystore for Redis v1beta1
+   * The `redis.googleapis.com` service implements the Google Cloud Memorystore
+   * for Redis API and defines the following resource model for managing Redis
+   * instances:
+   * * The service works with a collection of cloud projects, named: `/projects/*`
+   * * Each project has a collection of available locations, named: `/locations/*`
+   * * Each location has a collection of Redis instances, named: `/instances/*`
+   * * As such, Redis instances are resources of the form:
+   *   `/projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * Note that location_id must be refering to a GCP `region`; for example:
+   * * `projects/redpepper-1290/locations/us-central1/instances/my-redis`
+   * 

+   */
+  public static final class CloudRedisStub extends io.grpc.stub.AbstractStub {
+    private CloudRedisStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private CloudRedisStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected CloudRedisStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new CloudRedisStub(channel, callOptions);
+    }
+
+    /**
+     * 
+     * Lists all Redis instances owned by a project in either the specified
+     * location (region) or all locations.
+     * The location should have the following format:
+     * * `projects/{project_id}/locations/{location_id}`
+     * If `location_id` is specified as `-` (wildcard), then all regions
+     * available to the project are queried, and the results are aggregated.
+     * 

+     */
+    public void listInstances(com.google.cloud.redis.v1beta1.ListInstancesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getListInstancesMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Gets the details of a specific Redis instance.
+     * 

+     */
+    public void getInstance(com.google.cloud.redis.v1beta1.GetInstanceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getGetInstanceMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Creates a Redis instance based on the specified tier and memory size.
+     * By default, the instance is peered to the project's
+     * [default network](/compute/docs/networks-and-firewalls#networks).
+     * The creation is executed asynchronously and callers may check the returned
+     * operation to track its progress. Once the operation is completed the Redis
+     * instance will be fully functional. Completed longrunning.Operation will
+     * contain the new instance object in the response field.
+     * The returned operation is automatically deleted after a few hours, so there
+     * is no need to call DeleteOperation.
+     * 

+     */
+    public void createInstance(com.google.cloud.redis.v1beta1.CreateInstanceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getCreateInstanceMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Updates the metadata and configuration of a specific Redis instance.
+     * Completed longrunning.Operation will contain the new instance object
+     * in the response field. The returned operation is automatically deleted
+     * after a few hours, so there is no need to call DeleteOperation.
+     * 

+     */
+    public void updateInstance(com.google.cloud.redis.v1beta1.UpdateInstanceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getUpdateInstanceMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Deletes a specific Redis instance.  Instance stops serving and data is
+     * deleted.
+     * 

+     */
+    public void deleteInstance(com.google.cloud.redis.v1beta1.DeleteInstanceRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getDeleteInstanceMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+  }
+
+  /**
+   * 
+   * Configures and manages Cloud Memorystore for Redis instances
+   * Google Cloud Memorystore for Redis v1beta1
+   * The `redis.googleapis.com` service implements the Google Cloud Memorystore
+   * for Redis API and defines the following resource model for managing Redis
+   * instances:
+   * * The service works with a collection of cloud projects, named: `/projects/*`
+   * * Each project has a collection of available locations, named: `/locations/*`
+   * * Each location has a collection of Redis instances, named: `/instances/*`
+   * * As such, Redis instances are resources of the form:
+   *   `/projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * Note that location_id must be refering to a GCP `region`; for example:
+   * * `projects/redpepper-1290/locations/us-central1/instances/my-redis`
+   * 

+   */
+  public static final class CloudRedisBlockingStub extends io.grpc.stub.AbstractStub {
+    private CloudRedisBlockingStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private CloudRedisBlockingStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected CloudRedisBlockingStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new CloudRedisBlockingStub(channel, callOptions);
+    }
+
+    /**
+     * 
+     * Lists all Redis instances owned by a project in either the specified
+     * location (region) or all locations.
+     * The location should have the following format:
+     * * `projects/{project_id}/locations/{location_id}`
+     * If `location_id` is specified as `-` (wildcard), then all regions
+     * available to the project are queried, and the results are aggregated.
+     * 

+     */
+    public com.google.cloud.redis.v1beta1.ListInstancesResponse listInstances(com.google.cloud.redis.v1beta1.ListInstancesRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getListInstancesMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Gets the details of a specific Redis instance.
+     * 

+     */
+    public com.google.cloud.redis.v1beta1.Instance getInstance(com.google.cloud.redis.v1beta1.GetInstanceRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getGetInstanceMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Creates a Redis instance based on the specified tier and memory size.
+     * By default, the instance is peered to the project's
+     * [default network](/compute/docs/networks-and-firewalls#networks).
+     * The creation is executed asynchronously and callers may check the returned
+     * operation to track its progress. Once the operation is completed the Redis
+     * instance will be fully functional. Completed longrunning.Operation will
+     * contain the new instance object in the response field.
+     * The returned operation is automatically deleted after a few hours, so there
+     * is no need to call DeleteOperation.
+     * 

+     */
+    public com.google.longrunning.Operation createInstance(com.google.cloud.redis.v1beta1.CreateInstanceRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getCreateInstanceMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Updates the metadata and configuration of a specific Redis instance.
+     * Completed longrunning.Operation will contain the new instance object
+     * in the response field. The returned operation is automatically deleted
+     * after a few hours, so there is no need to call DeleteOperation.
+     * 

+     */
+    public com.google.longrunning.Operation updateInstance(com.google.cloud.redis.v1beta1.UpdateInstanceRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getUpdateInstanceMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Deletes a specific Redis instance.  Instance stops serving and data is
+     * deleted.
+     * 

+     */
+    public com.google.longrunning.Operation deleteInstance(com.google.cloud.redis.v1beta1.DeleteInstanceRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getDeleteInstanceMethodHelper(), getCallOptions(), request);
+    }
+  }
+
+  /**
+   * 
+   * Configures and manages Cloud Memorystore for Redis instances
+   * Google Cloud Memorystore for Redis v1beta1
+   * The `redis.googleapis.com` service implements the Google Cloud Memorystore
+   * for Redis API and defines the following resource model for managing Redis
+   * instances:
+   * * The service works with a collection of cloud projects, named: `/projects/*`
+   * * Each project has a collection of available locations, named: `/locations/*`
+   * * Each location has a collection of Redis instances, named: `/instances/*`
+   * * As such, Redis instances are resources of the form:
+   *   `/projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * Note that location_id must be refering to a GCP `region`; for example:
+   * * `projects/redpepper-1290/locations/us-central1/instances/my-redis`
+   * 

+   */
+  public static final class CloudRedisFutureStub extends io.grpc.stub.AbstractStub {
+    private CloudRedisFutureStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private CloudRedisFutureStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected CloudRedisFutureStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new CloudRedisFutureStub(channel, callOptions);
+    }
+
+    /**
+     * 
+     * Lists all Redis instances owned by a project in either the specified
+     * location (region) or all locations.
+     * The location should have the following format:
+     * * `projects/{project_id}/locations/{location_id}`
+     * If `location_id` is specified as `-` (wildcard), then all regions
+     * available to the project are queried, and the results are aggregated.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture listInstances(
+        com.google.cloud.redis.v1beta1.ListInstancesRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getListInstancesMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Gets the details of a specific Redis instance.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture getInstance(
+        com.google.cloud.redis.v1beta1.GetInstanceRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getGetInstanceMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Creates a Redis instance based on the specified tier and memory size.
+     * By default, the instance is peered to the project's
+     * [default network](/compute/docs/networks-and-firewalls#networks).
+     * The creation is executed asynchronously and callers may check the returned
+     * operation to track its progress. Once the operation is completed the Redis
+     * instance will be fully functional. Completed longrunning.Operation will
+     * contain the new instance object in the response field.
+     * The returned operation is automatically deleted after a few hours, so there
+     * is no need to call DeleteOperation.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture createInstance(
+        com.google.cloud.redis.v1beta1.CreateInstanceRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getCreateInstanceMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Updates the metadata and configuration of a specific Redis instance.
+     * Completed longrunning.Operation will contain the new instance object
+     * in the response field. The returned operation is automatically deleted
+     * after a few hours, so there is no need to call DeleteOperation.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture updateInstance(
+        com.google.cloud.redis.v1beta1.UpdateInstanceRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getUpdateInstanceMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Deletes a specific Redis instance.  Instance stops serving and data is
+     * deleted.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture deleteInstance(
+        com.google.cloud.redis.v1beta1.DeleteInstanceRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getDeleteInstanceMethodHelper(), getCallOptions()), request);
+    }
+  }
+
+  private static final int METHODID_LIST_INSTANCES = 0;
+  private static final int METHODID_GET_INSTANCE = 1;
+  private static final int METHODID_CREATE_INSTANCE = 2;
+  private static final int METHODID_UPDATE_INSTANCE = 3;
+  private static final int METHODID_DELETE_INSTANCE = 4;
+
+  private static final class MethodHandlers implements
+      io.grpc.stub.ServerCalls.UnaryMethod,
+      io.grpc.stub.ServerCalls.ServerStreamingMethod,
+      io.grpc.stub.ServerCalls.ClientStreamingMethod,
+      io.grpc.stub.ServerCalls.BidiStreamingMethod {
+    private final CloudRedisImplBase serviceImpl;
+    private final int methodId;
+
+    MethodHandlers(CloudRedisImplBase serviceImpl, int methodId) {
+      this.serviceImpl = serviceImpl;
+      this.methodId = methodId;
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) {
+      switch (methodId) {
+        case METHODID_LIST_INSTANCES:
+          serviceImpl.listInstances((com.google.cloud.redis.v1beta1.ListInstancesRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_GET_INSTANCE:
+          serviceImpl.getInstance((com.google.cloud.redis.v1beta1.GetInstanceRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_CREATE_INSTANCE:
+          serviceImpl.createInstance((com.google.cloud.redis.v1beta1.CreateInstanceRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_UPDATE_INSTANCE:
+          serviceImpl.updateInstance((com.google.cloud.redis.v1beta1.UpdateInstanceRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_DELETE_INSTANCE:
+          serviceImpl.deleteInstance((com.google.cloud.redis.v1beta1.DeleteInstanceRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        default:
+          throw new AssertionError();
+      }
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public io.grpc.stub.StreamObserver invoke(
+        io.grpc.stub.StreamObserver responseObserver) {
+      switch (methodId) {
+        default:
+          throw new AssertionError();
+      }
+    }
+  }
+
+  private static abstract class CloudRedisBaseDescriptorSupplier
+      implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
+    CloudRedisBaseDescriptorSupplier() {}
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.getDescriptor();
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
+      return getFileDescriptor().findServiceByName("CloudRedis");
+    }
+  }
+
+  private static final class CloudRedisFileDescriptorSupplier
+      extends CloudRedisBaseDescriptorSupplier {
+    CloudRedisFileDescriptorSupplier() {}
+  }
+
+  private static final class CloudRedisMethodDescriptorSupplier
+      extends CloudRedisBaseDescriptorSupplier
+      implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
+    private final String methodName;
+
+    CloudRedisMethodDescriptorSupplier(String methodName) {
+      this.methodName = methodName;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
+      return getServiceDescriptor().findMethodByName(methodName);
+    }
+  }
+
+  private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
+
+  public static io.grpc.ServiceDescriptor getServiceDescriptor() {
+    io.grpc.ServiceDescriptor result = serviceDescriptor;
+    if (result == null) {
+      synchronized (CloudRedisGrpc.class) {
+        result = serviceDescriptor;
+        if (result == null) {
+          serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
+              .setSchemaDescriptor(new CloudRedisFileDescriptorSupplier())
+              .addMethod(getListInstancesMethodHelper())
+              .addMethod(getGetInstanceMethodHelper())
+              .addMethod(getCreateInstanceMethodHelper())
+              .addMethod(getUpdateInstanceMethodHelper())
+              .addMethod(getDeleteInstanceMethodHelper())
+              .build();
+        }
+      }
+    }
+    return result;
+  }
+}
diff --git a/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
index 9629564e84a1..301472655f92 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-admin-database-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-spanner-admin-database-v1
   GRPC library for grpc-google-cloud-spanner-admin-database-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
index 075cb662af4e..c2662d3e06e3 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-admin-instance-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-spanner-admin-instance-v1
   GRPC library for grpc-google-cloud-spanner-admin-instance-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
index 696944a89367..ae8356cd46b4 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-spanner-v1
   GRPC library for grpc-google-cloud-spanner-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
index 3cecc87739ac..5985b132e431 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-speech-v1
   GRPC library for grpc-google-cloud-speech-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
index 9f8aacc099c2..1338f0204704 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-speech-v1beta1
   GRPC library for grpc-google-cloud-speech-v1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
index 4144f5584f60..49e31e564a69 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1p1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-speech-v1p1beta1
   GRPC library for grpc-google-cloud-speech-v1p1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
index 27c042edf939..04c66b3f6f3c 100644
--- a/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-texttospeech-v1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-texttospeech-v1beta1
   GRPC library for grpc-google-cloud-texttospeech-v1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml b/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
index 681409c62005..46fbca1959cf 100644
--- a/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-trace-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-trace-v1
   GRPC library for grpc-google-cloud-trace-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml b/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
index e9a96c152809..c6141da933d8 100644
--- a/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-trace-v2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-trace-v2
   GRPC library for grpc-google-cloud-trace-v2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
index c8f5c37ba39e..c61994262dda 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-video-intelligence-v1
   GRPC library for grpc-google-cloud-video-intelligence-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
index 55321920783b..71f3f55c173c 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-video-intelligence-v1beta1
   GRPC library for grpc-google-cloud-video-intelligence-v1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
index edeadf97674f..8ddc4833c953 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1beta2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-video-intelligence-v1beta2
   GRPC library for grpc-google-cloud-video-intelligence-v1beta2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
index 50b53cb23d21..eab707aee544 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1p1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-video-intelligence-v1p1beta1
   GRPC library for grpc-google-cloud-video-intelligence-v1p1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
index acd732f4a972..62c4be57e4c8 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1
-  1.10.1-SNAPSHOT
+  1.11.1-SNAPSHOT
   grpc-google-cloud-vision-v1
   GRPC library for grpc-google-cloud-vision-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
index daabb485a2a9..82796bb843b8 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1p1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   grpc-google-cloud-vision-v1p1beta1
   GRPC library for grpc-google-cloud-vision-v1p1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
index e492dd976546..c4b7c7166842 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1p2beta1
-  1.10.1-SNAPSHOT
+  1.11.1-SNAPSHOT
   grpc-google-cloud-vision-v1p2beta1
   GRPC library for grpc-google-cloud-vision-v1p2beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
new file mode 100644
index 000000000000..09074c71393d
--- /dev/null
+++ b/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
@@ -0,0 +1,31 @@
+
+  4.0.0
+  grpc-google-cloud-websecurityscanner-v1alpha
+  0.12.1-SNAPSHOT
+  grpc-google-cloud-websecurityscanner-v1alpha
+  GRPC library for grpc-google-cloud-websecurityscanner-v1alpha
+  
+    com.google.api.grpc
+    google-api-grpc
+    0.12.1-SNAPSHOT
+  
+  
+    
+      io.grpc
+      grpc-stub
+      compile
+    
+    
+      io.grpc
+      grpc-protobuf
+      compile
+    
+    
+      com.google.api.grpc
+      proto-google-cloud-websecurityscanner-v1alpha
+      compile
+    
+  
+
\ No newline at end of file
diff --git a/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerGrpc.java b/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerGrpc.java
new file mode 100644
index 000000000000..27811615a461
--- /dev/null
+++ b/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerGrpc.java
@@ -0,0 +1,1431 @@
+package com.google.cloud.websecurityscanner.v1alpha;
+
+import static io.grpc.MethodDescriptor.generateFullMethodName;
+import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncUnaryCall;
+import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
+import static io.grpc.stub.ClientCalls.blockingUnaryCall;
+import static io.grpc.stub.ClientCalls.futureUnaryCall;
+import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnaryCall;
+import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
+
+/**
+ * 
+ * Cloud Web Security Scanner Service identifies security vulnerabilities in web
+ * applications hosted on Google Cloud Platform. It crawls your application, and
+ * attempts to exercise as many user inputs and event handlers as possible.
+ * 

+ */
+@javax.annotation.Generated(
+    value = "by gRPC proto compiler (version 1.10.0)",
+    comments = "Source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto")
+public final class WebSecurityScannerGrpc {
+
+  private WebSecurityScannerGrpc() {}
+
+  public static final String SERVICE_NAME = "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner";
+
+  // Static method descriptors that strictly reflect the proto.
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getCreateScanConfigMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_CREATE_SCAN_CONFIG = getCreateScanConfigMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getCreateScanConfigMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getCreateScanConfigMethod() {
+    return getCreateScanConfigMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getCreateScanConfigMethodHelper() {
+    io.grpc.MethodDescriptor getCreateScanConfigMethod;
+    if ((getCreateScanConfigMethod = WebSecurityScannerGrpc.getCreateScanConfigMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getCreateScanConfigMethod = WebSecurityScannerGrpc.getCreateScanConfigMethod) == null) {
+          WebSecurityScannerGrpc.getCreateScanConfigMethod = getCreateScanConfigMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "CreateScanConfig"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("CreateScanConfig"))
+                  .build();
+          }
+        }
+     }
+     return getCreateScanConfigMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getDeleteScanConfigMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_DELETE_SCAN_CONFIG = getDeleteScanConfigMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getDeleteScanConfigMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getDeleteScanConfigMethod() {
+    return getDeleteScanConfigMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getDeleteScanConfigMethodHelper() {
+    io.grpc.MethodDescriptor getDeleteScanConfigMethod;
+    if ((getDeleteScanConfigMethod = WebSecurityScannerGrpc.getDeleteScanConfigMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getDeleteScanConfigMethod = WebSecurityScannerGrpc.getDeleteScanConfigMethod) == null) {
+          WebSecurityScannerGrpc.getDeleteScanConfigMethod = getDeleteScanConfigMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "DeleteScanConfig"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.protobuf.Empty.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("DeleteScanConfig"))
+                  .build();
+          }
+        }
+     }
+     return getDeleteScanConfigMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getGetScanConfigMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_GET_SCAN_CONFIG = getGetScanConfigMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getGetScanConfigMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getGetScanConfigMethod() {
+    return getGetScanConfigMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getGetScanConfigMethodHelper() {
+    io.grpc.MethodDescriptor getGetScanConfigMethod;
+    if ((getGetScanConfigMethod = WebSecurityScannerGrpc.getGetScanConfigMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getGetScanConfigMethod = WebSecurityScannerGrpc.getGetScanConfigMethod) == null) {
+          WebSecurityScannerGrpc.getGetScanConfigMethod = getGetScanConfigMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "GetScanConfig"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("GetScanConfig"))
+                  .build();
+          }
+        }
+     }
+     return getGetScanConfigMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getListScanConfigsMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_LIST_SCAN_CONFIGS = getListScanConfigsMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getListScanConfigsMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getListScanConfigsMethod() {
+    return getListScanConfigsMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getListScanConfigsMethodHelper() {
+    io.grpc.MethodDescriptor getListScanConfigsMethod;
+    if ((getListScanConfigsMethod = WebSecurityScannerGrpc.getListScanConfigsMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getListScanConfigsMethod = WebSecurityScannerGrpc.getListScanConfigsMethod) == null) {
+          WebSecurityScannerGrpc.getListScanConfigsMethod = getListScanConfigsMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "ListScanConfigs"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("ListScanConfigs"))
+                  .build();
+          }
+        }
+     }
+     return getListScanConfigsMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getUpdateScanConfigMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_UPDATE_SCAN_CONFIG = getUpdateScanConfigMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getUpdateScanConfigMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getUpdateScanConfigMethod() {
+    return getUpdateScanConfigMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getUpdateScanConfigMethodHelper() {
+    io.grpc.MethodDescriptor getUpdateScanConfigMethod;
+    if ((getUpdateScanConfigMethod = WebSecurityScannerGrpc.getUpdateScanConfigMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getUpdateScanConfigMethod = WebSecurityScannerGrpc.getUpdateScanConfigMethod) == null) {
+          WebSecurityScannerGrpc.getUpdateScanConfigMethod = getUpdateScanConfigMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "UpdateScanConfig"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("UpdateScanConfig"))
+                  .build();
+          }
+        }
+     }
+     return getUpdateScanConfigMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getStartScanRunMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_START_SCAN_RUN = getStartScanRunMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getStartScanRunMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getStartScanRunMethod() {
+    return getStartScanRunMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getStartScanRunMethodHelper() {
+    io.grpc.MethodDescriptor getStartScanRunMethod;
+    if ((getStartScanRunMethod = WebSecurityScannerGrpc.getStartScanRunMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getStartScanRunMethod = WebSecurityScannerGrpc.getStartScanRunMethod) == null) {
+          WebSecurityScannerGrpc.getStartScanRunMethod = getStartScanRunMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "StartScanRun"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ScanRun.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("StartScanRun"))
+                  .build();
+          }
+        }
+     }
+     return getStartScanRunMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getGetScanRunMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_GET_SCAN_RUN = getGetScanRunMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getGetScanRunMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getGetScanRunMethod() {
+    return getGetScanRunMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getGetScanRunMethodHelper() {
+    io.grpc.MethodDescriptor getGetScanRunMethod;
+    if ((getGetScanRunMethod = WebSecurityScannerGrpc.getGetScanRunMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getGetScanRunMethod = WebSecurityScannerGrpc.getGetScanRunMethod) == null) {
+          WebSecurityScannerGrpc.getGetScanRunMethod = getGetScanRunMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "GetScanRun"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ScanRun.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("GetScanRun"))
+                  .build();
+          }
+        }
+     }
+     return getGetScanRunMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getListScanRunsMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_LIST_SCAN_RUNS = getListScanRunsMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getListScanRunsMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getListScanRunsMethod() {
+    return getListScanRunsMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getListScanRunsMethodHelper() {
+    io.grpc.MethodDescriptor getListScanRunsMethod;
+    if ((getListScanRunsMethod = WebSecurityScannerGrpc.getListScanRunsMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getListScanRunsMethod = WebSecurityScannerGrpc.getListScanRunsMethod) == null) {
+          WebSecurityScannerGrpc.getListScanRunsMethod = getListScanRunsMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "ListScanRuns"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("ListScanRuns"))
+                  .build();
+          }
+        }
+     }
+     return getListScanRunsMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getStopScanRunMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_STOP_SCAN_RUN = getStopScanRunMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getStopScanRunMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getStopScanRunMethod() {
+    return getStopScanRunMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getStopScanRunMethodHelper() {
+    io.grpc.MethodDescriptor getStopScanRunMethod;
+    if ((getStopScanRunMethod = WebSecurityScannerGrpc.getStopScanRunMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getStopScanRunMethod = WebSecurityScannerGrpc.getStopScanRunMethod) == null) {
+          WebSecurityScannerGrpc.getStopScanRunMethod = getStopScanRunMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "StopScanRun"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ScanRun.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("StopScanRun"))
+                  .build();
+          }
+        }
+     }
+     return getStopScanRunMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getListCrawledUrlsMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_LIST_CRAWLED_URLS = getListCrawledUrlsMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getListCrawledUrlsMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getListCrawledUrlsMethod() {
+    return getListCrawledUrlsMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getListCrawledUrlsMethodHelper() {
+    io.grpc.MethodDescriptor getListCrawledUrlsMethod;
+    if ((getListCrawledUrlsMethod = WebSecurityScannerGrpc.getListCrawledUrlsMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getListCrawledUrlsMethod = WebSecurityScannerGrpc.getListCrawledUrlsMethod) == null) {
+          WebSecurityScannerGrpc.getListCrawledUrlsMethod = getListCrawledUrlsMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "ListCrawledUrls"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("ListCrawledUrls"))
+                  .build();
+          }
+        }
+     }
+     return getListCrawledUrlsMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getGetFindingMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_GET_FINDING = getGetFindingMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getGetFindingMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getGetFindingMethod() {
+    return getGetFindingMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getGetFindingMethodHelper() {
+    io.grpc.MethodDescriptor getGetFindingMethod;
+    if ((getGetFindingMethod = WebSecurityScannerGrpc.getGetFindingMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getGetFindingMethod = WebSecurityScannerGrpc.getGetFindingMethod) == null) {
+          WebSecurityScannerGrpc.getGetFindingMethod = getGetFindingMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "GetFinding"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.Finding.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("GetFinding"))
+                  .build();
+          }
+        }
+     }
+     return getGetFindingMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getListFindingsMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_LIST_FINDINGS = getListFindingsMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getListFindingsMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getListFindingsMethod() {
+    return getListFindingsMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getListFindingsMethodHelper() {
+    io.grpc.MethodDescriptor getListFindingsMethod;
+    if ((getListFindingsMethod = WebSecurityScannerGrpc.getListFindingsMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getListFindingsMethod = WebSecurityScannerGrpc.getListFindingsMethod) == null) {
+          WebSecurityScannerGrpc.getListFindingsMethod = getListFindingsMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "ListFindings"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("ListFindings"))
+                  .build();
+          }
+        }
+     }
+     return getListFindingsMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getListFindingTypeStatsMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_LIST_FINDING_TYPE_STATS = getListFindingTypeStatsMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getListFindingTypeStatsMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getListFindingTypeStatsMethod() {
+    return getListFindingTypeStatsMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getListFindingTypeStatsMethodHelper() {
+    io.grpc.MethodDescriptor getListFindingTypeStatsMethod;
+    if ((getListFindingTypeStatsMethod = WebSecurityScannerGrpc.getListFindingTypeStatsMethod) == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        if ((getListFindingTypeStatsMethod = WebSecurityScannerGrpc.getListFindingTypeStatsMethod) == null) {
+          WebSecurityScannerGrpc.getListFindingTypeStatsMethod = getListFindingTypeStatsMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner", "ListFindingTypeStats"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new WebSecurityScannerMethodDescriptorSupplier("ListFindingTypeStats"))
+                  .build();
+          }
+        }
+     }
+     return getListFindingTypeStatsMethod;
+  }
+
+  /**
+   * Creates a new async stub that supports all call types for the service
+   */
+  public static WebSecurityScannerStub newStub(io.grpc.Channel channel) {
+    return new WebSecurityScannerStub(channel);
+  }
+
+  /**
+   * Creates a new blocking-style stub that supports unary and streaming output calls on the service
+   */
+  public static WebSecurityScannerBlockingStub newBlockingStub(
+      io.grpc.Channel channel) {
+    return new WebSecurityScannerBlockingStub(channel);
+  }
+
+  /**
+   * Creates a new ListenableFuture-style stub that supports unary calls on the service
+   */
+  public static WebSecurityScannerFutureStub newFutureStub(
+      io.grpc.Channel channel) {
+    return new WebSecurityScannerFutureStub(channel);
+  }
+
+  /**
+   * 
+   * Cloud Web Security Scanner Service identifies security vulnerabilities in web
+   * applications hosted on Google Cloud Platform. It crawls your application, and
+   * attempts to exercise as many user inputs and event handlers as possible.
+   * 

+   */
+  public static abstract class WebSecurityScannerImplBase implements io.grpc.BindableService {
+
+    /**
+     * 
+     * Creates a new ScanConfig.
+     * 

+     */
+    public void createScanConfig(com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getCreateScanConfigMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Deletes an existing ScanConfig and its child resources.
+     * 

+     */
+    public void deleteScanConfig(com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getDeleteScanConfigMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Gets a ScanConfig.
+     * 

+     */
+    public void getScanConfig(com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getGetScanConfigMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Lists ScanConfigs under a given project.
+     * 

+     */
+    public void listScanConfigs(com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getListScanConfigsMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Updates a ScanConfig. This method support partial update of a ScanConfig.
+     * 

+     */
+    public void updateScanConfig(com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getUpdateScanConfigMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Start a ScanRun according to the given ScanConfig.
+     * 

+     */
+    public void startScanRun(com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getStartScanRunMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Gets a ScanRun.
+     * 

+     */
+    public void getScanRun(com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getGetScanRunMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Lists ScanRuns under a given ScanConfig, in descending order of ScanRun
+     * stop time.
+     * 

+     */
+    public void listScanRuns(com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getListScanRunsMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Stops a ScanRun. The stopped ScanRun is returned.
+     * 

+     */
+    public void stopScanRun(com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getStopScanRunMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * List CrawledUrls under a given ScanRun.
+     * 

+     */
+    public void listCrawledUrls(com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getListCrawledUrlsMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * Gets a Finding.
+     * 

+     */
+    public void getFinding(com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getGetFindingMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * List Findings under a given ScanRun.
+     * 

+     */
+    public void listFindings(com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getListFindingsMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
+     * List all FindingTypeStats under a given ScanRun.
+     * 

+     */
+    public void listFindingTypeStats(com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getListFindingTypeStatsMethodHelper(), responseObserver);
+    }
+
+    @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
+      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+          .addMethod(
+            getCreateScanConfigMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest,
+                com.google.cloud.websecurityscanner.v1alpha.ScanConfig>(
+                  this, METHODID_CREATE_SCAN_CONFIG)))
+          .addMethod(
+            getDeleteScanConfigMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest,
+                com.google.protobuf.Empty>(
+                  this, METHODID_DELETE_SCAN_CONFIG)))
+          .addMethod(
+            getGetScanConfigMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest,
+                com.google.cloud.websecurityscanner.v1alpha.ScanConfig>(
+                  this, METHODID_GET_SCAN_CONFIG)))
+          .addMethod(
+            getListScanConfigsMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest,
+                com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse>(
+                  this, METHODID_LIST_SCAN_CONFIGS)))
+          .addMethod(
+            getUpdateScanConfigMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest,
+                com.google.cloud.websecurityscanner.v1alpha.ScanConfig>(
+                  this, METHODID_UPDATE_SCAN_CONFIG)))
+          .addMethod(
+            getStartScanRunMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest,
+                com.google.cloud.websecurityscanner.v1alpha.ScanRun>(
+                  this, METHODID_START_SCAN_RUN)))
+          .addMethod(
+            getGetScanRunMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest,
+                com.google.cloud.websecurityscanner.v1alpha.ScanRun>(
+                  this, METHODID_GET_SCAN_RUN)))
+          .addMethod(
+            getListScanRunsMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest,
+                com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse>(
+                  this, METHODID_LIST_SCAN_RUNS)))
+          .addMethod(
+            getStopScanRunMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest,
+                com.google.cloud.websecurityscanner.v1alpha.ScanRun>(
+                  this, METHODID_STOP_SCAN_RUN)))
+          .addMethod(
+            getListCrawledUrlsMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest,
+                com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse>(
+                  this, METHODID_LIST_CRAWLED_URLS)))
+          .addMethod(
+            getGetFindingMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest,
+                com.google.cloud.websecurityscanner.v1alpha.Finding>(
+                  this, METHODID_GET_FINDING)))
+          .addMethod(
+            getListFindingsMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest,
+                com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse>(
+                  this, METHODID_LIST_FINDINGS)))
+          .addMethod(
+            getListFindingTypeStatsMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest,
+                com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse>(
+                  this, METHODID_LIST_FINDING_TYPE_STATS)))
+          .build();
+    }
+  }
+
+  /**
+   * 
+   * Cloud Web Security Scanner Service identifies security vulnerabilities in web
+   * applications hosted on Google Cloud Platform. It crawls your application, and
+   * attempts to exercise as many user inputs and event handlers as possible.
+   * 

+   */
+  public static final class WebSecurityScannerStub extends io.grpc.stub.AbstractStub {
+    private WebSecurityScannerStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private WebSecurityScannerStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected WebSecurityScannerStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new WebSecurityScannerStub(channel, callOptions);
+    }
+
+    /**
+     * 
+     * Creates a new ScanConfig.
+     * 

+     */
+    public void createScanConfig(com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getCreateScanConfigMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Deletes an existing ScanConfig and its child resources.
+     * 

+     */
+    public void deleteScanConfig(com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getDeleteScanConfigMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Gets a ScanConfig.
+     * 

+     */
+    public void getScanConfig(com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getGetScanConfigMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Lists ScanConfigs under a given project.
+     * 

+     */
+    public void listScanConfigs(com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getListScanConfigsMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Updates a ScanConfig. This method support partial update of a ScanConfig.
+     * 

+     */
+    public void updateScanConfig(com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getUpdateScanConfigMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Start a ScanRun according to the given ScanConfig.
+     * 

+     */
+    public void startScanRun(com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getStartScanRunMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Gets a ScanRun.
+     * 

+     */
+    public void getScanRun(com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getGetScanRunMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Lists ScanRuns under a given ScanConfig, in descending order of ScanRun
+     * stop time.
+     * 

+     */
+    public void listScanRuns(com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getListScanRunsMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Stops a ScanRun. The stopped ScanRun is returned.
+     * 

+     */
+    public void stopScanRun(com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getStopScanRunMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * List CrawledUrls under a given ScanRun.
+     * 

+     */
+    public void listCrawledUrls(com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getListCrawledUrlsMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * Gets a Finding.
+     * 

+     */
+    public void getFinding(com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getGetFindingMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * List Findings under a given ScanRun.
+     * 

+     */
+    public void listFindings(com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getListFindingsMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
+     * List all FindingTypeStats under a given ScanRun.
+     * 

+     */
+    public void listFindingTypeStats(com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getListFindingTypeStatsMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+  }
+
+  /**
+   * 
+   * Cloud Web Security Scanner Service identifies security vulnerabilities in web
+   * applications hosted on Google Cloud Platform. It crawls your application, and
+   * attempts to exercise as many user inputs and event handlers as possible.
+   * 

+   */
+  public static final class WebSecurityScannerBlockingStub extends io.grpc.stub.AbstractStub {
+    private WebSecurityScannerBlockingStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private WebSecurityScannerBlockingStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected WebSecurityScannerBlockingStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new WebSecurityScannerBlockingStub(channel, callOptions);
+    }
+
+    /**
+     * 
+     * Creates a new ScanConfig.
+     * 

+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig createScanConfig(com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getCreateScanConfigMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Deletes an existing ScanConfig and its child resources.
+     * 

+     */
+    public com.google.protobuf.Empty deleteScanConfig(com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getDeleteScanConfigMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Gets a ScanConfig.
+     * 

+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getScanConfig(com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getGetScanConfigMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Lists ScanConfigs under a given project.
+     * 

+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse listScanConfigs(com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getListScanConfigsMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Updates a ScanConfig. This method support partial update of a ScanConfig.
+     * 

+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig updateScanConfig(com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getUpdateScanConfigMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Start a ScanRun according to the given ScanConfig.
+     * 

+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRun startScanRun(com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getStartScanRunMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Gets a ScanRun.
+     * 

+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRun getScanRun(com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getGetScanRunMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Lists ScanRuns under a given ScanConfig, in descending order of ScanRun
+     * stop time.
+     * 

+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse listScanRuns(com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getListScanRunsMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Stops a ScanRun. The stopped ScanRun is returned.
+     * 

+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRun stopScanRun(com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getStopScanRunMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * List CrawledUrls under a given ScanRun.
+     * 

+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse listCrawledUrls(com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getListCrawledUrlsMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * Gets a Finding.
+     * 

+     */
+    public com.google.cloud.websecurityscanner.v1alpha.Finding getFinding(com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getGetFindingMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * List Findings under a given ScanRun.
+     * 

+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse listFindings(com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getListFindingsMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
+     * List all FindingTypeStats under a given ScanRun.
+     * 

+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse listFindingTypeStats(com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getListFindingTypeStatsMethodHelper(), getCallOptions(), request);
+    }
+  }
+
+  /**
+   * 
+   * Cloud Web Security Scanner Service identifies security vulnerabilities in web
+   * applications hosted on Google Cloud Platform. It crawls your application, and
+   * attempts to exercise as many user inputs and event handlers as possible.
+   * 

+   */
+  public static final class WebSecurityScannerFutureStub extends io.grpc.stub.AbstractStub {
+    private WebSecurityScannerFutureStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private WebSecurityScannerFutureStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected WebSecurityScannerFutureStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new WebSecurityScannerFutureStub(channel, callOptions);
+    }
+
+    /**
+     * 
+     * Creates a new ScanConfig.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture createScanConfig(
+        com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getCreateScanConfigMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Deletes an existing ScanConfig and its child resources.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture deleteScanConfig(
+        com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getDeleteScanConfigMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Gets a ScanConfig.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture getScanConfig(
+        com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getGetScanConfigMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Lists ScanConfigs under a given project.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture listScanConfigs(
+        com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getListScanConfigsMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Updates a ScanConfig. This method support partial update of a ScanConfig.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture updateScanConfig(
+        com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getUpdateScanConfigMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Start a ScanRun according to the given ScanConfig.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture startScanRun(
+        com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getStartScanRunMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Gets a ScanRun.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture getScanRun(
+        com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getGetScanRunMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Lists ScanRuns under a given ScanConfig, in descending order of ScanRun
+     * stop time.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture listScanRuns(
+        com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getListScanRunsMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Stops a ScanRun. The stopped ScanRun is returned.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture stopScanRun(
+        com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getStopScanRunMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * List CrawledUrls under a given ScanRun.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture listCrawledUrls(
+        com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getListCrawledUrlsMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * Gets a Finding.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture getFinding(
+        com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getGetFindingMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * List Findings under a given ScanRun.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture listFindings(
+        com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getListFindingsMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
+     * List all FindingTypeStats under a given ScanRun.
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture listFindingTypeStats(
+        com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getListFindingTypeStatsMethodHelper(), getCallOptions()), request);
+    }
+  }
+
+  private static final int METHODID_CREATE_SCAN_CONFIG = 0;
+  private static final int METHODID_DELETE_SCAN_CONFIG = 1;
+  private static final int METHODID_GET_SCAN_CONFIG = 2;
+  private static final int METHODID_LIST_SCAN_CONFIGS = 3;
+  private static final int METHODID_UPDATE_SCAN_CONFIG = 4;
+  private static final int METHODID_START_SCAN_RUN = 5;
+  private static final int METHODID_GET_SCAN_RUN = 6;
+  private static final int METHODID_LIST_SCAN_RUNS = 7;
+  private static final int METHODID_STOP_SCAN_RUN = 8;
+  private static final int METHODID_LIST_CRAWLED_URLS = 9;
+  private static final int METHODID_GET_FINDING = 10;
+  private static final int METHODID_LIST_FINDINGS = 11;
+  private static final int METHODID_LIST_FINDING_TYPE_STATS = 12;
+
+  private static final class MethodHandlers implements
+      io.grpc.stub.ServerCalls.UnaryMethod,
+      io.grpc.stub.ServerCalls.ServerStreamingMethod,
+      io.grpc.stub.ServerCalls.ClientStreamingMethod,
+      io.grpc.stub.ServerCalls.BidiStreamingMethod {
+    private final WebSecurityScannerImplBase serviceImpl;
+    private final int methodId;
+
+    MethodHandlers(WebSecurityScannerImplBase serviceImpl, int methodId) {
+      this.serviceImpl = serviceImpl;
+      this.methodId = methodId;
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) {
+      switch (methodId) {
+        case METHODID_CREATE_SCAN_CONFIG:
+          serviceImpl.createScanConfig((com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_DELETE_SCAN_CONFIG:
+          serviceImpl.deleteScanConfig((com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_GET_SCAN_CONFIG:
+          serviceImpl.getScanConfig((com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_LIST_SCAN_CONFIGS:
+          serviceImpl.listScanConfigs((com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_UPDATE_SCAN_CONFIG:
+          serviceImpl.updateScanConfig((com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_START_SCAN_RUN:
+          serviceImpl.startScanRun((com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_GET_SCAN_RUN:
+          serviceImpl.getScanRun((com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_LIST_SCAN_RUNS:
+          serviceImpl.listScanRuns((com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_STOP_SCAN_RUN:
+          serviceImpl.stopScanRun((com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_LIST_CRAWLED_URLS:
+          serviceImpl.listCrawledUrls((com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_GET_FINDING:
+          serviceImpl.getFinding((com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_LIST_FINDINGS:
+          serviceImpl.listFindings((com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_LIST_FINDING_TYPE_STATS:
+          serviceImpl.listFindingTypeStats((com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        default:
+          throw new AssertionError();
+      }
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public io.grpc.stub.StreamObserver invoke(
+        io.grpc.stub.StreamObserver responseObserver) {
+      switch (methodId) {
+        default:
+          throw new AssertionError();
+      }
+    }
+  }
+
+  private static abstract class WebSecurityScannerBaseDescriptorSupplier
+      implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
+    WebSecurityScannerBaseDescriptorSupplier() {}
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.getDescriptor();
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
+      return getFileDescriptor().findServiceByName("WebSecurityScanner");
+    }
+  }
+
+  private static final class WebSecurityScannerFileDescriptorSupplier
+      extends WebSecurityScannerBaseDescriptorSupplier {
+    WebSecurityScannerFileDescriptorSupplier() {}
+  }
+
+  private static final class WebSecurityScannerMethodDescriptorSupplier
+      extends WebSecurityScannerBaseDescriptorSupplier
+      implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
+    private final String methodName;
+
+    WebSecurityScannerMethodDescriptorSupplier(String methodName) {
+      this.methodName = methodName;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
+      return getServiceDescriptor().findMethodByName(methodName);
+    }
+  }
+
+  private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
+
+  public static io.grpc.ServiceDescriptor getServiceDescriptor() {
+    io.grpc.ServiceDescriptor result = serviceDescriptor;
+    if (result == null) {
+      synchronized (WebSecurityScannerGrpc.class) {
+        result = serviceDescriptor;
+        if (result == null) {
+          serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
+              .setSchemaDescriptor(new WebSecurityScannerFileDescriptorSupplier())
+              .addMethod(getCreateScanConfigMethodHelper())
+              .addMethod(getDeleteScanConfigMethodHelper())
+              .addMethod(getGetScanConfigMethodHelper())
+              .addMethod(getListScanConfigsMethodHelper())
+              .addMethod(getUpdateScanConfigMethodHelper())
+              .addMethod(getStartScanRunMethodHelper())
+              .addMethod(getGetScanRunMethodHelper())
+              .addMethod(getListScanRunsMethodHelper())
+              .addMethod(getStopScanRunMethodHelper())
+              .addMethod(getListCrawledUrlsMethodHelper())
+              .addMethod(getGetFindingMethodHelper())
+              .addMethod(getListFindingsMethodHelper())
+              .addMethod(getListFindingTypeStatsMethodHelper())
+              .build();
+        }
+      }
+    }
+    return result;
+  }
+}
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index d0ce753b61b2..3b398f94ab71 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -2,11 +2,11 @@
 
   4.0.0
   com.google.api.grpc
-  google-api-grpc-pom
+  google-api-grpc
   pom
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   Google Cloud API gRPC
-  https://github.com/GoogleCloudPlatform/google-cloud-java/google-api-grpc
+  https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-api-grpc
   
     Proto and grpc libraries for idiomatic client for Google Cloud Platform services
   
@@ -57,7 +57,7 @@
   
     scm:git:git@github.com:GoogleCloudPlatform/google-cloud-java.git
     scm:git:git@github.com:GoogleCloudPlatform/google-cloud-java.git
-    https://github.com/GoogleCloudPlatform/google-cloud-java/google-api-grpc
+    https://github.com/GoogleCloudPlatform/google-cloud-java
     HEAD
   
   
@@ -117,354 +117,384 @@
       
         com.google.api.grpc
         proto-google-common-protos
-        1.10.0
+        1.11.0
       
       
         com.google.api.grpc
         proto-google-iam-v1
-        0.11.0
+        0.12.0
       
       
         com.google.api.grpc
         grpc-google-iam-v1
-        0.11.0
+        0.12.0
       
 
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-v2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-v2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-admin-v2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-admin-v2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-bigquerydatatransfer-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigquerydatatransfer-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-container-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-container-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dataproc-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dataproc-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dlp-v2beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dlp-v2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-error-reporting-v1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-error-reporting-v1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-firestore-v1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-firestore-v1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1
-        1.10.1-SNAPSHOT
+        1.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1
-        1.10.1-SNAPSHOT
+        1.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1beta2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1beta2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-logging-v2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-logging-v2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-monitoring-v3
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-monitoring-v3
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-os-login-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-os-login-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-pubsub-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-pubsub-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-database-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-database-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-instance-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-instance-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1p1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1p1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-texttospeech-v1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-texttospeech-v1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1
-        1.10.1-SNAPSHOT
+        1.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1
-        1.10.1-SNAPSHOT
+        1.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p2beta1
-        1.10.1-SNAPSHOT
+        1.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p2beta1
-        1.10.1-SNAPSHOT
+        1.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta2
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1p1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1p1beta1
-        0.11.1-SNAPSHOT
+        0.12.1-SNAPSHOT
+      
+      
+        com.google.api.grpc
+        proto-google-cloud-cloudiot-v1
+        0.12.1-SNAPSHOT
+      
+      
+        com.google.api.grpc
+        grpc-google-cloud-cloudiot-v1
+        0.12.1-SNAPSHOT
+      
+      
+        com.google.api.grpc
+        proto-google-cloud-redis-v1beta1
+        0.12.1-SNAPSHOT
+      
+      
+        com.google.api.grpc
+        grpc-google-cloud-redis-v1beta1
+        0.12.1-SNAPSHOT
+      
+      
+        com.google.api.grpc
+        proto-google-cloud-websecurityscanner-v1alpha
+        0.12.1-SNAPSHOT
+      
+      
+        com.google.api.grpc
+        grpc-google-cloud-websecurityscanner-v1alpha
+        0.12.1-SNAPSHOT
       
     
   
@@ -503,6 +533,9 @@
     grpc-google-cloud-vision-v1
     grpc-google-cloud-vision-v1p1beta1
     grpc-google-cloud-vision-v1p2beta1
+    grpc-google-cloud-cloudiot-v1
+    grpc-google-cloud-redis-v1beta1
+    grpc-google-cloud-websecurityscanner-v1alpha
     proto-google-cloud-bigquerydatatransfer-v1
     proto-google-cloud-bigtable-admin-v2
     proto-google-cloud-bigtable-v2
@@ -537,6 +570,9 @@
     proto-google-cloud-vision-v1
     proto-google-cloud-vision-v1p1beta1
     proto-google-cloud-vision-v1p2beta1
+    proto-google-cloud-cloudiot-v1
+    proto-google-cloud-redis-v1beta1
+    proto-google-cloud-websecurityscanner-v1alpha
   
 
   
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
index 4b6e1d02f25d..881f98356bd2 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigquerydatatransfer-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-bigquerydatatransfer-v1
   PROTO library for proto-google-cloud-bigquerydatatransfer-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
index c670f79202ce..ac4842c20f66 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigtable-admin-v2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-bigtable-admin-v2
   PROTO library for proto-google-cloud-bigtable-admin-v2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml b/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
index 795abe75c1b9..2f6042617651 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigtable-v2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-bigtable-v2
   PROTO library for proto-google-cloud-bigtable-v2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/pom.xml b/google-api-grpc/proto-google-cloud-cloudiot-v1/pom.xml
new file mode 100644
index 000000000000..719aa6215677
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/pom.xml
@@ -0,0 +1,36 @@
+
+  4.0.0
+  proto-google-cloud-cloudiot-v1
+  0.12.1-SNAPSHOT
+  proto-google-cloud-cloudiot-v1
+  PROTO library for proto-google-cloud-cloudiot-v1
+  
+    com.google.api.grpc
+    google-api-grpc
+    0.12.1-SNAPSHOT
+  
+  
+    
+      com.google.protobuf
+      protobuf-java
+      compile
+    
+    
+      com.google.api
+      api-common
+      compile
+    
+    
+      com.google.api.grpc
+      proto-google-common-protos
+      compile
+    
+    
+      com.google.api.grpc
+      proto-google-iam-v1
+      compile
+    
+  
+
\ No newline at end of file
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java
new file mode 100644
index 000000000000..a82e76ebf101
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java
@@ -0,0 +1,812 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `CreateDeviceRegistry`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.CreateDeviceRegistryRequest}
+ */
+public  final class CreateDeviceRegistryRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.CreateDeviceRegistryRequest)
+    CreateDeviceRegistryRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use CreateDeviceRegistryRequest.newBuilder() to construct.
+  private CreateDeviceRegistryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private CreateDeviceRegistryRequest() {
+    parent_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private CreateDeviceRegistryRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
+          case 18: {
+            com.google.cloud.iot.v1.DeviceRegistry.Builder subBuilder = null;
+            if (deviceRegistry_ != null) {
+              subBuilder = deviceRegistry_.toBuilder();
+            }
+            deviceRegistry_ = input.readMessage(com.google.cloud.iot.v1.DeviceRegistry.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(deviceRegistry_);
+              deviceRegistry_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.CreateDeviceRegistryRequest.class, com.google.cloud.iot.v1.CreateDeviceRegistryRequest.Builder.class);
+  }
+
+  public static final int PARENT_FIELD_NUMBER = 1;
+  private volatile java.lang.Object parent_;
+  /**
+   * 
+   * The project and cloud region where this device registry must be created.
+   * For example, `projects/example-project/locations/us-central1`.
+   * 

+   *
+   * string parent = 1;
+   */
+  public java.lang.String getParent() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      parent_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The project and cloud region where this device registry must be created.
+   * For example, `projects/example-project/locations/us-central1`.
+   * 

+   *
+   * string parent = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParentBytes() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      parent_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int DEVICE_REGISTRY_FIELD_NUMBER = 2;
+  private com.google.cloud.iot.v1.DeviceRegistry deviceRegistry_;
+  /**
+   * 
+   * The device registry. The field `name` must be empty. The server will
+   * generate that field from the device registry `id` provided and the
+   * `parent` field.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+   */
+  public boolean hasDeviceRegistry() {
+    return deviceRegistry_ != null;
+  }
+  /**
+   * 
+   * The device registry. The field `name` must be empty. The server will
+   * generate that field from the device registry `id` provided and the
+   * `parent` field.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+   */
+  public com.google.cloud.iot.v1.DeviceRegistry getDeviceRegistry() {
+    return deviceRegistry_ == null ? com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance() : deviceRegistry_;
+  }
+  /**
+   * 
+   * The device registry. The field `name` must be empty. The server will
+   * generate that field from the device registry `id` provided and the
+   * `parent` field.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+   */
+  public com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistryOrBuilder() {
+    return getDeviceRegistry();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getParentBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
+    }
+    if (deviceRegistry_ != null) {
+      output.writeMessage(2, getDeviceRegistry());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getParentBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
+    }
+    if (deviceRegistry_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getDeviceRegistry());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.CreateDeviceRegistryRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.CreateDeviceRegistryRequest other = (com.google.cloud.iot.v1.CreateDeviceRegistryRequest) obj;
+
+    boolean result = true;
+    result = result && getParent()
+        .equals(other.getParent());
+    result = result && (hasDeviceRegistry() == other.hasDeviceRegistry());
+    if (hasDeviceRegistry()) {
+      result = result && getDeviceRegistry()
+          .equals(other.getDeviceRegistry());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PARENT_FIELD_NUMBER;
+    hash = (53 * hash) + getParent().hashCode();
+    if (hasDeviceRegistry()) {
+      hash = (37 * hash) + DEVICE_REGISTRY_FIELD_NUMBER;
+      hash = (53 * hash) + getDeviceRegistry().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.CreateDeviceRegistryRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `CreateDeviceRegistry`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.CreateDeviceRegistryRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.CreateDeviceRegistryRequest)
+      com.google.cloud.iot.v1.CreateDeviceRegistryRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.CreateDeviceRegistryRequest.class, com.google.cloud.iot.v1.CreateDeviceRegistryRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.CreateDeviceRegistryRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parent_ = "";
+
+      if (deviceRegistryBuilder_ == null) {
+        deviceRegistry_ = null;
+      } else {
+        deviceRegistry_ = null;
+        deviceRegistryBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.CreateDeviceRegistryRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.CreateDeviceRegistryRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.CreateDeviceRegistryRequest build() {
+      com.google.cloud.iot.v1.CreateDeviceRegistryRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.CreateDeviceRegistryRequest buildPartial() {
+      com.google.cloud.iot.v1.CreateDeviceRegistryRequest result = new com.google.cloud.iot.v1.CreateDeviceRegistryRequest(this);
+      result.parent_ = parent_;
+      if (deviceRegistryBuilder_ == null) {
+        result.deviceRegistry_ = deviceRegistry_;
+      } else {
+        result.deviceRegistry_ = deviceRegistryBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.CreateDeviceRegistryRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.CreateDeviceRegistryRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.CreateDeviceRegistryRequest other) {
+      if (other == com.google.cloud.iot.v1.CreateDeviceRegistryRequest.getDefaultInstance()) return this;
+      if (!other.getParent().isEmpty()) {
+        parent_ = other.parent_;
+        onChanged();
+      }
+      if (other.hasDeviceRegistry()) {
+        mergeDeviceRegistry(other.getDeviceRegistry());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.CreateDeviceRegistryRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.CreateDeviceRegistryRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object parent_ = "";
+    /**
+     * 
+     * The project and cloud region where this device registry must be created.
+     * For example, `projects/example-project/locations/us-central1`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public java.lang.String getParent() {
+      java.lang.Object ref = parent_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        parent_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The project and cloud region where this device registry must be created.
+     * For example, `projects/example-project/locations/us-central1`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParentBytes() {
+      java.lang.Object ref = parent_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        parent_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The project and cloud region where this device registry must be created.
+     * For example, `projects/example-project/locations/us-central1`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParent(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The project and cloud region where this device registry must be created.
+     * For example, `projects/example-project/locations/us-central1`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder clearParent() {
+      
+      parent_ = getDefaultInstance().getParent();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The project and cloud region where this device registry must be created.
+     * For example, `projects/example-project/locations/us-central1`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParentBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.cloud.iot.v1.DeviceRegistry deviceRegistry_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceRegistry, com.google.cloud.iot.v1.DeviceRegistry.Builder, com.google.cloud.iot.v1.DeviceRegistryOrBuilder> deviceRegistryBuilder_;
+    /**
+     * 
+     * The device registry. The field `name` must be empty. The server will
+     * generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+     */
+    public boolean hasDeviceRegistry() {
+      return deviceRegistryBuilder_ != null || deviceRegistry_ != null;
+    }
+    /**
+     * 
+     * The device registry. The field `name` must be empty. The server will
+     * generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+     */
+    public com.google.cloud.iot.v1.DeviceRegistry getDeviceRegistry() {
+      if (deviceRegistryBuilder_ == null) {
+        return deviceRegistry_ == null ? com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance() : deviceRegistry_;
+      } else {
+        return deviceRegistryBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The device registry. The field `name` must be empty. The server will
+     * generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+     */
+    public Builder setDeviceRegistry(com.google.cloud.iot.v1.DeviceRegistry value) {
+      if (deviceRegistryBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        deviceRegistry_ = value;
+        onChanged();
+      } else {
+        deviceRegistryBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The device registry. The field `name` must be empty. The server will
+     * generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+     */
+    public Builder setDeviceRegistry(
+        com.google.cloud.iot.v1.DeviceRegistry.Builder builderForValue) {
+      if (deviceRegistryBuilder_ == null) {
+        deviceRegistry_ = builderForValue.build();
+        onChanged();
+      } else {
+        deviceRegistryBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The device registry. The field `name` must be empty. The server will
+     * generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+     */
+    public Builder mergeDeviceRegistry(com.google.cloud.iot.v1.DeviceRegistry value) {
+      if (deviceRegistryBuilder_ == null) {
+        if (deviceRegistry_ != null) {
+          deviceRegistry_ =
+            com.google.cloud.iot.v1.DeviceRegistry.newBuilder(deviceRegistry_).mergeFrom(value).buildPartial();
+        } else {
+          deviceRegistry_ = value;
+        }
+        onChanged();
+      } else {
+        deviceRegistryBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The device registry. The field `name` must be empty. The server will
+     * generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+     */
+    public Builder clearDeviceRegistry() {
+      if (deviceRegistryBuilder_ == null) {
+        deviceRegistry_ = null;
+        onChanged();
+      } else {
+        deviceRegistry_ = null;
+        deviceRegistryBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The device registry. The field `name` must be empty. The server will
+     * generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+     */
+    public com.google.cloud.iot.v1.DeviceRegistry.Builder getDeviceRegistryBuilder() {
+      
+      onChanged();
+      return getDeviceRegistryFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The device registry. The field `name` must be empty. The server will
+     * generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+     */
+    public com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistryOrBuilder() {
+      if (deviceRegistryBuilder_ != null) {
+        return deviceRegistryBuilder_.getMessageOrBuilder();
+      } else {
+        return deviceRegistry_ == null ?
+            com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance() : deviceRegistry_;
+      }
+    }
+    /**
+     * 
+     * The device registry. The field `name` must be empty. The server will
+     * generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceRegistry, com.google.cloud.iot.v1.DeviceRegistry.Builder, com.google.cloud.iot.v1.DeviceRegistryOrBuilder> 
+        getDeviceRegistryFieldBuilder() {
+      if (deviceRegistryBuilder_ == null) {
+        deviceRegistryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.iot.v1.DeviceRegistry, com.google.cloud.iot.v1.DeviceRegistry.Builder, com.google.cloud.iot.v1.DeviceRegistryOrBuilder>(
+                getDeviceRegistry(),
+                getParentForChildren(),
+                isClean());
+        deviceRegistry_ = null;
+      }
+      return deviceRegistryBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.CreateDeviceRegistryRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.CreateDeviceRegistryRequest)
+  private static final com.google.cloud.iot.v1.CreateDeviceRegistryRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.CreateDeviceRegistryRequest();
+  }
+
+  public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public CreateDeviceRegistryRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new CreateDeviceRegistryRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.CreateDeviceRegistryRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequestOrBuilder.java
new file mode 100644
index 000000000000..b7655ff3f7ed
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequestOrBuilder.java
@@ -0,0 +1,60 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface CreateDeviceRegistryRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.CreateDeviceRegistryRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The project and cloud region where this device registry must be created.
+   * For example, `projects/example-project/locations/us-central1`.
+   * 

+   *
+   * string parent = 1;
+   */
+  java.lang.String getParent();
+  /**
+   * 
+   * The project and cloud region where this device registry must be created.
+   * For example, `projects/example-project/locations/us-central1`.
+   * 

+   *
+   * string parent = 1;
+   */
+  com.google.protobuf.ByteString
+      getParentBytes();
+
+  /**
+   * 
+   * The device registry. The field `name` must be empty. The server will
+   * generate that field from the device registry `id` provided and the
+   * `parent` field.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+   */
+  boolean hasDeviceRegistry();
+  /**
+   * 
+   * The device registry. The field `name` must be empty. The server will
+   * generate that field from the device registry `id` provided and the
+   * `parent` field.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+   */
+  com.google.cloud.iot.v1.DeviceRegistry getDeviceRegistry();
+  /**
+   * 
+   * The device registry. The field `name` must be empty. The server will
+   * generate that field from the device registry `id` provided and the
+   * `parent` field.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceRegistry device_registry = 2;
+   */
+  com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistryOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java
new file mode 100644
index 000000000000..df24f77fc9ad
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java
@@ -0,0 +1,819 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `CreateDevice`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.CreateDeviceRequest}
+ */
+public  final class CreateDeviceRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.CreateDeviceRequest)
+    CreateDeviceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use CreateDeviceRequest.newBuilder() to construct.
+  private CreateDeviceRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private CreateDeviceRequest() {
+    parent_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private CreateDeviceRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
+          case 18: {
+            com.google.cloud.iot.v1.Device.Builder subBuilder = null;
+            if (device_ != null) {
+              subBuilder = device_.toBuilder();
+            }
+            device_ = input.readMessage(com.google.cloud.iot.v1.Device.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(device_);
+              device_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.CreateDeviceRequest.class, com.google.cloud.iot.v1.CreateDeviceRequest.Builder.class);
+  }
+
+  public static final int PARENT_FIELD_NUMBER = 1;
+  private volatile java.lang.Object parent_;
+  /**
+   * 
+   * The name of the device registry where this device should be created.
+   * For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string parent = 1;
+   */
+  public java.lang.String getParent() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      parent_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The name of the device registry where this device should be created.
+   * For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string parent = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParentBytes() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      parent_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int DEVICE_FIELD_NUMBER = 2;
+  private com.google.cloud.iot.v1.Device device_;
+  /**
+   * 
+   * The device registration details. The field `name` must be empty. The server
+   * will generate that field from the device registry `id` provided and the
+   * `parent` field.
+   * 

+   *
+   * .google.cloud.iot.v1.Device device = 2;
+   */
+  public boolean hasDevice() {
+    return device_ != null;
+  }
+  /**
+   * 
+   * The device registration details. The field `name` must be empty. The server
+   * will generate that field from the device registry `id` provided and the
+   * `parent` field.
+   * 

+   *
+   * .google.cloud.iot.v1.Device device = 2;
+   */
+  public com.google.cloud.iot.v1.Device getDevice() {
+    return device_ == null ? com.google.cloud.iot.v1.Device.getDefaultInstance() : device_;
+  }
+  /**
+   * 
+   * The device registration details. The field `name` must be empty. The server
+   * will generate that field from the device registry `id` provided and the
+   * `parent` field.
+   * 

+   *
+   * .google.cloud.iot.v1.Device device = 2;
+   */
+  public com.google.cloud.iot.v1.DeviceOrBuilder getDeviceOrBuilder() {
+    return getDevice();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getParentBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
+    }
+    if (device_ != null) {
+      output.writeMessage(2, getDevice());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getParentBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
+    }
+    if (device_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getDevice());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.CreateDeviceRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.CreateDeviceRequest other = (com.google.cloud.iot.v1.CreateDeviceRequest) obj;
+
+    boolean result = true;
+    result = result && getParent()
+        .equals(other.getParent());
+    result = result && (hasDevice() == other.hasDevice());
+    if (hasDevice()) {
+      result = result && getDevice()
+          .equals(other.getDevice());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PARENT_FIELD_NUMBER;
+    hash = (53 * hash) + getParent().hashCode();
+    if (hasDevice()) {
+      hash = (37 * hash) + DEVICE_FIELD_NUMBER;
+      hash = (53 * hash) + getDevice().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.CreateDeviceRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.CreateDeviceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.CreateDeviceRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `CreateDevice`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.CreateDeviceRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.CreateDeviceRequest)
+      com.google.cloud.iot.v1.CreateDeviceRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.CreateDeviceRequest.class, com.google.cloud.iot.v1.CreateDeviceRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.CreateDeviceRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parent_ = "";
+
+      if (deviceBuilder_ == null) {
+        device_ = null;
+      } else {
+        device_ = null;
+        deviceBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.CreateDeviceRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.CreateDeviceRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.CreateDeviceRequest build() {
+      com.google.cloud.iot.v1.CreateDeviceRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.CreateDeviceRequest buildPartial() {
+      com.google.cloud.iot.v1.CreateDeviceRequest result = new com.google.cloud.iot.v1.CreateDeviceRequest(this);
+      result.parent_ = parent_;
+      if (deviceBuilder_ == null) {
+        result.device_ = device_;
+      } else {
+        result.device_ = deviceBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.CreateDeviceRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.CreateDeviceRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.CreateDeviceRequest other) {
+      if (other == com.google.cloud.iot.v1.CreateDeviceRequest.getDefaultInstance()) return this;
+      if (!other.getParent().isEmpty()) {
+        parent_ = other.parent_;
+        onChanged();
+      }
+      if (other.hasDevice()) {
+        mergeDevice(other.getDevice());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.CreateDeviceRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.CreateDeviceRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object parent_ = "";
+    /**
+     * 
+     * The name of the device registry where this device should be created.
+     * For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public java.lang.String getParent() {
+      java.lang.Object ref = parent_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        parent_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device registry where this device should be created.
+     * For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParentBytes() {
+      java.lang.Object ref = parent_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        parent_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device registry where this device should be created.
+     * For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParent(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device registry where this device should be created.
+     * For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder clearParent() {
+      
+      parent_ = getDefaultInstance().getParent();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device registry where this device should be created.
+     * For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParentBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.cloud.iot.v1.Device device_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.Device, com.google.cloud.iot.v1.Device.Builder, com.google.cloud.iot.v1.DeviceOrBuilder> deviceBuilder_;
+    /**
+     * 
+     * The device registration details. The field `name` must be empty. The server
+     * will generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public boolean hasDevice() {
+      return deviceBuilder_ != null || device_ != null;
+    }
+    /**
+     * 
+     * The device registration details. The field `name` must be empty. The server
+     * will generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public com.google.cloud.iot.v1.Device getDevice() {
+      if (deviceBuilder_ == null) {
+        return device_ == null ? com.google.cloud.iot.v1.Device.getDefaultInstance() : device_;
+      } else {
+        return deviceBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The device registration details. The field `name` must be empty. The server
+     * will generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public Builder setDevice(com.google.cloud.iot.v1.Device value) {
+      if (deviceBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        device_ = value;
+        onChanged();
+      } else {
+        deviceBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The device registration details. The field `name` must be empty. The server
+     * will generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public Builder setDevice(
+        com.google.cloud.iot.v1.Device.Builder builderForValue) {
+      if (deviceBuilder_ == null) {
+        device_ = builderForValue.build();
+        onChanged();
+      } else {
+        deviceBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The device registration details. The field `name` must be empty. The server
+     * will generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public Builder mergeDevice(com.google.cloud.iot.v1.Device value) {
+      if (deviceBuilder_ == null) {
+        if (device_ != null) {
+          device_ =
+            com.google.cloud.iot.v1.Device.newBuilder(device_).mergeFrom(value).buildPartial();
+        } else {
+          device_ = value;
+        }
+        onChanged();
+      } else {
+        deviceBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The device registration details. The field `name` must be empty. The server
+     * will generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public Builder clearDevice() {
+      if (deviceBuilder_ == null) {
+        device_ = null;
+        onChanged();
+      } else {
+        device_ = null;
+        deviceBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The device registration details. The field `name` must be empty. The server
+     * will generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public com.google.cloud.iot.v1.Device.Builder getDeviceBuilder() {
+      
+      onChanged();
+      return getDeviceFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The device registration details. The field `name` must be empty. The server
+     * will generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public com.google.cloud.iot.v1.DeviceOrBuilder getDeviceOrBuilder() {
+      if (deviceBuilder_ != null) {
+        return deviceBuilder_.getMessageOrBuilder();
+      } else {
+        return device_ == null ?
+            com.google.cloud.iot.v1.Device.getDefaultInstance() : device_;
+      }
+    }
+    /**
+     * 
+     * The device registration details. The field `name` must be empty. The server
+     * will generate that field from the device registry `id` provided and the
+     * `parent` field.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.Device, com.google.cloud.iot.v1.Device.Builder, com.google.cloud.iot.v1.DeviceOrBuilder> 
+        getDeviceFieldBuilder() {
+      if (deviceBuilder_ == null) {
+        deviceBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.iot.v1.Device, com.google.cloud.iot.v1.Device.Builder, com.google.cloud.iot.v1.DeviceOrBuilder>(
+                getDevice(),
+                getParentForChildren(),
+                isClean());
+        device_ = null;
+      }
+      return deviceBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.CreateDeviceRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.CreateDeviceRequest)
+  private static final com.google.cloud.iot.v1.CreateDeviceRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.CreateDeviceRequest();
+  }
+
+  public static com.google.cloud.iot.v1.CreateDeviceRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public CreateDeviceRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new CreateDeviceRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.CreateDeviceRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequestOrBuilder.java
new file mode 100644
index 000000000000..13aba855dced
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequestOrBuilder.java
@@ -0,0 +1,62 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface CreateDeviceRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.CreateDeviceRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The name of the device registry where this device should be created.
+   * For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string parent = 1;
+   */
+  java.lang.String getParent();
+  /**
+   * 
+   * The name of the device registry where this device should be created.
+   * For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string parent = 1;
+   */
+  com.google.protobuf.ByteString
+      getParentBytes();
+
+  /**
+   * 
+   * The device registration details. The field `name` must be empty. The server
+   * will generate that field from the device registry `id` provided and the
+   * `parent` field.
+   * 

+   *
+   * .google.cloud.iot.v1.Device device = 2;
+   */
+  boolean hasDevice();
+  /**
+   * 
+   * The device registration details. The field `name` must be empty. The server
+   * will generate that field from the device registry `id` provided and the
+   * `parent` field.
+   * 

+   *
+   * .google.cloud.iot.v1.Device device = 2;
+   */
+  com.google.cloud.iot.v1.Device getDevice();
+  /**
+   * 
+   * The device registration details. The field `name` must be empty. The server
+   * will generate that field from the device registry `id` provided and the
+   * `parent` field.
+   * 

+   *
+   * .google.cloud.iot.v1.Device device = 2;
+   */
+  com.google.cloud.iot.v1.DeviceOrBuilder getDeviceOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java
new file mode 100644
index 000000000000..d32f91fac660
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java
@@ -0,0 +1,559 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `DeleteDeviceRegistry`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.DeleteDeviceRegistryRequest}
+ */
+public  final class DeleteDeviceRegistryRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.DeleteDeviceRegistryRequest)
+    DeleteDeviceRegistryRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use DeleteDeviceRegistryRequest.newBuilder() to construct.
+  private DeleteDeviceRegistryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private DeleteDeviceRegistryRequest() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private DeleteDeviceRegistryRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.DeleteDeviceRegistryRequest.class, com.google.cloud.iot.v1.DeleteDeviceRegistryRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * The name of the device registry. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The name of the device registry. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.DeleteDeviceRegistryRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.DeleteDeviceRegistryRequest other = (com.google.cloud.iot.v1.DeleteDeviceRegistryRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.DeleteDeviceRegistryRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `DeleteDeviceRegistry`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.DeleteDeviceRegistryRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.DeleteDeviceRegistryRequest)
+      com.google.cloud.iot.v1.DeleteDeviceRegistryRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.DeleteDeviceRegistryRequest.class, com.google.cloud.iot.v1.DeleteDeviceRegistryRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.DeleteDeviceRegistryRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.DeleteDeviceRegistryRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.DeleteDeviceRegistryRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.DeleteDeviceRegistryRequest build() {
+      com.google.cloud.iot.v1.DeleteDeviceRegistryRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.DeleteDeviceRegistryRequest buildPartial() {
+      com.google.cloud.iot.v1.DeleteDeviceRegistryRequest result = new com.google.cloud.iot.v1.DeleteDeviceRegistryRequest(this);
+      result.name_ = name_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.DeleteDeviceRegistryRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.DeleteDeviceRegistryRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.DeleteDeviceRegistryRequest other) {
+      if (other == com.google.cloud.iot.v1.DeleteDeviceRegistryRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.DeleteDeviceRegistryRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * The name of the device registry. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device registry. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device registry. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device registry. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device registry. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.DeleteDeviceRegistryRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.DeleteDeviceRegistryRequest)
+  private static final com.google.cloud.iot.v1.DeleteDeviceRegistryRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.DeleteDeviceRegistryRequest();
+  }
+
+  public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public DeleteDeviceRegistryRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new DeleteDeviceRegistryRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.DeleteDeviceRegistryRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequestOrBuilder.java
new file mode 100644
index 000000000000..04386a0160b4
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequestOrBuilder.java
@@ -0,0 +1,29 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface DeleteDeviceRegistryRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.DeleteDeviceRegistryRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The name of the device registry. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * The name of the device registry. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java
new file mode 100644
index 000000000000..a8ae61fc74bb
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java
@@ -0,0 +1,566 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `DeleteDevice`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.DeleteDeviceRequest}
+ */
+public  final class DeleteDeviceRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.DeleteDeviceRequest)
+    DeleteDeviceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use DeleteDeviceRequest.newBuilder() to construct.
+  private DeleteDeviceRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private DeleteDeviceRequest() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private DeleteDeviceRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.DeleteDeviceRequest.class, com.google.cloud.iot.v1.DeleteDeviceRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.DeleteDeviceRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.DeleteDeviceRequest other = (com.google.cloud.iot.v1.DeleteDeviceRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.DeleteDeviceRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `DeleteDevice`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.DeleteDeviceRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.DeleteDeviceRequest)
+      com.google.cloud.iot.v1.DeleteDeviceRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.DeleteDeviceRequest.class, com.google.cloud.iot.v1.DeleteDeviceRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.DeleteDeviceRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.DeleteDeviceRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.DeleteDeviceRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.DeleteDeviceRequest build() {
+      com.google.cloud.iot.v1.DeleteDeviceRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.DeleteDeviceRequest buildPartial() {
+      com.google.cloud.iot.v1.DeleteDeviceRequest result = new com.google.cloud.iot.v1.DeleteDeviceRequest(this);
+      result.name_ = name_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.DeleteDeviceRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.DeleteDeviceRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.DeleteDeviceRequest other) {
+      if (other == com.google.cloud.iot.v1.DeleteDeviceRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.DeleteDeviceRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.DeleteDeviceRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.DeleteDeviceRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.DeleteDeviceRequest)
+  private static final com.google.cloud.iot.v1.DeleteDeviceRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.DeleteDeviceRequest();
+  }
+
+  public static com.google.cloud.iot.v1.DeleteDeviceRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public DeleteDeviceRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new DeleteDeviceRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.DeleteDeviceRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequestOrBuilder.java
new file mode 100644
index 000000000000..054f7032d326
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequestOrBuilder.java
@@ -0,0 +1,31 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface DeleteDeviceRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.DeleteDeviceRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/Device.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/Device.java
new file mode 100644
index 000000000000..b1db0d91f903
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/Device.java
@@ -0,0 +1,4188 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * The device resource.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.Device}
+ */
+public  final class Device extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.Device)
+    DeviceOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use Device.newBuilder() to construct.
+  private Device(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private Device() {
+    id_ = "";
+    name_ = "";
+    numId_ = 0L;
+    credentials_ = java.util.Collections.emptyList();
+    blocked_ = false;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private Device(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            id_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 24: {
+
+            numId_ = input.readUInt64();
+            break;
+          }
+          case 58: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (lastHeartbeatTime_ != null) {
+              subBuilder = lastHeartbeatTime_.toBuilder();
+            }
+            lastHeartbeatTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(lastHeartbeatTime_);
+              lastHeartbeatTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 66: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (lastEventTime_ != null) {
+              subBuilder = lastEventTime_.toBuilder();
+            }
+            lastEventTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(lastEventTime_);
+              lastEventTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 82: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (lastErrorTime_ != null) {
+              subBuilder = lastErrorTime_.toBuilder();
+            }
+            lastErrorTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(lastErrorTime_);
+              lastErrorTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 90: {
+            com.google.rpc.Status.Builder subBuilder = null;
+            if (lastErrorStatus_ != null) {
+              subBuilder = lastErrorStatus_.toBuilder();
+            }
+            lastErrorStatus_ = input.readMessage(com.google.rpc.Status.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(lastErrorStatus_);
+              lastErrorStatus_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 98: {
+            if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+              credentials_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000008;
+            }
+            credentials_.add(
+                input.readMessage(com.google.cloud.iot.v1.DeviceCredential.parser(), extensionRegistry));
+            break;
+          }
+          case 106: {
+            com.google.cloud.iot.v1.DeviceConfig.Builder subBuilder = null;
+            if (config_ != null) {
+              subBuilder = config_.toBuilder();
+            }
+            config_ = input.readMessage(com.google.cloud.iot.v1.DeviceConfig.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(config_);
+              config_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 114: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (lastConfigAckTime_ != null) {
+              subBuilder = lastConfigAckTime_.toBuilder();
+            }
+            lastConfigAckTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(lastConfigAckTime_);
+              lastConfigAckTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 130: {
+            com.google.cloud.iot.v1.DeviceState.Builder subBuilder = null;
+            if (state_ != null) {
+              subBuilder = state_.toBuilder();
+            }
+            state_ = input.readMessage(com.google.cloud.iot.v1.DeviceState.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(state_);
+              state_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 138: {
+            if (!((mutable_bitField0_ & 0x00004000) == 0x00004000)) {
+              metadata_ = com.google.protobuf.MapField.newMapField(
+                  MetadataDefaultEntryHolder.defaultEntry);
+              mutable_bitField0_ |= 0x00004000;
+            }
+            com.google.protobuf.MapEntry
+            metadata__ = input.readMessage(
+                MetadataDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+            metadata_.getMutableMap().put(
+                metadata__.getKey(), metadata__.getValue());
+            break;
+          }
+          case 146: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (lastConfigSendTime_ != null) {
+              subBuilder = lastConfigSendTime_.toBuilder();
+            }
+            lastConfigSendTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(lastConfigSendTime_);
+              lastConfigSendTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 152: {
+
+            blocked_ = input.readBool();
+            break;
+          }
+          case 162: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (lastStateTime_ != null) {
+              subBuilder = lastStateTime_.toBuilder();
+            }
+            lastStateTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(lastStateTime_);
+              lastStateTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+        credentials_ = java.util.Collections.unmodifiableList(credentials_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_Device_descriptor;
+  }
+
+  @SuppressWarnings({"rawtypes"})
+  protected com.google.protobuf.MapField internalGetMapField(
+      int number) {
+    switch (number) {
+      case 17:
+        return internalGetMetadata();
+      default:
+        throw new RuntimeException(
+            "Invalid map field number: " + number);
+    }
+  }
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_Device_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.Device.class, com.google.cloud.iot.v1.Device.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int ID_FIELD_NUMBER = 1;
+  private volatile java.lang.Object id_;
+  /**
+   * 
+   * The user-defined device identifier. The device ID must be unique
+   * within a device registry.
+   * 

+   *
+   * string id = 1;
+   */
+  public java.lang.String getId() {
+    java.lang.Object ref = id_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      id_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The user-defined device identifier. The device ID must be unique
+   * within a device registry.
+   * 

+   *
+   * string id = 1;
+   */
+  public com.google.protobuf.ByteString
+      getIdBytes() {
+    java.lang.Object ref = id_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      id_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int NAME_FIELD_NUMBER = 2;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * The resource path name. For example,
+   * `projects/p1/locations/us-central1/registries/registry0/devices/dev0` or
+   * `projects/p1/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * When `name` is populated as a response from the service, it always ends
+   * in the device numeric ID.
+   * 

+   *
+   * string name = 2;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The resource path name. For example,
+   * `projects/p1/locations/us-central1/registries/registry0/devices/dev0` or
+   * `projects/p1/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * When `name` is populated as a response from the service, it always ends
+   * in the device numeric ID.
+   * 

+   *
+   * string name = 2;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int NUM_ID_FIELD_NUMBER = 3;
+  private long numId_;
+  /**
+   * 
+   * [Output only] A server-defined unique numeric ID for the device. This is a
+   * more compact way to identify devices, and it is globally unique.
+   * 

+   *
+   * uint64 num_id = 3;
+   */
+  public long getNumId() {
+    return numId_;
+  }
+
+  public static final int CREDENTIALS_FIELD_NUMBER = 12;
+  private java.util.List credentials_;
+  /**
+   * 
+   * The credentials used to authenticate this device. To allow credential
+   * rotation without interruption, multiple device credentials can be bound to
+   * this device. No more than 3 credentials can be bound to a single device at
+   * a time. When new credentials are added to a device, they are verified
+   * against the registry credentials. For details, see the description of the
+   * `DeviceRegistry.credentials` field.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+   */
+  public java.util.List getCredentialsList() {
+    return credentials_;
+  }
+  /**
+   * 
+   * The credentials used to authenticate this device. To allow credential
+   * rotation without interruption, multiple device credentials can be bound to
+   * this device. No more than 3 credentials can be bound to a single device at
+   * a time. When new credentials are added to a device, they are verified
+   * against the registry credentials. For details, see the description of the
+   * `DeviceRegistry.credentials` field.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+   */
+  public java.util.List 
+      getCredentialsOrBuilderList() {
+    return credentials_;
+  }
+  /**
+   * 
+   * The credentials used to authenticate this device. To allow credential
+   * rotation without interruption, multiple device credentials can be bound to
+   * this device. No more than 3 credentials can be bound to a single device at
+   * a time. When new credentials are added to a device, they are verified
+   * against the registry credentials. For details, see the description of the
+   * `DeviceRegistry.credentials` field.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+   */
+  public int getCredentialsCount() {
+    return credentials_.size();
+  }
+  /**
+   * 
+   * The credentials used to authenticate this device. To allow credential
+   * rotation without interruption, multiple device credentials can be bound to
+   * this device. No more than 3 credentials can be bound to a single device at
+   * a time. When new credentials are added to a device, they are verified
+   * against the registry credentials. For details, see the description of the
+   * `DeviceRegistry.credentials` field.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+   */
+  public com.google.cloud.iot.v1.DeviceCredential getCredentials(int index) {
+    return credentials_.get(index);
+  }
+  /**
+   * 
+   * The credentials used to authenticate this device. To allow credential
+   * rotation without interruption, multiple device credentials can be bound to
+   * this device. No more than 3 credentials can be bound to a single device at
+   * a time. When new credentials are added to a device, they are verified
+   * against the registry credentials. For details, see the description of the
+   * `DeviceRegistry.credentials` field.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+   */
+  public com.google.cloud.iot.v1.DeviceCredentialOrBuilder getCredentialsOrBuilder(
+      int index) {
+    return credentials_.get(index);
+  }
+
+  public static final int LAST_HEARTBEAT_TIME_FIELD_NUMBER = 7;
+  private com.google.protobuf.Timestamp lastHeartbeatTime_;
+  /**
+   * 
+   * [Output only] The last time an MQTT `PINGREQ` was received. This field
+   * applies only to devices connecting through MQTT. MQTT clients usually only
+   * send `PINGREQ` messages if the connection is idle, and no other messages
+   * have been sent. Timestamps are periodically collected and written to
+   * storage; they may be stale by a few minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_heartbeat_time = 7;
+   */
+  public boolean hasLastHeartbeatTime() {
+    return lastHeartbeatTime_ != null;
+  }
+  /**
+   * 
+   * [Output only] The last time an MQTT `PINGREQ` was received. This field
+   * applies only to devices connecting through MQTT. MQTT clients usually only
+   * send `PINGREQ` messages if the connection is idle, and no other messages
+   * have been sent. Timestamps are periodically collected and written to
+   * storage; they may be stale by a few minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_heartbeat_time = 7;
+   */
+  public com.google.protobuf.Timestamp getLastHeartbeatTime() {
+    return lastHeartbeatTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : lastHeartbeatTime_;
+  }
+  /**
+   * 
+   * [Output only] The last time an MQTT `PINGREQ` was received. This field
+   * applies only to devices connecting through MQTT. MQTT clients usually only
+   * send `PINGREQ` messages if the connection is idle, and no other messages
+   * have been sent. Timestamps are periodically collected and written to
+   * storage; they may be stale by a few minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_heartbeat_time = 7;
+   */
+  public com.google.protobuf.TimestampOrBuilder getLastHeartbeatTimeOrBuilder() {
+    return getLastHeartbeatTime();
+  }
+
+  public static final int LAST_EVENT_TIME_FIELD_NUMBER = 8;
+  private com.google.protobuf.Timestamp lastEventTime_;
+  /**
+   * 
+   * [Output only] The last time a telemetry event was received. Timestamps are
+   * periodically collected and written to storage; they may be stale by a few
+   * minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_event_time = 8;
+   */
+  public boolean hasLastEventTime() {
+    return lastEventTime_ != null;
+  }
+  /**
+   * 
+   * [Output only] The last time a telemetry event was received. Timestamps are
+   * periodically collected and written to storage; they may be stale by a few
+   * minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_event_time = 8;
+   */
+  public com.google.protobuf.Timestamp getLastEventTime() {
+    return lastEventTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : lastEventTime_;
+  }
+  /**
+   * 
+   * [Output only] The last time a telemetry event was received. Timestamps are
+   * periodically collected and written to storage; they may be stale by a few
+   * minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_event_time = 8;
+   */
+  public com.google.protobuf.TimestampOrBuilder getLastEventTimeOrBuilder() {
+    return getLastEventTime();
+  }
+
+  public static final int LAST_STATE_TIME_FIELD_NUMBER = 20;
+  private com.google.protobuf.Timestamp lastStateTime_;
+  /**
+   * 
+   * [Output only] The last time a state event was received. Timestamps are
+   * periodically collected and written to storage; they may be stale by a few
+   * minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_state_time = 20;
+   */
+  public boolean hasLastStateTime() {
+    return lastStateTime_ != null;
+  }
+  /**
+   * 
+   * [Output only] The last time a state event was received. Timestamps are
+   * periodically collected and written to storage; they may be stale by a few
+   * minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_state_time = 20;
+   */
+  public com.google.protobuf.Timestamp getLastStateTime() {
+    return lastStateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : lastStateTime_;
+  }
+  /**
+   * 
+   * [Output only] The last time a state event was received. Timestamps are
+   * periodically collected and written to storage; they may be stale by a few
+   * minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_state_time = 20;
+   */
+  public com.google.protobuf.TimestampOrBuilder getLastStateTimeOrBuilder() {
+    return getLastStateTime();
+  }
+
+  public static final int LAST_CONFIG_ACK_TIME_FIELD_NUMBER = 14;
+  private com.google.protobuf.Timestamp lastConfigAckTime_;
+  /**
+   * 
+   * [Output only] The last time a cloud-to-device config version acknowledgment
+   * was received from the device. This field is only for configurations
+   * sent through MQTT.
+   * 

+   *
+   * .google.protobuf.Timestamp last_config_ack_time = 14;
+   */
+  public boolean hasLastConfigAckTime() {
+    return lastConfigAckTime_ != null;
+  }
+  /**
+   * 
+   * [Output only] The last time a cloud-to-device config version acknowledgment
+   * was received from the device. This field is only for configurations
+   * sent through MQTT.
+   * 

+   *
+   * .google.protobuf.Timestamp last_config_ack_time = 14;
+   */
+  public com.google.protobuf.Timestamp getLastConfigAckTime() {
+    return lastConfigAckTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : lastConfigAckTime_;
+  }
+  /**
+   * 
+   * [Output only] The last time a cloud-to-device config version acknowledgment
+   * was received from the device. This field is only for configurations
+   * sent through MQTT.
+   * 

+   *
+   * .google.protobuf.Timestamp last_config_ack_time = 14;
+   */
+  public com.google.protobuf.TimestampOrBuilder getLastConfigAckTimeOrBuilder() {
+    return getLastConfigAckTime();
+  }
+
+  public static final int LAST_CONFIG_SEND_TIME_FIELD_NUMBER = 18;
+  private com.google.protobuf.Timestamp lastConfigSendTime_;
+  /**
+   * 
+   * [Output only] The last time a cloud-to-device config version was sent to
+   * the device.
+   * 

+   *
+   * .google.protobuf.Timestamp last_config_send_time = 18;
+   */
+  public boolean hasLastConfigSendTime() {
+    return lastConfigSendTime_ != null;
+  }
+  /**
+   * 
+   * [Output only] The last time a cloud-to-device config version was sent to
+   * the device.
+   * 

+   *
+   * .google.protobuf.Timestamp last_config_send_time = 18;
+   */
+  public com.google.protobuf.Timestamp getLastConfigSendTime() {
+    return lastConfigSendTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : lastConfigSendTime_;
+  }
+  /**
+   * 
+   * [Output only] The last time a cloud-to-device config version was sent to
+   * the device.
+   * 

+   *
+   * .google.protobuf.Timestamp last_config_send_time = 18;
+   */
+  public com.google.protobuf.TimestampOrBuilder getLastConfigSendTimeOrBuilder() {
+    return getLastConfigSendTime();
+  }
+
+  public static final int BLOCKED_FIELD_NUMBER = 19;
+  private boolean blocked_;
+  /**
+   * 
+   * If a device is blocked, connections or requests from this device will fail.
+   * Can be used to temporarily prevent the device from connecting if, for
+   * example, the sensor is generating bad data and needs maintenance.
+   * 

+   *
+   * bool blocked = 19;
+   */
+  public boolean getBlocked() {
+    return blocked_;
+  }
+
+  public static final int LAST_ERROR_TIME_FIELD_NUMBER = 10;
+  private com.google.protobuf.Timestamp lastErrorTime_;
+  /**
+   * 
+   * [Output only] The time the most recent error occurred, such as a failure to
+   * publish to Cloud Pub/Sub. This field is the timestamp of
+   * 'last_error_status'.
+   * 

+   *
+   * .google.protobuf.Timestamp last_error_time = 10;
+   */
+  public boolean hasLastErrorTime() {
+    return lastErrorTime_ != null;
+  }
+  /**
+   * 
+   * [Output only] The time the most recent error occurred, such as a failure to
+   * publish to Cloud Pub/Sub. This field is the timestamp of
+   * 'last_error_status'.
+   * 

+   *
+   * .google.protobuf.Timestamp last_error_time = 10;
+   */
+  public com.google.protobuf.Timestamp getLastErrorTime() {
+    return lastErrorTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : lastErrorTime_;
+  }
+  /**
+   * 
+   * [Output only] The time the most recent error occurred, such as a failure to
+   * publish to Cloud Pub/Sub. This field is the timestamp of
+   * 'last_error_status'.
+   * 

+   *
+   * .google.protobuf.Timestamp last_error_time = 10;
+   */
+  public com.google.protobuf.TimestampOrBuilder getLastErrorTimeOrBuilder() {
+    return getLastErrorTime();
+  }
+
+  public static final int LAST_ERROR_STATUS_FIELD_NUMBER = 11;
+  private com.google.rpc.Status lastErrorStatus_;
+  /**
+   * 
+   * [Output only] The error message of the most recent error, such as a failure
+   * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+   * field. If no errors have occurred, this field has an empty message
+   * and the status code 0 == OK. Otherwise, this field is expected to have a
+   * status code other than OK.
+   * 

+   *
+   * .google.rpc.Status last_error_status = 11;
+   */
+  public boolean hasLastErrorStatus() {
+    return lastErrorStatus_ != null;
+  }
+  /**
+   * 
+   * [Output only] The error message of the most recent error, such as a failure
+   * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+   * field. If no errors have occurred, this field has an empty message
+   * and the status code 0 == OK. Otherwise, this field is expected to have a
+   * status code other than OK.
+   * 

+   *
+   * .google.rpc.Status last_error_status = 11;
+   */
+  public com.google.rpc.Status getLastErrorStatus() {
+    return lastErrorStatus_ == null ? com.google.rpc.Status.getDefaultInstance() : lastErrorStatus_;
+  }
+  /**
+   * 
+   * [Output only] The error message of the most recent error, such as a failure
+   * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+   * field. If no errors have occurred, this field has an empty message
+   * and the status code 0 == OK. Otherwise, this field is expected to have a
+   * status code other than OK.
+   * 

+   *
+   * .google.rpc.Status last_error_status = 11;
+   */
+  public com.google.rpc.StatusOrBuilder getLastErrorStatusOrBuilder() {
+    return getLastErrorStatus();
+  }
+
+  public static final int CONFIG_FIELD_NUMBER = 13;
+  private com.google.cloud.iot.v1.DeviceConfig config_;
+  /**
+   * 
+   * The most recent device configuration, which is eventually sent from
+   * Cloud IoT Core to the device. If not present on creation, the
+   * configuration will be initialized with an empty payload and version value
+   * of `1`. To update this field after creation, use the
+   * `DeviceManager.ModifyCloudToDeviceConfig` method.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceConfig config = 13;
+   */
+  public boolean hasConfig() {
+    return config_ != null;
+  }
+  /**
+   * 
+   * The most recent device configuration, which is eventually sent from
+   * Cloud IoT Core to the device. If not present on creation, the
+   * configuration will be initialized with an empty payload and version value
+   * of `1`. To update this field after creation, use the
+   * `DeviceManager.ModifyCloudToDeviceConfig` method.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceConfig config = 13;
+   */
+  public com.google.cloud.iot.v1.DeviceConfig getConfig() {
+    return config_ == null ? com.google.cloud.iot.v1.DeviceConfig.getDefaultInstance() : config_;
+  }
+  /**
+   * 
+   * The most recent device configuration, which is eventually sent from
+   * Cloud IoT Core to the device. If not present on creation, the
+   * configuration will be initialized with an empty payload and version value
+   * of `1`. To update this field after creation, use the
+   * `DeviceManager.ModifyCloudToDeviceConfig` method.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceConfig config = 13;
+   */
+  public com.google.cloud.iot.v1.DeviceConfigOrBuilder getConfigOrBuilder() {
+    return getConfig();
+  }
+
+  public static final int STATE_FIELD_NUMBER = 16;
+  private com.google.cloud.iot.v1.DeviceState state_;
+  /**
+   * 
+   * [Output only] The state most recently received from the device. If no state
+   * has been reported, this field is not present.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceState state = 16;
+   */
+  public boolean hasState() {
+    return state_ != null;
+  }
+  /**
+   * 
+   * [Output only] The state most recently received from the device. If no state
+   * has been reported, this field is not present.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceState state = 16;
+   */
+  public com.google.cloud.iot.v1.DeviceState getState() {
+    return state_ == null ? com.google.cloud.iot.v1.DeviceState.getDefaultInstance() : state_;
+  }
+  /**
+   * 
+   * [Output only] The state most recently received from the device. If no state
+   * has been reported, this field is not present.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceState state = 16;
+   */
+  public com.google.cloud.iot.v1.DeviceStateOrBuilder getStateOrBuilder() {
+    return getState();
+  }
+
+  public static final int METADATA_FIELD_NUMBER = 17;
+  private static final class MetadataDefaultEntryHolder {
+    static final com.google.protobuf.MapEntry<
+        java.lang.String, java.lang.String> defaultEntry =
+            com.google.protobuf.MapEntry
+            .newDefaultInstance(
+                com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_Device_MetadataEntry_descriptor, 
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "",
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "");
+  }
+  private com.google.protobuf.MapField<
+      java.lang.String, java.lang.String> metadata_;
+  private com.google.protobuf.MapField
+  internalGetMetadata() {
+    if (metadata_ == null) {
+      return com.google.protobuf.MapField.emptyMapField(
+          MetadataDefaultEntryHolder.defaultEntry);
+    }
+    return metadata_;
+  }
+
+  public int getMetadataCount() {
+    return internalGetMetadata().getMap().size();
+  }
+  /**
+   * 
+   * The metadata key-value pairs assigned to the device. This metadata is not
+   * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+   * information for the device.
+   * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+   * be less than 128 bytes in length.
+   * Values are free-form strings. Each value must be less than or equal to 32
+   * KB in size.
+   * The total size of all keys and values must be less than 256 KB, and the
+   * maximum number of key-value pairs is 500.
+   * 

+   *
+   * map<string, string> metadata = 17;
+   */
+
+  public boolean containsMetadata(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    return internalGetMetadata().getMap().containsKey(key);
+  }
+  /**
+   * Use {@link #getMetadataMap()} instead.
+   */
+  @java.lang.Deprecated
+  public java.util.Map getMetadata() {
+    return getMetadataMap();
+  }
+  /**
+   * 
+   * The metadata key-value pairs assigned to the device. This metadata is not
+   * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+   * information for the device.
+   * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+   * be less than 128 bytes in length.
+   * Values are free-form strings. Each value must be less than or equal to 32
+   * KB in size.
+   * The total size of all keys and values must be less than 256 KB, and the
+   * maximum number of key-value pairs is 500.
+   * 

+   *
+   * map<string, string> metadata = 17;
+   */
+
+  public java.util.Map getMetadataMap() {
+    return internalGetMetadata().getMap();
+  }
+  /**
+   * 
+   * The metadata key-value pairs assigned to the device. This metadata is not
+   * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+   * information for the device.
+   * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+   * be less than 128 bytes in length.
+   * Values are free-form strings. Each value must be less than or equal to 32
+   * KB in size.
+   * The total size of all keys and values must be less than 256 KB, and the
+   * maximum number of key-value pairs is 500.
+   * 

+   *
+   * map<string, string> metadata = 17;
+   */
+
+  public java.lang.String getMetadataOrDefault(
+      java.lang.String key,
+      java.lang.String defaultValue) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    java.util.Map map =
+        internalGetMetadata().getMap();
+    return map.containsKey(key) ? map.get(key) : defaultValue;
+  }
+  /**
+   * 
+   * The metadata key-value pairs assigned to the device. This metadata is not
+   * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+   * information for the device.
+   * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+   * be less than 128 bytes in length.
+   * Values are free-form strings. Each value must be less than or equal to 32
+   * KB in size.
+   * The total size of all keys and values must be less than 256 KB, and the
+   * maximum number of key-value pairs is 500.
+   * 

+   *
+   * map<string, string> metadata = 17;
+   */
+
+  public java.lang.String getMetadataOrThrow(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    java.util.Map map =
+        internalGetMetadata().getMap();
+    if (!map.containsKey(key)) {
+      throw new java.lang.IllegalArgumentException();
+    }
+    return map.get(key);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getIdBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
+    }
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_);
+    }
+    if (numId_ != 0L) {
+      output.writeUInt64(3, numId_);
+    }
+    if (lastHeartbeatTime_ != null) {
+      output.writeMessage(7, getLastHeartbeatTime());
+    }
+    if (lastEventTime_ != null) {
+      output.writeMessage(8, getLastEventTime());
+    }
+    if (lastErrorTime_ != null) {
+      output.writeMessage(10, getLastErrorTime());
+    }
+    if (lastErrorStatus_ != null) {
+      output.writeMessage(11, getLastErrorStatus());
+    }
+    for (int i = 0; i < credentials_.size(); i++) {
+      output.writeMessage(12, credentials_.get(i));
+    }
+    if (config_ != null) {
+      output.writeMessage(13, getConfig());
+    }
+    if (lastConfigAckTime_ != null) {
+      output.writeMessage(14, getLastConfigAckTime());
+    }
+    if (state_ != null) {
+      output.writeMessage(16, getState());
+    }
+    com.google.protobuf.GeneratedMessageV3
+      .serializeStringMapTo(
+        output,
+        internalGetMetadata(),
+        MetadataDefaultEntryHolder.defaultEntry,
+        17);
+    if (lastConfigSendTime_ != null) {
+      output.writeMessage(18, getLastConfigSendTime());
+    }
+    if (blocked_ != false) {
+      output.writeBool(19, blocked_);
+    }
+    if (lastStateTime_ != null) {
+      output.writeMessage(20, getLastStateTime());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getIdBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
+    }
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_);
+    }
+    if (numId_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeUInt64Size(3, numId_);
+    }
+    if (lastHeartbeatTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(7, getLastHeartbeatTime());
+    }
+    if (lastEventTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(8, getLastEventTime());
+    }
+    if (lastErrorTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(10, getLastErrorTime());
+    }
+    if (lastErrorStatus_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(11, getLastErrorStatus());
+    }
+    for (int i = 0; i < credentials_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(12, credentials_.get(i));
+    }
+    if (config_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(13, getConfig());
+    }
+    if (lastConfigAckTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(14, getLastConfigAckTime());
+    }
+    if (state_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(16, getState());
+    }
+    for (java.util.Map.Entry entry
+         : internalGetMetadata().getMap().entrySet()) {
+      com.google.protobuf.MapEntry
+      metadata__ = MetadataDefaultEntryHolder.defaultEntry.newBuilderForType()
+          .setKey(entry.getKey())
+          .setValue(entry.getValue())
+          .build();
+      size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(17, metadata__);
+    }
+    if (lastConfigSendTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(18, getLastConfigSendTime());
+    }
+    if (blocked_ != false) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(19, blocked_);
+    }
+    if (lastStateTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(20, getLastStateTime());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.Device)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.Device other = (com.google.cloud.iot.v1.Device) obj;
+
+    boolean result = true;
+    result = result && getId()
+        .equals(other.getId());
+    result = result && getName()
+        .equals(other.getName());
+    result = result && (getNumId()
+        == other.getNumId());
+    result = result && getCredentialsList()
+        .equals(other.getCredentialsList());
+    result = result && (hasLastHeartbeatTime() == other.hasLastHeartbeatTime());
+    if (hasLastHeartbeatTime()) {
+      result = result && getLastHeartbeatTime()
+          .equals(other.getLastHeartbeatTime());
+    }
+    result = result && (hasLastEventTime() == other.hasLastEventTime());
+    if (hasLastEventTime()) {
+      result = result && getLastEventTime()
+          .equals(other.getLastEventTime());
+    }
+    result = result && (hasLastStateTime() == other.hasLastStateTime());
+    if (hasLastStateTime()) {
+      result = result && getLastStateTime()
+          .equals(other.getLastStateTime());
+    }
+    result = result && (hasLastConfigAckTime() == other.hasLastConfigAckTime());
+    if (hasLastConfigAckTime()) {
+      result = result && getLastConfigAckTime()
+          .equals(other.getLastConfigAckTime());
+    }
+    result = result && (hasLastConfigSendTime() == other.hasLastConfigSendTime());
+    if (hasLastConfigSendTime()) {
+      result = result && getLastConfigSendTime()
+          .equals(other.getLastConfigSendTime());
+    }
+    result = result && (getBlocked()
+        == other.getBlocked());
+    result = result && (hasLastErrorTime() == other.hasLastErrorTime());
+    if (hasLastErrorTime()) {
+      result = result && getLastErrorTime()
+          .equals(other.getLastErrorTime());
+    }
+    result = result && (hasLastErrorStatus() == other.hasLastErrorStatus());
+    if (hasLastErrorStatus()) {
+      result = result && getLastErrorStatus()
+          .equals(other.getLastErrorStatus());
+    }
+    result = result && (hasConfig() == other.hasConfig());
+    if (hasConfig()) {
+      result = result && getConfig()
+          .equals(other.getConfig());
+    }
+    result = result && (hasState() == other.hasState());
+    if (hasState()) {
+      result = result && getState()
+          .equals(other.getState());
+    }
+    result = result && internalGetMetadata().equals(
+        other.internalGetMetadata());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + ID_FIELD_NUMBER;
+    hash = (53 * hash) + getId().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (37 * hash) + NUM_ID_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getNumId());
+    if (getCredentialsCount() > 0) {
+      hash = (37 * hash) + CREDENTIALS_FIELD_NUMBER;
+      hash = (53 * hash) + getCredentialsList().hashCode();
+    }
+    if (hasLastHeartbeatTime()) {
+      hash = (37 * hash) + LAST_HEARTBEAT_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getLastHeartbeatTime().hashCode();
+    }
+    if (hasLastEventTime()) {
+      hash = (37 * hash) + LAST_EVENT_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getLastEventTime().hashCode();
+    }
+    if (hasLastStateTime()) {
+      hash = (37 * hash) + LAST_STATE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getLastStateTime().hashCode();
+    }
+    if (hasLastConfigAckTime()) {
+      hash = (37 * hash) + LAST_CONFIG_ACK_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getLastConfigAckTime().hashCode();
+    }
+    if (hasLastConfigSendTime()) {
+      hash = (37 * hash) + LAST_CONFIG_SEND_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getLastConfigSendTime().hashCode();
+    }
+    hash = (37 * hash) + BLOCKED_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getBlocked());
+    if (hasLastErrorTime()) {
+      hash = (37 * hash) + LAST_ERROR_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getLastErrorTime().hashCode();
+    }
+    if (hasLastErrorStatus()) {
+      hash = (37 * hash) + LAST_ERROR_STATUS_FIELD_NUMBER;
+      hash = (53 * hash) + getLastErrorStatus().hashCode();
+    }
+    if (hasConfig()) {
+      hash = (37 * hash) + CONFIG_FIELD_NUMBER;
+      hash = (53 * hash) + getConfig().hashCode();
+    }
+    if (hasState()) {
+      hash = (37 * hash) + STATE_FIELD_NUMBER;
+      hash = (53 * hash) + getState().hashCode();
+    }
+    if (!internalGetMetadata().getMap().isEmpty()) {
+      hash = (37 * hash) + METADATA_FIELD_NUMBER;
+      hash = (53 * hash) + internalGetMetadata().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.Device parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.Device parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.Device parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.Device parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.Device parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.Device parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.Device parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.Device parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.Device parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.Device parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.Device parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.Device parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.Device prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * The device resource.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.Device}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.Device)
+      com.google.cloud.iot.v1.DeviceOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_Device_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMapField(
+        int number) {
+      switch (number) {
+        case 17:
+          return internalGetMetadata();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMutableMapField(
+        int number) {
+      switch (number) {
+        case 17:
+          return internalGetMutableMetadata();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_Device_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.Device.class, com.google.cloud.iot.v1.Device.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.Device.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getCredentialsFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      id_ = "";
+
+      name_ = "";
+
+      numId_ = 0L;
+
+      if (credentialsBuilder_ == null) {
+        credentials_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000008);
+      } else {
+        credentialsBuilder_.clear();
+      }
+      if (lastHeartbeatTimeBuilder_ == null) {
+        lastHeartbeatTime_ = null;
+      } else {
+        lastHeartbeatTime_ = null;
+        lastHeartbeatTimeBuilder_ = null;
+      }
+      if (lastEventTimeBuilder_ == null) {
+        lastEventTime_ = null;
+      } else {
+        lastEventTime_ = null;
+        lastEventTimeBuilder_ = null;
+      }
+      if (lastStateTimeBuilder_ == null) {
+        lastStateTime_ = null;
+      } else {
+        lastStateTime_ = null;
+        lastStateTimeBuilder_ = null;
+      }
+      if (lastConfigAckTimeBuilder_ == null) {
+        lastConfigAckTime_ = null;
+      } else {
+        lastConfigAckTime_ = null;
+        lastConfigAckTimeBuilder_ = null;
+      }
+      if (lastConfigSendTimeBuilder_ == null) {
+        lastConfigSendTime_ = null;
+      } else {
+        lastConfigSendTime_ = null;
+        lastConfigSendTimeBuilder_ = null;
+      }
+      blocked_ = false;
+
+      if (lastErrorTimeBuilder_ == null) {
+        lastErrorTime_ = null;
+      } else {
+        lastErrorTime_ = null;
+        lastErrorTimeBuilder_ = null;
+      }
+      if (lastErrorStatusBuilder_ == null) {
+        lastErrorStatus_ = null;
+      } else {
+        lastErrorStatus_ = null;
+        lastErrorStatusBuilder_ = null;
+      }
+      if (configBuilder_ == null) {
+        config_ = null;
+      } else {
+        config_ = null;
+        configBuilder_ = null;
+      }
+      if (stateBuilder_ == null) {
+        state_ = null;
+      } else {
+        state_ = null;
+        stateBuilder_ = null;
+      }
+      internalGetMutableMetadata().clear();
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_Device_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.Device getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.Device.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.Device build() {
+      com.google.cloud.iot.v1.Device result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.Device buildPartial() {
+      com.google.cloud.iot.v1.Device result = new com.google.cloud.iot.v1.Device(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      result.id_ = id_;
+      result.name_ = name_;
+      result.numId_ = numId_;
+      if (credentialsBuilder_ == null) {
+        if (((bitField0_ & 0x00000008) == 0x00000008)) {
+          credentials_ = java.util.Collections.unmodifiableList(credentials_);
+          bitField0_ = (bitField0_ & ~0x00000008);
+        }
+        result.credentials_ = credentials_;
+      } else {
+        result.credentials_ = credentialsBuilder_.build();
+      }
+      if (lastHeartbeatTimeBuilder_ == null) {
+        result.lastHeartbeatTime_ = lastHeartbeatTime_;
+      } else {
+        result.lastHeartbeatTime_ = lastHeartbeatTimeBuilder_.build();
+      }
+      if (lastEventTimeBuilder_ == null) {
+        result.lastEventTime_ = lastEventTime_;
+      } else {
+        result.lastEventTime_ = lastEventTimeBuilder_.build();
+      }
+      if (lastStateTimeBuilder_ == null) {
+        result.lastStateTime_ = lastStateTime_;
+      } else {
+        result.lastStateTime_ = lastStateTimeBuilder_.build();
+      }
+      if (lastConfigAckTimeBuilder_ == null) {
+        result.lastConfigAckTime_ = lastConfigAckTime_;
+      } else {
+        result.lastConfigAckTime_ = lastConfigAckTimeBuilder_.build();
+      }
+      if (lastConfigSendTimeBuilder_ == null) {
+        result.lastConfigSendTime_ = lastConfigSendTime_;
+      } else {
+        result.lastConfigSendTime_ = lastConfigSendTimeBuilder_.build();
+      }
+      result.blocked_ = blocked_;
+      if (lastErrorTimeBuilder_ == null) {
+        result.lastErrorTime_ = lastErrorTime_;
+      } else {
+        result.lastErrorTime_ = lastErrorTimeBuilder_.build();
+      }
+      if (lastErrorStatusBuilder_ == null) {
+        result.lastErrorStatus_ = lastErrorStatus_;
+      } else {
+        result.lastErrorStatus_ = lastErrorStatusBuilder_.build();
+      }
+      if (configBuilder_ == null) {
+        result.config_ = config_;
+      } else {
+        result.config_ = configBuilder_.build();
+      }
+      if (stateBuilder_ == null) {
+        result.state_ = state_;
+      } else {
+        result.state_ = stateBuilder_.build();
+      }
+      result.metadata_ = internalGetMetadata();
+      result.metadata_.makeImmutable();
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.Device) {
+        return mergeFrom((com.google.cloud.iot.v1.Device)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.Device other) {
+      if (other == com.google.cloud.iot.v1.Device.getDefaultInstance()) return this;
+      if (!other.getId().isEmpty()) {
+        id_ = other.id_;
+        onChanged();
+      }
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (other.getNumId() != 0L) {
+        setNumId(other.getNumId());
+      }
+      if (credentialsBuilder_ == null) {
+        if (!other.credentials_.isEmpty()) {
+          if (credentials_.isEmpty()) {
+            credentials_ = other.credentials_;
+            bitField0_ = (bitField0_ & ~0x00000008);
+          } else {
+            ensureCredentialsIsMutable();
+            credentials_.addAll(other.credentials_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.credentials_.isEmpty()) {
+          if (credentialsBuilder_.isEmpty()) {
+            credentialsBuilder_.dispose();
+            credentialsBuilder_ = null;
+            credentials_ = other.credentials_;
+            bitField0_ = (bitField0_ & ~0x00000008);
+            credentialsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getCredentialsFieldBuilder() : null;
+          } else {
+            credentialsBuilder_.addAllMessages(other.credentials_);
+          }
+        }
+      }
+      if (other.hasLastHeartbeatTime()) {
+        mergeLastHeartbeatTime(other.getLastHeartbeatTime());
+      }
+      if (other.hasLastEventTime()) {
+        mergeLastEventTime(other.getLastEventTime());
+      }
+      if (other.hasLastStateTime()) {
+        mergeLastStateTime(other.getLastStateTime());
+      }
+      if (other.hasLastConfigAckTime()) {
+        mergeLastConfigAckTime(other.getLastConfigAckTime());
+      }
+      if (other.hasLastConfigSendTime()) {
+        mergeLastConfigSendTime(other.getLastConfigSendTime());
+      }
+      if (other.getBlocked() != false) {
+        setBlocked(other.getBlocked());
+      }
+      if (other.hasLastErrorTime()) {
+        mergeLastErrorTime(other.getLastErrorTime());
+      }
+      if (other.hasLastErrorStatus()) {
+        mergeLastErrorStatus(other.getLastErrorStatus());
+      }
+      if (other.hasConfig()) {
+        mergeConfig(other.getConfig());
+      }
+      if (other.hasState()) {
+        mergeState(other.getState());
+      }
+      internalGetMutableMetadata().mergeFrom(
+          other.internalGetMetadata());
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.Device parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.Device) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.lang.Object id_ = "";
+    /**
+     * 
+     * The user-defined device identifier. The device ID must be unique
+     * within a device registry.
+     * 

+     *
+     * string id = 1;
+     */
+    public java.lang.String getId() {
+      java.lang.Object ref = id_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        id_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The user-defined device identifier. The device ID must be unique
+     * within a device registry.
+     * 

+     *
+     * string id = 1;
+     */
+    public com.google.protobuf.ByteString
+        getIdBytes() {
+      java.lang.Object ref = id_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        id_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The user-defined device identifier. The device ID must be unique
+     * within a device registry.
+     * 

+     *
+     * string id = 1;
+     */
+    public Builder setId(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      id_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The user-defined device identifier. The device ID must be unique
+     * within a device registry.
+     * 

+     *
+     * string id = 1;
+     */
+    public Builder clearId() {
+      
+      id_ = getDefaultInstance().getId();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The user-defined device identifier. The device ID must be unique
+     * within a device registry.
+     * 

+     *
+     * string id = 1;
+     */
+    public Builder setIdBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      id_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * The resource path name. For example,
+     * `projects/p1/locations/us-central1/registries/registry0/devices/dev0` or
+     * `projects/p1/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * When `name` is populated as a response from the service, it always ends
+     * in the device numeric ID.
+     * 

+     *
+     * string name = 2;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The resource path name. For example,
+     * `projects/p1/locations/us-central1/registries/registry0/devices/dev0` or
+     * `projects/p1/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * When `name` is populated as a response from the service, it always ends
+     * in the device numeric ID.
+     * 

+     *
+     * string name = 2;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The resource path name. For example,
+     * `projects/p1/locations/us-central1/registries/registry0/devices/dev0` or
+     * `projects/p1/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * When `name` is populated as a response from the service, it always ends
+     * in the device numeric ID.
+     * 

+     *
+     * string name = 2;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The resource path name. For example,
+     * `projects/p1/locations/us-central1/registries/registry0/devices/dev0` or
+     * `projects/p1/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * When `name` is populated as a response from the service, it always ends
+     * in the device numeric ID.
+     * 

+     *
+     * string name = 2;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The resource path name. For example,
+     * `projects/p1/locations/us-central1/registries/registry0/devices/dev0` or
+     * `projects/p1/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * When `name` is populated as a response from the service, it always ends
+     * in the device numeric ID.
+     * 

+     *
+     * string name = 2;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private long numId_ ;
+    /**
+     * 
+     * [Output only] A server-defined unique numeric ID for the device. This is a
+     * more compact way to identify devices, and it is globally unique.
+     * 

+     *
+     * uint64 num_id = 3;
+     */
+    public long getNumId() {
+      return numId_;
+    }
+    /**
+     * 
+     * [Output only] A server-defined unique numeric ID for the device. This is a
+     * more compact way to identify devices, and it is globally unique.
+     * 

+     *
+     * uint64 num_id = 3;
+     */
+    public Builder setNumId(long value) {
+      
+      numId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * [Output only] A server-defined unique numeric ID for the device. This is a
+     * more compact way to identify devices, and it is globally unique.
+     * 

+     *
+     * uint64 num_id = 3;
+     */
+    public Builder clearNumId() {
+      
+      numId_ = 0L;
+      onChanged();
+      return this;
+    }
+
+    private java.util.List credentials_ =
+      java.util.Collections.emptyList();
+    private void ensureCredentialsIsMutable() {
+      if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+        credentials_ = new java.util.ArrayList(credentials_);
+        bitField0_ |= 0x00000008;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceCredential, com.google.cloud.iot.v1.DeviceCredential.Builder, com.google.cloud.iot.v1.DeviceCredentialOrBuilder> credentialsBuilder_;
+
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public java.util.List getCredentialsList() {
+      if (credentialsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(credentials_);
+      } else {
+        return credentialsBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public int getCredentialsCount() {
+      if (credentialsBuilder_ == null) {
+        return credentials_.size();
+      } else {
+        return credentialsBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public com.google.cloud.iot.v1.DeviceCredential getCredentials(int index) {
+      if (credentialsBuilder_ == null) {
+        return credentials_.get(index);
+      } else {
+        return credentialsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public Builder setCredentials(
+        int index, com.google.cloud.iot.v1.DeviceCredential value) {
+      if (credentialsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureCredentialsIsMutable();
+        credentials_.set(index, value);
+        onChanged();
+      } else {
+        credentialsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public Builder setCredentials(
+        int index, com.google.cloud.iot.v1.DeviceCredential.Builder builderForValue) {
+      if (credentialsBuilder_ == null) {
+        ensureCredentialsIsMutable();
+        credentials_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        credentialsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public Builder addCredentials(com.google.cloud.iot.v1.DeviceCredential value) {
+      if (credentialsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureCredentialsIsMutable();
+        credentials_.add(value);
+        onChanged();
+      } else {
+        credentialsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public Builder addCredentials(
+        int index, com.google.cloud.iot.v1.DeviceCredential value) {
+      if (credentialsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureCredentialsIsMutable();
+        credentials_.add(index, value);
+        onChanged();
+      } else {
+        credentialsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public Builder addCredentials(
+        com.google.cloud.iot.v1.DeviceCredential.Builder builderForValue) {
+      if (credentialsBuilder_ == null) {
+        ensureCredentialsIsMutable();
+        credentials_.add(builderForValue.build());
+        onChanged();
+      } else {
+        credentialsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public Builder addCredentials(
+        int index, com.google.cloud.iot.v1.DeviceCredential.Builder builderForValue) {
+      if (credentialsBuilder_ == null) {
+        ensureCredentialsIsMutable();
+        credentials_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        credentialsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public Builder addAllCredentials(
+        java.lang.Iterable values) {
+      if (credentialsBuilder_ == null) {
+        ensureCredentialsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, credentials_);
+        onChanged();
+      } else {
+        credentialsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public Builder clearCredentials() {
+      if (credentialsBuilder_ == null) {
+        credentials_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000008);
+        onChanged();
+      } else {
+        credentialsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public Builder removeCredentials(int index) {
+      if (credentialsBuilder_ == null) {
+        ensureCredentialsIsMutable();
+        credentials_.remove(index);
+        onChanged();
+      } else {
+        credentialsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public com.google.cloud.iot.v1.DeviceCredential.Builder getCredentialsBuilder(
+        int index) {
+      return getCredentialsFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public com.google.cloud.iot.v1.DeviceCredentialOrBuilder getCredentialsOrBuilder(
+        int index) {
+      if (credentialsBuilder_ == null) {
+        return credentials_.get(index);  } else {
+        return credentialsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public java.util.List 
+         getCredentialsOrBuilderList() {
+      if (credentialsBuilder_ != null) {
+        return credentialsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(credentials_);
+      }
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public com.google.cloud.iot.v1.DeviceCredential.Builder addCredentialsBuilder() {
+      return getCredentialsFieldBuilder().addBuilder(
+          com.google.cloud.iot.v1.DeviceCredential.getDefaultInstance());
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public com.google.cloud.iot.v1.DeviceCredential.Builder addCredentialsBuilder(
+        int index) {
+      return getCredentialsFieldBuilder().addBuilder(
+          index, com.google.cloud.iot.v1.DeviceCredential.getDefaultInstance());
+    }
+    /**
+     * 
+     * The credentials used to authenticate this device. To allow credential
+     * rotation without interruption, multiple device credentials can be bound to
+     * this device. No more than 3 credentials can be bound to a single device at
+     * a time. When new credentials are added to a device, they are verified
+     * against the registry credentials. For details, see the description of the
+     * `DeviceRegistry.credentials` field.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+     */
+    public java.util.List 
+         getCredentialsBuilderList() {
+      return getCredentialsFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceCredential, com.google.cloud.iot.v1.DeviceCredential.Builder, com.google.cloud.iot.v1.DeviceCredentialOrBuilder> 
+        getCredentialsFieldBuilder() {
+      if (credentialsBuilder_ == null) {
+        credentialsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.iot.v1.DeviceCredential, com.google.cloud.iot.v1.DeviceCredential.Builder, com.google.cloud.iot.v1.DeviceCredentialOrBuilder>(
+                credentials_,
+                ((bitField0_ & 0x00000008) == 0x00000008),
+                getParentForChildren(),
+                isClean());
+        credentials_ = null;
+      }
+      return credentialsBuilder_;
+    }
+
+    private com.google.protobuf.Timestamp lastHeartbeatTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> lastHeartbeatTimeBuilder_;
+    /**
+     * 
+     * [Output only] The last time an MQTT `PINGREQ` was received. This field
+     * applies only to devices connecting through MQTT. MQTT clients usually only
+     * send `PINGREQ` messages if the connection is idle, and no other messages
+     * have been sent. Timestamps are periodically collected and written to
+     * storage; they may be stale by a few minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_heartbeat_time = 7;
+     */
+    public boolean hasLastHeartbeatTime() {
+      return lastHeartbeatTimeBuilder_ != null || lastHeartbeatTime_ != null;
+    }
+    /**
+     * 
+     * [Output only] The last time an MQTT `PINGREQ` was received. This field
+     * applies only to devices connecting through MQTT. MQTT clients usually only
+     * send `PINGREQ` messages if the connection is idle, and no other messages
+     * have been sent. Timestamps are periodically collected and written to
+     * storage; they may be stale by a few minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_heartbeat_time = 7;
+     */
+    public com.google.protobuf.Timestamp getLastHeartbeatTime() {
+      if (lastHeartbeatTimeBuilder_ == null) {
+        return lastHeartbeatTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : lastHeartbeatTime_;
+      } else {
+        return lastHeartbeatTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Output only] The last time an MQTT `PINGREQ` was received. This field
+     * applies only to devices connecting through MQTT. MQTT clients usually only
+     * send `PINGREQ` messages if the connection is idle, and no other messages
+     * have been sent. Timestamps are periodically collected and written to
+     * storage; they may be stale by a few minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_heartbeat_time = 7;
+     */
+    public Builder setLastHeartbeatTime(com.google.protobuf.Timestamp value) {
+      if (lastHeartbeatTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        lastHeartbeatTime_ = value;
+        onChanged();
+      } else {
+        lastHeartbeatTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time an MQTT `PINGREQ` was received. This field
+     * applies only to devices connecting through MQTT. MQTT clients usually only
+     * send `PINGREQ` messages if the connection is idle, and no other messages
+     * have been sent. Timestamps are periodically collected and written to
+     * storage; they may be stale by a few minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_heartbeat_time = 7;
+     */
+    public Builder setLastHeartbeatTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (lastHeartbeatTimeBuilder_ == null) {
+        lastHeartbeatTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        lastHeartbeatTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time an MQTT `PINGREQ` was received. This field
+     * applies only to devices connecting through MQTT. MQTT clients usually only
+     * send `PINGREQ` messages if the connection is idle, and no other messages
+     * have been sent. Timestamps are periodically collected and written to
+     * storage; they may be stale by a few minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_heartbeat_time = 7;
+     */
+    public Builder mergeLastHeartbeatTime(com.google.protobuf.Timestamp value) {
+      if (lastHeartbeatTimeBuilder_ == null) {
+        if (lastHeartbeatTime_ != null) {
+          lastHeartbeatTime_ =
+            com.google.protobuf.Timestamp.newBuilder(lastHeartbeatTime_).mergeFrom(value).buildPartial();
+        } else {
+          lastHeartbeatTime_ = value;
+        }
+        onChanged();
+      } else {
+        lastHeartbeatTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time an MQTT `PINGREQ` was received. This field
+     * applies only to devices connecting through MQTT. MQTT clients usually only
+     * send `PINGREQ` messages if the connection is idle, and no other messages
+     * have been sent. Timestamps are periodically collected and written to
+     * storage; they may be stale by a few minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_heartbeat_time = 7;
+     */
+    public Builder clearLastHeartbeatTime() {
+      if (lastHeartbeatTimeBuilder_ == null) {
+        lastHeartbeatTime_ = null;
+        onChanged();
+      } else {
+        lastHeartbeatTime_ = null;
+        lastHeartbeatTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time an MQTT `PINGREQ` was received. This field
+     * applies only to devices connecting through MQTT. MQTT clients usually only
+     * send `PINGREQ` messages if the connection is idle, and no other messages
+     * have been sent. Timestamps are periodically collected and written to
+     * storage; they may be stale by a few minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_heartbeat_time = 7;
+     */
+    public com.google.protobuf.Timestamp.Builder getLastHeartbeatTimeBuilder() {
+      
+      onChanged();
+      return getLastHeartbeatTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Output only] The last time an MQTT `PINGREQ` was received. This field
+     * applies only to devices connecting through MQTT. MQTT clients usually only
+     * send `PINGREQ` messages if the connection is idle, and no other messages
+     * have been sent. Timestamps are periodically collected and written to
+     * storage; they may be stale by a few minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_heartbeat_time = 7;
+     */
+    public com.google.protobuf.TimestampOrBuilder getLastHeartbeatTimeOrBuilder() {
+      if (lastHeartbeatTimeBuilder_ != null) {
+        return lastHeartbeatTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return lastHeartbeatTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : lastHeartbeatTime_;
+      }
+    }
+    /**
+     * 
+     * [Output only] The last time an MQTT `PINGREQ` was received. This field
+     * applies only to devices connecting through MQTT. MQTT clients usually only
+     * send `PINGREQ` messages if the connection is idle, and no other messages
+     * have been sent. Timestamps are periodically collected and written to
+     * storage; they may be stale by a few minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_heartbeat_time = 7;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getLastHeartbeatTimeFieldBuilder() {
+      if (lastHeartbeatTimeBuilder_ == null) {
+        lastHeartbeatTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getLastHeartbeatTime(),
+                getParentForChildren(),
+                isClean());
+        lastHeartbeatTime_ = null;
+      }
+      return lastHeartbeatTimeBuilder_;
+    }
+
+    private com.google.protobuf.Timestamp lastEventTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> lastEventTimeBuilder_;
+    /**
+     * 
+     * [Output only] The last time a telemetry event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_event_time = 8;
+     */
+    public boolean hasLastEventTime() {
+      return lastEventTimeBuilder_ != null || lastEventTime_ != null;
+    }
+    /**
+     * 
+     * [Output only] The last time a telemetry event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_event_time = 8;
+     */
+    public com.google.protobuf.Timestamp getLastEventTime() {
+      if (lastEventTimeBuilder_ == null) {
+        return lastEventTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : lastEventTime_;
+      } else {
+        return lastEventTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Output only] The last time a telemetry event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_event_time = 8;
+     */
+    public Builder setLastEventTime(com.google.protobuf.Timestamp value) {
+      if (lastEventTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        lastEventTime_ = value;
+        onChanged();
+      } else {
+        lastEventTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a telemetry event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_event_time = 8;
+     */
+    public Builder setLastEventTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (lastEventTimeBuilder_ == null) {
+        lastEventTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        lastEventTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a telemetry event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_event_time = 8;
+     */
+    public Builder mergeLastEventTime(com.google.protobuf.Timestamp value) {
+      if (lastEventTimeBuilder_ == null) {
+        if (lastEventTime_ != null) {
+          lastEventTime_ =
+            com.google.protobuf.Timestamp.newBuilder(lastEventTime_).mergeFrom(value).buildPartial();
+        } else {
+          lastEventTime_ = value;
+        }
+        onChanged();
+      } else {
+        lastEventTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a telemetry event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_event_time = 8;
+     */
+    public Builder clearLastEventTime() {
+      if (lastEventTimeBuilder_ == null) {
+        lastEventTime_ = null;
+        onChanged();
+      } else {
+        lastEventTime_ = null;
+        lastEventTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a telemetry event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_event_time = 8;
+     */
+    public com.google.protobuf.Timestamp.Builder getLastEventTimeBuilder() {
+      
+      onChanged();
+      return getLastEventTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Output only] The last time a telemetry event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_event_time = 8;
+     */
+    public com.google.protobuf.TimestampOrBuilder getLastEventTimeOrBuilder() {
+      if (lastEventTimeBuilder_ != null) {
+        return lastEventTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return lastEventTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : lastEventTime_;
+      }
+    }
+    /**
+     * 
+     * [Output only] The last time a telemetry event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_event_time = 8;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getLastEventTimeFieldBuilder() {
+      if (lastEventTimeBuilder_ == null) {
+        lastEventTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getLastEventTime(),
+                getParentForChildren(),
+                isClean());
+        lastEventTime_ = null;
+      }
+      return lastEventTimeBuilder_;
+    }
+
+    private com.google.protobuf.Timestamp lastStateTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> lastStateTimeBuilder_;
+    /**
+     * 
+     * [Output only] The last time a state event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_state_time = 20;
+     */
+    public boolean hasLastStateTime() {
+      return lastStateTimeBuilder_ != null || lastStateTime_ != null;
+    }
+    /**
+     * 
+     * [Output only] The last time a state event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_state_time = 20;
+     */
+    public com.google.protobuf.Timestamp getLastStateTime() {
+      if (lastStateTimeBuilder_ == null) {
+        return lastStateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : lastStateTime_;
+      } else {
+        return lastStateTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Output only] The last time a state event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_state_time = 20;
+     */
+    public Builder setLastStateTime(com.google.protobuf.Timestamp value) {
+      if (lastStateTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        lastStateTime_ = value;
+        onChanged();
+      } else {
+        lastStateTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a state event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_state_time = 20;
+     */
+    public Builder setLastStateTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (lastStateTimeBuilder_ == null) {
+        lastStateTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        lastStateTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a state event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_state_time = 20;
+     */
+    public Builder mergeLastStateTime(com.google.protobuf.Timestamp value) {
+      if (lastStateTimeBuilder_ == null) {
+        if (lastStateTime_ != null) {
+          lastStateTime_ =
+            com.google.protobuf.Timestamp.newBuilder(lastStateTime_).mergeFrom(value).buildPartial();
+        } else {
+          lastStateTime_ = value;
+        }
+        onChanged();
+      } else {
+        lastStateTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a state event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_state_time = 20;
+     */
+    public Builder clearLastStateTime() {
+      if (lastStateTimeBuilder_ == null) {
+        lastStateTime_ = null;
+        onChanged();
+      } else {
+        lastStateTime_ = null;
+        lastStateTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a state event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_state_time = 20;
+     */
+    public com.google.protobuf.Timestamp.Builder getLastStateTimeBuilder() {
+      
+      onChanged();
+      return getLastStateTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Output only] The last time a state event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_state_time = 20;
+     */
+    public com.google.protobuf.TimestampOrBuilder getLastStateTimeOrBuilder() {
+      if (lastStateTimeBuilder_ != null) {
+        return lastStateTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return lastStateTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : lastStateTime_;
+      }
+    }
+    /**
+     * 
+     * [Output only] The last time a state event was received. Timestamps are
+     * periodically collected and written to storage; they may be stale by a few
+     * minutes.
+     * 

+     *
+     * .google.protobuf.Timestamp last_state_time = 20;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getLastStateTimeFieldBuilder() {
+      if (lastStateTimeBuilder_ == null) {
+        lastStateTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getLastStateTime(),
+                getParentForChildren(),
+                isClean());
+        lastStateTime_ = null;
+      }
+      return lastStateTimeBuilder_;
+    }
+
+    private com.google.protobuf.Timestamp lastConfigAckTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> lastConfigAckTimeBuilder_;
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version acknowledgment
+     * was received from the device. This field is only for configurations
+     * sent through MQTT.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_ack_time = 14;
+     */
+    public boolean hasLastConfigAckTime() {
+      return lastConfigAckTimeBuilder_ != null || lastConfigAckTime_ != null;
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version acknowledgment
+     * was received from the device. This field is only for configurations
+     * sent through MQTT.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_ack_time = 14;
+     */
+    public com.google.protobuf.Timestamp getLastConfigAckTime() {
+      if (lastConfigAckTimeBuilder_ == null) {
+        return lastConfigAckTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : lastConfigAckTime_;
+      } else {
+        return lastConfigAckTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version acknowledgment
+     * was received from the device. This field is only for configurations
+     * sent through MQTT.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_ack_time = 14;
+     */
+    public Builder setLastConfigAckTime(com.google.protobuf.Timestamp value) {
+      if (lastConfigAckTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        lastConfigAckTime_ = value;
+        onChanged();
+      } else {
+        lastConfigAckTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version acknowledgment
+     * was received from the device. This field is only for configurations
+     * sent through MQTT.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_ack_time = 14;
+     */
+    public Builder setLastConfigAckTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (lastConfigAckTimeBuilder_ == null) {
+        lastConfigAckTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        lastConfigAckTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version acknowledgment
+     * was received from the device. This field is only for configurations
+     * sent through MQTT.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_ack_time = 14;
+     */
+    public Builder mergeLastConfigAckTime(com.google.protobuf.Timestamp value) {
+      if (lastConfigAckTimeBuilder_ == null) {
+        if (lastConfigAckTime_ != null) {
+          lastConfigAckTime_ =
+            com.google.protobuf.Timestamp.newBuilder(lastConfigAckTime_).mergeFrom(value).buildPartial();
+        } else {
+          lastConfigAckTime_ = value;
+        }
+        onChanged();
+      } else {
+        lastConfigAckTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version acknowledgment
+     * was received from the device. This field is only for configurations
+     * sent through MQTT.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_ack_time = 14;
+     */
+    public Builder clearLastConfigAckTime() {
+      if (lastConfigAckTimeBuilder_ == null) {
+        lastConfigAckTime_ = null;
+        onChanged();
+      } else {
+        lastConfigAckTime_ = null;
+        lastConfigAckTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version acknowledgment
+     * was received from the device. This field is only for configurations
+     * sent through MQTT.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_ack_time = 14;
+     */
+    public com.google.protobuf.Timestamp.Builder getLastConfigAckTimeBuilder() {
+      
+      onChanged();
+      return getLastConfigAckTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version acknowledgment
+     * was received from the device. This field is only for configurations
+     * sent through MQTT.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_ack_time = 14;
+     */
+    public com.google.protobuf.TimestampOrBuilder getLastConfigAckTimeOrBuilder() {
+      if (lastConfigAckTimeBuilder_ != null) {
+        return lastConfigAckTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return lastConfigAckTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : lastConfigAckTime_;
+      }
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version acknowledgment
+     * was received from the device. This field is only for configurations
+     * sent through MQTT.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_ack_time = 14;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getLastConfigAckTimeFieldBuilder() {
+      if (lastConfigAckTimeBuilder_ == null) {
+        lastConfigAckTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getLastConfigAckTime(),
+                getParentForChildren(),
+                isClean());
+        lastConfigAckTime_ = null;
+      }
+      return lastConfigAckTimeBuilder_;
+    }
+
+    private com.google.protobuf.Timestamp lastConfigSendTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> lastConfigSendTimeBuilder_;
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version was sent to
+     * the device.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_send_time = 18;
+     */
+    public boolean hasLastConfigSendTime() {
+      return lastConfigSendTimeBuilder_ != null || lastConfigSendTime_ != null;
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version was sent to
+     * the device.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_send_time = 18;
+     */
+    public com.google.protobuf.Timestamp getLastConfigSendTime() {
+      if (lastConfigSendTimeBuilder_ == null) {
+        return lastConfigSendTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : lastConfigSendTime_;
+      } else {
+        return lastConfigSendTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version was sent to
+     * the device.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_send_time = 18;
+     */
+    public Builder setLastConfigSendTime(com.google.protobuf.Timestamp value) {
+      if (lastConfigSendTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        lastConfigSendTime_ = value;
+        onChanged();
+      } else {
+        lastConfigSendTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version was sent to
+     * the device.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_send_time = 18;
+     */
+    public Builder setLastConfigSendTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (lastConfigSendTimeBuilder_ == null) {
+        lastConfigSendTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        lastConfigSendTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version was sent to
+     * the device.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_send_time = 18;
+     */
+    public Builder mergeLastConfigSendTime(com.google.protobuf.Timestamp value) {
+      if (lastConfigSendTimeBuilder_ == null) {
+        if (lastConfigSendTime_ != null) {
+          lastConfigSendTime_ =
+            com.google.protobuf.Timestamp.newBuilder(lastConfigSendTime_).mergeFrom(value).buildPartial();
+        } else {
+          lastConfigSendTime_ = value;
+        }
+        onChanged();
+      } else {
+        lastConfigSendTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version was sent to
+     * the device.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_send_time = 18;
+     */
+    public Builder clearLastConfigSendTime() {
+      if (lastConfigSendTimeBuilder_ == null) {
+        lastConfigSendTime_ = null;
+        onChanged();
+      } else {
+        lastConfigSendTime_ = null;
+        lastConfigSendTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version was sent to
+     * the device.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_send_time = 18;
+     */
+    public com.google.protobuf.Timestamp.Builder getLastConfigSendTimeBuilder() {
+      
+      onChanged();
+      return getLastConfigSendTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version was sent to
+     * the device.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_send_time = 18;
+     */
+    public com.google.protobuf.TimestampOrBuilder getLastConfigSendTimeOrBuilder() {
+      if (lastConfigSendTimeBuilder_ != null) {
+        return lastConfigSendTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return lastConfigSendTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : lastConfigSendTime_;
+      }
+    }
+    /**
+     * 
+     * [Output only] The last time a cloud-to-device config version was sent to
+     * the device.
+     * 

+     *
+     * .google.protobuf.Timestamp last_config_send_time = 18;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getLastConfigSendTimeFieldBuilder() {
+      if (lastConfigSendTimeBuilder_ == null) {
+        lastConfigSendTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getLastConfigSendTime(),
+                getParentForChildren(),
+                isClean());
+        lastConfigSendTime_ = null;
+      }
+      return lastConfigSendTimeBuilder_;
+    }
+
+    private boolean blocked_ ;
+    /**
+     * 
+     * If a device is blocked, connections or requests from this device will fail.
+     * Can be used to temporarily prevent the device from connecting if, for
+     * example, the sensor is generating bad data and needs maintenance.
+     * 

+     *
+     * bool blocked = 19;
+     */
+    public boolean getBlocked() {
+      return blocked_;
+    }
+    /**
+     * 
+     * If a device is blocked, connections or requests from this device will fail.
+     * Can be used to temporarily prevent the device from connecting if, for
+     * example, the sensor is generating bad data and needs maintenance.
+     * 

+     *
+     * bool blocked = 19;
+     */
+    public Builder setBlocked(boolean value) {
+      
+      blocked_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * If a device is blocked, connections or requests from this device will fail.
+     * Can be used to temporarily prevent the device from connecting if, for
+     * example, the sensor is generating bad data and needs maintenance.
+     * 

+     *
+     * bool blocked = 19;
+     */
+    public Builder clearBlocked() {
+      
+      blocked_ = false;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.Timestamp lastErrorTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> lastErrorTimeBuilder_;
+    /**
+     * 
+     * [Output only] The time the most recent error occurred, such as a failure to
+     * publish to Cloud Pub/Sub. This field is the timestamp of
+     * 'last_error_status'.
+     * 

+     *
+     * .google.protobuf.Timestamp last_error_time = 10;
+     */
+    public boolean hasLastErrorTime() {
+      return lastErrorTimeBuilder_ != null || lastErrorTime_ != null;
+    }
+    /**
+     * 
+     * [Output only] The time the most recent error occurred, such as a failure to
+     * publish to Cloud Pub/Sub. This field is the timestamp of
+     * 'last_error_status'.
+     * 

+     *
+     * .google.protobuf.Timestamp last_error_time = 10;
+     */
+    public com.google.protobuf.Timestamp getLastErrorTime() {
+      if (lastErrorTimeBuilder_ == null) {
+        return lastErrorTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : lastErrorTime_;
+      } else {
+        return lastErrorTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Output only] The time the most recent error occurred, such as a failure to
+     * publish to Cloud Pub/Sub. This field is the timestamp of
+     * 'last_error_status'.
+     * 

+     *
+     * .google.protobuf.Timestamp last_error_time = 10;
+     */
+    public Builder setLastErrorTime(com.google.protobuf.Timestamp value) {
+      if (lastErrorTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        lastErrorTime_ = value;
+        onChanged();
+      } else {
+        lastErrorTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time the most recent error occurred, such as a failure to
+     * publish to Cloud Pub/Sub. This field is the timestamp of
+     * 'last_error_status'.
+     * 

+     *
+     * .google.protobuf.Timestamp last_error_time = 10;
+     */
+    public Builder setLastErrorTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (lastErrorTimeBuilder_ == null) {
+        lastErrorTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        lastErrorTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time the most recent error occurred, such as a failure to
+     * publish to Cloud Pub/Sub. This field is the timestamp of
+     * 'last_error_status'.
+     * 

+     *
+     * .google.protobuf.Timestamp last_error_time = 10;
+     */
+    public Builder mergeLastErrorTime(com.google.protobuf.Timestamp value) {
+      if (lastErrorTimeBuilder_ == null) {
+        if (lastErrorTime_ != null) {
+          lastErrorTime_ =
+            com.google.protobuf.Timestamp.newBuilder(lastErrorTime_).mergeFrom(value).buildPartial();
+        } else {
+          lastErrorTime_ = value;
+        }
+        onChanged();
+      } else {
+        lastErrorTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time the most recent error occurred, such as a failure to
+     * publish to Cloud Pub/Sub. This field is the timestamp of
+     * 'last_error_status'.
+     * 

+     *
+     * .google.protobuf.Timestamp last_error_time = 10;
+     */
+    public Builder clearLastErrorTime() {
+      if (lastErrorTimeBuilder_ == null) {
+        lastErrorTime_ = null;
+        onChanged();
+      } else {
+        lastErrorTime_ = null;
+        lastErrorTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time the most recent error occurred, such as a failure to
+     * publish to Cloud Pub/Sub. This field is the timestamp of
+     * 'last_error_status'.
+     * 

+     *
+     * .google.protobuf.Timestamp last_error_time = 10;
+     */
+    public com.google.protobuf.Timestamp.Builder getLastErrorTimeBuilder() {
+      
+      onChanged();
+      return getLastErrorTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Output only] The time the most recent error occurred, such as a failure to
+     * publish to Cloud Pub/Sub. This field is the timestamp of
+     * 'last_error_status'.
+     * 

+     *
+     * .google.protobuf.Timestamp last_error_time = 10;
+     */
+    public com.google.protobuf.TimestampOrBuilder getLastErrorTimeOrBuilder() {
+      if (lastErrorTimeBuilder_ != null) {
+        return lastErrorTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return lastErrorTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : lastErrorTime_;
+      }
+    }
+    /**
+     * 
+     * [Output only] The time the most recent error occurred, such as a failure to
+     * publish to Cloud Pub/Sub. This field is the timestamp of
+     * 'last_error_status'.
+     * 

+     *
+     * .google.protobuf.Timestamp last_error_time = 10;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getLastErrorTimeFieldBuilder() {
+      if (lastErrorTimeBuilder_ == null) {
+        lastErrorTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getLastErrorTime(),
+                getParentForChildren(),
+                isClean());
+        lastErrorTime_ = null;
+      }
+      return lastErrorTimeBuilder_;
+    }
+
+    private com.google.rpc.Status lastErrorStatus_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> lastErrorStatusBuilder_;
+    /**
+     * 
+     * [Output only] The error message of the most recent error, such as a failure
+     * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+     * field. If no errors have occurred, this field has an empty message
+     * and the status code 0 == OK. Otherwise, this field is expected to have a
+     * status code other than OK.
+     * 

+     *
+     * .google.rpc.Status last_error_status = 11;
+     */
+    public boolean hasLastErrorStatus() {
+      return lastErrorStatusBuilder_ != null || lastErrorStatus_ != null;
+    }
+    /**
+     * 
+     * [Output only] The error message of the most recent error, such as a failure
+     * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+     * field. If no errors have occurred, this field has an empty message
+     * and the status code 0 == OK. Otherwise, this field is expected to have a
+     * status code other than OK.
+     * 

+     *
+     * .google.rpc.Status last_error_status = 11;
+     */
+    public com.google.rpc.Status getLastErrorStatus() {
+      if (lastErrorStatusBuilder_ == null) {
+        return lastErrorStatus_ == null ? com.google.rpc.Status.getDefaultInstance() : lastErrorStatus_;
+      } else {
+        return lastErrorStatusBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Output only] The error message of the most recent error, such as a failure
+     * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+     * field. If no errors have occurred, this field has an empty message
+     * and the status code 0 == OK. Otherwise, this field is expected to have a
+     * status code other than OK.
+     * 

+     *
+     * .google.rpc.Status last_error_status = 11;
+     */
+    public Builder setLastErrorStatus(com.google.rpc.Status value) {
+      if (lastErrorStatusBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        lastErrorStatus_ = value;
+        onChanged();
+      } else {
+        lastErrorStatusBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The error message of the most recent error, such as a failure
+     * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+     * field. If no errors have occurred, this field has an empty message
+     * and the status code 0 == OK. Otherwise, this field is expected to have a
+     * status code other than OK.
+     * 

+     *
+     * .google.rpc.Status last_error_status = 11;
+     */
+    public Builder setLastErrorStatus(
+        com.google.rpc.Status.Builder builderForValue) {
+      if (lastErrorStatusBuilder_ == null) {
+        lastErrorStatus_ = builderForValue.build();
+        onChanged();
+      } else {
+        lastErrorStatusBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The error message of the most recent error, such as a failure
+     * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+     * field. If no errors have occurred, this field has an empty message
+     * and the status code 0 == OK. Otherwise, this field is expected to have a
+     * status code other than OK.
+     * 

+     *
+     * .google.rpc.Status last_error_status = 11;
+     */
+    public Builder mergeLastErrorStatus(com.google.rpc.Status value) {
+      if (lastErrorStatusBuilder_ == null) {
+        if (lastErrorStatus_ != null) {
+          lastErrorStatus_ =
+            com.google.rpc.Status.newBuilder(lastErrorStatus_).mergeFrom(value).buildPartial();
+        } else {
+          lastErrorStatus_ = value;
+        }
+        onChanged();
+      } else {
+        lastErrorStatusBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The error message of the most recent error, such as a failure
+     * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+     * field. If no errors have occurred, this field has an empty message
+     * and the status code 0 == OK. Otherwise, this field is expected to have a
+     * status code other than OK.
+     * 

+     *
+     * .google.rpc.Status last_error_status = 11;
+     */
+    public Builder clearLastErrorStatus() {
+      if (lastErrorStatusBuilder_ == null) {
+        lastErrorStatus_ = null;
+        onChanged();
+      } else {
+        lastErrorStatus_ = null;
+        lastErrorStatusBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The error message of the most recent error, such as a failure
+     * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+     * field. If no errors have occurred, this field has an empty message
+     * and the status code 0 == OK. Otherwise, this field is expected to have a
+     * status code other than OK.
+     * 

+     *
+     * .google.rpc.Status last_error_status = 11;
+     */
+    public com.google.rpc.Status.Builder getLastErrorStatusBuilder() {
+      
+      onChanged();
+      return getLastErrorStatusFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Output only] The error message of the most recent error, such as a failure
+     * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+     * field. If no errors have occurred, this field has an empty message
+     * and the status code 0 == OK. Otherwise, this field is expected to have a
+     * status code other than OK.
+     * 

+     *
+     * .google.rpc.Status last_error_status = 11;
+     */
+    public com.google.rpc.StatusOrBuilder getLastErrorStatusOrBuilder() {
+      if (lastErrorStatusBuilder_ != null) {
+        return lastErrorStatusBuilder_.getMessageOrBuilder();
+      } else {
+        return lastErrorStatus_ == null ?
+            com.google.rpc.Status.getDefaultInstance() : lastErrorStatus_;
+      }
+    }
+    /**
+     * 
+     * [Output only] The error message of the most recent error, such as a failure
+     * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+     * field. If no errors have occurred, this field has an empty message
+     * and the status code 0 == OK. Otherwise, this field is expected to have a
+     * status code other than OK.
+     * 

+     *
+     * .google.rpc.Status last_error_status = 11;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> 
+        getLastErrorStatusFieldBuilder() {
+      if (lastErrorStatusBuilder_ == null) {
+        lastErrorStatusBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder>(
+                getLastErrorStatus(),
+                getParentForChildren(),
+                isClean());
+        lastErrorStatus_ = null;
+      }
+      return lastErrorStatusBuilder_;
+    }
+
+    private com.google.cloud.iot.v1.DeviceConfig config_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceConfig, com.google.cloud.iot.v1.DeviceConfig.Builder, com.google.cloud.iot.v1.DeviceConfigOrBuilder> configBuilder_;
+    /**
+     * 
+     * The most recent device configuration, which is eventually sent from
+     * Cloud IoT Core to the device. If not present on creation, the
+     * configuration will be initialized with an empty payload and version value
+     * of `1`. To update this field after creation, use the
+     * `DeviceManager.ModifyCloudToDeviceConfig` method.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceConfig config = 13;
+     */
+    public boolean hasConfig() {
+      return configBuilder_ != null || config_ != null;
+    }
+    /**
+     * 
+     * The most recent device configuration, which is eventually sent from
+     * Cloud IoT Core to the device. If not present on creation, the
+     * configuration will be initialized with an empty payload and version value
+     * of `1`. To update this field after creation, use the
+     * `DeviceManager.ModifyCloudToDeviceConfig` method.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceConfig config = 13;
+     */
+    public com.google.cloud.iot.v1.DeviceConfig getConfig() {
+      if (configBuilder_ == null) {
+        return config_ == null ? com.google.cloud.iot.v1.DeviceConfig.getDefaultInstance() : config_;
+      } else {
+        return configBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The most recent device configuration, which is eventually sent from
+     * Cloud IoT Core to the device. If not present on creation, the
+     * configuration will be initialized with an empty payload and version value
+     * of `1`. To update this field after creation, use the
+     * `DeviceManager.ModifyCloudToDeviceConfig` method.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceConfig config = 13;
+     */
+    public Builder setConfig(com.google.cloud.iot.v1.DeviceConfig value) {
+      if (configBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        config_ = value;
+        onChanged();
+      } else {
+        configBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The most recent device configuration, which is eventually sent from
+     * Cloud IoT Core to the device. If not present on creation, the
+     * configuration will be initialized with an empty payload and version value
+     * of `1`. To update this field after creation, use the
+     * `DeviceManager.ModifyCloudToDeviceConfig` method.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceConfig config = 13;
+     */
+    public Builder setConfig(
+        com.google.cloud.iot.v1.DeviceConfig.Builder builderForValue) {
+      if (configBuilder_ == null) {
+        config_ = builderForValue.build();
+        onChanged();
+      } else {
+        configBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The most recent device configuration, which is eventually sent from
+     * Cloud IoT Core to the device. If not present on creation, the
+     * configuration will be initialized with an empty payload and version value
+     * of `1`. To update this field after creation, use the
+     * `DeviceManager.ModifyCloudToDeviceConfig` method.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceConfig config = 13;
+     */
+    public Builder mergeConfig(com.google.cloud.iot.v1.DeviceConfig value) {
+      if (configBuilder_ == null) {
+        if (config_ != null) {
+          config_ =
+            com.google.cloud.iot.v1.DeviceConfig.newBuilder(config_).mergeFrom(value).buildPartial();
+        } else {
+          config_ = value;
+        }
+        onChanged();
+      } else {
+        configBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The most recent device configuration, which is eventually sent from
+     * Cloud IoT Core to the device. If not present on creation, the
+     * configuration will be initialized with an empty payload and version value
+     * of `1`. To update this field after creation, use the
+     * `DeviceManager.ModifyCloudToDeviceConfig` method.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceConfig config = 13;
+     */
+    public Builder clearConfig() {
+      if (configBuilder_ == null) {
+        config_ = null;
+        onChanged();
+      } else {
+        config_ = null;
+        configBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The most recent device configuration, which is eventually sent from
+     * Cloud IoT Core to the device. If not present on creation, the
+     * configuration will be initialized with an empty payload and version value
+     * of `1`. To update this field after creation, use the
+     * `DeviceManager.ModifyCloudToDeviceConfig` method.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceConfig config = 13;
+     */
+    public com.google.cloud.iot.v1.DeviceConfig.Builder getConfigBuilder() {
+      
+      onChanged();
+      return getConfigFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The most recent device configuration, which is eventually sent from
+     * Cloud IoT Core to the device. If not present on creation, the
+     * configuration will be initialized with an empty payload and version value
+     * of `1`. To update this field after creation, use the
+     * `DeviceManager.ModifyCloudToDeviceConfig` method.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceConfig config = 13;
+     */
+    public com.google.cloud.iot.v1.DeviceConfigOrBuilder getConfigOrBuilder() {
+      if (configBuilder_ != null) {
+        return configBuilder_.getMessageOrBuilder();
+      } else {
+        return config_ == null ?
+            com.google.cloud.iot.v1.DeviceConfig.getDefaultInstance() : config_;
+      }
+    }
+    /**
+     * 
+     * The most recent device configuration, which is eventually sent from
+     * Cloud IoT Core to the device. If not present on creation, the
+     * configuration will be initialized with an empty payload and version value
+     * of `1`. To update this field after creation, use the
+     * `DeviceManager.ModifyCloudToDeviceConfig` method.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceConfig config = 13;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceConfig, com.google.cloud.iot.v1.DeviceConfig.Builder, com.google.cloud.iot.v1.DeviceConfigOrBuilder> 
+        getConfigFieldBuilder() {
+      if (configBuilder_ == null) {
+        configBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.iot.v1.DeviceConfig, com.google.cloud.iot.v1.DeviceConfig.Builder, com.google.cloud.iot.v1.DeviceConfigOrBuilder>(
+                getConfig(),
+                getParentForChildren(),
+                isClean());
+        config_ = null;
+      }
+      return configBuilder_;
+    }
+
+    private com.google.cloud.iot.v1.DeviceState state_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceState, com.google.cloud.iot.v1.DeviceState.Builder, com.google.cloud.iot.v1.DeviceStateOrBuilder> stateBuilder_;
+    /**
+     * 
+     * [Output only] The state most recently received from the device. If no state
+     * has been reported, this field is not present.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceState state = 16;
+     */
+    public boolean hasState() {
+      return stateBuilder_ != null || state_ != null;
+    }
+    /**
+     * 
+     * [Output only] The state most recently received from the device. If no state
+     * has been reported, this field is not present.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceState state = 16;
+     */
+    public com.google.cloud.iot.v1.DeviceState getState() {
+      if (stateBuilder_ == null) {
+        return state_ == null ? com.google.cloud.iot.v1.DeviceState.getDefaultInstance() : state_;
+      } else {
+        return stateBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Output only] The state most recently received from the device. If no state
+     * has been reported, this field is not present.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceState state = 16;
+     */
+    public Builder setState(com.google.cloud.iot.v1.DeviceState value) {
+      if (stateBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        state_ = value;
+        onChanged();
+      } else {
+        stateBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The state most recently received from the device. If no state
+     * has been reported, this field is not present.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceState state = 16;
+     */
+    public Builder setState(
+        com.google.cloud.iot.v1.DeviceState.Builder builderForValue) {
+      if (stateBuilder_ == null) {
+        state_ = builderForValue.build();
+        onChanged();
+      } else {
+        stateBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The state most recently received from the device. If no state
+     * has been reported, this field is not present.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceState state = 16;
+     */
+    public Builder mergeState(com.google.cloud.iot.v1.DeviceState value) {
+      if (stateBuilder_ == null) {
+        if (state_ != null) {
+          state_ =
+            com.google.cloud.iot.v1.DeviceState.newBuilder(state_).mergeFrom(value).buildPartial();
+        } else {
+          state_ = value;
+        }
+        onChanged();
+      } else {
+        stateBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The state most recently received from the device. If no state
+     * has been reported, this field is not present.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceState state = 16;
+     */
+    public Builder clearState() {
+      if (stateBuilder_ == null) {
+        state_ = null;
+        onChanged();
+      } else {
+        state_ = null;
+        stateBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The state most recently received from the device. If no state
+     * has been reported, this field is not present.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceState state = 16;
+     */
+    public com.google.cloud.iot.v1.DeviceState.Builder getStateBuilder() {
+      
+      onChanged();
+      return getStateFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Output only] The state most recently received from the device. If no state
+     * has been reported, this field is not present.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceState state = 16;
+     */
+    public com.google.cloud.iot.v1.DeviceStateOrBuilder getStateOrBuilder() {
+      if (stateBuilder_ != null) {
+        return stateBuilder_.getMessageOrBuilder();
+      } else {
+        return state_ == null ?
+            com.google.cloud.iot.v1.DeviceState.getDefaultInstance() : state_;
+      }
+    }
+    /**
+     * 
+     * [Output only] The state most recently received from the device. If no state
+     * has been reported, this field is not present.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceState state = 16;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceState, com.google.cloud.iot.v1.DeviceState.Builder, com.google.cloud.iot.v1.DeviceStateOrBuilder> 
+        getStateFieldBuilder() {
+      if (stateBuilder_ == null) {
+        stateBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.iot.v1.DeviceState, com.google.cloud.iot.v1.DeviceState.Builder, com.google.cloud.iot.v1.DeviceStateOrBuilder>(
+                getState(),
+                getParentForChildren(),
+                isClean());
+        state_ = null;
+      }
+      return stateBuilder_;
+    }
+
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> metadata_;
+    private com.google.protobuf.MapField
+    internalGetMetadata() {
+      if (metadata_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            MetadataDefaultEntryHolder.defaultEntry);
+      }
+      return metadata_;
+    }
+    private com.google.protobuf.MapField
+    internalGetMutableMetadata() {
+      onChanged();;
+      if (metadata_ == null) {
+        metadata_ = com.google.protobuf.MapField.newMapField(
+            MetadataDefaultEntryHolder.defaultEntry);
+      }
+      if (!metadata_.isMutable()) {
+        metadata_ = metadata_.copy();
+      }
+      return metadata_;
+    }
+
+    public int getMetadataCount() {
+      return internalGetMetadata().getMap().size();
+    }
+    /**
+     * 
+     * The metadata key-value pairs assigned to the device. This metadata is not
+     * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+     * information for the device.
+     * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+     * be less than 128 bytes in length.
+     * Values are free-form strings. Each value must be less than or equal to 32
+     * KB in size.
+     * The total size of all keys and values must be less than 256 KB, and the
+     * maximum number of key-value pairs is 500.
+     * 

+     *
+     * map<string, string> metadata = 17;
+     */
+
+    public boolean containsMetadata(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      return internalGetMetadata().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getMetadataMap()} instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map getMetadata() {
+      return getMetadataMap();
+    }
+    /**
+     * 
+     * The metadata key-value pairs assigned to the device. This metadata is not
+     * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+     * information for the device.
+     * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+     * be less than 128 bytes in length.
+     * Values are free-form strings. Each value must be less than or equal to 32
+     * KB in size.
+     * The total size of all keys and values must be less than 256 KB, and the
+     * maximum number of key-value pairs is 500.
+     * 

+     *
+     * map<string, string> metadata = 17;
+     */
+
+    public java.util.Map getMetadataMap() {
+      return internalGetMetadata().getMap();
+    }
+    /**
+     * 
+     * The metadata key-value pairs assigned to the device. This metadata is not
+     * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+     * information for the device.
+     * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+     * be less than 128 bytes in length.
+     * Values are free-form strings. Each value must be less than or equal to 32
+     * KB in size.
+     * The total size of all keys and values must be less than 256 KB, and the
+     * maximum number of key-value pairs is 500.
+     * 

+     *
+     * map<string, string> metadata = 17;
+     */
+
+    public java.lang.String getMetadataOrDefault(
+        java.lang.String key,
+        java.lang.String defaultValue) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      java.util.Map map =
+          internalGetMetadata().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * 
+     * The metadata key-value pairs assigned to the device. This metadata is not
+     * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+     * information for the device.
+     * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+     * be less than 128 bytes in length.
+     * Values are free-form strings. Each value must be less than or equal to 32
+     * KB in size.
+     * The total size of all keys and values must be less than 256 KB, and the
+     * maximum number of key-value pairs is 500.
+     * 

+     *
+     * map<string, string> metadata = 17;
+     */
+
+    public java.lang.String getMetadataOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      java.util.Map map =
+          internalGetMetadata().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public Builder clearMetadata() {
+      internalGetMutableMetadata().getMutableMap()
+          .clear();
+      return this;
+    }
+    /**
+     * 
+     * The metadata key-value pairs assigned to the device. This metadata is not
+     * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+     * information for the device.
+     * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+     * be less than 128 bytes in length.
+     * Values are free-form strings. Each value must be less than or equal to 32
+     * KB in size.
+     * The total size of all keys and values must be less than 256 KB, and the
+     * maximum number of key-value pairs is 500.
+     * 

+     *
+     * map<string, string> metadata = 17;
+     */
+
+    public Builder removeMetadata(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableMetadata().getMutableMap()
+          .remove(key);
+      return this;
+    }
+    /**
+     * Use alternate mutation accessors instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map
+    getMutableMetadata() {
+      return internalGetMutableMetadata().getMutableMap();
+    }
+    /**
+     * 
+     * The metadata key-value pairs assigned to the device. This metadata is not
+     * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+     * information for the device.
+     * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+     * be less than 128 bytes in length.
+     * Values are free-form strings. Each value must be less than or equal to 32
+     * KB in size.
+     * The total size of all keys and values must be less than 256 KB, and the
+     * maximum number of key-value pairs is 500.
+     * 

+     *
+     * map<string, string> metadata = 17;
+     */
+    public Builder putMetadata(
+        java.lang.String key,
+        java.lang.String value) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      if (value == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableMetadata().getMutableMap()
+          .put(key, value);
+      return this;
+    }
+    /**
+     * 
+     * The metadata key-value pairs assigned to the device. This metadata is not
+     * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+     * information for the device.
+     * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+     * be less than 128 bytes in length.
+     * Values are free-form strings. Each value must be less than or equal to 32
+     * KB in size.
+     * The total size of all keys and values must be less than 256 KB, and the
+     * maximum number of key-value pairs is 500.
+     * 

+     *
+     * map<string, string> metadata = 17;
+     */
+
+    public Builder putAllMetadata(
+        java.util.Map values) {
+      internalGetMutableMetadata().getMutableMap()
+          .putAll(values);
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.Device)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.Device)
+  private static final com.google.cloud.iot.v1.Device DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.Device();
+  }
+
+  public static com.google.cloud.iot.v1.Device getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public Device parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Device(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.Device getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java
new file mode 100644
index 000000000000..6040fc339e01
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java
@@ -0,0 +1,1127 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * The device configuration. Eventually delivered to devices.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.DeviceConfig}
+ */
+public  final class DeviceConfig extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.DeviceConfig)
+    DeviceConfigOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use DeviceConfig.newBuilder() to construct.
+  private DeviceConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private DeviceConfig() {
+    version_ = 0L;
+    binaryData_ = com.google.protobuf.ByteString.EMPTY;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private DeviceConfig(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+
+            version_ = input.readInt64();
+            break;
+          }
+          case 18: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (cloudUpdateTime_ != null) {
+              subBuilder = cloudUpdateTime_.toBuilder();
+            }
+            cloudUpdateTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(cloudUpdateTime_);
+              cloudUpdateTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 26: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (deviceAckTime_ != null) {
+              subBuilder = deviceAckTime_.toBuilder();
+            }
+            deviceAckTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(deviceAckTime_);
+              deviceAckTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 34: {
+
+            binaryData_ = input.readBytes();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceConfig_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceConfig_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.DeviceConfig.class, com.google.cloud.iot.v1.DeviceConfig.Builder.class);
+  }
+
+  public static final int VERSION_FIELD_NUMBER = 1;
+  private long version_;
+  /**
+   * 
+   * [Output only] The version of this update. The version number is assigned by
+   * the server, and is always greater than 0 after device creation. The
+   * version must be 0 on the `CreateDevice` request if a `config` is
+   * specified; the response of `CreateDevice` will always have a value of 1.
+   * 

+   *
+   * int64 version = 1;
+   */
+  public long getVersion() {
+    return version_;
+  }
+
+  public static final int CLOUD_UPDATE_TIME_FIELD_NUMBER = 2;
+  private com.google.protobuf.Timestamp cloudUpdateTime_;
+  /**
+   * 
+   * [Output only] The time at which this configuration version was updated in
+   * Cloud IoT Core. This timestamp is set by the server.
+   * 

+   *
+   * .google.protobuf.Timestamp cloud_update_time = 2;
+   */
+  public boolean hasCloudUpdateTime() {
+    return cloudUpdateTime_ != null;
+  }
+  /**
+   * 
+   * [Output only] The time at which this configuration version was updated in
+   * Cloud IoT Core. This timestamp is set by the server.
+   * 

+   *
+   * .google.protobuf.Timestamp cloud_update_time = 2;
+   */
+  public com.google.protobuf.Timestamp getCloudUpdateTime() {
+    return cloudUpdateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : cloudUpdateTime_;
+  }
+  /**
+   * 
+   * [Output only] The time at which this configuration version was updated in
+   * Cloud IoT Core. This timestamp is set by the server.
+   * 

+   *
+   * .google.protobuf.Timestamp cloud_update_time = 2;
+   */
+  public com.google.protobuf.TimestampOrBuilder getCloudUpdateTimeOrBuilder() {
+    return getCloudUpdateTime();
+  }
+
+  public static final int DEVICE_ACK_TIME_FIELD_NUMBER = 3;
+  private com.google.protobuf.Timestamp deviceAckTime_;
+  /**
+   * 
+   * [Output only] The time at which Cloud IoT Core received the
+   * acknowledgment from the device, indicating that the device has received
+   * this configuration version. If this field is not present, the device has
+   * not yet acknowledged that it received this version. Note that when
+   * the config was sent to the device, many config versions may have been
+   * available in Cloud IoT Core while the device was disconnected, and on
+   * connection, only the latest version is sent to the device. Some
+   * versions may never be sent to the device, and therefore are never
+   * acknowledged. This timestamp is set by Cloud IoT Core.
+   * 

+   *
+   * .google.protobuf.Timestamp device_ack_time = 3;
+   */
+  public boolean hasDeviceAckTime() {
+    return deviceAckTime_ != null;
+  }
+  /**
+   * 
+   * [Output only] The time at which Cloud IoT Core received the
+   * acknowledgment from the device, indicating that the device has received
+   * this configuration version. If this field is not present, the device has
+   * not yet acknowledged that it received this version. Note that when
+   * the config was sent to the device, many config versions may have been
+   * available in Cloud IoT Core while the device was disconnected, and on
+   * connection, only the latest version is sent to the device. Some
+   * versions may never be sent to the device, and therefore are never
+   * acknowledged. This timestamp is set by Cloud IoT Core.
+   * 

+   *
+   * .google.protobuf.Timestamp device_ack_time = 3;
+   */
+  public com.google.protobuf.Timestamp getDeviceAckTime() {
+    return deviceAckTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : deviceAckTime_;
+  }
+  /**
+   * 
+   * [Output only] The time at which Cloud IoT Core received the
+   * acknowledgment from the device, indicating that the device has received
+   * this configuration version. If this field is not present, the device has
+   * not yet acknowledged that it received this version. Note that when
+   * the config was sent to the device, many config versions may have been
+   * available in Cloud IoT Core while the device was disconnected, and on
+   * connection, only the latest version is sent to the device. Some
+   * versions may never be sent to the device, and therefore are never
+   * acknowledged. This timestamp is set by Cloud IoT Core.
+   * 

+   *
+   * .google.protobuf.Timestamp device_ack_time = 3;
+   */
+  public com.google.protobuf.TimestampOrBuilder getDeviceAckTimeOrBuilder() {
+    return getDeviceAckTime();
+  }
+
+  public static final int BINARY_DATA_FIELD_NUMBER = 4;
+  private com.google.protobuf.ByteString binaryData_;
+  /**
+   * 
+   * The device configuration data.
+   * 

+   *
+   * bytes binary_data = 4;
+   */
+  public com.google.protobuf.ByteString getBinaryData() {
+    return binaryData_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (version_ != 0L) {
+      output.writeInt64(1, version_);
+    }
+    if (cloudUpdateTime_ != null) {
+      output.writeMessage(2, getCloudUpdateTime());
+    }
+    if (deviceAckTime_ != null) {
+      output.writeMessage(3, getDeviceAckTime());
+    }
+    if (!binaryData_.isEmpty()) {
+      output.writeBytes(4, binaryData_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (version_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(1, version_);
+    }
+    if (cloudUpdateTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getCloudUpdateTime());
+    }
+    if (deviceAckTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, getDeviceAckTime());
+    }
+    if (!binaryData_.isEmpty()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(4, binaryData_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.DeviceConfig)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.DeviceConfig other = (com.google.cloud.iot.v1.DeviceConfig) obj;
+
+    boolean result = true;
+    result = result && (getVersion()
+        == other.getVersion());
+    result = result && (hasCloudUpdateTime() == other.hasCloudUpdateTime());
+    if (hasCloudUpdateTime()) {
+      result = result && getCloudUpdateTime()
+          .equals(other.getCloudUpdateTime());
+    }
+    result = result && (hasDeviceAckTime() == other.hasDeviceAckTime());
+    if (hasDeviceAckTime()) {
+      result = result && getDeviceAckTime()
+          .equals(other.getDeviceAckTime());
+    }
+    result = result && getBinaryData()
+        .equals(other.getBinaryData());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + VERSION_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getVersion());
+    if (hasCloudUpdateTime()) {
+      hash = (37 * hash) + CLOUD_UPDATE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getCloudUpdateTime().hashCode();
+    }
+    if (hasDeviceAckTime()) {
+      hash = (37 * hash) + DEVICE_ACK_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getDeviceAckTime().hashCode();
+    }
+    hash = (37 * hash) + BINARY_DATA_FIELD_NUMBER;
+    hash = (53 * hash) + getBinaryData().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.DeviceConfig parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeviceConfig parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceConfig parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeviceConfig parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceConfig parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeviceConfig parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceConfig parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeviceConfig parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceConfig parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeviceConfig parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceConfig parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeviceConfig parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.DeviceConfig prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * The device configuration. Eventually delivered to devices.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.DeviceConfig}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.DeviceConfig)
+      com.google.cloud.iot.v1.DeviceConfigOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceConfig_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceConfig_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.DeviceConfig.class, com.google.cloud.iot.v1.DeviceConfig.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.DeviceConfig.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      version_ = 0L;
+
+      if (cloudUpdateTimeBuilder_ == null) {
+        cloudUpdateTime_ = null;
+      } else {
+        cloudUpdateTime_ = null;
+        cloudUpdateTimeBuilder_ = null;
+      }
+      if (deviceAckTimeBuilder_ == null) {
+        deviceAckTime_ = null;
+      } else {
+        deviceAckTime_ = null;
+        deviceAckTimeBuilder_ = null;
+      }
+      binaryData_ = com.google.protobuf.ByteString.EMPTY;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceConfig_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.DeviceConfig getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.DeviceConfig.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.DeviceConfig build() {
+      com.google.cloud.iot.v1.DeviceConfig result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.DeviceConfig buildPartial() {
+      com.google.cloud.iot.v1.DeviceConfig result = new com.google.cloud.iot.v1.DeviceConfig(this);
+      result.version_ = version_;
+      if (cloudUpdateTimeBuilder_ == null) {
+        result.cloudUpdateTime_ = cloudUpdateTime_;
+      } else {
+        result.cloudUpdateTime_ = cloudUpdateTimeBuilder_.build();
+      }
+      if (deviceAckTimeBuilder_ == null) {
+        result.deviceAckTime_ = deviceAckTime_;
+      } else {
+        result.deviceAckTime_ = deviceAckTimeBuilder_.build();
+      }
+      result.binaryData_ = binaryData_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.DeviceConfig) {
+        return mergeFrom((com.google.cloud.iot.v1.DeviceConfig)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.DeviceConfig other) {
+      if (other == com.google.cloud.iot.v1.DeviceConfig.getDefaultInstance()) return this;
+      if (other.getVersion() != 0L) {
+        setVersion(other.getVersion());
+      }
+      if (other.hasCloudUpdateTime()) {
+        mergeCloudUpdateTime(other.getCloudUpdateTime());
+      }
+      if (other.hasDeviceAckTime()) {
+        mergeDeviceAckTime(other.getDeviceAckTime());
+      }
+      if (other.getBinaryData() != com.google.protobuf.ByteString.EMPTY) {
+        setBinaryData(other.getBinaryData());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.DeviceConfig parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.DeviceConfig) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private long version_ ;
+    /**
+     * 
+     * [Output only] The version of this update. The version number is assigned by
+     * the server, and is always greater than 0 after device creation. The
+     * version must be 0 on the `CreateDevice` request if a `config` is
+     * specified; the response of `CreateDevice` will always have a value of 1.
+     * 

+     *
+     * int64 version = 1;
+     */
+    public long getVersion() {
+      return version_;
+    }
+    /**
+     * 
+     * [Output only] The version of this update. The version number is assigned by
+     * the server, and is always greater than 0 after device creation. The
+     * version must be 0 on the `CreateDevice` request if a `config` is
+     * specified; the response of `CreateDevice` will always have a value of 1.
+     * 

+     *
+     * int64 version = 1;
+     */
+    public Builder setVersion(long value) {
+      
+      version_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The version of this update. The version number is assigned by
+     * the server, and is always greater than 0 after device creation. The
+     * version must be 0 on the `CreateDevice` request if a `config` is
+     * specified; the response of `CreateDevice` will always have a value of 1.
+     * 

+     *
+     * int64 version = 1;
+     */
+    public Builder clearVersion() {
+      
+      version_ = 0L;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.Timestamp cloudUpdateTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> cloudUpdateTimeBuilder_;
+    /**
+     * 
+     * [Output only] The time at which this configuration version was updated in
+     * Cloud IoT Core. This timestamp is set by the server.
+     * 

+     *
+     * .google.protobuf.Timestamp cloud_update_time = 2;
+     */
+    public boolean hasCloudUpdateTime() {
+      return cloudUpdateTimeBuilder_ != null || cloudUpdateTime_ != null;
+    }
+    /**
+     * 
+     * [Output only] The time at which this configuration version was updated in
+     * Cloud IoT Core. This timestamp is set by the server.
+     * 

+     *
+     * .google.protobuf.Timestamp cloud_update_time = 2;
+     */
+    public com.google.protobuf.Timestamp getCloudUpdateTime() {
+      if (cloudUpdateTimeBuilder_ == null) {
+        return cloudUpdateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : cloudUpdateTime_;
+      } else {
+        return cloudUpdateTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Output only] The time at which this configuration version was updated in
+     * Cloud IoT Core. This timestamp is set by the server.
+     * 

+     *
+     * .google.protobuf.Timestamp cloud_update_time = 2;
+     */
+    public Builder setCloudUpdateTime(com.google.protobuf.Timestamp value) {
+      if (cloudUpdateTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        cloudUpdateTime_ = value;
+        onChanged();
+      } else {
+        cloudUpdateTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time at which this configuration version was updated in
+     * Cloud IoT Core. This timestamp is set by the server.
+     * 

+     *
+     * .google.protobuf.Timestamp cloud_update_time = 2;
+     */
+    public Builder setCloudUpdateTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (cloudUpdateTimeBuilder_ == null) {
+        cloudUpdateTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        cloudUpdateTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time at which this configuration version was updated in
+     * Cloud IoT Core. This timestamp is set by the server.
+     * 

+     *
+     * .google.protobuf.Timestamp cloud_update_time = 2;
+     */
+    public Builder mergeCloudUpdateTime(com.google.protobuf.Timestamp value) {
+      if (cloudUpdateTimeBuilder_ == null) {
+        if (cloudUpdateTime_ != null) {
+          cloudUpdateTime_ =
+            com.google.protobuf.Timestamp.newBuilder(cloudUpdateTime_).mergeFrom(value).buildPartial();
+        } else {
+          cloudUpdateTime_ = value;
+        }
+        onChanged();
+      } else {
+        cloudUpdateTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time at which this configuration version was updated in
+     * Cloud IoT Core. This timestamp is set by the server.
+     * 

+     *
+     * .google.protobuf.Timestamp cloud_update_time = 2;
+     */
+    public Builder clearCloudUpdateTime() {
+      if (cloudUpdateTimeBuilder_ == null) {
+        cloudUpdateTime_ = null;
+        onChanged();
+      } else {
+        cloudUpdateTime_ = null;
+        cloudUpdateTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time at which this configuration version was updated in
+     * Cloud IoT Core. This timestamp is set by the server.
+     * 

+     *
+     * .google.protobuf.Timestamp cloud_update_time = 2;
+     */
+    public com.google.protobuf.Timestamp.Builder getCloudUpdateTimeBuilder() {
+      
+      onChanged();
+      return getCloudUpdateTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Output only] The time at which this configuration version was updated in
+     * Cloud IoT Core. This timestamp is set by the server.
+     * 

+     *
+     * .google.protobuf.Timestamp cloud_update_time = 2;
+     */
+    public com.google.protobuf.TimestampOrBuilder getCloudUpdateTimeOrBuilder() {
+      if (cloudUpdateTimeBuilder_ != null) {
+        return cloudUpdateTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return cloudUpdateTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : cloudUpdateTime_;
+      }
+    }
+    /**
+     * 
+     * [Output only] The time at which this configuration version was updated in
+     * Cloud IoT Core. This timestamp is set by the server.
+     * 

+     *
+     * .google.protobuf.Timestamp cloud_update_time = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getCloudUpdateTimeFieldBuilder() {
+      if (cloudUpdateTimeBuilder_ == null) {
+        cloudUpdateTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getCloudUpdateTime(),
+                getParentForChildren(),
+                isClean());
+        cloudUpdateTime_ = null;
+      }
+      return cloudUpdateTimeBuilder_;
+    }
+
+    private com.google.protobuf.Timestamp deviceAckTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> deviceAckTimeBuilder_;
+    /**
+     * 
+     * [Output only] The time at which Cloud IoT Core received the
+     * acknowledgment from the device, indicating that the device has received
+     * this configuration version. If this field is not present, the device has
+     * not yet acknowledged that it received this version. Note that when
+     * the config was sent to the device, many config versions may have been
+     * available in Cloud IoT Core while the device was disconnected, and on
+     * connection, only the latest version is sent to the device. Some
+     * versions may never be sent to the device, and therefore are never
+     * acknowledged. This timestamp is set by Cloud IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp device_ack_time = 3;
+     */
+    public boolean hasDeviceAckTime() {
+      return deviceAckTimeBuilder_ != null || deviceAckTime_ != null;
+    }
+    /**
+     * 
+     * [Output only] The time at which Cloud IoT Core received the
+     * acknowledgment from the device, indicating that the device has received
+     * this configuration version. If this field is not present, the device has
+     * not yet acknowledged that it received this version. Note that when
+     * the config was sent to the device, many config versions may have been
+     * available in Cloud IoT Core while the device was disconnected, and on
+     * connection, only the latest version is sent to the device. Some
+     * versions may never be sent to the device, and therefore are never
+     * acknowledged. This timestamp is set by Cloud IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp device_ack_time = 3;
+     */
+    public com.google.protobuf.Timestamp getDeviceAckTime() {
+      if (deviceAckTimeBuilder_ == null) {
+        return deviceAckTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : deviceAckTime_;
+      } else {
+        return deviceAckTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Output only] The time at which Cloud IoT Core received the
+     * acknowledgment from the device, indicating that the device has received
+     * this configuration version. If this field is not present, the device has
+     * not yet acknowledged that it received this version. Note that when
+     * the config was sent to the device, many config versions may have been
+     * available in Cloud IoT Core while the device was disconnected, and on
+     * connection, only the latest version is sent to the device. Some
+     * versions may never be sent to the device, and therefore are never
+     * acknowledged. This timestamp is set by Cloud IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp device_ack_time = 3;
+     */
+    public Builder setDeviceAckTime(com.google.protobuf.Timestamp value) {
+      if (deviceAckTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        deviceAckTime_ = value;
+        onChanged();
+      } else {
+        deviceAckTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time at which Cloud IoT Core received the
+     * acknowledgment from the device, indicating that the device has received
+     * this configuration version. If this field is not present, the device has
+     * not yet acknowledged that it received this version. Note that when
+     * the config was sent to the device, many config versions may have been
+     * available in Cloud IoT Core while the device was disconnected, and on
+     * connection, only the latest version is sent to the device. Some
+     * versions may never be sent to the device, and therefore are never
+     * acknowledged. This timestamp is set by Cloud IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp device_ack_time = 3;
+     */
+    public Builder setDeviceAckTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (deviceAckTimeBuilder_ == null) {
+        deviceAckTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        deviceAckTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time at which Cloud IoT Core received the
+     * acknowledgment from the device, indicating that the device has received
+     * this configuration version. If this field is not present, the device has
+     * not yet acknowledged that it received this version. Note that when
+     * the config was sent to the device, many config versions may have been
+     * available in Cloud IoT Core while the device was disconnected, and on
+     * connection, only the latest version is sent to the device. Some
+     * versions may never be sent to the device, and therefore are never
+     * acknowledged. This timestamp is set by Cloud IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp device_ack_time = 3;
+     */
+    public Builder mergeDeviceAckTime(com.google.protobuf.Timestamp value) {
+      if (deviceAckTimeBuilder_ == null) {
+        if (deviceAckTime_ != null) {
+          deviceAckTime_ =
+            com.google.protobuf.Timestamp.newBuilder(deviceAckTime_).mergeFrom(value).buildPartial();
+        } else {
+          deviceAckTime_ = value;
+        }
+        onChanged();
+      } else {
+        deviceAckTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time at which Cloud IoT Core received the
+     * acknowledgment from the device, indicating that the device has received
+     * this configuration version. If this field is not present, the device has
+     * not yet acknowledged that it received this version. Note that when
+     * the config was sent to the device, many config versions may have been
+     * available in Cloud IoT Core while the device was disconnected, and on
+     * connection, only the latest version is sent to the device. Some
+     * versions may never be sent to the device, and therefore are never
+     * acknowledged. This timestamp is set by Cloud IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp device_ack_time = 3;
+     */
+    public Builder clearDeviceAckTime() {
+      if (deviceAckTimeBuilder_ == null) {
+        deviceAckTime_ = null;
+        onChanged();
+      } else {
+        deviceAckTime_ = null;
+        deviceAckTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time at which Cloud IoT Core received the
+     * acknowledgment from the device, indicating that the device has received
+     * this configuration version. If this field is not present, the device has
+     * not yet acknowledged that it received this version. Note that when
+     * the config was sent to the device, many config versions may have been
+     * available in Cloud IoT Core while the device was disconnected, and on
+     * connection, only the latest version is sent to the device. Some
+     * versions may never be sent to the device, and therefore are never
+     * acknowledged. This timestamp is set by Cloud IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp device_ack_time = 3;
+     */
+    public com.google.protobuf.Timestamp.Builder getDeviceAckTimeBuilder() {
+      
+      onChanged();
+      return getDeviceAckTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Output only] The time at which Cloud IoT Core received the
+     * acknowledgment from the device, indicating that the device has received
+     * this configuration version. If this field is not present, the device has
+     * not yet acknowledged that it received this version. Note that when
+     * the config was sent to the device, many config versions may have been
+     * available in Cloud IoT Core while the device was disconnected, and on
+     * connection, only the latest version is sent to the device. Some
+     * versions may never be sent to the device, and therefore are never
+     * acknowledged. This timestamp is set by Cloud IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp device_ack_time = 3;
+     */
+    public com.google.protobuf.TimestampOrBuilder getDeviceAckTimeOrBuilder() {
+      if (deviceAckTimeBuilder_ != null) {
+        return deviceAckTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return deviceAckTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : deviceAckTime_;
+      }
+    }
+    /**
+     * 
+     * [Output only] The time at which Cloud IoT Core received the
+     * acknowledgment from the device, indicating that the device has received
+     * this configuration version. If this field is not present, the device has
+     * not yet acknowledged that it received this version. Note that when
+     * the config was sent to the device, many config versions may have been
+     * available in Cloud IoT Core while the device was disconnected, and on
+     * connection, only the latest version is sent to the device. Some
+     * versions may never be sent to the device, and therefore are never
+     * acknowledged. This timestamp is set by Cloud IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp device_ack_time = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getDeviceAckTimeFieldBuilder() {
+      if (deviceAckTimeBuilder_ == null) {
+        deviceAckTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getDeviceAckTime(),
+                getParentForChildren(),
+                isClean());
+        deviceAckTime_ = null;
+      }
+      return deviceAckTimeBuilder_;
+    }
+
+    private com.google.protobuf.ByteString binaryData_ = com.google.protobuf.ByteString.EMPTY;
+    /**
+     * 
+     * The device configuration data.
+     * 

+     *
+     * bytes binary_data = 4;
+     */
+    public com.google.protobuf.ByteString getBinaryData() {
+      return binaryData_;
+    }
+    /**
+     * 
+     * The device configuration data.
+     * 

+     *
+     * bytes binary_data = 4;
+     */
+    public Builder setBinaryData(com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      binaryData_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The device configuration data.
+     * 

+     *
+     * bytes binary_data = 4;
+     */
+    public Builder clearBinaryData() {
+      
+      binaryData_ = getDefaultInstance().getBinaryData();
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.DeviceConfig)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.DeviceConfig)
+  private static final com.google.cloud.iot.v1.DeviceConfig DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.DeviceConfig();
+  }
+
+  public static com.google.cloud.iot.v1.DeviceConfig getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public DeviceConfig parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new DeviceConfig(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.DeviceConfig getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfigOrBuilder.java
new file mode 100644
index 000000000000..29fe48a4d716
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfigOrBuilder.java
@@ -0,0 +1,107 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface DeviceConfigOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.DeviceConfig)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * [Output only] The version of this update. The version number is assigned by
+   * the server, and is always greater than 0 after device creation. The
+   * version must be 0 on the `CreateDevice` request if a `config` is
+   * specified; the response of `CreateDevice` will always have a value of 1.
+   * 

+   *
+   * int64 version = 1;
+   */
+  long getVersion();
+
+  /**
+   * 
+   * [Output only] The time at which this configuration version was updated in
+   * Cloud IoT Core. This timestamp is set by the server.
+   * 

+   *
+   * .google.protobuf.Timestamp cloud_update_time = 2;
+   */
+  boolean hasCloudUpdateTime();
+  /**
+   * 
+   * [Output only] The time at which this configuration version was updated in
+   * Cloud IoT Core. This timestamp is set by the server.
+   * 

+   *
+   * .google.protobuf.Timestamp cloud_update_time = 2;
+   */
+  com.google.protobuf.Timestamp getCloudUpdateTime();
+  /**
+   * 
+   * [Output only] The time at which this configuration version was updated in
+   * Cloud IoT Core. This timestamp is set by the server.
+   * 

+   *
+   * .google.protobuf.Timestamp cloud_update_time = 2;
+   */
+  com.google.protobuf.TimestampOrBuilder getCloudUpdateTimeOrBuilder();
+
+  /**
+   * 
+   * [Output only] The time at which Cloud IoT Core received the
+   * acknowledgment from the device, indicating that the device has received
+   * this configuration version. If this field is not present, the device has
+   * not yet acknowledged that it received this version. Note that when
+   * the config was sent to the device, many config versions may have been
+   * available in Cloud IoT Core while the device was disconnected, and on
+   * connection, only the latest version is sent to the device. Some
+   * versions may never be sent to the device, and therefore are never
+   * acknowledged. This timestamp is set by Cloud IoT Core.
+   * 

+   *
+   * .google.protobuf.Timestamp device_ack_time = 3;
+   */
+  boolean hasDeviceAckTime();
+  /**
+   * 
+   * [Output only] The time at which Cloud IoT Core received the
+   * acknowledgment from the device, indicating that the device has received
+   * this configuration version. If this field is not present, the device has
+   * not yet acknowledged that it received this version. Note that when
+   * the config was sent to the device, many config versions may have been
+   * available in Cloud IoT Core while the device was disconnected, and on
+   * connection, only the latest version is sent to the device. Some
+   * versions may never be sent to the device, and therefore are never
+   * acknowledged. This timestamp is set by Cloud IoT Core.
+   * 

+   *
+   * .google.protobuf.Timestamp device_ack_time = 3;
+   */
+  com.google.protobuf.Timestamp getDeviceAckTime();
+  /**
+   * 
+   * [Output only] The time at which Cloud IoT Core received the
+   * acknowledgment from the device, indicating that the device has received
+   * this configuration version. If this field is not present, the device has
+   * not yet acknowledged that it received this version. Note that when
+   * the config was sent to the device, many config versions may have been
+   * available in Cloud IoT Core while the device was disconnected, and on
+   * connection, only the latest version is sent to the device. Some
+   * versions may never be sent to the device, and therefore are never
+   * acknowledged. This timestamp is set by Cloud IoT Core.
+   * 

+   *
+   * .google.protobuf.Timestamp device_ack_time = 3;
+   */
+  com.google.protobuf.TimestampOrBuilder getDeviceAckTimeOrBuilder();
+
+  /**
+   * 
+   * The device configuration data.
+   * 

+   *
+   * bytes binary_data = 4;
+   */
+  com.google.protobuf.ByteString getBinaryData();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java
new file mode 100644
index 000000000000..7048acf6fa1d
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java
@@ -0,0 +1,1090 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * A server-stored device credential used for authentication.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.DeviceCredential}
+ */
+public  final class DeviceCredential extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.DeviceCredential)
+    DeviceCredentialOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use DeviceCredential.newBuilder() to construct.
+  private DeviceCredential(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private DeviceCredential() {
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private DeviceCredential(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 18: {
+            com.google.cloud.iot.v1.PublicKeyCredential.Builder subBuilder = null;
+            if (credentialCase_ == 2) {
+              subBuilder = ((com.google.cloud.iot.v1.PublicKeyCredential) credential_).toBuilder();
+            }
+            credential_ =
+                input.readMessage(com.google.cloud.iot.v1.PublicKeyCredential.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.cloud.iot.v1.PublicKeyCredential) credential_);
+              credential_ = subBuilder.buildPartial();
+            }
+            credentialCase_ = 2;
+            break;
+          }
+          case 50: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (expirationTime_ != null) {
+              subBuilder = expirationTime_.toBuilder();
+            }
+            expirationTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(expirationTime_);
+              expirationTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceCredential_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceCredential_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.DeviceCredential.class, com.google.cloud.iot.v1.DeviceCredential.Builder.class);
+  }
+
+  private int credentialCase_ = 0;
+  private java.lang.Object credential_;
+  public enum CredentialCase
+      implements com.google.protobuf.Internal.EnumLite {
+    PUBLIC_KEY(2),
+    CREDENTIAL_NOT_SET(0);
+    private final int value;
+    private CredentialCase(int value) {
+      this.value = value;
+    }
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static CredentialCase valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static CredentialCase forNumber(int value) {
+      switch (value) {
+        case 2: return PUBLIC_KEY;
+        case 0: return CREDENTIAL_NOT_SET;
+        default: return null;
+      }
+    }
+    public int getNumber() {
+      return this.value;
+    }
+  };
+
+  public CredentialCase
+  getCredentialCase() {
+    return CredentialCase.forNumber(
+        credentialCase_);
+  }
+
+  public static final int PUBLIC_KEY_FIELD_NUMBER = 2;
+  /**
+   * 
+   * A public key used to verify the signature of JSON Web Tokens (JWTs).
+   * When adding a new device credential, either via device creation or via
+   * modifications, this public key credential may be required to be signed by
+   * one of the registry level certificates. More specifically, if the
+   * registry contains at least one certificate, any new device credential
+   * must be signed by one of the registry certificates. As a result,
+   * when the registry contains certificates, only X.509 certificates are
+   * accepted as device credentials. However, if the registry does
+   * not contain a certificate, self-signed certificates and public keys will
+   * be accepted. New device credentials must be different from every
+   * registry-level certificate.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+   */
+  public boolean hasPublicKey() {
+    return credentialCase_ == 2;
+  }
+  /**
+   * 
+   * A public key used to verify the signature of JSON Web Tokens (JWTs).
+   * When adding a new device credential, either via device creation or via
+   * modifications, this public key credential may be required to be signed by
+   * one of the registry level certificates. More specifically, if the
+   * registry contains at least one certificate, any new device credential
+   * must be signed by one of the registry certificates. As a result,
+   * when the registry contains certificates, only X.509 certificates are
+   * accepted as device credentials. However, if the registry does
+   * not contain a certificate, self-signed certificates and public keys will
+   * be accepted. New device credentials must be different from every
+   * registry-level certificate.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+   */
+  public com.google.cloud.iot.v1.PublicKeyCredential getPublicKey() {
+    if (credentialCase_ == 2) {
+       return (com.google.cloud.iot.v1.PublicKeyCredential) credential_;
+    }
+    return com.google.cloud.iot.v1.PublicKeyCredential.getDefaultInstance();
+  }
+  /**
+   * 
+   * A public key used to verify the signature of JSON Web Tokens (JWTs).
+   * When adding a new device credential, either via device creation or via
+   * modifications, this public key credential may be required to be signed by
+   * one of the registry level certificates. More specifically, if the
+   * registry contains at least one certificate, any new device credential
+   * must be signed by one of the registry certificates. As a result,
+   * when the registry contains certificates, only X.509 certificates are
+   * accepted as device credentials. However, if the registry does
+   * not contain a certificate, self-signed certificates and public keys will
+   * be accepted. New device credentials must be different from every
+   * registry-level certificate.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+   */
+  public com.google.cloud.iot.v1.PublicKeyCredentialOrBuilder getPublicKeyOrBuilder() {
+    if (credentialCase_ == 2) {
+       return (com.google.cloud.iot.v1.PublicKeyCredential) credential_;
+    }
+    return com.google.cloud.iot.v1.PublicKeyCredential.getDefaultInstance();
+  }
+
+  public static final int EXPIRATION_TIME_FIELD_NUMBER = 6;
+  private com.google.protobuf.Timestamp expirationTime_;
+  /**
+   * 
+   * [Optional] The time at which this credential becomes invalid. This
+   * credential will be ignored for new client authentication requests after
+   * this timestamp; however, it will not be automatically deleted.
+   * 

+   *
+   * .google.protobuf.Timestamp expiration_time = 6;
+   */
+  public boolean hasExpirationTime() {
+    return expirationTime_ != null;
+  }
+  /**
+   * 
+   * [Optional] The time at which this credential becomes invalid. This
+   * credential will be ignored for new client authentication requests after
+   * this timestamp; however, it will not be automatically deleted.
+   * 

+   *
+   * .google.protobuf.Timestamp expiration_time = 6;
+   */
+  public com.google.protobuf.Timestamp getExpirationTime() {
+    return expirationTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expirationTime_;
+  }
+  /**
+   * 
+   * [Optional] The time at which this credential becomes invalid. This
+   * credential will be ignored for new client authentication requests after
+   * this timestamp; however, it will not be automatically deleted.
+   * 

+   *
+   * .google.protobuf.Timestamp expiration_time = 6;
+   */
+  public com.google.protobuf.TimestampOrBuilder getExpirationTimeOrBuilder() {
+    return getExpirationTime();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (credentialCase_ == 2) {
+      output.writeMessage(2, (com.google.cloud.iot.v1.PublicKeyCredential) credential_);
+    }
+    if (expirationTime_ != null) {
+      output.writeMessage(6, getExpirationTime());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (credentialCase_ == 2) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, (com.google.cloud.iot.v1.PublicKeyCredential) credential_);
+    }
+    if (expirationTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(6, getExpirationTime());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.DeviceCredential)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.DeviceCredential other = (com.google.cloud.iot.v1.DeviceCredential) obj;
+
+    boolean result = true;
+    result = result && (hasExpirationTime() == other.hasExpirationTime());
+    if (hasExpirationTime()) {
+      result = result && getExpirationTime()
+          .equals(other.getExpirationTime());
+    }
+    result = result && getCredentialCase().equals(
+        other.getCredentialCase());
+    if (!result) return false;
+    switch (credentialCase_) {
+      case 2:
+        result = result && getPublicKey()
+            .equals(other.getPublicKey());
+        break;
+      case 0:
+      default:
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasExpirationTime()) {
+      hash = (37 * hash) + EXPIRATION_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getExpirationTime().hashCode();
+    }
+    switch (credentialCase_) {
+      case 2:
+        hash = (37 * hash) + PUBLIC_KEY_FIELD_NUMBER;
+        hash = (53 * hash) + getPublicKey().hashCode();
+        break;
+      case 0:
+      default:
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.DeviceCredential parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeviceCredential parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceCredential parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeviceCredential parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceCredential parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeviceCredential parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceCredential parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeviceCredential parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceCredential parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeviceCredential parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceCredential parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeviceCredential parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.DeviceCredential prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * A server-stored device credential used for authentication.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.DeviceCredential}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.DeviceCredential)
+      com.google.cloud.iot.v1.DeviceCredentialOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceCredential_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceCredential_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.DeviceCredential.class, com.google.cloud.iot.v1.DeviceCredential.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.DeviceCredential.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (expirationTimeBuilder_ == null) {
+        expirationTime_ = null;
+      } else {
+        expirationTime_ = null;
+        expirationTimeBuilder_ = null;
+      }
+      credentialCase_ = 0;
+      credential_ = null;
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceCredential_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.DeviceCredential getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.DeviceCredential.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.DeviceCredential build() {
+      com.google.cloud.iot.v1.DeviceCredential result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.DeviceCredential buildPartial() {
+      com.google.cloud.iot.v1.DeviceCredential result = new com.google.cloud.iot.v1.DeviceCredential(this);
+      if (credentialCase_ == 2) {
+        if (publicKeyBuilder_ == null) {
+          result.credential_ = credential_;
+        } else {
+          result.credential_ = publicKeyBuilder_.build();
+        }
+      }
+      if (expirationTimeBuilder_ == null) {
+        result.expirationTime_ = expirationTime_;
+      } else {
+        result.expirationTime_ = expirationTimeBuilder_.build();
+      }
+      result.credentialCase_ = credentialCase_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.DeviceCredential) {
+        return mergeFrom((com.google.cloud.iot.v1.DeviceCredential)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.DeviceCredential other) {
+      if (other == com.google.cloud.iot.v1.DeviceCredential.getDefaultInstance()) return this;
+      if (other.hasExpirationTime()) {
+        mergeExpirationTime(other.getExpirationTime());
+      }
+      switch (other.getCredentialCase()) {
+        case PUBLIC_KEY: {
+          mergePublicKey(other.getPublicKey());
+          break;
+        }
+        case CREDENTIAL_NOT_SET: {
+          break;
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.DeviceCredential parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.DeviceCredential) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int credentialCase_ = 0;
+    private java.lang.Object credential_;
+    public CredentialCase
+        getCredentialCase() {
+      return CredentialCase.forNumber(
+          credentialCase_);
+    }
+
+    public Builder clearCredential() {
+      credentialCase_ = 0;
+      credential_ = null;
+      onChanged();
+      return this;
+    }
+
+
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.PublicKeyCredential, com.google.cloud.iot.v1.PublicKeyCredential.Builder, com.google.cloud.iot.v1.PublicKeyCredentialOrBuilder> publicKeyBuilder_;
+    /**
+     * 
+     * A public key used to verify the signature of JSON Web Tokens (JWTs).
+     * When adding a new device credential, either via device creation or via
+     * modifications, this public key credential may be required to be signed by
+     * one of the registry level certificates. More specifically, if the
+     * registry contains at least one certificate, any new device credential
+     * must be signed by one of the registry certificates. As a result,
+     * when the registry contains certificates, only X.509 certificates are
+     * accepted as device credentials. However, if the registry does
+     * not contain a certificate, self-signed certificates and public keys will
+     * be accepted. New device credentials must be different from every
+     * registry-level certificate.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+     */
+    public boolean hasPublicKey() {
+      return credentialCase_ == 2;
+    }
+    /**
+     * 
+     * A public key used to verify the signature of JSON Web Tokens (JWTs).
+     * When adding a new device credential, either via device creation or via
+     * modifications, this public key credential may be required to be signed by
+     * one of the registry level certificates. More specifically, if the
+     * registry contains at least one certificate, any new device credential
+     * must be signed by one of the registry certificates. As a result,
+     * when the registry contains certificates, only X.509 certificates are
+     * accepted as device credentials. However, if the registry does
+     * not contain a certificate, self-signed certificates and public keys will
+     * be accepted. New device credentials must be different from every
+     * registry-level certificate.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+     */
+    public com.google.cloud.iot.v1.PublicKeyCredential getPublicKey() {
+      if (publicKeyBuilder_ == null) {
+        if (credentialCase_ == 2) {
+          return (com.google.cloud.iot.v1.PublicKeyCredential) credential_;
+        }
+        return com.google.cloud.iot.v1.PublicKeyCredential.getDefaultInstance();
+      } else {
+        if (credentialCase_ == 2) {
+          return publicKeyBuilder_.getMessage();
+        }
+        return com.google.cloud.iot.v1.PublicKeyCredential.getDefaultInstance();
+      }
+    }
+    /**
+     * 
+     * A public key used to verify the signature of JSON Web Tokens (JWTs).
+     * When adding a new device credential, either via device creation or via
+     * modifications, this public key credential may be required to be signed by
+     * one of the registry level certificates. More specifically, if the
+     * registry contains at least one certificate, any new device credential
+     * must be signed by one of the registry certificates. As a result,
+     * when the registry contains certificates, only X.509 certificates are
+     * accepted as device credentials. However, if the registry does
+     * not contain a certificate, self-signed certificates and public keys will
+     * be accepted. New device credentials must be different from every
+     * registry-level certificate.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+     */
+    public Builder setPublicKey(com.google.cloud.iot.v1.PublicKeyCredential value) {
+      if (publicKeyBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        credential_ = value;
+        onChanged();
+      } else {
+        publicKeyBuilder_.setMessage(value);
+      }
+      credentialCase_ = 2;
+      return this;
+    }
+    /**
+     * 
+     * A public key used to verify the signature of JSON Web Tokens (JWTs).
+     * When adding a new device credential, either via device creation or via
+     * modifications, this public key credential may be required to be signed by
+     * one of the registry level certificates. More specifically, if the
+     * registry contains at least one certificate, any new device credential
+     * must be signed by one of the registry certificates. As a result,
+     * when the registry contains certificates, only X.509 certificates are
+     * accepted as device credentials. However, if the registry does
+     * not contain a certificate, self-signed certificates and public keys will
+     * be accepted. New device credentials must be different from every
+     * registry-level certificate.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+     */
+    public Builder setPublicKey(
+        com.google.cloud.iot.v1.PublicKeyCredential.Builder builderForValue) {
+      if (publicKeyBuilder_ == null) {
+        credential_ = builderForValue.build();
+        onChanged();
+      } else {
+        publicKeyBuilder_.setMessage(builderForValue.build());
+      }
+      credentialCase_ = 2;
+      return this;
+    }
+    /**
+     * 
+     * A public key used to verify the signature of JSON Web Tokens (JWTs).
+     * When adding a new device credential, either via device creation or via
+     * modifications, this public key credential may be required to be signed by
+     * one of the registry level certificates. More specifically, if the
+     * registry contains at least one certificate, any new device credential
+     * must be signed by one of the registry certificates. As a result,
+     * when the registry contains certificates, only X.509 certificates are
+     * accepted as device credentials. However, if the registry does
+     * not contain a certificate, self-signed certificates and public keys will
+     * be accepted. New device credentials must be different from every
+     * registry-level certificate.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+     */
+    public Builder mergePublicKey(com.google.cloud.iot.v1.PublicKeyCredential value) {
+      if (publicKeyBuilder_ == null) {
+        if (credentialCase_ == 2 &&
+            credential_ != com.google.cloud.iot.v1.PublicKeyCredential.getDefaultInstance()) {
+          credential_ = com.google.cloud.iot.v1.PublicKeyCredential.newBuilder((com.google.cloud.iot.v1.PublicKeyCredential) credential_)
+              .mergeFrom(value).buildPartial();
+        } else {
+          credential_ = value;
+        }
+        onChanged();
+      } else {
+        if (credentialCase_ == 2) {
+          publicKeyBuilder_.mergeFrom(value);
+        }
+        publicKeyBuilder_.setMessage(value);
+      }
+      credentialCase_ = 2;
+      return this;
+    }
+    /**
+     * 
+     * A public key used to verify the signature of JSON Web Tokens (JWTs).
+     * When adding a new device credential, either via device creation or via
+     * modifications, this public key credential may be required to be signed by
+     * one of the registry level certificates. More specifically, if the
+     * registry contains at least one certificate, any new device credential
+     * must be signed by one of the registry certificates. As a result,
+     * when the registry contains certificates, only X.509 certificates are
+     * accepted as device credentials. However, if the registry does
+     * not contain a certificate, self-signed certificates and public keys will
+     * be accepted. New device credentials must be different from every
+     * registry-level certificate.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+     */
+    public Builder clearPublicKey() {
+      if (publicKeyBuilder_ == null) {
+        if (credentialCase_ == 2) {
+          credentialCase_ = 0;
+          credential_ = null;
+          onChanged();
+        }
+      } else {
+        if (credentialCase_ == 2) {
+          credentialCase_ = 0;
+          credential_ = null;
+        }
+        publicKeyBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * A public key used to verify the signature of JSON Web Tokens (JWTs).
+     * When adding a new device credential, either via device creation or via
+     * modifications, this public key credential may be required to be signed by
+     * one of the registry level certificates. More specifically, if the
+     * registry contains at least one certificate, any new device credential
+     * must be signed by one of the registry certificates. As a result,
+     * when the registry contains certificates, only X.509 certificates are
+     * accepted as device credentials. However, if the registry does
+     * not contain a certificate, self-signed certificates and public keys will
+     * be accepted. New device credentials must be different from every
+     * registry-level certificate.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+     */
+    public com.google.cloud.iot.v1.PublicKeyCredential.Builder getPublicKeyBuilder() {
+      return getPublicKeyFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * A public key used to verify the signature of JSON Web Tokens (JWTs).
+     * When adding a new device credential, either via device creation or via
+     * modifications, this public key credential may be required to be signed by
+     * one of the registry level certificates. More specifically, if the
+     * registry contains at least one certificate, any new device credential
+     * must be signed by one of the registry certificates. As a result,
+     * when the registry contains certificates, only X.509 certificates are
+     * accepted as device credentials. However, if the registry does
+     * not contain a certificate, self-signed certificates and public keys will
+     * be accepted. New device credentials must be different from every
+     * registry-level certificate.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+     */
+    public com.google.cloud.iot.v1.PublicKeyCredentialOrBuilder getPublicKeyOrBuilder() {
+      if ((credentialCase_ == 2) && (publicKeyBuilder_ != null)) {
+        return publicKeyBuilder_.getMessageOrBuilder();
+      } else {
+        if (credentialCase_ == 2) {
+          return (com.google.cloud.iot.v1.PublicKeyCredential) credential_;
+        }
+        return com.google.cloud.iot.v1.PublicKeyCredential.getDefaultInstance();
+      }
+    }
+    /**
+     * 
+     * A public key used to verify the signature of JSON Web Tokens (JWTs).
+     * When adding a new device credential, either via device creation or via
+     * modifications, this public key credential may be required to be signed by
+     * one of the registry level certificates. More specifically, if the
+     * registry contains at least one certificate, any new device credential
+     * must be signed by one of the registry certificates. As a result,
+     * when the registry contains certificates, only X.509 certificates are
+     * accepted as device credentials. However, if the registry does
+     * not contain a certificate, self-signed certificates and public keys will
+     * be accepted. New device credentials must be different from every
+     * registry-level certificate.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.PublicKeyCredential, com.google.cloud.iot.v1.PublicKeyCredential.Builder, com.google.cloud.iot.v1.PublicKeyCredentialOrBuilder> 
+        getPublicKeyFieldBuilder() {
+      if (publicKeyBuilder_ == null) {
+        if (!(credentialCase_ == 2)) {
+          credential_ = com.google.cloud.iot.v1.PublicKeyCredential.getDefaultInstance();
+        }
+        publicKeyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.iot.v1.PublicKeyCredential, com.google.cloud.iot.v1.PublicKeyCredential.Builder, com.google.cloud.iot.v1.PublicKeyCredentialOrBuilder>(
+                (com.google.cloud.iot.v1.PublicKeyCredential) credential_,
+                getParentForChildren(),
+                isClean());
+        credential_ = null;
+      }
+      credentialCase_ = 2;
+      onChanged();;
+      return publicKeyBuilder_;
+    }
+
+    private com.google.protobuf.Timestamp expirationTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> expirationTimeBuilder_;
+    /**
+     * 
+     * [Optional] The time at which this credential becomes invalid. This
+     * credential will be ignored for new client authentication requests after
+     * this timestamp; however, it will not be automatically deleted.
+     * 

+     *
+     * .google.protobuf.Timestamp expiration_time = 6;
+     */
+    public boolean hasExpirationTime() {
+      return expirationTimeBuilder_ != null || expirationTime_ != null;
+    }
+    /**
+     * 
+     * [Optional] The time at which this credential becomes invalid. This
+     * credential will be ignored for new client authentication requests after
+     * this timestamp; however, it will not be automatically deleted.
+     * 

+     *
+     * .google.protobuf.Timestamp expiration_time = 6;
+     */
+    public com.google.protobuf.Timestamp getExpirationTime() {
+      if (expirationTimeBuilder_ == null) {
+        return expirationTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expirationTime_;
+      } else {
+        return expirationTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Optional] The time at which this credential becomes invalid. This
+     * credential will be ignored for new client authentication requests after
+     * this timestamp; however, it will not be automatically deleted.
+     * 

+     *
+     * .google.protobuf.Timestamp expiration_time = 6;
+     */
+    public Builder setExpirationTime(com.google.protobuf.Timestamp value) {
+      if (expirationTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        expirationTime_ = value;
+        onChanged();
+      } else {
+        expirationTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Optional] The time at which this credential becomes invalid. This
+     * credential will be ignored for new client authentication requests after
+     * this timestamp; however, it will not be automatically deleted.
+     * 

+     *
+     * .google.protobuf.Timestamp expiration_time = 6;
+     */
+    public Builder setExpirationTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (expirationTimeBuilder_ == null) {
+        expirationTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        expirationTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Optional] The time at which this credential becomes invalid. This
+     * credential will be ignored for new client authentication requests after
+     * this timestamp; however, it will not be automatically deleted.
+     * 

+     *
+     * .google.protobuf.Timestamp expiration_time = 6;
+     */
+    public Builder mergeExpirationTime(com.google.protobuf.Timestamp value) {
+      if (expirationTimeBuilder_ == null) {
+        if (expirationTime_ != null) {
+          expirationTime_ =
+            com.google.protobuf.Timestamp.newBuilder(expirationTime_).mergeFrom(value).buildPartial();
+        } else {
+          expirationTime_ = value;
+        }
+        onChanged();
+      } else {
+        expirationTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Optional] The time at which this credential becomes invalid. This
+     * credential will be ignored for new client authentication requests after
+     * this timestamp; however, it will not be automatically deleted.
+     * 

+     *
+     * .google.protobuf.Timestamp expiration_time = 6;
+     */
+    public Builder clearExpirationTime() {
+      if (expirationTimeBuilder_ == null) {
+        expirationTime_ = null;
+        onChanged();
+      } else {
+        expirationTime_ = null;
+        expirationTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Optional] The time at which this credential becomes invalid. This
+     * credential will be ignored for new client authentication requests after
+     * this timestamp; however, it will not be automatically deleted.
+     * 

+     *
+     * .google.protobuf.Timestamp expiration_time = 6;
+     */
+    public com.google.protobuf.Timestamp.Builder getExpirationTimeBuilder() {
+      
+      onChanged();
+      return getExpirationTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Optional] The time at which this credential becomes invalid. This
+     * credential will be ignored for new client authentication requests after
+     * this timestamp; however, it will not be automatically deleted.
+     * 

+     *
+     * .google.protobuf.Timestamp expiration_time = 6;
+     */
+    public com.google.protobuf.TimestampOrBuilder getExpirationTimeOrBuilder() {
+      if (expirationTimeBuilder_ != null) {
+        return expirationTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return expirationTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : expirationTime_;
+      }
+    }
+    /**
+     * 
+     * [Optional] The time at which this credential becomes invalid. This
+     * credential will be ignored for new client authentication requests after
+     * this timestamp; however, it will not be automatically deleted.
+     * 

+     *
+     * .google.protobuf.Timestamp expiration_time = 6;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getExpirationTimeFieldBuilder() {
+      if (expirationTimeBuilder_ == null) {
+        expirationTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getExpirationTime(),
+                getParentForChildren(),
+                isClean());
+        expirationTime_ = null;
+      }
+      return expirationTimeBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.DeviceCredential)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.DeviceCredential)
+  private static final com.google.cloud.iot.v1.DeviceCredential DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.DeviceCredential();
+  }
+
+  public static com.google.cloud.iot.v1.DeviceCredential getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public DeviceCredential parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new DeviceCredential(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.DeviceCredential getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredentialOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredentialOrBuilder.java
new file mode 100644
index 000000000000..7f12fbd0b304
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredentialOrBuilder.java
@@ -0,0 +1,97 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface DeviceCredentialOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.DeviceCredential)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * A public key used to verify the signature of JSON Web Tokens (JWTs).
+   * When adding a new device credential, either via device creation or via
+   * modifications, this public key credential may be required to be signed by
+   * one of the registry level certificates. More specifically, if the
+   * registry contains at least one certificate, any new device credential
+   * must be signed by one of the registry certificates. As a result,
+   * when the registry contains certificates, only X.509 certificates are
+   * accepted as device credentials. However, if the registry does
+   * not contain a certificate, self-signed certificates and public keys will
+   * be accepted. New device credentials must be different from every
+   * registry-level certificate.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+   */
+  boolean hasPublicKey();
+  /**
+   * 
+   * A public key used to verify the signature of JSON Web Tokens (JWTs).
+   * When adding a new device credential, either via device creation or via
+   * modifications, this public key credential may be required to be signed by
+   * one of the registry level certificates. More specifically, if the
+   * registry contains at least one certificate, any new device credential
+   * must be signed by one of the registry certificates. As a result,
+   * when the registry contains certificates, only X.509 certificates are
+   * accepted as device credentials. However, if the registry does
+   * not contain a certificate, self-signed certificates and public keys will
+   * be accepted. New device credentials must be different from every
+   * registry-level certificate.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+   */
+  com.google.cloud.iot.v1.PublicKeyCredential getPublicKey();
+  /**
+   * 
+   * A public key used to verify the signature of JSON Web Tokens (JWTs).
+   * When adding a new device credential, either via device creation or via
+   * modifications, this public key credential may be required to be signed by
+   * one of the registry level certificates. More specifically, if the
+   * registry contains at least one certificate, any new device credential
+   * must be signed by one of the registry certificates. As a result,
+   * when the registry contains certificates, only X.509 certificates are
+   * accepted as device credentials. However, if the registry does
+   * not contain a certificate, self-signed certificates and public keys will
+   * be accepted. New device credentials must be different from every
+   * registry-level certificate.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCredential public_key = 2;
+   */
+  com.google.cloud.iot.v1.PublicKeyCredentialOrBuilder getPublicKeyOrBuilder();
+
+  /**
+   * 
+   * [Optional] The time at which this credential becomes invalid. This
+   * credential will be ignored for new client authentication requests after
+   * this timestamp; however, it will not be automatically deleted.
+   * 

+   *
+   * .google.protobuf.Timestamp expiration_time = 6;
+   */
+  boolean hasExpirationTime();
+  /**
+   * 
+   * [Optional] The time at which this credential becomes invalid. This
+   * credential will be ignored for new client authentication requests after
+   * this timestamp; however, it will not be automatically deleted.
+   * 

+   *
+   * .google.protobuf.Timestamp expiration_time = 6;
+   */
+  com.google.protobuf.Timestamp getExpirationTime();
+  /**
+   * 
+   * [Optional] The time at which this credential becomes invalid. This
+   * credential will be ignored for new client authentication requests after
+   * this timestamp; however, it will not be automatically deleted.
+   * 

+   *
+   * .google.protobuf.Timestamp expiration_time = 6;
+   */
+  com.google.protobuf.TimestampOrBuilder getExpirationTimeOrBuilder();
+
+  public com.google.cloud.iot.v1.DeviceCredential.CredentialCase getCredentialCase();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java
new file mode 100644
index 000000000000..8091d15e9121
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java
@@ -0,0 +1,390 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public final class DeviceManagerProto {
+  private DeviceManagerProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_CreateDeviceRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_CreateDeviceRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_GetDeviceRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_GetDeviceRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_UpdateDeviceRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_UpdateDeviceRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_DeleteDeviceRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_DeleteDeviceRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_ListDevicesRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_ListDevicesRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_ListDevicesResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_ListDevicesResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n(google/cloud/iot/v1/device_manager.pro" +
+      "to\022\023google.cloud.iot.v1\032\034google/api/anno" +
+      "tations.proto\032#google/cloud/iot/v1/resou" +
+      "rces.proto\032\036google/iam/v1/iam_policy.pro" +
+      "to\032\032google/iam/v1/policy.proto\032\036google/p" +
+      "rotobuf/duration.proto\032\033google/protobuf/" +
+      "empty.proto\032 google/protobuf/field_mask." +
+      "proto\032\037google/protobuf/timestamp.proto\"k" +
+      "\n\033CreateDeviceRegistryRequest\022\016\n\006parent\030" +
+      "\001 \001(\t\022<\n\017device_registry\030\002 \001(\0132#.google." +
+      "cloud.iot.v1.DeviceRegistry\"(\n\030GetDevice" +
+      "RegistryRequest\022\014\n\004name\030\001 \001(\t\"+\n\033DeleteD" +
+      "eviceRegistryRequest\022\014\n\004name\030\001 \001(\t\"\214\001\n\033U" +
+      "pdateDeviceRegistryRequest\022<\n\017device_reg" +
+      "istry\030\001 \001(\0132#.google.cloud.iot.v1.Device" +
+      "Registry\022/\n\013update_mask\030\002 \001(\0132\032.google.p" +
+      "rotobuf.FieldMask\"T\n\033ListDeviceRegistrie" +
+      "sRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\tpage_size\030\002 " +
+      "\001(\005\022\022\n\npage_token\030\003 \001(\t\"w\n\034ListDeviceReg" +
+      "istriesResponse\022>\n\021device_registries\030\001 \003" +
+      "(\0132#.google.cloud.iot.v1.DeviceRegistry\022" +
+      "\027\n\017next_page_token\030\002 \001(\t\"R\n\023CreateDevice" +
+      "Request\022\016\n\006parent\030\001 \001(\t\022+\n\006device\030\002 \001(\0132" +
+      "\033.google.cloud.iot.v1.Device\"P\n\020GetDevic" +
+      "eRequest\022\014\n\004name\030\001 \001(\t\022.\n\nfield_mask\030\002 \001" +
+      "(\0132\032.google.protobuf.FieldMask\"s\n\023Update" +
+      "DeviceRequest\022+\n\006device\030\002 \001(\0132\033.google.c" +
+      "loud.iot.v1.Device\022/\n\013update_mask\030\003 \001(\0132" +
+      "\032.google.protobuf.FieldMask\"#\n\023DeleteDev" +
+      "iceRequest\022\014\n\004name\030\001 \001(\t\"\247\001\n\022ListDevices" +
+      "Request\022\016\n\006parent\030\001 \001(\t\022\026\n\016device_num_id" +
+      "s\030\002 \003(\004\022\022\n\ndevice_ids\030\003 \003(\t\022.\n\nfield_mas" +
+      "k\030\004 \001(\0132\032.google.protobuf.FieldMask\022\021\n\tp" +
+      "age_size\030d \001(\005\022\022\n\npage_token\030e \001(\t\"\\\n\023Li" +
+      "stDevicesResponse\022,\n\007devices\030\001 \003(\0132\033.goo" +
+      "gle.cloud.iot.v1.Device\022\027\n\017next_page_tok" +
+      "en\030\002 \001(\t\"`\n ModifyCloudToDeviceConfigReq" +
+      "uest\022\014\n\004name\030\001 \001(\t\022\031\n\021version_to_update\030" +
+      "\002 \001(\003\022\023\n\013binary_data\030\003 \001(\014\"E\n\037ListDevice" +
+      "ConfigVersionsRequest\022\014\n\004name\030\001 \001(\t\022\024\n\014n" +
+      "um_versions\030\002 \001(\005\"]\n ListDeviceConfigVer" +
+      "sionsResponse\0229\n\016device_configs\030\001 \003(\0132!." +
+      "google.cloud.iot.v1.DeviceConfig\";\n\027List" +
+      "DeviceStatesRequest\022\014\n\004name\030\001 \001(\t\022\022\n\nnum" +
+      "_states\030\002 \001(\005\"S\n\030ListDeviceStatesRespons" +
+      "e\0227\n\rdevice_states\030\001 \003(\0132 .google.cloud." +
+      "iot.v1.DeviceState2\223\034\n\rDeviceManager\022\266\001\n" +
+      "\024CreateDeviceRegistry\0220.google.cloud.iot" +
+      ".v1.CreateDeviceRegistryRequest\032#.google" +
+      ".cloud.iot.v1.DeviceRegistry\"G\202\323\344\223\002A\"./v" +
+      "1/{parent=projects/*/locations/*}/regist" +
+      "ries:\017device_registry\022\237\001\n\021GetDeviceRegis" +
+      "try\022-.google.cloud.iot.v1.GetDeviceRegis" +
+      "tryRequest\032#.google.cloud.iot.v1.DeviceR" +
+      "egistry\"6\202\323\344\223\0020\022./v1/{name=projects/*/lo" +
+      "cations/*/registries/*}\022\306\001\n\024UpdateDevice" +
+      "Registry\0220.google.cloud.iot.v1.UpdateDev" +
+      "iceRegistryRequest\032#.google.cloud.iot.v1" +
+      ".DeviceRegistry\"W\202\323\344\223\002Q2>/v1/{device_reg" +
+      "istry.name=projects/*/locations/*/regist" +
+      "ries/*}:\017device_registry\022\230\001\n\024DeleteDevic" +
+      "eRegistry\0220.google.cloud.iot.v1.DeleteDe" +
+      "viceRegistryRequest\032\026.google.protobuf.Em" +
+      "pty\"6\202\323\344\223\0020*./v1/{name=projects/*/locati" +
+      "ons/*/registries/*}\022\263\001\n\024ListDeviceRegist" +
+      "ries\0220.google.cloud.iot.v1.ListDeviceReg" +
+      "istriesRequest\0321.google.cloud.iot.v1.Lis" +
+      "tDeviceRegistriesResponse\"6\202\323\344\223\0020\022./v1/{" +
+      "parent=projects/*/locations/*}/registrie" +
+      "s\022\237\001\n\014CreateDevice\022(.google.cloud.iot.v1" +
+      ".CreateDeviceRequest\032\033.google.cloud.iot." +
+      "v1.Device\"H\202\323\344\223\002B\"8/v1/{parent=projects/" +
+      "*/locations/*/registries/*}/devices:\006dev" +
+      "ice\022\327\001\n\tGetDevice\022%.google.cloud.iot.v1." +
+      "GetDeviceRequest\032\033.google.cloud.iot.v1.D" +
+      "evice\"\205\001\202\323\344\223\002\177\0228/v1/{name=projects/*/loc" +
+      "ations/*/registries/*/devices/*}ZC\022A/v1/" +
+      "{name=projects/*/locations/*/registries/" +
+      "*/groups/*/devices/*}\022\374\001\n\014UpdateDevice\022(" +
+      ".google.cloud.iot.v1.UpdateDeviceRequest" +
+      "\032\033.google.cloud.iot.v1.Device\"\244\001\202\323\344\223\002\235\0012" +
+      "?/v1/{device.name=projects/*/locations/*" +
+      "/registries/*/devices/*}:\006deviceZR2H/v1/" +
+      "{device.name=projects/*/locations/*/regi" +
+      "stries/*/groups/*/devices/*}:\006device\022\330\001\n" +
+      "\014DeleteDevice\022(.google.cloud.iot.v1.Dele" +
+      "teDeviceRequest\032\026.google.protobuf.Empty\"" +
+      "\205\001\202\323\344\223\002\177*8/v1/{name=projects/*/locations" +
+      "/*/registries/*/devices/*}ZC*A/v1/{name=" +
+      "projects/*/locations/*/registries/*/grou" +
+      "ps/*/devices/*}\022\332\001\n\013ListDevices\022\'.google" +
+      ".cloud.iot.v1.ListDevicesRequest\032(.googl" +
+      "e.cloud.iot.v1.ListDevicesResponse\"x\202\323\344\223" +
+      "\002r\0228/v1/{parent=projects/*/locations/*/r" +
+      "egistries/*}/devicesZ6\0224/v1/{parent=proj" +
+      "ects/*/locations/*/groups/*}/devices\022\270\002\n" +
+      "\031ModifyCloudToDeviceConfig\0225.google.clou" +
+      "d.iot.v1.ModifyCloudToDeviceConfigReques" +
+      "t\032!.google.cloud.iot.v1.DeviceConfig\"\300\001\202" +
+      "\323\344\223\002\271\001\"R/v1/{name=projects/*/locations/*" +
+      "/registries/*/devices/*}:modifyCloudToDe" +
+      "viceConfig:\001*Z`\"[/v1/{name=projects/*/lo" +
+      "cations/*/registries/*/groups/*/devices/" +
+      "*}:modifyCloudToDeviceConfig:\001*\022\256\002\n\030List" +
+      "DeviceConfigVersions\0224.google.cloud.iot." +
+      "v1.ListDeviceConfigVersionsRequest\0325.goo" +
+      "gle.cloud.iot.v1.ListDeviceConfigVersion" +
+      "sResponse\"\244\001\202\323\344\223\002\235\001\022G/v1/{name=projects/" +
+      "*/locations/*/registries/*/devices/*}/co" +
+      "nfigVersionsZR\022P/v1/{name=projects/*/loc" +
+      "ations/*/registries/*/groups/*/devices/*" +
+      "}/configVersions\022\206\002\n\020ListDeviceStates\022,." +
+      "google.cloud.iot.v1.ListDeviceStatesRequ" +
+      "est\032-.google.cloud.iot.v1.ListDeviceStat" +
+      "esResponse\"\224\001\202\323\344\223\002\215\001\022?/v1/{name=projects" +
+      "/*/locations/*/registries/*/devices/*}/s" +
+      "tatesZJ\022H/v1/{name=projects/*/locations/" +
+      "*/registries/*/groups/*/devices/*}/state" +
+      "s\022\346\001\n\014SetIamPolicy\022\".google.iam.v1.SetIa" +
+      "mPolicyRequest\032\025.google.iam.v1.Policy\"\232\001" +
+      "\202\323\344\223\002\223\001\"?/v1/{resource=projects/*/locati" +
+      "ons/*/registries/*}:setIamPolicy:\001*ZM\"H/" +
+      "v1/{resource=projects/*/locations/*/regi" +
+      "stries/*/groups/*}:setIamPolicy:\001*\022\346\001\n\014G" +
+      "etIamPolicy\022\".google.iam.v1.GetIamPolicy" +
+      "Request\032\025.google.iam.v1.Policy\"\232\001\202\323\344\223\002\223\001" +
+      "\"?/v1/{resource=projects/*/locations/*/r" +
+      "egistries/*}:getIamPolicy:\001*ZM\"H/v1/{res" +
+      "ource=projects/*/locations/*/registries/" +
+      "*/groups/*}:getIamPolicy:\001*\022\222\002\n\022TestIamP" +
+      "ermissions\022(.google.iam.v1.TestIamPermis" +
+      "sionsRequest\032).google.iam.v1.TestIamPerm" +
+      "issionsResponse\"\246\001\202\323\344\223\002\237\001\"E/v1/{resource" +
+      "=projects/*/locations/*/registries/*}:te" +
+      "stIamPermissions:\001*ZS\"N/v1/{resource=pro" +
+      "jects/*/locations/*/registries/*/groups/" +
+      "*}:testIamPermissions:\001*Bj\n\027com.google.c" +
+      "loud.iot.v1B\022DeviceManagerProtoP\001Z6googl" +
+      "e.golang.org/genproto/googleapis/cloud/i" +
+      "ot/v1;iot\370\001\001b\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.api.AnnotationsProto.getDescriptor(),
+          com.google.cloud.iot.v1.ResourcesProto.getDescriptor(),
+          com.google.iam.v1.IamPolicyProto.getDescriptor(),
+          com.google.iam.v1.PolicyProto.getDescriptor(),
+          com.google.protobuf.DurationProto.getDescriptor(),
+          com.google.protobuf.EmptyProto.getDescriptor(),
+          com.google.protobuf.FieldMaskProto.getDescriptor(),
+          com.google.protobuf.TimestampProto.getDescriptor(),
+        }, assigner);
+    internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_descriptor,
+        new java.lang.String[] { "Parent", "DeviceRegistry", });
+    internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_descriptor,
+        new java.lang.String[] { "Name", });
+    internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_descriptor,
+        new java.lang.String[] { "Name", });
+    internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_descriptor,
+        new java.lang.String[] { "DeviceRegistry", "UpdateMask", });
+    internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_descriptor =
+      getDescriptor().getMessageTypes().get(4);
+    internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_descriptor,
+        new java.lang.String[] { "Parent", "PageSize", "PageToken", });
+    internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_descriptor =
+      getDescriptor().getMessageTypes().get(5);
+    internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_descriptor,
+        new java.lang.String[] { "DeviceRegistries", "NextPageToken", });
+    internal_static_google_cloud_iot_v1_CreateDeviceRequest_descriptor =
+      getDescriptor().getMessageTypes().get(6);
+    internal_static_google_cloud_iot_v1_CreateDeviceRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_CreateDeviceRequest_descriptor,
+        new java.lang.String[] { "Parent", "Device", });
+    internal_static_google_cloud_iot_v1_GetDeviceRequest_descriptor =
+      getDescriptor().getMessageTypes().get(7);
+    internal_static_google_cloud_iot_v1_GetDeviceRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_GetDeviceRequest_descriptor,
+        new java.lang.String[] { "Name", "FieldMask", });
+    internal_static_google_cloud_iot_v1_UpdateDeviceRequest_descriptor =
+      getDescriptor().getMessageTypes().get(8);
+    internal_static_google_cloud_iot_v1_UpdateDeviceRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_UpdateDeviceRequest_descriptor,
+        new java.lang.String[] { "Device", "UpdateMask", });
+    internal_static_google_cloud_iot_v1_DeleteDeviceRequest_descriptor =
+      getDescriptor().getMessageTypes().get(9);
+    internal_static_google_cloud_iot_v1_DeleteDeviceRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_DeleteDeviceRequest_descriptor,
+        new java.lang.String[] { "Name", });
+    internal_static_google_cloud_iot_v1_ListDevicesRequest_descriptor =
+      getDescriptor().getMessageTypes().get(10);
+    internal_static_google_cloud_iot_v1_ListDevicesRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_ListDevicesRequest_descriptor,
+        new java.lang.String[] { "Parent", "DeviceNumIds", "DeviceIds", "FieldMask", "PageSize", "PageToken", });
+    internal_static_google_cloud_iot_v1_ListDevicesResponse_descriptor =
+      getDescriptor().getMessageTypes().get(11);
+    internal_static_google_cloud_iot_v1_ListDevicesResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_ListDevicesResponse_descriptor,
+        new java.lang.String[] { "Devices", "NextPageToken", });
+    internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_descriptor =
+      getDescriptor().getMessageTypes().get(12);
+    internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_descriptor,
+        new java.lang.String[] { "Name", "VersionToUpdate", "BinaryData", });
+    internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_descriptor =
+      getDescriptor().getMessageTypes().get(13);
+    internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_descriptor,
+        new java.lang.String[] { "Name", "NumVersions", });
+    internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_descriptor =
+      getDescriptor().getMessageTypes().get(14);
+    internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_descriptor,
+        new java.lang.String[] { "DeviceConfigs", });
+    internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_descriptor =
+      getDescriptor().getMessageTypes().get(15);
+    internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_descriptor,
+        new java.lang.String[] { "Name", "NumStates", });
+    internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_descriptor =
+      getDescriptor().getMessageTypes().get(16);
+    internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_descriptor,
+        new java.lang.String[] { "DeviceStates", });
+    com.google.protobuf.ExtensionRegistry registry =
+        com.google.protobuf.ExtensionRegistry.newInstance();
+    registry.add(com.google.api.AnnotationsProto.http);
+    com.google.protobuf.Descriptors.FileDescriptor
+        .internalUpdateFileDescriptor(descriptor, registry);
+    com.google.api.AnnotationsProto.getDescriptor();
+    com.google.cloud.iot.v1.ResourcesProto.getDescriptor();
+    com.google.iam.v1.IamPolicyProto.getDescriptor();
+    com.google.iam.v1.PolicyProto.getDescriptor();
+    com.google.protobuf.DurationProto.getDescriptor();
+    com.google.protobuf.EmptyProto.getDescriptor();
+    com.google.protobuf.FieldMaskProto.getDescriptor();
+    com.google.protobuf.TimestampProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceName.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceName.java
new file mode 100644
index 000000000000..309857e5c72f
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceName.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, 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.
+ */
+
+package com.google.cloud.iot.v1;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.api.resourcenames.ResourceNameType;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class DeviceName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/locations/{location}/registries/{registry}/devices/{device}");
+
+  private volatile Map fieldValuesMap;
+
+  private final String project;
+  private final String location;
+  private final String registry;
+  private final String device;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public String getRegistry() {
+    return registry;
+  }
+
+  public String getDevice() {
+    return device;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private DeviceName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    registry = Preconditions.checkNotNull(builder.getRegistry());
+    device = Preconditions.checkNotNull(builder.getDevice());
+  }
+
+  public static DeviceName of(String project, String location, String registry, String device) {
+    return newBuilder()
+      .setProject(project)
+      .setLocation(location)
+      .setRegistry(registry)
+      .setDevice(device)
+      .build();
+  }
+
+  public static String format(String project, String location, String registry, String device) {
+    return newBuilder()
+      .setProject(project)
+      .setLocation(location)
+      .setRegistry(registry)
+      .setDevice(device)
+      .build()
+      .toString();
+  }
+
+  public static DeviceName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map matchMap =
+        PATH_TEMPLATE.validatedMatch(formattedString, "DeviceName.parse: formattedString not in valid format");
+    return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("registry"), matchMap.get("device"));
+  }
+
+  public static List parseList(List formattedStrings) {
+    List list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List toStringList(List values) {
+    List list = new ArrayList(values.size());
+    for (DeviceName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldMapBuilder.put("location", location);
+          fieldMapBuilder.put("registry", registry);
+          fieldMapBuilder.put("device", device);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  /**
+   * @deprecated This method is only present to satisfy the ResourceName interface.
+   */
+  @Deprecated
+  public ResourceNameType getType() {
+    throw new UnsupportedOperationException("DeviceName.getType() not supported");
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate("project", project, "location", location, "registry", registry, "device", device);
+  }
+
+  /** Builder for DeviceName. */
+  public static class Builder {
+
+    private String project;
+    private String location;
+    private String registry;
+    private String device;
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public String getRegistry() {
+      return registry;
+    }
+
+    public String getDevice() {
+      return device;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public Builder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public Builder setRegistry(String registry) {
+      this.registry = registry;
+      return this;
+    }
+
+    public Builder setDevice(String device) {
+      this.device = device;
+      return this;
+    }
+
+    private Builder() {
+    }
+
+    private Builder(DeviceName deviceName) {
+      project = deviceName.project;
+      location = deviceName.location;
+      registry = deviceName.registry;
+      device = deviceName.device;
+    }
+
+    public DeviceName build() {
+      return new DeviceName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof DeviceName) {
+      DeviceName that = (DeviceName) o;
+      return (this.project.equals(that.project))
+          && (this.location.equals(that.location))
+          && (this.registry.equals(that.registry))
+          && (this.device.equals(that.device));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    h *= 1000003;
+    h ^= location.hashCode();
+    h *= 1000003;
+    h ^= registry.hashCode();
+    h *= 1000003;
+    h ^= device.hashCode();
+    return h;
+  }
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceOrBuilder.java
new file mode 100644
index 000000000000..32e9d7867e34
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceOrBuilder.java
@@ -0,0 +1,530 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface DeviceOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.Device)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The user-defined device identifier. The device ID must be unique
+   * within a device registry.
+   * 

+   *
+   * string id = 1;
+   */
+  java.lang.String getId();
+  /**
+   * 
+   * The user-defined device identifier. The device ID must be unique
+   * within a device registry.
+   * 

+   *
+   * string id = 1;
+   */
+  com.google.protobuf.ByteString
+      getIdBytes();
+
+  /**
+   * 
+   * The resource path name. For example,
+   * `projects/p1/locations/us-central1/registries/registry0/devices/dev0` or
+   * `projects/p1/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * When `name` is populated as a response from the service, it always ends
+   * in the device numeric ID.
+   * 

+   *
+   * string name = 2;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * The resource path name. For example,
+   * `projects/p1/locations/us-central1/registries/registry0/devices/dev0` or
+   * `projects/p1/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * When `name` is populated as a response from the service, it always ends
+   * in the device numeric ID.
+   * 

+   *
+   * string name = 2;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * 
+   * [Output only] A server-defined unique numeric ID for the device. This is a
+   * more compact way to identify devices, and it is globally unique.
+   * 

+   *
+   * uint64 num_id = 3;
+   */
+  long getNumId();
+
+  /**
+   * 
+   * The credentials used to authenticate this device. To allow credential
+   * rotation without interruption, multiple device credentials can be bound to
+   * this device. No more than 3 credentials can be bound to a single device at
+   * a time. When new credentials are added to a device, they are verified
+   * against the registry credentials. For details, see the description of the
+   * `DeviceRegistry.credentials` field.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+   */
+  java.util.List 
+      getCredentialsList();
+  /**
+   * 
+   * The credentials used to authenticate this device. To allow credential
+   * rotation without interruption, multiple device credentials can be bound to
+   * this device. No more than 3 credentials can be bound to a single device at
+   * a time. When new credentials are added to a device, they are verified
+   * against the registry credentials. For details, see the description of the
+   * `DeviceRegistry.credentials` field.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+   */
+  com.google.cloud.iot.v1.DeviceCredential getCredentials(int index);
+  /**
+   * 
+   * The credentials used to authenticate this device. To allow credential
+   * rotation without interruption, multiple device credentials can be bound to
+   * this device. No more than 3 credentials can be bound to a single device at
+   * a time. When new credentials are added to a device, they are verified
+   * against the registry credentials. For details, see the description of the
+   * `DeviceRegistry.credentials` field.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+   */
+  int getCredentialsCount();
+  /**
+   * 
+   * The credentials used to authenticate this device. To allow credential
+   * rotation without interruption, multiple device credentials can be bound to
+   * this device. No more than 3 credentials can be bound to a single device at
+   * a time. When new credentials are added to a device, they are verified
+   * against the registry credentials. For details, see the description of the
+   * `DeviceRegistry.credentials` field.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+   */
+  java.util.List 
+      getCredentialsOrBuilderList();
+  /**
+   * 
+   * The credentials used to authenticate this device. To allow credential
+   * rotation without interruption, multiple device credentials can be bound to
+   * this device. No more than 3 credentials can be bound to a single device at
+   * a time. When new credentials are added to a device, they are verified
+   * against the registry credentials. For details, see the description of the
+   * `DeviceRegistry.credentials` field.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceCredential credentials = 12;
+   */
+  com.google.cloud.iot.v1.DeviceCredentialOrBuilder getCredentialsOrBuilder(
+      int index);
+
+  /**
+   * 
+   * [Output only] The last time an MQTT `PINGREQ` was received. This field
+   * applies only to devices connecting through MQTT. MQTT clients usually only
+   * send `PINGREQ` messages if the connection is idle, and no other messages
+   * have been sent. Timestamps are periodically collected and written to
+   * storage; they may be stale by a few minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_heartbeat_time = 7;
+   */
+  boolean hasLastHeartbeatTime();
+  /**
+   * 
+   * [Output only] The last time an MQTT `PINGREQ` was received. This field
+   * applies only to devices connecting through MQTT. MQTT clients usually only
+   * send `PINGREQ` messages if the connection is idle, and no other messages
+   * have been sent. Timestamps are periodically collected and written to
+   * storage; they may be stale by a few minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_heartbeat_time = 7;
+   */
+  com.google.protobuf.Timestamp getLastHeartbeatTime();
+  /**
+   * 
+   * [Output only] The last time an MQTT `PINGREQ` was received. This field
+   * applies only to devices connecting through MQTT. MQTT clients usually only
+   * send `PINGREQ` messages if the connection is idle, and no other messages
+   * have been sent. Timestamps are periodically collected and written to
+   * storage; they may be stale by a few minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_heartbeat_time = 7;
+   */
+  com.google.protobuf.TimestampOrBuilder getLastHeartbeatTimeOrBuilder();
+
+  /**
+   * 
+   * [Output only] The last time a telemetry event was received. Timestamps are
+   * periodically collected and written to storage; they may be stale by a few
+   * minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_event_time = 8;
+   */
+  boolean hasLastEventTime();
+  /**
+   * 
+   * [Output only] The last time a telemetry event was received. Timestamps are
+   * periodically collected and written to storage; they may be stale by a few
+   * minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_event_time = 8;
+   */
+  com.google.protobuf.Timestamp getLastEventTime();
+  /**
+   * 
+   * [Output only] The last time a telemetry event was received. Timestamps are
+   * periodically collected and written to storage; they may be stale by a few
+   * minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_event_time = 8;
+   */
+  com.google.protobuf.TimestampOrBuilder getLastEventTimeOrBuilder();
+
+  /**
+   * 
+   * [Output only] The last time a state event was received. Timestamps are
+   * periodically collected and written to storage; they may be stale by a few
+   * minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_state_time = 20;
+   */
+  boolean hasLastStateTime();
+  /**
+   * 
+   * [Output only] The last time a state event was received. Timestamps are
+   * periodically collected and written to storage; they may be stale by a few
+   * minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_state_time = 20;
+   */
+  com.google.protobuf.Timestamp getLastStateTime();
+  /**
+   * 
+   * [Output only] The last time a state event was received. Timestamps are
+   * periodically collected and written to storage; they may be stale by a few
+   * minutes.
+   * 

+   *
+   * .google.protobuf.Timestamp last_state_time = 20;
+   */
+  com.google.protobuf.TimestampOrBuilder getLastStateTimeOrBuilder();
+
+  /**
+   * 
+   * [Output only] The last time a cloud-to-device config version acknowledgment
+   * was received from the device. This field is only for configurations
+   * sent through MQTT.
+   * 

+   *
+   * .google.protobuf.Timestamp last_config_ack_time = 14;
+   */
+  boolean hasLastConfigAckTime();
+  /**
+   * 
+   * [Output only] The last time a cloud-to-device config version acknowledgment
+   * was received from the device. This field is only for configurations
+   * sent through MQTT.
+   * 

+   *
+   * .google.protobuf.Timestamp last_config_ack_time = 14;
+   */
+  com.google.protobuf.Timestamp getLastConfigAckTime();
+  /**
+   * 
+   * [Output only] The last time a cloud-to-device config version acknowledgment
+   * was received from the device. This field is only for configurations
+   * sent through MQTT.
+   * 

+   *
+   * .google.protobuf.Timestamp last_config_ack_time = 14;
+   */
+  com.google.protobuf.TimestampOrBuilder getLastConfigAckTimeOrBuilder();
+
+  /**
+   * 
+   * [Output only] The last time a cloud-to-device config version was sent to
+   * the device.
+   * 

+   *
+   * .google.protobuf.Timestamp last_config_send_time = 18;
+   */
+  boolean hasLastConfigSendTime();
+  /**
+   * 
+   * [Output only] The last time a cloud-to-device config version was sent to
+   * the device.
+   * 

+   *
+   * .google.protobuf.Timestamp last_config_send_time = 18;
+   */
+  com.google.protobuf.Timestamp getLastConfigSendTime();
+  /**
+   * 
+   * [Output only] The last time a cloud-to-device config version was sent to
+   * the device.
+   * 

+   *
+   * .google.protobuf.Timestamp last_config_send_time = 18;
+   */
+  com.google.protobuf.TimestampOrBuilder getLastConfigSendTimeOrBuilder();
+
+  /**
+   * 
+   * If a device is blocked, connections or requests from this device will fail.
+   * Can be used to temporarily prevent the device from connecting if, for
+   * example, the sensor is generating bad data and needs maintenance.
+   * 

+   *
+   * bool blocked = 19;
+   */
+  boolean getBlocked();
+
+  /**
+   * 
+   * [Output only] The time the most recent error occurred, such as a failure to
+   * publish to Cloud Pub/Sub. This field is the timestamp of
+   * 'last_error_status'.
+   * 

+   *
+   * .google.protobuf.Timestamp last_error_time = 10;
+   */
+  boolean hasLastErrorTime();
+  /**
+   * 
+   * [Output only] The time the most recent error occurred, such as a failure to
+   * publish to Cloud Pub/Sub. This field is the timestamp of
+   * 'last_error_status'.
+   * 

+   *
+   * .google.protobuf.Timestamp last_error_time = 10;
+   */
+  com.google.protobuf.Timestamp getLastErrorTime();
+  /**
+   * 
+   * [Output only] The time the most recent error occurred, such as a failure to
+   * publish to Cloud Pub/Sub. This field is the timestamp of
+   * 'last_error_status'.
+   * 

+   *
+   * .google.protobuf.Timestamp last_error_time = 10;
+   */
+  com.google.protobuf.TimestampOrBuilder getLastErrorTimeOrBuilder();
+
+  /**
+   * 
+   * [Output only] The error message of the most recent error, such as a failure
+   * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+   * field. If no errors have occurred, this field has an empty message
+   * and the status code 0 == OK. Otherwise, this field is expected to have a
+   * status code other than OK.
+   * 

+   *
+   * .google.rpc.Status last_error_status = 11;
+   */
+  boolean hasLastErrorStatus();
+  /**
+   * 
+   * [Output only] The error message of the most recent error, such as a failure
+   * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+   * field. If no errors have occurred, this field has an empty message
+   * and the status code 0 == OK. Otherwise, this field is expected to have a
+   * status code other than OK.
+   * 

+   *
+   * .google.rpc.Status last_error_status = 11;
+   */
+  com.google.rpc.Status getLastErrorStatus();
+  /**
+   * 
+   * [Output only] The error message of the most recent error, such as a failure
+   * to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+   * field. If no errors have occurred, this field has an empty message
+   * and the status code 0 == OK. Otherwise, this field is expected to have a
+   * status code other than OK.
+   * 

+   *
+   * .google.rpc.Status last_error_status = 11;
+   */
+  com.google.rpc.StatusOrBuilder getLastErrorStatusOrBuilder();
+
+  /**
+   * 
+   * The most recent device configuration, which is eventually sent from
+   * Cloud IoT Core to the device. If not present on creation, the
+   * configuration will be initialized with an empty payload and version value
+   * of `1`. To update this field after creation, use the
+   * `DeviceManager.ModifyCloudToDeviceConfig` method.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceConfig config = 13;
+   */
+  boolean hasConfig();
+  /**
+   * 
+   * The most recent device configuration, which is eventually sent from
+   * Cloud IoT Core to the device. If not present on creation, the
+   * configuration will be initialized with an empty payload and version value
+   * of `1`. To update this field after creation, use the
+   * `DeviceManager.ModifyCloudToDeviceConfig` method.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceConfig config = 13;
+   */
+  com.google.cloud.iot.v1.DeviceConfig getConfig();
+  /**
+   * 
+   * The most recent device configuration, which is eventually sent from
+   * Cloud IoT Core to the device. If not present on creation, the
+   * configuration will be initialized with an empty payload and version value
+   * of `1`. To update this field after creation, use the
+   * `DeviceManager.ModifyCloudToDeviceConfig` method.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceConfig config = 13;
+   */
+  com.google.cloud.iot.v1.DeviceConfigOrBuilder getConfigOrBuilder();
+
+  /**
+   * 
+   * [Output only] The state most recently received from the device. If no state
+   * has been reported, this field is not present.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceState state = 16;
+   */
+  boolean hasState();
+  /**
+   * 
+   * [Output only] The state most recently received from the device. If no state
+   * has been reported, this field is not present.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceState state = 16;
+   */
+  com.google.cloud.iot.v1.DeviceState getState();
+  /**
+   * 
+   * [Output only] The state most recently received from the device. If no state
+   * has been reported, this field is not present.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceState state = 16;
+   */
+  com.google.cloud.iot.v1.DeviceStateOrBuilder getStateOrBuilder();
+
+  /**
+   * 
+   * The metadata key-value pairs assigned to the device. This metadata is not
+   * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+   * information for the device.
+   * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+   * be less than 128 bytes in length.
+   * Values are free-form strings. Each value must be less than or equal to 32
+   * KB in size.
+   * The total size of all keys and values must be less than 256 KB, and the
+   * maximum number of key-value pairs is 500.
+   * 

+   *
+   * map<string, string> metadata = 17;
+   */
+  int getMetadataCount();
+  /**
+   * 
+   * The metadata key-value pairs assigned to the device. This metadata is not
+   * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+   * information for the device.
+   * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+   * be less than 128 bytes in length.
+   * Values are free-form strings. Each value must be less than or equal to 32
+   * KB in size.
+   * The total size of all keys and values must be less than 256 KB, and the
+   * maximum number of key-value pairs is 500.
+   * 

+   *
+   * map<string, string> metadata = 17;
+   */
+  boolean containsMetadata(
+      java.lang.String key);
+  /**
+   * Use {@link #getMetadataMap()} instead.
+   */
+  @java.lang.Deprecated
+  java.util.Map
+  getMetadata();
+  /**
+   * 
+   * The metadata key-value pairs assigned to the device. This metadata is not
+   * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+   * information for the device.
+   * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+   * be less than 128 bytes in length.
+   * Values are free-form strings. Each value must be less than or equal to 32
+   * KB in size.
+   * The total size of all keys and values must be less than 256 KB, and the
+   * maximum number of key-value pairs is 500.
+   * 

+   *
+   * map<string, string> metadata = 17;
+   */
+  java.util.Map
+  getMetadataMap();
+  /**
+   * 
+   * The metadata key-value pairs assigned to the device. This metadata is not
+   * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+   * information for the device.
+   * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+   * be less than 128 bytes in length.
+   * Values are free-form strings. Each value must be less than or equal to 32
+   * KB in size.
+   * The total size of all keys and values must be less than 256 KB, and the
+   * maximum number of key-value pairs is 500.
+   * 

+   *
+   * map<string, string> metadata = 17;
+   */
+
+  java.lang.String getMetadataOrDefault(
+      java.lang.String key,
+      java.lang.String defaultValue);
+  /**
+   * 
+   * The metadata key-value pairs assigned to the device. This metadata is not
+   * interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+   * information for the device.
+   * Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+   * be less than 128 bytes in length.
+   * Values are free-form strings. Each value must be less than or equal to 32
+   * KB in size.
+   * The total size of all keys and values must be less than 256 KB, and the
+   * maximum number of key-value pairs is 500.
+   * 

+   *
+   * map<string, string> metadata = 17;
+   */
+
+  java.lang.String getMetadataOrThrow(
+      java.lang.String key);
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java
new file mode 100644
index 000000000000..35db2d6c4457
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java
@@ -0,0 +1,2727 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * A container for a group of devices.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.DeviceRegistry}
+ */
+public  final class DeviceRegistry extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.DeviceRegistry)
+    DeviceRegistryOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use DeviceRegistry.newBuilder() to construct.
+  private DeviceRegistry(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private DeviceRegistry() {
+    id_ = "";
+    name_ = "";
+    eventNotificationConfigs_ = java.util.Collections.emptyList();
+    credentials_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private DeviceRegistry(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            id_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 34: {
+            com.google.cloud.iot.v1.MqttConfig.Builder subBuilder = null;
+            if (mqttConfig_ != null) {
+              subBuilder = mqttConfig_.toBuilder();
+            }
+            mqttConfig_ = input.readMessage(com.google.cloud.iot.v1.MqttConfig.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(mqttConfig_);
+              mqttConfig_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 58: {
+            com.google.cloud.iot.v1.StateNotificationConfig.Builder subBuilder = null;
+            if (stateNotificationConfig_ != null) {
+              subBuilder = stateNotificationConfig_.toBuilder();
+            }
+            stateNotificationConfig_ = input.readMessage(com.google.cloud.iot.v1.StateNotificationConfig.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(stateNotificationConfig_);
+              stateNotificationConfig_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 66: {
+            if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+              credentials_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000040;
+            }
+            credentials_.add(
+                input.readMessage(com.google.cloud.iot.v1.RegistryCredential.parser(), extensionRegistry));
+            break;
+          }
+          case 74: {
+            com.google.cloud.iot.v1.HttpConfig.Builder subBuilder = null;
+            if (httpConfig_ != null) {
+              subBuilder = httpConfig_.toBuilder();
+            }
+            httpConfig_ = input.readMessage(com.google.cloud.iot.v1.HttpConfig.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(httpConfig_);
+              httpConfig_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 82: {
+            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+              eventNotificationConfigs_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000004;
+            }
+            eventNotificationConfigs_.add(
+                input.readMessage(com.google.cloud.iot.v1.EventNotificationConfig.parser(), extensionRegistry));
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+        credentials_ = java.util.Collections.unmodifiableList(credentials_);
+      }
+      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+        eventNotificationConfigs_ = java.util.Collections.unmodifiableList(eventNotificationConfigs_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceRegistry_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceRegistry_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.DeviceRegistry.class, com.google.cloud.iot.v1.DeviceRegistry.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int ID_FIELD_NUMBER = 1;
+  private volatile java.lang.Object id_;
+  /**
+   * 
+   * The identifier of this device registry. For example, `myRegistry`.
+   * 

+   *
+   * string id = 1;
+   */
+  public java.lang.String getId() {
+    java.lang.Object ref = id_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      id_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The identifier of this device registry. For example, `myRegistry`.
+   * 

+   *
+   * string id = 1;
+   */
+  public com.google.protobuf.ByteString
+      getIdBytes() {
+    java.lang.Object ref = id_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      id_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int NAME_FIELD_NUMBER = 2;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * The resource path name. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string name = 2;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The resource path name. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string name = 2;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int EVENT_NOTIFICATION_CONFIGS_FIELD_NUMBER = 10;
+  private java.util.List eventNotificationConfigs_;
+  /**
+   * 
+   * The configuration for notification of telemetry events received from the
+   * device. All telemetry events that were successfully published by the
+   * device and acknowledged by Cloud IoT Core are guaranteed to be
+   * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+   * only the first matching configuration is used. If you try to publish a
+   * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+   * for the device's registry, the connection closes automatically. If you try
+   * to do so using an HTTP connection, an error is returned. Up to 10
+   * configurations may be provided.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+   */
+  public java.util.List getEventNotificationConfigsList() {
+    return eventNotificationConfigs_;
+  }
+  /**
+   * 
+   * The configuration for notification of telemetry events received from the
+   * device. All telemetry events that were successfully published by the
+   * device and acknowledged by Cloud IoT Core are guaranteed to be
+   * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+   * only the first matching configuration is used. If you try to publish a
+   * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+   * for the device's registry, the connection closes automatically. If you try
+   * to do so using an HTTP connection, an error is returned. Up to 10
+   * configurations may be provided.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+   */
+  public java.util.List 
+      getEventNotificationConfigsOrBuilderList() {
+    return eventNotificationConfigs_;
+  }
+  /**
+   * 
+   * The configuration for notification of telemetry events received from the
+   * device. All telemetry events that were successfully published by the
+   * device and acknowledged by Cloud IoT Core are guaranteed to be
+   * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+   * only the first matching configuration is used. If you try to publish a
+   * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+   * for the device's registry, the connection closes automatically. If you try
+   * to do so using an HTTP connection, an error is returned. Up to 10
+   * configurations may be provided.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+   */
+  public int getEventNotificationConfigsCount() {
+    return eventNotificationConfigs_.size();
+  }
+  /**
+   * 
+   * The configuration for notification of telemetry events received from the
+   * device. All telemetry events that were successfully published by the
+   * device and acknowledged by Cloud IoT Core are guaranteed to be
+   * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+   * only the first matching configuration is used. If you try to publish a
+   * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+   * for the device's registry, the connection closes automatically. If you try
+   * to do so using an HTTP connection, an error is returned. Up to 10
+   * configurations may be provided.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+   */
+  public com.google.cloud.iot.v1.EventNotificationConfig getEventNotificationConfigs(int index) {
+    return eventNotificationConfigs_.get(index);
+  }
+  /**
+   * 
+   * The configuration for notification of telemetry events received from the
+   * device. All telemetry events that were successfully published by the
+   * device and acknowledged by Cloud IoT Core are guaranteed to be
+   * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+   * only the first matching configuration is used. If you try to publish a
+   * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+   * for the device's registry, the connection closes automatically. If you try
+   * to do so using an HTTP connection, an error is returned. Up to 10
+   * configurations may be provided.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+   */
+  public com.google.cloud.iot.v1.EventNotificationConfigOrBuilder getEventNotificationConfigsOrBuilder(
+      int index) {
+    return eventNotificationConfigs_.get(index);
+  }
+
+  public static final int STATE_NOTIFICATION_CONFIG_FIELD_NUMBER = 7;
+  private com.google.cloud.iot.v1.StateNotificationConfig stateNotificationConfig_;
+  /**
+   * 
+   * The configuration for notification of new states received from the device.
+   * State updates are guaranteed to be stored in the state history, but
+   * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+   * permissions are misconfigured or the specified topic doesn't exist, no
+   * notification will be published but the state will still be stored in Cloud
+   * IoT Core.
+   * 

+   *
+   * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+   */
+  public boolean hasStateNotificationConfig() {
+    return stateNotificationConfig_ != null;
+  }
+  /**
+   * 
+   * The configuration for notification of new states received from the device.
+   * State updates are guaranteed to be stored in the state history, but
+   * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+   * permissions are misconfigured or the specified topic doesn't exist, no
+   * notification will be published but the state will still be stored in Cloud
+   * IoT Core.
+   * 

+   *
+   * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+   */
+  public com.google.cloud.iot.v1.StateNotificationConfig getStateNotificationConfig() {
+    return stateNotificationConfig_ == null ? com.google.cloud.iot.v1.StateNotificationConfig.getDefaultInstance() : stateNotificationConfig_;
+  }
+  /**
+   * 
+   * The configuration for notification of new states received from the device.
+   * State updates are guaranteed to be stored in the state history, but
+   * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+   * permissions are misconfigured or the specified topic doesn't exist, no
+   * notification will be published but the state will still be stored in Cloud
+   * IoT Core.
+   * 

+   *
+   * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+   */
+  public com.google.cloud.iot.v1.StateNotificationConfigOrBuilder getStateNotificationConfigOrBuilder() {
+    return getStateNotificationConfig();
+  }
+
+  public static final int MQTT_CONFIG_FIELD_NUMBER = 4;
+  private com.google.cloud.iot.v1.MqttConfig mqttConfig_;
+  /**
+   * 
+   * The MQTT configuration for this device registry.
+   * 

+   *
+   * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+   */
+  public boolean hasMqttConfig() {
+    return mqttConfig_ != null;
+  }
+  /**
+   * 
+   * The MQTT configuration for this device registry.
+   * 

+   *
+   * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+   */
+  public com.google.cloud.iot.v1.MqttConfig getMqttConfig() {
+    return mqttConfig_ == null ? com.google.cloud.iot.v1.MqttConfig.getDefaultInstance() : mqttConfig_;
+  }
+  /**
+   * 
+   * The MQTT configuration for this device registry.
+   * 

+   *
+   * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+   */
+  public com.google.cloud.iot.v1.MqttConfigOrBuilder getMqttConfigOrBuilder() {
+    return getMqttConfig();
+  }
+
+  public static final int HTTP_CONFIG_FIELD_NUMBER = 9;
+  private com.google.cloud.iot.v1.HttpConfig httpConfig_;
+  /**
+   * 
+   * The DeviceService (HTTP) configuration for this device registry.
+   * 

+   *
+   * .google.cloud.iot.v1.HttpConfig http_config = 9;
+   */
+  public boolean hasHttpConfig() {
+    return httpConfig_ != null;
+  }
+  /**
+   * 
+   * The DeviceService (HTTP) configuration for this device registry.
+   * 

+   *
+   * .google.cloud.iot.v1.HttpConfig http_config = 9;
+   */
+  public com.google.cloud.iot.v1.HttpConfig getHttpConfig() {
+    return httpConfig_ == null ? com.google.cloud.iot.v1.HttpConfig.getDefaultInstance() : httpConfig_;
+  }
+  /**
+   * 
+   * The DeviceService (HTTP) configuration for this device registry.
+   * 

+   *
+   * .google.cloud.iot.v1.HttpConfig http_config = 9;
+   */
+  public com.google.cloud.iot.v1.HttpConfigOrBuilder getHttpConfigOrBuilder() {
+    return getHttpConfig();
+  }
+
+  public static final int CREDENTIALS_FIELD_NUMBER = 8;
+  private java.util.List credentials_;
+  /**
+   * 
+   * The credentials used to verify the device credentials. No more than 10
+   * credentials can be bound to a single registry at a time. The verification
+   * process occurs at the time of device creation or update. If this field is
+   * empty, no verification is performed. Otherwise, the credentials of a newly
+   * created device or added credentials of an updated device should be signed
+   * with one of these registry credentials.
+   * Note, however, that existing devices will never be affected by
+   * modifications to this list of credentials: after a device has been
+   * successfully created in a registry, it should be able to connect even if
+   * its registry credentials are revoked, deleted, or modified.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+   */
+  public java.util.List getCredentialsList() {
+    return credentials_;
+  }
+  /**
+   * 
+   * The credentials used to verify the device credentials. No more than 10
+   * credentials can be bound to a single registry at a time. The verification
+   * process occurs at the time of device creation or update. If this field is
+   * empty, no verification is performed. Otherwise, the credentials of a newly
+   * created device or added credentials of an updated device should be signed
+   * with one of these registry credentials.
+   * Note, however, that existing devices will never be affected by
+   * modifications to this list of credentials: after a device has been
+   * successfully created in a registry, it should be able to connect even if
+   * its registry credentials are revoked, deleted, or modified.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+   */
+  public java.util.List 
+      getCredentialsOrBuilderList() {
+    return credentials_;
+  }
+  /**
+   * 
+   * The credentials used to verify the device credentials. No more than 10
+   * credentials can be bound to a single registry at a time. The verification
+   * process occurs at the time of device creation or update. If this field is
+   * empty, no verification is performed. Otherwise, the credentials of a newly
+   * created device or added credentials of an updated device should be signed
+   * with one of these registry credentials.
+   * Note, however, that existing devices will never be affected by
+   * modifications to this list of credentials: after a device has been
+   * successfully created in a registry, it should be able to connect even if
+   * its registry credentials are revoked, deleted, or modified.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+   */
+  public int getCredentialsCount() {
+    return credentials_.size();
+  }
+  /**
+   * 
+   * The credentials used to verify the device credentials. No more than 10
+   * credentials can be bound to a single registry at a time. The verification
+   * process occurs at the time of device creation or update. If this field is
+   * empty, no verification is performed. Otherwise, the credentials of a newly
+   * created device or added credentials of an updated device should be signed
+   * with one of these registry credentials.
+   * Note, however, that existing devices will never be affected by
+   * modifications to this list of credentials: after a device has been
+   * successfully created in a registry, it should be able to connect even if
+   * its registry credentials are revoked, deleted, or modified.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+   */
+  public com.google.cloud.iot.v1.RegistryCredential getCredentials(int index) {
+    return credentials_.get(index);
+  }
+  /**
+   * 
+   * The credentials used to verify the device credentials. No more than 10
+   * credentials can be bound to a single registry at a time. The verification
+   * process occurs at the time of device creation or update. If this field is
+   * empty, no verification is performed. Otherwise, the credentials of a newly
+   * created device or added credentials of an updated device should be signed
+   * with one of these registry credentials.
+   * Note, however, that existing devices will never be affected by
+   * modifications to this list of credentials: after a device has been
+   * successfully created in a registry, it should be able to connect even if
+   * its registry credentials are revoked, deleted, or modified.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+   */
+  public com.google.cloud.iot.v1.RegistryCredentialOrBuilder getCredentialsOrBuilder(
+      int index) {
+    return credentials_.get(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getIdBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
+    }
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_);
+    }
+    if (mqttConfig_ != null) {
+      output.writeMessage(4, getMqttConfig());
+    }
+    if (stateNotificationConfig_ != null) {
+      output.writeMessage(7, getStateNotificationConfig());
+    }
+    for (int i = 0; i < credentials_.size(); i++) {
+      output.writeMessage(8, credentials_.get(i));
+    }
+    if (httpConfig_ != null) {
+      output.writeMessage(9, getHttpConfig());
+    }
+    for (int i = 0; i < eventNotificationConfigs_.size(); i++) {
+      output.writeMessage(10, eventNotificationConfigs_.get(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getIdBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
+    }
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_);
+    }
+    if (mqttConfig_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(4, getMqttConfig());
+    }
+    if (stateNotificationConfig_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(7, getStateNotificationConfig());
+    }
+    for (int i = 0; i < credentials_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(8, credentials_.get(i));
+    }
+    if (httpConfig_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(9, getHttpConfig());
+    }
+    for (int i = 0; i < eventNotificationConfigs_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(10, eventNotificationConfigs_.get(i));
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.DeviceRegistry)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.DeviceRegistry other = (com.google.cloud.iot.v1.DeviceRegistry) obj;
+
+    boolean result = true;
+    result = result && getId()
+        .equals(other.getId());
+    result = result && getName()
+        .equals(other.getName());
+    result = result && getEventNotificationConfigsList()
+        .equals(other.getEventNotificationConfigsList());
+    result = result && (hasStateNotificationConfig() == other.hasStateNotificationConfig());
+    if (hasStateNotificationConfig()) {
+      result = result && getStateNotificationConfig()
+          .equals(other.getStateNotificationConfig());
+    }
+    result = result && (hasMqttConfig() == other.hasMqttConfig());
+    if (hasMqttConfig()) {
+      result = result && getMqttConfig()
+          .equals(other.getMqttConfig());
+    }
+    result = result && (hasHttpConfig() == other.hasHttpConfig());
+    if (hasHttpConfig()) {
+      result = result && getHttpConfig()
+          .equals(other.getHttpConfig());
+    }
+    result = result && getCredentialsList()
+        .equals(other.getCredentialsList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + ID_FIELD_NUMBER;
+    hash = (53 * hash) + getId().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    if (getEventNotificationConfigsCount() > 0) {
+      hash = (37 * hash) + EVENT_NOTIFICATION_CONFIGS_FIELD_NUMBER;
+      hash = (53 * hash) + getEventNotificationConfigsList().hashCode();
+    }
+    if (hasStateNotificationConfig()) {
+      hash = (37 * hash) + STATE_NOTIFICATION_CONFIG_FIELD_NUMBER;
+      hash = (53 * hash) + getStateNotificationConfig().hashCode();
+    }
+    if (hasMqttConfig()) {
+      hash = (37 * hash) + MQTT_CONFIG_FIELD_NUMBER;
+      hash = (53 * hash) + getMqttConfig().hashCode();
+    }
+    if (hasHttpConfig()) {
+      hash = (37 * hash) + HTTP_CONFIG_FIELD_NUMBER;
+      hash = (53 * hash) + getHttpConfig().hashCode();
+    }
+    if (getCredentialsCount() > 0) {
+      hash = (37 * hash) + CREDENTIALS_FIELD_NUMBER;
+      hash = (53 * hash) + getCredentialsList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.DeviceRegistry parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeviceRegistry parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceRegistry parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeviceRegistry parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceRegistry parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeviceRegistry parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceRegistry parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeviceRegistry parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceRegistry parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeviceRegistry parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceRegistry parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeviceRegistry parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.DeviceRegistry prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * A container for a group of devices.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.DeviceRegistry}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.DeviceRegistry)
+      com.google.cloud.iot.v1.DeviceRegistryOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceRegistry_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceRegistry_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.DeviceRegistry.class, com.google.cloud.iot.v1.DeviceRegistry.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.DeviceRegistry.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getEventNotificationConfigsFieldBuilder();
+        getCredentialsFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      id_ = "";
+
+      name_ = "";
+
+      if (eventNotificationConfigsBuilder_ == null) {
+        eventNotificationConfigs_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+      } else {
+        eventNotificationConfigsBuilder_.clear();
+      }
+      if (stateNotificationConfigBuilder_ == null) {
+        stateNotificationConfig_ = null;
+      } else {
+        stateNotificationConfig_ = null;
+        stateNotificationConfigBuilder_ = null;
+      }
+      if (mqttConfigBuilder_ == null) {
+        mqttConfig_ = null;
+      } else {
+        mqttConfig_ = null;
+        mqttConfigBuilder_ = null;
+      }
+      if (httpConfigBuilder_ == null) {
+        httpConfig_ = null;
+      } else {
+        httpConfig_ = null;
+        httpConfigBuilder_ = null;
+      }
+      if (credentialsBuilder_ == null) {
+        credentials_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000040);
+      } else {
+        credentialsBuilder_.clear();
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceRegistry_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.DeviceRegistry getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.DeviceRegistry build() {
+      com.google.cloud.iot.v1.DeviceRegistry result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.DeviceRegistry buildPartial() {
+      com.google.cloud.iot.v1.DeviceRegistry result = new com.google.cloud.iot.v1.DeviceRegistry(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      result.id_ = id_;
+      result.name_ = name_;
+      if (eventNotificationConfigsBuilder_ == null) {
+        if (((bitField0_ & 0x00000004) == 0x00000004)) {
+          eventNotificationConfigs_ = java.util.Collections.unmodifiableList(eventNotificationConfigs_);
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.eventNotificationConfigs_ = eventNotificationConfigs_;
+      } else {
+        result.eventNotificationConfigs_ = eventNotificationConfigsBuilder_.build();
+      }
+      if (stateNotificationConfigBuilder_ == null) {
+        result.stateNotificationConfig_ = stateNotificationConfig_;
+      } else {
+        result.stateNotificationConfig_ = stateNotificationConfigBuilder_.build();
+      }
+      if (mqttConfigBuilder_ == null) {
+        result.mqttConfig_ = mqttConfig_;
+      } else {
+        result.mqttConfig_ = mqttConfigBuilder_.build();
+      }
+      if (httpConfigBuilder_ == null) {
+        result.httpConfig_ = httpConfig_;
+      } else {
+        result.httpConfig_ = httpConfigBuilder_.build();
+      }
+      if (credentialsBuilder_ == null) {
+        if (((bitField0_ & 0x00000040) == 0x00000040)) {
+          credentials_ = java.util.Collections.unmodifiableList(credentials_);
+          bitField0_ = (bitField0_ & ~0x00000040);
+        }
+        result.credentials_ = credentials_;
+      } else {
+        result.credentials_ = credentialsBuilder_.build();
+      }
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.DeviceRegistry) {
+        return mergeFrom((com.google.cloud.iot.v1.DeviceRegistry)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.DeviceRegistry other) {
+      if (other == com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance()) return this;
+      if (!other.getId().isEmpty()) {
+        id_ = other.id_;
+        onChanged();
+      }
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (eventNotificationConfigsBuilder_ == null) {
+        if (!other.eventNotificationConfigs_.isEmpty()) {
+          if (eventNotificationConfigs_.isEmpty()) {
+            eventNotificationConfigs_ = other.eventNotificationConfigs_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureEventNotificationConfigsIsMutable();
+            eventNotificationConfigs_.addAll(other.eventNotificationConfigs_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.eventNotificationConfigs_.isEmpty()) {
+          if (eventNotificationConfigsBuilder_.isEmpty()) {
+            eventNotificationConfigsBuilder_.dispose();
+            eventNotificationConfigsBuilder_ = null;
+            eventNotificationConfigs_ = other.eventNotificationConfigs_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+            eventNotificationConfigsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getEventNotificationConfigsFieldBuilder() : null;
+          } else {
+            eventNotificationConfigsBuilder_.addAllMessages(other.eventNotificationConfigs_);
+          }
+        }
+      }
+      if (other.hasStateNotificationConfig()) {
+        mergeStateNotificationConfig(other.getStateNotificationConfig());
+      }
+      if (other.hasMqttConfig()) {
+        mergeMqttConfig(other.getMqttConfig());
+      }
+      if (other.hasHttpConfig()) {
+        mergeHttpConfig(other.getHttpConfig());
+      }
+      if (credentialsBuilder_ == null) {
+        if (!other.credentials_.isEmpty()) {
+          if (credentials_.isEmpty()) {
+            credentials_ = other.credentials_;
+            bitField0_ = (bitField0_ & ~0x00000040);
+          } else {
+            ensureCredentialsIsMutable();
+            credentials_.addAll(other.credentials_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.credentials_.isEmpty()) {
+          if (credentialsBuilder_.isEmpty()) {
+            credentialsBuilder_.dispose();
+            credentialsBuilder_ = null;
+            credentials_ = other.credentials_;
+            bitField0_ = (bitField0_ & ~0x00000040);
+            credentialsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getCredentialsFieldBuilder() : null;
+          } else {
+            credentialsBuilder_.addAllMessages(other.credentials_);
+          }
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.DeviceRegistry parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.DeviceRegistry) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.lang.Object id_ = "";
+    /**
+     * 
+     * The identifier of this device registry. For example, `myRegistry`.
+     * 

+     *
+     * string id = 1;
+     */
+    public java.lang.String getId() {
+      java.lang.Object ref = id_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        id_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The identifier of this device registry. For example, `myRegistry`.
+     * 

+     *
+     * string id = 1;
+     */
+    public com.google.protobuf.ByteString
+        getIdBytes() {
+      java.lang.Object ref = id_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        id_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The identifier of this device registry. For example, `myRegistry`.
+     * 

+     *
+     * string id = 1;
+     */
+    public Builder setId(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      id_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The identifier of this device registry. For example, `myRegistry`.
+     * 

+     *
+     * string id = 1;
+     */
+    public Builder clearId() {
+      
+      id_ = getDefaultInstance().getId();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The identifier of this device registry. For example, `myRegistry`.
+     * 

+     *
+     * string id = 1;
+     */
+    public Builder setIdBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      id_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * The resource path name. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 2;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The resource path name. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 2;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The resource path name. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 2;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The resource path name. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 2;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The resource path name. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 2;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.util.List eventNotificationConfigs_ =
+      java.util.Collections.emptyList();
+    private void ensureEventNotificationConfigsIsMutable() {
+      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
+        eventNotificationConfigs_ = new java.util.ArrayList(eventNotificationConfigs_);
+        bitField0_ |= 0x00000004;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.EventNotificationConfig, com.google.cloud.iot.v1.EventNotificationConfig.Builder, com.google.cloud.iot.v1.EventNotificationConfigOrBuilder> eventNotificationConfigsBuilder_;
+
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public java.util.List getEventNotificationConfigsList() {
+      if (eventNotificationConfigsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(eventNotificationConfigs_);
+      } else {
+        return eventNotificationConfigsBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public int getEventNotificationConfigsCount() {
+      if (eventNotificationConfigsBuilder_ == null) {
+        return eventNotificationConfigs_.size();
+      } else {
+        return eventNotificationConfigsBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public com.google.cloud.iot.v1.EventNotificationConfig getEventNotificationConfigs(int index) {
+      if (eventNotificationConfigsBuilder_ == null) {
+        return eventNotificationConfigs_.get(index);
+      } else {
+        return eventNotificationConfigsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public Builder setEventNotificationConfigs(
+        int index, com.google.cloud.iot.v1.EventNotificationConfig value) {
+      if (eventNotificationConfigsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureEventNotificationConfigsIsMutable();
+        eventNotificationConfigs_.set(index, value);
+        onChanged();
+      } else {
+        eventNotificationConfigsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public Builder setEventNotificationConfigs(
+        int index, com.google.cloud.iot.v1.EventNotificationConfig.Builder builderForValue) {
+      if (eventNotificationConfigsBuilder_ == null) {
+        ensureEventNotificationConfigsIsMutable();
+        eventNotificationConfigs_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        eventNotificationConfigsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public Builder addEventNotificationConfigs(com.google.cloud.iot.v1.EventNotificationConfig value) {
+      if (eventNotificationConfigsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureEventNotificationConfigsIsMutable();
+        eventNotificationConfigs_.add(value);
+        onChanged();
+      } else {
+        eventNotificationConfigsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public Builder addEventNotificationConfigs(
+        int index, com.google.cloud.iot.v1.EventNotificationConfig value) {
+      if (eventNotificationConfigsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureEventNotificationConfigsIsMutable();
+        eventNotificationConfigs_.add(index, value);
+        onChanged();
+      } else {
+        eventNotificationConfigsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public Builder addEventNotificationConfigs(
+        com.google.cloud.iot.v1.EventNotificationConfig.Builder builderForValue) {
+      if (eventNotificationConfigsBuilder_ == null) {
+        ensureEventNotificationConfigsIsMutable();
+        eventNotificationConfigs_.add(builderForValue.build());
+        onChanged();
+      } else {
+        eventNotificationConfigsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public Builder addEventNotificationConfigs(
+        int index, com.google.cloud.iot.v1.EventNotificationConfig.Builder builderForValue) {
+      if (eventNotificationConfigsBuilder_ == null) {
+        ensureEventNotificationConfigsIsMutable();
+        eventNotificationConfigs_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        eventNotificationConfigsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public Builder addAllEventNotificationConfigs(
+        java.lang.Iterable values) {
+      if (eventNotificationConfigsBuilder_ == null) {
+        ensureEventNotificationConfigsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, eventNotificationConfigs_);
+        onChanged();
+      } else {
+        eventNotificationConfigsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public Builder clearEventNotificationConfigs() {
+      if (eventNotificationConfigsBuilder_ == null) {
+        eventNotificationConfigs_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+      } else {
+        eventNotificationConfigsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public Builder removeEventNotificationConfigs(int index) {
+      if (eventNotificationConfigsBuilder_ == null) {
+        ensureEventNotificationConfigsIsMutable();
+        eventNotificationConfigs_.remove(index);
+        onChanged();
+      } else {
+        eventNotificationConfigsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public com.google.cloud.iot.v1.EventNotificationConfig.Builder getEventNotificationConfigsBuilder(
+        int index) {
+      return getEventNotificationConfigsFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public com.google.cloud.iot.v1.EventNotificationConfigOrBuilder getEventNotificationConfigsOrBuilder(
+        int index) {
+      if (eventNotificationConfigsBuilder_ == null) {
+        return eventNotificationConfigs_.get(index);  } else {
+        return eventNotificationConfigsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public java.util.List 
+         getEventNotificationConfigsOrBuilderList() {
+      if (eventNotificationConfigsBuilder_ != null) {
+        return eventNotificationConfigsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(eventNotificationConfigs_);
+      }
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public com.google.cloud.iot.v1.EventNotificationConfig.Builder addEventNotificationConfigsBuilder() {
+      return getEventNotificationConfigsFieldBuilder().addBuilder(
+          com.google.cloud.iot.v1.EventNotificationConfig.getDefaultInstance());
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public com.google.cloud.iot.v1.EventNotificationConfig.Builder addEventNotificationConfigsBuilder(
+        int index) {
+      return getEventNotificationConfigsFieldBuilder().addBuilder(
+          index, com.google.cloud.iot.v1.EventNotificationConfig.getDefaultInstance());
+    }
+    /**
+     * 
+     * The configuration for notification of telemetry events received from the
+     * device. All telemetry events that were successfully published by the
+     * device and acknowledged by Cloud IoT Core are guaranteed to be
+     * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+     * only the first matching configuration is used. If you try to publish a
+     * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+     * for the device's registry, the connection closes automatically. If you try
+     * to do so using an HTTP connection, an error is returned. Up to 10
+     * configurations may be provided.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+     */
+    public java.util.List 
+         getEventNotificationConfigsBuilderList() {
+      return getEventNotificationConfigsFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.EventNotificationConfig, com.google.cloud.iot.v1.EventNotificationConfig.Builder, com.google.cloud.iot.v1.EventNotificationConfigOrBuilder> 
+        getEventNotificationConfigsFieldBuilder() {
+      if (eventNotificationConfigsBuilder_ == null) {
+        eventNotificationConfigsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.iot.v1.EventNotificationConfig, com.google.cloud.iot.v1.EventNotificationConfig.Builder, com.google.cloud.iot.v1.EventNotificationConfigOrBuilder>(
+                eventNotificationConfigs_,
+                ((bitField0_ & 0x00000004) == 0x00000004),
+                getParentForChildren(),
+                isClean());
+        eventNotificationConfigs_ = null;
+      }
+      return eventNotificationConfigsBuilder_;
+    }
+
+    private com.google.cloud.iot.v1.StateNotificationConfig stateNotificationConfig_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.StateNotificationConfig, com.google.cloud.iot.v1.StateNotificationConfig.Builder, com.google.cloud.iot.v1.StateNotificationConfigOrBuilder> stateNotificationConfigBuilder_;
+    /**
+     * 
+     * The configuration for notification of new states received from the device.
+     * State updates are guaranteed to be stored in the state history, but
+     * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+     * permissions are misconfigured or the specified topic doesn't exist, no
+     * notification will be published but the state will still be stored in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+     */
+    public boolean hasStateNotificationConfig() {
+      return stateNotificationConfigBuilder_ != null || stateNotificationConfig_ != null;
+    }
+    /**
+     * 
+     * The configuration for notification of new states received from the device.
+     * State updates are guaranteed to be stored in the state history, but
+     * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+     * permissions are misconfigured or the specified topic doesn't exist, no
+     * notification will be published but the state will still be stored in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+     */
+    public com.google.cloud.iot.v1.StateNotificationConfig getStateNotificationConfig() {
+      if (stateNotificationConfigBuilder_ == null) {
+        return stateNotificationConfig_ == null ? com.google.cloud.iot.v1.StateNotificationConfig.getDefaultInstance() : stateNotificationConfig_;
+      } else {
+        return stateNotificationConfigBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The configuration for notification of new states received from the device.
+     * State updates are guaranteed to be stored in the state history, but
+     * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+     * permissions are misconfigured or the specified topic doesn't exist, no
+     * notification will be published but the state will still be stored in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+     */
+    public Builder setStateNotificationConfig(com.google.cloud.iot.v1.StateNotificationConfig value) {
+      if (stateNotificationConfigBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        stateNotificationConfig_ = value;
+        onChanged();
+      } else {
+        stateNotificationConfigBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of new states received from the device.
+     * State updates are guaranteed to be stored in the state history, but
+     * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+     * permissions are misconfigured or the specified topic doesn't exist, no
+     * notification will be published but the state will still be stored in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+     */
+    public Builder setStateNotificationConfig(
+        com.google.cloud.iot.v1.StateNotificationConfig.Builder builderForValue) {
+      if (stateNotificationConfigBuilder_ == null) {
+        stateNotificationConfig_ = builderForValue.build();
+        onChanged();
+      } else {
+        stateNotificationConfigBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of new states received from the device.
+     * State updates are guaranteed to be stored in the state history, but
+     * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+     * permissions are misconfigured or the specified topic doesn't exist, no
+     * notification will be published but the state will still be stored in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+     */
+    public Builder mergeStateNotificationConfig(com.google.cloud.iot.v1.StateNotificationConfig value) {
+      if (stateNotificationConfigBuilder_ == null) {
+        if (stateNotificationConfig_ != null) {
+          stateNotificationConfig_ =
+            com.google.cloud.iot.v1.StateNotificationConfig.newBuilder(stateNotificationConfig_).mergeFrom(value).buildPartial();
+        } else {
+          stateNotificationConfig_ = value;
+        }
+        onChanged();
+      } else {
+        stateNotificationConfigBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of new states received from the device.
+     * State updates are guaranteed to be stored in the state history, but
+     * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+     * permissions are misconfigured or the specified topic doesn't exist, no
+     * notification will be published but the state will still be stored in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+     */
+    public Builder clearStateNotificationConfig() {
+      if (stateNotificationConfigBuilder_ == null) {
+        stateNotificationConfig_ = null;
+        onChanged();
+      } else {
+        stateNotificationConfig_ = null;
+        stateNotificationConfigBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The configuration for notification of new states received from the device.
+     * State updates are guaranteed to be stored in the state history, but
+     * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+     * permissions are misconfigured or the specified topic doesn't exist, no
+     * notification will be published but the state will still be stored in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+     */
+    public com.google.cloud.iot.v1.StateNotificationConfig.Builder getStateNotificationConfigBuilder() {
+      
+      onChanged();
+      return getStateNotificationConfigFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The configuration for notification of new states received from the device.
+     * State updates are guaranteed to be stored in the state history, but
+     * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+     * permissions are misconfigured or the specified topic doesn't exist, no
+     * notification will be published but the state will still be stored in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+     */
+    public com.google.cloud.iot.v1.StateNotificationConfigOrBuilder getStateNotificationConfigOrBuilder() {
+      if (stateNotificationConfigBuilder_ != null) {
+        return stateNotificationConfigBuilder_.getMessageOrBuilder();
+      } else {
+        return stateNotificationConfig_ == null ?
+            com.google.cloud.iot.v1.StateNotificationConfig.getDefaultInstance() : stateNotificationConfig_;
+      }
+    }
+    /**
+     * 
+     * The configuration for notification of new states received from the device.
+     * State updates are guaranteed to be stored in the state history, but
+     * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+     * permissions are misconfigured or the specified topic doesn't exist, no
+     * notification will be published but the state will still be stored in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.StateNotificationConfig, com.google.cloud.iot.v1.StateNotificationConfig.Builder, com.google.cloud.iot.v1.StateNotificationConfigOrBuilder> 
+        getStateNotificationConfigFieldBuilder() {
+      if (stateNotificationConfigBuilder_ == null) {
+        stateNotificationConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.iot.v1.StateNotificationConfig, com.google.cloud.iot.v1.StateNotificationConfig.Builder, com.google.cloud.iot.v1.StateNotificationConfigOrBuilder>(
+                getStateNotificationConfig(),
+                getParentForChildren(),
+                isClean());
+        stateNotificationConfig_ = null;
+      }
+      return stateNotificationConfigBuilder_;
+    }
+
+    private com.google.cloud.iot.v1.MqttConfig mqttConfig_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.MqttConfig, com.google.cloud.iot.v1.MqttConfig.Builder, com.google.cloud.iot.v1.MqttConfigOrBuilder> mqttConfigBuilder_;
+    /**
+     * 
+     * The MQTT configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+     */
+    public boolean hasMqttConfig() {
+      return mqttConfigBuilder_ != null || mqttConfig_ != null;
+    }
+    /**
+     * 
+     * The MQTT configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+     */
+    public com.google.cloud.iot.v1.MqttConfig getMqttConfig() {
+      if (mqttConfigBuilder_ == null) {
+        return mqttConfig_ == null ? com.google.cloud.iot.v1.MqttConfig.getDefaultInstance() : mqttConfig_;
+      } else {
+        return mqttConfigBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The MQTT configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+     */
+    public Builder setMqttConfig(com.google.cloud.iot.v1.MqttConfig value) {
+      if (mqttConfigBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        mqttConfig_ = value;
+        onChanged();
+      } else {
+        mqttConfigBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The MQTT configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+     */
+    public Builder setMqttConfig(
+        com.google.cloud.iot.v1.MqttConfig.Builder builderForValue) {
+      if (mqttConfigBuilder_ == null) {
+        mqttConfig_ = builderForValue.build();
+        onChanged();
+      } else {
+        mqttConfigBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The MQTT configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+     */
+    public Builder mergeMqttConfig(com.google.cloud.iot.v1.MqttConfig value) {
+      if (mqttConfigBuilder_ == null) {
+        if (mqttConfig_ != null) {
+          mqttConfig_ =
+            com.google.cloud.iot.v1.MqttConfig.newBuilder(mqttConfig_).mergeFrom(value).buildPartial();
+        } else {
+          mqttConfig_ = value;
+        }
+        onChanged();
+      } else {
+        mqttConfigBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The MQTT configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+     */
+    public Builder clearMqttConfig() {
+      if (mqttConfigBuilder_ == null) {
+        mqttConfig_ = null;
+        onChanged();
+      } else {
+        mqttConfig_ = null;
+        mqttConfigBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The MQTT configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+     */
+    public com.google.cloud.iot.v1.MqttConfig.Builder getMqttConfigBuilder() {
+      
+      onChanged();
+      return getMqttConfigFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The MQTT configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+     */
+    public com.google.cloud.iot.v1.MqttConfigOrBuilder getMqttConfigOrBuilder() {
+      if (mqttConfigBuilder_ != null) {
+        return mqttConfigBuilder_.getMessageOrBuilder();
+      } else {
+        return mqttConfig_ == null ?
+            com.google.cloud.iot.v1.MqttConfig.getDefaultInstance() : mqttConfig_;
+      }
+    }
+    /**
+     * 
+     * The MQTT configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.MqttConfig, com.google.cloud.iot.v1.MqttConfig.Builder, com.google.cloud.iot.v1.MqttConfigOrBuilder> 
+        getMqttConfigFieldBuilder() {
+      if (mqttConfigBuilder_ == null) {
+        mqttConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.iot.v1.MqttConfig, com.google.cloud.iot.v1.MqttConfig.Builder, com.google.cloud.iot.v1.MqttConfigOrBuilder>(
+                getMqttConfig(),
+                getParentForChildren(),
+                isClean());
+        mqttConfig_ = null;
+      }
+      return mqttConfigBuilder_;
+    }
+
+    private com.google.cloud.iot.v1.HttpConfig httpConfig_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.HttpConfig, com.google.cloud.iot.v1.HttpConfig.Builder, com.google.cloud.iot.v1.HttpConfigOrBuilder> httpConfigBuilder_;
+    /**
+     * 
+     * The DeviceService (HTTP) configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpConfig http_config = 9;
+     */
+    public boolean hasHttpConfig() {
+      return httpConfigBuilder_ != null || httpConfig_ != null;
+    }
+    /**
+     * 
+     * The DeviceService (HTTP) configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpConfig http_config = 9;
+     */
+    public com.google.cloud.iot.v1.HttpConfig getHttpConfig() {
+      if (httpConfigBuilder_ == null) {
+        return httpConfig_ == null ? com.google.cloud.iot.v1.HttpConfig.getDefaultInstance() : httpConfig_;
+      } else {
+        return httpConfigBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The DeviceService (HTTP) configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpConfig http_config = 9;
+     */
+    public Builder setHttpConfig(com.google.cloud.iot.v1.HttpConfig value) {
+      if (httpConfigBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        httpConfig_ = value;
+        onChanged();
+      } else {
+        httpConfigBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The DeviceService (HTTP) configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpConfig http_config = 9;
+     */
+    public Builder setHttpConfig(
+        com.google.cloud.iot.v1.HttpConfig.Builder builderForValue) {
+      if (httpConfigBuilder_ == null) {
+        httpConfig_ = builderForValue.build();
+        onChanged();
+      } else {
+        httpConfigBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The DeviceService (HTTP) configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpConfig http_config = 9;
+     */
+    public Builder mergeHttpConfig(com.google.cloud.iot.v1.HttpConfig value) {
+      if (httpConfigBuilder_ == null) {
+        if (httpConfig_ != null) {
+          httpConfig_ =
+            com.google.cloud.iot.v1.HttpConfig.newBuilder(httpConfig_).mergeFrom(value).buildPartial();
+        } else {
+          httpConfig_ = value;
+        }
+        onChanged();
+      } else {
+        httpConfigBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The DeviceService (HTTP) configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpConfig http_config = 9;
+     */
+    public Builder clearHttpConfig() {
+      if (httpConfigBuilder_ == null) {
+        httpConfig_ = null;
+        onChanged();
+      } else {
+        httpConfig_ = null;
+        httpConfigBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The DeviceService (HTTP) configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpConfig http_config = 9;
+     */
+    public com.google.cloud.iot.v1.HttpConfig.Builder getHttpConfigBuilder() {
+      
+      onChanged();
+      return getHttpConfigFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The DeviceService (HTTP) configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpConfig http_config = 9;
+     */
+    public com.google.cloud.iot.v1.HttpConfigOrBuilder getHttpConfigOrBuilder() {
+      if (httpConfigBuilder_ != null) {
+        return httpConfigBuilder_.getMessageOrBuilder();
+      } else {
+        return httpConfig_ == null ?
+            com.google.cloud.iot.v1.HttpConfig.getDefaultInstance() : httpConfig_;
+      }
+    }
+    /**
+     * 
+     * The DeviceService (HTTP) configuration for this device registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpConfig http_config = 9;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.HttpConfig, com.google.cloud.iot.v1.HttpConfig.Builder, com.google.cloud.iot.v1.HttpConfigOrBuilder> 
+        getHttpConfigFieldBuilder() {
+      if (httpConfigBuilder_ == null) {
+        httpConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.iot.v1.HttpConfig, com.google.cloud.iot.v1.HttpConfig.Builder, com.google.cloud.iot.v1.HttpConfigOrBuilder>(
+                getHttpConfig(),
+                getParentForChildren(),
+                isClean());
+        httpConfig_ = null;
+      }
+      return httpConfigBuilder_;
+    }
+
+    private java.util.List credentials_ =
+      java.util.Collections.emptyList();
+    private void ensureCredentialsIsMutable() {
+      if (!((bitField0_ & 0x00000040) == 0x00000040)) {
+        credentials_ = new java.util.ArrayList(credentials_);
+        bitField0_ |= 0x00000040;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.RegistryCredential, com.google.cloud.iot.v1.RegistryCredential.Builder, com.google.cloud.iot.v1.RegistryCredentialOrBuilder> credentialsBuilder_;
+
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public java.util.List getCredentialsList() {
+      if (credentialsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(credentials_);
+      } else {
+        return credentialsBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public int getCredentialsCount() {
+      if (credentialsBuilder_ == null) {
+        return credentials_.size();
+      } else {
+        return credentialsBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public com.google.cloud.iot.v1.RegistryCredential getCredentials(int index) {
+      if (credentialsBuilder_ == null) {
+        return credentials_.get(index);
+      } else {
+        return credentialsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public Builder setCredentials(
+        int index, com.google.cloud.iot.v1.RegistryCredential value) {
+      if (credentialsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureCredentialsIsMutable();
+        credentials_.set(index, value);
+        onChanged();
+      } else {
+        credentialsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public Builder setCredentials(
+        int index, com.google.cloud.iot.v1.RegistryCredential.Builder builderForValue) {
+      if (credentialsBuilder_ == null) {
+        ensureCredentialsIsMutable();
+        credentials_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        credentialsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public Builder addCredentials(com.google.cloud.iot.v1.RegistryCredential value) {
+      if (credentialsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureCredentialsIsMutable();
+        credentials_.add(value);
+        onChanged();
+      } else {
+        credentialsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public Builder addCredentials(
+        int index, com.google.cloud.iot.v1.RegistryCredential value) {
+      if (credentialsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureCredentialsIsMutable();
+        credentials_.add(index, value);
+        onChanged();
+      } else {
+        credentialsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public Builder addCredentials(
+        com.google.cloud.iot.v1.RegistryCredential.Builder builderForValue) {
+      if (credentialsBuilder_ == null) {
+        ensureCredentialsIsMutable();
+        credentials_.add(builderForValue.build());
+        onChanged();
+      } else {
+        credentialsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public Builder addCredentials(
+        int index, com.google.cloud.iot.v1.RegistryCredential.Builder builderForValue) {
+      if (credentialsBuilder_ == null) {
+        ensureCredentialsIsMutable();
+        credentials_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        credentialsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public Builder addAllCredentials(
+        java.lang.Iterable values) {
+      if (credentialsBuilder_ == null) {
+        ensureCredentialsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, credentials_);
+        onChanged();
+      } else {
+        credentialsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public Builder clearCredentials() {
+      if (credentialsBuilder_ == null) {
+        credentials_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000040);
+        onChanged();
+      } else {
+        credentialsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public Builder removeCredentials(int index) {
+      if (credentialsBuilder_ == null) {
+        ensureCredentialsIsMutable();
+        credentials_.remove(index);
+        onChanged();
+      } else {
+        credentialsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public com.google.cloud.iot.v1.RegistryCredential.Builder getCredentialsBuilder(
+        int index) {
+      return getCredentialsFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public com.google.cloud.iot.v1.RegistryCredentialOrBuilder getCredentialsOrBuilder(
+        int index) {
+      if (credentialsBuilder_ == null) {
+        return credentials_.get(index);  } else {
+        return credentialsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public java.util.List 
+         getCredentialsOrBuilderList() {
+      if (credentialsBuilder_ != null) {
+        return credentialsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(credentials_);
+      }
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public com.google.cloud.iot.v1.RegistryCredential.Builder addCredentialsBuilder() {
+      return getCredentialsFieldBuilder().addBuilder(
+          com.google.cloud.iot.v1.RegistryCredential.getDefaultInstance());
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public com.google.cloud.iot.v1.RegistryCredential.Builder addCredentialsBuilder(
+        int index) {
+      return getCredentialsFieldBuilder().addBuilder(
+          index, com.google.cloud.iot.v1.RegistryCredential.getDefaultInstance());
+    }
+    /**
+     * 
+     * The credentials used to verify the device credentials. No more than 10
+     * credentials can be bound to a single registry at a time. The verification
+     * process occurs at the time of device creation or update. If this field is
+     * empty, no verification is performed. Otherwise, the credentials of a newly
+     * created device or added credentials of an updated device should be signed
+     * with one of these registry credentials.
+     * Note, however, that existing devices will never be affected by
+     * modifications to this list of credentials: after a device has been
+     * successfully created in a registry, it should be able to connect even if
+     * its registry credentials are revoked, deleted, or modified.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+     */
+    public java.util.List 
+         getCredentialsBuilderList() {
+      return getCredentialsFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.RegistryCredential, com.google.cloud.iot.v1.RegistryCredential.Builder, com.google.cloud.iot.v1.RegistryCredentialOrBuilder> 
+        getCredentialsFieldBuilder() {
+      if (credentialsBuilder_ == null) {
+        credentialsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.iot.v1.RegistryCredential, com.google.cloud.iot.v1.RegistryCredential.Builder, com.google.cloud.iot.v1.RegistryCredentialOrBuilder>(
+                credentials_,
+                ((bitField0_ & 0x00000040) == 0x00000040),
+                getParentForChildren(),
+                isClean());
+        credentials_ = null;
+      }
+      return credentialsBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.DeviceRegistry)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.DeviceRegistry)
+  private static final com.google.cloud.iot.v1.DeviceRegistry DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.DeviceRegistry();
+  }
+
+  public static com.google.cloud.iot.v1.DeviceRegistry getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public DeviceRegistry parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new DeviceRegistry(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.DeviceRegistry getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistryOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistryOrBuilder.java
new file mode 100644
index 000000000000..fb1eff3332d9
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistryOrBuilder.java
@@ -0,0 +1,310 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface DeviceRegistryOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.DeviceRegistry)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The identifier of this device registry. For example, `myRegistry`.
+   * 

+   *
+   * string id = 1;
+   */
+  java.lang.String getId();
+  /**
+   * 
+   * The identifier of this device registry. For example, `myRegistry`.
+   * 

+   *
+   * string id = 1;
+   */
+  com.google.protobuf.ByteString
+      getIdBytes();
+
+  /**
+   * 
+   * The resource path name. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string name = 2;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * The resource path name. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string name = 2;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * 
+   * The configuration for notification of telemetry events received from the
+   * device. All telemetry events that were successfully published by the
+   * device and acknowledged by Cloud IoT Core are guaranteed to be
+   * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+   * only the first matching configuration is used. If you try to publish a
+   * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+   * for the device's registry, the connection closes automatically. If you try
+   * to do so using an HTTP connection, an error is returned. Up to 10
+   * configurations may be provided.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+   */
+  java.util.List 
+      getEventNotificationConfigsList();
+  /**
+   * 
+   * The configuration for notification of telemetry events received from the
+   * device. All telemetry events that were successfully published by the
+   * device and acknowledged by Cloud IoT Core are guaranteed to be
+   * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+   * only the first matching configuration is used. If you try to publish a
+   * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+   * for the device's registry, the connection closes automatically. If you try
+   * to do so using an HTTP connection, an error is returned. Up to 10
+   * configurations may be provided.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+   */
+  com.google.cloud.iot.v1.EventNotificationConfig getEventNotificationConfigs(int index);
+  /**
+   * 
+   * The configuration for notification of telemetry events received from the
+   * device. All telemetry events that were successfully published by the
+   * device and acknowledged by Cloud IoT Core are guaranteed to be
+   * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+   * only the first matching configuration is used. If you try to publish a
+   * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+   * for the device's registry, the connection closes automatically. If you try
+   * to do so using an HTTP connection, an error is returned. Up to 10
+   * configurations may be provided.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+   */
+  int getEventNotificationConfigsCount();
+  /**
+   * 
+   * The configuration for notification of telemetry events received from the
+   * device. All telemetry events that were successfully published by the
+   * device and acknowledged by Cloud IoT Core are guaranteed to be
+   * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+   * only the first matching configuration is used. If you try to publish a
+   * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+   * for the device's registry, the connection closes automatically. If you try
+   * to do so using an HTTP connection, an error is returned. Up to 10
+   * configurations may be provided.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+   */
+  java.util.List 
+      getEventNotificationConfigsOrBuilderList();
+  /**
+   * 
+   * The configuration for notification of telemetry events received from the
+   * device. All telemetry events that were successfully published by the
+   * device and acknowledged by Cloud IoT Core are guaranteed to be
+   * delivered to Cloud Pub/Sub. If multiple configurations match a message,
+   * only the first matching configuration is used. If you try to publish a
+   * device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+   * for the device's registry, the connection closes automatically. If you try
+   * to do so using an HTTP connection, an error is returned. Up to 10
+   * configurations may be provided.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.EventNotificationConfig event_notification_configs = 10;
+   */
+  com.google.cloud.iot.v1.EventNotificationConfigOrBuilder getEventNotificationConfigsOrBuilder(
+      int index);
+
+  /**
+   * 
+   * The configuration for notification of new states received from the device.
+   * State updates are guaranteed to be stored in the state history, but
+   * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+   * permissions are misconfigured or the specified topic doesn't exist, no
+   * notification will be published but the state will still be stored in Cloud
+   * IoT Core.
+   * 

+   *
+   * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+   */
+  boolean hasStateNotificationConfig();
+  /**
+   * 
+   * The configuration for notification of new states received from the device.
+   * State updates are guaranteed to be stored in the state history, but
+   * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+   * permissions are misconfigured or the specified topic doesn't exist, no
+   * notification will be published but the state will still be stored in Cloud
+   * IoT Core.
+   * 

+   *
+   * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+   */
+  com.google.cloud.iot.v1.StateNotificationConfig getStateNotificationConfig();
+  /**
+   * 
+   * The configuration for notification of new states received from the device.
+   * State updates are guaranteed to be stored in the state history, but
+   * notifications to Cloud Pub/Sub are not guaranteed. For example, if
+   * permissions are misconfigured or the specified topic doesn't exist, no
+   * notification will be published but the state will still be stored in Cloud
+   * IoT Core.
+   * 

+   *
+   * .google.cloud.iot.v1.StateNotificationConfig state_notification_config = 7;
+   */
+  com.google.cloud.iot.v1.StateNotificationConfigOrBuilder getStateNotificationConfigOrBuilder();
+
+  /**
+   * 
+   * The MQTT configuration for this device registry.
+   * 

+   *
+   * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+   */
+  boolean hasMqttConfig();
+  /**
+   * 
+   * The MQTT configuration for this device registry.
+   * 

+   *
+   * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+   */
+  com.google.cloud.iot.v1.MqttConfig getMqttConfig();
+  /**
+   * 
+   * The MQTT configuration for this device registry.
+   * 

+   *
+   * .google.cloud.iot.v1.MqttConfig mqtt_config = 4;
+   */
+  com.google.cloud.iot.v1.MqttConfigOrBuilder getMqttConfigOrBuilder();
+
+  /**
+   * 
+   * The DeviceService (HTTP) configuration for this device registry.
+   * 

+   *
+   * .google.cloud.iot.v1.HttpConfig http_config = 9;
+   */
+  boolean hasHttpConfig();
+  /**
+   * 
+   * The DeviceService (HTTP) configuration for this device registry.
+   * 

+   *
+   * .google.cloud.iot.v1.HttpConfig http_config = 9;
+   */
+  com.google.cloud.iot.v1.HttpConfig getHttpConfig();
+  /**
+   * 
+   * The DeviceService (HTTP) configuration for this device registry.
+   * 

+   *
+   * .google.cloud.iot.v1.HttpConfig http_config = 9;
+   */
+  com.google.cloud.iot.v1.HttpConfigOrBuilder getHttpConfigOrBuilder();
+
+  /**
+   * 
+   * The credentials used to verify the device credentials. No more than 10
+   * credentials can be bound to a single registry at a time. The verification
+   * process occurs at the time of device creation or update. If this field is
+   * empty, no verification is performed. Otherwise, the credentials of a newly
+   * created device or added credentials of an updated device should be signed
+   * with one of these registry credentials.
+   * Note, however, that existing devices will never be affected by
+   * modifications to this list of credentials: after a device has been
+   * successfully created in a registry, it should be able to connect even if
+   * its registry credentials are revoked, deleted, or modified.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+   */
+  java.util.List 
+      getCredentialsList();
+  /**
+   * 
+   * The credentials used to verify the device credentials. No more than 10
+   * credentials can be bound to a single registry at a time. The verification
+   * process occurs at the time of device creation or update. If this field is
+   * empty, no verification is performed. Otherwise, the credentials of a newly
+   * created device or added credentials of an updated device should be signed
+   * with one of these registry credentials.
+   * Note, however, that existing devices will never be affected by
+   * modifications to this list of credentials: after a device has been
+   * successfully created in a registry, it should be able to connect even if
+   * its registry credentials are revoked, deleted, or modified.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+   */
+  com.google.cloud.iot.v1.RegistryCredential getCredentials(int index);
+  /**
+   * 
+   * The credentials used to verify the device credentials. No more than 10
+   * credentials can be bound to a single registry at a time. The verification
+   * process occurs at the time of device creation or update. If this field is
+   * empty, no verification is performed. Otherwise, the credentials of a newly
+   * created device or added credentials of an updated device should be signed
+   * with one of these registry credentials.
+   * Note, however, that existing devices will never be affected by
+   * modifications to this list of credentials: after a device has been
+   * successfully created in a registry, it should be able to connect even if
+   * its registry credentials are revoked, deleted, or modified.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+   */
+  int getCredentialsCount();
+  /**
+   * 
+   * The credentials used to verify the device credentials. No more than 10
+   * credentials can be bound to a single registry at a time. The verification
+   * process occurs at the time of device creation or update. If this field is
+   * empty, no verification is performed. Otherwise, the credentials of a newly
+   * created device or added credentials of an updated device should be signed
+   * with one of these registry credentials.
+   * Note, however, that existing devices will never be affected by
+   * modifications to this list of credentials: after a device has been
+   * successfully created in a registry, it should be able to connect even if
+   * its registry credentials are revoked, deleted, or modified.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+   */
+  java.util.List 
+      getCredentialsOrBuilderList();
+  /**
+   * 
+   * The credentials used to verify the device credentials. No more than 10
+   * credentials can be bound to a single registry at a time. The verification
+   * process occurs at the time of device creation or update. If this field is
+   * empty, no verification is performed. Otherwise, the credentials of a newly
+   * created device or added credentials of an updated device should be signed
+   * with one of these registry credentials.
+   * Note, however, that existing devices will never be affected by
+   * modifications to this list of credentials: after a device has been
+   * successfully created in a registry, it should be able to connect even if
+   * its registry credentials are revoked, deleted, or modified.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.RegistryCredential credentials = 8;
+   */
+  com.google.cloud.iot.v1.RegistryCredentialOrBuilder getCredentialsOrBuilder(
+      int index);
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java
new file mode 100644
index 000000000000..758677668a7b
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java
@@ -0,0 +1,715 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * The device state, as reported by the device.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.DeviceState}
+ */
+public  final class DeviceState extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.DeviceState)
+    DeviceStateOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use DeviceState.newBuilder() to construct.
+  private DeviceState(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private DeviceState() {
+    binaryData_ = com.google.protobuf.ByteString.EMPTY;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private DeviceState(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (updateTime_ != null) {
+              subBuilder = updateTime_.toBuilder();
+            }
+            updateTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(updateTime_);
+              updateTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 18: {
+
+            binaryData_ = input.readBytes();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceState_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceState_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.DeviceState.class, com.google.cloud.iot.v1.DeviceState.Builder.class);
+  }
+
+  public static final int UPDATE_TIME_FIELD_NUMBER = 1;
+  private com.google.protobuf.Timestamp updateTime_;
+  /**
+   * 
+   * [Output only] The time at which this state version was updated in Cloud
+   * IoT Core.
+   * 

+   *
+   * .google.protobuf.Timestamp update_time = 1;
+   */
+  public boolean hasUpdateTime() {
+    return updateTime_ != null;
+  }
+  /**
+   * 
+   * [Output only] The time at which this state version was updated in Cloud
+   * IoT Core.
+   * 

+   *
+   * .google.protobuf.Timestamp update_time = 1;
+   */
+  public com.google.protobuf.Timestamp getUpdateTime() {
+    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+  }
+  /**
+   * 
+   * [Output only] The time at which this state version was updated in Cloud
+   * IoT Core.
+   * 

+   *
+   * .google.protobuf.Timestamp update_time = 1;
+   */
+  public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
+    return getUpdateTime();
+  }
+
+  public static final int BINARY_DATA_FIELD_NUMBER = 2;
+  private com.google.protobuf.ByteString binaryData_;
+  /**
+   * 
+   * The device state data.
+   * 

+   *
+   * bytes binary_data = 2;
+   */
+  public com.google.protobuf.ByteString getBinaryData() {
+    return binaryData_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (updateTime_ != null) {
+      output.writeMessage(1, getUpdateTime());
+    }
+    if (!binaryData_.isEmpty()) {
+      output.writeBytes(2, binaryData_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (updateTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getUpdateTime());
+    }
+    if (!binaryData_.isEmpty()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(2, binaryData_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.DeviceState)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.DeviceState other = (com.google.cloud.iot.v1.DeviceState) obj;
+
+    boolean result = true;
+    result = result && (hasUpdateTime() == other.hasUpdateTime());
+    if (hasUpdateTime()) {
+      result = result && getUpdateTime()
+          .equals(other.getUpdateTime());
+    }
+    result = result && getBinaryData()
+        .equals(other.getBinaryData());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasUpdateTime()) {
+      hash = (37 * hash) + UPDATE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getUpdateTime().hashCode();
+    }
+    hash = (37 * hash) + BINARY_DATA_FIELD_NUMBER;
+    hash = (53 * hash) + getBinaryData().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.DeviceState parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeviceState parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceState parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeviceState parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceState parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.DeviceState parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceState parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeviceState parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceState parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeviceState parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.DeviceState parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.DeviceState parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.DeviceState prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * The device state, as reported by the device.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.DeviceState}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.DeviceState)
+      com.google.cloud.iot.v1.DeviceStateOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceState_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceState_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.DeviceState.class, com.google.cloud.iot.v1.DeviceState.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.DeviceState.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
+        updateTimeBuilder_ = null;
+      }
+      binaryData_ = com.google.protobuf.ByteString.EMPTY;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceState_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.DeviceState getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.DeviceState.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.DeviceState build() {
+      com.google.cloud.iot.v1.DeviceState result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.DeviceState buildPartial() {
+      com.google.cloud.iot.v1.DeviceState result = new com.google.cloud.iot.v1.DeviceState(this);
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
+      }
+      result.binaryData_ = binaryData_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.DeviceState) {
+        return mergeFrom((com.google.cloud.iot.v1.DeviceState)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.DeviceState other) {
+      if (other == com.google.cloud.iot.v1.DeviceState.getDefaultInstance()) return this;
+      if (other.hasUpdateTime()) {
+        mergeUpdateTime(other.getUpdateTime());
+      }
+      if (other.getBinaryData() != com.google.protobuf.ByteString.EMPTY) {
+        setBinaryData(other.getBinaryData());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.DeviceState parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.DeviceState) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.protobuf.Timestamp updateTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> updateTimeBuilder_;
+    /**
+     * 
+     * [Output only] The time at which this state version was updated in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 1;
+     */
+    public boolean hasUpdateTime() {
+      return updateTimeBuilder_ != null || updateTime_ != null;
+    }
+    /**
+     * 
+     * [Output only] The time at which this state version was updated in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 1;
+     */
+    public com.google.protobuf.Timestamp getUpdateTime() {
+      if (updateTimeBuilder_ == null) {
+        return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+      } else {
+        return updateTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Output only] The time at which this state version was updated in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 1;
+     */
+    public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
+      if (updateTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        updateTime_ = value;
+        onChanged();
+      } else {
+        updateTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time at which this state version was updated in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 1;
+     */
+    public Builder setUpdateTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        updateTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time at which this state version was updated in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 1;
+     */
+    public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
+      if (updateTimeBuilder_ == null) {
+        if (updateTime_ != null) {
+          updateTime_ =
+            com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
+        } else {
+          updateTime_ = value;
+        }
+        onChanged();
+      } else {
+        updateTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time at which this state version was updated in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 1;
+     */
+    public Builder clearUpdateTime() {
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
+        updateTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The time at which this state version was updated in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 1;
+     */
+    public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
+      
+      onChanged();
+      return getUpdateTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Output only] The time at which this state version was updated in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 1;
+     */
+    public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
+      if (updateTimeBuilder_ != null) {
+        return updateTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return updateTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+      }
+    }
+    /**
+     * 
+     * [Output only] The time at which this state version was updated in Cloud
+     * IoT Core.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getUpdateTimeFieldBuilder() {
+      if (updateTimeBuilder_ == null) {
+        updateTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getUpdateTime(),
+                getParentForChildren(),
+                isClean());
+        updateTime_ = null;
+      }
+      return updateTimeBuilder_;
+    }
+
+    private com.google.protobuf.ByteString binaryData_ = com.google.protobuf.ByteString.EMPTY;
+    /**
+     * 
+     * The device state data.
+     * 

+     *
+     * bytes binary_data = 2;
+     */
+    public com.google.protobuf.ByteString getBinaryData() {
+      return binaryData_;
+    }
+    /**
+     * 
+     * The device state data.
+     * 

+     *
+     * bytes binary_data = 2;
+     */
+    public Builder setBinaryData(com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      binaryData_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The device state data.
+     * 

+     *
+     * bytes binary_data = 2;
+     */
+    public Builder clearBinaryData() {
+      
+      binaryData_ = getDefaultInstance().getBinaryData();
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.DeviceState)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.DeviceState)
+  private static final com.google.cloud.iot.v1.DeviceState DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.DeviceState();
+  }
+
+  public static com.google.cloud.iot.v1.DeviceState getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public DeviceState parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new DeviceState(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.DeviceState getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceStateOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceStateOrBuilder.java
new file mode 100644
index 000000000000..356abb045a2b
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceStateOrBuilder.java
@@ -0,0 +1,46 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface DeviceStateOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.DeviceState)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * [Output only] The time at which this state version was updated in Cloud
+   * IoT Core.
+   * 

+   *
+   * .google.protobuf.Timestamp update_time = 1;
+   */
+  boolean hasUpdateTime();
+  /**
+   * 
+   * [Output only] The time at which this state version was updated in Cloud
+   * IoT Core.
+   * 

+   *
+   * .google.protobuf.Timestamp update_time = 1;
+   */
+  com.google.protobuf.Timestamp getUpdateTime();
+  /**
+   * 
+   * [Output only] The time at which this state version was updated in Cloud
+   * IoT Core.
+   * 

+   *
+   * .google.protobuf.Timestamp update_time = 1;
+   */
+  com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder();
+
+  /**
+   * 
+   * The device state data.
+   * 

+   *
+   * bytes binary_data = 2;
+   */
+  com.google.protobuf.ByteString getBinaryData();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java
new file mode 100644
index 000000000000..e6c71bfd0171
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java
@@ -0,0 +1,735 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * The configuration for forwarding telemetry events.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.EventNotificationConfig}
+ */
+public  final class EventNotificationConfig extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.EventNotificationConfig)
+    EventNotificationConfigOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use EventNotificationConfig.newBuilder() to construct.
+  private EventNotificationConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private EventNotificationConfig() {
+    subfolderMatches_ = "";
+    pubsubTopicName_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private EventNotificationConfig(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            pubsubTopicName_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            subfolderMatches_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_EventNotificationConfig_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_EventNotificationConfig_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.EventNotificationConfig.class, com.google.cloud.iot.v1.EventNotificationConfig.Builder.class);
+  }
+
+  public static final int SUBFOLDER_MATCHES_FIELD_NUMBER = 2;
+  private volatile java.lang.Object subfolderMatches_;
+  /**
+   * 
+   * If the subfolder name matches this string exactly, this configuration will
+   * be used. The string must not include the leading '/' character. If empty,
+   * all strings are matched. This field is used only for telemetry events;
+   * subfolders are not supported for state changes.
+   * 

+   *
+   * string subfolder_matches = 2;
+   */
+  public java.lang.String getSubfolderMatches() {
+    java.lang.Object ref = subfolderMatches_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      subfolderMatches_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * If the subfolder name matches this string exactly, this configuration will
+   * be used. The string must not include the leading '/' character. If empty,
+   * all strings are matched. This field is used only for telemetry events;
+   * subfolders are not supported for state changes.
+   * 

+   *
+   * string subfolder_matches = 2;
+   */
+  public com.google.protobuf.ByteString
+      getSubfolderMatchesBytes() {
+    java.lang.Object ref = subfolderMatches_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      subfolderMatches_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PUBSUB_TOPIC_NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object pubsubTopicName_;
+  /**
+   * 
+   * A Cloud Pub/Sub topic name. For example,
+   * `projects/myProject/topics/deviceEvents`.
+   * 

+   *
+   * string pubsub_topic_name = 1;
+   */
+  public java.lang.String getPubsubTopicName() {
+    java.lang.Object ref = pubsubTopicName_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      pubsubTopicName_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * A Cloud Pub/Sub topic name. For example,
+   * `projects/myProject/topics/deviceEvents`.
+   * 

+   *
+   * string pubsub_topic_name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getPubsubTopicNameBytes() {
+    java.lang.Object ref = pubsubTopicName_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      pubsubTopicName_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getPubsubTopicNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, pubsubTopicName_);
+    }
+    if (!getSubfolderMatchesBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, subfolderMatches_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getPubsubTopicNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, pubsubTopicName_);
+    }
+    if (!getSubfolderMatchesBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, subfolderMatches_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.EventNotificationConfig)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.EventNotificationConfig other = (com.google.cloud.iot.v1.EventNotificationConfig) obj;
+
+    boolean result = true;
+    result = result && getSubfolderMatches()
+        .equals(other.getSubfolderMatches());
+    result = result && getPubsubTopicName()
+        .equals(other.getPubsubTopicName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + SUBFOLDER_MATCHES_FIELD_NUMBER;
+    hash = (53 * hash) + getSubfolderMatches().hashCode();
+    hash = (37 * hash) + PUBSUB_TOPIC_NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getPubsubTopicName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.EventNotificationConfig parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.EventNotificationConfig parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.EventNotificationConfig parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.EventNotificationConfig parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.EventNotificationConfig parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.EventNotificationConfig parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.EventNotificationConfig parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.EventNotificationConfig parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.EventNotificationConfig parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.EventNotificationConfig parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.EventNotificationConfig parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.EventNotificationConfig parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.EventNotificationConfig prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * The configuration for forwarding telemetry events.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.EventNotificationConfig}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.EventNotificationConfig)
+      com.google.cloud.iot.v1.EventNotificationConfigOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_EventNotificationConfig_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_EventNotificationConfig_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.EventNotificationConfig.class, com.google.cloud.iot.v1.EventNotificationConfig.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.EventNotificationConfig.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      subfolderMatches_ = "";
+
+      pubsubTopicName_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_EventNotificationConfig_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.EventNotificationConfig getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.EventNotificationConfig.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.EventNotificationConfig build() {
+      com.google.cloud.iot.v1.EventNotificationConfig result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.EventNotificationConfig buildPartial() {
+      com.google.cloud.iot.v1.EventNotificationConfig result = new com.google.cloud.iot.v1.EventNotificationConfig(this);
+      result.subfolderMatches_ = subfolderMatches_;
+      result.pubsubTopicName_ = pubsubTopicName_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.EventNotificationConfig) {
+        return mergeFrom((com.google.cloud.iot.v1.EventNotificationConfig)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.EventNotificationConfig other) {
+      if (other == com.google.cloud.iot.v1.EventNotificationConfig.getDefaultInstance()) return this;
+      if (!other.getSubfolderMatches().isEmpty()) {
+        subfolderMatches_ = other.subfolderMatches_;
+        onChanged();
+      }
+      if (!other.getPubsubTopicName().isEmpty()) {
+        pubsubTopicName_ = other.pubsubTopicName_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.EventNotificationConfig parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.EventNotificationConfig) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object subfolderMatches_ = "";
+    /**
+     * 
+     * If the subfolder name matches this string exactly, this configuration will
+     * be used. The string must not include the leading '/' character. If empty,
+     * all strings are matched. This field is used only for telemetry events;
+     * subfolders are not supported for state changes.
+     * 

+     *
+     * string subfolder_matches = 2;
+     */
+    public java.lang.String getSubfolderMatches() {
+      java.lang.Object ref = subfolderMatches_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        subfolderMatches_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * If the subfolder name matches this string exactly, this configuration will
+     * be used. The string must not include the leading '/' character. If empty,
+     * all strings are matched. This field is used only for telemetry events;
+     * subfolders are not supported for state changes.
+     * 

+     *
+     * string subfolder_matches = 2;
+     */
+    public com.google.protobuf.ByteString
+        getSubfolderMatchesBytes() {
+      java.lang.Object ref = subfolderMatches_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        subfolderMatches_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * If the subfolder name matches this string exactly, this configuration will
+     * be used. The string must not include the leading '/' character. If empty,
+     * all strings are matched. This field is used only for telemetry events;
+     * subfolders are not supported for state changes.
+     * 

+     *
+     * string subfolder_matches = 2;
+     */
+    public Builder setSubfolderMatches(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      subfolderMatches_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * If the subfolder name matches this string exactly, this configuration will
+     * be used. The string must not include the leading '/' character. If empty,
+     * all strings are matched. This field is used only for telemetry events;
+     * subfolders are not supported for state changes.
+     * 

+     *
+     * string subfolder_matches = 2;
+     */
+    public Builder clearSubfolderMatches() {
+      
+      subfolderMatches_ = getDefaultInstance().getSubfolderMatches();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * If the subfolder name matches this string exactly, this configuration will
+     * be used. The string must not include the leading '/' character. If empty,
+     * all strings are matched. This field is used only for telemetry events;
+     * subfolders are not supported for state changes.
+     * 

+     *
+     * string subfolder_matches = 2;
+     */
+    public Builder setSubfolderMatchesBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      subfolderMatches_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object pubsubTopicName_ = "";
+    /**
+     * 
+     * A Cloud Pub/Sub topic name. For example,
+     * `projects/myProject/topics/deviceEvents`.
+     * 

+     *
+     * string pubsub_topic_name = 1;
+     */
+    public java.lang.String getPubsubTopicName() {
+      java.lang.Object ref = pubsubTopicName_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        pubsubTopicName_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * A Cloud Pub/Sub topic name. For example,
+     * `projects/myProject/topics/deviceEvents`.
+     * 

+     *
+     * string pubsub_topic_name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getPubsubTopicNameBytes() {
+      java.lang.Object ref = pubsubTopicName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pubsubTopicName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * A Cloud Pub/Sub topic name. For example,
+     * `projects/myProject/topics/deviceEvents`.
+     * 

+     *
+     * string pubsub_topic_name = 1;
+     */
+    public Builder setPubsubTopicName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      pubsubTopicName_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A Cloud Pub/Sub topic name. For example,
+     * `projects/myProject/topics/deviceEvents`.
+     * 

+     *
+     * string pubsub_topic_name = 1;
+     */
+    public Builder clearPubsubTopicName() {
+      
+      pubsubTopicName_ = getDefaultInstance().getPubsubTopicName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A Cloud Pub/Sub topic name. For example,
+     * `projects/myProject/topics/deviceEvents`.
+     * 

+     *
+     * string pubsub_topic_name = 1;
+     */
+    public Builder setPubsubTopicNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      pubsubTopicName_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.EventNotificationConfig)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.EventNotificationConfig)
+  private static final com.google.cloud.iot.v1.EventNotificationConfig DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.EventNotificationConfig();
+  }
+
+  public static com.google.cloud.iot.v1.EventNotificationConfig getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public EventNotificationConfig parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new EventNotificationConfig(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.EventNotificationConfig getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfigOrBuilder.java
new file mode 100644
index 000000000000..15c07685b5dc
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfigOrBuilder.java
@@ -0,0 +1,53 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface EventNotificationConfigOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.EventNotificationConfig)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * If the subfolder name matches this string exactly, this configuration will
+   * be used. The string must not include the leading '/' character. If empty,
+   * all strings are matched. This field is used only for telemetry events;
+   * subfolders are not supported for state changes.
+   * 

+   *
+   * string subfolder_matches = 2;
+   */
+  java.lang.String getSubfolderMatches();
+  /**
+   * 
+   * If the subfolder name matches this string exactly, this configuration will
+   * be used. The string must not include the leading '/' character. If empty,
+   * all strings are matched. This field is used only for telemetry events;
+   * subfolders are not supported for state changes.
+   * 

+   *
+   * string subfolder_matches = 2;
+   */
+  com.google.protobuf.ByteString
+      getSubfolderMatchesBytes();
+
+  /**
+   * 
+   * A Cloud Pub/Sub topic name. For example,
+   * `projects/myProject/topics/deviceEvents`.
+   * 

+   *
+   * string pubsub_topic_name = 1;
+   */
+  java.lang.String getPubsubTopicName();
+  /**
+   * 
+   * A Cloud Pub/Sub topic name. For example,
+   * `projects/myProject/topics/deviceEvents`.
+   * 

+   *
+   * string pubsub_topic_name = 1;
+   */
+  com.google.protobuf.ByteString
+      getPubsubTopicNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java
new file mode 100644
index 000000000000..836add77f3e4
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java
@@ -0,0 +1,559 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `GetDeviceRegistry`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.GetDeviceRegistryRequest}
+ */
+public  final class GetDeviceRegistryRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.GetDeviceRegistryRequest)
+    GetDeviceRegistryRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use GetDeviceRegistryRequest.newBuilder() to construct.
+  private GetDeviceRegistryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private GetDeviceRegistryRequest() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private GetDeviceRegistryRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.GetDeviceRegistryRequest.class, com.google.cloud.iot.v1.GetDeviceRegistryRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * The name of the device registry. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The name of the device registry. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.GetDeviceRegistryRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.GetDeviceRegistryRequest other = (com.google.cloud.iot.v1.GetDeviceRegistryRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.GetDeviceRegistryRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `GetDeviceRegistry`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.GetDeviceRegistryRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.GetDeviceRegistryRequest)
+      com.google.cloud.iot.v1.GetDeviceRegistryRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.GetDeviceRegistryRequest.class, com.google.cloud.iot.v1.GetDeviceRegistryRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.GetDeviceRegistryRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.GetDeviceRegistryRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.GetDeviceRegistryRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.GetDeviceRegistryRequest build() {
+      com.google.cloud.iot.v1.GetDeviceRegistryRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.GetDeviceRegistryRequest buildPartial() {
+      com.google.cloud.iot.v1.GetDeviceRegistryRequest result = new com.google.cloud.iot.v1.GetDeviceRegistryRequest(this);
+      result.name_ = name_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.GetDeviceRegistryRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.GetDeviceRegistryRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.GetDeviceRegistryRequest other) {
+      if (other == com.google.cloud.iot.v1.GetDeviceRegistryRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.GetDeviceRegistryRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.GetDeviceRegistryRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * The name of the device registry. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device registry. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device registry. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device registry. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device registry. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.GetDeviceRegistryRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.GetDeviceRegistryRequest)
+  private static final com.google.cloud.iot.v1.GetDeviceRegistryRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.GetDeviceRegistryRequest();
+  }
+
+  public static com.google.cloud.iot.v1.GetDeviceRegistryRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public GetDeviceRegistryRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new GetDeviceRegistryRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.GetDeviceRegistryRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequestOrBuilder.java
new file mode 100644
index 000000000000..45b6bac07c8a
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequestOrBuilder.java
@@ -0,0 +1,29 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface GetDeviceRegistryRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.GetDeviceRegistryRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The name of the device registry. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * The name of the device registry. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java
new file mode 100644
index 000000000000..0986487bd19e
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java
@@ -0,0 +1,807 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `GetDevice`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.GetDeviceRequest}
+ */
+public  final class GetDeviceRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.GetDeviceRequest)
+    GetDeviceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use GetDeviceRequest.newBuilder() to construct.
+  private GetDeviceRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private GetDeviceRequest() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private GetDeviceRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 18: {
+            com.google.protobuf.FieldMask.Builder subBuilder = null;
+            if (fieldMask_ != null) {
+              subBuilder = fieldMask_.toBuilder();
+            }
+            fieldMask_ = input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(fieldMask_);
+              fieldMask_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.GetDeviceRequest.class, com.google.cloud.iot.v1.GetDeviceRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int FIELD_MASK_FIELD_NUMBER = 2;
+  private com.google.protobuf.FieldMask fieldMask_;
+  /**
+   * 
+   * The fields of the `Device` resource to be returned in the response. If the
+   * field mask is unset or empty, all fields are returned.
+   * 

+   *
+   * .google.protobuf.FieldMask field_mask = 2;
+   */
+  public boolean hasFieldMask() {
+    return fieldMask_ != null;
+  }
+  /**
+   * 
+   * The fields of the `Device` resource to be returned in the response. If the
+   * field mask is unset or empty, all fields are returned.
+   * 

+   *
+   * .google.protobuf.FieldMask field_mask = 2;
+   */
+  public com.google.protobuf.FieldMask getFieldMask() {
+    return fieldMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : fieldMask_;
+  }
+  /**
+   * 
+   * The fields of the `Device` resource to be returned in the response. If the
+   * field mask is unset or empty, all fields are returned.
+   * 

+   *
+   * .google.protobuf.FieldMask field_mask = 2;
+   */
+  public com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder() {
+    return getFieldMask();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    if (fieldMask_ != null) {
+      output.writeMessage(2, getFieldMask());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    if (fieldMask_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getFieldMask());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.GetDeviceRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.GetDeviceRequest other = (com.google.cloud.iot.v1.GetDeviceRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && (hasFieldMask() == other.hasFieldMask());
+    if (hasFieldMask()) {
+      result = result && getFieldMask()
+          .equals(other.getFieldMask());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    if (hasFieldMask()) {
+      hash = (37 * hash) + FIELD_MASK_FIELD_NUMBER;
+      hash = (53 * hash) + getFieldMask().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.GetDeviceRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.GetDeviceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.GetDeviceRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `GetDevice`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.GetDeviceRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.GetDeviceRequest)
+      com.google.cloud.iot.v1.GetDeviceRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.GetDeviceRequest.class, com.google.cloud.iot.v1.GetDeviceRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.GetDeviceRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      if (fieldMaskBuilder_ == null) {
+        fieldMask_ = null;
+      } else {
+        fieldMask_ = null;
+        fieldMaskBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.GetDeviceRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.GetDeviceRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.GetDeviceRequest build() {
+      com.google.cloud.iot.v1.GetDeviceRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.GetDeviceRequest buildPartial() {
+      com.google.cloud.iot.v1.GetDeviceRequest result = new com.google.cloud.iot.v1.GetDeviceRequest(this);
+      result.name_ = name_;
+      if (fieldMaskBuilder_ == null) {
+        result.fieldMask_ = fieldMask_;
+      } else {
+        result.fieldMask_ = fieldMaskBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.GetDeviceRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.GetDeviceRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.GetDeviceRequest other) {
+      if (other == com.google.cloud.iot.v1.GetDeviceRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (other.hasFieldMask()) {
+        mergeFieldMask(other.getFieldMask());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.GetDeviceRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.GetDeviceRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.FieldMask fieldMask_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder> fieldMaskBuilder_;
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. If the
+     * field mask is unset or empty, all fields are returned.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 2;
+     */
+    public boolean hasFieldMask() {
+      return fieldMaskBuilder_ != null || fieldMask_ != null;
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. If the
+     * field mask is unset or empty, all fields are returned.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 2;
+     */
+    public com.google.protobuf.FieldMask getFieldMask() {
+      if (fieldMaskBuilder_ == null) {
+        return fieldMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : fieldMask_;
+      } else {
+        return fieldMaskBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. If the
+     * field mask is unset or empty, all fields are returned.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 2;
+     */
+    public Builder setFieldMask(com.google.protobuf.FieldMask value) {
+      if (fieldMaskBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        fieldMask_ = value;
+        onChanged();
+      } else {
+        fieldMaskBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. If the
+     * field mask is unset or empty, all fields are returned.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 2;
+     */
+    public Builder setFieldMask(
+        com.google.protobuf.FieldMask.Builder builderForValue) {
+      if (fieldMaskBuilder_ == null) {
+        fieldMask_ = builderForValue.build();
+        onChanged();
+      } else {
+        fieldMaskBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. If the
+     * field mask is unset or empty, all fields are returned.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 2;
+     */
+    public Builder mergeFieldMask(com.google.protobuf.FieldMask value) {
+      if (fieldMaskBuilder_ == null) {
+        if (fieldMask_ != null) {
+          fieldMask_ =
+            com.google.protobuf.FieldMask.newBuilder(fieldMask_).mergeFrom(value).buildPartial();
+        } else {
+          fieldMask_ = value;
+        }
+        onChanged();
+      } else {
+        fieldMaskBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. If the
+     * field mask is unset or empty, all fields are returned.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 2;
+     */
+    public Builder clearFieldMask() {
+      if (fieldMaskBuilder_ == null) {
+        fieldMask_ = null;
+        onChanged();
+      } else {
+        fieldMask_ = null;
+        fieldMaskBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. If the
+     * field mask is unset or empty, all fields are returned.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 2;
+     */
+    public com.google.protobuf.FieldMask.Builder getFieldMaskBuilder() {
+      
+      onChanged();
+      return getFieldMaskFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. If the
+     * field mask is unset or empty, all fields are returned.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 2;
+     */
+    public com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder() {
+      if (fieldMaskBuilder_ != null) {
+        return fieldMaskBuilder_.getMessageOrBuilder();
+      } else {
+        return fieldMask_ == null ?
+            com.google.protobuf.FieldMask.getDefaultInstance() : fieldMask_;
+      }
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. If the
+     * field mask is unset or empty, all fields are returned.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder> 
+        getFieldMaskFieldBuilder() {
+      if (fieldMaskBuilder_ == null) {
+        fieldMaskBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder>(
+                getFieldMask(),
+                getParentForChildren(),
+                isClean());
+        fieldMask_ = null;
+      }
+      return fieldMaskBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.GetDeviceRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.GetDeviceRequest)
+  private static final com.google.cloud.iot.v1.GetDeviceRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.GetDeviceRequest();
+  }
+
+  public static com.google.cloud.iot.v1.GetDeviceRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public GetDeviceRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new GetDeviceRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.GetDeviceRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequestOrBuilder.java
new file mode 100644
index 000000000000..5b27bcb00bbf
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequestOrBuilder.java
@@ -0,0 +1,59 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface GetDeviceRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.GetDeviceRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * 
+   * The fields of the `Device` resource to be returned in the response. If the
+   * field mask is unset or empty, all fields are returned.
+   * 

+   *
+   * .google.protobuf.FieldMask field_mask = 2;
+   */
+  boolean hasFieldMask();
+  /**
+   * 
+   * The fields of the `Device` resource to be returned in the response. If the
+   * field mask is unset or empty, all fields are returned.
+   * 

+   *
+   * .google.protobuf.FieldMask field_mask = 2;
+   */
+  com.google.protobuf.FieldMask getFieldMask();
+  /**
+   * 
+   * The fields of the `Device` resource to be returned in the response. If the
+   * field mask is unset or empty, all fields are returned.
+   * 

+   *
+   * .google.protobuf.FieldMask field_mask = 2;
+   */
+  com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java
new file mode 100644
index 000000000000..f7998b96c3fd
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java
@@ -0,0 +1,515 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * The configuration of the HTTP bridge for a device registry.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.HttpConfig}
+ */
+public  final class HttpConfig extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.HttpConfig)
+    HttpConfigOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use HttpConfig.newBuilder() to construct.
+  private HttpConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private HttpConfig() {
+    httpEnabledState_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private HttpConfig(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            httpEnabledState_ = rawValue;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_HttpConfig_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_HttpConfig_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.HttpConfig.class, com.google.cloud.iot.v1.HttpConfig.Builder.class);
+  }
+
+  public static final int HTTP_ENABLED_STATE_FIELD_NUMBER = 1;
+  private int httpEnabledState_;
+  /**
+   * 
+   * If enabled, allows devices to use DeviceService via the HTTP protocol.
+   * Otherwise, any requests to DeviceService will fail for this registry.
+   * 

+   *
+   * .google.cloud.iot.v1.HttpState http_enabled_state = 1;
+   */
+  public int getHttpEnabledStateValue() {
+    return httpEnabledState_;
+  }
+  /**
+   * 
+   * If enabled, allows devices to use DeviceService via the HTTP protocol.
+   * Otherwise, any requests to DeviceService will fail for this registry.
+   * 

+   *
+   * .google.cloud.iot.v1.HttpState http_enabled_state = 1;
+   */
+  public com.google.cloud.iot.v1.HttpState getHttpEnabledState() {
+    com.google.cloud.iot.v1.HttpState result = com.google.cloud.iot.v1.HttpState.valueOf(httpEnabledState_);
+    return result == null ? com.google.cloud.iot.v1.HttpState.UNRECOGNIZED : result;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (httpEnabledState_ != com.google.cloud.iot.v1.HttpState.HTTP_STATE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(1, httpEnabledState_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (httpEnabledState_ != com.google.cloud.iot.v1.HttpState.HTTP_STATE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(1, httpEnabledState_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.HttpConfig)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.HttpConfig other = (com.google.cloud.iot.v1.HttpConfig) obj;
+
+    boolean result = true;
+    result = result && httpEnabledState_ == other.httpEnabledState_;
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + HTTP_ENABLED_STATE_FIELD_NUMBER;
+    hash = (53 * hash) + httpEnabledState_;
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.HttpConfig parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.HttpConfig parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.HttpConfig parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.HttpConfig parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.HttpConfig parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.HttpConfig parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.HttpConfig parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.HttpConfig parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.HttpConfig parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.HttpConfig parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.HttpConfig parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.HttpConfig parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.HttpConfig prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * The configuration of the HTTP bridge for a device registry.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.HttpConfig}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.HttpConfig)
+      com.google.cloud.iot.v1.HttpConfigOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_HttpConfig_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_HttpConfig_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.HttpConfig.class, com.google.cloud.iot.v1.HttpConfig.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.HttpConfig.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      httpEnabledState_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_HttpConfig_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.HttpConfig getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.HttpConfig.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.HttpConfig build() {
+      com.google.cloud.iot.v1.HttpConfig result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.HttpConfig buildPartial() {
+      com.google.cloud.iot.v1.HttpConfig result = new com.google.cloud.iot.v1.HttpConfig(this);
+      result.httpEnabledState_ = httpEnabledState_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.HttpConfig) {
+        return mergeFrom((com.google.cloud.iot.v1.HttpConfig)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.HttpConfig other) {
+      if (other == com.google.cloud.iot.v1.HttpConfig.getDefaultInstance()) return this;
+      if (other.httpEnabledState_ != 0) {
+        setHttpEnabledStateValue(other.getHttpEnabledStateValue());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.HttpConfig parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.HttpConfig) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int httpEnabledState_ = 0;
+    /**
+     * 
+     * If enabled, allows devices to use DeviceService via the HTTP protocol.
+     * Otherwise, any requests to DeviceService will fail for this registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpState http_enabled_state = 1;
+     */
+    public int getHttpEnabledStateValue() {
+      return httpEnabledState_;
+    }
+    /**
+     * 
+     * If enabled, allows devices to use DeviceService via the HTTP protocol.
+     * Otherwise, any requests to DeviceService will fail for this registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpState http_enabled_state = 1;
+     */
+    public Builder setHttpEnabledStateValue(int value) {
+      httpEnabledState_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * If enabled, allows devices to use DeviceService via the HTTP protocol.
+     * Otherwise, any requests to DeviceService will fail for this registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpState http_enabled_state = 1;
+     */
+    public com.google.cloud.iot.v1.HttpState getHttpEnabledState() {
+      com.google.cloud.iot.v1.HttpState result = com.google.cloud.iot.v1.HttpState.valueOf(httpEnabledState_);
+      return result == null ? com.google.cloud.iot.v1.HttpState.UNRECOGNIZED : result;
+    }
+    /**
+     * 
+     * If enabled, allows devices to use DeviceService via the HTTP protocol.
+     * Otherwise, any requests to DeviceService will fail for this registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpState http_enabled_state = 1;
+     */
+    public Builder setHttpEnabledState(com.google.cloud.iot.v1.HttpState value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      httpEnabledState_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * If enabled, allows devices to use DeviceService via the HTTP protocol.
+     * Otherwise, any requests to DeviceService will fail for this registry.
+     * 

+     *
+     * .google.cloud.iot.v1.HttpState http_enabled_state = 1;
+     */
+    public Builder clearHttpEnabledState() {
+      
+      httpEnabledState_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.HttpConfig)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.HttpConfig)
+  private static final com.google.cloud.iot.v1.HttpConfig DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.HttpConfig();
+  }
+
+  public static com.google.cloud.iot.v1.HttpConfig getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public HttpConfig parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new HttpConfig(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.HttpConfig getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfigOrBuilder.java
new file mode 100644
index 000000000000..e16aa3d7ff36
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfigOrBuilder.java
@@ -0,0 +1,28 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface HttpConfigOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.HttpConfig)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * If enabled, allows devices to use DeviceService via the HTTP protocol.
+   * Otherwise, any requests to DeviceService will fail for this registry.
+   * 

+   *
+   * .google.cloud.iot.v1.HttpState http_enabled_state = 1;
+   */
+  int getHttpEnabledStateValue();
+  /**
+   * 
+   * If enabled, allows devices to use DeviceService via the HTTP protocol.
+   * Otherwise, any requests to DeviceService will fail for this registry.
+   * 

+   *
+   * .google.cloud.iot.v1.HttpState http_enabled_state = 1;
+   */
+  com.google.cloud.iot.v1.HttpState getHttpEnabledState();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpState.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpState.java
new file mode 100644
index 000000000000..8a14b10dad29
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpState.java
@@ -0,0 +1,143 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Indicates whether DeviceService (HTTP) is enabled or disabled for the
+ * registry. See the field description for details.
+ * 

+ *
+ * Protobuf enum {@code google.cloud.iot.v1.HttpState}
+ */
+public enum HttpState
+    implements com.google.protobuf.ProtocolMessageEnum {
+  /**
+   * 
+   * No HTTP state specified. If not specified, DeviceService will be
+   * enabled by default.
+   * 

+   *
+   * HTTP_STATE_UNSPECIFIED = 0;
+   */
+  HTTP_STATE_UNSPECIFIED(0),
+  /**
+   * 
+   * Enables DeviceService (HTTP) service for the registry.
+   * 

+   *
+   * HTTP_ENABLED = 1;
+   */
+  HTTP_ENABLED(1),
+  /**
+   * 
+   * Disables DeviceService (HTTP) service for the registry.
+   * 

+   *
+   * HTTP_DISABLED = 2;
+   */
+  HTTP_DISABLED(2),
+  UNRECOGNIZED(-1),
+  ;
+
+  /**
+   * 
+   * No HTTP state specified. If not specified, DeviceService will be
+   * enabled by default.
+   * 

+   *
+   * HTTP_STATE_UNSPECIFIED = 0;
+   */
+  public static final int HTTP_STATE_UNSPECIFIED_VALUE = 0;
+  /**
+   * 
+   * Enables DeviceService (HTTP) service for the registry.
+   * 

+   *
+   * HTTP_ENABLED = 1;
+   */
+  public static final int HTTP_ENABLED_VALUE = 1;
+  /**
+   * 
+   * Disables DeviceService (HTTP) service for the registry.
+   * 

+   *
+   * HTTP_DISABLED = 2;
+   */
+  public static final int HTTP_DISABLED_VALUE = 2;
+
+
+  public final int getNumber() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalArgumentException(
+          "Can't get the number of an unknown enum value.");
+    }
+    return value;
+  }
+
+  /**
+   * @deprecated Use {@link #forNumber(int)} instead.
+   */
+  @java.lang.Deprecated
+  public static HttpState valueOf(int value) {
+    return forNumber(value);
+  }
+
+  public static HttpState forNumber(int value) {
+    switch (value) {
+      case 0: return HTTP_STATE_UNSPECIFIED;
+      case 1: return HTTP_ENABLED;
+      case 2: return HTTP_DISABLED;
+      default: return null;
+    }
+  }
+
+  public static com.google.protobuf.Internal.EnumLiteMap
+      internalGetValueMap() {
+    return internalValueMap;
+  }
+  private static final com.google.protobuf.Internal.EnumLiteMap<
+      HttpState> internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public HttpState findValueByNumber(int number) {
+            return HttpState.forNumber(number);
+          }
+        };
+
+  public final com.google.protobuf.Descriptors.EnumValueDescriptor
+      getValueDescriptor() {
+    return getDescriptor().getValues().get(ordinal());
+  }
+  public final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptorForType() {
+    return getDescriptor();
+  }
+  public static final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.getDescriptor().getEnumTypes().get(1);
+  }
+
+  private static final HttpState[] VALUES = values();
+
+  public static HttpState valueOf(
+      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    if (desc.getType() != getDescriptor()) {
+      throw new java.lang.IllegalArgumentException(
+        "EnumValueDescriptor is not for this type.");
+    }
+    if (desc.getIndex() == -1) {
+      return UNRECOGNIZED;
+    }
+    return VALUES[desc.getIndex()];
+  }
+
+  private final int value;
+
+  private HttpState(int value) {
+    this.value = value;
+  }
+
+  // @@protoc_insertion_point(enum_scope:google.cloud.iot.v1.HttpState)
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java
new file mode 100644
index 000000000000..d0c7f5cd1c02
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java
@@ -0,0 +1,648 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `ListDeviceConfigVersions`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.ListDeviceConfigVersionsRequest}
+ */
+public  final class ListDeviceConfigVersionsRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.ListDeviceConfigVersionsRequest)
+    ListDeviceConfigVersionsRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListDeviceConfigVersionsRequest.newBuilder() to construct.
+  private ListDeviceConfigVersionsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListDeviceConfigVersionsRequest() {
+    name_ = "";
+    numVersions_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListDeviceConfigVersionsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 16: {
+
+            numVersions_ = input.readInt32();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest.class, com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int NUM_VERSIONS_FIELD_NUMBER = 2;
+  private int numVersions_;
+  /**
+   * 
+   * The number of versions to list. Versions are listed in decreasing order of
+   * the version number. The maximum number of versions retained is 10. If this
+   * value is zero, it will return all the versions available.
+   * 

+   *
+   * int32 num_versions = 2;
+   */
+  public int getNumVersions() {
+    return numVersions_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    if (numVersions_ != 0) {
+      output.writeInt32(2, numVersions_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    if (numVersions_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(2, numVersions_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest other = (com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && (getNumVersions()
+        == other.getNumVersions());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (37 * hash) + NUM_VERSIONS_FIELD_NUMBER;
+    hash = (53 * hash) + getNumVersions();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `ListDeviceConfigVersions`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.ListDeviceConfigVersionsRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.ListDeviceConfigVersionsRequest)
+      com.google.cloud.iot.v1.ListDeviceConfigVersionsRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest.class, com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      numVersions_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest build() {
+      com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest buildPartial() {
+      com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest result = new com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest(this);
+      result.name_ = name_;
+      result.numVersions_ = numVersions_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest other) {
+      if (other == com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (other.getNumVersions() != 0) {
+        setNumVersions(other.getNumVersions());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int numVersions_ ;
+    /**
+     * 
+     * The number of versions to list. Versions are listed in decreasing order of
+     * the version number. The maximum number of versions retained is 10. If this
+     * value is zero, it will return all the versions available.
+     * 

+     *
+     * int32 num_versions = 2;
+     */
+    public int getNumVersions() {
+      return numVersions_;
+    }
+    /**
+     * 
+     * The number of versions to list. Versions are listed in decreasing order of
+     * the version number. The maximum number of versions retained is 10. If this
+     * value is zero, it will return all the versions available.
+     * 

+     *
+     * int32 num_versions = 2;
+     */
+    public Builder setNumVersions(int value) {
+      
+      numVersions_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The number of versions to list. Versions are listed in decreasing order of
+     * the version number. The maximum number of versions retained is 10. If this
+     * value is zero, it will return all the versions available.
+     * 

+     *
+     * int32 num_versions = 2;
+     */
+    public Builder clearNumVersions() {
+      
+      numVersions_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.ListDeviceConfigVersionsRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.ListDeviceConfigVersionsRequest)
+  private static final com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest();
+  }
+
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListDeviceConfigVersionsRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListDeviceConfigVersionsRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequestOrBuilder.java
new file mode 100644
index 000000000000..bfff2d937bed
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequestOrBuilder.java
@@ -0,0 +1,42 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface ListDeviceConfigVersionsRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.ListDeviceConfigVersionsRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * 
+   * The number of versions to list. Versions are listed in decreasing order of
+   * the version number. The maximum number of versions retained is 10. If this
+   * value is zero, it will return all the versions available.
+   * 

+   *
+   * int32 num_versions = 2;
+   */
+  int getNumVersions();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java
new file mode 100644
index 000000000000..84a6696cd263
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java
@@ -0,0 +1,857 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Response for `ListDeviceConfigVersions`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.ListDeviceConfigVersionsResponse}
+ */
+public  final class ListDeviceConfigVersionsResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.ListDeviceConfigVersionsResponse)
+    ListDeviceConfigVersionsResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListDeviceConfigVersionsResponse.newBuilder() to construct.
+  private ListDeviceConfigVersionsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListDeviceConfigVersionsResponse() {
+    deviceConfigs_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListDeviceConfigVersionsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              deviceConfigs_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            deviceConfigs_.add(
+                input.readMessage(com.google.cloud.iot.v1.DeviceConfig.parser(), extensionRegistry));
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        deviceConfigs_ = java.util.Collections.unmodifiableList(deviceConfigs_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse.class, com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse.Builder.class);
+  }
+
+  public static final int DEVICE_CONFIGS_FIELD_NUMBER = 1;
+  private java.util.List deviceConfigs_;
+  /**
+   * 
+   * The device configuration for the last few versions. Versions are listed
+   * in decreasing order, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+   */
+  public java.util.List getDeviceConfigsList() {
+    return deviceConfigs_;
+  }
+  /**
+   * 
+   * The device configuration for the last few versions. Versions are listed
+   * in decreasing order, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+   */
+  public java.util.List 
+      getDeviceConfigsOrBuilderList() {
+    return deviceConfigs_;
+  }
+  /**
+   * 
+   * The device configuration for the last few versions. Versions are listed
+   * in decreasing order, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+   */
+  public int getDeviceConfigsCount() {
+    return deviceConfigs_.size();
+  }
+  /**
+   * 
+   * The device configuration for the last few versions. Versions are listed
+   * in decreasing order, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+   */
+  public com.google.cloud.iot.v1.DeviceConfig getDeviceConfigs(int index) {
+    return deviceConfigs_.get(index);
+  }
+  /**
+   * 
+   * The device configuration for the last few versions. Versions are listed
+   * in decreasing order, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+   */
+  public com.google.cloud.iot.v1.DeviceConfigOrBuilder getDeviceConfigsOrBuilder(
+      int index) {
+    return deviceConfigs_.get(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < deviceConfigs_.size(); i++) {
+      output.writeMessage(1, deviceConfigs_.get(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < deviceConfigs_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, deviceConfigs_.get(i));
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse other = (com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse) obj;
+
+    boolean result = true;
+    result = result && getDeviceConfigsList()
+        .equals(other.getDeviceConfigsList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getDeviceConfigsCount() > 0) {
+      hash = (37 * hash) + DEVICE_CONFIGS_FIELD_NUMBER;
+      hash = (53 * hash) + getDeviceConfigsList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Response for `ListDeviceConfigVersions`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.ListDeviceConfigVersionsResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.ListDeviceConfigVersionsResponse)
+      com.google.cloud.iot.v1.ListDeviceConfigVersionsResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse.class, com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getDeviceConfigsFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (deviceConfigsBuilder_ == null) {
+        deviceConfigs_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        deviceConfigsBuilder_.clear();
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse build() {
+      com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse buildPartial() {
+      com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse result = new com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse(this);
+      int from_bitField0_ = bitField0_;
+      if (deviceConfigsBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          deviceConfigs_ = java.util.Collections.unmodifiableList(deviceConfigs_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.deviceConfigs_ = deviceConfigs_;
+      } else {
+        result.deviceConfigs_ = deviceConfigsBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse) {
+        return mergeFrom((com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse other) {
+      if (other == com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse.getDefaultInstance()) return this;
+      if (deviceConfigsBuilder_ == null) {
+        if (!other.deviceConfigs_.isEmpty()) {
+          if (deviceConfigs_.isEmpty()) {
+            deviceConfigs_ = other.deviceConfigs_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureDeviceConfigsIsMutable();
+            deviceConfigs_.addAll(other.deviceConfigs_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.deviceConfigs_.isEmpty()) {
+          if (deviceConfigsBuilder_.isEmpty()) {
+            deviceConfigsBuilder_.dispose();
+            deviceConfigsBuilder_ = null;
+            deviceConfigs_ = other.deviceConfigs_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            deviceConfigsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getDeviceConfigsFieldBuilder() : null;
+          } else {
+            deviceConfigsBuilder_.addAllMessages(other.deviceConfigs_);
+          }
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List deviceConfigs_ =
+      java.util.Collections.emptyList();
+    private void ensureDeviceConfigsIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        deviceConfigs_ = new java.util.ArrayList(deviceConfigs_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceConfig, com.google.cloud.iot.v1.DeviceConfig.Builder, com.google.cloud.iot.v1.DeviceConfigOrBuilder> deviceConfigsBuilder_;
+
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public java.util.List getDeviceConfigsList() {
+      if (deviceConfigsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(deviceConfigs_);
+      } else {
+        return deviceConfigsBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public int getDeviceConfigsCount() {
+      if (deviceConfigsBuilder_ == null) {
+        return deviceConfigs_.size();
+      } else {
+        return deviceConfigsBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceConfig getDeviceConfigs(int index) {
+      if (deviceConfigsBuilder_ == null) {
+        return deviceConfigs_.get(index);
+      } else {
+        return deviceConfigsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public Builder setDeviceConfigs(
+        int index, com.google.cloud.iot.v1.DeviceConfig value) {
+      if (deviceConfigsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureDeviceConfigsIsMutable();
+        deviceConfigs_.set(index, value);
+        onChanged();
+      } else {
+        deviceConfigsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public Builder setDeviceConfigs(
+        int index, com.google.cloud.iot.v1.DeviceConfig.Builder builderForValue) {
+      if (deviceConfigsBuilder_ == null) {
+        ensureDeviceConfigsIsMutable();
+        deviceConfigs_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        deviceConfigsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public Builder addDeviceConfigs(com.google.cloud.iot.v1.DeviceConfig value) {
+      if (deviceConfigsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureDeviceConfigsIsMutable();
+        deviceConfigs_.add(value);
+        onChanged();
+      } else {
+        deviceConfigsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public Builder addDeviceConfigs(
+        int index, com.google.cloud.iot.v1.DeviceConfig value) {
+      if (deviceConfigsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureDeviceConfigsIsMutable();
+        deviceConfigs_.add(index, value);
+        onChanged();
+      } else {
+        deviceConfigsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public Builder addDeviceConfigs(
+        com.google.cloud.iot.v1.DeviceConfig.Builder builderForValue) {
+      if (deviceConfigsBuilder_ == null) {
+        ensureDeviceConfigsIsMutable();
+        deviceConfigs_.add(builderForValue.build());
+        onChanged();
+      } else {
+        deviceConfigsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public Builder addDeviceConfigs(
+        int index, com.google.cloud.iot.v1.DeviceConfig.Builder builderForValue) {
+      if (deviceConfigsBuilder_ == null) {
+        ensureDeviceConfigsIsMutable();
+        deviceConfigs_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        deviceConfigsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public Builder addAllDeviceConfigs(
+        java.lang.Iterable values) {
+      if (deviceConfigsBuilder_ == null) {
+        ensureDeviceConfigsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, deviceConfigs_);
+        onChanged();
+      } else {
+        deviceConfigsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public Builder clearDeviceConfigs() {
+      if (deviceConfigsBuilder_ == null) {
+        deviceConfigs_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        deviceConfigsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public Builder removeDeviceConfigs(int index) {
+      if (deviceConfigsBuilder_ == null) {
+        ensureDeviceConfigsIsMutable();
+        deviceConfigs_.remove(index);
+        onChanged();
+      } else {
+        deviceConfigsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceConfig.Builder getDeviceConfigsBuilder(
+        int index) {
+      return getDeviceConfigsFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceConfigOrBuilder getDeviceConfigsOrBuilder(
+        int index) {
+      if (deviceConfigsBuilder_ == null) {
+        return deviceConfigs_.get(index);  } else {
+        return deviceConfigsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public java.util.List 
+         getDeviceConfigsOrBuilderList() {
+      if (deviceConfigsBuilder_ != null) {
+        return deviceConfigsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(deviceConfigs_);
+      }
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceConfig.Builder addDeviceConfigsBuilder() {
+      return getDeviceConfigsFieldBuilder().addBuilder(
+          com.google.cloud.iot.v1.DeviceConfig.getDefaultInstance());
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceConfig.Builder addDeviceConfigsBuilder(
+        int index) {
+      return getDeviceConfigsFieldBuilder().addBuilder(
+          index, com.google.cloud.iot.v1.DeviceConfig.getDefaultInstance());
+    }
+    /**
+     * 
+     * The device configuration for the last few versions. Versions are listed
+     * in decreasing order, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+     */
+    public java.util.List 
+         getDeviceConfigsBuilderList() {
+      return getDeviceConfigsFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceConfig, com.google.cloud.iot.v1.DeviceConfig.Builder, com.google.cloud.iot.v1.DeviceConfigOrBuilder> 
+        getDeviceConfigsFieldBuilder() {
+      if (deviceConfigsBuilder_ == null) {
+        deviceConfigsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.iot.v1.DeviceConfig, com.google.cloud.iot.v1.DeviceConfig.Builder, com.google.cloud.iot.v1.DeviceConfigOrBuilder>(
+                deviceConfigs_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        deviceConfigs_ = null;
+      }
+      return deviceConfigsBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.ListDeviceConfigVersionsResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.ListDeviceConfigVersionsResponse)
+  private static final com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse();
+  }
+
+  public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListDeviceConfigVersionsResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListDeviceConfigVersionsResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponseOrBuilder.java
new file mode 100644
index 000000000000..78eb05c0210e
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponseOrBuilder.java
@@ -0,0 +1,58 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface ListDeviceConfigVersionsResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.ListDeviceConfigVersionsResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The device configuration for the last few versions. Versions are listed
+   * in decreasing order, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+   */
+  java.util.List 
+      getDeviceConfigsList();
+  /**
+   * 
+   * The device configuration for the last few versions. Versions are listed
+   * in decreasing order, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+   */
+  com.google.cloud.iot.v1.DeviceConfig getDeviceConfigs(int index);
+  /**
+   * 
+   * The device configuration for the last few versions. Versions are listed
+   * in decreasing order, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+   */
+  int getDeviceConfigsCount();
+  /**
+   * 
+   * The device configuration for the last few versions. Versions are listed
+   * in decreasing order, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+   */
+  java.util.List 
+      getDeviceConfigsOrBuilderList();
+  /**
+   * 
+   * The device configuration for the last few versions. Versions are listed
+   * in decreasing order, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceConfig device_configs = 1;
+   */
+  com.google.cloud.iot.v1.DeviceConfigOrBuilder getDeviceConfigsOrBuilder(
+      int index);
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java
new file mode 100644
index 000000000000..d8ba161856a5
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java
@@ -0,0 +1,814 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `ListDeviceRegistries`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.ListDeviceRegistriesRequest}
+ */
+public  final class ListDeviceRegistriesRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.ListDeviceRegistriesRequest)
+    ListDeviceRegistriesRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListDeviceRegistriesRequest.newBuilder() to construct.
+  private ListDeviceRegistriesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListDeviceRegistriesRequest() {
+    parent_ = "";
+    pageSize_ = 0;
+    pageToken_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListDeviceRegistriesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
+          case 16: {
+
+            pageSize_ = input.readInt32();
+            break;
+          }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            pageToken_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.ListDeviceRegistriesRequest.class, com.google.cloud.iot.v1.ListDeviceRegistriesRequest.Builder.class);
+  }
+
+  public static final int PARENT_FIELD_NUMBER = 1;
+  private volatile java.lang.Object parent_;
+  /**
+   * 
+   * The project and cloud region path. For example,
+   * `projects/example-project/locations/us-central1`.
+   * 

+   *
+   * string parent = 1;
+   */
+  public java.lang.String getParent() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      parent_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The project and cloud region path. For example,
+   * `projects/example-project/locations/us-central1`.
+   * 

+   *
+   * string parent = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParentBytes() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      parent_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PAGE_SIZE_FIELD_NUMBER = 2;
+  private int pageSize_;
+  /**
+   * 
+   * The maximum number of registries to return in the response. If this value
+   * is zero, the service will select a default size. A call may return fewer
+   * objects than requested, but if there is a non-empty `page_token`, it
+   * indicates that more entries are available.
+   * 

+   *
+   * int32 page_size = 2;
+   */
+  public int getPageSize() {
+    return pageSize_;
+  }
+
+  public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
+  private volatile java.lang.Object pageToken_;
+  /**
+   * 
+   * The value returned by the last `ListDeviceRegistriesResponse`; indicates
+   * that this is a continuation of a prior `ListDeviceRegistries` call, and
+   * that the system should return the next page of data.
+   * 

+   *
+   * string page_token = 3;
+   */
+  public java.lang.String getPageToken() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      pageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The value returned by the last `ListDeviceRegistriesResponse`; indicates
+   * that this is a continuation of a prior `ListDeviceRegistries` call, and
+   * that the system should return the next page of data.
+   * 

+   *
+   * string page_token = 3;
+   */
+  public com.google.protobuf.ByteString
+      getPageTokenBytes() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      pageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getParentBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
+    }
+    if (pageSize_ != 0) {
+      output.writeInt32(2, pageSize_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getParentBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
+    }
+    if (pageSize_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(2, pageSize_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.ListDeviceRegistriesRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.ListDeviceRegistriesRequest other = (com.google.cloud.iot.v1.ListDeviceRegistriesRequest) obj;
+
+    boolean result = true;
+    result = result && getParent()
+        .equals(other.getParent());
+    result = result && (getPageSize()
+        == other.getPageSize());
+    result = result && getPageToken()
+        .equals(other.getPageToken());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PARENT_FIELD_NUMBER;
+    hash = (53 * hash) + getParent().hashCode();
+    hash = (37 * hash) + PAGE_SIZE_FIELD_NUMBER;
+    hash = (53 * hash) + getPageSize();
+    hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getPageToken().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.ListDeviceRegistriesRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `ListDeviceRegistries`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.ListDeviceRegistriesRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.ListDeviceRegistriesRequest)
+      com.google.cloud.iot.v1.ListDeviceRegistriesRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.ListDeviceRegistriesRequest.class, com.google.cloud.iot.v1.ListDeviceRegistriesRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.ListDeviceRegistriesRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parent_ = "";
+
+      pageSize_ = 0;
+
+      pageToken_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceRegistriesRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.ListDeviceRegistriesRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceRegistriesRequest build() {
+      com.google.cloud.iot.v1.ListDeviceRegistriesRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceRegistriesRequest buildPartial() {
+      com.google.cloud.iot.v1.ListDeviceRegistriesRequest result = new com.google.cloud.iot.v1.ListDeviceRegistriesRequest(this);
+      result.parent_ = parent_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.ListDeviceRegistriesRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.ListDeviceRegistriesRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.ListDeviceRegistriesRequest other) {
+      if (other == com.google.cloud.iot.v1.ListDeviceRegistriesRequest.getDefaultInstance()) return this;
+      if (!other.getParent().isEmpty()) {
+        parent_ = other.parent_;
+        onChanged();
+      }
+      if (other.getPageSize() != 0) {
+        setPageSize(other.getPageSize());
+      }
+      if (!other.getPageToken().isEmpty()) {
+        pageToken_ = other.pageToken_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.ListDeviceRegistriesRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.ListDeviceRegistriesRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object parent_ = "";
+    /**
+     * 
+     * The project and cloud region path. For example,
+     * `projects/example-project/locations/us-central1`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public java.lang.String getParent() {
+      java.lang.Object ref = parent_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        parent_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The project and cloud region path. For example,
+     * `projects/example-project/locations/us-central1`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParentBytes() {
+      java.lang.Object ref = parent_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        parent_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The project and cloud region path. For example,
+     * `projects/example-project/locations/us-central1`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParent(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The project and cloud region path. For example,
+     * `projects/example-project/locations/us-central1`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder clearParent() {
+      
+      parent_ = getDefaultInstance().getParent();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The project and cloud region path. For example,
+     * `projects/example-project/locations/us-central1`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParentBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int pageSize_ ;
+    /**
+     * 
+     * The maximum number of registries to return in the response. If this value
+     * is zero, the service will select a default size. A call may return fewer
+     * objects than requested, but if there is a non-empty `page_token`, it
+     * indicates that more entries are available.
+     * 

+     *
+     * int32 page_size = 2;
+     */
+    public int getPageSize() {
+      return pageSize_;
+    }
+    /**
+     * 
+     * The maximum number of registries to return in the response. If this value
+     * is zero, the service will select a default size. A call may return fewer
+     * objects than requested, but if there is a non-empty `page_token`, it
+     * indicates that more entries are available.
+     * 

+     *
+     * int32 page_size = 2;
+     */
+    public Builder setPageSize(int value) {
+      
+      pageSize_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The maximum number of registries to return in the response. If this value
+     * is zero, the service will select a default size. A call may return fewer
+     * objects than requested, but if there is a non-empty `page_token`, it
+     * indicates that more entries are available.
+     * 

+     *
+     * int32 page_size = 2;
+     */
+    public Builder clearPageSize() {
+      
+      pageSize_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object pageToken_ = "";
+    /**
+     * 
+     * The value returned by the last `ListDeviceRegistriesResponse`; indicates
+     * that this is a continuation of a prior `ListDeviceRegistries` call, and
+     * that the system should return the next page of data.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public java.lang.String getPageToken() {
+      java.lang.Object ref = pageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        pageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The value returned by the last `ListDeviceRegistriesResponse`; indicates
+     * that this is a continuation of a prior `ListDeviceRegistries` call, and
+     * that the system should return the next page of data.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public com.google.protobuf.ByteString
+        getPageTokenBytes() {
+      java.lang.Object ref = pageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The value returned by the last `ListDeviceRegistriesResponse`; indicates
+     * that this is a continuation of a prior `ListDeviceRegistries` call, and
+     * that the system should return the next page of data.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public Builder setPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The value returned by the last `ListDeviceRegistriesResponse`; indicates
+     * that this is a continuation of a prior `ListDeviceRegistries` call, and
+     * that the system should return the next page of data.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public Builder clearPageToken() {
+      
+      pageToken_ = getDefaultInstance().getPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The value returned by the last `ListDeviceRegistriesResponse`; indicates
+     * that this is a continuation of a prior `ListDeviceRegistries` call, and
+     * that the system should return the next page of data.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public Builder setPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.ListDeviceRegistriesRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.ListDeviceRegistriesRequest)
+  private static final com.google.cloud.iot.v1.ListDeviceRegistriesRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.ListDeviceRegistriesRequest();
+  }
+
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListDeviceRegistriesRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListDeviceRegistriesRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.ListDeviceRegistriesRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequestOrBuilder.java
new file mode 100644
index 000000000000..8ac4c04aaa98
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequestOrBuilder.java
@@ -0,0 +1,63 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface ListDeviceRegistriesRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.ListDeviceRegistriesRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The project and cloud region path. For example,
+   * `projects/example-project/locations/us-central1`.
+   * 

+   *
+   * string parent = 1;
+   */
+  java.lang.String getParent();
+  /**
+   * 
+   * The project and cloud region path. For example,
+   * `projects/example-project/locations/us-central1`.
+   * 

+   *
+   * string parent = 1;
+   */
+  com.google.protobuf.ByteString
+      getParentBytes();
+
+  /**
+   * 
+   * The maximum number of registries to return in the response. If this value
+   * is zero, the service will select a default size. A call may return fewer
+   * objects than requested, but if there is a non-empty `page_token`, it
+   * indicates that more entries are available.
+   * 

+   *
+   * int32 page_size = 2;
+   */
+  int getPageSize();
+
+  /**
+   * 
+   * The value returned by the last `ListDeviceRegistriesResponse`; indicates
+   * that this is a continuation of a prior `ListDeviceRegistries` call, and
+   * that the system should return the next page of data.
+   * 

+   *
+   * string page_token = 3;
+   */
+  java.lang.String getPageToken();
+  /**
+   * 
+   * The value returned by the last `ListDeviceRegistriesResponse`; indicates
+   * that this is a continuation of a prior `ListDeviceRegistries` call, and
+   * that the system should return the next page of data.
+   * 

+   *
+   * string page_token = 3;
+   */
+  com.google.protobuf.ByteString
+      getPageTokenBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java
new file mode 100644
index 000000000000..6a44ef95e2ab
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java
@@ -0,0 +1,1006 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Response for `ListDeviceRegistries`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.ListDeviceRegistriesResponse}
+ */
+public  final class ListDeviceRegistriesResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.ListDeviceRegistriesResponse)
+    ListDeviceRegistriesResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListDeviceRegistriesResponse.newBuilder() to construct.
+  private ListDeviceRegistriesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListDeviceRegistriesResponse() {
+    deviceRegistries_ = java.util.Collections.emptyList();
+    nextPageToken_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListDeviceRegistriesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              deviceRegistries_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            deviceRegistries_.add(
+                input.readMessage(com.google.cloud.iot.v1.DeviceRegistry.parser(), extensionRegistry));
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            nextPageToken_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        deviceRegistries_ = java.util.Collections.unmodifiableList(deviceRegistries_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.ListDeviceRegistriesResponse.class, com.google.cloud.iot.v1.ListDeviceRegistriesResponse.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int DEVICE_REGISTRIES_FIELD_NUMBER = 1;
+  private java.util.List deviceRegistries_;
+  /**
+   * 
+   * The registries that matched the query.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+   */
+  public java.util.List getDeviceRegistriesList() {
+    return deviceRegistries_;
+  }
+  /**
+   * 
+   * The registries that matched the query.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+   */
+  public java.util.List 
+      getDeviceRegistriesOrBuilderList() {
+    return deviceRegistries_;
+  }
+  /**
+   * 
+   * The registries that matched the query.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+   */
+  public int getDeviceRegistriesCount() {
+    return deviceRegistries_.size();
+  }
+  /**
+   * 
+   * The registries that matched the query.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+   */
+  public com.google.cloud.iot.v1.DeviceRegistry getDeviceRegistries(int index) {
+    return deviceRegistries_.get(index);
+  }
+  /**
+   * 
+   * The registries that matched the query.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+   */
+  public com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistriesOrBuilder(
+      int index) {
+    return deviceRegistries_.get(index);
+  }
+
+  public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
+  private volatile java.lang.Object nextPageToken_;
+  /**
+   * 
+   * If not empty, indicates that there may be more registries that match the
+   * request; this value should be passed in a new
+   * `ListDeviceRegistriesRequest`.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public java.lang.String getNextPageToken() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      nextPageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * If not empty, indicates that there may be more registries that match the
+   * request; this value should be passed in a new
+   * `ListDeviceRegistriesRequest`.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public com.google.protobuf.ByteString
+      getNextPageTokenBytes() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      nextPageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < deviceRegistries_.size(); i++) {
+      output.writeMessage(1, deviceRegistries_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < deviceRegistries_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, deviceRegistries_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.ListDeviceRegistriesResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.ListDeviceRegistriesResponse other = (com.google.cloud.iot.v1.ListDeviceRegistriesResponse) obj;
+
+    boolean result = true;
+    result = result && getDeviceRegistriesList()
+        .equals(other.getDeviceRegistriesList());
+    result = result && getNextPageToken()
+        .equals(other.getNextPageToken());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getDeviceRegistriesCount() > 0) {
+      hash = (37 * hash) + DEVICE_REGISTRIES_FIELD_NUMBER;
+      hash = (53 * hash) + getDeviceRegistriesList().hashCode();
+    }
+    hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getNextPageToken().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.ListDeviceRegistriesResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Response for `ListDeviceRegistries`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.ListDeviceRegistriesResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.ListDeviceRegistriesResponse)
+      com.google.cloud.iot.v1.ListDeviceRegistriesResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.ListDeviceRegistriesResponse.class, com.google.cloud.iot.v1.ListDeviceRegistriesResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.ListDeviceRegistriesResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getDeviceRegistriesFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (deviceRegistriesBuilder_ == null) {
+        deviceRegistries_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        deviceRegistriesBuilder_.clear();
+      }
+      nextPageToken_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceRegistriesResponse getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.ListDeviceRegistriesResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceRegistriesResponse build() {
+      com.google.cloud.iot.v1.ListDeviceRegistriesResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceRegistriesResponse buildPartial() {
+      com.google.cloud.iot.v1.ListDeviceRegistriesResponse result = new com.google.cloud.iot.v1.ListDeviceRegistriesResponse(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (deviceRegistriesBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          deviceRegistries_ = java.util.Collections.unmodifiableList(deviceRegistries_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.deviceRegistries_ = deviceRegistries_;
+      } else {
+        result.deviceRegistries_ = deviceRegistriesBuilder_.build();
+      }
+      result.nextPageToken_ = nextPageToken_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.ListDeviceRegistriesResponse) {
+        return mergeFrom((com.google.cloud.iot.v1.ListDeviceRegistriesResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.ListDeviceRegistriesResponse other) {
+      if (other == com.google.cloud.iot.v1.ListDeviceRegistriesResponse.getDefaultInstance()) return this;
+      if (deviceRegistriesBuilder_ == null) {
+        if (!other.deviceRegistries_.isEmpty()) {
+          if (deviceRegistries_.isEmpty()) {
+            deviceRegistries_ = other.deviceRegistries_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureDeviceRegistriesIsMutable();
+            deviceRegistries_.addAll(other.deviceRegistries_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.deviceRegistries_.isEmpty()) {
+          if (deviceRegistriesBuilder_.isEmpty()) {
+            deviceRegistriesBuilder_.dispose();
+            deviceRegistriesBuilder_ = null;
+            deviceRegistries_ = other.deviceRegistries_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            deviceRegistriesBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getDeviceRegistriesFieldBuilder() : null;
+          } else {
+            deviceRegistriesBuilder_.addAllMessages(other.deviceRegistries_);
+          }
+        }
+      }
+      if (!other.getNextPageToken().isEmpty()) {
+        nextPageToken_ = other.nextPageToken_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.ListDeviceRegistriesResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.ListDeviceRegistriesResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List deviceRegistries_ =
+      java.util.Collections.emptyList();
+    private void ensureDeviceRegistriesIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        deviceRegistries_ = new java.util.ArrayList(deviceRegistries_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceRegistry, com.google.cloud.iot.v1.DeviceRegistry.Builder, com.google.cloud.iot.v1.DeviceRegistryOrBuilder> deviceRegistriesBuilder_;
+
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public java.util.List getDeviceRegistriesList() {
+      if (deviceRegistriesBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(deviceRegistries_);
+      } else {
+        return deviceRegistriesBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public int getDeviceRegistriesCount() {
+      if (deviceRegistriesBuilder_ == null) {
+        return deviceRegistries_.size();
+      } else {
+        return deviceRegistriesBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceRegistry getDeviceRegistries(int index) {
+      if (deviceRegistriesBuilder_ == null) {
+        return deviceRegistries_.get(index);
+      } else {
+        return deviceRegistriesBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public Builder setDeviceRegistries(
+        int index, com.google.cloud.iot.v1.DeviceRegistry value) {
+      if (deviceRegistriesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureDeviceRegistriesIsMutable();
+        deviceRegistries_.set(index, value);
+        onChanged();
+      } else {
+        deviceRegistriesBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public Builder setDeviceRegistries(
+        int index, com.google.cloud.iot.v1.DeviceRegistry.Builder builderForValue) {
+      if (deviceRegistriesBuilder_ == null) {
+        ensureDeviceRegistriesIsMutable();
+        deviceRegistries_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        deviceRegistriesBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public Builder addDeviceRegistries(com.google.cloud.iot.v1.DeviceRegistry value) {
+      if (deviceRegistriesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureDeviceRegistriesIsMutable();
+        deviceRegistries_.add(value);
+        onChanged();
+      } else {
+        deviceRegistriesBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public Builder addDeviceRegistries(
+        int index, com.google.cloud.iot.v1.DeviceRegistry value) {
+      if (deviceRegistriesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureDeviceRegistriesIsMutable();
+        deviceRegistries_.add(index, value);
+        onChanged();
+      } else {
+        deviceRegistriesBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public Builder addDeviceRegistries(
+        com.google.cloud.iot.v1.DeviceRegistry.Builder builderForValue) {
+      if (deviceRegistriesBuilder_ == null) {
+        ensureDeviceRegistriesIsMutable();
+        deviceRegistries_.add(builderForValue.build());
+        onChanged();
+      } else {
+        deviceRegistriesBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public Builder addDeviceRegistries(
+        int index, com.google.cloud.iot.v1.DeviceRegistry.Builder builderForValue) {
+      if (deviceRegistriesBuilder_ == null) {
+        ensureDeviceRegistriesIsMutable();
+        deviceRegistries_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        deviceRegistriesBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public Builder addAllDeviceRegistries(
+        java.lang.Iterable values) {
+      if (deviceRegistriesBuilder_ == null) {
+        ensureDeviceRegistriesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, deviceRegistries_);
+        onChanged();
+      } else {
+        deviceRegistriesBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public Builder clearDeviceRegistries() {
+      if (deviceRegistriesBuilder_ == null) {
+        deviceRegistries_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        deviceRegistriesBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public Builder removeDeviceRegistries(int index) {
+      if (deviceRegistriesBuilder_ == null) {
+        ensureDeviceRegistriesIsMutable();
+        deviceRegistries_.remove(index);
+        onChanged();
+      } else {
+        deviceRegistriesBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceRegistry.Builder getDeviceRegistriesBuilder(
+        int index) {
+      return getDeviceRegistriesFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistriesOrBuilder(
+        int index) {
+      if (deviceRegistriesBuilder_ == null) {
+        return deviceRegistries_.get(index);  } else {
+        return deviceRegistriesBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public java.util.List 
+         getDeviceRegistriesOrBuilderList() {
+      if (deviceRegistriesBuilder_ != null) {
+        return deviceRegistriesBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(deviceRegistries_);
+      }
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceRegistry.Builder addDeviceRegistriesBuilder() {
+      return getDeviceRegistriesFieldBuilder().addBuilder(
+          com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance());
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceRegistry.Builder addDeviceRegistriesBuilder(
+        int index) {
+      return getDeviceRegistriesFieldBuilder().addBuilder(
+          index, com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance());
+    }
+    /**
+     * 
+     * The registries that matched the query.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+     */
+    public java.util.List 
+         getDeviceRegistriesBuilderList() {
+      return getDeviceRegistriesFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceRegistry, com.google.cloud.iot.v1.DeviceRegistry.Builder, com.google.cloud.iot.v1.DeviceRegistryOrBuilder> 
+        getDeviceRegistriesFieldBuilder() {
+      if (deviceRegistriesBuilder_ == null) {
+        deviceRegistriesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.iot.v1.DeviceRegistry, com.google.cloud.iot.v1.DeviceRegistry.Builder, com.google.cloud.iot.v1.DeviceRegistryOrBuilder>(
+                deviceRegistries_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        deviceRegistries_ = null;
+      }
+      return deviceRegistriesBuilder_;
+    }
+
+    private java.lang.Object nextPageToken_ = "";
+    /**
+     * 
+     * If not empty, indicates that there may be more registries that match the
+     * request; this value should be passed in a new
+     * `ListDeviceRegistriesRequest`.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public java.lang.String getNextPageToken() {
+      java.lang.Object ref = nextPageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        nextPageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * If not empty, indicates that there may be more registries that match the
+     * request; this value should be passed in a new
+     * `ListDeviceRegistriesRequest`.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public com.google.protobuf.ByteString
+        getNextPageTokenBytes() {
+      java.lang.Object ref = nextPageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        nextPageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * If not empty, indicates that there may be more registries that match the
+     * request; this value should be passed in a new
+     * `ListDeviceRegistriesRequest`.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * If not empty, indicates that there may be more registries that match the
+     * request; this value should be passed in a new
+     * `ListDeviceRegistriesRequest`.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder clearNextPageToken() {
+      
+      nextPageToken_ = getDefaultInstance().getNextPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * If not empty, indicates that there may be more registries that match the
+     * request; this value should be passed in a new
+     * `ListDeviceRegistriesRequest`.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.ListDeviceRegistriesResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.ListDeviceRegistriesResponse)
+  private static final com.google.cloud.iot.v1.ListDeviceRegistriesResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.ListDeviceRegistriesResponse();
+  }
+
+  public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListDeviceRegistriesResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListDeviceRegistriesResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.ListDeviceRegistriesResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponseOrBuilder.java
new file mode 100644
index 000000000000..13eccac9a742
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponseOrBuilder.java
@@ -0,0 +1,75 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface ListDeviceRegistriesResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.ListDeviceRegistriesResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The registries that matched the query.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+   */
+  java.util.List 
+      getDeviceRegistriesList();
+  /**
+   * 
+   * The registries that matched the query.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+   */
+  com.google.cloud.iot.v1.DeviceRegistry getDeviceRegistries(int index);
+  /**
+   * 
+   * The registries that matched the query.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+   */
+  int getDeviceRegistriesCount();
+  /**
+   * 
+   * The registries that matched the query.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+   */
+  java.util.List 
+      getDeviceRegistriesOrBuilderList();
+  /**
+   * 
+   * The registries that matched the query.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceRegistry device_registries = 1;
+   */
+  com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistriesOrBuilder(
+      int index);
+
+  /**
+   * 
+   * If not empty, indicates that there may be more registries that match the
+   * request; this value should be passed in a new
+   * `ListDeviceRegistriesRequest`.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  java.lang.String getNextPageToken();
+  /**
+   * 
+   * If not empty, indicates that there may be more registries that match the
+   * request; this value should be passed in a new
+   * `ListDeviceRegistriesRequest`.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  com.google.protobuf.ByteString
+      getNextPageTokenBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java
new file mode 100644
index 000000000000..4ab9364ad7e1
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java
@@ -0,0 +1,648 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `ListDeviceStates`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.ListDeviceStatesRequest}
+ */
+public  final class ListDeviceStatesRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.ListDeviceStatesRequest)
+    ListDeviceStatesRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListDeviceStatesRequest.newBuilder() to construct.
+  private ListDeviceStatesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListDeviceStatesRequest() {
+    name_ = "";
+    numStates_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListDeviceStatesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 16: {
+
+            numStates_ = input.readInt32();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.ListDeviceStatesRequest.class, com.google.cloud.iot.v1.ListDeviceStatesRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int NUM_STATES_FIELD_NUMBER = 2;
+  private int numStates_;
+  /**
+   * 
+   * The number of states to list. States are listed in descending order of
+   * update time. The maximum number of states retained is 10. If this
+   * value is zero, it will return all the states available.
+   * 

+   *
+   * int32 num_states = 2;
+   */
+  public int getNumStates() {
+    return numStates_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    if (numStates_ != 0) {
+      output.writeInt32(2, numStates_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    if (numStates_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(2, numStates_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.ListDeviceStatesRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.ListDeviceStatesRequest other = (com.google.cloud.iot.v1.ListDeviceStatesRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && (getNumStates()
+        == other.getNumStates());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (37 * hash) + NUM_STATES_FIELD_NUMBER;
+    hash = (53 * hash) + getNumStates();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.ListDeviceStatesRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `ListDeviceStates`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.ListDeviceStatesRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.ListDeviceStatesRequest)
+      com.google.cloud.iot.v1.ListDeviceStatesRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.ListDeviceStatesRequest.class, com.google.cloud.iot.v1.ListDeviceStatesRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.ListDeviceStatesRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      numStates_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceStatesRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.ListDeviceStatesRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceStatesRequest build() {
+      com.google.cloud.iot.v1.ListDeviceStatesRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceStatesRequest buildPartial() {
+      com.google.cloud.iot.v1.ListDeviceStatesRequest result = new com.google.cloud.iot.v1.ListDeviceStatesRequest(this);
+      result.name_ = name_;
+      result.numStates_ = numStates_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.ListDeviceStatesRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.ListDeviceStatesRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.ListDeviceStatesRequest other) {
+      if (other == com.google.cloud.iot.v1.ListDeviceStatesRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (other.getNumStates() != 0) {
+        setNumStates(other.getNumStates());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.ListDeviceStatesRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.ListDeviceStatesRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int numStates_ ;
+    /**
+     * 
+     * The number of states to list. States are listed in descending order of
+     * update time. The maximum number of states retained is 10. If this
+     * value is zero, it will return all the states available.
+     * 

+     *
+     * int32 num_states = 2;
+     */
+    public int getNumStates() {
+      return numStates_;
+    }
+    /**
+     * 
+     * The number of states to list. States are listed in descending order of
+     * update time. The maximum number of states retained is 10. If this
+     * value is zero, it will return all the states available.
+     * 

+     *
+     * int32 num_states = 2;
+     */
+    public Builder setNumStates(int value) {
+      
+      numStates_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The number of states to list. States are listed in descending order of
+     * update time. The maximum number of states retained is 10. If this
+     * value is zero, it will return all the states available.
+     * 

+     *
+     * int32 num_states = 2;
+     */
+    public Builder clearNumStates() {
+      
+      numStates_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.ListDeviceStatesRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.ListDeviceStatesRequest)
+  private static final com.google.cloud.iot.v1.ListDeviceStatesRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.ListDeviceStatesRequest();
+  }
+
+  public static com.google.cloud.iot.v1.ListDeviceStatesRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListDeviceStatesRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListDeviceStatesRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.ListDeviceStatesRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequestOrBuilder.java
new file mode 100644
index 000000000000..5f437a4e907d
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequestOrBuilder.java
@@ -0,0 +1,42 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface ListDeviceStatesRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.ListDeviceStatesRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * 
+   * The number of states to list. States are listed in descending order of
+   * update time. The maximum number of states retained is 10. If this
+   * value is zero, it will return all the states available.
+   * 

+   *
+   * int32 num_states = 2;
+   */
+  int getNumStates();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java
new file mode 100644
index 000000000000..8ab09ac94638
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java
@@ -0,0 +1,857 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Response for `ListDeviceStates`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.ListDeviceStatesResponse}
+ */
+public  final class ListDeviceStatesResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.ListDeviceStatesResponse)
+    ListDeviceStatesResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListDeviceStatesResponse.newBuilder() to construct.
+  private ListDeviceStatesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListDeviceStatesResponse() {
+    deviceStates_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListDeviceStatesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              deviceStates_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            deviceStates_.add(
+                input.readMessage(com.google.cloud.iot.v1.DeviceState.parser(), extensionRegistry));
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        deviceStates_ = java.util.Collections.unmodifiableList(deviceStates_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.ListDeviceStatesResponse.class, com.google.cloud.iot.v1.ListDeviceStatesResponse.Builder.class);
+  }
+
+  public static final int DEVICE_STATES_FIELD_NUMBER = 1;
+  private java.util.List deviceStates_;
+  /**
+   * 
+   * The last few device states. States are listed in descending order of server
+   * update time, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+   */
+  public java.util.List getDeviceStatesList() {
+    return deviceStates_;
+  }
+  /**
+   * 
+   * The last few device states. States are listed in descending order of server
+   * update time, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+   */
+  public java.util.List 
+      getDeviceStatesOrBuilderList() {
+    return deviceStates_;
+  }
+  /**
+   * 
+   * The last few device states. States are listed in descending order of server
+   * update time, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+   */
+  public int getDeviceStatesCount() {
+    return deviceStates_.size();
+  }
+  /**
+   * 
+   * The last few device states. States are listed in descending order of server
+   * update time, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+   */
+  public com.google.cloud.iot.v1.DeviceState getDeviceStates(int index) {
+    return deviceStates_.get(index);
+  }
+  /**
+   * 
+   * The last few device states. States are listed in descending order of server
+   * update time, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+   */
+  public com.google.cloud.iot.v1.DeviceStateOrBuilder getDeviceStatesOrBuilder(
+      int index) {
+    return deviceStates_.get(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < deviceStates_.size(); i++) {
+      output.writeMessage(1, deviceStates_.get(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < deviceStates_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, deviceStates_.get(i));
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.ListDeviceStatesResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.ListDeviceStatesResponse other = (com.google.cloud.iot.v1.ListDeviceStatesResponse) obj;
+
+    boolean result = true;
+    result = result && getDeviceStatesList()
+        .equals(other.getDeviceStatesList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getDeviceStatesCount() > 0) {
+      hash = (37 * hash) + DEVICE_STATES_FIELD_NUMBER;
+      hash = (53 * hash) + getDeviceStatesList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.ListDeviceStatesResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Response for `ListDeviceStates`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.ListDeviceStatesResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.ListDeviceStatesResponse)
+      com.google.cloud.iot.v1.ListDeviceStatesResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.ListDeviceStatesResponse.class, com.google.cloud.iot.v1.ListDeviceStatesResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.ListDeviceStatesResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getDeviceStatesFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (deviceStatesBuilder_ == null) {
+        deviceStates_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        deviceStatesBuilder_.clear();
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceStatesResponse getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.ListDeviceStatesResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceStatesResponse build() {
+      com.google.cloud.iot.v1.ListDeviceStatesResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.ListDeviceStatesResponse buildPartial() {
+      com.google.cloud.iot.v1.ListDeviceStatesResponse result = new com.google.cloud.iot.v1.ListDeviceStatesResponse(this);
+      int from_bitField0_ = bitField0_;
+      if (deviceStatesBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          deviceStates_ = java.util.Collections.unmodifiableList(deviceStates_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.deviceStates_ = deviceStates_;
+      } else {
+        result.deviceStates_ = deviceStatesBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.ListDeviceStatesResponse) {
+        return mergeFrom((com.google.cloud.iot.v1.ListDeviceStatesResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.ListDeviceStatesResponse other) {
+      if (other == com.google.cloud.iot.v1.ListDeviceStatesResponse.getDefaultInstance()) return this;
+      if (deviceStatesBuilder_ == null) {
+        if (!other.deviceStates_.isEmpty()) {
+          if (deviceStates_.isEmpty()) {
+            deviceStates_ = other.deviceStates_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureDeviceStatesIsMutable();
+            deviceStates_.addAll(other.deviceStates_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.deviceStates_.isEmpty()) {
+          if (deviceStatesBuilder_.isEmpty()) {
+            deviceStatesBuilder_.dispose();
+            deviceStatesBuilder_ = null;
+            deviceStates_ = other.deviceStates_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            deviceStatesBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getDeviceStatesFieldBuilder() : null;
+          } else {
+            deviceStatesBuilder_.addAllMessages(other.deviceStates_);
+          }
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.ListDeviceStatesResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.ListDeviceStatesResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List deviceStates_ =
+      java.util.Collections.emptyList();
+    private void ensureDeviceStatesIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        deviceStates_ = new java.util.ArrayList(deviceStates_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceState, com.google.cloud.iot.v1.DeviceState.Builder, com.google.cloud.iot.v1.DeviceStateOrBuilder> deviceStatesBuilder_;
+
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public java.util.List getDeviceStatesList() {
+      if (deviceStatesBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(deviceStates_);
+      } else {
+        return deviceStatesBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public int getDeviceStatesCount() {
+      if (deviceStatesBuilder_ == null) {
+        return deviceStates_.size();
+      } else {
+        return deviceStatesBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceState getDeviceStates(int index) {
+      if (deviceStatesBuilder_ == null) {
+        return deviceStates_.get(index);
+      } else {
+        return deviceStatesBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public Builder setDeviceStates(
+        int index, com.google.cloud.iot.v1.DeviceState value) {
+      if (deviceStatesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureDeviceStatesIsMutable();
+        deviceStates_.set(index, value);
+        onChanged();
+      } else {
+        deviceStatesBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public Builder setDeviceStates(
+        int index, com.google.cloud.iot.v1.DeviceState.Builder builderForValue) {
+      if (deviceStatesBuilder_ == null) {
+        ensureDeviceStatesIsMutable();
+        deviceStates_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        deviceStatesBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public Builder addDeviceStates(com.google.cloud.iot.v1.DeviceState value) {
+      if (deviceStatesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureDeviceStatesIsMutable();
+        deviceStates_.add(value);
+        onChanged();
+      } else {
+        deviceStatesBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public Builder addDeviceStates(
+        int index, com.google.cloud.iot.v1.DeviceState value) {
+      if (deviceStatesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureDeviceStatesIsMutable();
+        deviceStates_.add(index, value);
+        onChanged();
+      } else {
+        deviceStatesBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public Builder addDeviceStates(
+        com.google.cloud.iot.v1.DeviceState.Builder builderForValue) {
+      if (deviceStatesBuilder_ == null) {
+        ensureDeviceStatesIsMutable();
+        deviceStates_.add(builderForValue.build());
+        onChanged();
+      } else {
+        deviceStatesBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public Builder addDeviceStates(
+        int index, com.google.cloud.iot.v1.DeviceState.Builder builderForValue) {
+      if (deviceStatesBuilder_ == null) {
+        ensureDeviceStatesIsMutable();
+        deviceStates_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        deviceStatesBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public Builder addAllDeviceStates(
+        java.lang.Iterable values) {
+      if (deviceStatesBuilder_ == null) {
+        ensureDeviceStatesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, deviceStates_);
+        onChanged();
+      } else {
+        deviceStatesBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public Builder clearDeviceStates() {
+      if (deviceStatesBuilder_ == null) {
+        deviceStates_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        deviceStatesBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public Builder removeDeviceStates(int index) {
+      if (deviceStatesBuilder_ == null) {
+        ensureDeviceStatesIsMutable();
+        deviceStates_.remove(index);
+        onChanged();
+      } else {
+        deviceStatesBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceState.Builder getDeviceStatesBuilder(
+        int index) {
+      return getDeviceStatesFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceStateOrBuilder getDeviceStatesOrBuilder(
+        int index) {
+      if (deviceStatesBuilder_ == null) {
+        return deviceStates_.get(index);  } else {
+        return deviceStatesBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public java.util.List 
+         getDeviceStatesOrBuilderList() {
+      if (deviceStatesBuilder_ != null) {
+        return deviceStatesBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(deviceStates_);
+      }
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceState.Builder addDeviceStatesBuilder() {
+      return getDeviceStatesFieldBuilder().addBuilder(
+          com.google.cloud.iot.v1.DeviceState.getDefaultInstance());
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceState.Builder addDeviceStatesBuilder(
+        int index) {
+      return getDeviceStatesFieldBuilder().addBuilder(
+          index, com.google.cloud.iot.v1.DeviceState.getDefaultInstance());
+    }
+    /**
+     * 
+     * The last few device states. States are listed in descending order of server
+     * update time, starting from the most recent one.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+     */
+    public java.util.List 
+         getDeviceStatesBuilderList() {
+      return getDeviceStatesFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceState, com.google.cloud.iot.v1.DeviceState.Builder, com.google.cloud.iot.v1.DeviceStateOrBuilder> 
+        getDeviceStatesFieldBuilder() {
+      if (deviceStatesBuilder_ == null) {
+        deviceStatesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.iot.v1.DeviceState, com.google.cloud.iot.v1.DeviceState.Builder, com.google.cloud.iot.v1.DeviceStateOrBuilder>(
+                deviceStates_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        deviceStates_ = null;
+      }
+      return deviceStatesBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.ListDeviceStatesResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.ListDeviceStatesResponse)
+  private static final com.google.cloud.iot.v1.ListDeviceStatesResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.ListDeviceStatesResponse();
+  }
+
+  public static com.google.cloud.iot.v1.ListDeviceStatesResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListDeviceStatesResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListDeviceStatesResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.ListDeviceStatesResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponseOrBuilder.java
new file mode 100644
index 000000000000..a409f7de11b8
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponseOrBuilder.java
@@ -0,0 +1,58 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface ListDeviceStatesResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.ListDeviceStatesResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The last few device states. States are listed in descending order of server
+   * update time, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+   */
+  java.util.List 
+      getDeviceStatesList();
+  /**
+   * 
+   * The last few device states. States are listed in descending order of server
+   * update time, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+   */
+  com.google.cloud.iot.v1.DeviceState getDeviceStates(int index);
+  /**
+   * 
+   * The last few device states. States are listed in descending order of server
+   * update time, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+   */
+  int getDeviceStatesCount();
+  /**
+   * 
+   * The last few device states. States are listed in descending order of server
+   * update time, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+   */
+  java.util.List 
+      getDeviceStatesOrBuilderList();
+  /**
+   * 
+   * The last few device states. States are listed in descending order of server
+   * update time, starting from the most recent one.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.DeviceState device_states = 1;
+   */
+  com.google.cloud.iot.v1.DeviceStateOrBuilder getDeviceStatesOrBuilder(
+      int index);
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java
new file mode 100644
index 000000000000..76dd6852954b
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java
@@ -0,0 +1,1529 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `ListDevices`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.ListDevicesRequest}
+ */
+public  final class ListDevicesRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.ListDevicesRequest)
+    ListDevicesRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListDevicesRequest.newBuilder() to construct.
+  private ListDevicesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListDevicesRequest() {
+    parent_ = "";
+    deviceNumIds_ = java.util.Collections.emptyList();
+    deviceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    pageSize_ = 0;
+    pageToken_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListDevicesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
+          case 16: {
+            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+              deviceNumIds_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000002;
+            }
+            deviceNumIds_.add(input.readUInt64());
+            break;
+          }
+          case 18: {
+            int length = input.readRawVarint32();
+            int limit = input.pushLimit(length);
+            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) && input.getBytesUntilLimit() > 0) {
+              deviceNumIds_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000002;
+            }
+            while (input.getBytesUntilLimit() > 0) {
+              deviceNumIds_.add(input.readUInt64());
+            }
+            input.popLimit(limit);
+            break;
+          }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+              deviceIds_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000004;
+            }
+            deviceIds_.add(s);
+            break;
+          }
+          case 34: {
+            com.google.protobuf.FieldMask.Builder subBuilder = null;
+            if (fieldMask_ != null) {
+              subBuilder = fieldMask_.toBuilder();
+            }
+            fieldMask_ = input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(fieldMask_);
+              fieldMask_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 800: {
+
+            pageSize_ = input.readInt32();
+            break;
+          }
+          case 810: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            pageToken_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+        deviceNumIds_ = java.util.Collections.unmodifiableList(deviceNumIds_);
+      }
+      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+        deviceIds_ = deviceIds_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.ListDevicesRequest.class, com.google.cloud.iot.v1.ListDevicesRequest.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int PARENT_FIELD_NUMBER = 1;
+  private volatile java.lang.Object parent_;
+  /**
+   * 
+   * The device registry path. Required. For example,
+   * `projects/my-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string parent = 1;
+   */
+  public java.lang.String getParent() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      parent_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The device registry path. Required. For example,
+   * `projects/my-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string parent = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParentBytes() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      parent_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int DEVICE_NUM_IDS_FIELD_NUMBER = 2;
+  private java.util.List deviceNumIds_;
+  /**
+   * 
+   * A list of device numerical ids. If empty, it will ignore this field. This
+   * field cannot hold more than 10,000 entries.
+   * 

+   *
+   * repeated uint64 device_num_ids = 2;
+   */
+  public java.util.List
+      getDeviceNumIdsList() {
+    return deviceNumIds_;
+  }
+  /**
+   * 
+   * A list of device numerical ids. If empty, it will ignore this field. This
+   * field cannot hold more than 10,000 entries.
+   * 

+   *
+   * repeated uint64 device_num_ids = 2;
+   */
+  public int getDeviceNumIdsCount() {
+    return deviceNumIds_.size();
+  }
+  /**
+   * 
+   * A list of device numerical ids. If empty, it will ignore this field. This
+   * field cannot hold more than 10,000 entries.
+   * 

+   *
+   * repeated uint64 device_num_ids = 2;
+   */
+  public long getDeviceNumIds(int index) {
+    return deviceNumIds_.get(index);
+  }
+  private int deviceNumIdsMemoizedSerializedSize = -1;
+
+  public static final int DEVICE_IDS_FIELD_NUMBER = 3;
+  private com.google.protobuf.LazyStringList deviceIds_;
+  /**
+   * 
+   * A list of device string identifiers. If empty, it will ignore this field.
+   * For example, `['device0', 'device12']`. This field cannot hold more than
+   * 10,000 entries.
+   * 

+   *
+   * repeated string device_ids = 3;
+   */
+  public com.google.protobuf.ProtocolStringList
+      getDeviceIdsList() {
+    return deviceIds_;
+  }
+  /**
+   * 
+   * A list of device string identifiers. If empty, it will ignore this field.
+   * For example, `['device0', 'device12']`. This field cannot hold more than
+   * 10,000 entries.
+   * 

+   *
+   * repeated string device_ids = 3;
+   */
+  public int getDeviceIdsCount() {
+    return deviceIds_.size();
+  }
+  /**
+   * 
+   * A list of device string identifiers. If empty, it will ignore this field.
+   * For example, `['device0', 'device12']`. This field cannot hold more than
+   * 10,000 entries.
+   * 

+   *
+   * repeated string device_ids = 3;
+   */
+  public java.lang.String getDeviceIds(int index) {
+    return deviceIds_.get(index);
+  }
+  /**
+   * 
+   * A list of device string identifiers. If empty, it will ignore this field.
+   * For example, `['device0', 'device12']`. This field cannot hold more than
+   * 10,000 entries.
+   * 

+   *
+   * repeated string device_ids = 3;
+   */
+  public com.google.protobuf.ByteString
+      getDeviceIdsBytes(int index) {
+    return deviceIds_.getByteString(index);
+  }
+
+  public static final int FIELD_MASK_FIELD_NUMBER = 4;
+  private com.google.protobuf.FieldMask fieldMask_;
+  /**
+   * 
+   * The fields of the `Device` resource to be returned in the response. The
+   * fields `id`, and `num_id` are always returned by default, along with any
+   * other fields specified.
+   * 

+   *
+   * .google.protobuf.FieldMask field_mask = 4;
+   */
+  public boolean hasFieldMask() {
+    return fieldMask_ != null;
+  }
+  /**
+   * 
+   * The fields of the `Device` resource to be returned in the response. The
+   * fields `id`, and `num_id` are always returned by default, along with any
+   * other fields specified.
+   * 

+   *
+   * .google.protobuf.FieldMask field_mask = 4;
+   */
+  public com.google.protobuf.FieldMask getFieldMask() {
+    return fieldMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : fieldMask_;
+  }
+  /**
+   * 
+   * The fields of the `Device` resource to be returned in the response. The
+   * fields `id`, and `num_id` are always returned by default, along with any
+   * other fields specified.
+   * 

+   *
+   * .google.protobuf.FieldMask field_mask = 4;
+   */
+  public com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder() {
+    return getFieldMask();
+  }
+
+  public static final int PAGE_SIZE_FIELD_NUMBER = 100;
+  private int pageSize_;
+  /**
+   * 
+   * The maximum number of devices to return in the response. If this value
+   * is zero, the service will select a default size. A call may return fewer
+   * objects than requested, but if there is a non-empty `page_token`, it
+   * indicates that more entries are available.
+   * 

+   *
+   * int32 page_size = 100;
+   */
+  public int getPageSize() {
+    return pageSize_;
+  }
+
+  public static final int PAGE_TOKEN_FIELD_NUMBER = 101;
+  private volatile java.lang.Object pageToken_;
+  /**
+   * 
+   * The value returned by the last `ListDevicesResponse`; indicates
+   * that this is a continuation of a prior `ListDevices` call, and
+   * that the system should return the next page of data.
+   * 

+   *
+   * string page_token = 101;
+   */
+  public java.lang.String getPageToken() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      pageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The value returned by the last `ListDevicesResponse`; indicates
+   * that this is a continuation of a prior `ListDevices` call, and
+   * that the system should return the next page of data.
+   * 

+   *
+   * string page_token = 101;
+   */
+  public com.google.protobuf.ByteString
+      getPageTokenBytes() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      pageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    getSerializedSize();
+    if (!getParentBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
+    }
+    if (getDeviceNumIdsList().size() > 0) {
+      output.writeUInt32NoTag(18);
+      output.writeUInt32NoTag(deviceNumIdsMemoizedSerializedSize);
+    }
+    for (int i = 0; i < deviceNumIds_.size(); i++) {
+      output.writeUInt64NoTag(deviceNumIds_.get(i));
+    }
+    for (int i = 0; i < deviceIds_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, deviceIds_.getRaw(i));
+    }
+    if (fieldMask_ != null) {
+      output.writeMessage(4, getFieldMask());
+    }
+    if (pageSize_ != 0) {
+      output.writeInt32(100, pageSize_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 101, pageToken_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getParentBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
+    }
+    {
+      int dataSize = 0;
+      for (int i = 0; i < deviceNumIds_.size(); i++) {
+        dataSize += com.google.protobuf.CodedOutputStream
+          .computeUInt64SizeNoTag(deviceNumIds_.get(i));
+      }
+      size += dataSize;
+      if (!getDeviceNumIdsList().isEmpty()) {
+        size += 1;
+        size += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(dataSize);
+      }
+      deviceNumIdsMemoizedSerializedSize = dataSize;
+    }
+    {
+      int dataSize = 0;
+      for (int i = 0; i < deviceIds_.size(); i++) {
+        dataSize += computeStringSizeNoTag(deviceIds_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getDeviceIdsList().size();
+    }
+    if (fieldMask_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(4, getFieldMask());
+    }
+    if (pageSize_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(100, pageSize_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(101, pageToken_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.ListDevicesRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.ListDevicesRequest other = (com.google.cloud.iot.v1.ListDevicesRequest) obj;
+
+    boolean result = true;
+    result = result && getParent()
+        .equals(other.getParent());
+    result = result && getDeviceNumIdsList()
+        .equals(other.getDeviceNumIdsList());
+    result = result && getDeviceIdsList()
+        .equals(other.getDeviceIdsList());
+    result = result && (hasFieldMask() == other.hasFieldMask());
+    if (hasFieldMask()) {
+      result = result && getFieldMask()
+          .equals(other.getFieldMask());
+    }
+    result = result && (getPageSize()
+        == other.getPageSize());
+    result = result && getPageToken()
+        .equals(other.getPageToken());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PARENT_FIELD_NUMBER;
+    hash = (53 * hash) + getParent().hashCode();
+    if (getDeviceNumIdsCount() > 0) {
+      hash = (37 * hash) + DEVICE_NUM_IDS_FIELD_NUMBER;
+      hash = (53 * hash) + getDeviceNumIdsList().hashCode();
+    }
+    if (getDeviceIdsCount() > 0) {
+      hash = (37 * hash) + DEVICE_IDS_FIELD_NUMBER;
+      hash = (53 * hash) + getDeviceIdsList().hashCode();
+    }
+    if (hasFieldMask()) {
+      hash = (37 * hash) + FIELD_MASK_FIELD_NUMBER;
+      hash = (53 * hash) + getFieldMask().hashCode();
+    }
+    hash = (37 * hash) + PAGE_SIZE_FIELD_NUMBER;
+    hash = (53 * hash) + getPageSize();
+    hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getPageToken().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.ListDevicesRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.ListDevicesRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `ListDevices`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.ListDevicesRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.ListDevicesRequest)
+      com.google.cloud.iot.v1.ListDevicesRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.ListDevicesRequest.class, com.google.cloud.iot.v1.ListDevicesRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.ListDevicesRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parent_ = "";
+
+      deviceNumIds_ = java.util.Collections.emptyList();
+      bitField0_ = (bitField0_ & ~0x00000002);
+      deviceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      if (fieldMaskBuilder_ == null) {
+        fieldMask_ = null;
+      } else {
+        fieldMask_ = null;
+        fieldMaskBuilder_ = null;
+      }
+      pageSize_ = 0;
+
+      pageToken_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.ListDevicesRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.ListDevicesRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.ListDevicesRequest build() {
+      com.google.cloud.iot.v1.ListDevicesRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.ListDevicesRequest buildPartial() {
+      com.google.cloud.iot.v1.ListDevicesRequest result = new com.google.cloud.iot.v1.ListDevicesRequest(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      result.parent_ = parent_;
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        deviceNumIds_ = java.util.Collections.unmodifiableList(deviceNumIds_);
+        bitField0_ = (bitField0_ & ~0x00000002);
+      }
+      result.deviceNumIds_ = deviceNumIds_;
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        deviceIds_ = deviceIds_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000004);
+      }
+      result.deviceIds_ = deviceIds_;
+      if (fieldMaskBuilder_ == null) {
+        result.fieldMask_ = fieldMask_;
+      } else {
+        result.fieldMask_ = fieldMaskBuilder_.build();
+      }
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.ListDevicesRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.ListDevicesRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.ListDevicesRequest other) {
+      if (other == com.google.cloud.iot.v1.ListDevicesRequest.getDefaultInstance()) return this;
+      if (!other.getParent().isEmpty()) {
+        parent_ = other.parent_;
+        onChanged();
+      }
+      if (!other.deviceNumIds_.isEmpty()) {
+        if (deviceNumIds_.isEmpty()) {
+          deviceNumIds_ = other.deviceNumIds_;
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          ensureDeviceNumIdsIsMutable();
+          deviceNumIds_.addAll(other.deviceNumIds_);
+        }
+        onChanged();
+      }
+      if (!other.deviceIds_.isEmpty()) {
+        if (deviceIds_.isEmpty()) {
+          deviceIds_ = other.deviceIds_;
+          bitField0_ = (bitField0_ & ~0x00000004);
+        } else {
+          ensureDeviceIdsIsMutable();
+          deviceIds_.addAll(other.deviceIds_);
+        }
+        onChanged();
+      }
+      if (other.hasFieldMask()) {
+        mergeFieldMask(other.getFieldMask());
+      }
+      if (other.getPageSize() != 0) {
+        setPageSize(other.getPageSize());
+      }
+      if (!other.getPageToken().isEmpty()) {
+        pageToken_ = other.pageToken_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.ListDevicesRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.ListDevicesRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.lang.Object parent_ = "";
+    /**
+     * 
+     * The device registry path. Required. For example,
+     * `projects/my-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public java.lang.String getParent() {
+      java.lang.Object ref = parent_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        parent_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The device registry path. Required. For example,
+     * `projects/my-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParentBytes() {
+      java.lang.Object ref = parent_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        parent_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The device registry path. Required. For example,
+     * `projects/my-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParent(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The device registry path. Required. For example,
+     * `projects/my-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder clearParent() {
+      
+      parent_ = getDefaultInstance().getParent();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The device registry path. Required. For example,
+     * `projects/my-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParentBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.util.List deviceNumIds_ = java.util.Collections.emptyList();
+    private void ensureDeviceNumIdsIsMutable() {
+      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+        deviceNumIds_ = new java.util.ArrayList(deviceNumIds_);
+        bitField0_ |= 0x00000002;
+       }
+    }
+    /**
+     * 
+     * A list of device numerical ids. If empty, it will ignore this field. This
+     * field cannot hold more than 10,000 entries.
+     * 

+     *
+     * repeated uint64 device_num_ids = 2;
+     */
+    public java.util.List
+        getDeviceNumIdsList() {
+      return java.util.Collections.unmodifiableList(deviceNumIds_);
+    }
+    /**
+     * 
+     * A list of device numerical ids. If empty, it will ignore this field. This
+     * field cannot hold more than 10,000 entries.
+     * 

+     *
+     * repeated uint64 device_num_ids = 2;
+     */
+    public int getDeviceNumIdsCount() {
+      return deviceNumIds_.size();
+    }
+    /**
+     * 
+     * A list of device numerical ids. If empty, it will ignore this field. This
+     * field cannot hold more than 10,000 entries.
+     * 

+     *
+     * repeated uint64 device_num_ids = 2;
+     */
+    public long getDeviceNumIds(int index) {
+      return deviceNumIds_.get(index);
+    }
+    /**
+     * 
+     * A list of device numerical ids. If empty, it will ignore this field. This
+     * field cannot hold more than 10,000 entries.
+     * 

+     *
+     * repeated uint64 device_num_ids = 2;
+     */
+    public Builder setDeviceNumIds(
+        int index, long value) {
+      ensureDeviceNumIdsIsMutable();
+      deviceNumIds_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A list of device numerical ids. If empty, it will ignore this field. This
+     * field cannot hold more than 10,000 entries.
+     * 

+     *
+     * repeated uint64 device_num_ids = 2;
+     */
+    public Builder addDeviceNumIds(long value) {
+      ensureDeviceNumIdsIsMutable();
+      deviceNumIds_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A list of device numerical ids. If empty, it will ignore this field. This
+     * field cannot hold more than 10,000 entries.
+     * 

+     *
+     * repeated uint64 device_num_ids = 2;
+     */
+    public Builder addAllDeviceNumIds(
+        java.lang.Iterable values) {
+      ensureDeviceNumIdsIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, deviceNumIds_);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A list of device numerical ids. If empty, it will ignore this field. This
+     * field cannot hold more than 10,000 entries.
+     * 

+     *
+     * repeated uint64 device_num_ids = 2;
+     */
+    public Builder clearDeviceNumIds() {
+      deviceNumIds_ = java.util.Collections.emptyList();
+      bitField0_ = (bitField0_ & ~0x00000002);
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.LazyStringList deviceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensureDeviceIdsIsMutable() {
+      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
+        deviceIds_ = new com.google.protobuf.LazyStringArrayList(deviceIds_);
+        bitField0_ |= 0x00000004;
+       }
+    }
+    /**
+     * 
+     * A list of device string identifiers. If empty, it will ignore this field.
+     * For example, `['device0', 'device12']`. This field cannot hold more than
+     * 10,000 entries.
+     * 

+     *
+     * repeated string device_ids = 3;
+     */
+    public com.google.protobuf.ProtocolStringList
+        getDeviceIdsList() {
+      return deviceIds_.getUnmodifiableView();
+    }
+    /**
+     * 
+     * A list of device string identifiers. If empty, it will ignore this field.
+     * For example, `['device0', 'device12']`. This field cannot hold more than
+     * 10,000 entries.
+     * 

+     *
+     * repeated string device_ids = 3;
+     */
+    public int getDeviceIdsCount() {
+      return deviceIds_.size();
+    }
+    /**
+     * 
+     * A list of device string identifiers. If empty, it will ignore this field.
+     * For example, `['device0', 'device12']`. This field cannot hold more than
+     * 10,000 entries.
+     * 

+     *
+     * repeated string device_ids = 3;
+     */
+    public java.lang.String getDeviceIds(int index) {
+      return deviceIds_.get(index);
+    }
+    /**
+     * 
+     * A list of device string identifiers. If empty, it will ignore this field.
+     * For example, `['device0', 'device12']`. This field cannot hold more than
+     * 10,000 entries.
+     * 

+     *
+     * repeated string device_ids = 3;
+     */
+    public com.google.protobuf.ByteString
+        getDeviceIdsBytes(int index) {
+      return deviceIds_.getByteString(index);
+    }
+    /**
+     * 
+     * A list of device string identifiers. If empty, it will ignore this field.
+     * For example, `['device0', 'device12']`. This field cannot hold more than
+     * 10,000 entries.
+     * 

+     *
+     * repeated string device_ids = 3;
+     */
+    public Builder setDeviceIds(
+        int index, java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureDeviceIdsIsMutable();
+      deviceIds_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A list of device string identifiers. If empty, it will ignore this field.
+     * For example, `['device0', 'device12']`. This field cannot hold more than
+     * 10,000 entries.
+     * 

+     *
+     * repeated string device_ids = 3;
+     */
+    public Builder addDeviceIds(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureDeviceIdsIsMutable();
+      deviceIds_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A list of device string identifiers. If empty, it will ignore this field.
+     * For example, `['device0', 'device12']`. This field cannot hold more than
+     * 10,000 entries.
+     * 

+     *
+     * repeated string device_ids = 3;
+     */
+    public Builder addAllDeviceIds(
+        java.lang.Iterable values) {
+      ensureDeviceIdsIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, deviceIds_);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A list of device string identifiers. If empty, it will ignore this field.
+     * For example, `['device0', 'device12']`. This field cannot hold more than
+     * 10,000 entries.
+     * 

+     *
+     * repeated string device_ids = 3;
+     */
+    public Builder clearDeviceIds() {
+      deviceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A list of device string identifiers. If empty, it will ignore this field.
+     * For example, `['device0', 'device12']`. This field cannot hold more than
+     * 10,000 entries.
+     * 

+     *
+     * repeated string device_ids = 3;
+     */
+    public Builder addDeviceIdsBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      ensureDeviceIdsIsMutable();
+      deviceIds_.add(value);
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.FieldMask fieldMask_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder> fieldMaskBuilder_;
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. The
+     * fields `id`, and `num_id` are always returned by default, along with any
+     * other fields specified.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 4;
+     */
+    public boolean hasFieldMask() {
+      return fieldMaskBuilder_ != null || fieldMask_ != null;
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. The
+     * fields `id`, and `num_id` are always returned by default, along with any
+     * other fields specified.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 4;
+     */
+    public com.google.protobuf.FieldMask getFieldMask() {
+      if (fieldMaskBuilder_ == null) {
+        return fieldMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : fieldMask_;
+      } else {
+        return fieldMaskBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. The
+     * fields `id`, and `num_id` are always returned by default, along with any
+     * other fields specified.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 4;
+     */
+    public Builder setFieldMask(com.google.protobuf.FieldMask value) {
+      if (fieldMaskBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        fieldMask_ = value;
+        onChanged();
+      } else {
+        fieldMaskBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. The
+     * fields `id`, and `num_id` are always returned by default, along with any
+     * other fields specified.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 4;
+     */
+    public Builder setFieldMask(
+        com.google.protobuf.FieldMask.Builder builderForValue) {
+      if (fieldMaskBuilder_ == null) {
+        fieldMask_ = builderForValue.build();
+        onChanged();
+      } else {
+        fieldMaskBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. The
+     * fields `id`, and `num_id` are always returned by default, along with any
+     * other fields specified.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 4;
+     */
+    public Builder mergeFieldMask(com.google.protobuf.FieldMask value) {
+      if (fieldMaskBuilder_ == null) {
+        if (fieldMask_ != null) {
+          fieldMask_ =
+            com.google.protobuf.FieldMask.newBuilder(fieldMask_).mergeFrom(value).buildPartial();
+        } else {
+          fieldMask_ = value;
+        }
+        onChanged();
+      } else {
+        fieldMaskBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. The
+     * fields `id`, and `num_id` are always returned by default, along with any
+     * other fields specified.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 4;
+     */
+    public Builder clearFieldMask() {
+      if (fieldMaskBuilder_ == null) {
+        fieldMask_ = null;
+        onChanged();
+      } else {
+        fieldMask_ = null;
+        fieldMaskBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. The
+     * fields `id`, and `num_id` are always returned by default, along with any
+     * other fields specified.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 4;
+     */
+    public com.google.protobuf.FieldMask.Builder getFieldMaskBuilder() {
+      
+      onChanged();
+      return getFieldMaskFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. The
+     * fields `id`, and `num_id` are always returned by default, along with any
+     * other fields specified.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 4;
+     */
+    public com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder() {
+      if (fieldMaskBuilder_ != null) {
+        return fieldMaskBuilder_.getMessageOrBuilder();
+      } else {
+        return fieldMask_ == null ?
+            com.google.protobuf.FieldMask.getDefaultInstance() : fieldMask_;
+      }
+    }
+    /**
+     * 
+     * The fields of the `Device` resource to be returned in the response. The
+     * fields `id`, and `num_id` are always returned by default, along with any
+     * other fields specified.
+     * 

+     *
+     * .google.protobuf.FieldMask field_mask = 4;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder> 
+        getFieldMaskFieldBuilder() {
+      if (fieldMaskBuilder_ == null) {
+        fieldMaskBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder>(
+                getFieldMask(),
+                getParentForChildren(),
+                isClean());
+        fieldMask_ = null;
+      }
+      return fieldMaskBuilder_;
+    }
+
+    private int pageSize_ ;
+    /**
+     * 
+     * The maximum number of devices to return in the response. If this value
+     * is zero, the service will select a default size. A call may return fewer
+     * objects than requested, but if there is a non-empty `page_token`, it
+     * indicates that more entries are available.
+     * 

+     *
+     * int32 page_size = 100;
+     */
+    public int getPageSize() {
+      return pageSize_;
+    }
+    /**
+     * 
+     * The maximum number of devices to return in the response. If this value
+     * is zero, the service will select a default size. A call may return fewer
+     * objects than requested, but if there is a non-empty `page_token`, it
+     * indicates that more entries are available.
+     * 

+     *
+     * int32 page_size = 100;
+     */
+    public Builder setPageSize(int value) {
+      
+      pageSize_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The maximum number of devices to return in the response. If this value
+     * is zero, the service will select a default size. A call may return fewer
+     * objects than requested, but if there is a non-empty `page_token`, it
+     * indicates that more entries are available.
+     * 

+     *
+     * int32 page_size = 100;
+     */
+    public Builder clearPageSize() {
+      
+      pageSize_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object pageToken_ = "";
+    /**
+     * 
+     * The value returned by the last `ListDevicesResponse`; indicates
+     * that this is a continuation of a prior `ListDevices` call, and
+     * that the system should return the next page of data.
+     * 

+     *
+     * string page_token = 101;
+     */
+    public java.lang.String getPageToken() {
+      java.lang.Object ref = pageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        pageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The value returned by the last `ListDevicesResponse`; indicates
+     * that this is a continuation of a prior `ListDevices` call, and
+     * that the system should return the next page of data.
+     * 

+     *
+     * string page_token = 101;
+     */
+    public com.google.protobuf.ByteString
+        getPageTokenBytes() {
+      java.lang.Object ref = pageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The value returned by the last `ListDevicesResponse`; indicates
+     * that this is a continuation of a prior `ListDevices` call, and
+     * that the system should return the next page of data.
+     * 

+     *
+     * string page_token = 101;
+     */
+    public Builder setPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The value returned by the last `ListDevicesResponse`; indicates
+     * that this is a continuation of a prior `ListDevices` call, and
+     * that the system should return the next page of data.
+     * 

+     *
+     * string page_token = 101;
+     */
+    public Builder clearPageToken() {
+      
+      pageToken_ = getDefaultInstance().getPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The value returned by the last `ListDevicesResponse`; indicates
+     * that this is a continuation of a prior `ListDevices` call, and
+     * that the system should return the next page of data.
+     * 

+     *
+     * string page_token = 101;
+     */
+    public Builder setPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.ListDevicesRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.ListDevicesRequest)
+  private static final com.google.cloud.iot.v1.ListDevicesRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.ListDevicesRequest();
+  }
+
+  public static com.google.cloud.iot.v1.ListDevicesRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListDevicesRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListDevicesRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.ListDevicesRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequestOrBuilder.java
new file mode 100644
index 000000000000..89d102539e2b
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequestOrBuilder.java
@@ -0,0 +1,165 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface ListDevicesRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.ListDevicesRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The device registry path. Required. For example,
+   * `projects/my-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string parent = 1;
+   */
+  java.lang.String getParent();
+  /**
+   * 
+   * The device registry path. Required. For example,
+   * `projects/my-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * string parent = 1;
+   */
+  com.google.protobuf.ByteString
+      getParentBytes();
+
+  /**
+   * 
+   * A list of device numerical ids. If empty, it will ignore this field. This
+   * field cannot hold more than 10,000 entries.
+   * 

+   *
+   * repeated uint64 device_num_ids = 2;
+   */
+  java.util.List getDeviceNumIdsList();
+  /**
+   * 
+   * A list of device numerical ids. If empty, it will ignore this field. This
+   * field cannot hold more than 10,000 entries.
+   * 

+   *
+   * repeated uint64 device_num_ids = 2;
+   */
+  int getDeviceNumIdsCount();
+  /**
+   * 
+   * A list of device numerical ids. If empty, it will ignore this field. This
+   * field cannot hold more than 10,000 entries.
+   * 

+   *
+   * repeated uint64 device_num_ids = 2;
+   */
+  long getDeviceNumIds(int index);
+
+  /**
+   * 
+   * A list of device string identifiers. If empty, it will ignore this field.
+   * For example, `['device0', 'device12']`. This field cannot hold more than
+   * 10,000 entries.
+   * 

+   *
+   * repeated string device_ids = 3;
+   */
+  java.util.List
+      getDeviceIdsList();
+  /**
+   * 
+   * A list of device string identifiers. If empty, it will ignore this field.
+   * For example, `['device0', 'device12']`. This field cannot hold more than
+   * 10,000 entries.
+   * 

+   *
+   * repeated string device_ids = 3;
+   */
+  int getDeviceIdsCount();
+  /**
+   * 
+   * A list of device string identifiers. If empty, it will ignore this field.
+   * For example, `['device0', 'device12']`. This field cannot hold more than
+   * 10,000 entries.
+   * 

+   *
+   * repeated string device_ids = 3;
+   */
+  java.lang.String getDeviceIds(int index);
+  /**
+   * 
+   * A list of device string identifiers. If empty, it will ignore this field.
+   * For example, `['device0', 'device12']`. This field cannot hold more than
+   * 10,000 entries.
+   * 

+   *
+   * repeated string device_ids = 3;
+   */
+  com.google.protobuf.ByteString
+      getDeviceIdsBytes(int index);
+
+  /**
+   * 
+   * The fields of the `Device` resource to be returned in the response. The
+   * fields `id`, and `num_id` are always returned by default, along with any
+   * other fields specified.
+   * 

+   *
+   * .google.protobuf.FieldMask field_mask = 4;
+   */
+  boolean hasFieldMask();
+  /**
+   * 
+   * The fields of the `Device` resource to be returned in the response. The
+   * fields `id`, and `num_id` are always returned by default, along with any
+   * other fields specified.
+   * 

+   *
+   * .google.protobuf.FieldMask field_mask = 4;
+   */
+  com.google.protobuf.FieldMask getFieldMask();
+  /**
+   * 
+   * The fields of the `Device` resource to be returned in the response. The
+   * fields `id`, and `num_id` are always returned by default, along with any
+   * other fields specified.
+   * 

+   *
+   * .google.protobuf.FieldMask field_mask = 4;
+   */
+  com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder();
+
+  /**
+   * 
+   * The maximum number of devices to return in the response. If this value
+   * is zero, the service will select a default size. A call may return fewer
+   * objects than requested, but if there is a non-empty `page_token`, it
+   * indicates that more entries are available.
+   * 

+   *
+   * int32 page_size = 100;
+   */
+  int getPageSize();
+
+  /**
+   * 
+   * The value returned by the last `ListDevicesResponse`; indicates
+   * that this is a continuation of a prior `ListDevices` call, and
+   * that the system should return the next page of data.
+   * 

+   *
+   * string page_token = 101;
+   */
+  java.lang.String getPageToken();
+  /**
+   * 
+   * The value returned by the last `ListDevicesResponse`; indicates
+   * that this is a continuation of a prior `ListDevices` call, and
+   * that the system should return the next page of data.
+   * 

+   *
+   * string page_token = 101;
+   */
+  com.google.protobuf.ByteString
+      getPageTokenBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java
new file mode 100644
index 000000000000..4e334c17b513
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java
@@ -0,0 +1,999 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Response for `ListDevices`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.ListDevicesResponse}
+ */
+public  final class ListDevicesResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.ListDevicesResponse)
+    ListDevicesResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListDevicesResponse.newBuilder() to construct.
+  private ListDevicesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListDevicesResponse() {
+    devices_ = java.util.Collections.emptyList();
+    nextPageToken_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListDevicesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              devices_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            devices_.add(
+                input.readMessage(com.google.cloud.iot.v1.Device.parser(), extensionRegistry));
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            nextPageToken_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        devices_ = java.util.Collections.unmodifiableList(devices_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.ListDevicesResponse.class, com.google.cloud.iot.v1.ListDevicesResponse.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int DEVICES_FIELD_NUMBER = 1;
+  private java.util.List devices_;
+  /**
+   * 
+   * The devices that match the request.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.Device devices = 1;
+   */
+  public java.util.List getDevicesList() {
+    return devices_;
+  }
+  /**
+   * 
+   * The devices that match the request.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.Device devices = 1;
+   */
+  public java.util.List 
+      getDevicesOrBuilderList() {
+    return devices_;
+  }
+  /**
+   * 
+   * The devices that match the request.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.Device devices = 1;
+   */
+  public int getDevicesCount() {
+    return devices_.size();
+  }
+  /**
+   * 
+   * The devices that match the request.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.Device devices = 1;
+   */
+  public com.google.cloud.iot.v1.Device getDevices(int index) {
+    return devices_.get(index);
+  }
+  /**
+   * 
+   * The devices that match the request.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.Device devices = 1;
+   */
+  public com.google.cloud.iot.v1.DeviceOrBuilder getDevicesOrBuilder(
+      int index) {
+    return devices_.get(index);
+  }
+
+  public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
+  private volatile java.lang.Object nextPageToken_;
+  /**
+   * 
+   * If not empty, indicates that there may be more devices that match the
+   * request; this value should be passed in a new `ListDevicesRequest`.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public java.lang.String getNextPageToken() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      nextPageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * If not empty, indicates that there may be more devices that match the
+   * request; this value should be passed in a new `ListDevicesRequest`.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public com.google.protobuf.ByteString
+      getNextPageTokenBytes() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      nextPageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < devices_.size(); i++) {
+      output.writeMessage(1, devices_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < devices_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, devices_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.ListDevicesResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.ListDevicesResponse other = (com.google.cloud.iot.v1.ListDevicesResponse) obj;
+
+    boolean result = true;
+    result = result && getDevicesList()
+        .equals(other.getDevicesList());
+    result = result && getNextPageToken()
+        .equals(other.getNextPageToken());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getDevicesCount() > 0) {
+      hash = (37 * hash) + DEVICES_FIELD_NUMBER;
+      hash = (53 * hash) + getDevicesList().hashCode();
+    }
+    hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getNextPageToken().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.ListDevicesResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ListDevicesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.ListDevicesResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Response for `ListDevices`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.ListDevicesResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.ListDevicesResponse)
+      com.google.cloud.iot.v1.ListDevicesResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.ListDevicesResponse.class, com.google.cloud.iot.v1.ListDevicesResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.ListDevicesResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getDevicesFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (devicesBuilder_ == null) {
+        devices_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        devicesBuilder_.clear();
+      }
+      nextPageToken_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesResponse_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.ListDevicesResponse getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.ListDevicesResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.ListDevicesResponse build() {
+      com.google.cloud.iot.v1.ListDevicesResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.ListDevicesResponse buildPartial() {
+      com.google.cloud.iot.v1.ListDevicesResponse result = new com.google.cloud.iot.v1.ListDevicesResponse(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (devicesBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          devices_ = java.util.Collections.unmodifiableList(devices_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.devices_ = devices_;
+      } else {
+        result.devices_ = devicesBuilder_.build();
+      }
+      result.nextPageToken_ = nextPageToken_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.ListDevicesResponse) {
+        return mergeFrom((com.google.cloud.iot.v1.ListDevicesResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.ListDevicesResponse other) {
+      if (other == com.google.cloud.iot.v1.ListDevicesResponse.getDefaultInstance()) return this;
+      if (devicesBuilder_ == null) {
+        if (!other.devices_.isEmpty()) {
+          if (devices_.isEmpty()) {
+            devices_ = other.devices_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureDevicesIsMutable();
+            devices_.addAll(other.devices_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.devices_.isEmpty()) {
+          if (devicesBuilder_.isEmpty()) {
+            devicesBuilder_.dispose();
+            devicesBuilder_ = null;
+            devices_ = other.devices_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            devicesBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getDevicesFieldBuilder() : null;
+          } else {
+            devicesBuilder_.addAllMessages(other.devices_);
+          }
+        }
+      }
+      if (!other.getNextPageToken().isEmpty()) {
+        nextPageToken_ = other.nextPageToken_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.ListDevicesResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.ListDevicesResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List devices_ =
+      java.util.Collections.emptyList();
+    private void ensureDevicesIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        devices_ = new java.util.ArrayList(devices_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.Device, com.google.cloud.iot.v1.Device.Builder, com.google.cloud.iot.v1.DeviceOrBuilder> devicesBuilder_;
+
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public java.util.List getDevicesList() {
+      if (devicesBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(devices_);
+      } else {
+        return devicesBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public int getDevicesCount() {
+      if (devicesBuilder_ == null) {
+        return devices_.size();
+      } else {
+        return devicesBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public com.google.cloud.iot.v1.Device getDevices(int index) {
+      if (devicesBuilder_ == null) {
+        return devices_.get(index);
+      } else {
+        return devicesBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public Builder setDevices(
+        int index, com.google.cloud.iot.v1.Device value) {
+      if (devicesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureDevicesIsMutable();
+        devices_.set(index, value);
+        onChanged();
+      } else {
+        devicesBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public Builder setDevices(
+        int index, com.google.cloud.iot.v1.Device.Builder builderForValue) {
+      if (devicesBuilder_ == null) {
+        ensureDevicesIsMutable();
+        devices_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        devicesBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public Builder addDevices(com.google.cloud.iot.v1.Device value) {
+      if (devicesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureDevicesIsMutable();
+        devices_.add(value);
+        onChanged();
+      } else {
+        devicesBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public Builder addDevices(
+        int index, com.google.cloud.iot.v1.Device value) {
+      if (devicesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureDevicesIsMutable();
+        devices_.add(index, value);
+        onChanged();
+      } else {
+        devicesBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public Builder addDevices(
+        com.google.cloud.iot.v1.Device.Builder builderForValue) {
+      if (devicesBuilder_ == null) {
+        ensureDevicesIsMutable();
+        devices_.add(builderForValue.build());
+        onChanged();
+      } else {
+        devicesBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public Builder addDevices(
+        int index, com.google.cloud.iot.v1.Device.Builder builderForValue) {
+      if (devicesBuilder_ == null) {
+        ensureDevicesIsMutable();
+        devices_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        devicesBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public Builder addAllDevices(
+        java.lang.Iterable values) {
+      if (devicesBuilder_ == null) {
+        ensureDevicesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, devices_);
+        onChanged();
+      } else {
+        devicesBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public Builder clearDevices() {
+      if (devicesBuilder_ == null) {
+        devices_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        devicesBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public Builder removeDevices(int index) {
+      if (devicesBuilder_ == null) {
+        ensureDevicesIsMutable();
+        devices_.remove(index);
+        onChanged();
+      } else {
+        devicesBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public com.google.cloud.iot.v1.Device.Builder getDevicesBuilder(
+        int index) {
+      return getDevicesFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceOrBuilder getDevicesOrBuilder(
+        int index) {
+      if (devicesBuilder_ == null) {
+        return devices_.get(index);  } else {
+        return devicesBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public java.util.List 
+         getDevicesOrBuilderList() {
+      if (devicesBuilder_ != null) {
+        return devicesBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(devices_);
+      }
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public com.google.cloud.iot.v1.Device.Builder addDevicesBuilder() {
+      return getDevicesFieldBuilder().addBuilder(
+          com.google.cloud.iot.v1.Device.getDefaultInstance());
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public com.google.cloud.iot.v1.Device.Builder addDevicesBuilder(
+        int index) {
+      return getDevicesFieldBuilder().addBuilder(
+          index, com.google.cloud.iot.v1.Device.getDefaultInstance());
+    }
+    /**
+     * 
+     * The devices that match the request.
+     * 

+     *
+     * repeated .google.cloud.iot.v1.Device devices = 1;
+     */
+    public java.util.List 
+         getDevicesBuilderList() {
+      return getDevicesFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.iot.v1.Device, com.google.cloud.iot.v1.Device.Builder, com.google.cloud.iot.v1.DeviceOrBuilder> 
+        getDevicesFieldBuilder() {
+      if (devicesBuilder_ == null) {
+        devicesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.iot.v1.Device, com.google.cloud.iot.v1.Device.Builder, com.google.cloud.iot.v1.DeviceOrBuilder>(
+                devices_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        devices_ = null;
+      }
+      return devicesBuilder_;
+    }
+
+    private java.lang.Object nextPageToken_ = "";
+    /**
+     * 
+     * If not empty, indicates that there may be more devices that match the
+     * request; this value should be passed in a new `ListDevicesRequest`.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public java.lang.String getNextPageToken() {
+      java.lang.Object ref = nextPageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        nextPageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * If not empty, indicates that there may be more devices that match the
+     * request; this value should be passed in a new `ListDevicesRequest`.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public com.google.protobuf.ByteString
+        getNextPageTokenBytes() {
+      java.lang.Object ref = nextPageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        nextPageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * If not empty, indicates that there may be more devices that match the
+     * request; this value should be passed in a new `ListDevicesRequest`.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * If not empty, indicates that there may be more devices that match the
+     * request; this value should be passed in a new `ListDevicesRequest`.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder clearNextPageToken() {
+      
+      nextPageToken_ = getDefaultInstance().getNextPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * If not empty, indicates that there may be more devices that match the
+     * request; this value should be passed in a new `ListDevicesRequest`.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.ListDevicesResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.ListDevicesResponse)
+  private static final com.google.cloud.iot.v1.ListDevicesResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.ListDevicesResponse();
+  }
+
+  public static com.google.cloud.iot.v1.ListDevicesResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListDevicesResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListDevicesResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.ListDevicesResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponseOrBuilder.java
new file mode 100644
index 000000000000..befef6262c6d
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponseOrBuilder.java
@@ -0,0 +1,73 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface ListDevicesResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.ListDevicesResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The devices that match the request.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.Device devices = 1;
+   */
+  java.util.List 
+      getDevicesList();
+  /**
+   * 
+   * The devices that match the request.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.Device devices = 1;
+   */
+  com.google.cloud.iot.v1.Device getDevices(int index);
+  /**
+   * 
+   * The devices that match the request.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.Device devices = 1;
+   */
+  int getDevicesCount();
+  /**
+   * 
+   * The devices that match the request.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.Device devices = 1;
+   */
+  java.util.List 
+      getDevicesOrBuilderList();
+  /**
+   * 
+   * The devices that match the request.
+   * 

+   *
+   * repeated .google.cloud.iot.v1.Device devices = 1;
+   */
+  com.google.cloud.iot.v1.DeviceOrBuilder getDevicesOrBuilder(
+      int index);
+
+  /**
+   * 
+   * If not empty, indicates that there may be more devices that match the
+   * request; this value should be passed in a new `ListDevicesRequest`.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  java.lang.String getNextPageToken();
+  /**
+   * 
+   * If not empty, indicates that there may be more devices that match the
+   * request; this value should be passed in a new `ListDevicesRequest`.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  com.google.protobuf.ByteString
+      getNextPageTokenBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/LocationName.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/LocationName.java
new file mode 100644
index 000000000000..b3667d2ce6f9
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/LocationName.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, 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.
+ */
+
+package com.google.cloud.iot.v1;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.api.resourcenames.ResourceNameType;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class LocationName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/locations/{location}");
+
+  private volatile Map fieldValuesMap;
+
+  private final String project;
+  private final String location;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private LocationName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+  }
+
+  public static LocationName of(String project, String location) {
+    return newBuilder()
+      .setProject(project)
+      .setLocation(location)
+      .build();
+  }
+
+  public static String format(String project, String location) {
+    return newBuilder()
+      .setProject(project)
+      .setLocation(location)
+      .build()
+      .toString();
+  }
+
+  public static LocationName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map matchMap =
+        PATH_TEMPLATE.validatedMatch(formattedString, "LocationName.parse: formattedString not in valid format");
+    return of(matchMap.get("project"), matchMap.get("location"));
+  }
+
+  public static List parseList(List formattedStrings) {
+    List list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List toStringList(List values) {
+    List list = new ArrayList(values.size());
+    for (LocationName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldMapBuilder.put("location", location);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  /**
+   * @deprecated This method is only present to satisfy the ResourceName interface.
+   */
+  @Deprecated
+  public ResourceNameType getType() {
+    throw new UnsupportedOperationException("LocationName.getType() not supported");
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate("project", project, "location", location);
+  }
+
+  /** Builder for LocationName. */
+  public static class Builder {
+
+    private String project;
+    private String location;
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public Builder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    private Builder() {
+    }
+
+    private Builder(LocationName locationName) {
+      project = locationName.project;
+      location = locationName.location;
+    }
+
+    public LocationName build() {
+      return new LocationName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof LocationName) {
+      LocationName that = (LocationName) o;
+      return (this.project.equals(that.project))
+          && (this.location.equals(that.location));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    h *= 1000003;
+    h ^= location.hashCode();
+    return h;
+  }
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java
new file mode 100644
index 000000000000..76cfc68ad3a2
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java
@@ -0,0 +1,734 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `ModifyCloudToDeviceConfig`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest}
+ */
+public  final class ModifyCloudToDeviceConfigRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest)
+    ModifyCloudToDeviceConfigRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ModifyCloudToDeviceConfigRequest.newBuilder() to construct.
+  private ModifyCloudToDeviceConfigRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ModifyCloudToDeviceConfigRequest() {
+    name_ = "";
+    versionToUpdate_ = 0L;
+    binaryData_ = com.google.protobuf.ByteString.EMPTY;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ModifyCloudToDeviceConfigRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 16: {
+
+            versionToUpdate_ = input.readInt64();
+            break;
+          }
+          case 26: {
+
+            binaryData_ = input.readBytes();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest.class, com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int VERSION_TO_UPDATE_FIELD_NUMBER = 2;
+  private long versionToUpdate_;
+  /**
+   * 
+   * The version number to update. If this value is zero, it will not check the
+   * version number of the server and will always update the current version;
+   * otherwise, this update will fail if the version number found on the server
+   * does not match this version number. This is used to support multiple
+   * simultaneous updates without losing data.
+   * 

+   *
+   * int64 version_to_update = 2;
+   */
+  public long getVersionToUpdate() {
+    return versionToUpdate_;
+  }
+
+  public static final int BINARY_DATA_FIELD_NUMBER = 3;
+  private com.google.protobuf.ByteString binaryData_;
+  /**
+   * 
+   * The configuration data for the device.
+   * 

+   *
+   * bytes binary_data = 3;
+   */
+  public com.google.protobuf.ByteString getBinaryData() {
+    return binaryData_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    if (versionToUpdate_ != 0L) {
+      output.writeInt64(2, versionToUpdate_);
+    }
+    if (!binaryData_.isEmpty()) {
+      output.writeBytes(3, binaryData_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    if (versionToUpdate_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(2, versionToUpdate_);
+    }
+    if (!binaryData_.isEmpty()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(3, binaryData_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest other = (com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && (getVersionToUpdate()
+        == other.getVersionToUpdate());
+    result = result && getBinaryData()
+        .equals(other.getBinaryData());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (37 * hash) + VERSION_TO_UPDATE_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getVersionToUpdate());
+    hash = (37 * hash) + BINARY_DATA_FIELD_NUMBER;
+    hash = (53 * hash) + getBinaryData().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `ModifyCloudToDeviceConfig`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest)
+      com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest.class, com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      versionToUpdate_ = 0L;
+
+      binaryData_ = com.google.protobuf.ByteString.EMPTY;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest build() {
+      com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest buildPartial() {
+      com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest result = new com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest(this);
+      result.name_ = name_;
+      result.versionToUpdate_ = versionToUpdate_;
+      result.binaryData_ = binaryData_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest other) {
+      if (other == com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (other.getVersionToUpdate() != 0L) {
+        setVersionToUpdate(other.getVersionToUpdate());
+      }
+      if (other.getBinaryData() != com.google.protobuf.ByteString.EMPTY) {
+        setBinaryData(other.getBinaryData());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the device. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private long versionToUpdate_ ;
+    /**
+     * 
+     * The version number to update. If this value is zero, it will not check the
+     * version number of the server and will always update the current version;
+     * otherwise, this update will fail if the version number found on the server
+     * does not match this version number. This is used to support multiple
+     * simultaneous updates without losing data.
+     * 

+     *
+     * int64 version_to_update = 2;
+     */
+    public long getVersionToUpdate() {
+      return versionToUpdate_;
+    }
+    /**
+     * 
+     * The version number to update. If this value is zero, it will not check the
+     * version number of the server and will always update the current version;
+     * otherwise, this update will fail if the version number found on the server
+     * does not match this version number. This is used to support multiple
+     * simultaneous updates without losing data.
+     * 

+     *
+     * int64 version_to_update = 2;
+     */
+    public Builder setVersionToUpdate(long value) {
+      
+      versionToUpdate_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The version number to update. If this value is zero, it will not check the
+     * version number of the server and will always update the current version;
+     * otherwise, this update will fail if the version number found on the server
+     * does not match this version number. This is used to support multiple
+     * simultaneous updates without losing data.
+     * 

+     *
+     * int64 version_to_update = 2;
+     */
+    public Builder clearVersionToUpdate() {
+      
+      versionToUpdate_ = 0L;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.ByteString binaryData_ = com.google.protobuf.ByteString.EMPTY;
+    /**
+     * 
+     * The configuration data for the device.
+     * 

+     *
+     * bytes binary_data = 3;
+     */
+    public com.google.protobuf.ByteString getBinaryData() {
+      return binaryData_;
+    }
+    /**
+     * 
+     * The configuration data for the device.
+     * 

+     *
+     * bytes binary_data = 3;
+     */
+    public Builder setBinaryData(com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      binaryData_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The configuration data for the device.
+     * 

+     *
+     * bytes binary_data = 3;
+     */
+    public Builder clearBinaryData() {
+      
+      binaryData_ = getDefaultInstance().getBinaryData();
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest)
+  private static final com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest();
+  }
+
+  public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ModifyCloudToDeviceConfigRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ModifyCloudToDeviceConfigRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequestOrBuilder.java
new file mode 100644
index 000000000000..1591418091cf
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequestOrBuilder.java
@@ -0,0 +1,53 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface ModifyCloudToDeviceConfigRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * The name of the device. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * 
+   * The version number to update. If this value is zero, it will not check the
+   * version number of the server and will always update the current version;
+   * otherwise, this update will fail if the version number found on the server
+   * does not match this version number. This is used to support multiple
+   * simultaneous updates without losing data.
+   * 

+   *
+   * int64 version_to_update = 2;
+   */
+  long getVersionToUpdate();
+
+  /**
+   * 
+   * The configuration data for the device.
+   * 

+   *
+   * bytes binary_data = 3;
+   */
+  com.google.protobuf.ByteString getBinaryData();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java
new file mode 100644
index 000000000000..8dd4fdd58ecb
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java
@@ -0,0 +1,515 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * The configuration of MQTT for a device registry.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.MqttConfig}
+ */
+public  final class MqttConfig extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.MqttConfig)
+    MqttConfigOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use MqttConfig.newBuilder() to construct.
+  private MqttConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private MqttConfig() {
+    mqttEnabledState_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private MqttConfig(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            mqttEnabledState_ = rawValue;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_MqttConfig_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_MqttConfig_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.MqttConfig.class, com.google.cloud.iot.v1.MqttConfig.Builder.class);
+  }
+
+  public static final int MQTT_ENABLED_STATE_FIELD_NUMBER = 1;
+  private int mqttEnabledState_;
+  /**
+   * 
+   * If enabled, allows connections using the MQTT protocol. Otherwise, MQTT
+   * connections to this registry will fail.
+   * 

+   *
+   * .google.cloud.iot.v1.MqttState mqtt_enabled_state = 1;
+   */
+  public int getMqttEnabledStateValue() {
+    return mqttEnabledState_;
+  }
+  /**
+   * 
+   * If enabled, allows connections using the MQTT protocol. Otherwise, MQTT
+   * connections to this registry will fail.
+   * 

+   *
+   * .google.cloud.iot.v1.MqttState mqtt_enabled_state = 1;
+   */
+  public com.google.cloud.iot.v1.MqttState getMqttEnabledState() {
+    com.google.cloud.iot.v1.MqttState result = com.google.cloud.iot.v1.MqttState.valueOf(mqttEnabledState_);
+    return result == null ? com.google.cloud.iot.v1.MqttState.UNRECOGNIZED : result;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (mqttEnabledState_ != com.google.cloud.iot.v1.MqttState.MQTT_STATE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(1, mqttEnabledState_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (mqttEnabledState_ != com.google.cloud.iot.v1.MqttState.MQTT_STATE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(1, mqttEnabledState_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.MqttConfig)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.MqttConfig other = (com.google.cloud.iot.v1.MqttConfig) obj;
+
+    boolean result = true;
+    result = result && mqttEnabledState_ == other.mqttEnabledState_;
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + MQTT_ENABLED_STATE_FIELD_NUMBER;
+    hash = (53 * hash) + mqttEnabledState_;
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.MqttConfig parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.MqttConfig parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.MqttConfig parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.MqttConfig parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.MqttConfig parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.MqttConfig parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.MqttConfig parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.MqttConfig parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.MqttConfig parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.MqttConfig parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.MqttConfig parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.MqttConfig parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.MqttConfig prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * The configuration of MQTT for a device registry.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.MqttConfig}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.MqttConfig)
+      com.google.cloud.iot.v1.MqttConfigOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_MqttConfig_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_MqttConfig_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.MqttConfig.class, com.google.cloud.iot.v1.MqttConfig.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.MqttConfig.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      mqttEnabledState_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_MqttConfig_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.MqttConfig getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.MqttConfig.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.MqttConfig build() {
+      com.google.cloud.iot.v1.MqttConfig result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.MqttConfig buildPartial() {
+      com.google.cloud.iot.v1.MqttConfig result = new com.google.cloud.iot.v1.MqttConfig(this);
+      result.mqttEnabledState_ = mqttEnabledState_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.MqttConfig) {
+        return mergeFrom((com.google.cloud.iot.v1.MqttConfig)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.MqttConfig other) {
+      if (other == com.google.cloud.iot.v1.MqttConfig.getDefaultInstance()) return this;
+      if (other.mqttEnabledState_ != 0) {
+        setMqttEnabledStateValue(other.getMqttEnabledStateValue());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.MqttConfig parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.MqttConfig) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int mqttEnabledState_ = 0;
+    /**
+     * 
+     * If enabled, allows connections using the MQTT protocol. Otherwise, MQTT
+     * connections to this registry will fail.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttState mqtt_enabled_state = 1;
+     */
+    public int getMqttEnabledStateValue() {
+      return mqttEnabledState_;
+    }
+    /**
+     * 
+     * If enabled, allows connections using the MQTT protocol. Otherwise, MQTT
+     * connections to this registry will fail.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttState mqtt_enabled_state = 1;
+     */
+    public Builder setMqttEnabledStateValue(int value) {
+      mqttEnabledState_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * If enabled, allows connections using the MQTT protocol. Otherwise, MQTT
+     * connections to this registry will fail.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttState mqtt_enabled_state = 1;
+     */
+    public com.google.cloud.iot.v1.MqttState getMqttEnabledState() {
+      com.google.cloud.iot.v1.MqttState result = com.google.cloud.iot.v1.MqttState.valueOf(mqttEnabledState_);
+      return result == null ? com.google.cloud.iot.v1.MqttState.UNRECOGNIZED : result;
+    }
+    /**
+     * 
+     * If enabled, allows connections using the MQTT protocol. Otherwise, MQTT
+     * connections to this registry will fail.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttState mqtt_enabled_state = 1;
+     */
+    public Builder setMqttEnabledState(com.google.cloud.iot.v1.MqttState value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      mqttEnabledState_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * If enabled, allows connections using the MQTT protocol. Otherwise, MQTT
+     * connections to this registry will fail.
+     * 

+     *
+     * .google.cloud.iot.v1.MqttState mqtt_enabled_state = 1;
+     */
+    public Builder clearMqttEnabledState() {
+      
+      mqttEnabledState_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.MqttConfig)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.MqttConfig)
+  private static final com.google.cloud.iot.v1.MqttConfig DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.MqttConfig();
+  }
+
+  public static com.google.cloud.iot.v1.MqttConfig getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public MqttConfig parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new MqttConfig(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.MqttConfig getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfigOrBuilder.java
new file mode 100644
index 000000000000..d18013c9791e
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfigOrBuilder.java
@@ -0,0 +1,28 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface MqttConfigOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.MqttConfig)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * If enabled, allows connections using the MQTT protocol. Otherwise, MQTT
+   * connections to this registry will fail.
+   * 

+   *
+   * .google.cloud.iot.v1.MqttState mqtt_enabled_state = 1;
+   */
+  int getMqttEnabledStateValue();
+  /**
+   * 
+   * If enabled, allows connections using the MQTT protocol. Otherwise, MQTT
+   * connections to this registry will fail.
+   * 

+   *
+   * .google.cloud.iot.v1.MqttState mqtt_enabled_state = 1;
+   */
+  com.google.cloud.iot.v1.MqttState getMqttEnabledState();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttState.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttState.java
new file mode 100644
index 000000000000..13ef85925d77
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttState.java
@@ -0,0 +1,141 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Indicates whether an MQTT connection is enabled or disabled. See the field
+ * description for details.
+ * 

+ *
+ * Protobuf enum {@code google.cloud.iot.v1.MqttState}
+ */
+public enum MqttState
+    implements com.google.protobuf.ProtocolMessageEnum {
+  /**
+   * 
+   * No MQTT state specified. If not specified, MQTT will be enabled by default.
+   * 

+   *
+   * MQTT_STATE_UNSPECIFIED = 0;
+   */
+  MQTT_STATE_UNSPECIFIED(0),
+  /**
+   * 
+   * Enables a MQTT connection.
+   * 

+   *
+   * MQTT_ENABLED = 1;
+   */
+  MQTT_ENABLED(1),
+  /**
+   * 
+   * Disables a MQTT connection.
+   * 

+   *
+   * MQTT_DISABLED = 2;
+   */
+  MQTT_DISABLED(2),
+  UNRECOGNIZED(-1),
+  ;
+
+  /**
+   * 
+   * No MQTT state specified. If not specified, MQTT will be enabled by default.
+   * 

+   *
+   * MQTT_STATE_UNSPECIFIED = 0;
+   */
+  public static final int MQTT_STATE_UNSPECIFIED_VALUE = 0;
+  /**
+   * 
+   * Enables a MQTT connection.
+   * 

+   *
+   * MQTT_ENABLED = 1;
+   */
+  public static final int MQTT_ENABLED_VALUE = 1;
+  /**
+   * 
+   * Disables a MQTT connection.
+   * 

+   *
+   * MQTT_DISABLED = 2;
+   */
+  public static final int MQTT_DISABLED_VALUE = 2;
+
+
+  public final int getNumber() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalArgumentException(
+          "Can't get the number of an unknown enum value.");
+    }
+    return value;
+  }
+
+  /**
+   * @deprecated Use {@link #forNumber(int)} instead.
+   */
+  @java.lang.Deprecated
+  public static MqttState valueOf(int value) {
+    return forNumber(value);
+  }
+
+  public static MqttState forNumber(int value) {
+    switch (value) {
+      case 0: return MQTT_STATE_UNSPECIFIED;
+      case 1: return MQTT_ENABLED;
+      case 2: return MQTT_DISABLED;
+      default: return null;
+    }
+  }
+
+  public static com.google.protobuf.Internal.EnumLiteMap
+      internalGetValueMap() {
+    return internalValueMap;
+  }
+  private static final com.google.protobuf.Internal.EnumLiteMap<
+      MqttState> internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public MqttState findValueByNumber(int number) {
+            return MqttState.forNumber(number);
+          }
+        };
+
+  public final com.google.protobuf.Descriptors.EnumValueDescriptor
+      getValueDescriptor() {
+    return getDescriptor().getValues().get(ordinal());
+  }
+  public final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptorForType() {
+    return getDescriptor();
+  }
+  public static final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.getDescriptor().getEnumTypes().get(0);
+  }
+
+  private static final MqttState[] VALUES = values();
+
+  public static MqttState valueOf(
+      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    if (desc.getType() != getDescriptor()) {
+      throw new java.lang.IllegalArgumentException(
+        "EnumValueDescriptor is not for this type.");
+    }
+    if (desc.getIndex() == -1) {
+      return UNRECOGNIZED;
+    }
+    return VALUES[desc.getIndex()];
+  }
+
+  private final int value;
+
+  private MqttState(int value) {
+    this.value = value;
+  }
+
+  // @@protoc_insertion_point(enum_scope:google.cloud.iot.v1.MqttState)
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java
new file mode 100644
index 000000000000..192fb886897b
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java
@@ -0,0 +1,892 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * A public key certificate format and data.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.PublicKeyCertificate}
+ */
+public  final class PublicKeyCertificate extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.PublicKeyCertificate)
+    PublicKeyCertificateOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use PublicKeyCertificate.newBuilder() to construct.
+  private PublicKeyCertificate(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private PublicKeyCertificate() {
+    format_ = 0;
+    certificate_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private PublicKeyCertificate(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            format_ = rawValue;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            certificate_ = s;
+            break;
+          }
+          case 26: {
+            com.google.cloud.iot.v1.X509CertificateDetails.Builder subBuilder = null;
+            if (x509Details_ != null) {
+              subBuilder = x509Details_.toBuilder();
+            }
+            x509Details_ = input.readMessage(com.google.cloud.iot.v1.X509CertificateDetails.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(x509Details_);
+              x509Details_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCertificate_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCertificate_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.PublicKeyCertificate.class, com.google.cloud.iot.v1.PublicKeyCertificate.Builder.class);
+  }
+
+  public static final int FORMAT_FIELD_NUMBER = 1;
+  private int format_;
+  /**
+   * 
+   * The certificate format.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCertificateFormat format = 1;
+   */
+  public int getFormatValue() {
+    return format_;
+  }
+  /**
+   * 
+   * The certificate format.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCertificateFormat format = 1;
+   */
+  public com.google.cloud.iot.v1.PublicKeyCertificateFormat getFormat() {
+    com.google.cloud.iot.v1.PublicKeyCertificateFormat result = com.google.cloud.iot.v1.PublicKeyCertificateFormat.valueOf(format_);
+    return result == null ? com.google.cloud.iot.v1.PublicKeyCertificateFormat.UNRECOGNIZED : result;
+  }
+
+  public static final int CERTIFICATE_FIELD_NUMBER = 2;
+  private volatile java.lang.Object certificate_;
+  /**
+   * 
+   * The certificate data.
+   * 

+   *
+   * string certificate = 2;
+   */
+  public java.lang.String getCertificate() {
+    java.lang.Object ref = certificate_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      certificate_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The certificate data.
+   * 

+   *
+   * string certificate = 2;
+   */
+  public com.google.protobuf.ByteString
+      getCertificateBytes() {
+    java.lang.Object ref = certificate_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      certificate_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int X509_DETAILS_FIELD_NUMBER = 3;
+  private com.google.cloud.iot.v1.X509CertificateDetails x509Details_;
+  /**
+   * 
+   * [Output only] The certificate details. Used only for X.509 certificates.
+   * 

+   *
+   * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+   */
+  public boolean hasX509Details() {
+    return x509Details_ != null;
+  }
+  /**
+   * 
+   * [Output only] The certificate details. Used only for X.509 certificates.
+   * 

+   *
+   * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+   */
+  public com.google.cloud.iot.v1.X509CertificateDetails getX509Details() {
+    return x509Details_ == null ? com.google.cloud.iot.v1.X509CertificateDetails.getDefaultInstance() : x509Details_;
+  }
+  /**
+   * 
+   * [Output only] The certificate details. Used only for X.509 certificates.
+   * 

+   *
+   * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+   */
+  public com.google.cloud.iot.v1.X509CertificateDetailsOrBuilder getX509DetailsOrBuilder() {
+    return getX509Details();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (format_ != com.google.cloud.iot.v1.PublicKeyCertificateFormat.UNSPECIFIED_PUBLIC_KEY_CERTIFICATE_FORMAT.getNumber()) {
+      output.writeEnum(1, format_);
+    }
+    if (!getCertificateBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, certificate_);
+    }
+    if (x509Details_ != null) {
+      output.writeMessage(3, getX509Details());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (format_ != com.google.cloud.iot.v1.PublicKeyCertificateFormat.UNSPECIFIED_PUBLIC_KEY_CERTIFICATE_FORMAT.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(1, format_);
+    }
+    if (!getCertificateBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, certificate_);
+    }
+    if (x509Details_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, getX509Details());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.PublicKeyCertificate)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.PublicKeyCertificate other = (com.google.cloud.iot.v1.PublicKeyCertificate) obj;
+
+    boolean result = true;
+    result = result && format_ == other.format_;
+    result = result && getCertificate()
+        .equals(other.getCertificate());
+    result = result && (hasX509Details() == other.hasX509Details());
+    if (hasX509Details()) {
+      result = result && getX509Details()
+          .equals(other.getX509Details());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + FORMAT_FIELD_NUMBER;
+    hash = (53 * hash) + format_;
+    hash = (37 * hash) + CERTIFICATE_FIELD_NUMBER;
+    hash = (53 * hash) + getCertificate().hashCode();
+    if (hasX509Details()) {
+      hash = (37 * hash) + X509_DETAILS_FIELD_NUMBER;
+      hash = (53 * hash) + getX509Details().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.PublicKeyCertificate parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCertificate parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCertificate parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCertificate parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCertificate parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCertificate parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCertificate parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCertificate parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCertificate parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCertificate parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCertificate parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCertificate parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.PublicKeyCertificate prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * A public key certificate format and data.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.PublicKeyCertificate}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.PublicKeyCertificate)
+      com.google.cloud.iot.v1.PublicKeyCertificateOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCertificate_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCertificate_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.PublicKeyCertificate.class, com.google.cloud.iot.v1.PublicKeyCertificate.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.PublicKeyCertificate.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      format_ = 0;
+
+      certificate_ = "";
+
+      if (x509DetailsBuilder_ == null) {
+        x509Details_ = null;
+      } else {
+        x509Details_ = null;
+        x509DetailsBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCertificate_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.PublicKeyCertificate getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.PublicKeyCertificate.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.PublicKeyCertificate build() {
+      com.google.cloud.iot.v1.PublicKeyCertificate result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.PublicKeyCertificate buildPartial() {
+      com.google.cloud.iot.v1.PublicKeyCertificate result = new com.google.cloud.iot.v1.PublicKeyCertificate(this);
+      result.format_ = format_;
+      result.certificate_ = certificate_;
+      if (x509DetailsBuilder_ == null) {
+        result.x509Details_ = x509Details_;
+      } else {
+        result.x509Details_ = x509DetailsBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.PublicKeyCertificate) {
+        return mergeFrom((com.google.cloud.iot.v1.PublicKeyCertificate)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.PublicKeyCertificate other) {
+      if (other == com.google.cloud.iot.v1.PublicKeyCertificate.getDefaultInstance()) return this;
+      if (other.format_ != 0) {
+        setFormatValue(other.getFormatValue());
+      }
+      if (!other.getCertificate().isEmpty()) {
+        certificate_ = other.certificate_;
+        onChanged();
+      }
+      if (other.hasX509Details()) {
+        mergeX509Details(other.getX509Details());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.PublicKeyCertificate parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.PublicKeyCertificate) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int format_ = 0;
+    /**
+     * 
+     * The certificate format.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificateFormat format = 1;
+     */
+    public int getFormatValue() {
+      return format_;
+    }
+    /**
+     * 
+     * The certificate format.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificateFormat format = 1;
+     */
+    public Builder setFormatValue(int value) {
+      format_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The certificate format.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificateFormat format = 1;
+     */
+    public com.google.cloud.iot.v1.PublicKeyCertificateFormat getFormat() {
+      com.google.cloud.iot.v1.PublicKeyCertificateFormat result = com.google.cloud.iot.v1.PublicKeyCertificateFormat.valueOf(format_);
+      return result == null ? com.google.cloud.iot.v1.PublicKeyCertificateFormat.UNRECOGNIZED : result;
+    }
+    /**
+     * 
+     * The certificate format.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificateFormat format = 1;
+     */
+    public Builder setFormat(com.google.cloud.iot.v1.PublicKeyCertificateFormat value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      format_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The certificate format.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificateFormat format = 1;
+     */
+    public Builder clearFormat() {
+      
+      format_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object certificate_ = "";
+    /**
+     * 
+     * The certificate data.
+     * 

+     *
+     * string certificate = 2;
+     */
+    public java.lang.String getCertificate() {
+      java.lang.Object ref = certificate_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        certificate_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The certificate data.
+     * 

+     *
+     * string certificate = 2;
+     */
+    public com.google.protobuf.ByteString
+        getCertificateBytes() {
+      java.lang.Object ref = certificate_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        certificate_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The certificate data.
+     * 

+     *
+     * string certificate = 2;
+     */
+    public Builder setCertificate(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      certificate_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The certificate data.
+     * 

+     *
+     * string certificate = 2;
+     */
+    public Builder clearCertificate() {
+      
+      certificate_ = getDefaultInstance().getCertificate();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The certificate data.
+     * 

+     *
+     * string certificate = 2;
+     */
+    public Builder setCertificateBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      certificate_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.cloud.iot.v1.X509CertificateDetails x509Details_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.X509CertificateDetails, com.google.cloud.iot.v1.X509CertificateDetails.Builder, com.google.cloud.iot.v1.X509CertificateDetailsOrBuilder> x509DetailsBuilder_;
+    /**
+     * 
+     * [Output only] The certificate details. Used only for X.509 certificates.
+     * 

+     *
+     * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+     */
+    public boolean hasX509Details() {
+      return x509DetailsBuilder_ != null || x509Details_ != null;
+    }
+    /**
+     * 
+     * [Output only] The certificate details. Used only for X.509 certificates.
+     * 

+     *
+     * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+     */
+    public com.google.cloud.iot.v1.X509CertificateDetails getX509Details() {
+      if (x509DetailsBuilder_ == null) {
+        return x509Details_ == null ? com.google.cloud.iot.v1.X509CertificateDetails.getDefaultInstance() : x509Details_;
+      } else {
+        return x509DetailsBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * [Output only] The certificate details. Used only for X.509 certificates.
+     * 

+     *
+     * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+     */
+    public Builder setX509Details(com.google.cloud.iot.v1.X509CertificateDetails value) {
+      if (x509DetailsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        x509Details_ = value;
+        onChanged();
+      } else {
+        x509DetailsBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The certificate details. Used only for X.509 certificates.
+     * 

+     *
+     * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+     */
+    public Builder setX509Details(
+        com.google.cloud.iot.v1.X509CertificateDetails.Builder builderForValue) {
+      if (x509DetailsBuilder_ == null) {
+        x509Details_ = builderForValue.build();
+        onChanged();
+      } else {
+        x509DetailsBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The certificate details. Used only for X.509 certificates.
+     * 

+     *
+     * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+     */
+    public Builder mergeX509Details(com.google.cloud.iot.v1.X509CertificateDetails value) {
+      if (x509DetailsBuilder_ == null) {
+        if (x509Details_ != null) {
+          x509Details_ =
+            com.google.cloud.iot.v1.X509CertificateDetails.newBuilder(x509Details_).mergeFrom(value).buildPartial();
+        } else {
+          x509Details_ = value;
+        }
+        onChanged();
+      } else {
+        x509DetailsBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The certificate details. Used only for X.509 certificates.
+     * 

+     *
+     * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+     */
+    public Builder clearX509Details() {
+      if (x509DetailsBuilder_ == null) {
+        x509Details_ = null;
+        onChanged();
+      } else {
+        x509Details_ = null;
+        x509DetailsBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * [Output only] The certificate details. Used only for X.509 certificates.
+     * 

+     *
+     * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+     */
+    public com.google.cloud.iot.v1.X509CertificateDetails.Builder getX509DetailsBuilder() {
+      
+      onChanged();
+      return getX509DetailsFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * [Output only] The certificate details. Used only for X.509 certificates.
+     * 

+     *
+     * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+     */
+    public com.google.cloud.iot.v1.X509CertificateDetailsOrBuilder getX509DetailsOrBuilder() {
+      if (x509DetailsBuilder_ != null) {
+        return x509DetailsBuilder_.getMessageOrBuilder();
+      } else {
+        return x509Details_ == null ?
+            com.google.cloud.iot.v1.X509CertificateDetails.getDefaultInstance() : x509Details_;
+      }
+    }
+    /**
+     * 
+     * [Output only] The certificate details. Used only for X.509 certificates.
+     * 

+     *
+     * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.X509CertificateDetails, com.google.cloud.iot.v1.X509CertificateDetails.Builder, com.google.cloud.iot.v1.X509CertificateDetailsOrBuilder> 
+        getX509DetailsFieldBuilder() {
+      if (x509DetailsBuilder_ == null) {
+        x509DetailsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.iot.v1.X509CertificateDetails, com.google.cloud.iot.v1.X509CertificateDetails.Builder, com.google.cloud.iot.v1.X509CertificateDetailsOrBuilder>(
+                getX509Details(),
+                getParentForChildren(),
+                isClean());
+        x509Details_ = null;
+      }
+      return x509DetailsBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.PublicKeyCertificate)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.PublicKeyCertificate)
+  private static final com.google.cloud.iot.v1.PublicKeyCertificate DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.PublicKeyCertificate();
+  }
+
+  public static com.google.cloud.iot.v1.PublicKeyCertificate getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public PublicKeyCertificate parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new PublicKeyCertificate(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.PublicKeyCertificate getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateFormat.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateFormat.java
new file mode 100644
index 000000000000..fd6b786bb182
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateFormat.java
@@ -0,0 +1,129 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * The supported formats for the public key.
+ * 

+ *
+ * Protobuf enum {@code google.cloud.iot.v1.PublicKeyCertificateFormat}
+ */
+public enum PublicKeyCertificateFormat
+    implements com.google.protobuf.ProtocolMessageEnum {
+  /**
+   * 
+   * The format has not been specified. This is an invalid default value and
+   * must not be used.
+   * 

+   *
+   * UNSPECIFIED_PUBLIC_KEY_CERTIFICATE_FORMAT = 0;
+   */
+  UNSPECIFIED_PUBLIC_KEY_CERTIFICATE_FORMAT(0),
+  /**
+   * 
+   * An X.509v3 certificate ([RFC5280](https://www.ietf.org/rfc/rfc5280.txt)),
+   * encoded in base64, and wrapped by `-----BEGIN CERTIFICATE-----` and
+   * `-----END CERTIFICATE-----`.
+   * 

+   *
+   * X509_CERTIFICATE_PEM = 1;
+   */
+  X509_CERTIFICATE_PEM(1),
+  UNRECOGNIZED(-1),
+  ;
+
+  /**
+   * 
+   * The format has not been specified. This is an invalid default value and
+   * must not be used.
+   * 

+   *
+   * UNSPECIFIED_PUBLIC_KEY_CERTIFICATE_FORMAT = 0;
+   */
+  public static final int UNSPECIFIED_PUBLIC_KEY_CERTIFICATE_FORMAT_VALUE = 0;
+  /**
+   * 
+   * An X.509v3 certificate ([RFC5280](https://www.ietf.org/rfc/rfc5280.txt)),
+   * encoded in base64, and wrapped by `-----BEGIN CERTIFICATE-----` and
+   * `-----END CERTIFICATE-----`.
+   * 

+   *
+   * X509_CERTIFICATE_PEM = 1;
+   */
+  public static final int X509_CERTIFICATE_PEM_VALUE = 1;
+
+
+  public final int getNumber() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalArgumentException(
+          "Can't get the number of an unknown enum value.");
+    }
+    return value;
+  }
+
+  /**
+   * @deprecated Use {@link #forNumber(int)} instead.
+   */
+  @java.lang.Deprecated
+  public static PublicKeyCertificateFormat valueOf(int value) {
+    return forNumber(value);
+  }
+
+  public static PublicKeyCertificateFormat forNumber(int value) {
+    switch (value) {
+      case 0: return UNSPECIFIED_PUBLIC_KEY_CERTIFICATE_FORMAT;
+      case 1: return X509_CERTIFICATE_PEM;
+      default: return null;
+    }
+  }
+
+  public static com.google.protobuf.Internal.EnumLiteMap
+      internalGetValueMap() {
+    return internalValueMap;
+  }
+  private static final com.google.protobuf.Internal.EnumLiteMap<
+      PublicKeyCertificateFormat> internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public PublicKeyCertificateFormat findValueByNumber(int number) {
+            return PublicKeyCertificateFormat.forNumber(number);
+          }
+        };
+
+  public final com.google.protobuf.Descriptors.EnumValueDescriptor
+      getValueDescriptor() {
+    return getDescriptor().getValues().get(ordinal());
+  }
+  public final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptorForType() {
+    return getDescriptor();
+  }
+  public static final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.getDescriptor().getEnumTypes().get(2);
+  }
+
+  private static final PublicKeyCertificateFormat[] VALUES = values();
+
+  public static PublicKeyCertificateFormat valueOf(
+      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    if (desc.getType() != getDescriptor()) {
+      throw new java.lang.IllegalArgumentException(
+        "EnumValueDescriptor is not for this type.");
+    }
+    if (desc.getIndex() == -1) {
+      return UNRECOGNIZED;
+    }
+    return VALUES[desc.getIndex()];
+  }
+
+  private final int value;
+
+  private PublicKeyCertificateFormat(int value) {
+    this.value = value;
+  }
+
+  // @@protoc_insertion_point(enum_scope:google.cloud.iot.v1.PublicKeyCertificateFormat)
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateOrBuilder.java
new file mode 100644
index 000000000000..7f8fc7851e44
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateOrBuilder.java
@@ -0,0 +1,69 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface PublicKeyCertificateOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.PublicKeyCertificate)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The certificate format.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCertificateFormat format = 1;
+   */
+  int getFormatValue();
+  /**
+   * 
+   * The certificate format.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCertificateFormat format = 1;
+   */
+  com.google.cloud.iot.v1.PublicKeyCertificateFormat getFormat();
+
+  /**
+   * 
+   * The certificate data.
+   * 

+   *
+   * string certificate = 2;
+   */
+  java.lang.String getCertificate();
+  /**
+   * 
+   * The certificate data.
+   * 

+   *
+   * string certificate = 2;
+   */
+  com.google.protobuf.ByteString
+      getCertificateBytes();
+
+  /**
+   * 
+   * [Output only] The certificate details. Used only for X.509 certificates.
+   * 

+   *
+   * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+   */
+  boolean hasX509Details();
+  /**
+   * 
+   * [Output only] The certificate details. Used only for X.509 certificates.
+   * 

+   *
+   * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+   */
+  com.google.cloud.iot.v1.X509CertificateDetails getX509Details();
+  /**
+   * 
+   * [Output only] The certificate details. Used only for X.509 certificates.
+   * 

+   *
+   * .google.cloud.iot.v1.X509CertificateDetails x509_details = 3;
+   */
+  com.google.cloud.iot.v1.X509CertificateDetailsOrBuilder getX509DetailsOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java
new file mode 100644
index 000000000000..beaafe72aaa8
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java
@@ -0,0 +1,663 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * A public key format and data.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.PublicKeyCredential}
+ */
+public  final class PublicKeyCredential extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.PublicKeyCredential)
+    PublicKeyCredentialOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use PublicKeyCredential.newBuilder() to construct.
+  private PublicKeyCredential(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private PublicKeyCredential() {
+    format_ = 0;
+    key_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private PublicKeyCredential(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            format_ = rawValue;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            key_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCredential_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCredential_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.PublicKeyCredential.class, com.google.cloud.iot.v1.PublicKeyCredential.Builder.class);
+  }
+
+  public static final int FORMAT_FIELD_NUMBER = 1;
+  private int format_;
+  /**
+   * 
+   * The format of the key.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyFormat format = 1;
+   */
+  public int getFormatValue() {
+    return format_;
+  }
+  /**
+   * 
+   * The format of the key.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyFormat format = 1;
+   */
+  public com.google.cloud.iot.v1.PublicKeyFormat getFormat() {
+    com.google.cloud.iot.v1.PublicKeyFormat result = com.google.cloud.iot.v1.PublicKeyFormat.valueOf(format_);
+    return result == null ? com.google.cloud.iot.v1.PublicKeyFormat.UNRECOGNIZED : result;
+  }
+
+  public static final int KEY_FIELD_NUMBER = 2;
+  private volatile java.lang.Object key_;
+  /**
+   * 
+   * The key data.
+   * 

+   *
+   * string key = 2;
+   */
+  public java.lang.String getKey() {
+    java.lang.Object ref = key_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      key_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The key data.
+   * 

+   *
+   * string key = 2;
+   */
+  public com.google.protobuf.ByteString
+      getKeyBytes() {
+    java.lang.Object ref = key_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      key_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (format_ != com.google.cloud.iot.v1.PublicKeyFormat.UNSPECIFIED_PUBLIC_KEY_FORMAT.getNumber()) {
+      output.writeEnum(1, format_);
+    }
+    if (!getKeyBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, key_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (format_ != com.google.cloud.iot.v1.PublicKeyFormat.UNSPECIFIED_PUBLIC_KEY_FORMAT.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(1, format_);
+    }
+    if (!getKeyBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, key_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.PublicKeyCredential)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.PublicKeyCredential other = (com.google.cloud.iot.v1.PublicKeyCredential) obj;
+
+    boolean result = true;
+    result = result && format_ == other.format_;
+    result = result && getKey()
+        .equals(other.getKey());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + FORMAT_FIELD_NUMBER;
+    hash = (53 * hash) + format_;
+    hash = (37 * hash) + KEY_FIELD_NUMBER;
+    hash = (53 * hash) + getKey().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.PublicKeyCredential parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCredential parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCredential parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCredential parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCredential parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCredential parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCredential parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCredential parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCredential parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCredential parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCredential parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.PublicKeyCredential parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.PublicKeyCredential prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * A public key format and data.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.PublicKeyCredential}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.PublicKeyCredential)
+      com.google.cloud.iot.v1.PublicKeyCredentialOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCredential_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCredential_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.PublicKeyCredential.class, com.google.cloud.iot.v1.PublicKeyCredential.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.PublicKeyCredential.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      format_ = 0;
+
+      key_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCredential_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.PublicKeyCredential getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.PublicKeyCredential.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.PublicKeyCredential build() {
+      com.google.cloud.iot.v1.PublicKeyCredential result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.PublicKeyCredential buildPartial() {
+      com.google.cloud.iot.v1.PublicKeyCredential result = new com.google.cloud.iot.v1.PublicKeyCredential(this);
+      result.format_ = format_;
+      result.key_ = key_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.PublicKeyCredential) {
+        return mergeFrom((com.google.cloud.iot.v1.PublicKeyCredential)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.PublicKeyCredential other) {
+      if (other == com.google.cloud.iot.v1.PublicKeyCredential.getDefaultInstance()) return this;
+      if (other.format_ != 0) {
+        setFormatValue(other.getFormatValue());
+      }
+      if (!other.getKey().isEmpty()) {
+        key_ = other.key_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.PublicKeyCredential parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.PublicKeyCredential) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int format_ = 0;
+    /**
+     * 
+     * The format of the key.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyFormat format = 1;
+     */
+    public int getFormatValue() {
+      return format_;
+    }
+    /**
+     * 
+     * The format of the key.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyFormat format = 1;
+     */
+    public Builder setFormatValue(int value) {
+      format_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The format of the key.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyFormat format = 1;
+     */
+    public com.google.cloud.iot.v1.PublicKeyFormat getFormat() {
+      com.google.cloud.iot.v1.PublicKeyFormat result = com.google.cloud.iot.v1.PublicKeyFormat.valueOf(format_);
+      return result == null ? com.google.cloud.iot.v1.PublicKeyFormat.UNRECOGNIZED : result;
+    }
+    /**
+     * 
+     * The format of the key.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyFormat format = 1;
+     */
+    public Builder setFormat(com.google.cloud.iot.v1.PublicKeyFormat value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      format_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The format of the key.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyFormat format = 1;
+     */
+    public Builder clearFormat() {
+      
+      format_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object key_ = "";
+    /**
+     * 
+     * The key data.
+     * 

+     *
+     * string key = 2;
+     */
+    public java.lang.String getKey() {
+      java.lang.Object ref = key_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        key_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The key data.
+     * 

+     *
+     * string key = 2;
+     */
+    public com.google.protobuf.ByteString
+        getKeyBytes() {
+      java.lang.Object ref = key_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        key_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The key data.
+     * 

+     *
+     * string key = 2;
+     */
+    public Builder setKey(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      key_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The key data.
+     * 

+     *
+     * string key = 2;
+     */
+    public Builder clearKey() {
+      
+      key_ = getDefaultInstance().getKey();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The key data.
+     * 

+     *
+     * string key = 2;
+     */
+    public Builder setKeyBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      key_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.PublicKeyCredential)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.PublicKeyCredential)
+  private static final com.google.cloud.iot.v1.PublicKeyCredential DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.PublicKeyCredential();
+  }
+
+  public static com.google.cloud.iot.v1.PublicKeyCredential getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public PublicKeyCredential parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new PublicKeyCredential(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.PublicKeyCredential getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredentialOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredentialOrBuilder.java
new file mode 100644
index 000000000000..46de56aab981
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredentialOrBuilder.java
@@ -0,0 +1,44 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface PublicKeyCredentialOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.PublicKeyCredential)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The format of the key.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyFormat format = 1;
+   */
+  int getFormatValue();
+  /**
+   * 
+   * The format of the key.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyFormat format = 1;
+   */
+  com.google.cloud.iot.v1.PublicKeyFormat getFormat();
+
+  /**
+   * 
+   * The key data.
+   * 

+   *
+   * string key = 2;
+   */
+  java.lang.String getKey();
+  /**
+   * 
+   * The key data.
+   * 

+   *
+   * string key = 2;
+   */
+  com.google.protobuf.ByteString
+      getKeyBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyFormat.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyFormat.java
new file mode 100644
index 000000000000..a5b984244985
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyFormat.java
@@ -0,0 +1,198 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * The supported formats for the public key.
+ * 

+ *
+ * Protobuf enum {@code google.cloud.iot.v1.PublicKeyFormat}
+ */
+public enum PublicKeyFormat
+    implements com.google.protobuf.ProtocolMessageEnum {
+  /**
+   * 
+   * The format has not been specified. This is an invalid default value and
+   * must not be used.
+   * 

+   *
+   * UNSPECIFIED_PUBLIC_KEY_FORMAT = 0;
+   */
+  UNSPECIFIED_PUBLIC_KEY_FORMAT(0),
+  /**
+   * 
+   * An RSA public key encoded in base64, and wrapped by
+   * `-----BEGIN PUBLIC KEY-----` and `-----END PUBLIC KEY-----`. This can be
+   * used to verify `RS256` signatures in JWT tokens ([RFC7518](
+   * https://www.ietf.org/rfc/rfc7518.txt)).
+   * 

+   *
+   * RSA_PEM = 3;
+   */
+  RSA_PEM(3),
+  /**
+   * 
+   * As RSA_PEM, but wrapped in an X.509v3 certificate ([RFC5280](
+   * https://www.ietf.org/rfc/rfc5280.txt)), encoded in base64, and wrapped by
+   * `-----BEGIN CERTIFICATE-----` and `-----END CERTIFICATE-----`.
+   * 

+   *
+   * RSA_X509_PEM = 1;
+   */
+  RSA_X509_PEM(1),
+  /**
+   * 
+   * Public key for the ECDSA algorithm using P-256 and SHA-256, encoded in
+   * base64, and wrapped by `-----BEGIN PUBLIC KEY-----` and `-----END
+   * PUBLIC KEY-----`. This can be used to verify JWT tokens with the `ES256`
+   * algorithm ([RFC7518](https://www.ietf.org/rfc/rfc7518.txt)). This curve is
+   * defined in [OpenSSL](https://www.openssl.org/) as the `prime256v1` curve.
+   * 

+   *
+   * ES256_PEM = 2;
+   */
+  ES256_PEM(2),
+  /**
+   * 
+   * As ES256_PEM, but wrapped in an X.509v3 certificate ([RFC5280](
+   * https://www.ietf.org/rfc/rfc5280.txt)), encoded in base64, and wrapped by
+   * `-----BEGIN CERTIFICATE-----` and `-----END CERTIFICATE-----`.
+   * 

+   *
+   * ES256_X509_PEM = 4;
+   */
+  ES256_X509_PEM(4),
+  UNRECOGNIZED(-1),
+  ;
+
+  /**
+   * 
+   * The format has not been specified. This is an invalid default value and
+   * must not be used.
+   * 

+   *
+   * UNSPECIFIED_PUBLIC_KEY_FORMAT = 0;
+   */
+  public static final int UNSPECIFIED_PUBLIC_KEY_FORMAT_VALUE = 0;
+  /**
+   * 
+   * An RSA public key encoded in base64, and wrapped by
+   * `-----BEGIN PUBLIC KEY-----` and `-----END PUBLIC KEY-----`. This can be
+   * used to verify `RS256` signatures in JWT tokens ([RFC7518](
+   * https://www.ietf.org/rfc/rfc7518.txt)).
+   * 

+   *
+   * RSA_PEM = 3;
+   */
+  public static final int RSA_PEM_VALUE = 3;
+  /**
+   * 
+   * As RSA_PEM, but wrapped in an X.509v3 certificate ([RFC5280](
+   * https://www.ietf.org/rfc/rfc5280.txt)), encoded in base64, and wrapped by
+   * `-----BEGIN CERTIFICATE-----` and `-----END CERTIFICATE-----`.
+   * 

+   *
+   * RSA_X509_PEM = 1;
+   */
+  public static final int RSA_X509_PEM_VALUE = 1;
+  /**
+   * 
+   * Public key for the ECDSA algorithm using P-256 and SHA-256, encoded in
+   * base64, and wrapped by `-----BEGIN PUBLIC KEY-----` and `-----END
+   * PUBLIC KEY-----`. This can be used to verify JWT tokens with the `ES256`
+   * algorithm ([RFC7518](https://www.ietf.org/rfc/rfc7518.txt)). This curve is
+   * defined in [OpenSSL](https://www.openssl.org/) as the `prime256v1` curve.
+   * 

+   *
+   * ES256_PEM = 2;
+   */
+  public static final int ES256_PEM_VALUE = 2;
+  /**
+   * 
+   * As ES256_PEM, but wrapped in an X.509v3 certificate ([RFC5280](
+   * https://www.ietf.org/rfc/rfc5280.txt)), encoded in base64, and wrapped by
+   * `-----BEGIN CERTIFICATE-----` and `-----END CERTIFICATE-----`.
+   * 

+   *
+   * ES256_X509_PEM = 4;
+   */
+  public static final int ES256_X509_PEM_VALUE = 4;
+
+
+  public final int getNumber() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalArgumentException(
+          "Can't get the number of an unknown enum value.");
+    }
+    return value;
+  }
+
+  /**
+   * @deprecated Use {@link #forNumber(int)} instead.
+   */
+  @java.lang.Deprecated
+  public static PublicKeyFormat valueOf(int value) {
+    return forNumber(value);
+  }
+
+  public static PublicKeyFormat forNumber(int value) {
+    switch (value) {
+      case 0: return UNSPECIFIED_PUBLIC_KEY_FORMAT;
+      case 3: return RSA_PEM;
+      case 1: return RSA_X509_PEM;
+      case 2: return ES256_PEM;
+      case 4: return ES256_X509_PEM;
+      default: return null;
+    }
+  }
+
+  public static com.google.protobuf.Internal.EnumLiteMap
+      internalGetValueMap() {
+    return internalValueMap;
+  }
+  private static final com.google.protobuf.Internal.EnumLiteMap<
+      PublicKeyFormat> internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public PublicKeyFormat findValueByNumber(int number) {
+            return PublicKeyFormat.forNumber(number);
+          }
+        };
+
+  public final com.google.protobuf.Descriptors.EnumValueDescriptor
+      getValueDescriptor() {
+    return getDescriptor().getValues().get(ordinal());
+  }
+  public final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptorForType() {
+    return getDescriptor();
+  }
+  public static final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.getDescriptor().getEnumTypes().get(3);
+  }
+
+  private static final PublicKeyFormat[] VALUES = values();
+
+  public static PublicKeyFormat valueOf(
+      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    if (desc.getType() != getDescriptor()) {
+      throw new java.lang.IllegalArgumentException(
+        "EnumValueDescriptor is not for this type.");
+    }
+    if (desc.getIndex() == -1) {
+      return UNRECOGNIZED;
+    }
+    return VALUES[desc.getIndex()];
+  }
+
+  private final int value;
+
+  private PublicKeyFormat(int value) {
+    this.value = value;
+  }
+
+  // @@protoc_insertion_point(enum_scope:google.cloud.iot.v1.PublicKeyFormat)
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java
new file mode 100644
index 000000000000..b75a03536a27
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java
@@ -0,0 +1,717 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * A server-stored registry credential used to validate device credentials.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.RegistryCredential}
+ */
+public  final class RegistryCredential extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.RegistryCredential)
+    RegistryCredentialOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use RegistryCredential.newBuilder() to construct.
+  private RegistryCredential(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private RegistryCredential() {
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private RegistryCredential(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            com.google.cloud.iot.v1.PublicKeyCertificate.Builder subBuilder = null;
+            if (credentialCase_ == 1) {
+              subBuilder = ((com.google.cloud.iot.v1.PublicKeyCertificate) credential_).toBuilder();
+            }
+            credential_ =
+                input.readMessage(com.google.cloud.iot.v1.PublicKeyCertificate.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.cloud.iot.v1.PublicKeyCertificate) credential_);
+              credential_ = subBuilder.buildPartial();
+            }
+            credentialCase_ = 1;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_RegistryCredential_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_RegistryCredential_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.RegistryCredential.class, com.google.cloud.iot.v1.RegistryCredential.Builder.class);
+  }
+
+  private int credentialCase_ = 0;
+  private java.lang.Object credential_;
+  public enum CredentialCase
+      implements com.google.protobuf.Internal.EnumLite {
+    PUBLIC_KEY_CERTIFICATE(1),
+    CREDENTIAL_NOT_SET(0);
+    private final int value;
+    private CredentialCase(int value) {
+      this.value = value;
+    }
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static CredentialCase valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static CredentialCase forNumber(int value) {
+      switch (value) {
+        case 1: return PUBLIC_KEY_CERTIFICATE;
+        case 0: return CREDENTIAL_NOT_SET;
+        default: return null;
+      }
+    }
+    public int getNumber() {
+      return this.value;
+    }
+  };
+
+  public CredentialCase
+  getCredentialCase() {
+    return CredentialCase.forNumber(
+        credentialCase_);
+  }
+
+  public static final int PUBLIC_KEY_CERTIFICATE_FIELD_NUMBER = 1;
+  /**
+   * 
+   * A public key certificate used to verify the device credentials.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+   */
+  public boolean hasPublicKeyCertificate() {
+    return credentialCase_ == 1;
+  }
+  /**
+   * 
+   * A public key certificate used to verify the device credentials.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+   */
+  public com.google.cloud.iot.v1.PublicKeyCertificate getPublicKeyCertificate() {
+    if (credentialCase_ == 1) {
+       return (com.google.cloud.iot.v1.PublicKeyCertificate) credential_;
+    }
+    return com.google.cloud.iot.v1.PublicKeyCertificate.getDefaultInstance();
+  }
+  /**
+   * 
+   * A public key certificate used to verify the device credentials.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+   */
+  public com.google.cloud.iot.v1.PublicKeyCertificateOrBuilder getPublicKeyCertificateOrBuilder() {
+    if (credentialCase_ == 1) {
+       return (com.google.cloud.iot.v1.PublicKeyCertificate) credential_;
+    }
+    return com.google.cloud.iot.v1.PublicKeyCertificate.getDefaultInstance();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (credentialCase_ == 1) {
+      output.writeMessage(1, (com.google.cloud.iot.v1.PublicKeyCertificate) credential_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (credentialCase_ == 1) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, (com.google.cloud.iot.v1.PublicKeyCertificate) credential_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.RegistryCredential)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.RegistryCredential other = (com.google.cloud.iot.v1.RegistryCredential) obj;
+
+    boolean result = true;
+    result = result && getCredentialCase().equals(
+        other.getCredentialCase());
+    if (!result) return false;
+    switch (credentialCase_) {
+      case 1:
+        result = result && getPublicKeyCertificate()
+            .equals(other.getPublicKeyCertificate());
+        break;
+      case 0:
+      default:
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    switch (credentialCase_) {
+      case 1:
+        hash = (37 * hash) + PUBLIC_KEY_CERTIFICATE_FIELD_NUMBER;
+        hash = (53 * hash) + getPublicKeyCertificate().hashCode();
+        break;
+      case 0:
+      default:
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.RegistryCredential parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.RegistryCredential parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.RegistryCredential parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.RegistryCredential parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.RegistryCredential parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.RegistryCredential parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.RegistryCredential parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.RegistryCredential parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.RegistryCredential parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.RegistryCredential parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.RegistryCredential parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.RegistryCredential parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.RegistryCredential prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * A server-stored registry credential used to validate device credentials.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.RegistryCredential}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.RegistryCredential)
+      com.google.cloud.iot.v1.RegistryCredentialOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_RegistryCredential_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_RegistryCredential_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.RegistryCredential.class, com.google.cloud.iot.v1.RegistryCredential.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.RegistryCredential.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      credentialCase_ = 0;
+      credential_ = null;
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_RegistryCredential_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.RegistryCredential getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.RegistryCredential.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.RegistryCredential build() {
+      com.google.cloud.iot.v1.RegistryCredential result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.RegistryCredential buildPartial() {
+      com.google.cloud.iot.v1.RegistryCredential result = new com.google.cloud.iot.v1.RegistryCredential(this);
+      if (credentialCase_ == 1) {
+        if (publicKeyCertificateBuilder_ == null) {
+          result.credential_ = credential_;
+        } else {
+          result.credential_ = publicKeyCertificateBuilder_.build();
+        }
+      }
+      result.credentialCase_ = credentialCase_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.RegistryCredential) {
+        return mergeFrom((com.google.cloud.iot.v1.RegistryCredential)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.RegistryCredential other) {
+      if (other == com.google.cloud.iot.v1.RegistryCredential.getDefaultInstance()) return this;
+      switch (other.getCredentialCase()) {
+        case PUBLIC_KEY_CERTIFICATE: {
+          mergePublicKeyCertificate(other.getPublicKeyCertificate());
+          break;
+        }
+        case CREDENTIAL_NOT_SET: {
+          break;
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.RegistryCredential parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.RegistryCredential) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int credentialCase_ = 0;
+    private java.lang.Object credential_;
+    public CredentialCase
+        getCredentialCase() {
+      return CredentialCase.forNumber(
+          credentialCase_);
+    }
+
+    public Builder clearCredential() {
+      credentialCase_ = 0;
+      credential_ = null;
+      onChanged();
+      return this;
+    }
+
+
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.PublicKeyCertificate, com.google.cloud.iot.v1.PublicKeyCertificate.Builder, com.google.cloud.iot.v1.PublicKeyCertificateOrBuilder> publicKeyCertificateBuilder_;
+    /**
+     * 
+     * A public key certificate used to verify the device credentials.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+     */
+    public boolean hasPublicKeyCertificate() {
+      return credentialCase_ == 1;
+    }
+    /**
+     * 
+     * A public key certificate used to verify the device credentials.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+     */
+    public com.google.cloud.iot.v1.PublicKeyCertificate getPublicKeyCertificate() {
+      if (publicKeyCertificateBuilder_ == null) {
+        if (credentialCase_ == 1) {
+          return (com.google.cloud.iot.v1.PublicKeyCertificate) credential_;
+        }
+        return com.google.cloud.iot.v1.PublicKeyCertificate.getDefaultInstance();
+      } else {
+        if (credentialCase_ == 1) {
+          return publicKeyCertificateBuilder_.getMessage();
+        }
+        return com.google.cloud.iot.v1.PublicKeyCertificate.getDefaultInstance();
+      }
+    }
+    /**
+     * 
+     * A public key certificate used to verify the device credentials.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+     */
+    public Builder setPublicKeyCertificate(com.google.cloud.iot.v1.PublicKeyCertificate value) {
+      if (publicKeyCertificateBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        credential_ = value;
+        onChanged();
+      } else {
+        publicKeyCertificateBuilder_.setMessage(value);
+      }
+      credentialCase_ = 1;
+      return this;
+    }
+    /**
+     * 
+     * A public key certificate used to verify the device credentials.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+     */
+    public Builder setPublicKeyCertificate(
+        com.google.cloud.iot.v1.PublicKeyCertificate.Builder builderForValue) {
+      if (publicKeyCertificateBuilder_ == null) {
+        credential_ = builderForValue.build();
+        onChanged();
+      } else {
+        publicKeyCertificateBuilder_.setMessage(builderForValue.build());
+      }
+      credentialCase_ = 1;
+      return this;
+    }
+    /**
+     * 
+     * A public key certificate used to verify the device credentials.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+     */
+    public Builder mergePublicKeyCertificate(com.google.cloud.iot.v1.PublicKeyCertificate value) {
+      if (publicKeyCertificateBuilder_ == null) {
+        if (credentialCase_ == 1 &&
+            credential_ != com.google.cloud.iot.v1.PublicKeyCertificate.getDefaultInstance()) {
+          credential_ = com.google.cloud.iot.v1.PublicKeyCertificate.newBuilder((com.google.cloud.iot.v1.PublicKeyCertificate) credential_)
+              .mergeFrom(value).buildPartial();
+        } else {
+          credential_ = value;
+        }
+        onChanged();
+      } else {
+        if (credentialCase_ == 1) {
+          publicKeyCertificateBuilder_.mergeFrom(value);
+        }
+        publicKeyCertificateBuilder_.setMessage(value);
+      }
+      credentialCase_ = 1;
+      return this;
+    }
+    /**
+     * 
+     * A public key certificate used to verify the device credentials.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+     */
+    public Builder clearPublicKeyCertificate() {
+      if (publicKeyCertificateBuilder_ == null) {
+        if (credentialCase_ == 1) {
+          credentialCase_ = 0;
+          credential_ = null;
+          onChanged();
+        }
+      } else {
+        if (credentialCase_ == 1) {
+          credentialCase_ = 0;
+          credential_ = null;
+        }
+        publicKeyCertificateBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * A public key certificate used to verify the device credentials.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+     */
+    public com.google.cloud.iot.v1.PublicKeyCertificate.Builder getPublicKeyCertificateBuilder() {
+      return getPublicKeyCertificateFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * A public key certificate used to verify the device credentials.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+     */
+    public com.google.cloud.iot.v1.PublicKeyCertificateOrBuilder getPublicKeyCertificateOrBuilder() {
+      if ((credentialCase_ == 1) && (publicKeyCertificateBuilder_ != null)) {
+        return publicKeyCertificateBuilder_.getMessageOrBuilder();
+      } else {
+        if (credentialCase_ == 1) {
+          return (com.google.cloud.iot.v1.PublicKeyCertificate) credential_;
+        }
+        return com.google.cloud.iot.v1.PublicKeyCertificate.getDefaultInstance();
+      }
+    }
+    /**
+     * 
+     * A public key certificate used to verify the device credentials.
+     * 

+     *
+     * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.PublicKeyCertificate, com.google.cloud.iot.v1.PublicKeyCertificate.Builder, com.google.cloud.iot.v1.PublicKeyCertificateOrBuilder> 
+        getPublicKeyCertificateFieldBuilder() {
+      if (publicKeyCertificateBuilder_ == null) {
+        if (!(credentialCase_ == 1)) {
+          credential_ = com.google.cloud.iot.v1.PublicKeyCertificate.getDefaultInstance();
+        }
+        publicKeyCertificateBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.iot.v1.PublicKeyCertificate, com.google.cloud.iot.v1.PublicKeyCertificate.Builder, com.google.cloud.iot.v1.PublicKeyCertificateOrBuilder>(
+                (com.google.cloud.iot.v1.PublicKeyCertificate) credential_,
+                getParentForChildren(),
+                isClean());
+        credential_ = null;
+      }
+      credentialCase_ = 1;
+      onChanged();;
+      return publicKeyCertificateBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.RegistryCredential)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.RegistryCredential)
+  private static final com.google.cloud.iot.v1.RegistryCredential DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.RegistryCredential();
+  }
+
+  public static com.google.cloud.iot.v1.RegistryCredential getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public RegistryCredential parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new RegistryCredential(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.RegistryCredential getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredentialOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredentialOrBuilder.java
new file mode 100644
index 000000000000..d39cb7cbdca1
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredentialOrBuilder.java
@@ -0,0 +1,36 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface RegistryCredentialOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.RegistryCredential)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * A public key certificate used to verify the device credentials.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+   */
+  boolean hasPublicKeyCertificate();
+  /**
+   * 
+   * A public key certificate used to verify the device credentials.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+   */
+  com.google.cloud.iot.v1.PublicKeyCertificate getPublicKeyCertificate();
+  /**
+   * 
+   * A public key certificate used to verify the device credentials.
+   * 

+   *
+   * .google.cloud.iot.v1.PublicKeyCertificate public_key_certificate = 1;
+   */
+  com.google.cloud.iot.v1.PublicKeyCertificateOrBuilder getPublicKeyCertificateOrBuilder();
+
+  public com.google.cloud.iot.v1.RegistryCredential.CredentialCase getCredentialCase();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryName.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryName.java
new file mode 100644
index 000000000000..d1f7f394ba38
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryName.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, 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.
+ */
+
+package com.google.cloud.iot.v1;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.api.resourcenames.ResourceNameType;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class RegistryName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/locations/{location}/registries/{registry}");
+
+  private volatile Map fieldValuesMap;
+
+  private final String project;
+  private final String location;
+  private final String registry;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public String getRegistry() {
+    return registry;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private RegistryName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    registry = Preconditions.checkNotNull(builder.getRegistry());
+  }
+
+  public static RegistryName of(String project, String location, String registry) {
+    return newBuilder()
+      .setProject(project)
+      .setLocation(location)
+      .setRegistry(registry)
+      .build();
+  }
+
+  public static String format(String project, String location, String registry) {
+    return newBuilder()
+      .setProject(project)
+      .setLocation(location)
+      .setRegistry(registry)
+      .build()
+      .toString();
+  }
+
+  public static RegistryName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map matchMap =
+        PATH_TEMPLATE.validatedMatch(formattedString, "RegistryName.parse: formattedString not in valid format");
+    return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("registry"));
+  }
+
+  public static List parseList(List formattedStrings) {
+    List list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List toStringList(List values) {
+    List list = new ArrayList(values.size());
+    for (RegistryName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldMapBuilder.put("location", location);
+          fieldMapBuilder.put("registry", registry);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  /**
+   * @deprecated This method is only present to satisfy the ResourceName interface.
+   */
+  @Deprecated
+  public ResourceNameType getType() {
+    throw new UnsupportedOperationException("RegistryName.getType() not supported");
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate("project", project, "location", location, "registry", registry);
+  }
+
+  /** Builder for RegistryName. */
+  public static class Builder {
+
+    private String project;
+    private String location;
+    private String registry;
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public String getRegistry() {
+      return registry;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public Builder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public Builder setRegistry(String registry) {
+      this.registry = registry;
+      return this;
+    }
+
+    private Builder() {
+    }
+
+    private Builder(RegistryName registryName) {
+      project = registryName.project;
+      location = registryName.location;
+      registry = registryName.registry;
+    }
+
+    public RegistryName build() {
+      return new RegistryName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof RegistryName) {
+      RegistryName that = (RegistryName) o;
+      return (this.project.equals(that.project))
+          && (this.location.equals(that.location))
+          && (this.registry.equals(that.registry));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    h *= 1000003;
+    h ^= location.hashCode();
+    h *= 1000003;
+    h ^= registry.hashCode();
+    return h;
+  }
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java
new file mode 100644
index 000000000000..97b5949d3561
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java
@@ -0,0 +1,278 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public final class ResourcesProto {
+  private ResourcesProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_Device_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_Device_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_Device_MetadataEntry_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_Device_MetadataEntry_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_DeviceRegistry_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_DeviceRegistry_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_MqttConfig_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_MqttConfig_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_HttpConfig_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_HttpConfig_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_EventNotificationConfig_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_EventNotificationConfig_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_StateNotificationConfig_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_StateNotificationConfig_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_RegistryCredential_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_RegistryCredential_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_X509CertificateDetails_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_X509CertificateDetails_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_PublicKeyCertificate_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_PublicKeyCertificate_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_DeviceCredential_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_DeviceCredential_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_PublicKeyCredential_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_PublicKeyCredential_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_DeviceConfig_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_DeviceConfig_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_iot_v1_DeviceState_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_iot_v1_DeviceState_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n#google/cloud/iot/v1/resources.proto\022\023g" +
+      "oogle.cloud.iot.v1\032\034google/api/annotatio" +
+      "ns.proto\032\037google/protobuf/timestamp.prot" +
+      "o\032\027google/rpc/status.proto\"\315\005\n\006Device\022\n\n" +
+      "\002id\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\016\n\006num_id\030\003 \001(\004\022" +
+      ":\n\013credentials\030\014 \003(\0132%.google.cloud.iot." +
+      "v1.DeviceCredential\0227\n\023last_heartbeat_ti" +
+      "me\030\007 \001(\0132\032.google.protobuf.Timestamp\0223\n\017" +
+      "last_event_time\030\010 \001(\0132\032.google.protobuf." +
+      "Timestamp\0223\n\017last_state_time\030\024 \001(\0132\032.goo" +
+      "gle.protobuf.Timestamp\0228\n\024last_config_ac" +
+      "k_time\030\016 \001(\0132\032.google.protobuf.Timestamp" +
+      "\0229\n\025last_config_send_time\030\022 \001(\0132\032.google" +
+      ".protobuf.Timestamp\022\017\n\007blocked\030\023 \001(\010\0223\n\017" +
+      "last_error_time\030\n \001(\0132\032.google.protobuf." +
+      "Timestamp\022-\n\021last_error_status\030\013 \001(\0132\022.g" +
+      "oogle.rpc.Status\0221\n\006config\030\r \001(\0132!.googl" +
+      "e.cloud.iot.v1.DeviceConfig\022/\n\005state\030\020 \001" +
+      "(\0132 .google.cloud.iot.v1.DeviceState\022;\n\010" +
+      "metadata\030\021 \003(\0132).google.cloud.iot.v1.Dev" +
+      "ice.MetadataEntry\032/\n\rMetadataEntry\022\013\n\003ke" +
+      "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\367\002\n\016DeviceReg" +
+      "istry\022\n\n\002id\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022P\n\032event" +
+      "_notification_configs\030\n \003(\0132,.google.clo" +
+      "ud.iot.v1.EventNotificationConfig\022O\n\031sta" +
+      "te_notification_config\030\007 \001(\0132,.google.cl" +
+      "oud.iot.v1.StateNotificationConfig\0224\n\013mq" +
+      "tt_config\030\004 \001(\0132\037.google.cloud.iot.v1.Mq" +
+      "ttConfig\0224\n\013http_config\030\t \001(\0132\037.google.c" +
+      "loud.iot.v1.HttpConfig\022<\n\013credentials\030\010 " +
+      "\003(\0132\'.google.cloud.iot.v1.RegistryCreden" +
+      "tial\"H\n\nMqttConfig\022:\n\022mqtt_enabled_state" +
+      "\030\001 \001(\0162\036.google.cloud.iot.v1.MqttState\"H" +
+      "\n\nHttpConfig\022:\n\022http_enabled_state\030\001 \001(\016" +
+      "2\036.google.cloud.iot.v1.HttpState\"O\n\027Even" +
+      "tNotificationConfig\022\031\n\021subfolder_matches" +
+      "\030\002 \001(\t\022\031\n\021pubsub_topic_name\030\001 \001(\t\"4\n\027Sta" +
+      "teNotificationConfig\022\031\n\021pubsub_topic_nam" +
+      "e\030\001 \001(\t\"o\n\022RegistryCredential\022K\n\026public_" +
+      "key_certificate\030\001 \001(\0132).google.cloud.iot" +
+      ".v1.PublicKeyCertificateH\000B\014\n\ncredential" +
+      "\"\320\001\n\026X509CertificateDetails\022\016\n\006issuer\030\001 " +
+      "\001(\t\022\017\n\007subject\030\002 \001(\t\022.\n\nstart_time\030\003 \001(\013" +
+      "2\032.google.protobuf.Timestamp\022/\n\013expiry_t" +
+      "ime\030\004 \001(\0132\032.google.protobuf.Timestamp\022\033\n" +
+      "\023signature_algorithm\030\005 \001(\t\022\027\n\017public_key" +
+      "_type\030\006 \001(\t\"\257\001\n\024PublicKeyCertificate\022?\n\006" +
+      "format\030\001 \001(\0162/.google.cloud.iot.v1.Publi" +
+      "cKeyCertificateFormat\022\023\n\013certificate\030\002 \001" +
+      "(\t\022A\n\014x509_details\030\003 \001(\0132+.google.cloud." +
+      "iot.v1.X509CertificateDetails\"\225\001\n\020Device" +
+      "Credential\022>\n\npublic_key\030\002 \001(\0132(.google." +
+      "cloud.iot.v1.PublicKeyCredentialH\000\0223\n\017ex" +
+      "piration_time\030\006 \001(\0132\032.google.protobuf.Ti" +
+      "mestampB\014\n\ncredential\"X\n\023PublicKeyCreden" +
+      "tial\0224\n\006format\030\001 \001(\0162$.google.cloud.iot." +
+      "v1.PublicKeyFormat\022\013\n\003key\030\002 \001(\t\"\240\001\n\014Devi" +
+      "ceConfig\022\017\n\007version\030\001 \001(\003\0225\n\021cloud_updat" +
+      "e_time\030\002 \001(\0132\032.google.protobuf.Timestamp" +
+      "\0223\n\017device_ack_time\030\003 \001(\0132\032.google.proto" +
+      "buf.Timestamp\022\023\n\013binary_data\030\004 \001(\014\"S\n\013De" +
+      "viceState\022/\n\013update_time\030\001 \001(\0132\032.google." +
+      "protobuf.Timestamp\022\023\n\013binary_data\030\002 \001(\014*" +
+      "L\n\tMqttState\022\032\n\026MQTT_STATE_UNSPECIFIED\020\000" +
+      "\022\020\n\014MQTT_ENABLED\020\001\022\021\n\rMQTT_DISABLED\020\002*L\n" +
+      "\tHttpState\022\032\n\026HTTP_STATE_UNSPECIFIED\020\000\022\020" +
+      "\n\014HTTP_ENABLED\020\001\022\021\n\rHTTP_DISABLED\020\002*e\n\032P" +
+      "ublicKeyCertificateFormat\022-\n)UNSPECIFIED" +
+      "_PUBLIC_KEY_CERTIFICATE_FORMAT\020\000\022\030\n\024X509" +
+      "_CERTIFICATE_PEM\020\001*v\n\017PublicKeyFormat\022!\n" +
+      "\035UNSPECIFIED_PUBLIC_KEY_FORMAT\020\000\022\013\n\007RSA_" +
+      "PEM\020\003\022\020\n\014RSA_X509_PEM\020\001\022\r\n\tES256_PEM\020\002\022\022" +
+      "\n\016ES256_X509_PEM\020\004Bf\n\027com.google.cloud.i" +
+      "ot.v1B\016ResourcesProtoP\001Z6google.golang.o" +
+      "rg/genproto/googleapis/cloud/iot/v1;iot\370" +
+      "\001\001b\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.api.AnnotationsProto.getDescriptor(),
+          com.google.protobuf.TimestampProto.getDescriptor(),
+          com.google.rpc.StatusProto.getDescriptor(),
+        }, assigner);
+    internal_static_google_cloud_iot_v1_Device_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_cloud_iot_v1_Device_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_Device_descriptor,
+        new java.lang.String[] { "Id", "Name", "NumId", "Credentials", "LastHeartbeatTime", "LastEventTime", "LastStateTime", "LastConfigAckTime", "LastConfigSendTime", "Blocked", "LastErrorTime", "LastErrorStatus", "Config", "State", "Metadata", });
+    internal_static_google_cloud_iot_v1_Device_MetadataEntry_descriptor =
+      internal_static_google_cloud_iot_v1_Device_descriptor.getNestedTypes().get(0);
+    internal_static_google_cloud_iot_v1_Device_MetadataEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_Device_MetadataEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_google_cloud_iot_v1_DeviceRegistry_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_google_cloud_iot_v1_DeviceRegistry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_DeviceRegistry_descriptor,
+        new java.lang.String[] { "Id", "Name", "EventNotificationConfigs", "StateNotificationConfig", "MqttConfig", "HttpConfig", "Credentials", });
+    internal_static_google_cloud_iot_v1_MqttConfig_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_google_cloud_iot_v1_MqttConfig_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_MqttConfig_descriptor,
+        new java.lang.String[] { "MqttEnabledState", });
+    internal_static_google_cloud_iot_v1_HttpConfig_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_google_cloud_iot_v1_HttpConfig_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_HttpConfig_descriptor,
+        new java.lang.String[] { "HttpEnabledState", });
+    internal_static_google_cloud_iot_v1_EventNotificationConfig_descriptor =
+      getDescriptor().getMessageTypes().get(4);
+    internal_static_google_cloud_iot_v1_EventNotificationConfig_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_EventNotificationConfig_descriptor,
+        new java.lang.String[] { "SubfolderMatches", "PubsubTopicName", });
+    internal_static_google_cloud_iot_v1_StateNotificationConfig_descriptor =
+      getDescriptor().getMessageTypes().get(5);
+    internal_static_google_cloud_iot_v1_StateNotificationConfig_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_StateNotificationConfig_descriptor,
+        new java.lang.String[] { "PubsubTopicName", });
+    internal_static_google_cloud_iot_v1_RegistryCredential_descriptor =
+      getDescriptor().getMessageTypes().get(6);
+    internal_static_google_cloud_iot_v1_RegistryCredential_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_RegistryCredential_descriptor,
+        new java.lang.String[] { "PublicKeyCertificate", "Credential", });
+    internal_static_google_cloud_iot_v1_X509CertificateDetails_descriptor =
+      getDescriptor().getMessageTypes().get(7);
+    internal_static_google_cloud_iot_v1_X509CertificateDetails_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_X509CertificateDetails_descriptor,
+        new java.lang.String[] { "Issuer", "Subject", "StartTime", "ExpiryTime", "SignatureAlgorithm", "PublicKeyType", });
+    internal_static_google_cloud_iot_v1_PublicKeyCertificate_descriptor =
+      getDescriptor().getMessageTypes().get(8);
+    internal_static_google_cloud_iot_v1_PublicKeyCertificate_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_PublicKeyCertificate_descriptor,
+        new java.lang.String[] { "Format", "Certificate", "X509Details", });
+    internal_static_google_cloud_iot_v1_DeviceCredential_descriptor =
+      getDescriptor().getMessageTypes().get(9);
+    internal_static_google_cloud_iot_v1_DeviceCredential_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_DeviceCredential_descriptor,
+        new java.lang.String[] { "PublicKey", "ExpirationTime", "Credential", });
+    internal_static_google_cloud_iot_v1_PublicKeyCredential_descriptor =
+      getDescriptor().getMessageTypes().get(10);
+    internal_static_google_cloud_iot_v1_PublicKeyCredential_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_PublicKeyCredential_descriptor,
+        new java.lang.String[] { "Format", "Key", });
+    internal_static_google_cloud_iot_v1_DeviceConfig_descriptor =
+      getDescriptor().getMessageTypes().get(11);
+    internal_static_google_cloud_iot_v1_DeviceConfig_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_DeviceConfig_descriptor,
+        new java.lang.String[] { "Version", "CloudUpdateTime", "DeviceAckTime", "BinaryData", });
+    internal_static_google_cloud_iot_v1_DeviceState_descriptor =
+      getDescriptor().getMessageTypes().get(12);
+    internal_static_google_cloud_iot_v1_DeviceState_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_iot_v1_DeviceState_descriptor,
+        new java.lang.String[] { "UpdateTime", "BinaryData", });
+    com.google.api.AnnotationsProto.getDescriptor();
+    com.google.protobuf.TimestampProto.getDescriptor();
+    com.google.rpc.StatusProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java
new file mode 100644
index 000000000000..848e3573fd73
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java
@@ -0,0 +1,559 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * The configuration for notification of new states received from the device.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.StateNotificationConfig}
+ */
+public  final class StateNotificationConfig extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.StateNotificationConfig)
+    StateNotificationConfigOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use StateNotificationConfig.newBuilder() to construct.
+  private StateNotificationConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private StateNotificationConfig() {
+    pubsubTopicName_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private StateNotificationConfig(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            pubsubTopicName_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_StateNotificationConfig_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_StateNotificationConfig_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.StateNotificationConfig.class, com.google.cloud.iot.v1.StateNotificationConfig.Builder.class);
+  }
+
+  public static final int PUBSUB_TOPIC_NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object pubsubTopicName_;
+  /**
+   * 
+   * A Cloud Pub/Sub topic name. For example,
+   * `projects/myProject/topics/deviceEvents`.
+   * 

+   *
+   * string pubsub_topic_name = 1;
+   */
+  public java.lang.String getPubsubTopicName() {
+    java.lang.Object ref = pubsubTopicName_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      pubsubTopicName_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * A Cloud Pub/Sub topic name. For example,
+   * `projects/myProject/topics/deviceEvents`.
+   * 

+   *
+   * string pubsub_topic_name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getPubsubTopicNameBytes() {
+    java.lang.Object ref = pubsubTopicName_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      pubsubTopicName_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getPubsubTopicNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, pubsubTopicName_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getPubsubTopicNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, pubsubTopicName_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.StateNotificationConfig)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.StateNotificationConfig other = (com.google.cloud.iot.v1.StateNotificationConfig) obj;
+
+    boolean result = true;
+    result = result && getPubsubTopicName()
+        .equals(other.getPubsubTopicName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PUBSUB_TOPIC_NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getPubsubTopicName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.StateNotificationConfig parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.StateNotificationConfig parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.StateNotificationConfig parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.StateNotificationConfig parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.StateNotificationConfig parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.StateNotificationConfig parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.StateNotificationConfig parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.StateNotificationConfig parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.StateNotificationConfig parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.StateNotificationConfig parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.StateNotificationConfig parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.StateNotificationConfig parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.StateNotificationConfig prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * The configuration for notification of new states received from the device.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.StateNotificationConfig}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.StateNotificationConfig)
+      com.google.cloud.iot.v1.StateNotificationConfigOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_StateNotificationConfig_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_StateNotificationConfig_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.StateNotificationConfig.class, com.google.cloud.iot.v1.StateNotificationConfig.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.StateNotificationConfig.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      pubsubTopicName_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_StateNotificationConfig_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.StateNotificationConfig getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.StateNotificationConfig.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.StateNotificationConfig build() {
+      com.google.cloud.iot.v1.StateNotificationConfig result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.StateNotificationConfig buildPartial() {
+      com.google.cloud.iot.v1.StateNotificationConfig result = new com.google.cloud.iot.v1.StateNotificationConfig(this);
+      result.pubsubTopicName_ = pubsubTopicName_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.StateNotificationConfig) {
+        return mergeFrom((com.google.cloud.iot.v1.StateNotificationConfig)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.StateNotificationConfig other) {
+      if (other == com.google.cloud.iot.v1.StateNotificationConfig.getDefaultInstance()) return this;
+      if (!other.getPubsubTopicName().isEmpty()) {
+        pubsubTopicName_ = other.pubsubTopicName_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.StateNotificationConfig parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.StateNotificationConfig) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object pubsubTopicName_ = "";
+    /**
+     * 
+     * A Cloud Pub/Sub topic name. For example,
+     * `projects/myProject/topics/deviceEvents`.
+     * 

+     *
+     * string pubsub_topic_name = 1;
+     */
+    public java.lang.String getPubsubTopicName() {
+      java.lang.Object ref = pubsubTopicName_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        pubsubTopicName_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * A Cloud Pub/Sub topic name. For example,
+     * `projects/myProject/topics/deviceEvents`.
+     * 

+     *
+     * string pubsub_topic_name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getPubsubTopicNameBytes() {
+      java.lang.Object ref = pubsubTopicName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pubsubTopicName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * A Cloud Pub/Sub topic name. For example,
+     * `projects/myProject/topics/deviceEvents`.
+     * 

+     *
+     * string pubsub_topic_name = 1;
+     */
+    public Builder setPubsubTopicName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      pubsubTopicName_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A Cloud Pub/Sub topic name. For example,
+     * `projects/myProject/topics/deviceEvents`.
+     * 

+     *
+     * string pubsub_topic_name = 1;
+     */
+    public Builder clearPubsubTopicName() {
+      
+      pubsubTopicName_ = getDefaultInstance().getPubsubTopicName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A Cloud Pub/Sub topic name. For example,
+     * `projects/myProject/topics/deviceEvents`.
+     * 

+     *
+     * string pubsub_topic_name = 1;
+     */
+    public Builder setPubsubTopicNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      pubsubTopicName_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.StateNotificationConfig)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.StateNotificationConfig)
+  private static final com.google.cloud.iot.v1.StateNotificationConfig DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.StateNotificationConfig();
+  }
+
+  public static com.google.cloud.iot.v1.StateNotificationConfig getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public StateNotificationConfig parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new StateNotificationConfig(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.StateNotificationConfig getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfigOrBuilder.java
new file mode 100644
index 000000000000..7a1bd3fcaac6
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfigOrBuilder.java
@@ -0,0 +1,29 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface StateNotificationConfigOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.StateNotificationConfig)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * A Cloud Pub/Sub topic name. For example,
+   * `projects/myProject/topics/deviceEvents`.
+   * 

+   *
+   * string pubsub_topic_name = 1;
+   */
+  java.lang.String getPubsubTopicName();
+  /**
+   * 
+   * A Cloud Pub/Sub topic name. For example,
+   * `projects/myProject/topics/deviceEvents`.
+   * 

+   *
+   * string pubsub_topic_name = 1;
+   */
+  com.google.protobuf.ByteString
+      getPubsubTopicNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java
new file mode 100644
index 000000000000..1050afa6a4ca
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java
@@ -0,0 +1,927 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `UpdateDeviceRegistry`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.UpdateDeviceRegistryRequest}
+ */
+public  final class UpdateDeviceRegistryRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.UpdateDeviceRegistryRequest)
+    UpdateDeviceRegistryRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use UpdateDeviceRegistryRequest.newBuilder() to construct.
+  private UpdateDeviceRegistryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private UpdateDeviceRegistryRequest() {
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private UpdateDeviceRegistryRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            com.google.cloud.iot.v1.DeviceRegistry.Builder subBuilder = null;
+            if (deviceRegistry_ != null) {
+              subBuilder = deviceRegistry_.toBuilder();
+            }
+            deviceRegistry_ = input.readMessage(com.google.cloud.iot.v1.DeviceRegistry.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(deviceRegistry_);
+              deviceRegistry_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 18: {
+            com.google.protobuf.FieldMask.Builder subBuilder = null;
+            if (updateMask_ != null) {
+              subBuilder = updateMask_.toBuilder();
+            }
+            updateMask_ = input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(updateMask_);
+              updateMask_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.UpdateDeviceRegistryRequest.class, com.google.cloud.iot.v1.UpdateDeviceRegistryRequest.Builder.class);
+  }
+
+  public static final int DEVICE_REGISTRY_FIELD_NUMBER = 1;
+  private com.google.cloud.iot.v1.DeviceRegistry deviceRegistry_;
+  /**
+   * 
+   * The new values for the device registry. The `id` field must be empty, and
+   * the `name` field must indicate the path of the resource. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+   */
+  public boolean hasDeviceRegistry() {
+    return deviceRegistry_ != null;
+  }
+  /**
+   * 
+   * The new values for the device registry. The `id` field must be empty, and
+   * the `name` field must indicate the path of the resource. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+   */
+  public com.google.cloud.iot.v1.DeviceRegistry getDeviceRegistry() {
+    return deviceRegistry_ == null ? com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance() : deviceRegistry_;
+  }
+  /**
+   * 
+   * The new values for the device registry. The `id` field must be empty, and
+   * the `name` field must indicate the path of the resource. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+   */
+  public com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistryOrBuilder() {
+    return getDeviceRegistry();
+  }
+
+  public static final int UPDATE_MASK_FIELD_NUMBER = 2;
+  private com.google.protobuf.FieldMask updateMask_;
+  /**
+   * 
+   * Only updates the `device_registry` fields indicated by this mask.
+   * The field mask must not be empty, and it must not contain fields that
+   * are immutable or only set by the server.
+   * Mutable top-level fields: `event_notification_config`, `http_config`,
+   * `mqtt_config`, and `state_notification_config`.
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 2;
+   */
+  public boolean hasUpdateMask() {
+    return updateMask_ != null;
+  }
+  /**
+   * 
+   * Only updates the `device_registry` fields indicated by this mask.
+   * The field mask must not be empty, and it must not contain fields that
+   * are immutable or only set by the server.
+   * Mutable top-level fields: `event_notification_config`, `http_config`,
+   * `mqtt_config`, and `state_notification_config`.
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 2;
+   */
+  public com.google.protobuf.FieldMask getUpdateMask() {
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+  }
+  /**
+   * 
+   * Only updates the `device_registry` fields indicated by this mask.
+   * The field mask must not be empty, and it must not contain fields that
+   * are immutable or only set by the server.
+   * Mutable top-level fields: `event_notification_config`, `http_config`,
+   * `mqtt_config`, and `state_notification_config`.
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 2;
+   */
+  public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
+    return getUpdateMask();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (deviceRegistry_ != null) {
+      output.writeMessage(1, getDeviceRegistry());
+    }
+    if (updateMask_ != null) {
+      output.writeMessage(2, getUpdateMask());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (deviceRegistry_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getDeviceRegistry());
+    }
+    if (updateMask_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getUpdateMask());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.UpdateDeviceRegistryRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.UpdateDeviceRegistryRequest other = (com.google.cloud.iot.v1.UpdateDeviceRegistryRequest) obj;
+
+    boolean result = true;
+    result = result && (hasDeviceRegistry() == other.hasDeviceRegistry());
+    if (hasDeviceRegistry()) {
+      result = result && getDeviceRegistry()
+          .equals(other.getDeviceRegistry());
+    }
+    result = result && (hasUpdateMask() == other.hasUpdateMask());
+    if (hasUpdateMask()) {
+      result = result && getUpdateMask()
+          .equals(other.getUpdateMask());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasDeviceRegistry()) {
+      hash = (37 * hash) + DEVICE_REGISTRY_FIELD_NUMBER;
+      hash = (53 * hash) + getDeviceRegistry().hashCode();
+    }
+    if (hasUpdateMask()) {
+      hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER;
+      hash = (53 * hash) + getUpdateMask().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.UpdateDeviceRegistryRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `UpdateDeviceRegistry`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.UpdateDeviceRegistryRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.UpdateDeviceRegistryRequest)
+      com.google.cloud.iot.v1.UpdateDeviceRegistryRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.UpdateDeviceRegistryRequest.class, com.google.cloud.iot.v1.UpdateDeviceRegistryRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.UpdateDeviceRegistryRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (deviceRegistryBuilder_ == null) {
+        deviceRegistry_ = null;
+      } else {
+        deviceRegistry_ = null;
+        deviceRegistryBuilder_ = null;
+      }
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+      } else {
+        updateMask_ = null;
+        updateMaskBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.UpdateDeviceRegistryRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.UpdateDeviceRegistryRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.UpdateDeviceRegistryRequest build() {
+      com.google.cloud.iot.v1.UpdateDeviceRegistryRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.UpdateDeviceRegistryRequest buildPartial() {
+      com.google.cloud.iot.v1.UpdateDeviceRegistryRequest result = new com.google.cloud.iot.v1.UpdateDeviceRegistryRequest(this);
+      if (deviceRegistryBuilder_ == null) {
+        result.deviceRegistry_ = deviceRegistry_;
+      } else {
+        result.deviceRegistry_ = deviceRegistryBuilder_.build();
+      }
+      if (updateMaskBuilder_ == null) {
+        result.updateMask_ = updateMask_;
+      } else {
+        result.updateMask_ = updateMaskBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.UpdateDeviceRegistryRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.UpdateDeviceRegistryRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.UpdateDeviceRegistryRequest other) {
+      if (other == com.google.cloud.iot.v1.UpdateDeviceRegistryRequest.getDefaultInstance()) return this;
+      if (other.hasDeviceRegistry()) {
+        mergeDeviceRegistry(other.getDeviceRegistry());
+      }
+      if (other.hasUpdateMask()) {
+        mergeUpdateMask(other.getUpdateMask());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.UpdateDeviceRegistryRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.cloud.iot.v1.DeviceRegistry deviceRegistry_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceRegistry, com.google.cloud.iot.v1.DeviceRegistry.Builder, com.google.cloud.iot.v1.DeviceRegistryOrBuilder> deviceRegistryBuilder_;
+    /**
+     * 
+     * The new values for the device registry. The `id` field must be empty, and
+     * the `name` field must indicate the path of the resource. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+     */
+    public boolean hasDeviceRegistry() {
+      return deviceRegistryBuilder_ != null || deviceRegistry_ != null;
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` field must be empty, and
+     * the `name` field must indicate the path of the resource. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceRegistry getDeviceRegistry() {
+      if (deviceRegistryBuilder_ == null) {
+        return deviceRegistry_ == null ? com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance() : deviceRegistry_;
+      } else {
+        return deviceRegistryBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` field must be empty, and
+     * the `name` field must indicate the path of the resource. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+     */
+    public Builder setDeviceRegistry(com.google.cloud.iot.v1.DeviceRegistry value) {
+      if (deviceRegistryBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        deviceRegistry_ = value;
+        onChanged();
+      } else {
+        deviceRegistryBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` field must be empty, and
+     * the `name` field must indicate the path of the resource. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+     */
+    public Builder setDeviceRegistry(
+        com.google.cloud.iot.v1.DeviceRegistry.Builder builderForValue) {
+      if (deviceRegistryBuilder_ == null) {
+        deviceRegistry_ = builderForValue.build();
+        onChanged();
+      } else {
+        deviceRegistryBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` field must be empty, and
+     * the `name` field must indicate the path of the resource. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+     */
+    public Builder mergeDeviceRegistry(com.google.cloud.iot.v1.DeviceRegistry value) {
+      if (deviceRegistryBuilder_ == null) {
+        if (deviceRegistry_ != null) {
+          deviceRegistry_ =
+            com.google.cloud.iot.v1.DeviceRegistry.newBuilder(deviceRegistry_).mergeFrom(value).buildPartial();
+        } else {
+          deviceRegistry_ = value;
+        }
+        onChanged();
+      } else {
+        deviceRegistryBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` field must be empty, and
+     * the `name` field must indicate the path of the resource. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+     */
+    public Builder clearDeviceRegistry() {
+      if (deviceRegistryBuilder_ == null) {
+        deviceRegistry_ = null;
+        onChanged();
+      } else {
+        deviceRegistry_ = null;
+        deviceRegistryBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` field must be empty, and
+     * the `name` field must indicate the path of the resource. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceRegistry.Builder getDeviceRegistryBuilder() {
+      
+      onChanged();
+      return getDeviceRegistryFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` field must be empty, and
+     * the `name` field must indicate the path of the resource. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+     */
+    public com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistryOrBuilder() {
+      if (deviceRegistryBuilder_ != null) {
+        return deviceRegistryBuilder_.getMessageOrBuilder();
+      } else {
+        return deviceRegistry_ == null ?
+            com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance() : deviceRegistry_;
+      }
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` field must be empty, and
+     * the `name` field must indicate the path of the resource. For example,
+     * `projects/example-project/locations/us-central1/registries/my-registry`.
+     * 

+     *
+     * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.DeviceRegistry, com.google.cloud.iot.v1.DeviceRegistry.Builder, com.google.cloud.iot.v1.DeviceRegistryOrBuilder> 
+        getDeviceRegistryFieldBuilder() {
+      if (deviceRegistryBuilder_ == null) {
+        deviceRegistryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.iot.v1.DeviceRegistry, com.google.cloud.iot.v1.DeviceRegistry.Builder, com.google.cloud.iot.v1.DeviceRegistryOrBuilder>(
+                getDeviceRegistry(),
+                getParentForChildren(),
+                isClean());
+        deviceRegistry_ = null;
+      }
+      return deviceRegistryBuilder_;
+    }
+
+    private com.google.protobuf.FieldMask updateMask_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder> updateMaskBuilder_;
+    /**
+     * 
+     * Only updates the `device_registry` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `event_notification_config`, `http_config`,
+     * `mqtt_config`, and `state_notification_config`.
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 2;
+     */
+    public boolean hasUpdateMask() {
+      return updateMaskBuilder_ != null || updateMask_ != null;
+    }
+    /**
+     * 
+     * Only updates the `device_registry` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `event_notification_config`, `http_config`,
+     * `mqtt_config`, and `state_notification_config`.
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 2;
+     */
+    public com.google.protobuf.FieldMask getUpdateMask() {
+      if (updateMaskBuilder_ == null) {
+        return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+      } else {
+        return updateMaskBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Only updates the `device_registry` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `event_notification_config`, `http_config`,
+     * `mqtt_config`, and `state_notification_config`.
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 2;
+     */
+    public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
+      if (updateMaskBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        updateMask_ = value;
+        onChanged();
+      } else {
+        updateMaskBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Only updates the `device_registry` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `event_notification_config`, `http_config`,
+     * `mqtt_config`, and `state_notification_config`.
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 2;
+     */
+    public Builder setUpdateMask(
+        com.google.protobuf.FieldMask.Builder builderForValue) {
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = builderForValue.build();
+        onChanged();
+      } else {
+        updateMaskBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Only updates the `device_registry` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `event_notification_config`, `http_config`,
+     * `mqtt_config`, and `state_notification_config`.
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 2;
+     */
+    public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
+      if (updateMaskBuilder_ == null) {
+        if (updateMask_ != null) {
+          updateMask_ =
+            com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        } else {
+          updateMask_ = value;
+        }
+        onChanged();
+      } else {
+        updateMaskBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Only updates the `device_registry` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `event_notification_config`, `http_config`,
+     * `mqtt_config`, and `state_notification_config`.
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 2;
+     */
+    public Builder clearUpdateMask() {
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+        onChanged();
+      } else {
+        updateMask_ = null;
+        updateMaskBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Only updates the `device_registry` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `event_notification_config`, `http_config`,
+     * `mqtt_config`, and `state_notification_config`.
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 2;
+     */
+    public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
+      
+      onChanged();
+      return getUpdateMaskFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Only updates the `device_registry` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `event_notification_config`, `http_config`,
+     * `mqtt_config`, and `state_notification_config`.
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 2;
+     */
+    public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
+      if (updateMaskBuilder_ != null) {
+        return updateMaskBuilder_.getMessageOrBuilder();
+      } else {
+        return updateMask_ == null ?
+            com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+      }
+    }
+    /**
+     * 
+     * Only updates the `device_registry` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `event_notification_config`, `http_config`,
+     * `mqtt_config`, and `state_notification_config`.
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder> 
+        getUpdateMaskFieldBuilder() {
+      if (updateMaskBuilder_ == null) {
+        updateMaskBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder>(
+                getUpdateMask(),
+                getParentForChildren(),
+                isClean());
+        updateMask_ = null;
+      }
+      return updateMaskBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.UpdateDeviceRegistryRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.UpdateDeviceRegistryRequest)
+  private static final com.google.cloud.iot.v1.UpdateDeviceRegistryRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.UpdateDeviceRegistryRequest();
+  }
+
+  public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public UpdateDeviceRegistryRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new UpdateDeviceRegistryRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.UpdateDeviceRegistryRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequestOrBuilder.java
new file mode 100644
index 000000000000..38ae18dd2292
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequestOrBuilder.java
@@ -0,0 +1,77 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface UpdateDeviceRegistryRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.UpdateDeviceRegistryRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The new values for the device registry. The `id` field must be empty, and
+   * the `name` field must indicate the path of the resource. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+   */
+  boolean hasDeviceRegistry();
+  /**
+   * 
+   * The new values for the device registry. The `id` field must be empty, and
+   * the `name` field must indicate the path of the resource. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+   */
+  com.google.cloud.iot.v1.DeviceRegistry getDeviceRegistry();
+  /**
+   * 
+   * The new values for the device registry. The `id` field must be empty, and
+   * the `name` field must indicate the path of the resource. For example,
+   * `projects/example-project/locations/us-central1/registries/my-registry`.
+   * 

+   *
+   * .google.cloud.iot.v1.DeviceRegistry device_registry = 1;
+   */
+  com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistryOrBuilder();
+
+  /**
+   * 
+   * Only updates the `device_registry` fields indicated by this mask.
+   * The field mask must not be empty, and it must not contain fields that
+   * are immutable or only set by the server.
+   * Mutable top-level fields: `event_notification_config`, `http_config`,
+   * `mqtt_config`, and `state_notification_config`.
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 2;
+   */
+  boolean hasUpdateMask();
+  /**
+   * 
+   * Only updates the `device_registry` fields indicated by this mask.
+   * The field mask must not be empty, and it must not contain fields that
+   * are immutable or only set by the server.
+   * Mutable top-level fields: `event_notification_config`, `http_config`,
+   * `mqtt_config`, and `state_notification_config`.
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 2;
+   */
+  com.google.protobuf.FieldMask getUpdateMask();
+  /**
+   * 
+   * Only updates the `device_registry` fields indicated by this mask.
+   * The field mask must not be empty, and it must not contain fields that
+   * are immutable or only set by the server.
+   * Mutable top-level fields: `event_notification_config`, `http_config`,
+   * `mqtt_config`, and `state_notification_config`.
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 2;
+   */
+  com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java
new file mode 100644
index 000000000000..39b81a0b0d9a
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java
@@ -0,0 +1,927 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Request for `UpdateDevice`.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.UpdateDeviceRequest}
+ */
+public  final class UpdateDeviceRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.UpdateDeviceRequest)
+    UpdateDeviceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use UpdateDeviceRequest.newBuilder() to construct.
+  private UpdateDeviceRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private UpdateDeviceRequest() {
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private UpdateDeviceRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 18: {
+            com.google.cloud.iot.v1.Device.Builder subBuilder = null;
+            if (device_ != null) {
+              subBuilder = device_.toBuilder();
+            }
+            device_ = input.readMessage(com.google.cloud.iot.v1.Device.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(device_);
+              device_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 26: {
+            com.google.protobuf.FieldMask.Builder subBuilder = null;
+            if (updateMask_ != null) {
+              subBuilder = updateMask_.toBuilder();
+            }
+            updateMask_ = input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(updateMask_);
+              updateMask_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.UpdateDeviceRequest.class, com.google.cloud.iot.v1.UpdateDeviceRequest.Builder.class);
+  }
+
+  public static final int DEVICE_FIELD_NUMBER = 2;
+  private com.google.cloud.iot.v1.Device device_;
+  /**
+   * 
+   * The new values for the device registry. The `id` and `num_id` fields must
+   * be empty, and the field `name` must specify the name path. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * .google.cloud.iot.v1.Device device = 2;
+   */
+  public boolean hasDevice() {
+    return device_ != null;
+  }
+  /**
+   * 
+   * The new values for the device registry. The `id` and `num_id` fields must
+   * be empty, and the field `name` must specify the name path. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * .google.cloud.iot.v1.Device device = 2;
+   */
+  public com.google.cloud.iot.v1.Device getDevice() {
+    return device_ == null ? com.google.cloud.iot.v1.Device.getDefaultInstance() : device_;
+  }
+  /**
+   * 
+   * The new values for the device registry. The `id` and `num_id` fields must
+   * be empty, and the field `name` must specify the name path. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * .google.cloud.iot.v1.Device device = 2;
+   */
+  public com.google.cloud.iot.v1.DeviceOrBuilder getDeviceOrBuilder() {
+    return getDevice();
+  }
+
+  public static final int UPDATE_MASK_FIELD_NUMBER = 3;
+  private com.google.protobuf.FieldMask updateMask_;
+  /**
+   * 
+   * Only updates the `device` fields indicated by this mask.
+   * The field mask must not be empty, and it must not contain fields that
+   * are immutable or only set by the server.
+   * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 3;
+   */
+  public boolean hasUpdateMask() {
+    return updateMask_ != null;
+  }
+  /**
+   * 
+   * Only updates the `device` fields indicated by this mask.
+   * The field mask must not be empty, and it must not contain fields that
+   * are immutable or only set by the server.
+   * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 3;
+   */
+  public com.google.protobuf.FieldMask getUpdateMask() {
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+  }
+  /**
+   * 
+   * Only updates the `device` fields indicated by this mask.
+   * The field mask must not be empty, and it must not contain fields that
+   * are immutable or only set by the server.
+   * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 3;
+   */
+  public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
+    return getUpdateMask();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (device_ != null) {
+      output.writeMessage(2, getDevice());
+    }
+    if (updateMask_ != null) {
+      output.writeMessage(3, getUpdateMask());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (device_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getDevice());
+    }
+    if (updateMask_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, getUpdateMask());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.UpdateDeviceRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.UpdateDeviceRequest other = (com.google.cloud.iot.v1.UpdateDeviceRequest) obj;
+
+    boolean result = true;
+    result = result && (hasDevice() == other.hasDevice());
+    if (hasDevice()) {
+      result = result && getDevice()
+          .equals(other.getDevice());
+    }
+    result = result && (hasUpdateMask() == other.hasUpdateMask());
+    if (hasUpdateMask()) {
+      result = result && getUpdateMask()
+          .equals(other.getUpdateMask());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasDevice()) {
+      hash = (37 * hash) + DEVICE_FIELD_NUMBER;
+      hash = (53 * hash) + getDevice().hashCode();
+    }
+    if (hasUpdateMask()) {
+      hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER;
+      hash = (53 * hash) + getUpdateMask().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.UpdateDeviceRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for `UpdateDevice`.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.UpdateDeviceRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.UpdateDeviceRequest)
+      com.google.cloud.iot.v1.UpdateDeviceRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.UpdateDeviceRequest.class, com.google.cloud.iot.v1.UpdateDeviceRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.UpdateDeviceRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (deviceBuilder_ == null) {
+        device_ = null;
+      } else {
+        device_ = null;
+        deviceBuilder_ = null;
+      }
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+      } else {
+        updateMask_ = null;
+        updateMaskBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRequest_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.UpdateDeviceRequest getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.UpdateDeviceRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.UpdateDeviceRequest build() {
+      com.google.cloud.iot.v1.UpdateDeviceRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.UpdateDeviceRequest buildPartial() {
+      com.google.cloud.iot.v1.UpdateDeviceRequest result = new com.google.cloud.iot.v1.UpdateDeviceRequest(this);
+      if (deviceBuilder_ == null) {
+        result.device_ = device_;
+      } else {
+        result.device_ = deviceBuilder_.build();
+      }
+      if (updateMaskBuilder_ == null) {
+        result.updateMask_ = updateMask_;
+      } else {
+        result.updateMask_ = updateMaskBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.UpdateDeviceRequest) {
+        return mergeFrom((com.google.cloud.iot.v1.UpdateDeviceRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.UpdateDeviceRequest other) {
+      if (other == com.google.cloud.iot.v1.UpdateDeviceRequest.getDefaultInstance()) return this;
+      if (other.hasDevice()) {
+        mergeDevice(other.getDevice());
+      }
+      if (other.hasUpdateMask()) {
+        mergeUpdateMask(other.getUpdateMask());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.UpdateDeviceRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.UpdateDeviceRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.cloud.iot.v1.Device device_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.Device, com.google.cloud.iot.v1.Device.Builder, com.google.cloud.iot.v1.DeviceOrBuilder> deviceBuilder_;
+    /**
+     * 
+     * The new values for the device registry. The `id` and `num_id` fields must
+     * be empty, and the field `name` must specify the name path. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public boolean hasDevice() {
+      return deviceBuilder_ != null || device_ != null;
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` and `num_id` fields must
+     * be empty, and the field `name` must specify the name path. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public com.google.cloud.iot.v1.Device getDevice() {
+      if (deviceBuilder_ == null) {
+        return device_ == null ? com.google.cloud.iot.v1.Device.getDefaultInstance() : device_;
+      } else {
+        return deviceBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` and `num_id` fields must
+     * be empty, and the field `name` must specify the name path. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public Builder setDevice(com.google.cloud.iot.v1.Device value) {
+      if (deviceBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        device_ = value;
+        onChanged();
+      } else {
+        deviceBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` and `num_id` fields must
+     * be empty, and the field `name` must specify the name path. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public Builder setDevice(
+        com.google.cloud.iot.v1.Device.Builder builderForValue) {
+      if (deviceBuilder_ == null) {
+        device_ = builderForValue.build();
+        onChanged();
+      } else {
+        deviceBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` and `num_id` fields must
+     * be empty, and the field `name` must specify the name path. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public Builder mergeDevice(com.google.cloud.iot.v1.Device value) {
+      if (deviceBuilder_ == null) {
+        if (device_ != null) {
+          device_ =
+            com.google.cloud.iot.v1.Device.newBuilder(device_).mergeFrom(value).buildPartial();
+        } else {
+          device_ = value;
+        }
+        onChanged();
+      } else {
+        deviceBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` and `num_id` fields must
+     * be empty, and the field `name` must specify the name path. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public Builder clearDevice() {
+      if (deviceBuilder_ == null) {
+        device_ = null;
+        onChanged();
+      } else {
+        device_ = null;
+        deviceBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` and `num_id` fields must
+     * be empty, and the field `name` must specify the name path. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public com.google.cloud.iot.v1.Device.Builder getDeviceBuilder() {
+      
+      onChanged();
+      return getDeviceFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` and `num_id` fields must
+     * be empty, and the field `name` must specify the name path. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    public com.google.cloud.iot.v1.DeviceOrBuilder getDeviceOrBuilder() {
+      if (deviceBuilder_ != null) {
+        return deviceBuilder_.getMessageOrBuilder();
+      } else {
+        return device_ == null ?
+            com.google.cloud.iot.v1.Device.getDefaultInstance() : device_;
+      }
+    }
+    /**
+     * 
+     * The new values for the device registry. The `id` and `num_id` fields must
+     * be empty, and the field `name` must specify the name path. For example,
+     * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+     * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+     * 

+     *
+     * .google.cloud.iot.v1.Device device = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.iot.v1.Device, com.google.cloud.iot.v1.Device.Builder, com.google.cloud.iot.v1.DeviceOrBuilder> 
+        getDeviceFieldBuilder() {
+      if (deviceBuilder_ == null) {
+        deviceBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.iot.v1.Device, com.google.cloud.iot.v1.Device.Builder, com.google.cloud.iot.v1.DeviceOrBuilder>(
+                getDevice(),
+                getParentForChildren(),
+                isClean());
+        device_ = null;
+      }
+      return deviceBuilder_;
+    }
+
+    private com.google.protobuf.FieldMask updateMask_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder> updateMaskBuilder_;
+    /**
+     * 
+     * Only updates the `device` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public boolean hasUpdateMask() {
+      return updateMaskBuilder_ != null || updateMask_ != null;
+    }
+    /**
+     * 
+     * Only updates the `device` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public com.google.protobuf.FieldMask getUpdateMask() {
+      if (updateMaskBuilder_ == null) {
+        return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+      } else {
+        return updateMaskBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Only updates the `device` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
+      if (updateMaskBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        updateMask_ = value;
+        onChanged();
+      } else {
+        updateMaskBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Only updates the `device` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public Builder setUpdateMask(
+        com.google.protobuf.FieldMask.Builder builderForValue) {
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = builderForValue.build();
+        onChanged();
+      } else {
+        updateMaskBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Only updates the `device` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
+      if (updateMaskBuilder_ == null) {
+        if (updateMask_ != null) {
+          updateMask_ =
+            com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        } else {
+          updateMask_ = value;
+        }
+        onChanged();
+      } else {
+        updateMaskBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Only updates the `device` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public Builder clearUpdateMask() {
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+        onChanged();
+      } else {
+        updateMask_ = null;
+        updateMaskBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Only updates the `device` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
+      
+      onChanged();
+      return getUpdateMaskFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Only updates the `device` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
+      if (updateMaskBuilder_ != null) {
+        return updateMaskBuilder_.getMessageOrBuilder();
+      } else {
+        return updateMask_ == null ?
+            com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+      }
+    }
+    /**
+     * 
+     * Only updates the `device` fields indicated by this mask.
+     * The field mask must not be empty, and it must not contain fields that
+     * are immutable or only set by the server.
+     * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder> 
+        getUpdateMaskFieldBuilder() {
+      if (updateMaskBuilder_ == null) {
+        updateMaskBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder>(
+                getUpdateMask(),
+                getParentForChildren(),
+                isClean());
+        updateMask_ = null;
+      }
+      return updateMaskBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.UpdateDeviceRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.UpdateDeviceRequest)
+  private static final com.google.cloud.iot.v1.UpdateDeviceRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.UpdateDeviceRequest();
+  }
+
+  public static com.google.cloud.iot.v1.UpdateDeviceRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public UpdateDeviceRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new UpdateDeviceRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.UpdateDeviceRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequestOrBuilder.java
new file mode 100644
index 000000000000..037a0bcfd238
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequestOrBuilder.java
@@ -0,0 +1,77 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/device_manager.proto
+
+package com.google.cloud.iot.v1;
+
+public interface UpdateDeviceRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.UpdateDeviceRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The new values for the device registry. The `id` and `num_id` fields must
+   * be empty, and the field `name` must specify the name path. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * .google.cloud.iot.v1.Device device = 2;
+   */
+  boolean hasDevice();
+  /**
+   * 
+   * The new values for the device registry. The `id` and `num_id` fields must
+   * be empty, and the field `name` must specify the name path. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * .google.cloud.iot.v1.Device device = 2;
+   */
+  com.google.cloud.iot.v1.Device getDevice();
+  /**
+   * 
+   * The new values for the device registry. The `id` and `num_id` fields must
+   * be empty, and the field `name` must specify the name path. For example,
+   * `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+   * `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * 

+   *
+   * .google.cloud.iot.v1.Device device = 2;
+   */
+  com.google.cloud.iot.v1.DeviceOrBuilder getDeviceOrBuilder();
+
+  /**
+   * 
+   * Only updates the `device` fields indicated by this mask.
+   * The field mask must not be empty, and it must not contain fields that
+   * are immutable or only set by the server.
+   * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 3;
+   */
+  boolean hasUpdateMask();
+  /**
+   * 
+   * Only updates the `device` fields indicated by this mask.
+   * The field mask must not be empty, and it must not contain fields that
+   * are immutable or only set by the server.
+   * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 3;
+   */
+  com.google.protobuf.FieldMask getUpdateMask();
+  /**
+   * 
+   * Only updates the `device` fields indicated by this mask.
+   * The field mask must not be empty, and it must not contain fields that
+   * are immutable or only set by the server.
+   * Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 3;
+   */
+  com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java
new file mode 100644
index 000000000000..7535ad6cbc93
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java
@@ -0,0 +1,1475 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+/**
+ * 
+ * Details of an X.509 certificate. For informational purposes only.
+ * 

+ *
+ * Protobuf type {@code google.cloud.iot.v1.X509CertificateDetails}
+ */
+public  final class X509CertificateDetails extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.iot.v1.X509CertificateDetails)
+    X509CertificateDetailsOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use X509CertificateDetails.newBuilder() to construct.
+  private X509CertificateDetails(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private X509CertificateDetails() {
+    issuer_ = "";
+    subject_ = "";
+    signatureAlgorithm_ = "";
+    publicKeyType_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private X509CertificateDetails(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            issuer_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            subject_ = s;
+            break;
+          }
+          case 26: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (startTime_ != null) {
+              subBuilder = startTime_.toBuilder();
+            }
+            startTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(startTime_);
+              startTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 34: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (expiryTime_ != null) {
+              subBuilder = expiryTime_.toBuilder();
+            }
+            expiryTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(expiryTime_);
+              expiryTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 42: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            signatureAlgorithm_ = s;
+            break;
+          }
+          case 50: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            publicKeyType_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_X509CertificateDetails_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_X509CertificateDetails_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.iot.v1.X509CertificateDetails.class, com.google.cloud.iot.v1.X509CertificateDetails.Builder.class);
+  }
+
+  public static final int ISSUER_FIELD_NUMBER = 1;
+  private volatile java.lang.Object issuer_;
+  /**
+   * 
+   * The entity that signed the certificate.
+   * 

+   *
+   * string issuer = 1;
+   */
+  public java.lang.String getIssuer() {
+    java.lang.Object ref = issuer_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      issuer_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The entity that signed the certificate.
+   * 

+   *
+   * string issuer = 1;
+   */
+  public com.google.protobuf.ByteString
+      getIssuerBytes() {
+    java.lang.Object ref = issuer_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      issuer_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int SUBJECT_FIELD_NUMBER = 2;
+  private volatile java.lang.Object subject_;
+  /**
+   * 
+   * The entity the certificate and public key belong to.
+   * 

+   *
+   * string subject = 2;
+   */
+  public java.lang.String getSubject() {
+    java.lang.Object ref = subject_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      subject_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The entity the certificate and public key belong to.
+   * 

+   *
+   * string subject = 2;
+   */
+  public com.google.protobuf.ByteString
+      getSubjectBytes() {
+    java.lang.Object ref = subject_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      subject_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int START_TIME_FIELD_NUMBER = 3;
+  private com.google.protobuf.Timestamp startTime_;
+  /**
+   * 
+   * The time the certificate becomes valid.
+   * 

+   *
+   * .google.protobuf.Timestamp start_time = 3;
+   */
+  public boolean hasStartTime() {
+    return startTime_ != null;
+  }
+  /**
+   * 
+   * The time the certificate becomes valid.
+   * 

+   *
+   * .google.protobuf.Timestamp start_time = 3;
+   */
+  public com.google.protobuf.Timestamp getStartTime() {
+    return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
+  }
+  /**
+   * 
+   * The time the certificate becomes valid.
+   * 

+   *
+   * .google.protobuf.Timestamp start_time = 3;
+   */
+  public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
+    return getStartTime();
+  }
+
+  public static final int EXPIRY_TIME_FIELD_NUMBER = 4;
+  private com.google.protobuf.Timestamp expiryTime_;
+  /**
+   * 
+   * The time the certificate becomes invalid.
+   * 

+   *
+   * .google.protobuf.Timestamp expiry_time = 4;
+   */
+  public boolean hasExpiryTime() {
+    return expiryTime_ != null;
+  }
+  /**
+   * 
+   * The time the certificate becomes invalid.
+   * 

+   *
+   * .google.protobuf.Timestamp expiry_time = 4;
+   */
+  public com.google.protobuf.Timestamp getExpiryTime() {
+    return expiryTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expiryTime_;
+  }
+  /**
+   * 
+   * The time the certificate becomes invalid.
+   * 

+   *
+   * .google.protobuf.Timestamp expiry_time = 4;
+   */
+  public com.google.protobuf.TimestampOrBuilder getExpiryTimeOrBuilder() {
+    return getExpiryTime();
+  }
+
+  public static final int SIGNATURE_ALGORITHM_FIELD_NUMBER = 5;
+  private volatile java.lang.Object signatureAlgorithm_;
+  /**
+   * 
+   * The algorithm used to sign the certificate.
+   * 

+   *
+   * string signature_algorithm = 5;
+   */
+  public java.lang.String getSignatureAlgorithm() {
+    java.lang.Object ref = signatureAlgorithm_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      signatureAlgorithm_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The algorithm used to sign the certificate.
+   * 

+   *
+   * string signature_algorithm = 5;
+   */
+  public com.google.protobuf.ByteString
+      getSignatureAlgorithmBytes() {
+    java.lang.Object ref = signatureAlgorithm_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      signatureAlgorithm_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PUBLIC_KEY_TYPE_FIELD_NUMBER = 6;
+  private volatile java.lang.Object publicKeyType_;
+  /**
+   * 
+   * The type of public key in the certificate.
+   * 

+   *
+   * string public_key_type = 6;
+   */
+  public java.lang.String getPublicKeyType() {
+    java.lang.Object ref = publicKeyType_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      publicKeyType_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The type of public key in the certificate.
+   * 

+   *
+   * string public_key_type = 6;
+   */
+  public com.google.protobuf.ByteString
+      getPublicKeyTypeBytes() {
+    java.lang.Object ref = publicKeyType_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      publicKeyType_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getIssuerBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, issuer_);
+    }
+    if (!getSubjectBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, subject_);
+    }
+    if (startTime_ != null) {
+      output.writeMessage(3, getStartTime());
+    }
+    if (expiryTime_ != null) {
+      output.writeMessage(4, getExpiryTime());
+    }
+    if (!getSignatureAlgorithmBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 5, signatureAlgorithm_);
+    }
+    if (!getPublicKeyTypeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 6, publicKeyType_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getIssuerBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, issuer_);
+    }
+    if (!getSubjectBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, subject_);
+    }
+    if (startTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, getStartTime());
+    }
+    if (expiryTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(4, getExpiryTime());
+    }
+    if (!getSignatureAlgorithmBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, signatureAlgorithm_);
+    }
+    if (!getPublicKeyTypeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, publicKeyType_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.iot.v1.X509CertificateDetails)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.iot.v1.X509CertificateDetails other = (com.google.cloud.iot.v1.X509CertificateDetails) obj;
+
+    boolean result = true;
+    result = result && getIssuer()
+        .equals(other.getIssuer());
+    result = result && getSubject()
+        .equals(other.getSubject());
+    result = result && (hasStartTime() == other.hasStartTime());
+    if (hasStartTime()) {
+      result = result && getStartTime()
+          .equals(other.getStartTime());
+    }
+    result = result && (hasExpiryTime() == other.hasExpiryTime());
+    if (hasExpiryTime()) {
+      result = result && getExpiryTime()
+          .equals(other.getExpiryTime());
+    }
+    result = result && getSignatureAlgorithm()
+        .equals(other.getSignatureAlgorithm());
+    result = result && getPublicKeyType()
+        .equals(other.getPublicKeyType());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + ISSUER_FIELD_NUMBER;
+    hash = (53 * hash) + getIssuer().hashCode();
+    hash = (37 * hash) + SUBJECT_FIELD_NUMBER;
+    hash = (53 * hash) + getSubject().hashCode();
+    if (hasStartTime()) {
+      hash = (37 * hash) + START_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getStartTime().hashCode();
+    }
+    if (hasExpiryTime()) {
+      hash = (37 * hash) + EXPIRY_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getExpiryTime().hashCode();
+    }
+    hash = (37 * hash) + SIGNATURE_ALGORITHM_FIELD_NUMBER;
+    hash = (53 * hash) + getSignatureAlgorithm().hashCode();
+    hash = (37 * hash) + PUBLIC_KEY_TYPE_FIELD_NUMBER;
+    hash = (53 * hash) + getPublicKeyType().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.iot.v1.X509CertificateDetails parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.X509CertificateDetails parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.X509CertificateDetails parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.X509CertificateDetails parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.X509CertificateDetails parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.iot.v1.X509CertificateDetails parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.X509CertificateDetails parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.X509CertificateDetails parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.X509CertificateDetails parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.X509CertificateDetails parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.iot.v1.X509CertificateDetails parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.iot.v1.X509CertificateDetails parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.iot.v1.X509CertificateDetails prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Details of an X.509 certificate. For informational purposes only.
+   * 

+   *
+   * Protobuf type {@code google.cloud.iot.v1.X509CertificateDetails}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.iot.v1.X509CertificateDetails)
+      com.google.cloud.iot.v1.X509CertificateDetailsOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_X509CertificateDetails_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_X509CertificateDetails_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.iot.v1.X509CertificateDetails.class, com.google.cloud.iot.v1.X509CertificateDetails.Builder.class);
+    }
+
+    // Construct using com.google.cloud.iot.v1.X509CertificateDetails.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      issuer_ = "";
+
+      subject_ = "";
+
+      if (startTimeBuilder_ == null) {
+        startTime_ = null;
+      } else {
+        startTime_ = null;
+        startTimeBuilder_ = null;
+      }
+      if (expiryTimeBuilder_ == null) {
+        expiryTime_ = null;
+      } else {
+        expiryTime_ = null;
+        expiryTimeBuilder_ = null;
+      }
+      signatureAlgorithm_ = "";
+
+      publicKeyType_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_X509CertificateDetails_descriptor;
+    }
+
+    public com.google.cloud.iot.v1.X509CertificateDetails getDefaultInstanceForType() {
+      return com.google.cloud.iot.v1.X509CertificateDetails.getDefaultInstance();
+    }
+
+    public com.google.cloud.iot.v1.X509CertificateDetails build() {
+      com.google.cloud.iot.v1.X509CertificateDetails result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.iot.v1.X509CertificateDetails buildPartial() {
+      com.google.cloud.iot.v1.X509CertificateDetails result = new com.google.cloud.iot.v1.X509CertificateDetails(this);
+      result.issuer_ = issuer_;
+      result.subject_ = subject_;
+      if (startTimeBuilder_ == null) {
+        result.startTime_ = startTime_;
+      } else {
+        result.startTime_ = startTimeBuilder_.build();
+      }
+      if (expiryTimeBuilder_ == null) {
+        result.expiryTime_ = expiryTime_;
+      } else {
+        result.expiryTime_ = expiryTimeBuilder_.build();
+      }
+      result.signatureAlgorithm_ = signatureAlgorithm_;
+      result.publicKeyType_ = publicKeyType_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.iot.v1.X509CertificateDetails) {
+        return mergeFrom((com.google.cloud.iot.v1.X509CertificateDetails)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.iot.v1.X509CertificateDetails other) {
+      if (other == com.google.cloud.iot.v1.X509CertificateDetails.getDefaultInstance()) return this;
+      if (!other.getIssuer().isEmpty()) {
+        issuer_ = other.issuer_;
+        onChanged();
+      }
+      if (!other.getSubject().isEmpty()) {
+        subject_ = other.subject_;
+        onChanged();
+      }
+      if (other.hasStartTime()) {
+        mergeStartTime(other.getStartTime());
+      }
+      if (other.hasExpiryTime()) {
+        mergeExpiryTime(other.getExpiryTime());
+      }
+      if (!other.getSignatureAlgorithm().isEmpty()) {
+        signatureAlgorithm_ = other.signatureAlgorithm_;
+        onChanged();
+      }
+      if (!other.getPublicKeyType().isEmpty()) {
+        publicKeyType_ = other.publicKeyType_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.iot.v1.X509CertificateDetails parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.iot.v1.X509CertificateDetails) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object issuer_ = "";
+    /**
+     * 
+     * The entity that signed the certificate.
+     * 

+     *
+     * string issuer = 1;
+     */
+    public java.lang.String getIssuer() {
+      java.lang.Object ref = issuer_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        issuer_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The entity that signed the certificate.
+     * 

+     *
+     * string issuer = 1;
+     */
+    public com.google.protobuf.ByteString
+        getIssuerBytes() {
+      java.lang.Object ref = issuer_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        issuer_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The entity that signed the certificate.
+     * 

+     *
+     * string issuer = 1;
+     */
+    public Builder setIssuer(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      issuer_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The entity that signed the certificate.
+     * 

+     *
+     * string issuer = 1;
+     */
+    public Builder clearIssuer() {
+      
+      issuer_ = getDefaultInstance().getIssuer();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The entity that signed the certificate.
+     * 

+     *
+     * string issuer = 1;
+     */
+    public Builder setIssuerBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      issuer_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object subject_ = "";
+    /**
+     * 
+     * The entity the certificate and public key belong to.
+     * 

+     *
+     * string subject = 2;
+     */
+    public java.lang.String getSubject() {
+      java.lang.Object ref = subject_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        subject_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The entity the certificate and public key belong to.
+     * 

+     *
+     * string subject = 2;
+     */
+    public com.google.protobuf.ByteString
+        getSubjectBytes() {
+      java.lang.Object ref = subject_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        subject_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The entity the certificate and public key belong to.
+     * 

+     *
+     * string subject = 2;
+     */
+    public Builder setSubject(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      subject_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The entity the certificate and public key belong to.
+     * 

+     *
+     * string subject = 2;
+     */
+    public Builder clearSubject() {
+      
+      subject_ = getDefaultInstance().getSubject();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The entity the certificate and public key belong to.
+     * 

+     *
+     * string subject = 2;
+     */
+    public Builder setSubjectBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      subject_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.Timestamp startTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> startTimeBuilder_;
+    /**
+     * 
+     * The time the certificate becomes valid.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 3;
+     */
+    public boolean hasStartTime() {
+      return startTimeBuilder_ != null || startTime_ != null;
+    }
+    /**
+     * 
+     * The time the certificate becomes valid.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 3;
+     */
+    public com.google.protobuf.Timestamp getStartTime() {
+      if (startTimeBuilder_ == null) {
+        return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
+      } else {
+        return startTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The time the certificate becomes valid.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 3;
+     */
+    public Builder setStartTime(com.google.protobuf.Timestamp value) {
+      if (startTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        startTime_ = value;
+        onChanged();
+      } else {
+        startTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time the certificate becomes valid.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 3;
+     */
+    public Builder setStartTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (startTimeBuilder_ == null) {
+        startTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        startTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time the certificate becomes valid.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 3;
+     */
+    public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
+      if (startTimeBuilder_ == null) {
+        if (startTime_ != null) {
+          startTime_ =
+            com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial();
+        } else {
+          startTime_ = value;
+        }
+        onChanged();
+      } else {
+        startTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time the certificate becomes valid.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 3;
+     */
+    public Builder clearStartTime() {
+      if (startTimeBuilder_ == null) {
+        startTime_ = null;
+        onChanged();
+      } else {
+        startTime_ = null;
+        startTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time the certificate becomes valid.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 3;
+     */
+    public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
+      
+      onChanged();
+      return getStartTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The time the certificate becomes valid.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 3;
+     */
+    public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
+      if (startTimeBuilder_ != null) {
+        return startTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return startTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
+      }
+    }
+    /**
+     * 
+     * The time the certificate becomes valid.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getStartTimeFieldBuilder() {
+      if (startTimeBuilder_ == null) {
+        startTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getStartTime(),
+                getParentForChildren(),
+                isClean());
+        startTime_ = null;
+      }
+      return startTimeBuilder_;
+    }
+
+    private com.google.protobuf.Timestamp expiryTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> expiryTimeBuilder_;
+    /**
+     * 
+     * The time the certificate becomes invalid.
+     * 

+     *
+     * .google.protobuf.Timestamp expiry_time = 4;
+     */
+    public boolean hasExpiryTime() {
+      return expiryTimeBuilder_ != null || expiryTime_ != null;
+    }
+    /**
+     * 
+     * The time the certificate becomes invalid.
+     * 

+     *
+     * .google.protobuf.Timestamp expiry_time = 4;
+     */
+    public com.google.protobuf.Timestamp getExpiryTime() {
+      if (expiryTimeBuilder_ == null) {
+        return expiryTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expiryTime_;
+      } else {
+        return expiryTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The time the certificate becomes invalid.
+     * 

+     *
+     * .google.protobuf.Timestamp expiry_time = 4;
+     */
+    public Builder setExpiryTime(com.google.protobuf.Timestamp value) {
+      if (expiryTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        expiryTime_ = value;
+        onChanged();
+      } else {
+        expiryTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time the certificate becomes invalid.
+     * 

+     *
+     * .google.protobuf.Timestamp expiry_time = 4;
+     */
+    public Builder setExpiryTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (expiryTimeBuilder_ == null) {
+        expiryTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        expiryTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time the certificate becomes invalid.
+     * 

+     *
+     * .google.protobuf.Timestamp expiry_time = 4;
+     */
+    public Builder mergeExpiryTime(com.google.protobuf.Timestamp value) {
+      if (expiryTimeBuilder_ == null) {
+        if (expiryTime_ != null) {
+          expiryTime_ =
+            com.google.protobuf.Timestamp.newBuilder(expiryTime_).mergeFrom(value).buildPartial();
+        } else {
+          expiryTime_ = value;
+        }
+        onChanged();
+      } else {
+        expiryTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time the certificate becomes invalid.
+     * 

+     *
+     * .google.protobuf.Timestamp expiry_time = 4;
+     */
+    public Builder clearExpiryTime() {
+      if (expiryTimeBuilder_ == null) {
+        expiryTime_ = null;
+        onChanged();
+      } else {
+        expiryTime_ = null;
+        expiryTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time the certificate becomes invalid.
+     * 

+     *
+     * .google.protobuf.Timestamp expiry_time = 4;
+     */
+    public com.google.protobuf.Timestamp.Builder getExpiryTimeBuilder() {
+      
+      onChanged();
+      return getExpiryTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The time the certificate becomes invalid.
+     * 

+     *
+     * .google.protobuf.Timestamp expiry_time = 4;
+     */
+    public com.google.protobuf.TimestampOrBuilder getExpiryTimeOrBuilder() {
+      if (expiryTimeBuilder_ != null) {
+        return expiryTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return expiryTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : expiryTime_;
+      }
+    }
+    /**
+     * 
+     * The time the certificate becomes invalid.
+     * 

+     *
+     * .google.protobuf.Timestamp expiry_time = 4;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getExpiryTimeFieldBuilder() {
+      if (expiryTimeBuilder_ == null) {
+        expiryTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getExpiryTime(),
+                getParentForChildren(),
+                isClean());
+        expiryTime_ = null;
+      }
+      return expiryTimeBuilder_;
+    }
+
+    private java.lang.Object signatureAlgorithm_ = "";
+    /**
+     * 
+     * The algorithm used to sign the certificate.
+     * 

+     *
+     * string signature_algorithm = 5;
+     */
+    public java.lang.String getSignatureAlgorithm() {
+      java.lang.Object ref = signatureAlgorithm_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        signatureAlgorithm_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The algorithm used to sign the certificate.
+     * 

+     *
+     * string signature_algorithm = 5;
+     */
+    public com.google.protobuf.ByteString
+        getSignatureAlgorithmBytes() {
+      java.lang.Object ref = signatureAlgorithm_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        signatureAlgorithm_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The algorithm used to sign the certificate.
+     * 

+     *
+     * string signature_algorithm = 5;
+     */
+    public Builder setSignatureAlgorithm(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      signatureAlgorithm_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The algorithm used to sign the certificate.
+     * 

+     *
+     * string signature_algorithm = 5;
+     */
+    public Builder clearSignatureAlgorithm() {
+      
+      signatureAlgorithm_ = getDefaultInstance().getSignatureAlgorithm();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The algorithm used to sign the certificate.
+     * 

+     *
+     * string signature_algorithm = 5;
+     */
+    public Builder setSignatureAlgorithmBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      signatureAlgorithm_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object publicKeyType_ = "";
+    /**
+     * 
+     * The type of public key in the certificate.
+     * 

+     *
+     * string public_key_type = 6;
+     */
+    public java.lang.String getPublicKeyType() {
+      java.lang.Object ref = publicKeyType_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        publicKeyType_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The type of public key in the certificate.
+     * 

+     *
+     * string public_key_type = 6;
+     */
+    public com.google.protobuf.ByteString
+        getPublicKeyTypeBytes() {
+      java.lang.Object ref = publicKeyType_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        publicKeyType_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The type of public key in the certificate.
+     * 

+     *
+     * string public_key_type = 6;
+     */
+    public Builder setPublicKeyType(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      publicKeyType_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The type of public key in the certificate.
+     * 

+     *
+     * string public_key_type = 6;
+     */
+    public Builder clearPublicKeyType() {
+      
+      publicKeyType_ = getDefaultInstance().getPublicKeyType();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The type of public key in the certificate.
+     * 

+     *
+     * string public_key_type = 6;
+     */
+    public Builder setPublicKeyTypeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      publicKeyType_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.iot.v1.X509CertificateDetails)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.iot.v1.X509CertificateDetails)
+  private static final com.google.cloud.iot.v1.X509CertificateDetails DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.iot.v1.X509CertificateDetails();
+  }
+
+  public static com.google.cloud.iot.v1.X509CertificateDetails getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public X509CertificateDetails parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new X509CertificateDetails(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.iot.v1.X509CertificateDetails getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetailsOrBuilder.java b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetailsOrBuilder.java
new file mode 100644
index 000000000000..b8e29b108f5b
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetailsOrBuilder.java
@@ -0,0 +1,131 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/iot/v1/resources.proto
+
+package com.google.cloud.iot.v1;
+
+public interface X509CertificateDetailsOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.iot.v1.X509CertificateDetails)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The entity that signed the certificate.
+   * 

+   *
+   * string issuer = 1;
+   */
+  java.lang.String getIssuer();
+  /**
+   * 
+   * The entity that signed the certificate.
+   * 

+   *
+   * string issuer = 1;
+   */
+  com.google.protobuf.ByteString
+      getIssuerBytes();
+
+  /**
+   * 
+   * The entity the certificate and public key belong to.
+   * 

+   *
+   * string subject = 2;
+   */
+  java.lang.String getSubject();
+  /**
+   * 
+   * The entity the certificate and public key belong to.
+   * 

+   *
+   * string subject = 2;
+   */
+  com.google.protobuf.ByteString
+      getSubjectBytes();
+
+  /**
+   * 
+   * The time the certificate becomes valid.
+   * 

+   *
+   * .google.protobuf.Timestamp start_time = 3;
+   */
+  boolean hasStartTime();
+  /**
+   * 
+   * The time the certificate becomes valid.
+   * 

+   *
+   * .google.protobuf.Timestamp start_time = 3;
+   */
+  com.google.protobuf.Timestamp getStartTime();
+  /**
+   * 
+   * The time the certificate becomes valid.
+   * 

+   *
+   * .google.protobuf.Timestamp start_time = 3;
+   */
+  com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder();
+
+  /**
+   * 
+   * The time the certificate becomes invalid.
+   * 

+   *
+   * .google.protobuf.Timestamp expiry_time = 4;
+   */
+  boolean hasExpiryTime();
+  /**
+   * 
+   * The time the certificate becomes invalid.
+   * 

+   *
+   * .google.protobuf.Timestamp expiry_time = 4;
+   */
+  com.google.protobuf.Timestamp getExpiryTime();
+  /**
+   * 
+   * The time the certificate becomes invalid.
+   * 

+   *
+   * .google.protobuf.Timestamp expiry_time = 4;
+   */
+  com.google.protobuf.TimestampOrBuilder getExpiryTimeOrBuilder();
+
+  /**
+   * 
+   * The algorithm used to sign the certificate.
+   * 

+   *
+   * string signature_algorithm = 5;
+   */
+  java.lang.String getSignatureAlgorithm();
+  /**
+   * 
+   * The algorithm used to sign the certificate.
+   * 

+   *
+   * string signature_algorithm = 5;
+   */
+  com.google.protobuf.ByteString
+      getSignatureAlgorithmBytes();
+
+  /**
+   * 
+   * The type of public key in the certificate.
+   * 

+   *
+   * string public_key_type = 6;
+   */
+  java.lang.String getPublicKeyType();
+  /**
+   * 
+   * The type of public key in the certificate.
+   * 

+   *
+   * string public_key_type = 6;
+   */
+  com.google.protobuf.ByteString
+      getPublicKeyTypeBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/proto/google/cloud/iot/v1/device_manager.proto b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/proto/google/cloud/iot/v1/device_manager.proto
new file mode 100644
index 000000000000..dd9f994107e7
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/proto/google/cloud/iot/v1/device_manager.proto
@@ -0,0 +1,419 @@
+// Copyright 2018 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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";
+
+package google.cloud.iot.v1;
+
+import "google/api/annotations.proto";
+import "google/cloud/iot/v1/resources.proto";
+import "google/iam/v1/iam_policy.proto";
+import "google/iam/v1/policy.proto";
+import "google/protobuf/duration.proto";
+import "google/protobuf/empty.proto";
+import "google/protobuf/field_mask.proto";
+import "google/protobuf/timestamp.proto";
+
+option cc_enable_arenas = true;
+option go_package = "google.golang.org/genproto/googleapis/cloud/iot/v1;iot";
+option java_multiple_files = true;
+option java_outer_classname = "DeviceManagerProto";
+option java_package = "com.google.cloud.iot.v1";
+
+
+// Internet of things (IoT) service. Allows to manipulate device registry
+// instances and the registration of devices (Things) to the cloud.
+service DeviceManager {
+  // Creates a device registry that contains devices.
+  rpc CreateDeviceRegistry(CreateDeviceRegistryRequest) returns (DeviceRegistry) {
+    option (google.api.http) = {
+      post: "/v1/{parent=projects/*/locations/*}/registries"
+      body: "device_registry"
+    };
+  }
+
+  // Gets a device registry configuration.
+  rpc GetDeviceRegistry(GetDeviceRegistryRequest) returns (DeviceRegistry) {
+    option (google.api.http) = {
+      get: "/v1/{name=projects/*/locations/*/registries/*}"
+    };
+  }
+
+  // Updates a device registry configuration.
+  rpc UpdateDeviceRegistry(UpdateDeviceRegistryRequest) returns (DeviceRegistry) {
+    option (google.api.http) = {
+      patch: "/v1/{device_registry.name=projects/*/locations/*/registries/*}"
+      body: "device_registry"
+    };
+  }
+
+  // Deletes a device registry configuration.
+  rpc DeleteDeviceRegistry(DeleteDeviceRegistryRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      delete: "/v1/{name=projects/*/locations/*/registries/*}"
+    };
+  }
+
+  // Lists device registries.
+  rpc ListDeviceRegistries(ListDeviceRegistriesRequest) returns (ListDeviceRegistriesResponse) {
+    option (google.api.http) = {
+      get: "/v1/{parent=projects/*/locations/*}/registries"
+    };
+  }
+
+  // Creates a device in a device registry.
+  rpc CreateDevice(CreateDeviceRequest) returns (Device) {
+    option (google.api.http) = {
+      post: "/v1/{parent=projects/*/locations/*/registries/*}/devices"
+      body: "device"
+    };
+  }
+
+  // Gets details about a device.
+  rpc GetDevice(GetDeviceRequest) returns (Device) {
+    option (google.api.http) = {
+      get: "/v1/{name=projects/*/locations/*/registries/*/devices/*}"
+      additional_bindings {
+        get: "/v1/{name=projects/*/locations/*/registries/*/groups/*/devices/*}"
+      }
+    };
+  }
+
+  // Updates a device.
+  rpc UpdateDevice(UpdateDeviceRequest) returns (Device) {
+    option (google.api.http) = {
+      patch: "/v1/{device.name=projects/*/locations/*/registries/*/devices/*}"
+      body: "device"
+      additional_bindings {
+        patch: "/v1/{device.name=projects/*/locations/*/registries/*/groups/*/devices/*}"
+        body: "device"
+      }
+    };
+  }
+
+  // Deletes a device.
+  rpc DeleteDevice(DeleteDeviceRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      delete: "/v1/{name=projects/*/locations/*/registries/*/devices/*}"
+      additional_bindings {
+        delete: "/v1/{name=projects/*/locations/*/registries/*/groups/*/devices/*}"
+      }
+    };
+  }
+
+  // List devices in a device registry.
+  rpc ListDevices(ListDevicesRequest) returns (ListDevicesResponse) {
+    option (google.api.http) = {
+      get: "/v1/{parent=projects/*/locations/*/registries/*}/devices"
+      additional_bindings {
+        get: "/v1/{parent=projects/*/locations/*/groups/*}/devices"
+      }
+    };
+  }
+
+  // Modifies the configuration for the device, which is eventually sent from
+  // the Cloud IoT Core servers. Returns the modified configuration version and
+  // its metadata.
+  rpc ModifyCloudToDeviceConfig(ModifyCloudToDeviceConfigRequest) returns (DeviceConfig) {
+    option (google.api.http) = {
+      post: "/v1/{name=projects/*/locations/*/registries/*/devices/*}:modifyCloudToDeviceConfig"
+      body: "*"
+      additional_bindings {
+        post: "/v1/{name=projects/*/locations/*/registries/*/groups/*/devices/*}:modifyCloudToDeviceConfig"
+        body: "*"
+      }
+    };
+  }
+
+  // Lists the last few versions of the device configuration in descending
+  // order (i.e.: newest first).
+  rpc ListDeviceConfigVersions(ListDeviceConfigVersionsRequest) returns (ListDeviceConfigVersionsResponse) {
+    option (google.api.http) = {
+      get: "/v1/{name=projects/*/locations/*/registries/*/devices/*}/configVersions"
+      additional_bindings {
+        get: "/v1/{name=projects/*/locations/*/registries/*/groups/*/devices/*}/configVersions"
+      }
+    };
+  }
+
+  // Lists the last few versions of the device state in descending order (i.e.:
+  // newest first).
+  rpc ListDeviceStates(ListDeviceStatesRequest) returns (ListDeviceStatesResponse) {
+    option (google.api.http) = {
+      get: "/v1/{name=projects/*/locations/*/registries/*/devices/*}/states"
+      additional_bindings {
+        get: "/v1/{name=projects/*/locations/*/registries/*/groups/*/devices/*}/states"
+      }
+    };
+  }
+
+  // Sets the access control policy on the specified resource. Replaces any
+  // existing policy.
+  rpc SetIamPolicy(google.iam.v1.SetIamPolicyRequest) returns (google.iam.v1.Policy) {
+    option (google.api.http) = {
+      post: "/v1/{resource=projects/*/locations/*/registries/*}:setIamPolicy"
+      body: "*"
+      additional_bindings {
+        post: "/v1/{resource=projects/*/locations/*/registries/*/groups/*}:setIamPolicy"
+        body: "*"
+      }
+    };
+  }
+
+  // Gets the access control policy for a resource.
+  // Returns an empty policy if the resource exists and does not have a policy
+  // set.
+  rpc GetIamPolicy(google.iam.v1.GetIamPolicyRequest) returns (google.iam.v1.Policy) {
+    option (google.api.http) = {
+      post: "/v1/{resource=projects/*/locations/*/registries/*}:getIamPolicy"
+      body: "*"
+      additional_bindings {
+        post: "/v1/{resource=projects/*/locations/*/registries/*/groups/*}:getIamPolicy"
+        body: "*"
+      }
+    };
+  }
+
+  // Returns permissions that a caller has on the specified resource.
+  // If the resource does not exist, this will return an empty set of
+  // permissions, not a NOT_FOUND error.
+  rpc TestIamPermissions(google.iam.v1.TestIamPermissionsRequest) returns (google.iam.v1.TestIamPermissionsResponse) {
+    option (google.api.http) = {
+      post: "/v1/{resource=projects/*/locations/*/registries/*}:testIamPermissions"
+      body: "*"
+      additional_bindings {
+        post: "/v1/{resource=projects/*/locations/*/registries/*/groups/*}:testIamPermissions"
+        body: "*"
+      }
+    };
+  }
+}
+
+// Request for `CreateDeviceRegistry`.
+message CreateDeviceRegistryRequest {
+  // The project and cloud region where this device registry must be created.
+  // For example, `projects/example-project/locations/us-central1`.
+  string parent = 1;
+
+  // The device registry. The field `name` must be empty. The server will
+  // generate that field from the device registry `id` provided and the
+  // `parent` field.
+  DeviceRegistry device_registry = 2;
+}
+
+// Request for `GetDeviceRegistry`.
+message GetDeviceRegistryRequest {
+  // The name of the device registry. For example,
+  // `projects/example-project/locations/us-central1/registries/my-registry`.
+  string name = 1;
+}
+
+// Request for `DeleteDeviceRegistry`.
+message DeleteDeviceRegistryRequest {
+  // The name of the device registry. For example,
+  // `projects/example-project/locations/us-central1/registries/my-registry`.
+  string name = 1;
+}
+
+// Request for `UpdateDeviceRegistry`.
+message UpdateDeviceRegistryRequest {
+  // The new values for the device registry. The `id` field must be empty, and
+  // the `name` field must indicate the path of the resource. For example,
+  // `projects/example-project/locations/us-central1/registries/my-registry`.
+  DeviceRegistry device_registry = 1;
+
+  // Only updates the `device_registry` fields indicated by this mask.
+  // The field mask must not be empty, and it must not contain fields that
+  // are immutable or only set by the server.
+  // Mutable top-level fields: `event_notification_config`, `http_config`,
+  // `mqtt_config`, and `state_notification_config`.
+  google.protobuf.FieldMask update_mask = 2;
+}
+
+// Request for `ListDeviceRegistries`.
+message ListDeviceRegistriesRequest {
+  // The project and cloud region path. For example,
+  // `projects/example-project/locations/us-central1`.
+  string parent = 1;
+
+  // The maximum number of registries to return in the response. If this value
+  // is zero, the service will select a default size. A call may return fewer
+  // objects than requested, but if there is a non-empty `page_token`, it
+  // indicates that more entries are available.
+  int32 page_size = 2;
+
+  // The value returned by the last `ListDeviceRegistriesResponse`; indicates
+  // that this is a continuation of a prior `ListDeviceRegistries` call, and
+  // that the system should return the next page of data.
+  string page_token = 3;
+}
+
+// Response for `ListDeviceRegistries`.
+message ListDeviceRegistriesResponse {
+  // The registries that matched the query.
+  repeated DeviceRegistry device_registries = 1;
+
+  // If not empty, indicates that there may be more registries that match the
+  // request; this value should be passed in a new
+  // `ListDeviceRegistriesRequest`.
+  string next_page_token = 2;
+}
+
+// Request for `CreateDevice`.
+message CreateDeviceRequest {
+  // The name of the device registry where this device should be created.
+  // For example,
+  // `projects/example-project/locations/us-central1/registries/my-registry`.
+  string parent = 1;
+
+  // The device registration details. The field `name` must be empty. The server
+  // will generate that field from the device registry `id` provided and the
+  // `parent` field.
+  Device device = 2;
+}
+
+// Request for `GetDevice`.
+message GetDeviceRequest {
+  // The name of the device. For example,
+  // `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+  // `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+  string name = 1;
+
+  // The fields of the `Device` resource to be returned in the response. If the
+  // field mask is unset or empty, all fields are returned.
+  google.protobuf.FieldMask field_mask = 2;
+}
+
+// Request for `UpdateDevice`.
+message UpdateDeviceRequest {
+  // The new values for the device registry. The `id` and `num_id` fields must
+  // be empty, and the field `name` must specify the name path. For example,
+  // `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+  // `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+  Device device = 2;
+
+  // Only updates the `device` fields indicated by this mask.
+  // The field mask must not be empty, and it must not contain fields that
+  // are immutable or only set by the server.
+  // Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+  google.protobuf.FieldMask update_mask = 3;
+}
+
+// Request for `DeleteDevice`.
+message DeleteDeviceRequest {
+  // The name of the device. For example,
+  // `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+  // `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+  string name = 1;
+}
+
+// Request for `ListDevices`.
+message ListDevicesRequest {
+  // The device registry path. Required. For example,
+  // `projects/my-project/locations/us-central1/registries/my-registry`.
+  string parent = 1;
+
+  // A list of device numerical ids. If empty, it will ignore this field. This
+  // field cannot hold more than 10,000 entries.
+  repeated uint64 device_num_ids = 2;
+
+  // A list of device string identifiers. If empty, it will ignore this field.
+  // For example, `['device0', 'device12']`. This field cannot hold more than
+  // 10,000 entries.
+  repeated string device_ids = 3;
+
+  // The fields of the `Device` resource to be returned in the response. The
+  // fields `id`, and `num_id` are always returned by default, along with any
+  // other fields specified.
+  google.protobuf.FieldMask field_mask = 4;
+
+  // The maximum number of devices to return in the response. If this value
+  // is zero, the service will select a default size. A call may return fewer
+  // objects than requested, but if there is a non-empty `page_token`, it
+  // indicates that more entries are available.
+  int32 page_size = 100;
+
+  // The value returned by the last `ListDevicesResponse`; indicates
+  // that this is a continuation of a prior `ListDevices` call, and
+  // that the system should return the next page of data.
+  string page_token = 101;
+}
+
+// Response for `ListDevices`.
+message ListDevicesResponse {
+  // The devices that match the request.
+  repeated Device devices = 1;
+
+  // If not empty, indicates that there may be more devices that match the
+  // request; this value should be passed in a new `ListDevicesRequest`.
+  string next_page_token = 2;
+}
+
+// Request for `ModifyCloudToDeviceConfig`.
+message ModifyCloudToDeviceConfigRequest {
+  // The name of the device. For example,
+  // `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+  // `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+  string name = 1;
+
+  // The version number to update. If this value is zero, it will not check the
+  // version number of the server and will always update the current version;
+  // otherwise, this update will fail if the version number found on the server
+  // does not match this version number. This is used to support multiple
+  // simultaneous updates without losing data.
+  int64 version_to_update = 2;
+
+  // The configuration data for the device.
+  bytes binary_data = 3;
+}
+
+// Request for `ListDeviceConfigVersions`.
+message ListDeviceConfigVersionsRequest {
+  // The name of the device. For example,
+  // `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+  // `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+  string name = 1;
+
+  // The number of versions to list. Versions are listed in decreasing order of
+  // the version number. The maximum number of versions retained is 10. If this
+  // value is zero, it will return all the versions available.
+  int32 num_versions = 2;
+}
+
+// Response for `ListDeviceConfigVersions`.
+message ListDeviceConfigVersionsResponse {
+  // The device configuration for the last few versions. Versions are listed
+  // in decreasing order, starting from the most recent one.
+  repeated DeviceConfig device_configs = 1;
+}
+
+// Request for `ListDeviceStates`.
+message ListDeviceStatesRequest {
+  // The name of the device. For example,
+  // `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+  // `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+  string name = 1;
+
+  // The number of states to list. States are listed in descending order of
+  // update time. The maximum number of states retained is 10. If this
+  // value is zero, it will return all the states available.
+  int32 num_states = 2;
+}
+
+// Response for `ListDeviceStates`.
+message ListDeviceStatesResponse {
+  // The last few device states. States are listed in descending order of server
+  // update time, starting from the most recent one.
+  repeated DeviceState device_states = 1;
+}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/proto/google/cloud/iot/v1/resources.proto b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/proto/google/cloud/iot/v1/resources.proto
new file mode 100644
index 000000000000..542947637077
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/proto/google/cloud/iot/v1/resources.proto
@@ -0,0 +1,385 @@
+// Copyright 2018 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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";
+
+package google.cloud.iot.v1;
+
+import "google/api/annotations.proto";
+import "google/protobuf/timestamp.proto";
+import "google/rpc/status.proto";
+
+option cc_enable_arenas = true;
+option go_package = "google.golang.org/genproto/googleapis/cloud/iot/v1;iot";
+option java_multiple_files = true;
+option java_outer_classname = "ResourcesProto";
+option java_package = "com.google.cloud.iot.v1";
+
+
+// The device resource.
+message Device {
+  // The user-defined device identifier. The device ID must be unique
+  // within a device registry.
+  string id = 1;
+
+  // The resource path name. For example,
+  // `projects/p1/locations/us-central1/registries/registry0/devices/dev0` or
+  // `projects/p1/locations/us-central1/registries/registry0/devices/{num_id}`.
+  // When `name` is populated as a response from the service, it always ends
+  // in the device numeric ID.
+  string name = 2;
+
+  // [Output only] A server-defined unique numeric ID for the device. This is a
+  // more compact way to identify devices, and it is globally unique.
+  uint64 num_id = 3;
+
+  // The credentials used to authenticate this device. To allow credential
+  // rotation without interruption, multiple device credentials can be bound to
+  // this device. No more than 3 credentials can be bound to a single device at
+  // a time. When new credentials are added to a device, they are verified
+  // against the registry credentials. For details, see the description of the
+  // `DeviceRegistry.credentials` field.
+  repeated DeviceCredential credentials = 12;
+
+  // [Output only] The last time an MQTT `PINGREQ` was received. This field
+  // applies only to devices connecting through MQTT. MQTT clients usually only
+  // send `PINGREQ` messages if the connection is idle, and no other messages
+  // have been sent. Timestamps are periodically collected and written to
+  // storage; they may be stale by a few minutes.
+  google.protobuf.Timestamp last_heartbeat_time = 7;
+
+  // [Output only] The last time a telemetry event was received. Timestamps are
+  // periodically collected and written to storage; they may be stale by a few
+  // minutes.
+  google.protobuf.Timestamp last_event_time = 8;
+
+  // [Output only] The last time a state event was received. Timestamps are
+  // periodically collected and written to storage; they may be stale by a few
+  // minutes.
+  google.protobuf.Timestamp last_state_time = 20;
+
+  // [Output only] The last time a cloud-to-device config version acknowledgment
+  // was received from the device. This field is only for configurations
+  // sent through MQTT.
+  google.protobuf.Timestamp last_config_ack_time = 14;
+
+  // [Output only] The last time a cloud-to-device config version was sent to
+  // the device.
+  google.protobuf.Timestamp last_config_send_time = 18;
+
+  // If a device is blocked, connections or requests from this device will fail.
+  // Can be used to temporarily prevent the device from connecting if, for
+  // example, the sensor is generating bad data and needs maintenance.
+  bool blocked = 19;
+
+  // [Output only] The time the most recent error occurred, such as a failure to
+  // publish to Cloud Pub/Sub. This field is the timestamp of
+  // 'last_error_status'.
+  google.protobuf.Timestamp last_error_time = 10;
+
+  // [Output only] The error message of the most recent error, such as a failure
+  // to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
+  // field. If no errors have occurred, this field has an empty message
+  // and the status code 0 == OK. Otherwise, this field is expected to have a
+  // status code other than OK.
+  google.rpc.Status last_error_status = 11;
+
+  // The most recent device configuration, which is eventually sent from
+  // Cloud IoT Core to the device. If not present on creation, the
+  // configuration will be initialized with an empty payload and version value
+  // of `1`. To update this field after creation, use the
+  // `DeviceManager.ModifyCloudToDeviceConfig` method.
+  DeviceConfig config = 13;
+
+  // [Output only] The state most recently received from the device. If no state
+  // has been reported, this field is not present.
+  DeviceState state = 16;
+
+  // The metadata key-value pairs assigned to the device. This metadata is not
+  // interpreted or indexed by Cloud IoT Core. It can be used to add contextual
+  // information for the device.
+  //
+  // Keys must conform to the regular expression [a-zA-Z][a-zA-Z0-9-_.+~%]+ and
+  // be less than 128 bytes in length.
+  //
+  // Values are free-form strings. Each value must be less than or equal to 32
+  // KB in size.
+  //
+  // The total size of all keys and values must be less than 256 KB, and the
+  // maximum number of key-value pairs is 500.
+  map metadata = 17;
+}
+
+// A container for a group of devices.
+message DeviceRegistry {
+  // The identifier of this device registry. For example, `myRegistry`.
+  string id = 1;
+
+  // The resource path name. For example,
+  // `projects/example-project/locations/us-central1/registries/my-registry`.
+  string name = 2;
+
+  // The configuration for notification of telemetry events received from the
+  // device. All telemetry events that were successfully published by the
+  // device and acknowledged by Cloud IoT Core are guaranteed to be
+  // delivered to Cloud Pub/Sub. If multiple configurations match a message,
+  // only the first matching configuration is used. If you try to publish a
+  // device telemetry event using MQTT without specifying a Cloud Pub/Sub topic
+  // for the device's registry, the connection closes automatically. If you try
+  // to do so using an HTTP connection, an error is returned. Up to 10
+  // configurations may be provided.
+  repeated EventNotificationConfig event_notification_configs = 10;
+
+  // The configuration for notification of new states received from the device.
+  // State updates are guaranteed to be stored in the state history, but
+  // notifications to Cloud Pub/Sub are not guaranteed. For example, if
+  // permissions are misconfigured or the specified topic doesn't exist, no
+  // notification will be published but the state will still be stored in Cloud
+  // IoT Core.
+  StateNotificationConfig state_notification_config = 7;
+
+  // The MQTT configuration for this device registry.
+  MqttConfig mqtt_config = 4;
+
+  // The DeviceService (HTTP) configuration for this device registry.
+  HttpConfig http_config = 9;
+
+  // The credentials used to verify the device credentials. No more than 10
+  // credentials can be bound to a single registry at a time. The verification
+  // process occurs at the time of device creation or update. If this field is
+  // empty, no verification is performed. Otherwise, the credentials of a newly
+  // created device or added credentials of an updated device should be signed
+  // with one of these registry credentials.
+  //
+  // Note, however, that existing devices will never be affected by
+  // modifications to this list of credentials: after a device has been
+  // successfully created in a registry, it should be able to connect even if
+  // its registry credentials are revoked, deleted, or modified.
+  repeated RegistryCredential credentials = 8;
+}
+
+// The configuration of MQTT for a device registry.
+message MqttConfig {
+  // If enabled, allows connections using the MQTT protocol. Otherwise, MQTT
+  // connections to this registry will fail.
+  MqttState mqtt_enabled_state = 1;
+}
+
+// The configuration of the HTTP bridge for a device registry.
+message HttpConfig {
+  // If enabled, allows devices to use DeviceService via the HTTP protocol.
+  // Otherwise, any requests to DeviceService will fail for this registry.
+  HttpState http_enabled_state = 1;
+}
+
+// The configuration for forwarding telemetry events.
+message EventNotificationConfig {
+  // If the subfolder name matches this string exactly, this configuration will
+  // be used. The string must not include the leading '/' character. If empty,
+  // all strings are matched. This field is used only for telemetry events;
+  // subfolders are not supported for state changes.
+  string subfolder_matches = 2;
+
+  // A Cloud Pub/Sub topic name. For example,
+  // `projects/myProject/topics/deviceEvents`.
+  string pubsub_topic_name = 1;
+}
+
+// The configuration for notification of new states received from the device.
+message StateNotificationConfig {
+  // A Cloud Pub/Sub topic name. For example,
+  // `projects/myProject/topics/deviceEvents`.
+  string pubsub_topic_name = 1;
+}
+
+// A server-stored registry credential used to validate device credentials.
+message RegistryCredential {
+  // The credential data. Reserved for expansion in the future.
+  oneof credential {
+    // A public key certificate used to verify the device credentials.
+    PublicKeyCertificate public_key_certificate = 1;
+  }
+}
+
+// Details of an X.509 certificate. For informational purposes only.
+message X509CertificateDetails {
+  // The entity that signed the certificate.
+  string issuer = 1;
+
+  // The entity the certificate and public key belong to.
+  string subject = 2;
+
+  // The time the certificate becomes valid.
+  google.protobuf.Timestamp start_time = 3;
+
+  // The time the certificate becomes invalid.
+  google.protobuf.Timestamp expiry_time = 4;
+
+  // The algorithm used to sign the certificate.
+  string signature_algorithm = 5;
+
+  // The type of public key in the certificate.
+  string public_key_type = 6;
+}
+
+// A public key certificate format and data.
+message PublicKeyCertificate {
+  // The certificate format.
+  PublicKeyCertificateFormat format = 1;
+
+  // The certificate data.
+  string certificate = 2;
+
+  // [Output only] The certificate details. Used only for X.509 certificates.
+  X509CertificateDetails x509_details = 3;
+}
+
+// A server-stored device credential used for authentication.
+message DeviceCredential {
+  // The credential data. Reserved for expansion in the future.
+  oneof credential {
+    // A public key used to verify the signature of JSON Web Tokens (JWTs).
+    // When adding a new device credential, either via device creation or via
+    // modifications, this public key credential may be required to be signed by
+    // one of the registry level certificates. More specifically, if the
+    // registry contains at least one certificate, any new device credential
+    // must be signed by one of the registry certificates. As a result,
+    // when the registry contains certificates, only X.509 certificates are
+    // accepted as device credentials. However, if the registry does
+    // not contain a certificate, self-signed certificates and public keys will
+    // be accepted. New device credentials must be different from every
+    // registry-level certificate.
+    PublicKeyCredential public_key = 2;
+  }
+
+  // [Optional] The time at which this credential becomes invalid. This
+  // credential will be ignored for new client authentication requests after
+  // this timestamp; however, it will not be automatically deleted.
+  google.protobuf.Timestamp expiration_time = 6;
+}
+
+// A public key format and data.
+message PublicKeyCredential {
+  // The format of the key.
+  PublicKeyFormat format = 1;
+
+  // The key data.
+  string key = 2;
+}
+
+// The device configuration. Eventually delivered to devices.
+message DeviceConfig {
+  // [Output only] The version of this update. The version number is assigned by
+  // the server, and is always greater than 0 after device creation. The
+  // version must be 0 on the `CreateDevice` request if a `config` is
+  // specified; the response of `CreateDevice` will always have a value of 1.
+  int64 version = 1;
+
+  // [Output only] The time at which this configuration version was updated in
+  // Cloud IoT Core. This timestamp is set by the server.
+  google.protobuf.Timestamp cloud_update_time = 2;
+
+  // [Output only] The time at which Cloud IoT Core received the
+  // acknowledgment from the device, indicating that the device has received
+  // this configuration version. If this field is not present, the device has
+  // not yet acknowledged that it received this version. Note that when
+  // the config was sent to the device, many config versions may have been
+  // available in Cloud IoT Core while the device was disconnected, and on
+  // connection, only the latest version is sent to the device. Some
+  // versions may never be sent to the device, and therefore are never
+  // acknowledged. This timestamp is set by Cloud IoT Core.
+  google.protobuf.Timestamp device_ack_time = 3;
+
+  // The device configuration data.
+  bytes binary_data = 4;
+}
+
+// The device state, as reported by the device.
+message DeviceState {
+  // [Output only] The time at which this state version was updated in Cloud
+  // IoT Core.
+  google.protobuf.Timestamp update_time = 1;
+
+  // The device state data.
+  bytes binary_data = 2;
+}
+
+// Indicates whether an MQTT connection is enabled or disabled. See the field
+// description for details.
+enum MqttState {
+  // No MQTT state specified. If not specified, MQTT will be enabled by default.
+  MQTT_STATE_UNSPECIFIED = 0;
+
+  // Enables a MQTT connection.
+  MQTT_ENABLED = 1;
+
+  // Disables a MQTT connection.
+  MQTT_DISABLED = 2;
+}
+
+// Indicates whether DeviceService (HTTP) is enabled or disabled for the
+// registry. See the field description for details.
+enum HttpState {
+  // No HTTP state specified. If not specified, DeviceService will be
+  // enabled by default.
+  HTTP_STATE_UNSPECIFIED = 0;
+
+  // Enables DeviceService (HTTP) service for the registry.
+  HTTP_ENABLED = 1;
+
+  // Disables DeviceService (HTTP) service for the registry.
+  HTTP_DISABLED = 2;
+}
+
+// The supported formats for the public key.
+enum PublicKeyCertificateFormat {
+  // The format has not been specified. This is an invalid default value and
+  // must not be used.
+  UNSPECIFIED_PUBLIC_KEY_CERTIFICATE_FORMAT = 0;
+
+  // An X.509v3 certificate ([RFC5280](https://www.ietf.org/rfc/rfc5280.txt)),
+  // encoded in base64, and wrapped by `-----BEGIN CERTIFICATE-----` and
+  // `-----END CERTIFICATE-----`.
+  X509_CERTIFICATE_PEM = 1;
+}
+
+// The supported formats for the public key.
+enum PublicKeyFormat {
+  // The format has not been specified. This is an invalid default value and
+  // must not be used.
+  UNSPECIFIED_PUBLIC_KEY_FORMAT = 0;
+
+  // An RSA public key encoded in base64, and wrapped by
+  // `-----BEGIN PUBLIC KEY-----` and `-----END PUBLIC KEY-----`. This can be
+  // used to verify `RS256` signatures in JWT tokens ([RFC7518](
+  // https://www.ietf.org/rfc/rfc7518.txt)).
+  RSA_PEM = 3;
+
+  // As RSA_PEM, but wrapped in an X.509v3 certificate ([RFC5280](
+  // https://www.ietf.org/rfc/rfc5280.txt)), encoded in base64, and wrapped by
+  // `-----BEGIN CERTIFICATE-----` and `-----END CERTIFICATE-----`.
+  RSA_X509_PEM = 1;
+
+  // Public key for the ECDSA algorithm using P-256 and SHA-256, encoded in
+  // base64, and wrapped by `-----BEGIN PUBLIC KEY-----` and `-----END
+  // PUBLIC KEY-----`. This can be used to verify JWT tokens with the `ES256`
+  // algorithm ([RFC7518](https://www.ietf.org/rfc/rfc7518.txt)). This curve is
+  // defined in [OpenSSL](https://www.openssl.org/) as the `prime256v1` curve.
+  ES256_PEM = 2;
+
+  // As ES256_PEM, but wrapped in an X.509v3 certificate ([RFC5280](
+  // https://www.ietf.org/rfc/rfc5280.txt)), encoded in base64, and wrapped by
+  // `-----BEGIN CERTIFICATE-----` and `-----END CERTIFICATE-----`.
+  ES256_X509_PEM = 4;
+}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/pom.xml b/google-api-grpc/proto-google-cloud-container-v1/pom.xml
index dd91cc6f16cf..6a168a03ff40 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-container-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-container-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-container-v1
   PROTO library for proto-google-cloud-container-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml b/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
index f3bf8fa0cfc1..30207e6576d3 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dataproc-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-dataproc-v1
   PROTO library for proto-google-cloud-dataproc-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml b/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
index e9bbdf243743..d3003828dcb4 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml b/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
index b1260ef34498..726553bedd6e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dialogflow-v2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-dialogflow-v2
   PROTO library for proto-google-cloud-dialogflow-v2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
index 3253e29f0fea..db10af6e65bf 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dialogflow-v2beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-dialogflow-v2beta1
   PROTO library for proto-google-cloud-dialogflow-v2beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentContextName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentContextName.java
index 4241e53ced0c..fa8344304ffe 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentContextName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentContextName.java
@@ -28,7 +28,7 @@
 public class EnvironmentContextName implements ResourceName {
 
   private static final PathTemplate PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/agent/sessions/{environment}/users/{user}/{session}/contexts/{context}");
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/agent/environments/{environment}/users/{user}/sessions/{session}/contexts/{context}");
 
   private volatile Map fieldValuesMap;
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml b/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
index 41d0838ee00a..7a306f05edac 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dlp-v2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-dlp-v2
   PROTO library for proto-google-cloud-dlp-v2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/pom.xml b/google-api-grpc/proto-google-cloud-dlp-v2beta1/pom.xml
index 6c619c5db258..fc23a6b340e9 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dlp-v2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dlp-v2beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-dlp-v2beta1
   PROTO library for proto-google-cloud-dlp-v2beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
index 948e957715aa..ba2145581adf 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-error-reporting-v1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-error-reporting-v1beta1
   PROTO library for proto-google-cloud-error-reporting-v1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
index c3dd9b384268..7f879ad81285 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-firestore-v1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-firestore-v1beta1
   PROTO library for proto-google-cloud-firestore-v1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-language-v1/pom.xml b/google-api-grpc/proto-google-cloud-language-v1/pom.xml
index 866ef029e3f1..48accf8a5dda 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-language-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-language-v1
-  1.10.1-SNAPSHOT
+  1.11.1-SNAPSHOT
   proto-google-cloud-language-v1
   PROTO library for proto-google-cloud-language-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml b/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
index 597260f73cdd..9e0b26af3b64 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-language-v1beta2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-language-v1beta2
   PROTO library for proto-google-cloud-language-v1beta2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/pom.xml b/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
index 6f6b57d204cf..90d9aa9fa392 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-logging-v2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-logging-v2
   PROTO library for proto-google-cloud-logging-v2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml b/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
index a856a9c8e9ef..65b6e010bf4c 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-monitoring-v3
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-monitoring-v3
   PROTO library for proto-google-cloud-monitoring-v3
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml b/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
index ed26172067d9..5756dfee6669 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-os-login-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-os-login-v1
   PROTO library for proto-google-cloud-os-login-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml b/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
index 4f6013c4b52e..33ee59ca88b9 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-pubsub-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-pubsub-v1
   PROTO library for proto-google-cloud-pubsub-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
new file mode 100644
index 000000000000..b58969b67cbb
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
@@ -0,0 +1,31 @@
+
+  4.0.0
+  proto-google-cloud-redis-v1beta1
+  0.12.1-SNAPSHOT
+  proto-google-cloud-redis-v1beta1
+  PROTO library for proto-google-cloud-redis-v1beta1
+  
+    com.google.api.grpc
+    google-api-grpc
+    0.12.1-SNAPSHOT
+  
+  
+    
+      com.google.protobuf
+      protobuf-java
+      compile
+    
+    
+      com.google.api
+      api-common
+      compile
+    
+    
+      com.google.api.grpc
+      proto-google-common-protos
+      compile
+    
+  
+
\ No newline at end of file
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java
new file mode 100644
index 000000000000..200a261d78e8
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java
@@ -0,0 +1,258 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+public final class CloudRedisServiceBetaProto {
+  private CloudRedisServiceBetaProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_redis_v1beta1_Instance_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_redis_v1beta1_Instance_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_redis_v1beta1_Instance_LabelsEntry_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_redis_v1beta1_Instance_LabelsEntry_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_redis_v1beta1_Instance_RedisConfigsEntry_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_redis_v1beta1_Instance_RedisConfigsEntry_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_redis_v1beta1_LocationMetadata_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_redis_v1beta1_LocationMetadata_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_redis_v1beta1_LocationMetadata_AvailableZonesEntry_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_redis_v1beta1_LocationMetadata_AvailableZonesEntry_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_redis_v1beta1_ZoneMetadata_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_redis_v1beta1_ZoneMetadata_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n,google/cloud/redis/v1beta1/cloud_redis" +
+      ".proto\022\032google.cloud.redis.v1beta1\032\034goog" +
+      "le/api/annotations.proto\032#google/longrun" +
+      "ning/operations.proto\032 google/protobuf/f" +
+      "ield_mask.proto\032\037google/protobuf/timesta" +
+      "mp.proto\"\344\006\n\010Instance\022\014\n\004name\030\001 \001(\t\022\024\n\014d" +
+      "isplay_name\030\002 \001(\t\022@\n\006labels\030\003 \003(\01320.goog" +
+      "le.cloud.redis.v1beta1.Instance.LabelsEn" +
+      "try\022\023\n\013location_id\030\004 \001(\t\022\037\n\027alternative_" +
+      "location_id\030\005 \001(\t\022\025\n\rredis_version\030\007 \001(\t" +
+      "\022\031\n\021reserved_ip_range\030\t \001(\t\022\014\n\004host\030\n \001(" +
+      "\t\022\014\n\004port\030\013 \001(\005\022\033\n\023current_location_id\030\014" +
+      " \001(\t\022/\n\013create_time\030\r \001(\0132\032.google.proto" +
+      "buf.Timestamp\0229\n\005state\030\016 \001(\0162*.google.cl" +
+      "oud.redis.v1beta1.Instance.State\022\026\n\016stat" +
+      "us_message\030\017 \001(\t\022M\n\rredis_configs\030\020 \003(\0132" +
+      "6.google.cloud.redis.v1beta1.Instance.Re" +
+      "disConfigsEntry\0227\n\004tier\030\021 \001(\0162).google.c" +
+      "loud.redis.v1beta1.Instance.Tier\022\026\n\016memo" +
+      "ry_size_gb\030\022 \001(\005\022\032\n\022authorized_network\030\024" +
+      " \001(\t\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu" +
+      "e\030\002 \001(\t:\0028\001\0323\n\021RedisConfigsEntry\022\013\n\003key\030" +
+      "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"s\n\005State\022\025\n\021STA" +
+      "TE_UNSPECIFIED\020\000\022\014\n\010CREATING\020\001\022\t\n\005READY\020" +
+      "\002\022\014\n\010UPDATING\020\003\022\014\n\010DELETING\020\004\022\r\n\tREPAIRI" +
+      "NG\020\005\022\017\n\013MAINTENANCE\020\006\"8\n\004Tier\022\024\n\020TIER_UN" +
+      "SPECIFIED\020\000\022\t\n\005BASIC\020\001\022\017\n\013STANDARD_HA\020\003\"" +
+      "M\n\024ListInstancesRequest\022\016\n\006parent\030\001 \001(\t\022" +
+      "\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"i" +
+      "\n\025ListInstancesResponse\0227\n\tinstances\030\001 \003" +
+      "(\0132$.google.cloud.redis.v1beta1.Instance" +
+      "\022\027\n\017next_page_token\030\002 \001(\t\"\"\n\022GetInstance" +
+      "Request\022\014\n\004name\030\001 \001(\t\"t\n\025CreateInstanceR" +
+      "equest\022\016\n\006parent\030\001 \001(\t\022\023\n\013instance_id\030\002 " +
+      "\001(\t\0226\n\010instance\030\003 \001(\0132$.google.cloud.red" +
+      "is.v1beta1.Instance\"\200\001\n\025UpdateInstanceRe" +
+      "quest\022/\n\013update_mask\030\001 \001(\0132\032.google.prot" +
+      "obuf.FieldMask\0226\n\010instance\030\002 \001(\0132$.googl" +
+      "e.cloud.redis.v1beta1.Instance\"%\n\025Delete" +
+      "InstanceRequest\022\014\n\004name\030\001 \001(\t\"\316\001\n\020Locati" +
+      "onMetadata\022Y\n\017available_zones\030\001 \003(\0132@.go" +
+      "ogle.cloud.redis.v1beta1.LocationMetadat" +
+      "a.AvailableZonesEntry\032_\n\023AvailableZonesE" +
+      "ntry\022\013\n\003key\030\001 \001(\t\0227\n\005value\030\002 \001(\0132(.googl" +
+      "e.cloud.redis.v1beta1.ZoneMetadata:\0028\001\"\016" +
+      "\n\014ZoneMetadata2\341\006\n\nCloudRedis\022\260\001\n\rListIn" +
+      "stances\0220.google.cloud.redis.v1beta1.Lis" +
+      "tInstancesRequest\0321.google.cloud.redis.v" +
+      "1beta1.ListInstancesResponse\":\202\323\344\223\0024\0222/v" +
+      "1beta1/{parent=projects/*/locations/*}/i" +
+      "nstances\022\237\001\n\013GetInstance\022..google.cloud." +
+      "redis.v1beta1.GetInstanceRequest\032$.googl" +
+      "e.cloud.redis.v1beta1.Instance\":\202\323\344\223\0024\0222" +
+      "/v1beta1/{name=projects/*/locations/*/in" +
+      "stances/*}\022\250\001\n\016CreateInstance\0221.google.c" +
+      "loud.redis.v1beta1.CreateInstanceRequest" +
+      "\032\035.google.longrunning.Operation\"D\202\323\344\223\002>\"" +
+      "2/v1beta1/{parent=projects/*/locations/*" +
+      "}/instances:\010instance\022\261\001\n\016UpdateInstance" +
+      "\0221.google.cloud.redis.v1beta1.UpdateInst" +
+      "anceRequest\032\035.google.longrunning.Operati" +
+      "on\"M\202\323\344\223\002G2;/v1beta1/{instance.name=proj" +
+      "ects/*/locations/*/instances/*}:\010instanc" +
+      "e\022\236\001\n\016DeleteInstance\0221.google.cloud.redi" +
+      "s.v1beta1.DeleteInstanceRequest\032\035.google" +
+      ".longrunning.Operation\":\202\323\344\223\0024*2/v1beta1" +
+      "/{name=projects/*/locations/*/instances/" +
+      "*}B\177\n\036com.google.cloud.redis.v1beta1B\032Cl" +
+      "oudRedisServiceBetaProtoP\001Z?google.golan" +
+      "g.org/genproto/googleapis/cloud/redis/v1" +
+      "beta1;redisb\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.api.AnnotationsProto.getDescriptor(),
+          com.google.longrunning.OperationsProto.getDescriptor(),
+          com.google.protobuf.FieldMaskProto.getDescriptor(),
+          com.google.protobuf.TimestampProto.getDescriptor(),
+        }, assigner);
+    internal_static_google_cloud_redis_v1beta1_Instance_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_cloud_redis_v1beta1_Instance_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_redis_v1beta1_Instance_descriptor,
+        new java.lang.String[] { "Name", "DisplayName", "Labels", "LocationId", "AlternativeLocationId", "RedisVersion", "ReservedIpRange", "Host", "Port", "CurrentLocationId", "CreateTime", "State", "StatusMessage", "RedisConfigs", "Tier", "MemorySizeGb", "AuthorizedNetwork", });
+    internal_static_google_cloud_redis_v1beta1_Instance_LabelsEntry_descriptor =
+      internal_static_google_cloud_redis_v1beta1_Instance_descriptor.getNestedTypes().get(0);
+    internal_static_google_cloud_redis_v1beta1_Instance_LabelsEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_redis_v1beta1_Instance_LabelsEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_google_cloud_redis_v1beta1_Instance_RedisConfigsEntry_descriptor =
+      internal_static_google_cloud_redis_v1beta1_Instance_descriptor.getNestedTypes().get(1);
+    internal_static_google_cloud_redis_v1beta1_Instance_RedisConfigsEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_redis_v1beta1_Instance_RedisConfigsEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_descriptor,
+        new java.lang.String[] { "Parent", "PageSize", "PageToken", });
+    internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_descriptor,
+        new java.lang.String[] { "Instances", "NextPageToken", });
+    internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_descriptor,
+        new java.lang.String[] { "Name", });
+    internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_descriptor =
+      getDescriptor().getMessageTypes().get(4);
+    internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_descriptor,
+        new java.lang.String[] { "Parent", "InstanceId", "Instance", });
+    internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_descriptor =
+      getDescriptor().getMessageTypes().get(5);
+    internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_descriptor,
+        new java.lang.String[] { "UpdateMask", "Instance", });
+    internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_descriptor =
+      getDescriptor().getMessageTypes().get(6);
+    internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_descriptor,
+        new java.lang.String[] { "Name", });
+    internal_static_google_cloud_redis_v1beta1_LocationMetadata_descriptor =
+      getDescriptor().getMessageTypes().get(7);
+    internal_static_google_cloud_redis_v1beta1_LocationMetadata_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_redis_v1beta1_LocationMetadata_descriptor,
+        new java.lang.String[] { "AvailableZones", });
+    internal_static_google_cloud_redis_v1beta1_LocationMetadata_AvailableZonesEntry_descriptor =
+      internal_static_google_cloud_redis_v1beta1_LocationMetadata_descriptor.getNestedTypes().get(0);
+    internal_static_google_cloud_redis_v1beta1_LocationMetadata_AvailableZonesEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_redis_v1beta1_LocationMetadata_AvailableZonesEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_google_cloud_redis_v1beta1_ZoneMetadata_descriptor =
+      getDescriptor().getMessageTypes().get(8);
+    internal_static_google_cloud_redis_v1beta1_ZoneMetadata_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_redis_v1beta1_ZoneMetadata_descriptor,
+        new java.lang.String[] { });
+    com.google.protobuf.ExtensionRegistry registry =
+        com.google.protobuf.ExtensionRegistry.newInstance();
+    registry.add(com.google.api.AnnotationsProto.http);
+    com.google.protobuf.Descriptors.FileDescriptor
+        .internalUpdateFileDescriptor(descriptor, registry);
+    com.google.api.AnnotationsProto.getDescriptor();
+    com.google.longrunning.OperationsProto.getDescriptor();
+    com.google.protobuf.FieldMaskProto.getDescriptor();
+    com.google.protobuf.TimestampProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java
new file mode 100644
index 000000000000..56a6b12756fb
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java
@@ -0,0 +1,992 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+/**
+ * 
+ * Request for [CreateInstance][google.cloud.redis.v1beta1.CloudRedis.CreateInstance].
+ * 

+ *
+ * Protobuf type {@code google.cloud.redis.v1beta1.CreateInstanceRequest}
+ */
+public  final class CreateInstanceRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.redis.v1beta1.CreateInstanceRequest)
+    CreateInstanceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use CreateInstanceRequest.newBuilder() to construct.
+  private CreateInstanceRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private CreateInstanceRequest() {
+    parent_ = "";
+    instanceId_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private CreateInstanceRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            instanceId_ = s;
+            break;
+          }
+          case 26: {
+            com.google.cloud.redis.v1beta1.Instance.Builder subBuilder = null;
+            if (instance_ != null) {
+              subBuilder = instance_.toBuilder();
+            }
+            instance_ = input.readMessage(com.google.cloud.redis.v1beta1.Instance.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(instance_);
+              instance_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.redis.v1beta1.CreateInstanceRequest.class, com.google.cloud.redis.v1beta1.CreateInstanceRequest.Builder.class);
+  }
+
+  public static final int PARENT_FIELD_NUMBER = 1;
+  private volatile java.lang.Object parent_;
+  /**
+   * 
+   * Required. The resource name of the instance location using the form:
+   *     `projects/{project_id}/locations/{location_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string parent = 1;
+   */
+  public java.lang.String getParent() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      parent_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required. The resource name of the instance location using the form:
+   *     `projects/{project_id}/locations/{location_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string parent = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParentBytes() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      parent_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int INSTANCE_ID_FIELD_NUMBER = 2;
+  private volatile java.lang.Object instanceId_;
+  /**
+   * 
+   * Required. The logical name of the Redis instance in the customer project
+   * with the following restrictions:
+   * * Must contain only lowercase letters, numbers, and hyphens.
+   * * Must start with a letter.
+   * * Must be between 1-40 characters.
+   * * Must end with a number or a letter.
+   * * Must be unique within the customer project / location
+   * 

+   *
+   * string instance_id = 2;
+   */
+  public java.lang.String getInstanceId() {
+    java.lang.Object ref = instanceId_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      instanceId_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required. The logical name of the Redis instance in the customer project
+   * with the following restrictions:
+   * * Must contain only lowercase letters, numbers, and hyphens.
+   * * Must start with a letter.
+   * * Must be between 1-40 characters.
+   * * Must end with a number or a letter.
+   * * Must be unique within the customer project / location
+   * 

+   *
+   * string instance_id = 2;
+   */
+  public com.google.protobuf.ByteString
+      getInstanceIdBytes() {
+    java.lang.Object ref = instanceId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      instanceId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int INSTANCE_FIELD_NUMBER = 3;
+  private com.google.cloud.redis.v1beta1.Instance instance_;
+  /**
+   * 
+   * Required. A Redis [Instance] resource
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance instance = 3;
+   */
+  public boolean hasInstance() {
+    return instance_ != null;
+  }
+  /**
+   * 
+   * Required. A Redis [Instance] resource
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance instance = 3;
+   */
+  public com.google.cloud.redis.v1beta1.Instance getInstance() {
+    return instance_ == null ? com.google.cloud.redis.v1beta1.Instance.getDefaultInstance() : instance_;
+  }
+  /**
+   * 
+   * Required. A Redis [Instance] resource
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance instance = 3;
+   */
+  public com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstanceOrBuilder() {
+    return getInstance();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getParentBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
+    }
+    if (!getInstanceIdBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, instanceId_);
+    }
+    if (instance_ != null) {
+      output.writeMessage(3, getInstance());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getParentBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
+    }
+    if (!getInstanceIdBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, instanceId_);
+    }
+    if (instance_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, getInstance());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.redis.v1beta1.CreateInstanceRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.redis.v1beta1.CreateInstanceRequest other = (com.google.cloud.redis.v1beta1.CreateInstanceRequest) obj;
+
+    boolean result = true;
+    result = result && getParent()
+        .equals(other.getParent());
+    result = result && getInstanceId()
+        .equals(other.getInstanceId());
+    result = result && (hasInstance() == other.hasInstance());
+    if (hasInstance()) {
+      result = result && getInstance()
+          .equals(other.getInstance());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PARENT_FIELD_NUMBER;
+    hash = (53 * hash) + getParent().hashCode();
+    hash = (37 * hash) + INSTANCE_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getInstanceId().hashCode();
+    if (hasInstance()) {
+      hash = (37 * hash) + INSTANCE_FIELD_NUMBER;
+      hash = (53 * hash) + getInstance().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.redis.v1beta1.CreateInstanceRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for [CreateInstance][google.cloud.redis.v1beta1.CloudRedis.CreateInstance].
+   * 

+   *
+   * Protobuf type {@code google.cloud.redis.v1beta1.CreateInstanceRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.redis.v1beta1.CreateInstanceRequest)
+      com.google.cloud.redis.v1beta1.CreateInstanceRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.redis.v1beta1.CreateInstanceRequest.class, com.google.cloud.redis.v1beta1.CreateInstanceRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.redis.v1beta1.CreateInstanceRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parent_ = "";
+
+      instanceId_ = "";
+
+      if (instanceBuilder_ == null) {
+        instance_ = null;
+      } else {
+        instance_ = null;
+        instanceBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_descriptor;
+    }
+
+    public com.google.cloud.redis.v1beta1.CreateInstanceRequest getDefaultInstanceForType() {
+      return com.google.cloud.redis.v1beta1.CreateInstanceRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.redis.v1beta1.CreateInstanceRequest build() {
+      com.google.cloud.redis.v1beta1.CreateInstanceRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.redis.v1beta1.CreateInstanceRequest buildPartial() {
+      com.google.cloud.redis.v1beta1.CreateInstanceRequest result = new com.google.cloud.redis.v1beta1.CreateInstanceRequest(this);
+      result.parent_ = parent_;
+      result.instanceId_ = instanceId_;
+      if (instanceBuilder_ == null) {
+        result.instance_ = instance_;
+      } else {
+        result.instance_ = instanceBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.redis.v1beta1.CreateInstanceRequest) {
+        return mergeFrom((com.google.cloud.redis.v1beta1.CreateInstanceRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.redis.v1beta1.CreateInstanceRequest other) {
+      if (other == com.google.cloud.redis.v1beta1.CreateInstanceRequest.getDefaultInstance()) return this;
+      if (!other.getParent().isEmpty()) {
+        parent_ = other.parent_;
+        onChanged();
+      }
+      if (!other.getInstanceId().isEmpty()) {
+        instanceId_ = other.instanceId_;
+        onChanged();
+      }
+      if (other.hasInstance()) {
+        mergeInstance(other.getInstance());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.redis.v1beta1.CreateInstanceRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.redis.v1beta1.CreateInstanceRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object parent_ = "";
+    /**
+     * 
+     * Required. The resource name of the instance location using the form:
+     *     `projects/{project_id}/locations/{location_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string parent = 1;
+     */
+    public java.lang.String getParent() {
+      java.lang.Object ref = parent_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        parent_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required. The resource name of the instance location using the form:
+     *     `projects/{project_id}/locations/{location_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string parent = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParentBytes() {
+      java.lang.Object ref = parent_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        parent_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required. The resource name of the instance location using the form:
+     *     `projects/{project_id}/locations/{location_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParent(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. The resource name of the instance location using the form:
+     *     `projects/{project_id}/locations/{location_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder clearParent() {
+      
+      parent_ = getDefaultInstance().getParent();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. The resource name of the instance location using the form:
+     *     `projects/{project_id}/locations/{location_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParentBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object instanceId_ = "";
+    /**
+     * 
+     * Required. The logical name of the Redis instance in the customer project
+     * with the following restrictions:
+     * * Must contain only lowercase letters, numbers, and hyphens.
+     * * Must start with a letter.
+     * * Must be between 1-40 characters.
+     * * Must end with a number or a letter.
+     * * Must be unique within the customer project / location
+     * 

+     *
+     * string instance_id = 2;
+     */
+    public java.lang.String getInstanceId() {
+      java.lang.Object ref = instanceId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        instanceId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required. The logical name of the Redis instance in the customer project
+     * with the following restrictions:
+     * * Must contain only lowercase letters, numbers, and hyphens.
+     * * Must start with a letter.
+     * * Must be between 1-40 characters.
+     * * Must end with a number or a letter.
+     * * Must be unique within the customer project / location
+     * 

+     *
+     * string instance_id = 2;
+     */
+    public com.google.protobuf.ByteString
+        getInstanceIdBytes() {
+      java.lang.Object ref = instanceId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        instanceId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required. The logical name of the Redis instance in the customer project
+     * with the following restrictions:
+     * * Must contain only lowercase letters, numbers, and hyphens.
+     * * Must start with a letter.
+     * * Must be between 1-40 characters.
+     * * Must end with a number or a letter.
+     * * Must be unique within the customer project / location
+     * 

+     *
+     * string instance_id = 2;
+     */
+    public Builder setInstanceId(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      instanceId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. The logical name of the Redis instance in the customer project
+     * with the following restrictions:
+     * * Must contain only lowercase letters, numbers, and hyphens.
+     * * Must start with a letter.
+     * * Must be between 1-40 characters.
+     * * Must end with a number or a letter.
+     * * Must be unique within the customer project / location
+     * 

+     *
+     * string instance_id = 2;
+     */
+    public Builder clearInstanceId() {
+      
+      instanceId_ = getDefaultInstance().getInstanceId();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. The logical name of the Redis instance in the customer project
+     * with the following restrictions:
+     * * Must contain only lowercase letters, numbers, and hyphens.
+     * * Must start with a letter.
+     * * Must be between 1-40 characters.
+     * * Must end with a number or a letter.
+     * * Must be unique within the customer project / location
+     * 

+     *
+     * string instance_id = 2;
+     */
+    public Builder setInstanceIdBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      instanceId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.cloud.redis.v1beta1.Instance instance_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.redis.v1beta1.Instance, com.google.cloud.redis.v1beta1.Instance.Builder, com.google.cloud.redis.v1beta1.InstanceOrBuilder> instanceBuilder_;
+    /**
+     * 
+     * Required. A Redis [Instance] resource
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 3;
+     */
+    public boolean hasInstance() {
+      return instanceBuilder_ != null || instance_ != null;
+    }
+    /**
+     * 
+     * Required. A Redis [Instance] resource
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 3;
+     */
+    public com.google.cloud.redis.v1beta1.Instance getInstance() {
+      if (instanceBuilder_ == null) {
+        return instance_ == null ? com.google.cloud.redis.v1beta1.Instance.getDefaultInstance() : instance_;
+      } else {
+        return instanceBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Required. A Redis [Instance] resource
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 3;
+     */
+    public Builder setInstance(com.google.cloud.redis.v1beta1.Instance value) {
+      if (instanceBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        instance_ = value;
+        onChanged();
+      } else {
+        instanceBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. A Redis [Instance] resource
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 3;
+     */
+    public Builder setInstance(
+        com.google.cloud.redis.v1beta1.Instance.Builder builderForValue) {
+      if (instanceBuilder_ == null) {
+        instance_ = builderForValue.build();
+        onChanged();
+      } else {
+        instanceBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. A Redis [Instance] resource
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 3;
+     */
+    public Builder mergeInstance(com.google.cloud.redis.v1beta1.Instance value) {
+      if (instanceBuilder_ == null) {
+        if (instance_ != null) {
+          instance_ =
+            com.google.cloud.redis.v1beta1.Instance.newBuilder(instance_).mergeFrom(value).buildPartial();
+        } else {
+          instance_ = value;
+        }
+        onChanged();
+      } else {
+        instanceBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. A Redis [Instance] resource
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 3;
+     */
+    public Builder clearInstance() {
+      if (instanceBuilder_ == null) {
+        instance_ = null;
+        onChanged();
+      } else {
+        instance_ = null;
+        instanceBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. A Redis [Instance] resource
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 3;
+     */
+    public com.google.cloud.redis.v1beta1.Instance.Builder getInstanceBuilder() {
+      
+      onChanged();
+      return getInstanceFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Required. A Redis [Instance] resource
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 3;
+     */
+    public com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstanceOrBuilder() {
+      if (instanceBuilder_ != null) {
+        return instanceBuilder_.getMessageOrBuilder();
+      } else {
+        return instance_ == null ?
+            com.google.cloud.redis.v1beta1.Instance.getDefaultInstance() : instance_;
+      }
+    }
+    /**
+     * 
+     * Required. A Redis [Instance] resource
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.redis.v1beta1.Instance, com.google.cloud.redis.v1beta1.Instance.Builder, com.google.cloud.redis.v1beta1.InstanceOrBuilder> 
+        getInstanceFieldBuilder() {
+      if (instanceBuilder_ == null) {
+        instanceBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.redis.v1beta1.Instance, com.google.cloud.redis.v1beta1.Instance.Builder, com.google.cloud.redis.v1beta1.InstanceOrBuilder>(
+                getInstance(),
+                getParentForChildren(),
+                isClean());
+        instance_ = null;
+      }
+      return instanceBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.redis.v1beta1.CreateInstanceRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.redis.v1beta1.CreateInstanceRequest)
+  private static final com.google.cloud.redis.v1beta1.CreateInstanceRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.redis.v1beta1.CreateInstanceRequest();
+  }
+
+  public static com.google.cloud.redis.v1beta1.CreateInstanceRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public CreateInstanceRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new CreateInstanceRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.redis.v1beta1.CreateInstanceRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequestOrBuilder.java
new file mode 100644
index 000000000000..b4e288a45805
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequestOrBuilder.java
@@ -0,0 +1,86 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+public interface CreateInstanceRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.redis.v1beta1.CreateInstanceRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required. The resource name of the instance location using the form:
+   *     `projects/{project_id}/locations/{location_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string parent = 1;
+   */
+  java.lang.String getParent();
+  /**
+   * 
+   * Required. The resource name of the instance location using the form:
+   *     `projects/{project_id}/locations/{location_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string parent = 1;
+   */
+  com.google.protobuf.ByteString
+      getParentBytes();
+
+  /**
+   * 
+   * Required. The logical name of the Redis instance in the customer project
+   * with the following restrictions:
+   * * Must contain only lowercase letters, numbers, and hyphens.
+   * * Must start with a letter.
+   * * Must be between 1-40 characters.
+   * * Must end with a number or a letter.
+   * * Must be unique within the customer project / location
+   * 

+   *
+   * string instance_id = 2;
+   */
+  java.lang.String getInstanceId();
+  /**
+   * 
+   * Required. The logical name of the Redis instance in the customer project
+   * with the following restrictions:
+   * * Must contain only lowercase letters, numbers, and hyphens.
+   * * Must start with a letter.
+   * * Must be between 1-40 characters.
+   * * Must end with a number or a letter.
+   * * Must be unique within the customer project / location
+   * 

+   *
+   * string instance_id = 2;
+   */
+  com.google.protobuf.ByteString
+      getInstanceIdBytes();
+
+  /**
+   * 
+   * Required. A Redis [Instance] resource
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance instance = 3;
+   */
+  boolean hasInstance();
+  /**
+   * 
+   * Required. A Redis [Instance] resource
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance instance = 3;
+   */
+  com.google.cloud.redis.v1beta1.Instance getInstance();
+  /**
+   * 
+   * Required. A Redis [Instance] resource
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance instance = 3;
+   */
+  com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstanceOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java
new file mode 100644
index 000000000000..1b5365ea21f3
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java
@@ -0,0 +1,566 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+/**
+ * 
+ * Request for [DeleteInstance][google.cloud.redis.v1beta1.CloudRedis.DeleteInstance].
+ * 

+ *
+ * Protobuf type {@code google.cloud.redis.v1beta1.DeleteInstanceRequest}
+ */
+public  final class DeleteInstanceRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.redis.v1beta1.DeleteInstanceRequest)
+    DeleteInstanceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use DeleteInstanceRequest.newBuilder() to construct.
+  private DeleteInstanceRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private DeleteInstanceRequest() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private DeleteInstanceRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.redis.v1beta1.DeleteInstanceRequest.class, com.google.cloud.redis.v1beta1.DeleteInstanceRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * Required. Redis instance resource name using the form:
+   *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required. Redis instance resource name using the form:
+   *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.redis.v1beta1.DeleteInstanceRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.redis.v1beta1.DeleteInstanceRequest other = (com.google.cloud.redis.v1beta1.DeleteInstanceRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.redis.v1beta1.DeleteInstanceRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for [DeleteInstance][google.cloud.redis.v1beta1.CloudRedis.DeleteInstance].
+   * 

+   *
+   * Protobuf type {@code google.cloud.redis.v1beta1.DeleteInstanceRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.redis.v1beta1.DeleteInstanceRequest)
+      com.google.cloud.redis.v1beta1.DeleteInstanceRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.redis.v1beta1.DeleteInstanceRequest.class, com.google.cloud.redis.v1beta1.DeleteInstanceRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.redis.v1beta1.DeleteInstanceRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_descriptor;
+    }
+
+    public com.google.cloud.redis.v1beta1.DeleteInstanceRequest getDefaultInstanceForType() {
+      return com.google.cloud.redis.v1beta1.DeleteInstanceRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.redis.v1beta1.DeleteInstanceRequest build() {
+      com.google.cloud.redis.v1beta1.DeleteInstanceRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.redis.v1beta1.DeleteInstanceRequest buildPartial() {
+      com.google.cloud.redis.v1beta1.DeleteInstanceRequest result = new com.google.cloud.redis.v1beta1.DeleteInstanceRequest(this);
+      result.name_ = name_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.redis.v1beta1.DeleteInstanceRequest) {
+        return mergeFrom((com.google.cloud.redis.v1beta1.DeleteInstanceRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.redis.v1beta1.DeleteInstanceRequest other) {
+      if (other == com.google.cloud.redis.v1beta1.DeleteInstanceRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.redis.v1beta1.DeleteInstanceRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.redis.v1beta1.DeleteInstanceRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * Required. Redis instance resource name using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required. Redis instance resource name using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required. Redis instance resource name using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. Redis instance resource name using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. Redis instance resource name using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.redis.v1beta1.DeleteInstanceRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.redis.v1beta1.DeleteInstanceRequest)
+  private static final com.google.cloud.redis.v1beta1.DeleteInstanceRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.redis.v1beta1.DeleteInstanceRequest();
+  }
+
+  public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public DeleteInstanceRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new DeleteInstanceRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.redis.v1beta1.DeleteInstanceRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequestOrBuilder.java
new file mode 100644
index 000000000000..1094462f1181
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequestOrBuilder.java
@@ -0,0 +1,31 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+public interface DeleteInstanceRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.redis.v1beta1.DeleteInstanceRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required. Redis instance resource name using the form:
+   *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * Required. Redis instance resource name using the form:
+   *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java
new file mode 100644
index 000000000000..db517813a34f
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java
@@ -0,0 +1,566 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+/**
+ * 
+ * Request for [GetInstance][google.cloud.redis.v1beta1.CloudRedis.GetInstance].
+ * 

+ *
+ * Protobuf type {@code google.cloud.redis.v1beta1.GetInstanceRequest}
+ */
+public  final class GetInstanceRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.redis.v1beta1.GetInstanceRequest)
+    GetInstanceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use GetInstanceRequest.newBuilder() to construct.
+  private GetInstanceRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private GetInstanceRequest() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private GetInstanceRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.redis.v1beta1.GetInstanceRequest.class, com.google.cloud.redis.v1beta1.GetInstanceRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * Required. Redis instance resource name using the form:
+   *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required. Redis instance resource name using the form:
+   *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.redis.v1beta1.GetInstanceRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.redis.v1beta1.GetInstanceRequest other = (com.google.cloud.redis.v1beta1.GetInstanceRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.redis.v1beta1.GetInstanceRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for [GetInstance][google.cloud.redis.v1beta1.CloudRedis.GetInstance].
+   * 

+   *
+   * Protobuf type {@code google.cloud.redis.v1beta1.GetInstanceRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.redis.v1beta1.GetInstanceRequest)
+      com.google.cloud.redis.v1beta1.GetInstanceRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.redis.v1beta1.GetInstanceRequest.class, com.google.cloud.redis.v1beta1.GetInstanceRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.redis.v1beta1.GetInstanceRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_descriptor;
+    }
+
+    public com.google.cloud.redis.v1beta1.GetInstanceRequest getDefaultInstanceForType() {
+      return com.google.cloud.redis.v1beta1.GetInstanceRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.redis.v1beta1.GetInstanceRequest build() {
+      com.google.cloud.redis.v1beta1.GetInstanceRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.redis.v1beta1.GetInstanceRequest buildPartial() {
+      com.google.cloud.redis.v1beta1.GetInstanceRequest result = new com.google.cloud.redis.v1beta1.GetInstanceRequest(this);
+      result.name_ = name_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.redis.v1beta1.GetInstanceRequest) {
+        return mergeFrom((com.google.cloud.redis.v1beta1.GetInstanceRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.redis.v1beta1.GetInstanceRequest other) {
+      if (other == com.google.cloud.redis.v1beta1.GetInstanceRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.redis.v1beta1.GetInstanceRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.redis.v1beta1.GetInstanceRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * Required. Redis instance resource name using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required. Redis instance resource name using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required. Redis instance resource name using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. Redis instance resource name using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. Redis instance resource name using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.redis.v1beta1.GetInstanceRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.redis.v1beta1.GetInstanceRequest)
+  private static final com.google.cloud.redis.v1beta1.GetInstanceRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.redis.v1beta1.GetInstanceRequest();
+  }
+
+  public static com.google.cloud.redis.v1beta1.GetInstanceRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public GetInstanceRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new GetInstanceRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.redis.v1beta1.GetInstanceRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequestOrBuilder.java
new file mode 100644
index 000000000000..2ce4a4f9a288
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequestOrBuilder.java
@@ -0,0 +1,31 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+public interface GetInstanceRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.redis.v1beta1.GetInstanceRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required. Redis instance resource name using the form:
+   *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * Required. Redis instance resource name using the form:
+   *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java
new file mode 100644
index 000000000000..ad98640e31ec
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java
@@ -0,0 +1,3726 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+/**
+ * 
+ * A Google Cloud Redis instance.
+ * 

+ *
+ * Protobuf type {@code google.cloud.redis.v1beta1.Instance}
+ */
+public  final class Instance extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.redis.v1beta1.Instance)
+    InstanceOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use Instance.newBuilder() to construct.
+  private Instance(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private Instance() {
+    name_ = "";
+    displayName_ = "";
+    locationId_ = "";
+    alternativeLocationId_ = "";
+    redisVersion_ = "";
+    reservedIpRange_ = "";
+    host_ = "";
+    port_ = 0;
+    currentLocationId_ = "";
+    state_ = 0;
+    statusMessage_ = "";
+    tier_ = 0;
+    memorySizeGb_ = 0;
+    authorizedNetwork_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private Instance(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            displayName_ = s;
+            break;
+          }
+          case 26: {
+            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+              labels_ = com.google.protobuf.MapField.newMapField(
+                  LabelsDefaultEntryHolder.defaultEntry);
+              mutable_bitField0_ |= 0x00000004;
+            }
+            com.google.protobuf.MapEntry
+            labels__ = input.readMessage(
+                LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+            labels_.getMutableMap().put(
+                labels__.getKey(), labels__.getValue());
+            break;
+          }
+          case 34: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            locationId_ = s;
+            break;
+          }
+          case 42: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            alternativeLocationId_ = s;
+            break;
+          }
+          case 58: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            redisVersion_ = s;
+            break;
+          }
+          case 74: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            reservedIpRange_ = s;
+            break;
+          }
+          case 82: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            host_ = s;
+            break;
+          }
+          case 88: {
+
+            port_ = input.readInt32();
+            break;
+          }
+          case 98: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            currentLocationId_ = s;
+            break;
+          }
+          case 106: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (createTime_ != null) {
+              subBuilder = createTime_.toBuilder();
+            }
+            createTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(createTime_);
+              createTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 112: {
+            int rawValue = input.readEnum();
+
+            state_ = rawValue;
+            break;
+          }
+          case 122: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            statusMessage_ = s;
+            break;
+          }
+          case 130: {
+            if (!((mutable_bitField0_ & 0x00002000) == 0x00002000)) {
+              redisConfigs_ = com.google.protobuf.MapField.newMapField(
+                  RedisConfigsDefaultEntryHolder.defaultEntry);
+              mutable_bitField0_ |= 0x00002000;
+            }
+            com.google.protobuf.MapEntry
+            redisConfigs__ = input.readMessage(
+                RedisConfigsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+            redisConfigs_.getMutableMap().put(
+                redisConfigs__.getKey(), redisConfigs__.getValue());
+            break;
+          }
+          case 136: {
+            int rawValue = input.readEnum();
+
+            tier_ = rawValue;
+            break;
+          }
+          case 144: {
+
+            memorySizeGb_ = input.readInt32();
+            break;
+          }
+          case 162: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            authorizedNetwork_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_Instance_descriptor;
+  }
+
+  @SuppressWarnings({"rawtypes"})
+  protected com.google.protobuf.MapField internalGetMapField(
+      int number) {
+    switch (number) {
+      case 3:
+        return internalGetLabels();
+      case 16:
+        return internalGetRedisConfigs();
+      default:
+        throw new RuntimeException(
+            "Invalid map field number: " + number);
+    }
+  }
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_Instance_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.redis.v1beta1.Instance.class, com.google.cloud.redis.v1beta1.Instance.Builder.class);
+  }
+
+  /**
+   * 
+   * Represents the different states of a Redis instance.
+   * 

+   *
+   * Protobuf enum {@code google.cloud.redis.v1beta1.Instance.State}
+   */
+  public enum State
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * 
+     * Not set.
+     * 

+     *
+     * STATE_UNSPECIFIED = 0;
+     */
+    STATE_UNSPECIFIED(0),
+    /**
+     * 
+     * Redis instance is being created.
+     * 

+     *
+     * CREATING = 1;
+     */
+    CREATING(1),
+    /**
+     * 
+     * Redis instance has been created and is fully usable.
+     * 

+     *
+     * READY = 2;
+     */
+    READY(2),
+    /**
+     * 
+     * Redis instance configuration is being updated. Certain kinds of updates
+     * may cause the instance to become unusable while the update is in
+     * progress.
+     * 

+     *
+     * UPDATING = 3;
+     */
+    UPDATING(3),
+    /**
+     * 
+     * Redis instance is being deleted.
+     * 

+     *
+     * DELETING = 4;
+     */
+    DELETING(4),
+    /**
+     * 
+     * Redis instance is being repaired and may be unusable. Details can be
+     * found in the `status_message` field.
+     * 

+     *
+     * REPAIRING = 5;
+     */
+    REPAIRING(5),
+    /**
+     * 
+     * Maintenance is being performed on this Redis instance.
+     * 

+     *
+     * MAINTENANCE = 6;
+     */
+    MAINTENANCE(6),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * 
+     * Not set.
+     * 

+     *
+     * STATE_UNSPECIFIED = 0;
+     */
+    public static final int STATE_UNSPECIFIED_VALUE = 0;
+    /**
+     * 
+     * Redis instance is being created.
+     * 

+     *
+     * CREATING = 1;
+     */
+    public static final int CREATING_VALUE = 1;
+    /**
+     * 
+     * Redis instance has been created and is fully usable.
+     * 

+     *
+     * READY = 2;
+     */
+    public static final int READY_VALUE = 2;
+    /**
+     * 
+     * Redis instance configuration is being updated. Certain kinds of updates
+     * may cause the instance to become unusable while the update is in
+     * progress.
+     * 

+     *
+     * UPDATING = 3;
+     */
+    public static final int UPDATING_VALUE = 3;
+    /**
+     * 
+     * Redis instance is being deleted.
+     * 

+     *
+     * DELETING = 4;
+     */
+    public static final int DELETING_VALUE = 4;
+    /**
+     * 
+     * Redis instance is being repaired and may be unusable. Details can be
+     * found in the `status_message` field.
+     * 

+     *
+     * REPAIRING = 5;
+     */
+    public static final int REPAIRING_VALUE = 5;
+    /**
+     * 
+     * Maintenance is being performed on this Redis instance.
+     * 

+     *
+     * MAINTENANCE = 6;
+     */
+    public static final int MAINTENANCE_VALUE = 6;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static State valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static State forNumber(int value) {
+      switch (value) {
+        case 0: return STATE_UNSPECIFIED;
+        case 1: return CREATING;
+        case 2: return READY;
+        case 3: return UPDATING;
+        case 4: return DELETING;
+        case 5: return REPAIRING;
+        case 6: return MAINTENANCE;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        State> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public State findValueByNumber(int number) {
+              return State.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return com.google.cloud.redis.v1beta1.Instance.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final State[] VALUES = values();
+
+    public static State valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private State(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.cloud.redis.v1beta1.Instance.State)
+  }
+
+  /**
+   * 
+   * Available service tiers to choose from
+   * 

+   *
+   * Protobuf enum {@code google.cloud.redis.v1beta1.Instance.Tier}
+   */
+  public enum Tier
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * 
+     * Not set.
+     * 

+     *
+     * TIER_UNSPECIFIED = 0;
+     */
+    TIER_UNSPECIFIED(0),
+    /**
+     * 
+     * BASIC tier: standalone instance
+     * 

+     *
+     * BASIC = 1;
+     */
+    BASIC(1),
+    /**
+     * 
+     * STANDARD_HA tier: highly available primary/replica instances
+     * 

+     *
+     * STANDARD_HA = 3;
+     */
+    STANDARD_HA(3),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * 
+     * Not set.
+     * 

+     *
+     * TIER_UNSPECIFIED = 0;
+     */
+    public static final int TIER_UNSPECIFIED_VALUE = 0;
+    /**
+     * 
+     * BASIC tier: standalone instance
+     * 

+     *
+     * BASIC = 1;
+     */
+    public static final int BASIC_VALUE = 1;
+    /**
+     * 
+     * STANDARD_HA tier: highly available primary/replica instances
+     * 

+     *
+     * STANDARD_HA = 3;
+     */
+    public static final int STANDARD_HA_VALUE = 3;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static Tier valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static Tier forNumber(int value) {
+      switch (value) {
+        case 0: return TIER_UNSPECIFIED;
+        case 1: return BASIC;
+        case 3: return STANDARD_HA;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        Tier> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public Tier findValueByNumber(int number) {
+              return Tier.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return com.google.cloud.redis.v1beta1.Instance.getDescriptor().getEnumTypes().get(1);
+    }
+
+    private static final Tier[] VALUES = values();
+
+    public static Tier valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private Tier(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.cloud.redis.v1beta1.Instance.Tier)
+  }
+
+  private int bitField0_;
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * Required. Unique name of the resource in this scope including project and
+   * location using the form:
+   *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * Note: Redis instances are managed and addressed at regional level so
+   * location_id here refers to a GCP region; however, users get to choose which
+   * specific zone (or collection of zones for cross-zone instances) an instance
+   * should be provisioned in. Refer to [location_id] and
+   * [alternative_location_id] fields for more details.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required. Unique name of the resource in this scope including project and
+   * location using the form:
+   *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * Note: Redis instances are managed and addressed at regional level so
+   * location_id here refers to a GCP region; however, users get to choose which
+   * specific zone (or collection of zones for cross-zone instances) an instance
+   * should be provisioned in. Refer to [location_id] and
+   * [alternative_location_id] fields for more details.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
+  private volatile java.lang.Object displayName_;
+  /**
+   * 
+   * An arbitrary and optional user-provided name for the instance.
+   * 

+   *
+   * string display_name = 2;
+   */
+  public java.lang.String getDisplayName() {
+    java.lang.Object ref = displayName_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      displayName_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * An arbitrary and optional user-provided name for the instance.
+   * 

+   *
+   * string display_name = 2;
+   */
+  public com.google.protobuf.ByteString
+      getDisplayNameBytes() {
+    java.lang.Object ref = displayName_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      displayName_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int LABELS_FIELD_NUMBER = 3;
+  private static final class LabelsDefaultEntryHolder {
+    static final com.google.protobuf.MapEntry<
+        java.lang.String, java.lang.String> defaultEntry =
+            com.google.protobuf.MapEntry
+            .newDefaultInstance(
+                com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_Instance_LabelsEntry_descriptor, 
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "",
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "");
+  }
+  private com.google.protobuf.MapField<
+      java.lang.String, java.lang.String> labels_;
+  private com.google.protobuf.MapField
+  internalGetLabels() {
+    if (labels_ == null) {
+      return com.google.protobuf.MapField.emptyMapField(
+          LabelsDefaultEntryHolder.defaultEntry);
+    }
+    return labels_;
+  }
+
+  public int getLabelsCount() {
+    return internalGetLabels().getMap().size();
+  }
+  /**
+   * 
+   * Resource labels to represent user provided metadata
+   * 

+   *
+   * map<string, string> labels = 3;
+   */
+
+  public boolean containsLabels(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    return internalGetLabels().getMap().containsKey(key);
+  }
+  /**
+   * Use {@link #getLabelsMap()} instead.
+   */
+  @java.lang.Deprecated
+  public java.util.Map getLabels() {
+    return getLabelsMap();
+  }
+  /**
+   * 
+   * Resource labels to represent user provided metadata
+   * 

+   *
+   * map<string, string> labels = 3;
+   */
+
+  public java.util.Map getLabelsMap() {
+    return internalGetLabels().getMap();
+  }
+  /**
+   * 
+   * Resource labels to represent user provided metadata
+   * 

+   *
+   * map<string, string> labels = 3;
+   */
+
+  public java.lang.String getLabelsOrDefault(
+      java.lang.String key,
+      java.lang.String defaultValue) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    java.util.Map map =
+        internalGetLabels().getMap();
+    return map.containsKey(key) ? map.get(key) : defaultValue;
+  }
+  /**
+   * 
+   * Resource labels to represent user provided metadata
+   * 

+   *
+   * map<string, string> labels = 3;
+   */
+
+  public java.lang.String getLabelsOrThrow(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    java.util.Map map =
+        internalGetLabels().getMap();
+    if (!map.containsKey(key)) {
+      throw new java.lang.IllegalArgumentException();
+    }
+    return map.get(key);
+  }
+
+  public static final int LOCATION_ID_FIELD_NUMBER = 4;
+  private volatile java.lang.Object locationId_;
+  /**
+   * 
+   * Optional. The zone where the instance will be provisioned. If not provided,
+   * the service will choose a zone for the instance. For STANDARD_HA tier,
+   * instances will be created across two zones for protection against zonal
+   * failures. if [alternative_location_id] is also provided, it must be
+   * different from [location_id].
+   * 

+   *
+   * string location_id = 4;
+   */
+  public java.lang.String getLocationId() {
+    java.lang.Object ref = locationId_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      locationId_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Optional. The zone where the instance will be provisioned. If not provided,
+   * the service will choose a zone for the instance. For STANDARD_HA tier,
+   * instances will be created across two zones for protection against zonal
+   * failures. if [alternative_location_id] is also provided, it must be
+   * different from [location_id].
+   * 

+   *
+   * string location_id = 4;
+   */
+  public com.google.protobuf.ByteString
+      getLocationIdBytes() {
+    java.lang.Object ref = locationId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      locationId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int ALTERNATIVE_LOCATION_ID_FIELD_NUMBER = 5;
+  private volatile java.lang.Object alternativeLocationId_;
+  /**
+   * 
+   * Optional. Only applicable to STANDARD_HA tier which protects the instance
+   * against zonal failures by provisioning it across two zones. If provided, it
+   * must be a different zone from the one provided in [location_id].
+   * 

+   *
+   * string alternative_location_id = 5;
+   */
+  public java.lang.String getAlternativeLocationId() {
+    java.lang.Object ref = alternativeLocationId_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      alternativeLocationId_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Optional. Only applicable to STANDARD_HA tier which protects the instance
+   * against zonal failures by provisioning it across two zones. If provided, it
+   * must be a different zone from the one provided in [location_id].
+   * 

+   *
+   * string alternative_location_id = 5;
+   */
+  public com.google.protobuf.ByteString
+      getAlternativeLocationIdBytes() {
+    java.lang.Object ref = alternativeLocationId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      alternativeLocationId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int REDIS_VERSION_FIELD_NUMBER = 7;
+  private volatile java.lang.Object redisVersion_;
+  /**
+   * 
+   * Optional. The version of Redis software.
+   * If not provided, latest supported version will be used.
+   * 

+   *
+   * string redis_version = 7;
+   */
+  public java.lang.String getRedisVersion() {
+    java.lang.Object ref = redisVersion_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      redisVersion_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Optional. The version of Redis software.
+   * If not provided, latest supported version will be used.
+   * 

+   *
+   * string redis_version = 7;
+   */
+  public com.google.protobuf.ByteString
+      getRedisVersionBytes() {
+    java.lang.Object ref = redisVersion_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      redisVersion_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int RESERVED_IP_RANGE_FIELD_NUMBER = 9;
+  private volatile java.lang.Object reservedIpRange_;
+  /**
+   * 
+   * Optional. The CIDR range of internal addresses that are reserved for this
+   * instance. If not provided, the service will choose an unused /29 block,
+   * for example, 10.0.0.0/29 or 192.168.0.0/29. Ranges must be unique
+   * and non-overlapping with existing subnets in a network.
+   * 

+   *
+   * string reserved_ip_range = 9;
+   */
+  public java.lang.String getReservedIpRange() {
+    java.lang.Object ref = reservedIpRange_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      reservedIpRange_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Optional. The CIDR range of internal addresses that are reserved for this
+   * instance. If not provided, the service will choose an unused /29 block,
+   * for example, 10.0.0.0/29 or 192.168.0.0/29. Ranges must be unique
+   * and non-overlapping with existing subnets in a network.
+   * 

+   *
+   * string reserved_ip_range = 9;
+   */
+  public com.google.protobuf.ByteString
+      getReservedIpRangeBytes() {
+    java.lang.Object ref = reservedIpRange_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      reservedIpRange_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int HOST_FIELD_NUMBER = 10;
+  private volatile java.lang.Object host_;
+  /**
+   * 
+   * Output only. Hostname or IP address of the exposed redis endpoint used by
+   * clients to connect to the service.
+   * 

+   *
+   * string host = 10;
+   */
+  public java.lang.String getHost() {
+    java.lang.Object ref = host_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      host_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only. Hostname or IP address of the exposed redis endpoint used by
+   * clients to connect to the service.
+   * 

+   *
+   * string host = 10;
+   */
+  public com.google.protobuf.ByteString
+      getHostBytes() {
+    java.lang.Object ref = host_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      host_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PORT_FIELD_NUMBER = 11;
+  private int port_;
+  /**
+   * 
+   * Output only. The port number of the exposed redis endpoint.
+   * 

+   *
+   * int32 port = 11;
+   */
+  public int getPort() {
+    return port_;
+  }
+
+  public static final int CURRENT_LOCATION_ID_FIELD_NUMBER = 12;
+  private volatile java.lang.Object currentLocationId_;
+  /**
+   * 
+   * Output only. The current zone where the Redis endpoint is placed. In
+   * single zone deployments, this will always be the same as [location_id]
+   * provided by the user at creation time. In cross-zone instances (only
+   * applicable in STANDARD_HA tier), this can be either [location_id] or
+   * [alternative_location_id] and can change on a failover event.
+   * 

+   *
+   * string current_location_id = 12;
+   */
+  public java.lang.String getCurrentLocationId() {
+    java.lang.Object ref = currentLocationId_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      currentLocationId_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only. The current zone where the Redis endpoint is placed. In
+   * single zone deployments, this will always be the same as [location_id]
+   * provided by the user at creation time. In cross-zone instances (only
+   * applicable in STANDARD_HA tier), this can be either [location_id] or
+   * [alternative_location_id] and can change on a failover event.
+   * 

+   *
+   * string current_location_id = 12;
+   */
+  public com.google.protobuf.ByteString
+      getCurrentLocationIdBytes() {
+    java.lang.Object ref = currentLocationId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      currentLocationId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int CREATE_TIME_FIELD_NUMBER = 13;
+  private com.google.protobuf.Timestamp createTime_;
+  /**
+   * 
+   * Output only. The time the instance was created.
+   * 

+   *
+   * .google.protobuf.Timestamp create_time = 13;
+   */
+  public boolean hasCreateTime() {
+    return createTime_ != null;
+  }
+  /**
+   * 
+   * Output only. The time the instance was created.
+   * 

+   *
+   * .google.protobuf.Timestamp create_time = 13;
+   */
+  public com.google.protobuf.Timestamp getCreateTime() {
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+  }
+  /**
+   * 
+   * Output only. The time the instance was created.
+   * 

+   *
+   * .google.protobuf.Timestamp create_time = 13;
+   */
+  public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
+    return getCreateTime();
+  }
+
+  public static final int STATE_FIELD_NUMBER = 14;
+  private int state_;
+  /**
+   * 
+   * Output only. The current state of this instance.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance.State state = 14;
+   */
+  public int getStateValue() {
+    return state_;
+  }
+  /**
+   * 
+   * Output only. The current state of this instance.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance.State state = 14;
+   */
+  public com.google.cloud.redis.v1beta1.Instance.State getState() {
+    com.google.cloud.redis.v1beta1.Instance.State result = com.google.cloud.redis.v1beta1.Instance.State.valueOf(state_);
+    return result == null ? com.google.cloud.redis.v1beta1.Instance.State.UNRECOGNIZED : result;
+  }
+
+  public static final int STATUS_MESSAGE_FIELD_NUMBER = 15;
+  private volatile java.lang.Object statusMessage_;
+  /**
+   * 
+   * Output only. Additional information about the current status of this
+   * instance, if available.
+   * 

+   *
+   * string status_message = 15;
+   */
+  public java.lang.String getStatusMessage() {
+    java.lang.Object ref = statusMessage_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      statusMessage_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only. Additional information about the current status of this
+   * instance, if available.
+   * 

+   *
+   * string status_message = 15;
+   */
+  public com.google.protobuf.ByteString
+      getStatusMessageBytes() {
+    java.lang.Object ref = statusMessage_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      statusMessage_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int REDIS_CONFIGS_FIELD_NUMBER = 16;
+  private static final class RedisConfigsDefaultEntryHolder {
+    static final com.google.protobuf.MapEntry<
+        java.lang.String, java.lang.String> defaultEntry =
+            com.google.protobuf.MapEntry
+            .newDefaultInstance(
+                com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_Instance_RedisConfigsEntry_descriptor, 
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "",
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "");
+  }
+  private com.google.protobuf.MapField<
+      java.lang.String, java.lang.String> redisConfigs_;
+  private com.google.protobuf.MapField
+  internalGetRedisConfigs() {
+    if (redisConfigs_ == null) {
+      return com.google.protobuf.MapField.emptyMapField(
+          RedisConfigsDefaultEntryHolder.defaultEntry);
+    }
+    return redisConfigs_;
+  }
+
+  public int getRedisConfigsCount() {
+    return internalGetRedisConfigs().getMap().size();
+  }
+  /**
+   * 
+   * Optional. Redis configuration parameters, according to
+   * http://redis.io/topics/config. Currently, the only supported parameters
+   * are:
+   *  * maxmemory-policy
+   *  * notify-keyspace-events
+   * 

+   *
+   * map<string, string> redis_configs = 16;
+   */
+
+  public boolean containsRedisConfigs(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    return internalGetRedisConfigs().getMap().containsKey(key);
+  }
+  /**
+   * Use {@link #getRedisConfigsMap()} instead.
+   */
+  @java.lang.Deprecated
+  public java.util.Map getRedisConfigs() {
+    return getRedisConfigsMap();
+  }
+  /**
+   * 
+   * Optional. Redis configuration parameters, according to
+   * http://redis.io/topics/config. Currently, the only supported parameters
+   * are:
+   *  * maxmemory-policy
+   *  * notify-keyspace-events
+   * 

+   *
+   * map<string, string> redis_configs = 16;
+   */
+
+  public java.util.Map getRedisConfigsMap() {
+    return internalGetRedisConfigs().getMap();
+  }
+  /**
+   * 
+   * Optional. Redis configuration parameters, according to
+   * http://redis.io/topics/config. Currently, the only supported parameters
+   * are:
+   *  * maxmemory-policy
+   *  * notify-keyspace-events
+   * 

+   *
+   * map<string, string> redis_configs = 16;
+   */
+
+  public java.lang.String getRedisConfigsOrDefault(
+      java.lang.String key,
+      java.lang.String defaultValue) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    java.util.Map map =
+        internalGetRedisConfigs().getMap();
+    return map.containsKey(key) ? map.get(key) : defaultValue;
+  }
+  /**
+   * 
+   * Optional. Redis configuration parameters, according to
+   * http://redis.io/topics/config. Currently, the only supported parameters
+   * are:
+   *  * maxmemory-policy
+   *  * notify-keyspace-events
+   * 

+   *
+   * map<string, string> redis_configs = 16;
+   */
+
+  public java.lang.String getRedisConfigsOrThrow(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    java.util.Map map =
+        internalGetRedisConfigs().getMap();
+    if (!map.containsKey(key)) {
+      throw new java.lang.IllegalArgumentException();
+    }
+    return map.get(key);
+  }
+
+  public static final int TIER_FIELD_NUMBER = 17;
+  private int tier_;
+  /**
+   * 
+   * Required. The service tier of the instance.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance.Tier tier = 17;
+   */
+  public int getTierValue() {
+    return tier_;
+  }
+  /**
+   * 
+   * Required. The service tier of the instance.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance.Tier tier = 17;
+   */
+  public com.google.cloud.redis.v1beta1.Instance.Tier getTier() {
+    com.google.cloud.redis.v1beta1.Instance.Tier result = com.google.cloud.redis.v1beta1.Instance.Tier.valueOf(tier_);
+    return result == null ? com.google.cloud.redis.v1beta1.Instance.Tier.UNRECOGNIZED : result;
+  }
+
+  public static final int MEMORY_SIZE_GB_FIELD_NUMBER = 18;
+  private int memorySizeGb_;
+  /**
+   * 
+   * Required. Redis memory size in GB.
+   * 

+   *
+   * int32 memory_size_gb = 18;
+   */
+  public int getMemorySizeGb() {
+    return memorySizeGb_;
+  }
+
+  public static final int AUTHORIZED_NETWORK_FIELD_NUMBER = 20;
+  private volatile java.lang.Object authorizedNetwork_;
+  /**
+   * 
+   * Optional. The full name of the Google Compute Engine
+   * [network](/compute/docs/networks-and-firewalls#networks) to which the
+   * instance is connected. If left unspecified, the `default` network
+   * will be used.
+   * 

+   *
+   * string authorized_network = 20;
+   */
+  public java.lang.String getAuthorizedNetwork() {
+    java.lang.Object ref = authorizedNetwork_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      authorizedNetwork_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Optional. The full name of the Google Compute Engine
+   * [network](/compute/docs/networks-and-firewalls#networks) to which the
+   * instance is connected. If left unspecified, the `default` network
+   * will be used.
+   * 

+   *
+   * string authorized_network = 20;
+   */
+  public com.google.protobuf.ByteString
+      getAuthorizedNetworkBytes() {
+    java.lang.Object ref = authorizedNetwork_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      authorizedNetwork_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    if (!getDisplayNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, displayName_);
+    }
+    com.google.protobuf.GeneratedMessageV3
+      .serializeStringMapTo(
+        output,
+        internalGetLabels(),
+        LabelsDefaultEntryHolder.defaultEntry,
+        3);
+    if (!getLocationIdBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 4, locationId_);
+    }
+    if (!getAlternativeLocationIdBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 5, alternativeLocationId_);
+    }
+    if (!getRedisVersionBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 7, redisVersion_);
+    }
+    if (!getReservedIpRangeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 9, reservedIpRange_);
+    }
+    if (!getHostBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 10, host_);
+    }
+    if (port_ != 0) {
+      output.writeInt32(11, port_);
+    }
+    if (!getCurrentLocationIdBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 12, currentLocationId_);
+    }
+    if (createTime_ != null) {
+      output.writeMessage(13, getCreateTime());
+    }
+    if (state_ != com.google.cloud.redis.v1beta1.Instance.State.STATE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(14, state_);
+    }
+    if (!getStatusMessageBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 15, statusMessage_);
+    }
+    com.google.protobuf.GeneratedMessageV3
+      .serializeStringMapTo(
+        output,
+        internalGetRedisConfigs(),
+        RedisConfigsDefaultEntryHolder.defaultEntry,
+        16);
+    if (tier_ != com.google.cloud.redis.v1beta1.Instance.Tier.TIER_UNSPECIFIED.getNumber()) {
+      output.writeEnum(17, tier_);
+    }
+    if (memorySizeGb_ != 0) {
+      output.writeInt32(18, memorySizeGb_);
+    }
+    if (!getAuthorizedNetworkBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 20, authorizedNetwork_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    if (!getDisplayNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, displayName_);
+    }
+    for (java.util.Map.Entry entry
+         : internalGetLabels().getMap().entrySet()) {
+      com.google.protobuf.MapEntry
+      labels__ = LabelsDefaultEntryHolder.defaultEntry.newBuilderForType()
+          .setKey(entry.getKey())
+          .setValue(entry.getValue())
+          .build();
+      size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, labels__);
+    }
+    if (!getLocationIdBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, locationId_);
+    }
+    if (!getAlternativeLocationIdBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, alternativeLocationId_);
+    }
+    if (!getRedisVersionBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, redisVersion_);
+    }
+    if (!getReservedIpRangeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, reservedIpRange_);
+    }
+    if (!getHostBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, host_);
+    }
+    if (port_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(11, port_);
+    }
+    if (!getCurrentLocationIdBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, currentLocationId_);
+    }
+    if (createTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(13, getCreateTime());
+    }
+    if (state_ != com.google.cloud.redis.v1beta1.Instance.State.STATE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(14, state_);
+    }
+    if (!getStatusMessageBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, statusMessage_);
+    }
+    for (java.util.Map.Entry entry
+         : internalGetRedisConfigs().getMap().entrySet()) {
+      com.google.protobuf.MapEntry
+      redisConfigs__ = RedisConfigsDefaultEntryHolder.defaultEntry.newBuilderForType()
+          .setKey(entry.getKey())
+          .setValue(entry.getValue())
+          .build();
+      size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(16, redisConfigs__);
+    }
+    if (tier_ != com.google.cloud.redis.v1beta1.Instance.Tier.TIER_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(17, tier_);
+    }
+    if (memorySizeGb_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(18, memorySizeGb_);
+    }
+    if (!getAuthorizedNetworkBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(20, authorizedNetwork_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.redis.v1beta1.Instance)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.redis.v1beta1.Instance other = (com.google.cloud.redis.v1beta1.Instance) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && getDisplayName()
+        .equals(other.getDisplayName());
+    result = result && internalGetLabels().equals(
+        other.internalGetLabels());
+    result = result && getLocationId()
+        .equals(other.getLocationId());
+    result = result && getAlternativeLocationId()
+        .equals(other.getAlternativeLocationId());
+    result = result && getRedisVersion()
+        .equals(other.getRedisVersion());
+    result = result && getReservedIpRange()
+        .equals(other.getReservedIpRange());
+    result = result && getHost()
+        .equals(other.getHost());
+    result = result && (getPort()
+        == other.getPort());
+    result = result && getCurrentLocationId()
+        .equals(other.getCurrentLocationId());
+    result = result && (hasCreateTime() == other.hasCreateTime());
+    if (hasCreateTime()) {
+      result = result && getCreateTime()
+          .equals(other.getCreateTime());
+    }
+    result = result && state_ == other.state_;
+    result = result && getStatusMessage()
+        .equals(other.getStatusMessage());
+    result = result && internalGetRedisConfigs().equals(
+        other.internalGetRedisConfigs());
+    result = result && tier_ == other.tier_;
+    result = result && (getMemorySizeGb()
+        == other.getMemorySizeGb());
+    result = result && getAuthorizedNetwork()
+        .equals(other.getAuthorizedNetwork());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getDisplayName().hashCode();
+    if (!internalGetLabels().getMap().isEmpty()) {
+      hash = (37 * hash) + LABELS_FIELD_NUMBER;
+      hash = (53 * hash) + internalGetLabels().hashCode();
+    }
+    hash = (37 * hash) + LOCATION_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getLocationId().hashCode();
+    hash = (37 * hash) + ALTERNATIVE_LOCATION_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getAlternativeLocationId().hashCode();
+    hash = (37 * hash) + REDIS_VERSION_FIELD_NUMBER;
+    hash = (53 * hash) + getRedisVersion().hashCode();
+    hash = (37 * hash) + RESERVED_IP_RANGE_FIELD_NUMBER;
+    hash = (53 * hash) + getReservedIpRange().hashCode();
+    hash = (37 * hash) + HOST_FIELD_NUMBER;
+    hash = (53 * hash) + getHost().hashCode();
+    hash = (37 * hash) + PORT_FIELD_NUMBER;
+    hash = (53 * hash) + getPort();
+    hash = (37 * hash) + CURRENT_LOCATION_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getCurrentLocationId().hashCode();
+    if (hasCreateTime()) {
+      hash = (37 * hash) + CREATE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getCreateTime().hashCode();
+    }
+    hash = (37 * hash) + STATE_FIELD_NUMBER;
+    hash = (53 * hash) + state_;
+    hash = (37 * hash) + STATUS_MESSAGE_FIELD_NUMBER;
+    hash = (53 * hash) + getStatusMessage().hashCode();
+    if (!internalGetRedisConfigs().getMap().isEmpty()) {
+      hash = (37 * hash) + REDIS_CONFIGS_FIELD_NUMBER;
+      hash = (53 * hash) + internalGetRedisConfigs().hashCode();
+    }
+    hash = (37 * hash) + TIER_FIELD_NUMBER;
+    hash = (53 * hash) + tier_;
+    hash = (37 * hash) + MEMORY_SIZE_GB_FIELD_NUMBER;
+    hash = (53 * hash) + getMemorySizeGb();
+    hash = (37 * hash) + AUTHORIZED_NETWORK_FIELD_NUMBER;
+    hash = (53 * hash) + getAuthorizedNetwork().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.redis.v1beta1.Instance parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.Instance parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.Instance parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.Instance parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.Instance parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.Instance parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.Instance parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.Instance parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.Instance parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.Instance parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.Instance parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.Instance parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.redis.v1beta1.Instance prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * A Google Cloud Redis instance.
+   * 

+   *
+   * Protobuf type {@code google.cloud.redis.v1beta1.Instance}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.redis.v1beta1.Instance)
+      com.google.cloud.redis.v1beta1.InstanceOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_Instance_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMapField(
+        int number) {
+      switch (number) {
+        case 3:
+          return internalGetLabels();
+        case 16:
+          return internalGetRedisConfigs();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMutableMapField(
+        int number) {
+      switch (number) {
+        case 3:
+          return internalGetMutableLabels();
+        case 16:
+          return internalGetMutableRedisConfigs();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_Instance_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.redis.v1beta1.Instance.class, com.google.cloud.redis.v1beta1.Instance.Builder.class);
+    }
+
+    // Construct using com.google.cloud.redis.v1beta1.Instance.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      displayName_ = "";
+
+      internalGetMutableLabels().clear();
+      locationId_ = "";
+
+      alternativeLocationId_ = "";
+
+      redisVersion_ = "";
+
+      reservedIpRange_ = "";
+
+      host_ = "";
+
+      port_ = 0;
+
+      currentLocationId_ = "";
+
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
+        createTimeBuilder_ = null;
+      }
+      state_ = 0;
+
+      statusMessage_ = "";
+
+      internalGetMutableRedisConfigs().clear();
+      tier_ = 0;
+
+      memorySizeGb_ = 0;
+
+      authorizedNetwork_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_Instance_descriptor;
+    }
+
+    public com.google.cloud.redis.v1beta1.Instance getDefaultInstanceForType() {
+      return com.google.cloud.redis.v1beta1.Instance.getDefaultInstance();
+    }
+
+    public com.google.cloud.redis.v1beta1.Instance build() {
+      com.google.cloud.redis.v1beta1.Instance result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.redis.v1beta1.Instance buildPartial() {
+      com.google.cloud.redis.v1beta1.Instance result = new com.google.cloud.redis.v1beta1.Instance(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      result.name_ = name_;
+      result.displayName_ = displayName_;
+      result.labels_ = internalGetLabels();
+      result.labels_.makeImmutable();
+      result.locationId_ = locationId_;
+      result.alternativeLocationId_ = alternativeLocationId_;
+      result.redisVersion_ = redisVersion_;
+      result.reservedIpRange_ = reservedIpRange_;
+      result.host_ = host_;
+      result.port_ = port_;
+      result.currentLocationId_ = currentLocationId_;
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
+      }
+      result.state_ = state_;
+      result.statusMessage_ = statusMessage_;
+      result.redisConfigs_ = internalGetRedisConfigs();
+      result.redisConfigs_.makeImmutable();
+      result.tier_ = tier_;
+      result.memorySizeGb_ = memorySizeGb_;
+      result.authorizedNetwork_ = authorizedNetwork_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.redis.v1beta1.Instance) {
+        return mergeFrom((com.google.cloud.redis.v1beta1.Instance)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.redis.v1beta1.Instance other) {
+      if (other == com.google.cloud.redis.v1beta1.Instance.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (!other.getDisplayName().isEmpty()) {
+        displayName_ = other.displayName_;
+        onChanged();
+      }
+      internalGetMutableLabels().mergeFrom(
+          other.internalGetLabels());
+      if (!other.getLocationId().isEmpty()) {
+        locationId_ = other.locationId_;
+        onChanged();
+      }
+      if (!other.getAlternativeLocationId().isEmpty()) {
+        alternativeLocationId_ = other.alternativeLocationId_;
+        onChanged();
+      }
+      if (!other.getRedisVersion().isEmpty()) {
+        redisVersion_ = other.redisVersion_;
+        onChanged();
+      }
+      if (!other.getReservedIpRange().isEmpty()) {
+        reservedIpRange_ = other.reservedIpRange_;
+        onChanged();
+      }
+      if (!other.getHost().isEmpty()) {
+        host_ = other.host_;
+        onChanged();
+      }
+      if (other.getPort() != 0) {
+        setPort(other.getPort());
+      }
+      if (!other.getCurrentLocationId().isEmpty()) {
+        currentLocationId_ = other.currentLocationId_;
+        onChanged();
+      }
+      if (other.hasCreateTime()) {
+        mergeCreateTime(other.getCreateTime());
+      }
+      if (other.state_ != 0) {
+        setStateValue(other.getStateValue());
+      }
+      if (!other.getStatusMessage().isEmpty()) {
+        statusMessage_ = other.statusMessage_;
+        onChanged();
+      }
+      internalGetMutableRedisConfigs().mergeFrom(
+          other.internalGetRedisConfigs());
+      if (other.tier_ != 0) {
+        setTierValue(other.getTierValue());
+      }
+      if (other.getMemorySizeGb() != 0) {
+        setMemorySizeGb(other.getMemorySizeGb());
+      }
+      if (!other.getAuthorizedNetwork().isEmpty()) {
+        authorizedNetwork_ = other.authorizedNetwork_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.redis.v1beta1.Instance parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.redis.v1beta1.Instance) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * Required. Unique name of the resource in this scope including project and
+     * location using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * Note: Redis instances are managed and addressed at regional level so
+     * location_id here refers to a GCP region; however, users get to choose which
+     * specific zone (or collection of zones for cross-zone instances) an instance
+     * should be provisioned in. Refer to [location_id] and
+     * [alternative_location_id] fields for more details.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required. Unique name of the resource in this scope including project and
+     * location using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * Note: Redis instances are managed and addressed at regional level so
+     * location_id here refers to a GCP region; however, users get to choose which
+     * specific zone (or collection of zones for cross-zone instances) an instance
+     * should be provisioned in. Refer to [location_id] and
+     * [alternative_location_id] fields for more details.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required. Unique name of the resource in this scope including project and
+     * location using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * Note: Redis instances are managed and addressed at regional level so
+     * location_id here refers to a GCP region; however, users get to choose which
+     * specific zone (or collection of zones for cross-zone instances) an instance
+     * should be provisioned in. Refer to [location_id] and
+     * [alternative_location_id] fields for more details.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. Unique name of the resource in this scope including project and
+     * location using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * Note: Redis instances are managed and addressed at regional level so
+     * location_id here refers to a GCP region; however, users get to choose which
+     * specific zone (or collection of zones for cross-zone instances) an instance
+     * should be provisioned in. Refer to [location_id] and
+     * [alternative_location_id] fields for more details.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. Unique name of the resource in this scope including project and
+     * location using the form:
+     *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+     * Note: Redis instances are managed and addressed at regional level so
+     * location_id here refers to a GCP region; however, users get to choose which
+     * specific zone (or collection of zones for cross-zone instances) an instance
+     * should be provisioned in. Refer to [location_id] and
+     * [alternative_location_id] fields for more details.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object displayName_ = "";
+    /**
+     * 
+     * An arbitrary and optional user-provided name for the instance.
+     * 

+     *
+     * string display_name = 2;
+     */
+    public java.lang.String getDisplayName() {
+      java.lang.Object ref = displayName_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        displayName_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * An arbitrary and optional user-provided name for the instance.
+     * 

+     *
+     * string display_name = 2;
+     */
+    public com.google.protobuf.ByteString
+        getDisplayNameBytes() {
+      java.lang.Object ref = displayName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        displayName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * An arbitrary and optional user-provided name for the instance.
+     * 

+     *
+     * string display_name = 2;
+     */
+    public Builder setDisplayName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      displayName_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * An arbitrary and optional user-provided name for the instance.
+     * 

+     *
+     * string display_name = 2;
+     */
+    public Builder clearDisplayName() {
+      
+      displayName_ = getDefaultInstance().getDisplayName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * An arbitrary and optional user-provided name for the instance.
+     * 

+     *
+     * string display_name = 2;
+     */
+    public Builder setDisplayNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      displayName_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> labels_;
+    private com.google.protobuf.MapField
+    internalGetLabels() {
+      if (labels_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            LabelsDefaultEntryHolder.defaultEntry);
+      }
+      return labels_;
+    }
+    private com.google.protobuf.MapField
+    internalGetMutableLabels() {
+      onChanged();;
+      if (labels_ == null) {
+        labels_ = com.google.protobuf.MapField.newMapField(
+            LabelsDefaultEntryHolder.defaultEntry);
+      }
+      if (!labels_.isMutable()) {
+        labels_ = labels_.copy();
+      }
+      return labels_;
+    }
+
+    public int getLabelsCount() {
+      return internalGetLabels().getMap().size();
+    }
+    /**
+     * 
+     * Resource labels to represent user provided metadata
+     * 

+     *
+     * map<string, string> labels = 3;
+     */
+
+    public boolean containsLabels(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      return internalGetLabels().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getLabelsMap()} instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map getLabels() {
+      return getLabelsMap();
+    }
+    /**
+     * 
+     * Resource labels to represent user provided metadata
+     * 

+     *
+     * map<string, string> labels = 3;
+     */
+
+    public java.util.Map getLabelsMap() {
+      return internalGetLabels().getMap();
+    }
+    /**
+     * 
+     * Resource labels to represent user provided metadata
+     * 

+     *
+     * map<string, string> labels = 3;
+     */
+
+    public java.lang.String getLabelsOrDefault(
+        java.lang.String key,
+        java.lang.String defaultValue) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      java.util.Map map =
+          internalGetLabels().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * 
+     * Resource labels to represent user provided metadata
+     * 

+     *
+     * map<string, string> labels = 3;
+     */
+
+    public java.lang.String getLabelsOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      java.util.Map map =
+          internalGetLabels().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public Builder clearLabels() {
+      internalGetMutableLabels().getMutableMap()
+          .clear();
+      return this;
+    }
+    /**
+     * 
+     * Resource labels to represent user provided metadata
+     * 

+     *
+     * map<string, string> labels = 3;
+     */
+
+    public Builder removeLabels(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableLabels().getMutableMap()
+          .remove(key);
+      return this;
+    }
+    /**
+     * Use alternate mutation accessors instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map
+    getMutableLabels() {
+      return internalGetMutableLabels().getMutableMap();
+    }
+    /**
+     * 
+     * Resource labels to represent user provided metadata
+     * 

+     *
+     * map<string, string> labels = 3;
+     */
+    public Builder putLabels(
+        java.lang.String key,
+        java.lang.String value) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      if (value == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableLabels().getMutableMap()
+          .put(key, value);
+      return this;
+    }
+    /**
+     * 
+     * Resource labels to represent user provided metadata
+     * 

+     *
+     * map<string, string> labels = 3;
+     */
+
+    public Builder putAllLabels(
+        java.util.Map values) {
+      internalGetMutableLabels().getMutableMap()
+          .putAll(values);
+      return this;
+    }
+
+    private java.lang.Object locationId_ = "";
+    /**
+     * 
+     * Optional. The zone where the instance will be provisioned. If not provided,
+     * the service will choose a zone for the instance. For STANDARD_HA tier,
+     * instances will be created across two zones for protection against zonal
+     * failures. if [alternative_location_id] is also provided, it must be
+     * different from [location_id].
+     * 

+     *
+     * string location_id = 4;
+     */
+    public java.lang.String getLocationId() {
+      java.lang.Object ref = locationId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        locationId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Optional. The zone where the instance will be provisioned. If not provided,
+     * the service will choose a zone for the instance. For STANDARD_HA tier,
+     * instances will be created across two zones for protection against zonal
+     * failures. if [alternative_location_id] is also provided, it must be
+     * different from [location_id].
+     * 

+     *
+     * string location_id = 4;
+     */
+    public com.google.protobuf.ByteString
+        getLocationIdBytes() {
+      java.lang.Object ref = locationId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        locationId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Optional. The zone where the instance will be provisioned. If not provided,
+     * the service will choose a zone for the instance. For STANDARD_HA tier,
+     * instances will be created across two zones for protection against zonal
+     * failures. if [alternative_location_id] is also provided, it must be
+     * different from [location_id].
+     * 

+     *
+     * string location_id = 4;
+     */
+    public Builder setLocationId(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      locationId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Optional. The zone where the instance will be provisioned. If not provided,
+     * the service will choose a zone for the instance. For STANDARD_HA tier,
+     * instances will be created across two zones for protection against zonal
+     * failures. if [alternative_location_id] is also provided, it must be
+     * different from [location_id].
+     * 

+     *
+     * string location_id = 4;
+     */
+    public Builder clearLocationId() {
+      
+      locationId_ = getDefaultInstance().getLocationId();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Optional. The zone where the instance will be provisioned. If not provided,
+     * the service will choose a zone for the instance. For STANDARD_HA tier,
+     * instances will be created across two zones for protection against zonal
+     * failures. if [alternative_location_id] is also provided, it must be
+     * different from [location_id].
+     * 

+     *
+     * string location_id = 4;
+     */
+    public Builder setLocationIdBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      locationId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object alternativeLocationId_ = "";
+    /**
+     * 
+     * Optional. Only applicable to STANDARD_HA tier which protects the instance
+     * against zonal failures by provisioning it across two zones. If provided, it
+     * must be a different zone from the one provided in [location_id].
+     * 

+     *
+     * string alternative_location_id = 5;
+     */
+    public java.lang.String getAlternativeLocationId() {
+      java.lang.Object ref = alternativeLocationId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        alternativeLocationId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Optional. Only applicable to STANDARD_HA tier which protects the instance
+     * against zonal failures by provisioning it across two zones. If provided, it
+     * must be a different zone from the one provided in [location_id].
+     * 

+     *
+     * string alternative_location_id = 5;
+     */
+    public com.google.protobuf.ByteString
+        getAlternativeLocationIdBytes() {
+      java.lang.Object ref = alternativeLocationId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        alternativeLocationId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Optional. Only applicable to STANDARD_HA tier which protects the instance
+     * against zonal failures by provisioning it across two zones. If provided, it
+     * must be a different zone from the one provided in [location_id].
+     * 

+     *
+     * string alternative_location_id = 5;
+     */
+    public Builder setAlternativeLocationId(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      alternativeLocationId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Optional. Only applicable to STANDARD_HA tier which protects the instance
+     * against zonal failures by provisioning it across two zones. If provided, it
+     * must be a different zone from the one provided in [location_id].
+     * 

+     *
+     * string alternative_location_id = 5;
+     */
+    public Builder clearAlternativeLocationId() {
+      
+      alternativeLocationId_ = getDefaultInstance().getAlternativeLocationId();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Optional. Only applicable to STANDARD_HA tier which protects the instance
+     * against zonal failures by provisioning it across two zones. If provided, it
+     * must be a different zone from the one provided in [location_id].
+     * 

+     *
+     * string alternative_location_id = 5;
+     */
+    public Builder setAlternativeLocationIdBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      alternativeLocationId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object redisVersion_ = "";
+    /**
+     * 
+     * Optional. The version of Redis software.
+     * If not provided, latest supported version will be used.
+     * 

+     *
+     * string redis_version = 7;
+     */
+    public java.lang.String getRedisVersion() {
+      java.lang.Object ref = redisVersion_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        redisVersion_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Optional. The version of Redis software.
+     * If not provided, latest supported version will be used.
+     * 

+     *
+     * string redis_version = 7;
+     */
+    public com.google.protobuf.ByteString
+        getRedisVersionBytes() {
+      java.lang.Object ref = redisVersion_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        redisVersion_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Optional. The version of Redis software.
+     * If not provided, latest supported version will be used.
+     * 

+     *
+     * string redis_version = 7;
+     */
+    public Builder setRedisVersion(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      redisVersion_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Optional. The version of Redis software.
+     * If not provided, latest supported version will be used.
+     * 

+     *
+     * string redis_version = 7;
+     */
+    public Builder clearRedisVersion() {
+      
+      redisVersion_ = getDefaultInstance().getRedisVersion();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Optional. The version of Redis software.
+     * If not provided, latest supported version will be used.
+     * 

+     *
+     * string redis_version = 7;
+     */
+    public Builder setRedisVersionBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      redisVersion_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object reservedIpRange_ = "";
+    /**
+     * 
+     * Optional. The CIDR range of internal addresses that are reserved for this
+     * instance. If not provided, the service will choose an unused /29 block,
+     * for example, 10.0.0.0/29 or 192.168.0.0/29. Ranges must be unique
+     * and non-overlapping with existing subnets in a network.
+     * 

+     *
+     * string reserved_ip_range = 9;
+     */
+    public java.lang.String getReservedIpRange() {
+      java.lang.Object ref = reservedIpRange_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        reservedIpRange_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Optional. The CIDR range of internal addresses that are reserved for this
+     * instance. If not provided, the service will choose an unused /29 block,
+     * for example, 10.0.0.0/29 or 192.168.0.0/29. Ranges must be unique
+     * and non-overlapping with existing subnets in a network.
+     * 

+     *
+     * string reserved_ip_range = 9;
+     */
+    public com.google.protobuf.ByteString
+        getReservedIpRangeBytes() {
+      java.lang.Object ref = reservedIpRange_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        reservedIpRange_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Optional. The CIDR range of internal addresses that are reserved for this
+     * instance. If not provided, the service will choose an unused /29 block,
+     * for example, 10.0.0.0/29 or 192.168.0.0/29. Ranges must be unique
+     * and non-overlapping with existing subnets in a network.
+     * 

+     *
+     * string reserved_ip_range = 9;
+     */
+    public Builder setReservedIpRange(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      reservedIpRange_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Optional. The CIDR range of internal addresses that are reserved for this
+     * instance. If not provided, the service will choose an unused /29 block,
+     * for example, 10.0.0.0/29 or 192.168.0.0/29. Ranges must be unique
+     * and non-overlapping with existing subnets in a network.
+     * 

+     *
+     * string reserved_ip_range = 9;
+     */
+    public Builder clearReservedIpRange() {
+      
+      reservedIpRange_ = getDefaultInstance().getReservedIpRange();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Optional. The CIDR range of internal addresses that are reserved for this
+     * instance. If not provided, the service will choose an unused /29 block,
+     * for example, 10.0.0.0/29 or 192.168.0.0/29. Ranges must be unique
+     * and non-overlapping with existing subnets in a network.
+     * 

+     *
+     * string reserved_ip_range = 9;
+     */
+    public Builder setReservedIpRangeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      reservedIpRange_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object host_ = "";
+    /**
+     * 
+     * Output only. Hostname or IP address of the exposed redis endpoint used by
+     * clients to connect to the service.
+     * 

+     *
+     * string host = 10;
+     */
+    public java.lang.String getHost() {
+      java.lang.Object ref = host_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        host_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only. Hostname or IP address of the exposed redis endpoint used by
+     * clients to connect to the service.
+     * 

+     *
+     * string host = 10;
+     */
+    public com.google.protobuf.ByteString
+        getHostBytes() {
+      java.lang.Object ref = host_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        host_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only. Hostname or IP address of the exposed redis endpoint used by
+     * clients to connect to the service.
+     * 

+     *
+     * string host = 10;
+     */
+    public Builder setHost(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      host_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only. Hostname or IP address of the exposed redis endpoint used by
+     * clients to connect to the service.
+     * 

+     *
+     * string host = 10;
+     */
+    public Builder clearHost() {
+      
+      host_ = getDefaultInstance().getHost();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only. Hostname or IP address of the exposed redis endpoint used by
+     * clients to connect to the service.
+     * 

+     *
+     * string host = 10;
+     */
+    public Builder setHostBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      host_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int port_ ;
+    /**
+     * 
+     * Output only. The port number of the exposed redis endpoint.
+     * 

+     *
+     * int32 port = 11;
+     */
+    public int getPort() {
+      return port_;
+    }
+    /**
+     * 
+     * Output only. The port number of the exposed redis endpoint.
+     * 

+     *
+     * int32 port = 11;
+     */
+    public Builder setPort(int value) {
+      
+      port_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only. The port number of the exposed redis endpoint.
+     * 

+     *
+     * int32 port = 11;
+     */
+    public Builder clearPort() {
+      
+      port_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object currentLocationId_ = "";
+    /**
+     * 
+     * Output only. The current zone where the Redis endpoint is placed. In
+     * single zone deployments, this will always be the same as [location_id]
+     * provided by the user at creation time. In cross-zone instances (only
+     * applicable in STANDARD_HA tier), this can be either [location_id] or
+     * [alternative_location_id] and can change on a failover event.
+     * 

+     *
+     * string current_location_id = 12;
+     */
+    public java.lang.String getCurrentLocationId() {
+      java.lang.Object ref = currentLocationId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        currentLocationId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only. The current zone where the Redis endpoint is placed. In
+     * single zone deployments, this will always be the same as [location_id]
+     * provided by the user at creation time. In cross-zone instances (only
+     * applicable in STANDARD_HA tier), this can be either [location_id] or
+     * [alternative_location_id] and can change on a failover event.
+     * 

+     *
+     * string current_location_id = 12;
+     */
+    public com.google.protobuf.ByteString
+        getCurrentLocationIdBytes() {
+      java.lang.Object ref = currentLocationId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        currentLocationId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only. The current zone where the Redis endpoint is placed. In
+     * single zone deployments, this will always be the same as [location_id]
+     * provided by the user at creation time. In cross-zone instances (only
+     * applicable in STANDARD_HA tier), this can be either [location_id] or
+     * [alternative_location_id] and can change on a failover event.
+     * 

+     *
+     * string current_location_id = 12;
+     */
+    public Builder setCurrentLocationId(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      currentLocationId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only. The current zone where the Redis endpoint is placed. In
+     * single zone deployments, this will always be the same as [location_id]
+     * provided by the user at creation time. In cross-zone instances (only
+     * applicable in STANDARD_HA tier), this can be either [location_id] or
+     * [alternative_location_id] and can change on a failover event.
+     * 

+     *
+     * string current_location_id = 12;
+     */
+    public Builder clearCurrentLocationId() {
+      
+      currentLocationId_ = getDefaultInstance().getCurrentLocationId();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only. The current zone where the Redis endpoint is placed. In
+     * single zone deployments, this will always be the same as [location_id]
+     * provided by the user at creation time. In cross-zone instances (only
+     * applicable in STANDARD_HA tier), this can be either [location_id] or
+     * [alternative_location_id] and can change on a failover event.
+     * 

+     *
+     * string current_location_id = 12;
+     */
+    public Builder setCurrentLocationIdBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      currentLocationId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.Timestamp createTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> createTimeBuilder_;
+    /**
+     * 
+     * Output only. The time the instance was created.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 13;
+     */
+    public boolean hasCreateTime() {
+      return createTimeBuilder_ != null || createTime_ != null;
+    }
+    /**
+     * 
+     * Output only. The time the instance was created.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 13;
+     */
+    public com.google.protobuf.Timestamp getCreateTime() {
+      if (createTimeBuilder_ == null) {
+        return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+      } else {
+        return createTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Output only. The time the instance was created.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 13;
+     */
+    public Builder setCreateTime(com.google.protobuf.Timestamp value) {
+      if (createTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        createTime_ = value;
+        onChanged();
+      } else {
+        createTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only. The time the instance was created.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 13;
+     */
+    public Builder setCreateTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (createTimeBuilder_ == null) {
+        createTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        createTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only. The time the instance was created.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 13;
+     */
+    public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
+      if (createTimeBuilder_ == null) {
+        if (createTime_ != null) {
+          createTime_ =
+            com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        } else {
+          createTime_ = value;
+        }
+        onChanged();
+      } else {
+        createTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only. The time the instance was created.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 13;
+     */
+    public Builder clearCreateTime() {
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
+        createTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only. The time the instance was created.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 13;
+     */
+    public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
+      
+      onChanged();
+      return getCreateTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Output only. The time the instance was created.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 13;
+     */
+    public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
+      if (createTimeBuilder_ != null) {
+        return createTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return createTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+      }
+    }
+    /**
+     * 
+     * Output only. The time the instance was created.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 13;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getCreateTimeFieldBuilder() {
+      if (createTimeBuilder_ == null) {
+        createTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getCreateTime(),
+                getParentForChildren(),
+                isClean());
+        createTime_ = null;
+      }
+      return createTimeBuilder_;
+    }
+
+    private int state_ = 0;
+    /**
+     * 
+     * Output only. The current state of this instance.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance.State state = 14;
+     */
+    public int getStateValue() {
+      return state_;
+    }
+    /**
+     * 
+     * Output only. The current state of this instance.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance.State state = 14;
+     */
+    public Builder setStateValue(int value) {
+      state_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only. The current state of this instance.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance.State state = 14;
+     */
+    public com.google.cloud.redis.v1beta1.Instance.State getState() {
+      com.google.cloud.redis.v1beta1.Instance.State result = com.google.cloud.redis.v1beta1.Instance.State.valueOf(state_);
+      return result == null ? com.google.cloud.redis.v1beta1.Instance.State.UNRECOGNIZED : result;
+    }
+    /**
+     * 
+     * Output only. The current state of this instance.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance.State state = 14;
+     */
+    public Builder setState(com.google.cloud.redis.v1beta1.Instance.State value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      state_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only. The current state of this instance.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance.State state = 14;
+     */
+    public Builder clearState() {
+      
+      state_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object statusMessage_ = "";
+    /**
+     * 
+     * Output only. Additional information about the current status of this
+     * instance, if available.
+     * 

+     *
+     * string status_message = 15;
+     */
+    public java.lang.String getStatusMessage() {
+      java.lang.Object ref = statusMessage_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        statusMessage_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only. Additional information about the current status of this
+     * instance, if available.
+     * 

+     *
+     * string status_message = 15;
+     */
+    public com.google.protobuf.ByteString
+        getStatusMessageBytes() {
+      java.lang.Object ref = statusMessage_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        statusMessage_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only. Additional information about the current status of this
+     * instance, if available.
+     * 

+     *
+     * string status_message = 15;
+     */
+    public Builder setStatusMessage(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      statusMessage_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only. Additional information about the current status of this
+     * instance, if available.
+     * 

+     *
+     * string status_message = 15;
+     */
+    public Builder clearStatusMessage() {
+      
+      statusMessage_ = getDefaultInstance().getStatusMessage();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only. Additional information about the current status of this
+     * instance, if available.
+     * 

+     *
+     * string status_message = 15;
+     */
+    public Builder setStatusMessageBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      statusMessage_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> redisConfigs_;
+    private com.google.protobuf.MapField
+    internalGetRedisConfigs() {
+      if (redisConfigs_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            RedisConfigsDefaultEntryHolder.defaultEntry);
+      }
+      return redisConfigs_;
+    }
+    private com.google.protobuf.MapField
+    internalGetMutableRedisConfigs() {
+      onChanged();;
+      if (redisConfigs_ == null) {
+        redisConfigs_ = com.google.protobuf.MapField.newMapField(
+            RedisConfigsDefaultEntryHolder.defaultEntry);
+      }
+      if (!redisConfigs_.isMutable()) {
+        redisConfigs_ = redisConfigs_.copy();
+      }
+      return redisConfigs_;
+    }
+
+    public int getRedisConfigsCount() {
+      return internalGetRedisConfigs().getMap().size();
+    }
+    /**
+     * 
+     * Optional. Redis configuration parameters, according to
+     * http://redis.io/topics/config. Currently, the only supported parameters
+     * are:
+     *  * maxmemory-policy
+     *  * notify-keyspace-events
+     * 

+     *
+     * map<string, string> redis_configs = 16;
+     */
+
+    public boolean containsRedisConfigs(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      return internalGetRedisConfigs().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getRedisConfigsMap()} instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map getRedisConfigs() {
+      return getRedisConfigsMap();
+    }
+    /**
+     * 
+     * Optional. Redis configuration parameters, according to
+     * http://redis.io/topics/config. Currently, the only supported parameters
+     * are:
+     *  * maxmemory-policy
+     *  * notify-keyspace-events
+     * 

+     *
+     * map<string, string> redis_configs = 16;
+     */
+
+    public java.util.Map getRedisConfigsMap() {
+      return internalGetRedisConfigs().getMap();
+    }
+    /**
+     * 
+     * Optional. Redis configuration parameters, according to
+     * http://redis.io/topics/config. Currently, the only supported parameters
+     * are:
+     *  * maxmemory-policy
+     *  * notify-keyspace-events
+     * 

+     *
+     * map<string, string> redis_configs = 16;
+     */
+
+    public java.lang.String getRedisConfigsOrDefault(
+        java.lang.String key,
+        java.lang.String defaultValue) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      java.util.Map map =
+          internalGetRedisConfigs().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * 
+     * Optional. Redis configuration parameters, according to
+     * http://redis.io/topics/config. Currently, the only supported parameters
+     * are:
+     *  * maxmemory-policy
+     *  * notify-keyspace-events
+     * 

+     *
+     * map<string, string> redis_configs = 16;
+     */
+
+    public java.lang.String getRedisConfigsOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      java.util.Map map =
+          internalGetRedisConfigs().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public Builder clearRedisConfigs() {
+      internalGetMutableRedisConfigs().getMutableMap()
+          .clear();
+      return this;
+    }
+    /**
+     * 
+     * Optional. Redis configuration parameters, according to
+     * http://redis.io/topics/config. Currently, the only supported parameters
+     * are:
+     *  * maxmemory-policy
+     *  * notify-keyspace-events
+     * 

+     *
+     * map<string, string> redis_configs = 16;
+     */
+
+    public Builder removeRedisConfigs(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableRedisConfigs().getMutableMap()
+          .remove(key);
+      return this;
+    }
+    /**
+     * Use alternate mutation accessors instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map
+    getMutableRedisConfigs() {
+      return internalGetMutableRedisConfigs().getMutableMap();
+    }
+    /**
+     * 
+     * Optional. Redis configuration parameters, according to
+     * http://redis.io/topics/config. Currently, the only supported parameters
+     * are:
+     *  * maxmemory-policy
+     *  * notify-keyspace-events
+     * 

+     *
+     * map<string, string> redis_configs = 16;
+     */
+    public Builder putRedisConfigs(
+        java.lang.String key,
+        java.lang.String value) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      if (value == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableRedisConfigs().getMutableMap()
+          .put(key, value);
+      return this;
+    }
+    /**
+     * 
+     * Optional. Redis configuration parameters, according to
+     * http://redis.io/topics/config. Currently, the only supported parameters
+     * are:
+     *  * maxmemory-policy
+     *  * notify-keyspace-events
+     * 

+     *
+     * map<string, string> redis_configs = 16;
+     */
+
+    public Builder putAllRedisConfigs(
+        java.util.Map values) {
+      internalGetMutableRedisConfigs().getMutableMap()
+          .putAll(values);
+      return this;
+    }
+
+    private int tier_ = 0;
+    /**
+     * 
+     * Required. The service tier of the instance.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance.Tier tier = 17;
+     */
+    public int getTierValue() {
+      return tier_;
+    }
+    /**
+     * 
+     * Required. The service tier of the instance.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance.Tier tier = 17;
+     */
+    public Builder setTierValue(int value) {
+      tier_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. The service tier of the instance.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance.Tier tier = 17;
+     */
+    public com.google.cloud.redis.v1beta1.Instance.Tier getTier() {
+      com.google.cloud.redis.v1beta1.Instance.Tier result = com.google.cloud.redis.v1beta1.Instance.Tier.valueOf(tier_);
+      return result == null ? com.google.cloud.redis.v1beta1.Instance.Tier.UNRECOGNIZED : result;
+    }
+    /**
+     * 
+     * Required. The service tier of the instance.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance.Tier tier = 17;
+     */
+    public Builder setTier(com.google.cloud.redis.v1beta1.Instance.Tier value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      tier_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. The service tier of the instance.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance.Tier tier = 17;
+     */
+    public Builder clearTier() {
+      
+      tier_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private int memorySizeGb_ ;
+    /**
+     * 
+     * Required. Redis memory size in GB.
+     * 

+     *
+     * int32 memory_size_gb = 18;
+     */
+    public int getMemorySizeGb() {
+      return memorySizeGb_;
+    }
+    /**
+     * 
+     * Required. Redis memory size in GB.
+     * 

+     *
+     * int32 memory_size_gb = 18;
+     */
+    public Builder setMemorySizeGb(int value) {
+      
+      memorySizeGb_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. Redis memory size in GB.
+     * 

+     *
+     * int32 memory_size_gb = 18;
+     */
+    public Builder clearMemorySizeGb() {
+      
+      memorySizeGb_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object authorizedNetwork_ = "";
+    /**
+     * 
+     * Optional. The full name of the Google Compute Engine
+     * [network](/compute/docs/networks-and-firewalls#networks) to which the
+     * instance is connected. If left unspecified, the `default` network
+     * will be used.
+     * 

+     *
+     * string authorized_network = 20;
+     */
+    public java.lang.String getAuthorizedNetwork() {
+      java.lang.Object ref = authorizedNetwork_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        authorizedNetwork_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Optional. The full name of the Google Compute Engine
+     * [network](/compute/docs/networks-and-firewalls#networks) to which the
+     * instance is connected. If left unspecified, the `default` network
+     * will be used.
+     * 

+     *
+     * string authorized_network = 20;
+     */
+    public com.google.protobuf.ByteString
+        getAuthorizedNetworkBytes() {
+      java.lang.Object ref = authorizedNetwork_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        authorizedNetwork_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Optional. The full name of the Google Compute Engine
+     * [network](/compute/docs/networks-and-firewalls#networks) to which the
+     * instance is connected. If left unspecified, the `default` network
+     * will be used.
+     * 

+     *
+     * string authorized_network = 20;
+     */
+    public Builder setAuthorizedNetwork(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      authorizedNetwork_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Optional. The full name of the Google Compute Engine
+     * [network](/compute/docs/networks-and-firewalls#networks) to which the
+     * instance is connected. If left unspecified, the `default` network
+     * will be used.
+     * 

+     *
+     * string authorized_network = 20;
+     */
+    public Builder clearAuthorizedNetwork() {
+      
+      authorizedNetwork_ = getDefaultInstance().getAuthorizedNetwork();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Optional. The full name of the Google Compute Engine
+     * [network](/compute/docs/networks-and-firewalls#networks) to which the
+     * instance is connected. If left unspecified, the `default` network
+     * will be used.
+     * 

+     *
+     * string authorized_network = 20;
+     */
+    public Builder setAuthorizedNetworkBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      authorizedNetwork_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.redis.v1beta1.Instance)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.redis.v1beta1.Instance)
+  private static final com.google.cloud.redis.v1beta1.Instance DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.redis.v1beta1.Instance();
+  }
+
+  public static com.google.cloud.redis.v1beta1.Instance getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public Instance parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Instance(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.redis.v1beta1.Instance getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceName.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceName.java
new file mode 100644
index 000000000000..5c58eba35d0a
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceName.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, 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.
+ */
+
+package com.google.cloud.redis.v1beta1;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.api.resourcenames.ResourceNameType;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class InstanceName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/locations/{location}/instances/{instance}");
+
+  private volatile Map fieldValuesMap;
+
+  private final String project;
+  private final String location;
+  private final String instance;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public String getInstance() {
+    return instance;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private InstanceName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    instance = Preconditions.checkNotNull(builder.getInstance());
+  }
+
+  public static InstanceName of(String project, String location, String instance) {
+    return newBuilder()
+      .setProject(project)
+      .setLocation(location)
+      .setInstance(instance)
+      .build();
+  }
+
+  public static String format(String project, String location, String instance) {
+    return newBuilder()
+      .setProject(project)
+      .setLocation(location)
+      .setInstance(instance)
+      .build()
+      .toString();
+  }
+
+  public static InstanceName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map matchMap =
+        PATH_TEMPLATE.validatedMatch(formattedString, "InstanceName.parse: formattedString not in valid format");
+    return of(matchMap.get("project"), matchMap.get("location"), matchMap.get("instance"));
+  }
+
+  public static List parseList(List formattedStrings) {
+    List list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List toStringList(List values) {
+    List list = new ArrayList(values.size());
+    for (InstanceName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldMapBuilder.put("location", location);
+          fieldMapBuilder.put("instance", instance);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  /**
+   * @deprecated This method is only present to satisfy the ResourceName interface.
+   */
+  @Deprecated
+  public ResourceNameType getType() {
+    throw new UnsupportedOperationException("InstanceName.getType() not supported");
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate("project", project, "location", location, "instance", instance);
+  }
+
+  /** Builder for InstanceName. */
+  public static class Builder {
+
+    private String project;
+    private String location;
+    private String instance;
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public String getInstance() {
+      return instance;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public Builder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public Builder setInstance(String instance) {
+      this.instance = instance;
+      return this;
+    }
+
+    private Builder() {
+    }
+
+    private Builder(InstanceName instanceName) {
+      project = instanceName.project;
+      location = instanceName.location;
+      instance = instanceName.instance;
+    }
+
+    public InstanceName build() {
+      return new InstanceName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof InstanceName) {
+      InstanceName that = (InstanceName) o;
+      return (this.project.equals(that.project))
+          && (this.location.equals(that.location))
+          && (this.instance.equals(that.instance));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    h *= 1000003;
+    h ^= location.hashCode();
+    h *= 1000003;
+    h ^= instance.hashCode();
+    return h;
+  }
+}
+
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceOrBuilder.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceOrBuilder.java
new file mode 100644
index 000000000000..acbe11db1799
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceOrBuilder.java
@@ -0,0 +1,446 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+public interface InstanceOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.redis.v1beta1.Instance)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required. Unique name of the resource in this scope including project and
+   * location using the form:
+   *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * Note: Redis instances are managed and addressed at regional level so
+   * location_id here refers to a GCP region; however, users get to choose which
+   * specific zone (or collection of zones for cross-zone instances) an instance
+   * should be provisioned in. Refer to [location_id] and
+   * [alternative_location_id] fields for more details.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * Required. Unique name of the resource in this scope including project and
+   * location using the form:
+   *     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+   * Note: Redis instances are managed and addressed at regional level so
+   * location_id here refers to a GCP region; however, users get to choose which
+   * specific zone (or collection of zones for cross-zone instances) an instance
+   * should be provisioned in. Refer to [location_id] and
+   * [alternative_location_id] fields for more details.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * 
+   * An arbitrary and optional user-provided name for the instance.
+   * 

+   *
+   * string display_name = 2;
+   */
+  java.lang.String getDisplayName();
+  /**
+   * 
+   * An arbitrary and optional user-provided name for the instance.
+   * 

+   *
+   * string display_name = 2;
+   */
+  com.google.protobuf.ByteString
+      getDisplayNameBytes();
+
+  /**
+   * 
+   * Resource labels to represent user provided metadata
+   * 

+   *
+   * map<string, string> labels = 3;
+   */
+  int getLabelsCount();
+  /**
+   * 
+   * Resource labels to represent user provided metadata
+   * 

+   *
+   * map<string, string> labels = 3;
+   */
+  boolean containsLabels(
+      java.lang.String key);
+  /**
+   * Use {@link #getLabelsMap()} instead.
+   */
+  @java.lang.Deprecated
+  java.util.Map
+  getLabels();
+  /**
+   * 
+   * Resource labels to represent user provided metadata
+   * 

+   *
+   * map<string, string> labels = 3;
+   */
+  java.util.Map
+  getLabelsMap();
+  /**
+   * 
+   * Resource labels to represent user provided metadata
+   * 

+   *
+   * map<string, string> labels = 3;
+   */
+
+  java.lang.String getLabelsOrDefault(
+      java.lang.String key,
+      java.lang.String defaultValue);
+  /**
+   * 
+   * Resource labels to represent user provided metadata
+   * 

+   *
+   * map<string, string> labels = 3;
+   */
+
+  java.lang.String getLabelsOrThrow(
+      java.lang.String key);
+
+  /**
+   * 
+   * Optional. The zone where the instance will be provisioned. If not provided,
+   * the service will choose a zone for the instance. For STANDARD_HA tier,
+   * instances will be created across two zones for protection against zonal
+   * failures. if [alternative_location_id] is also provided, it must be
+   * different from [location_id].
+   * 

+   *
+   * string location_id = 4;
+   */
+  java.lang.String getLocationId();
+  /**
+   * 
+   * Optional. The zone where the instance will be provisioned. If not provided,
+   * the service will choose a zone for the instance. For STANDARD_HA tier,
+   * instances will be created across two zones for protection against zonal
+   * failures. if [alternative_location_id] is also provided, it must be
+   * different from [location_id].
+   * 

+   *
+   * string location_id = 4;
+   */
+  com.google.protobuf.ByteString
+      getLocationIdBytes();
+
+  /**
+   * 
+   * Optional. Only applicable to STANDARD_HA tier which protects the instance
+   * against zonal failures by provisioning it across two zones. If provided, it
+   * must be a different zone from the one provided in [location_id].
+   * 

+   *
+   * string alternative_location_id = 5;
+   */
+  java.lang.String getAlternativeLocationId();
+  /**
+   * 
+   * Optional. Only applicable to STANDARD_HA tier which protects the instance
+   * against zonal failures by provisioning it across two zones. If provided, it
+   * must be a different zone from the one provided in [location_id].
+   * 

+   *
+   * string alternative_location_id = 5;
+   */
+  com.google.protobuf.ByteString
+      getAlternativeLocationIdBytes();
+
+  /**
+   * 
+   * Optional. The version of Redis software.
+   * If not provided, latest supported version will be used.
+   * 

+   *
+   * string redis_version = 7;
+   */
+  java.lang.String getRedisVersion();
+  /**
+   * 
+   * Optional. The version of Redis software.
+   * If not provided, latest supported version will be used.
+   * 

+   *
+   * string redis_version = 7;
+   */
+  com.google.protobuf.ByteString
+      getRedisVersionBytes();
+
+  /**
+   * 
+   * Optional. The CIDR range of internal addresses that are reserved for this
+   * instance. If not provided, the service will choose an unused /29 block,
+   * for example, 10.0.0.0/29 or 192.168.0.0/29. Ranges must be unique
+   * and non-overlapping with existing subnets in a network.
+   * 

+   *
+   * string reserved_ip_range = 9;
+   */
+  java.lang.String getReservedIpRange();
+  /**
+   * 
+   * Optional. The CIDR range of internal addresses that are reserved for this
+   * instance. If not provided, the service will choose an unused /29 block,
+   * for example, 10.0.0.0/29 or 192.168.0.0/29. Ranges must be unique
+   * and non-overlapping with existing subnets in a network.
+   * 

+   *
+   * string reserved_ip_range = 9;
+   */
+  com.google.protobuf.ByteString
+      getReservedIpRangeBytes();
+
+  /**
+   * 
+   * Output only. Hostname or IP address of the exposed redis endpoint used by
+   * clients to connect to the service.
+   * 

+   *
+   * string host = 10;
+   */
+  java.lang.String getHost();
+  /**
+   * 
+   * Output only. Hostname or IP address of the exposed redis endpoint used by
+   * clients to connect to the service.
+   * 

+   *
+   * string host = 10;
+   */
+  com.google.protobuf.ByteString
+      getHostBytes();
+
+  /**
+   * 
+   * Output only. The port number of the exposed redis endpoint.
+   * 

+   *
+   * int32 port = 11;
+   */
+  int getPort();
+
+  /**
+   * 
+   * Output only. The current zone where the Redis endpoint is placed. In
+   * single zone deployments, this will always be the same as [location_id]
+   * provided by the user at creation time. In cross-zone instances (only
+   * applicable in STANDARD_HA tier), this can be either [location_id] or
+   * [alternative_location_id] and can change on a failover event.
+   * 

+   *
+   * string current_location_id = 12;
+   */
+  java.lang.String getCurrentLocationId();
+  /**
+   * 
+   * Output only. The current zone where the Redis endpoint is placed. In
+   * single zone deployments, this will always be the same as [location_id]
+   * provided by the user at creation time. In cross-zone instances (only
+   * applicable in STANDARD_HA tier), this can be either [location_id] or
+   * [alternative_location_id] and can change on a failover event.
+   * 

+   *
+   * string current_location_id = 12;
+   */
+  com.google.protobuf.ByteString
+      getCurrentLocationIdBytes();
+
+  /**
+   * 
+   * Output only. The time the instance was created.
+   * 

+   *
+   * .google.protobuf.Timestamp create_time = 13;
+   */
+  boolean hasCreateTime();
+  /**
+   * 
+   * Output only. The time the instance was created.
+   * 

+   *
+   * .google.protobuf.Timestamp create_time = 13;
+   */
+  com.google.protobuf.Timestamp getCreateTime();
+  /**
+   * 
+   * Output only. The time the instance was created.
+   * 

+   *
+   * .google.protobuf.Timestamp create_time = 13;
+   */
+  com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder();
+
+  /**
+   * 
+   * Output only. The current state of this instance.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance.State state = 14;
+   */
+  int getStateValue();
+  /**
+   * 
+   * Output only. The current state of this instance.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance.State state = 14;
+   */
+  com.google.cloud.redis.v1beta1.Instance.State getState();
+
+  /**
+   * 
+   * Output only. Additional information about the current status of this
+   * instance, if available.
+   * 

+   *
+   * string status_message = 15;
+   */
+  java.lang.String getStatusMessage();
+  /**
+   * 
+   * Output only. Additional information about the current status of this
+   * instance, if available.
+   * 

+   *
+   * string status_message = 15;
+   */
+  com.google.protobuf.ByteString
+      getStatusMessageBytes();
+
+  /**
+   * 
+   * Optional. Redis configuration parameters, according to
+   * http://redis.io/topics/config. Currently, the only supported parameters
+   * are:
+   *  * maxmemory-policy
+   *  * notify-keyspace-events
+   * 

+   *
+   * map<string, string> redis_configs = 16;
+   */
+  int getRedisConfigsCount();
+  /**
+   * 
+   * Optional. Redis configuration parameters, according to
+   * http://redis.io/topics/config. Currently, the only supported parameters
+   * are:
+   *  * maxmemory-policy
+   *  * notify-keyspace-events
+   * 

+   *
+   * map<string, string> redis_configs = 16;
+   */
+  boolean containsRedisConfigs(
+      java.lang.String key);
+  /**
+   * Use {@link #getRedisConfigsMap()} instead.
+   */
+  @java.lang.Deprecated
+  java.util.Map
+  getRedisConfigs();
+  /**
+   * 
+   * Optional. Redis configuration parameters, according to
+   * http://redis.io/topics/config. Currently, the only supported parameters
+   * are:
+   *  * maxmemory-policy
+   *  * notify-keyspace-events
+   * 

+   *
+   * map<string, string> redis_configs = 16;
+   */
+  java.util.Map
+  getRedisConfigsMap();
+  /**
+   * 
+   * Optional. Redis configuration parameters, according to
+   * http://redis.io/topics/config. Currently, the only supported parameters
+   * are:
+   *  * maxmemory-policy
+   *  * notify-keyspace-events
+   * 

+   *
+   * map<string, string> redis_configs = 16;
+   */
+
+  java.lang.String getRedisConfigsOrDefault(
+      java.lang.String key,
+      java.lang.String defaultValue);
+  /**
+   * 
+   * Optional. Redis configuration parameters, according to
+   * http://redis.io/topics/config. Currently, the only supported parameters
+   * are:
+   *  * maxmemory-policy
+   *  * notify-keyspace-events
+   * 

+   *
+   * map<string, string> redis_configs = 16;
+   */
+
+  java.lang.String getRedisConfigsOrThrow(
+      java.lang.String key);
+
+  /**
+   * 
+   * Required. The service tier of the instance.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance.Tier tier = 17;
+   */
+  int getTierValue();
+  /**
+   * 
+   * Required. The service tier of the instance.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance.Tier tier = 17;
+   */
+  com.google.cloud.redis.v1beta1.Instance.Tier getTier();
+
+  /**
+   * 
+   * Required. Redis memory size in GB.
+   * 

+   *
+   * int32 memory_size_gb = 18;
+   */
+  int getMemorySizeGb();
+
+  /**
+   * 
+   * Optional. The full name of the Google Compute Engine
+   * [network](/compute/docs/networks-and-firewalls#networks) to which the
+   * instance is connected. If left unspecified, the `default` network
+   * will be used.
+   * 

+   *
+   * string authorized_network = 20;
+   */
+  java.lang.String getAuthorizedNetwork();
+  /**
+   * 
+   * Optional. The full name of the Google Compute Engine
+   * [network](/compute/docs/networks-and-firewalls#networks) to which the
+   * instance is connected. If left unspecified, the `default` network
+   * will be used.
+   * 

+   *
+   * string authorized_network = 20;
+   */
+  com.google.protobuf.ByteString
+      getAuthorizedNetworkBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java
new file mode 100644
index 000000000000..0a6d555080a7
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java
@@ -0,0 +1,822 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+/**
+ * 
+ * Request for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances].
+ * 

+ *
+ * Protobuf type {@code google.cloud.redis.v1beta1.ListInstancesRequest}
+ */
+public  final class ListInstancesRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.redis.v1beta1.ListInstancesRequest)
+    ListInstancesRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListInstancesRequest.newBuilder() to construct.
+  private ListInstancesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListInstancesRequest() {
+    parent_ = "";
+    pageSize_ = 0;
+    pageToken_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListInstancesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
+          case 16: {
+
+            pageSize_ = input.readInt32();
+            break;
+          }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            pageToken_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.redis.v1beta1.ListInstancesRequest.class, com.google.cloud.redis.v1beta1.ListInstancesRequest.Builder.class);
+  }
+
+  public static final int PARENT_FIELD_NUMBER = 1;
+  private volatile java.lang.Object parent_;
+  /**
+   * 
+   * Required. The resource name of the instance location using the form:
+   *     `projects/{project_id}/locations/{location_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string parent = 1;
+   */
+  public java.lang.String getParent() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      parent_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required. The resource name of the instance location using the form:
+   *     `projects/{project_id}/locations/{location_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string parent = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParentBytes() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      parent_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PAGE_SIZE_FIELD_NUMBER = 2;
+  private int pageSize_;
+  /**
+   * 
+   * The maximum number of items to return.
+   * If not specified, a default value of 1000 will be used by the service.
+   * Regardless of the page_size value, the response may include a partial list
+   * and a caller should only rely on response's
+   * [next_page_token][CloudRedis.ListInstancesResponse.next_page_token]
+   * to determine if there are more instances left to be queried.
+   * 

+   *
+   * int32 page_size = 2;
+   */
+  public int getPageSize() {
+    return pageSize_;
+  }
+
+  public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
+  private volatile java.lang.Object pageToken_;
+  /**
+   * 
+   * The next_page_token value returned from a previous List request,
+   * if any.
+   * 

+   *
+   * string page_token = 3;
+   */
+  public java.lang.String getPageToken() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      pageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The next_page_token value returned from a previous List request,
+   * if any.
+   * 

+   *
+   * string page_token = 3;
+   */
+  public com.google.protobuf.ByteString
+      getPageTokenBytes() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      pageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getParentBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
+    }
+    if (pageSize_ != 0) {
+      output.writeInt32(2, pageSize_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getParentBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
+    }
+    if (pageSize_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(2, pageSize_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.redis.v1beta1.ListInstancesRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.redis.v1beta1.ListInstancesRequest other = (com.google.cloud.redis.v1beta1.ListInstancesRequest) obj;
+
+    boolean result = true;
+    result = result && getParent()
+        .equals(other.getParent());
+    result = result && (getPageSize()
+        == other.getPageSize());
+    result = result && getPageToken()
+        .equals(other.getPageToken());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PARENT_FIELD_NUMBER;
+    hash = (53 * hash) + getParent().hashCode();
+    hash = (37 * hash) + PAGE_SIZE_FIELD_NUMBER;
+    hash = (53 * hash) + getPageSize();
+    hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getPageToken().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.redis.v1beta1.ListInstancesRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances].
+   * 

+   *
+   * Protobuf type {@code google.cloud.redis.v1beta1.ListInstancesRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.redis.v1beta1.ListInstancesRequest)
+      com.google.cloud.redis.v1beta1.ListInstancesRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.redis.v1beta1.ListInstancesRequest.class, com.google.cloud.redis.v1beta1.ListInstancesRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.redis.v1beta1.ListInstancesRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parent_ = "";
+
+      pageSize_ = 0;
+
+      pageToken_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_descriptor;
+    }
+
+    public com.google.cloud.redis.v1beta1.ListInstancesRequest getDefaultInstanceForType() {
+      return com.google.cloud.redis.v1beta1.ListInstancesRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.redis.v1beta1.ListInstancesRequest build() {
+      com.google.cloud.redis.v1beta1.ListInstancesRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.redis.v1beta1.ListInstancesRequest buildPartial() {
+      com.google.cloud.redis.v1beta1.ListInstancesRequest result = new com.google.cloud.redis.v1beta1.ListInstancesRequest(this);
+      result.parent_ = parent_;
+      result.pageSize_ = pageSize_;
+      result.pageToken_ = pageToken_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.redis.v1beta1.ListInstancesRequest) {
+        return mergeFrom((com.google.cloud.redis.v1beta1.ListInstancesRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.redis.v1beta1.ListInstancesRequest other) {
+      if (other == com.google.cloud.redis.v1beta1.ListInstancesRequest.getDefaultInstance()) return this;
+      if (!other.getParent().isEmpty()) {
+        parent_ = other.parent_;
+        onChanged();
+      }
+      if (other.getPageSize() != 0) {
+        setPageSize(other.getPageSize());
+      }
+      if (!other.getPageToken().isEmpty()) {
+        pageToken_ = other.pageToken_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.redis.v1beta1.ListInstancesRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.redis.v1beta1.ListInstancesRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object parent_ = "";
+    /**
+     * 
+     * Required. The resource name of the instance location using the form:
+     *     `projects/{project_id}/locations/{location_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string parent = 1;
+     */
+    public java.lang.String getParent() {
+      java.lang.Object ref = parent_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        parent_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required. The resource name of the instance location using the form:
+     *     `projects/{project_id}/locations/{location_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string parent = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParentBytes() {
+      java.lang.Object ref = parent_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        parent_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required. The resource name of the instance location using the form:
+     *     `projects/{project_id}/locations/{location_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParent(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. The resource name of the instance location using the form:
+     *     `projects/{project_id}/locations/{location_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder clearParent() {
+      
+      parent_ = getDefaultInstance().getParent();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required. The resource name of the instance location using the form:
+     *     `projects/{project_id}/locations/{location_id}`
+     * where `location_id` refers to a GCP region
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParentBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int pageSize_ ;
+    /**
+     * 
+     * The maximum number of items to return.
+     * If not specified, a default value of 1000 will be used by the service.
+     * Regardless of the page_size value, the response may include a partial list
+     * and a caller should only rely on response's
+     * [next_page_token][CloudRedis.ListInstancesResponse.next_page_token]
+     * to determine if there are more instances left to be queried.
+     * 

+     *
+     * int32 page_size = 2;
+     */
+    public int getPageSize() {
+      return pageSize_;
+    }
+    /**
+     * 
+     * The maximum number of items to return.
+     * If not specified, a default value of 1000 will be used by the service.
+     * Regardless of the page_size value, the response may include a partial list
+     * and a caller should only rely on response's
+     * [next_page_token][CloudRedis.ListInstancesResponse.next_page_token]
+     * to determine if there are more instances left to be queried.
+     * 

+     *
+     * int32 page_size = 2;
+     */
+    public Builder setPageSize(int value) {
+      
+      pageSize_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The maximum number of items to return.
+     * If not specified, a default value of 1000 will be used by the service.
+     * Regardless of the page_size value, the response may include a partial list
+     * and a caller should only rely on response's
+     * [next_page_token][CloudRedis.ListInstancesResponse.next_page_token]
+     * to determine if there are more instances left to be queried.
+     * 

+     *
+     * int32 page_size = 2;
+     */
+    public Builder clearPageSize() {
+      
+      pageSize_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object pageToken_ = "";
+    /**
+     * 
+     * The next_page_token value returned from a previous List request,
+     * if any.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public java.lang.String getPageToken() {
+      java.lang.Object ref = pageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        pageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The next_page_token value returned from a previous List request,
+     * if any.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public com.google.protobuf.ByteString
+        getPageTokenBytes() {
+      java.lang.Object ref = pageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The next_page_token value returned from a previous List request,
+     * if any.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public Builder setPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The next_page_token value returned from a previous List request,
+     * if any.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public Builder clearPageToken() {
+      
+      pageToken_ = getDefaultInstance().getPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The next_page_token value returned from a previous List request,
+     * if any.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public Builder setPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.redis.v1beta1.ListInstancesRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.redis.v1beta1.ListInstancesRequest)
+  private static final com.google.cloud.redis.v1beta1.ListInstancesRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.redis.v1beta1.ListInstancesRequest();
+  }
+
+  public static com.google.cloud.redis.v1beta1.ListInstancesRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListInstancesRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListInstancesRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.redis.v1beta1.ListInstancesRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequestOrBuilder.java
new file mode 100644
index 000000000000..4c0bf9192e23
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequestOrBuilder.java
@@ -0,0 +1,65 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+public interface ListInstancesRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.redis.v1beta1.ListInstancesRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required. The resource name of the instance location using the form:
+   *     `projects/{project_id}/locations/{location_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string parent = 1;
+   */
+  java.lang.String getParent();
+  /**
+   * 
+   * Required. The resource name of the instance location using the form:
+   *     `projects/{project_id}/locations/{location_id}`
+   * where `location_id` refers to a GCP region
+   * 

+   *
+   * string parent = 1;
+   */
+  com.google.protobuf.ByteString
+      getParentBytes();
+
+  /**
+   * 
+   * The maximum number of items to return.
+   * If not specified, a default value of 1000 will be used by the service.
+   * Regardless of the page_size value, the response may include a partial list
+   * and a caller should only rely on response's
+   * [next_page_token][CloudRedis.ListInstancesResponse.next_page_token]
+   * to determine if there are more instances left to be queried.
+   * 

+   *
+   * int32 page_size = 2;
+   */
+  int getPageSize();
+
+  /**
+   * 
+   * The next_page_token value returned from a previous List request,
+   * if any.
+   * 

+   *
+   * string page_token = 3;
+   */
+  java.lang.String getPageToken();
+  /**
+   * 
+   * The next_page_token value returned from a previous List request,
+   * if any.
+   * 

+   *
+   * string page_token = 3;
+   */
+  com.google.protobuf.ByteString
+      getPageTokenBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java
new file mode 100644
index 000000000000..9b017df46889
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java
@@ -0,0 +1,1183 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+/**
+ * 
+ * Response for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances].
+ * 

+ *
+ * Protobuf type {@code google.cloud.redis.v1beta1.ListInstancesResponse}
+ */
+public  final class ListInstancesResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.redis.v1beta1.ListInstancesResponse)
+    ListInstancesResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListInstancesResponse.newBuilder() to construct.
+  private ListInstancesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListInstancesResponse() {
+    instances_ = java.util.Collections.emptyList();
+    nextPageToken_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListInstancesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              instances_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            instances_.add(
+                input.readMessage(com.google.cloud.redis.v1beta1.Instance.parser(), extensionRegistry));
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            nextPageToken_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        instances_ = java.util.Collections.unmodifiableList(instances_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.redis.v1beta1.ListInstancesResponse.class, com.google.cloud.redis.v1beta1.ListInstancesResponse.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int INSTANCES_FIELD_NUMBER = 1;
+  private java.util.List instances_;
+  /**
+   * 
+   * A list of Redis instances in the project in the specified location,
+   * or across all locations.
+   * If the `location_id` in the parent field of the request is "-", all regions
+   * available to the project are queried, and the results aggregated.
+   * If in such an aggregated query a location is unavailable, a dummy Redis
+   * entry is included in the response with the "name" field set to a value of
+   * the form projects/{project_id}/locations/{location_id}/instances/- and the
+   * "status" field set to ERROR and "status_message" field set to "location not
+   * available for ListInstances".
+   * 

+   *
+   * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+   */
+  public java.util.List getInstancesList() {
+    return instances_;
+  }
+  /**
+   * 
+   * A list of Redis instances in the project in the specified location,
+   * or across all locations.
+   * If the `location_id` in the parent field of the request is "-", all regions
+   * available to the project are queried, and the results aggregated.
+   * If in such an aggregated query a location is unavailable, a dummy Redis
+   * entry is included in the response with the "name" field set to a value of
+   * the form projects/{project_id}/locations/{location_id}/instances/- and the
+   * "status" field set to ERROR and "status_message" field set to "location not
+   * available for ListInstances".
+   * 

+   *
+   * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+   */
+  public java.util.List 
+      getInstancesOrBuilderList() {
+    return instances_;
+  }
+  /**
+   * 
+   * A list of Redis instances in the project in the specified location,
+   * or across all locations.
+   * If the `location_id` in the parent field of the request is "-", all regions
+   * available to the project are queried, and the results aggregated.
+   * If in such an aggregated query a location is unavailable, a dummy Redis
+   * entry is included in the response with the "name" field set to a value of
+   * the form projects/{project_id}/locations/{location_id}/instances/- and the
+   * "status" field set to ERROR and "status_message" field set to "location not
+   * available for ListInstances".
+   * 

+   *
+   * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+   */
+  public int getInstancesCount() {
+    return instances_.size();
+  }
+  /**
+   * 
+   * A list of Redis instances in the project in the specified location,
+   * or across all locations.
+   * If the `location_id` in the parent field of the request is "-", all regions
+   * available to the project are queried, and the results aggregated.
+   * If in such an aggregated query a location is unavailable, a dummy Redis
+   * entry is included in the response with the "name" field set to a value of
+   * the form projects/{project_id}/locations/{location_id}/instances/- and the
+   * "status" field set to ERROR and "status_message" field set to "location not
+   * available for ListInstances".
+   * 

+   *
+   * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+   */
+  public com.google.cloud.redis.v1beta1.Instance getInstances(int index) {
+    return instances_.get(index);
+  }
+  /**
+   * 
+   * A list of Redis instances in the project in the specified location,
+   * or across all locations.
+   * If the `location_id` in the parent field of the request is "-", all regions
+   * available to the project are queried, and the results aggregated.
+   * If in such an aggregated query a location is unavailable, a dummy Redis
+   * entry is included in the response with the "name" field set to a value of
+   * the form projects/{project_id}/locations/{location_id}/instances/- and the
+   * "status" field set to ERROR and "status_message" field set to "location not
+   * available for ListInstances".
+   * 

+   *
+   * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+   */
+  public com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstancesOrBuilder(
+      int index) {
+    return instances_.get(index);
+  }
+
+  public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
+  private volatile java.lang.Object nextPageToken_;
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no more
+   * results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public java.lang.String getNextPageToken() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      nextPageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no more
+   * results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public com.google.protobuf.ByteString
+      getNextPageTokenBytes() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      nextPageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < instances_.size(); i++) {
+      output.writeMessage(1, instances_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < instances_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, instances_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.redis.v1beta1.ListInstancesResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.redis.v1beta1.ListInstancesResponse other = (com.google.cloud.redis.v1beta1.ListInstancesResponse) obj;
+
+    boolean result = true;
+    result = result && getInstancesList()
+        .equals(other.getInstancesList());
+    result = result && getNextPageToken()
+        .equals(other.getNextPageToken());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getInstancesCount() > 0) {
+      hash = (37 * hash) + INSTANCES_FIELD_NUMBER;
+      hash = (53 * hash) + getInstancesList().hashCode();
+    }
+    hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getNextPageToken().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.redis.v1beta1.ListInstancesResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Response for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances].
+   * 

+   *
+   * Protobuf type {@code google.cloud.redis.v1beta1.ListInstancesResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.redis.v1beta1.ListInstancesResponse)
+      com.google.cloud.redis.v1beta1.ListInstancesResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.redis.v1beta1.ListInstancesResponse.class, com.google.cloud.redis.v1beta1.ListInstancesResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.redis.v1beta1.ListInstancesResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getInstancesFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (instancesBuilder_ == null) {
+        instances_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        instancesBuilder_.clear();
+      }
+      nextPageToken_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_descriptor;
+    }
+
+    public com.google.cloud.redis.v1beta1.ListInstancesResponse getDefaultInstanceForType() {
+      return com.google.cloud.redis.v1beta1.ListInstancesResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.redis.v1beta1.ListInstancesResponse build() {
+      com.google.cloud.redis.v1beta1.ListInstancesResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.redis.v1beta1.ListInstancesResponse buildPartial() {
+      com.google.cloud.redis.v1beta1.ListInstancesResponse result = new com.google.cloud.redis.v1beta1.ListInstancesResponse(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (instancesBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          instances_ = java.util.Collections.unmodifiableList(instances_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.instances_ = instances_;
+      } else {
+        result.instances_ = instancesBuilder_.build();
+      }
+      result.nextPageToken_ = nextPageToken_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.redis.v1beta1.ListInstancesResponse) {
+        return mergeFrom((com.google.cloud.redis.v1beta1.ListInstancesResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.redis.v1beta1.ListInstancesResponse other) {
+      if (other == com.google.cloud.redis.v1beta1.ListInstancesResponse.getDefaultInstance()) return this;
+      if (instancesBuilder_ == null) {
+        if (!other.instances_.isEmpty()) {
+          if (instances_.isEmpty()) {
+            instances_ = other.instances_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureInstancesIsMutable();
+            instances_.addAll(other.instances_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.instances_.isEmpty()) {
+          if (instancesBuilder_.isEmpty()) {
+            instancesBuilder_.dispose();
+            instancesBuilder_ = null;
+            instances_ = other.instances_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            instancesBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getInstancesFieldBuilder() : null;
+          } else {
+            instancesBuilder_.addAllMessages(other.instances_);
+          }
+        }
+      }
+      if (!other.getNextPageToken().isEmpty()) {
+        nextPageToken_ = other.nextPageToken_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.redis.v1beta1.ListInstancesResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.redis.v1beta1.ListInstancesResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List instances_ =
+      java.util.Collections.emptyList();
+    private void ensureInstancesIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        instances_ = new java.util.ArrayList(instances_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.redis.v1beta1.Instance, com.google.cloud.redis.v1beta1.Instance.Builder, com.google.cloud.redis.v1beta1.InstanceOrBuilder> instancesBuilder_;
+
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public java.util.List getInstancesList() {
+      if (instancesBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(instances_);
+      } else {
+        return instancesBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public int getInstancesCount() {
+      if (instancesBuilder_ == null) {
+        return instances_.size();
+      } else {
+        return instancesBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public com.google.cloud.redis.v1beta1.Instance getInstances(int index) {
+      if (instancesBuilder_ == null) {
+        return instances_.get(index);
+      } else {
+        return instancesBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public Builder setInstances(
+        int index, com.google.cloud.redis.v1beta1.Instance value) {
+      if (instancesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureInstancesIsMutable();
+        instances_.set(index, value);
+        onChanged();
+      } else {
+        instancesBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public Builder setInstances(
+        int index, com.google.cloud.redis.v1beta1.Instance.Builder builderForValue) {
+      if (instancesBuilder_ == null) {
+        ensureInstancesIsMutable();
+        instances_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        instancesBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public Builder addInstances(com.google.cloud.redis.v1beta1.Instance value) {
+      if (instancesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureInstancesIsMutable();
+        instances_.add(value);
+        onChanged();
+      } else {
+        instancesBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public Builder addInstances(
+        int index, com.google.cloud.redis.v1beta1.Instance value) {
+      if (instancesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureInstancesIsMutable();
+        instances_.add(index, value);
+        onChanged();
+      } else {
+        instancesBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public Builder addInstances(
+        com.google.cloud.redis.v1beta1.Instance.Builder builderForValue) {
+      if (instancesBuilder_ == null) {
+        ensureInstancesIsMutable();
+        instances_.add(builderForValue.build());
+        onChanged();
+      } else {
+        instancesBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public Builder addInstances(
+        int index, com.google.cloud.redis.v1beta1.Instance.Builder builderForValue) {
+      if (instancesBuilder_ == null) {
+        ensureInstancesIsMutable();
+        instances_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        instancesBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public Builder addAllInstances(
+        java.lang.Iterable values) {
+      if (instancesBuilder_ == null) {
+        ensureInstancesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, instances_);
+        onChanged();
+      } else {
+        instancesBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public Builder clearInstances() {
+      if (instancesBuilder_ == null) {
+        instances_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        instancesBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public Builder removeInstances(int index) {
+      if (instancesBuilder_ == null) {
+        ensureInstancesIsMutable();
+        instances_.remove(index);
+        onChanged();
+      } else {
+        instancesBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public com.google.cloud.redis.v1beta1.Instance.Builder getInstancesBuilder(
+        int index) {
+      return getInstancesFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstancesOrBuilder(
+        int index) {
+      if (instancesBuilder_ == null) {
+        return instances_.get(index);  } else {
+        return instancesBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public java.util.List 
+         getInstancesOrBuilderList() {
+      if (instancesBuilder_ != null) {
+        return instancesBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(instances_);
+      }
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public com.google.cloud.redis.v1beta1.Instance.Builder addInstancesBuilder() {
+      return getInstancesFieldBuilder().addBuilder(
+          com.google.cloud.redis.v1beta1.Instance.getDefaultInstance());
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public com.google.cloud.redis.v1beta1.Instance.Builder addInstancesBuilder(
+        int index) {
+      return getInstancesFieldBuilder().addBuilder(
+          index, com.google.cloud.redis.v1beta1.Instance.getDefaultInstance());
+    }
+    /**
+     * 
+     * A list of Redis instances in the project in the specified location,
+     * or across all locations.
+     * If the `location_id` in the parent field of the request is "-", all regions
+     * available to the project are queried, and the results aggregated.
+     * If in such an aggregated query a location is unavailable, a dummy Redis
+     * entry is included in the response with the "name" field set to a value of
+     * the form projects/{project_id}/locations/{location_id}/instances/- and the
+     * "status" field set to ERROR and "status_message" field set to "location not
+     * available for ListInstances".
+     * 

+     *
+     * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+     */
+    public java.util.List 
+         getInstancesBuilderList() {
+      return getInstancesFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.redis.v1beta1.Instance, com.google.cloud.redis.v1beta1.Instance.Builder, com.google.cloud.redis.v1beta1.InstanceOrBuilder> 
+        getInstancesFieldBuilder() {
+      if (instancesBuilder_ == null) {
+        instancesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.redis.v1beta1.Instance, com.google.cloud.redis.v1beta1.Instance.Builder, com.google.cloud.redis.v1beta1.InstanceOrBuilder>(
+                instances_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        instances_ = null;
+      }
+      return instancesBuilder_;
+    }
+
+    private java.lang.Object nextPageToken_ = "";
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no more
+     * results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public java.lang.String getNextPageToken() {
+      java.lang.Object ref = nextPageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        nextPageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no more
+     * results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public com.google.protobuf.ByteString
+        getNextPageTokenBytes() {
+      java.lang.Object ref = nextPageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        nextPageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no more
+     * results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no more
+     * results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder clearNextPageToken() {
+      
+      nextPageToken_ = getDefaultInstance().getNextPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no more
+     * results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.redis.v1beta1.ListInstancesResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.redis.v1beta1.ListInstancesResponse)
+  private static final com.google.cloud.redis.v1beta1.ListInstancesResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.redis.v1beta1.ListInstancesResponse();
+  }
+
+  public static com.google.cloud.redis.v1beta1.ListInstancesResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListInstancesResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListInstancesResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.redis.v1beta1.ListInstancesResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponseOrBuilder.java
new file mode 100644
index 000000000000..345439740b40
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponseOrBuilder.java
@@ -0,0 +1,113 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+public interface ListInstancesResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.redis.v1beta1.ListInstancesResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * A list of Redis instances in the project in the specified location,
+   * or across all locations.
+   * If the `location_id` in the parent field of the request is "-", all regions
+   * available to the project are queried, and the results aggregated.
+   * If in such an aggregated query a location is unavailable, a dummy Redis
+   * entry is included in the response with the "name" field set to a value of
+   * the form projects/{project_id}/locations/{location_id}/instances/- and the
+   * "status" field set to ERROR and "status_message" field set to "location not
+   * available for ListInstances".
+   * 

+   *
+   * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+   */
+  java.util.List 
+      getInstancesList();
+  /**
+   * 
+   * A list of Redis instances in the project in the specified location,
+   * or across all locations.
+   * If the `location_id` in the parent field of the request is "-", all regions
+   * available to the project are queried, and the results aggregated.
+   * If in such an aggregated query a location is unavailable, a dummy Redis
+   * entry is included in the response with the "name" field set to a value of
+   * the form projects/{project_id}/locations/{location_id}/instances/- and the
+   * "status" field set to ERROR and "status_message" field set to "location not
+   * available for ListInstances".
+   * 

+   *
+   * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+   */
+  com.google.cloud.redis.v1beta1.Instance getInstances(int index);
+  /**
+   * 
+   * A list of Redis instances in the project in the specified location,
+   * or across all locations.
+   * If the `location_id` in the parent field of the request is "-", all regions
+   * available to the project are queried, and the results aggregated.
+   * If in such an aggregated query a location is unavailable, a dummy Redis
+   * entry is included in the response with the "name" field set to a value of
+   * the form projects/{project_id}/locations/{location_id}/instances/- and the
+   * "status" field set to ERROR and "status_message" field set to "location not
+   * available for ListInstances".
+   * 

+   *
+   * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+   */
+  int getInstancesCount();
+  /**
+   * 
+   * A list of Redis instances in the project in the specified location,
+   * or across all locations.
+   * If the `location_id` in the parent field of the request is "-", all regions
+   * available to the project are queried, and the results aggregated.
+   * If in such an aggregated query a location is unavailable, a dummy Redis
+   * entry is included in the response with the "name" field set to a value of
+   * the form projects/{project_id}/locations/{location_id}/instances/- and the
+   * "status" field set to ERROR and "status_message" field set to "location not
+   * available for ListInstances".
+   * 

+   *
+   * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+   */
+  java.util.List 
+      getInstancesOrBuilderList();
+  /**
+   * 
+   * A list of Redis instances in the project in the specified location,
+   * or across all locations.
+   * If the `location_id` in the parent field of the request is "-", all regions
+   * available to the project are queried, and the results aggregated.
+   * If in such an aggregated query a location is unavailable, a dummy Redis
+   * entry is included in the response with the "name" field set to a value of
+   * the form projects/{project_id}/locations/{location_id}/instances/- and the
+   * "status" field set to ERROR and "status_message" field set to "location not
+   * available for ListInstances".
+   * 

+   *
+   * repeated .google.cloud.redis.v1beta1.Instance instances = 1;
+   */
+  com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstancesOrBuilder(
+      int index);
+
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no more
+   * results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  java.lang.String getNextPageToken();
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no more
+   * results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  com.google.protobuf.ByteString
+      getNextPageTokenBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadata.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadata.java
new file mode 100644
index 000000000000..3ca322c73c60
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadata.java
@@ -0,0 +1,754 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+/**
+ * 
+ * This location metadata represents additional configuration options for a
+ * given location where a Redis instance may be created. All fields are output
+ * only. It is returned as content of the
+ * `google.cloud.location.Location.metadata` field.
+ * 

+ *
+ * Protobuf type {@code google.cloud.redis.v1beta1.LocationMetadata}
+ */
+public  final class LocationMetadata extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.redis.v1beta1.LocationMetadata)
+    LocationMetadataOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use LocationMetadata.newBuilder() to construct.
+  private LocationMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private LocationMetadata() {
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private LocationMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              availableZones_ = com.google.protobuf.MapField.newMapField(
+                  AvailableZonesDefaultEntryHolder.defaultEntry);
+              mutable_bitField0_ |= 0x00000001;
+            }
+            com.google.protobuf.MapEntry
+            availableZones__ = input.readMessage(
+                AvailableZonesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+            availableZones_.getMutableMap().put(
+                availableZones__.getKey(), availableZones__.getValue());
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_LocationMetadata_descriptor;
+  }
+
+  @SuppressWarnings({"rawtypes"})
+  protected com.google.protobuf.MapField internalGetMapField(
+      int number) {
+    switch (number) {
+      case 1:
+        return internalGetAvailableZones();
+      default:
+        throw new RuntimeException(
+            "Invalid map field number: " + number);
+    }
+  }
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_LocationMetadata_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.redis.v1beta1.LocationMetadata.class, com.google.cloud.redis.v1beta1.LocationMetadata.Builder.class);
+  }
+
+  public static final int AVAILABLE_ZONES_FIELD_NUMBER = 1;
+  private static final class AvailableZonesDefaultEntryHolder {
+    static final com.google.protobuf.MapEntry<
+        java.lang.String, com.google.cloud.redis.v1beta1.ZoneMetadata> defaultEntry =
+            com.google.protobuf.MapEntry
+            .newDefaultInstance(
+                com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_LocationMetadata_AvailableZonesEntry_descriptor, 
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "",
+                com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                com.google.cloud.redis.v1beta1.ZoneMetadata.getDefaultInstance());
+  }
+  private com.google.protobuf.MapField<
+      java.lang.String, com.google.cloud.redis.v1beta1.ZoneMetadata> availableZones_;
+  private com.google.protobuf.MapField
+  internalGetAvailableZones() {
+    if (availableZones_ == null) {
+      return com.google.protobuf.MapField.emptyMapField(
+          AvailableZonesDefaultEntryHolder.defaultEntry);
+    }
+    return availableZones_;
+  }
+
+  public int getAvailableZonesCount() {
+    return internalGetAvailableZones().getMap().size();
+  }
+  /**
+   * 
+   * Output only. The set of available zones in the location. The map is keyed
+   * by the lowercase ID of each zone, as defined by GCE. These keys can be
+   * specified in `location_id` or `alternative_location_id` fields when
+   * creating a Redis instance.
+   * 

+   *
+   * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+   */
+
+  public boolean containsAvailableZones(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    return internalGetAvailableZones().getMap().containsKey(key);
+  }
+  /**
+   * Use {@link #getAvailableZonesMap()} instead.
+   */
+  @java.lang.Deprecated
+  public java.util.Map getAvailableZones() {
+    return getAvailableZonesMap();
+  }
+  /**
+   * 
+   * Output only. The set of available zones in the location. The map is keyed
+   * by the lowercase ID of each zone, as defined by GCE. These keys can be
+   * specified in `location_id` or `alternative_location_id` fields when
+   * creating a Redis instance.
+   * 

+   *
+   * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+   */
+
+  public java.util.Map getAvailableZonesMap() {
+    return internalGetAvailableZones().getMap();
+  }
+  /**
+   * 
+   * Output only. The set of available zones in the location. The map is keyed
+   * by the lowercase ID of each zone, as defined by GCE. These keys can be
+   * specified in `location_id` or `alternative_location_id` fields when
+   * creating a Redis instance.
+   * 

+   *
+   * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+   */
+
+  public com.google.cloud.redis.v1beta1.ZoneMetadata getAvailableZonesOrDefault(
+      java.lang.String key,
+      com.google.cloud.redis.v1beta1.ZoneMetadata defaultValue) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    java.util.Map map =
+        internalGetAvailableZones().getMap();
+    return map.containsKey(key) ? map.get(key) : defaultValue;
+  }
+  /**
+   * 
+   * Output only. The set of available zones in the location. The map is keyed
+   * by the lowercase ID of each zone, as defined by GCE. These keys can be
+   * specified in `location_id` or `alternative_location_id` fields when
+   * creating a Redis instance.
+   * 

+   *
+   * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+   */
+
+  public com.google.cloud.redis.v1beta1.ZoneMetadata getAvailableZonesOrThrow(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
+    java.util.Map map =
+        internalGetAvailableZones().getMap();
+    if (!map.containsKey(key)) {
+      throw new java.lang.IllegalArgumentException();
+    }
+    return map.get(key);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    com.google.protobuf.GeneratedMessageV3
+      .serializeStringMapTo(
+        output,
+        internalGetAvailableZones(),
+        AvailableZonesDefaultEntryHolder.defaultEntry,
+        1);
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (java.util.Map.Entry entry
+         : internalGetAvailableZones().getMap().entrySet()) {
+      com.google.protobuf.MapEntry
+      availableZones__ = AvailableZonesDefaultEntryHolder.defaultEntry.newBuilderForType()
+          .setKey(entry.getKey())
+          .setValue(entry.getValue())
+          .build();
+      size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, availableZones__);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.redis.v1beta1.LocationMetadata)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.redis.v1beta1.LocationMetadata other = (com.google.cloud.redis.v1beta1.LocationMetadata) obj;
+
+    boolean result = true;
+    result = result && internalGetAvailableZones().equals(
+        other.internalGetAvailableZones());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (!internalGetAvailableZones().getMap().isEmpty()) {
+      hash = (37 * hash) + AVAILABLE_ZONES_FIELD_NUMBER;
+      hash = (53 * hash) + internalGetAvailableZones().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.redis.v1beta1.LocationMetadata parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.LocationMetadata parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.LocationMetadata parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.LocationMetadata parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.LocationMetadata parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.LocationMetadata parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.LocationMetadata parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.LocationMetadata parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.LocationMetadata parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.LocationMetadata parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.LocationMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.LocationMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.redis.v1beta1.LocationMetadata prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * This location metadata represents additional configuration options for a
+   * given location where a Redis instance may be created. All fields are output
+   * only. It is returned as content of the
+   * `google.cloud.location.Location.metadata` field.
+   * 

+   *
+   * Protobuf type {@code google.cloud.redis.v1beta1.LocationMetadata}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.redis.v1beta1.LocationMetadata)
+      com.google.cloud.redis.v1beta1.LocationMetadataOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_LocationMetadata_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMapField(
+        int number) {
+      switch (number) {
+        case 1:
+          return internalGetAvailableZones();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @SuppressWarnings({"rawtypes"})
+    protected com.google.protobuf.MapField internalGetMutableMapField(
+        int number) {
+      switch (number) {
+        case 1:
+          return internalGetMutableAvailableZones();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_LocationMetadata_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.redis.v1beta1.LocationMetadata.class, com.google.cloud.redis.v1beta1.LocationMetadata.Builder.class);
+    }
+
+    // Construct using com.google.cloud.redis.v1beta1.LocationMetadata.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      internalGetMutableAvailableZones().clear();
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_LocationMetadata_descriptor;
+    }
+
+    public com.google.cloud.redis.v1beta1.LocationMetadata getDefaultInstanceForType() {
+      return com.google.cloud.redis.v1beta1.LocationMetadata.getDefaultInstance();
+    }
+
+    public com.google.cloud.redis.v1beta1.LocationMetadata build() {
+      com.google.cloud.redis.v1beta1.LocationMetadata result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.redis.v1beta1.LocationMetadata buildPartial() {
+      com.google.cloud.redis.v1beta1.LocationMetadata result = new com.google.cloud.redis.v1beta1.LocationMetadata(this);
+      int from_bitField0_ = bitField0_;
+      result.availableZones_ = internalGetAvailableZones();
+      result.availableZones_.makeImmutable();
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.redis.v1beta1.LocationMetadata) {
+        return mergeFrom((com.google.cloud.redis.v1beta1.LocationMetadata)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.redis.v1beta1.LocationMetadata other) {
+      if (other == com.google.cloud.redis.v1beta1.LocationMetadata.getDefaultInstance()) return this;
+      internalGetMutableAvailableZones().mergeFrom(
+          other.internalGetAvailableZones());
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.redis.v1beta1.LocationMetadata parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.redis.v1beta1.LocationMetadata) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private com.google.protobuf.MapField<
+        java.lang.String, com.google.cloud.redis.v1beta1.ZoneMetadata> availableZones_;
+    private com.google.protobuf.MapField
+    internalGetAvailableZones() {
+      if (availableZones_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            AvailableZonesDefaultEntryHolder.defaultEntry);
+      }
+      return availableZones_;
+    }
+    private com.google.protobuf.MapField
+    internalGetMutableAvailableZones() {
+      onChanged();;
+      if (availableZones_ == null) {
+        availableZones_ = com.google.protobuf.MapField.newMapField(
+            AvailableZonesDefaultEntryHolder.defaultEntry);
+      }
+      if (!availableZones_.isMutable()) {
+        availableZones_ = availableZones_.copy();
+      }
+      return availableZones_;
+    }
+
+    public int getAvailableZonesCount() {
+      return internalGetAvailableZones().getMap().size();
+    }
+    /**
+     * 
+     * Output only. The set of available zones in the location. The map is keyed
+     * by the lowercase ID of each zone, as defined by GCE. These keys can be
+     * specified in `location_id` or `alternative_location_id` fields when
+     * creating a Redis instance.
+     * 

+     *
+     * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+     */
+
+    public boolean containsAvailableZones(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      return internalGetAvailableZones().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getAvailableZonesMap()} instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map getAvailableZones() {
+      return getAvailableZonesMap();
+    }
+    /**
+     * 
+     * Output only. The set of available zones in the location. The map is keyed
+     * by the lowercase ID of each zone, as defined by GCE. These keys can be
+     * specified in `location_id` or `alternative_location_id` fields when
+     * creating a Redis instance.
+     * 

+     *
+     * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+     */
+
+    public java.util.Map getAvailableZonesMap() {
+      return internalGetAvailableZones().getMap();
+    }
+    /**
+     * 
+     * Output only. The set of available zones in the location. The map is keyed
+     * by the lowercase ID of each zone, as defined by GCE. These keys can be
+     * specified in `location_id` or `alternative_location_id` fields when
+     * creating a Redis instance.
+     * 

+     *
+     * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+     */
+
+    public com.google.cloud.redis.v1beta1.ZoneMetadata getAvailableZonesOrDefault(
+        java.lang.String key,
+        com.google.cloud.redis.v1beta1.ZoneMetadata defaultValue) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      java.util.Map map =
+          internalGetAvailableZones().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * 
+     * Output only. The set of available zones in the location. The map is keyed
+     * by the lowercase ID of each zone, as defined by GCE. These keys can be
+     * specified in `location_id` or `alternative_location_id` fields when
+     * creating a Redis instance.
+     * 

+     *
+     * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+     */
+
+    public com.google.cloud.redis.v1beta1.ZoneMetadata getAvailableZonesOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      java.util.Map map =
+          internalGetAvailableZones().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public Builder clearAvailableZones() {
+      internalGetMutableAvailableZones().getMutableMap()
+          .clear();
+      return this;
+    }
+    /**
+     * 
+     * Output only. The set of available zones in the location. The map is keyed
+     * by the lowercase ID of each zone, as defined by GCE. These keys can be
+     * specified in `location_id` or `alternative_location_id` fields when
+     * creating a Redis instance.
+     * 

+     *
+     * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+     */
+
+    public Builder removeAvailableZones(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableAvailableZones().getMutableMap()
+          .remove(key);
+      return this;
+    }
+    /**
+     * Use alternate mutation accessors instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map
+    getMutableAvailableZones() {
+      return internalGetMutableAvailableZones().getMutableMap();
+    }
+    /**
+     * 
+     * Output only. The set of available zones in the location. The map is keyed
+     * by the lowercase ID of each zone, as defined by GCE. These keys can be
+     * specified in `location_id` or `alternative_location_id` fields when
+     * creating a Redis instance.
+     * 

+     *
+     * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+     */
+    public Builder putAvailableZones(
+        java.lang.String key,
+        com.google.cloud.redis.v1beta1.ZoneMetadata value) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      if (value == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableAvailableZones().getMutableMap()
+          .put(key, value);
+      return this;
+    }
+    /**
+     * 
+     * Output only. The set of available zones in the location. The map is keyed
+     * by the lowercase ID of each zone, as defined by GCE. These keys can be
+     * specified in `location_id` or `alternative_location_id` fields when
+     * creating a Redis instance.
+     * 

+     *
+     * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+     */
+
+    public Builder putAllAvailableZones(
+        java.util.Map values) {
+      internalGetMutableAvailableZones().getMutableMap()
+          .putAll(values);
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.redis.v1beta1.LocationMetadata)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.redis.v1beta1.LocationMetadata)
+  private static final com.google.cloud.redis.v1beta1.LocationMetadata DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.redis.v1beta1.LocationMetadata();
+  }
+
+  public static com.google.cloud.redis.v1beta1.LocationMetadata getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public LocationMetadata parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new LocationMetadata(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.redis.v1beta1.LocationMetadata getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadataOrBuilder.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadataOrBuilder.java
new file mode 100644
index 000000000000..81fc90a8e292
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadataOrBuilder.java
@@ -0,0 +1,78 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+public interface LocationMetadataOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.redis.v1beta1.LocationMetadata)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Output only. The set of available zones in the location. The map is keyed
+   * by the lowercase ID of each zone, as defined by GCE. These keys can be
+   * specified in `location_id` or `alternative_location_id` fields when
+   * creating a Redis instance.
+   * 

+   *
+   * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+   */
+  int getAvailableZonesCount();
+  /**
+   * 
+   * Output only. The set of available zones in the location. The map is keyed
+   * by the lowercase ID of each zone, as defined by GCE. These keys can be
+   * specified in `location_id` or `alternative_location_id` fields when
+   * creating a Redis instance.
+   * 

+   *
+   * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+   */
+  boolean containsAvailableZones(
+      java.lang.String key);
+  /**
+   * Use {@link #getAvailableZonesMap()} instead.
+   */
+  @java.lang.Deprecated
+  java.util.Map
+  getAvailableZones();
+  /**
+   * 
+   * Output only. The set of available zones in the location. The map is keyed
+   * by the lowercase ID of each zone, as defined by GCE. These keys can be
+   * specified in `location_id` or `alternative_location_id` fields when
+   * creating a Redis instance.
+   * 

+   *
+   * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+   */
+  java.util.Map
+  getAvailableZonesMap();
+  /**
+   * 
+   * Output only. The set of available zones in the location. The map is keyed
+   * by the lowercase ID of each zone, as defined by GCE. These keys can be
+   * specified in `location_id` or `alternative_location_id` fields when
+   * creating a Redis instance.
+   * 

+   *
+   * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+   */
+
+  com.google.cloud.redis.v1beta1.ZoneMetadata getAvailableZonesOrDefault(
+      java.lang.String key,
+      com.google.cloud.redis.v1beta1.ZoneMetadata defaultValue);
+  /**
+   * 
+   * Output only. The set of available zones in the location. The map is keyed
+   * by the lowercase ID of each zone, as defined by GCE. These keys can be
+   * specified in `location_id` or `alternative_location_id` fields when
+   * creating a Redis instance.
+   * 

+   *
+   * map<string, .google.cloud.redis.v1beta1.ZoneMetadata> available_zones = 1;
+   */
+
+  com.google.cloud.redis.v1beta1.ZoneMetadata getAvailableZonesOrThrow(
+      java.lang.String key);
+}
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationName.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationName.java
new file mode 100644
index 000000000000..8c7985f17ef4
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationName.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, 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.
+ */
+
+package com.google.cloud.redis.v1beta1;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.api.resourcenames.ResourceNameType;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class LocationName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/locations/{location}");
+
+  private volatile Map fieldValuesMap;
+
+  private final String project;
+  private final String location;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private LocationName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+  }
+
+  public static LocationName of(String project, String location) {
+    return newBuilder()
+      .setProject(project)
+      .setLocation(location)
+      .build();
+  }
+
+  public static String format(String project, String location) {
+    return newBuilder()
+      .setProject(project)
+      .setLocation(location)
+      .build()
+      .toString();
+  }
+
+  public static LocationName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map matchMap =
+        PATH_TEMPLATE.validatedMatch(formattedString, "LocationName.parse: formattedString not in valid format");
+    return of(matchMap.get("project"), matchMap.get("location"));
+  }
+
+  public static List parseList(List formattedStrings) {
+    List list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List toStringList(List values) {
+    List list = new ArrayList(values.size());
+    for (LocationName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldMapBuilder.put("location", location);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  /**
+   * @deprecated This method is only present to satisfy the ResourceName interface.
+   */
+  @Deprecated
+  public ResourceNameType getType() {
+    throw new UnsupportedOperationException("LocationName.getType() not supported");
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate("project", project, "location", location);
+  }
+
+  /** Builder for LocationName. */
+  public static class Builder {
+
+    private String project;
+    private String location;
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public Builder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    private Builder() {
+    }
+
+    private Builder(LocationName locationName) {
+      project = locationName.project;
+      location = locationName.location;
+    }
+
+    public LocationName build() {
+      return new LocationName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof LocationName) {
+      LocationName that = (LocationName) o;
+      return (this.project.equals(that.project))
+          && (this.location.equals(that.location));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    h *= 1000003;
+    h ^= location.hashCode();
+    return h;
+  }
+}
+
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequest.java
new file mode 100644
index 000000000000..ab093dd55e05
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequest.java
@@ -0,0 +1,939 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+/**
+ * 
+ * Request for [UpdateInstance][google.cloud.redis.v1beta1.CloudRedis.UpdateInstance].
+ * 

+ *
+ * Protobuf type {@code google.cloud.redis.v1beta1.UpdateInstanceRequest}
+ */
+public  final class UpdateInstanceRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.redis.v1beta1.UpdateInstanceRequest)
+    UpdateInstanceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use UpdateInstanceRequest.newBuilder() to construct.
+  private UpdateInstanceRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private UpdateInstanceRequest() {
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private UpdateInstanceRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            com.google.protobuf.FieldMask.Builder subBuilder = null;
+            if (updateMask_ != null) {
+              subBuilder = updateMask_.toBuilder();
+            }
+            updateMask_ = input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(updateMask_);
+              updateMask_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 18: {
+            com.google.cloud.redis.v1beta1.Instance.Builder subBuilder = null;
+            if (instance_ != null) {
+              subBuilder = instance_.toBuilder();
+            }
+            instance_ = input.readMessage(com.google.cloud.redis.v1beta1.Instance.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(instance_);
+              instance_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.redis.v1beta1.UpdateInstanceRequest.class, com.google.cloud.redis.v1beta1.UpdateInstanceRequest.Builder.class);
+  }
+
+  public static final int UPDATE_MASK_FIELD_NUMBER = 1;
+  private com.google.protobuf.FieldMask updateMask_;
+  /**
+   * 
+   * Required. Mask of fields to update. At least one path must be supplied in
+   * this field. The elements of the repeated paths field may only include these
+   * fields from [Instance][CloudRedis.Instance]:
+   * * `display_name`
+   * * `labels`
+   * * `memory_size_gb`
+   * * `redis_config`
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 1;
+   */
+  public boolean hasUpdateMask() {
+    return updateMask_ != null;
+  }
+  /**
+   * 
+   * Required. Mask of fields to update. At least one path must be supplied in
+   * this field. The elements of the repeated paths field may only include these
+   * fields from [Instance][CloudRedis.Instance]:
+   * * `display_name`
+   * * `labels`
+   * * `memory_size_gb`
+   * * `redis_config`
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 1;
+   */
+  public com.google.protobuf.FieldMask getUpdateMask() {
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+  }
+  /**
+   * 
+   * Required. Mask of fields to update. At least one path must be supplied in
+   * this field. The elements of the repeated paths field may only include these
+   * fields from [Instance][CloudRedis.Instance]:
+   * * `display_name`
+   * * `labels`
+   * * `memory_size_gb`
+   * * `redis_config`
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 1;
+   */
+  public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
+    return getUpdateMask();
+  }
+
+  public static final int INSTANCE_FIELD_NUMBER = 2;
+  private com.google.cloud.redis.v1beta1.Instance instance_;
+  /**
+   * 
+   * Required. Update description.
+   * Only fields specified in update_mask are updated.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance instance = 2;
+   */
+  public boolean hasInstance() {
+    return instance_ != null;
+  }
+  /**
+   * 
+   * Required. Update description.
+   * Only fields specified in update_mask are updated.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance instance = 2;
+   */
+  public com.google.cloud.redis.v1beta1.Instance getInstance() {
+    return instance_ == null ? com.google.cloud.redis.v1beta1.Instance.getDefaultInstance() : instance_;
+  }
+  /**
+   * 
+   * Required. Update description.
+   * Only fields specified in update_mask are updated.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance instance = 2;
+   */
+  public com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstanceOrBuilder() {
+    return getInstance();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (updateMask_ != null) {
+      output.writeMessage(1, getUpdateMask());
+    }
+    if (instance_ != null) {
+      output.writeMessage(2, getInstance());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (updateMask_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getUpdateMask());
+    }
+    if (instance_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getInstance());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.redis.v1beta1.UpdateInstanceRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.redis.v1beta1.UpdateInstanceRequest other = (com.google.cloud.redis.v1beta1.UpdateInstanceRequest) obj;
+
+    boolean result = true;
+    result = result && (hasUpdateMask() == other.hasUpdateMask());
+    if (hasUpdateMask()) {
+      result = result && getUpdateMask()
+          .equals(other.getUpdateMask());
+    }
+    result = result && (hasInstance() == other.hasInstance());
+    if (hasInstance()) {
+      result = result && getInstance()
+          .equals(other.getInstance());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasUpdateMask()) {
+      hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER;
+      hash = (53 * hash) + getUpdateMask().hashCode();
+    }
+    if (hasInstance()) {
+      hash = (37 * hash) + INSTANCE_FIELD_NUMBER;
+      hash = (53 * hash) + getInstance().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.redis.v1beta1.UpdateInstanceRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for [UpdateInstance][google.cloud.redis.v1beta1.CloudRedis.UpdateInstance].
+   * 

+   *
+   * Protobuf type {@code google.cloud.redis.v1beta1.UpdateInstanceRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.redis.v1beta1.UpdateInstanceRequest)
+      com.google.cloud.redis.v1beta1.UpdateInstanceRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.redis.v1beta1.UpdateInstanceRequest.class, com.google.cloud.redis.v1beta1.UpdateInstanceRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.redis.v1beta1.UpdateInstanceRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+      } else {
+        updateMask_ = null;
+        updateMaskBuilder_ = null;
+      }
+      if (instanceBuilder_ == null) {
+        instance_ = null;
+      } else {
+        instance_ = null;
+        instanceBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_descriptor;
+    }
+
+    public com.google.cloud.redis.v1beta1.UpdateInstanceRequest getDefaultInstanceForType() {
+      return com.google.cloud.redis.v1beta1.UpdateInstanceRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.redis.v1beta1.UpdateInstanceRequest build() {
+      com.google.cloud.redis.v1beta1.UpdateInstanceRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.redis.v1beta1.UpdateInstanceRequest buildPartial() {
+      com.google.cloud.redis.v1beta1.UpdateInstanceRequest result = new com.google.cloud.redis.v1beta1.UpdateInstanceRequest(this);
+      if (updateMaskBuilder_ == null) {
+        result.updateMask_ = updateMask_;
+      } else {
+        result.updateMask_ = updateMaskBuilder_.build();
+      }
+      if (instanceBuilder_ == null) {
+        result.instance_ = instance_;
+      } else {
+        result.instance_ = instanceBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.redis.v1beta1.UpdateInstanceRequest) {
+        return mergeFrom((com.google.cloud.redis.v1beta1.UpdateInstanceRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.redis.v1beta1.UpdateInstanceRequest other) {
+      if (other == com.google.cloud.redis.v1beta1.UpdateInstanceRequest.getDefaultInstance()) return this;
+      if (other.hasUpdateMask()) {
+        mergeUpdateMask(other.getUpdateMask());
+      }
+      if (other.hasInstance()) {
+        mergeInstance(other.getInstance());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.redis.v1beta1.UpdateInstanceRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.redis.v1beta1.UpdateInstanceRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.protobuf.FieldMask updateMask_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder> updateMaskBuilder_;
+    /**
+     * 
+     * Required. Mask of fields to update. At least one path must be supplied in
+     * this field. The elements of the repeated paths field may only include these
+     * fields from [Instance][CloudRedis.Instance]:
+     * * `display_name`
+     * * `labels`
+     * * `memory_size_gb`
+     * * `redis_config`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 1;
+     */
+    public boolean hasUpdateMask() {
+      return updateMaskBuilder_ != null || updateMask_ != null;
+    }
+    /**
+     * 
+     * Required. Mask of fields to update. At least one path must be supplied in
+     * this field. The elements of the repeated paths field may only include these
+     * fields from [Instance][CloudRedis.Instance]:
+     * * `display_name`
+     * * `labels`
+     * * `memory_size_gb`
+     * * `redis_config`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 1;
+     */
+    public com.google.protobuf.FieldMask getUpdateMask() {
+      if (updateMaskBuilder_ == null) {
+        return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+      } else {
+        return updateMaskBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Required. Mask of fields to update. At least one path must be supplied in
+     * this field. The elements of the repeated paths field may only include these
+     * fields from [Instance][CloudRedis.Instance]:
+     * * `display_name`
+     * * `labels`
+     * * `memory_size_gb`
+     * * `redis_config`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 1;
+     */
+    public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
+      if (updateMaskBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        updateMask_ = value;
+        onChanged();
+      } else {
+        updateMaskBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. Mask of fields to update. At least one path must be supplied in
+     * this field. The elements of the repeated paths field may only include these
+     * fields from [Instance][CloudRedis.Instance]:
+     * * `display_name`
+     * * `labels`
+     * * `memory_size_gb`
+     * * `redis_config`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 1;
+     */
+    public Builder setUpdateMask(
+        com.google.protobuf.FieldMask.Builder builderForValue) {
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = builderForValue.build();
+        onChanged();
+      } else {
+        updateMaskBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. Mask of fields to update. At least one path must be supplied in
+     * this field. The elements of the repeated paths field may only include these
+     * fields from [Instance][CloudRedis.Instance]:
+     * * `display_name`
+     * * `labels`
+     * * `memory_size_gb`
+     * * `redis_config`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 1;
+     */
+    public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
+      if (updateMaskBuilder_ == null) {
+        if (updateMask_ != null) {
+          updateMask_ =
+            com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        } else {
+          updateMask_ = value;
+        }
+        onChanged();
+      } else {
+        updateMaskBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. Mask of fields to update. At least one path must be supplied in
+     * this field. The elements of the repeated paths field may only include these
+     * fields from [Instance][CloudRedis.Instance]:
+     * * `display_name`
+     * * `labels`
+     * * `memory_size_gb`
+     * * `redis_config`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 1;
+     */
+    public Builder clearUpdateMask() {
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+        onChanged();
+      } else {
+        updateMask_ = null;
+        updateMaskBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. Mask of fields to update. At least one path must be supplied in
+     * this field. The elements of the repeated paths field may only include these
+     * fields from [Instance][CloudRedis.Instance]:
+     * * `display_name`
+     * * `labels`
+     * * `memory_size_gb`
+     * * `redis_config`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 1;
+     */
+    public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
+      
+      onChanged();
+      return getUpdateMaskFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Required. Mask of fields to update. At least one path must be supplied in
+     * this field. The elements of the repeated paths field may only include these
+     * fields from [Instance][CloudRedis.Instance]:
+     * * `display_name`
+     * * `labels`
+     * * `memory_size_gb`
+     * * `redis_config`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 1;
+     */
+    public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
+      if (updateMaskBuilder_ != null) {
+        return updateMaskBuilder_.getMessageOrBuilder();
+      } else {
+        return updateMask_ == null ?
+            com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+      }
+    }
+    /**
+     * 
+     * Required. Mask of fields to update. At least one path must be supplied in
+     * this field. The elements of the repeated paths field may only include these
+     * fields from [Instance][CloudRedis.Instance]:
+     * * `display_name`
+     * * `labels`
+     * * `memory_size_gb`
+     * * `redis_config`
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder> 
+        getUpdateMaskFieldBuilder() {
+      if (updateMaskBuilder_ == null) {
+        updateMaskBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder>(
+                getUpdateMask(),
+                getParentForChildren(),
+                isClean());
+        updateMask_ = null;
+      }
+      return updateMaskBuilder_;
+    }
+
+    private com.google.cloud.redis.v1beta1.Instance instance_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.redis.v1beta1.Instance, com.google.cloud.redis.v1beta1.Instance.Builder, com.google.cloud.redis.v1beta1.InstanceOrBuilder> instanceBuilder_;
+    /**
+     * 
+     * Required. Update description.
+     * Only fields specified in update_mask are updated.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 2;
+     */
+    public boolean hasInstance() {
+      return instanceBuilder_ != null || instance_ != null;
+    }
+    /**
+     * 
+     * Required. Update description.
+     * Only fields specified in update_mask are updated.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 2;
+     */
+    public com.google.cloud.redis.v1beta1.Instance getInstance() {
+      if (instanceBuilder_ == null) {
+        return instance_ == null ? com.google.cloud.redis.v1beta1.Instance.getDefaultInstance() : instance_;
+      } else {
+        return instanceBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Required. Update description.
+     * Only fields specified in update_mask are updated.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 2;
+     */
+    public Builder setInstance(com.google.cloud.redis.v1beta1.Instance value) {
+      if (instanceBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        instance_ = value;
+        onChanged();
+      } else {
+        instanceBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. Update description.
+     * Only fields specified in update_mask are updated.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 2;
+     */
+    public Builder setInstance(
+        com.google.cloud.redis.v1beta1.Instance.Builder builderForValue) {
+      if (instanceBuilder_ == null) {
+        instance_ = builderForValue.build();
+        onChanged();
+      } else {
+        instanceBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. Update description.
+     * Only fields specified in update_mask are updated.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 2;
+     */
+    public Builder mergeInstance(com.google.cloud.redis.v1beta1.Instance value) {
+      if (instanceBuilder_ == null) {
+        if (instance_ != null) {
+          instance_ =
+            com.google.cloud.redis.v1beta1.Instance.newBuilder(instance_).mergeFrom(value).buildPartial();
+        } else {
+          instance_ = value;
+        }
+        onChanged();
+      } else {
+        instanceBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. Update description.
+     * Only fields specified in update_mask are updated.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 2;
+     */
+    public Builder clearInstance() {
+      if (instanceBuilder_ == null) {
+        instance_ = null;
+        onChanged();
+      } else {
+        instance_ = null;
+        instanceBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. Update description.
+     * Only fields specified in update_mask are updated.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 2;
+     */
+    public com.google.cloud.redis.v1beta1.Instance.Builder getInstanceBuilder() {
+      
+      onChanged();
+      return getInstanceFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Required. Update description.
+     * Only fields specified in update_mask are updated.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 2;
+     */
+    public com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstanceOrBuilder() {
+      if (instanceBuilder_ != null) {
+        return instanceBuilder_.getMessageOrBuilder();
+      } else {
+        return instance_ == null ?
+            com.google.cloud.redis.v1beta1.Instance.getDefaultInstance() : instance_;
+      }
+    }
+    /**
+     * 
+     * Required. Update description.
+     * Only fields specified in update_mask are updated.
+     * 

+     *
+     * .google.cloud.redis.v1beta1.Instance instance = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.redis.v1beta1.Instance, com.google.cloud.redis.v1beta1.Instance.Builder, com.google.cloud.redis.v1beta1.InstanceOrBuilder> 
+        getInstanceFieldBuilder() {
+      if (instanceBuilder_ == null) {
+        instanceBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.redis.v1beta1.Instance, com.google.cloud.redis.v1beta1.Instance.Builder, com.google.cloud.redis.v1beta1.InstanceOrBuilder>(
+                getInstance(),
+                getParentForChildren(),
+                isClean());
+        instance_ = null;
+      }
+      return instanceBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.redis.v1beta1.UpdateInstanceRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.redis.v1beta1.UpdateInstanceRequest)
+  private static final com.google.cloud.redis.v1beta1.UpdateInstanceRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.redis.v1beta1.UpdateInstanceRequest();
+  }
+
+  public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public UpdateInstanceRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new UpdateInstanceRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.redis.v1beta1.UpdateInstanceRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequestOrBuilder.java
new file mode 100644
index 000000000000..c5b4aab12627
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequestOrBuilder.java
@@ -0,0 +1,80 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+public interface UpdateInstanceRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.redis.v1beta1.UpdateInstanceRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required. Mask of fields to update. At least one path must be supplied in
+   * this field. The elements of the repeated paths field may only include these
+   * fields from [Instance][CloudRedis.Instance]:
+   * * `display_name`
+   * * `labels`
+   * * `memory_size_gb`
+   * * `redis_config`
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 1;
+   */
+  boolean hasUpdateMask();
+  /**
+   * 
+   * Required. Mask of fields to update. At least one path must be supplied in
+   * this field. The elements of the repeated paths field may only include these
+   * fields from [Instance][CloudRedis.Instance]:
+   * * `display_name`
+   * * `labels`
+   * * `memory_size_gb`
+   * * `redis_config`
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 1;
+   */
+  com.google.protobuf.FieldMask getUpdateMask();
+  /**
+   * 
+   * Required. Mask of fields to update. At least one path must be supplied in
+   * this field. The elements of the repeated paths field may only include these
+   * fields from [Instance][CloudRedis.Instance]:
+   * * `display_name`
+   * * `labels`
+   * * `memory_size_gb`
+   * * `redis_config`
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 1;
+   */
+  com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder();
+
+  /**
+   * 
+   * Required. Update description.
+   * Only fields specified in update_mask are updated.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance instance = 2;
+   */
+  boolean hasInstance();
+  /**
+   * 
+   * Required. Update description.
+   * Only fields specified in update_mask are updated.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance instance = 2;
+   */
+  com.google.cloud.redis.v1beta1.Instance getInstance();
+  /**
+   * 
+   * Required. Update description.
+   * Only fields specified in update_mask are updated.
+   * 

+   *
+   * .google.cloud.redis.v1beta1.Instance instance = 2;
+   */
+  com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstanceOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadata.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadata.java
new file mode 100644
index 000000000000..ca22ac749972
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadata.java
@@ -0,0 +1,398 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+/**
+ * 
+ * Defines specific information for a particular zone. Currently empty and
+ * reserved for future use only.
+ * 

+ *
+ * Protobuf type {@code google.cloud.redis.v1beta1.ZoneMetadata}
+ */
+public  final class ZoneMetadata extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.redis.v1beta1.ZoneMetadata)
+    ZoneMetadataOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ZoneMetadata.newBuilder() to construct.
+  private ZoneMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ZoneMetadata() {
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ZoneMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ZoneMetadata_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ZoneMetadata_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.redis.v1beta1.ZoneMetadata.class, com.google.cloud.redis.v1beta1.ZoneMetadata.Builder.class);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.redis.v1beta1.ZoneMetadata)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.redis.v1beta1.ZoneMetadata other = (com.google.cloud.redis.v1beta1.ZoneMetadata) obj;
+
+    boolean result = true;
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.redis.v1beta1.ZoneMetadata prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Defines specific information for a particular zone. Currently empty and
+   * reserved for future use only.
+   * 

+   *
+   * Protobuf type {@code google.cloud.redis.v1beta1.ZoneMetadata}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.redis.v1beta1.ZoneMetadata)
+      com.google.cloud.redis.v1beta1.ZoneMetadataOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ZoneMetadata_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ZoneMetadata_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.redis.v1beta1.ZoneMetadata.class, com.google.cloud.redis.v1beta1.ZoneMetadata.Builder.class);
+    }
+
+    // Construct using com.google.cloud.redis.v1beta1.ZoneMetadata.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ZoneMetadata_descriptor;
+    }
+
+    public com.google.cloud.redis.v1beta1.ZoneMetadata getDefaultInstanceForType() {
+      return com.google.cloud.redis.v1beta1.ZoneMetadata.getDefaultInstance();
+    }
+
+    public com.google.cloud.redis.v1beta1.ZoneMetadata build() {
+      com.google.cloud.redis.v1beta1.ZoneMetadata result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.redis.v1beta1.ZoneMetadata buildPartial() {
+      com.google.cloud.redis.v1beta1.ZoneMetadata result = new com.google.cloud.redis.v1beta1.ZoneMetadata(this);
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.redis.v1beta1.ZoneMetadata) {
+        return mergeFrom((com.google.cloud.redis.v1beta1.ZoneMetadata)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.redis.v1beta1.ZoneMetadata other) {
+      if (other == com.google.cloud.redis.v1beta1.ZoneMetadata.getDefaultInstance()) return this;
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.redis.v1beta1.ZoneMetadata parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.redis.v1beta1.ZoneMetadata) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.redis.v1beta1.ZoneMetadata)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.redis.v1beta1.ZoneMetadata)
+  private static final com.google.cloud.redis.v1beta1.ZoneMetadata DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.redis.v1beta1.ZoneMetadata();
+  }
+
+  public static com.google.cloud.redis.v1beta1.ZoneMetadata getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ZoneMetadata parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ZoneMetadata(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.redis.v1beta1.ZoneMetadata getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadataOrBuilder.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadataOrBuilder.java
new file mode 100644
index 000000000000..986cf0c3ee1a
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadataOrBuilder.java
@@ -0,0 +1,9 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/redis/v1beta1/cloud_redis.proto
+
+package com.google.cloud.redis.v1beta1;
+
+public interface ZoneMetadataOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.redis.v1beta1.ZoneMetadata)
+    com.google.protobuf.MessageOrBuilder {
+}
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/proto/google/cloud/redis/v1beta1/cloud_redis.proto b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/proto/google/cloud/redis/v1beta1/cloud_redis.proto
new file mode 100644
index 000000000000..1aa944cdba84
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/proto/google/cloud/redis/v1beta1/cloud_redis.proto
@@ -0,0 +1,340 @@
+// Copyright 2018 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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";
+
+package google.cloud.redis.v1beta1;
+
+import "google/api/annotations.proto";
+import "google/longrunning/operations.proto";
+import "google/protobuf/field_mask.proto";
+import "google/protobuf/timestamp.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/cloud/redis/v1beta1;redis";
+option java_multiple_files = true;
+option java_outer_classname = "CloudRedisServiceBetaProto";
+option java_package = "com.google.cloud.redis.v1beta1";
+
+
+// Configures and manages Cloud Memorystore for Redis instances
+//
+// Google Cloud Memorystore for Redis v1beta1
+//
+// The `redis.googleapis.com` service implements the Google Cloud Memorystore
+// for Redis API and defines the following resource model for managing Redis
+// instances:
+// * The service works with a collection of cloud projects, named: `/projects/*`
+// * Each project has a collection of available locations, named: `/locations/*`
+// * Each location has a collection of Redis instances, named: `/instances/*`
+// * As such, Redis instances are resources of the form:
+//   `/projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+//
+// Note that location_id must be refering to a GCP `region`; for example:
+// * `projects/redpepper-1290/locations/us-central1/instances/my-redis`
+service CloudRedis {
+  // Lists all Redis instances owned by a project in either the specified
+  // location (region) or all locations.
+  //
+  // The location should have the following format:
+  // * `projects/{project_id}/locations/{location_id}`
+  //
+  // If `location_id` is specified as `-` (wildcard), then all regions
+  // available to the project are queried, and the results are aggregated.
+  rpc ListInstances(ListInstancesRequest) returns (ListInstancesResponse) {
+    option (google.api.http) = {
+      get: "/v1beta1/{parent=projects/*/locations/*}/instances"
+    };
+  }
+
+  // Gets the details of a specific Redis instance.
+  rpc GetInstance(GetInstanceRequest) returns (Instance) {
+    option (google.api.http) = {
+      get: "/v1beta1/{name=projects/*/locations/*/instances/*}"
+    };
+  }
+
+  // Creates a Redis instance based on the specified tier and memory size.
+  //
+  // By default, the instance is peered to the project's
+  // [default network](/compute/docs/networks-and-firewalls#networks).
+  //
+  // The creation is executed asynchronously and callers may check the returned
+  // operation to track its progress. Once the operation is completed the Redis
+  // instance will be fully functional. Completed longrunning.Operation will
+  // contain the new instance object in the response field.
+  //
+  // The returned operation is automatically deleted after a few hours, so there
+  // is no need to call DeleteOperation.
+  rpc CreateInstance(CreateInstanceRequest) returns (google.longrunning.Operation) {
+    option (google.api.http) = {
+      post: "/v1beta1/{parent=projects/*/locations/*}/instances"
+      body: "instance"
+    };
+  }
+
+  // Updates the metadata and configuration of a specific Redis instance.
+  //
+  // Completed longrunning.Operation will contain the new instance object
+  // in the response field. The returned operation is automatically deleted
+  // after a few hours, so there is no need to call DeleteOperation.
+  rpc UpdateInstance(UpdateInstanceRequest) returns (google.longrunning.Operation) {
+    option (google.api.http) = {
+      patch: "/v1beta1/{instance.name=projects/*/locations/*/instances/*}"
+      body: "instance"
+    };
+  }
+
+  // Deletes a specific Redis instance.  Instance stops serving and data is
+  // deleted.
+  rpc DeleteInstance(DeleteInstanceRequest) returns (google.longrunning.Operation) {
+    option (google.api.http) = {
+      delete: "/v1beta1/{name=projects/*/locations/*/instances/*}"
+    };
+  }
+}
+
+// A Google Cloud Redis instance.
+message Instance {
+  // Represents the different states of a Redis instance.
+  enum State {
+    // Not set.
+    STATE_UNSPECIFIED = 0;
+
+    // Redis instance is being created.
+    CREATING = 1;
+
+    // Redis instance has been created and is fully usable.
+    READY = 2;
+
+    // Redis instance configuration is being updated. Certain kinds of updates
+    // may cause the instance to become unusable while the update is in
+    // progress.
+    UPDATING = 3;
+
+    // Redis instance is being deleted.
+    DELETING = 4;
+
+    // Redis instance is being repaired and may be unusable. Details can be
+    // found in the `status_message` field.
+    REPAIRING = 5;
+
+    // Maintenance is being performed on this Redis instance.
+    MAINTENANCE = 6;
+  }
+
+  // Available service tiers to choose from
+  enum Tier {
+    // Not set.
+    TIER_UNSPECIFIED = 0;
+
+    // BASIC tier: standalone instance
+    BASIC = 1;
+
+    // STANDARD_HA tier: highly available primary/replica instances
+    STANDARD_HA = 3;
+  }
+
+  // Required. Unique name of the resource in this scope including project and
+  // location using the form:
+  //     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+  //
+  // Note: Redis instances are managed and addressed at regional level so
+  // location_id here refers to a GCP region; however, users get to choose which
+  // specific zone (or collection of zones for cross-zone instances) an instance
+  // should be provisioned in. Refer to [location_id] and
+  // [alternative_location_id] fields for more details.
+  string name = 1;
+
+  // An arbitrary and optional user-provided name for the instance.
+  string display_name = 2;
+
+  // Resource labels to represent user provided metadata
+  map labels = 3;
+
+  // Optional. The zone where the instance will be provisioned. If not provided,
+  // the service will choose a zone for the instance. For STANDARD_HA tier,
+  // instances will be created across two zones for protection against zonal
+  // failures. if [alternative_location_id] is also provided, it must be
+  // different from [location_id].
+  string location_id = 4;
+
+  // Optional. Only applicable to STANDARD_HA tier which protects the instance
+  // against zonal failures by provisioning it across two zones. If provided, it
+  // must be a different zone from the one provided in [location_id].
+  string alternative_location_id = 5;
+
+  // Optional. The version of Redis software.
+  // If not provided, latest supported version will be used.
+  string redis_version = 7;
+
+  // Optional. The CIDR range of internal addresses that are reserved for this
+  // instance. If not provided, the service will choose an unused /29 block,
+  // for example, 10.0.0.0/29 or 192.168.0.0/29. Ranges must be unique
+  // and non-overlapping with existing subnets in a network.
+  string reserved_ip_range = 9;
+
+  // Output only. Hostname or IP address of the exposed redis endpoint used by
+  // clients to connect to the service.
+  string host = 10;
+
+  // Output only. The port number of the exposed redis endpoint.
+  int32 port = 11;
+
+  // Output only. The current zone where the Redis endpoint is placed. In
+  // single zone deployments, this will always be the same as [location_id]
+  // provided by the user at creation time. In cross-zone instances (only
+  // applicable in STANDARD_HA tier), this can be either [location_id] or
+  // [alternative_location_id] and can change on a failover event.
+  string current_location_id = 12;
+
+  // Output only. The time the instance was created.
+  google.protobuf.Timestamp create_time = 13;
+
+  // Output only. The current state of this instance.
+  State state = 14;
+
+  // Output only. Additional information about the current status of this
+  // instance, if available.
+  string status_message = 15;
+
+  // Optional. Redis configuration parameters, according to
+  // http://redis.io/topics/config. Currently, the only supported parameters
+  // are:
+  //  * maxmemory-policy
+  //  * notify-keyspace-events
+  map redis_configs = 16;
+
+  // Required. The service tier of the instance.
+  Tier tier = 17;
+
+  // Required. Redis memory size in GB.
+  int32 memory_size_gb = 18;
+
+  // Optional. The full name of the Google Compute Engine
+  // [network](/compute/docs/networks-and-firewalls#networks) to which the
+  // instance is connected. If left unspecified, the `default` network
+  // will be used.
+  string authorized_network = 20;
+}
+
+// Request for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances].
+message ListInstancesRequest {
+  // Required. The resource name of the instance location using the form:
+  //     `projects/{project_id}/locations/{location_id}`
+  // where `location_id` refers to a GCP region
+  string parent = 1;
+
+  // The maximum number of items to return.
+  //
+  // If not specified, a default value of 1000 will be used by the service.
+  // Regardless of the page_size value, the response may include a partial list
+  // and a caller should only rely on response's
+  // [next_page_token][CloudRedis.ListInstancesResponse.next_page_token]
+  // to determine if there are more instances left to be queried.
+  int32 page_size = 2;
+
+  // The next_page_token value returned from a previous List request,
+  // if any.
+  string page_token = 3;
+}
+
+// Response for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances].
+message ListInstancesResponse {
+  // A list of Redis instances in the project in the specified location,
+  // or across all locations.
+  //
+  // If the `location_id` in the parent field of the request is "-", all regions
+  // available to the project are queried, and the results aggregated.
+  // If in such an aggregated query a location is unavailable, a dummy Redis
+  // entry is included in the response with the "name" field set to a value of
+  // the form projects/{project_id}/locations/{location_id}/instances/- and the
+  // "status" field set to ERROR and "status_message" field set to "location not
+  // available for ListInstances".
+  repeated Instance instances = 1;
+
+  // Token to retrieve the next page of results, or empty if there are no more
+  // results in the list.
+  string next_page_token = 2;
+}
+
+// Request for [GetInstance][google.cloud.redis.v1beta1.CloudRedis.GetInstance].
+message GetInstanceRequest {
+  // Required. Redis instance resource name using the form:
+  //     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+  // where `location_id` refers to a GCP region
+  string name = 1;
+}
+
+// Request for [CreateInstance][google.cloud.redis.v1beta1.CloudRedis.CreateInstance].
+message CreateInstanceRequest {
+  // Required. The resource name of the instance location using the form:
+  //     `projects/{project_id}/locations/{location_id}`
+  // where `location_id` refers to a GCP region
+  string parent = 1;
+
+  // Required. The logical name of the Redis instance in the customer project
+  // with the following restrictions:
+  //
+  // * Must contain only lowercase letters, numbers, and hyphens.
+  // * Must start with a letter.
+  // * Must be between 1-40 characters.
+  // * Must end with a number or a letter.
+  // * Must be unique within the customer project / location
+  string instance_id = 2;
+
+  // Required. A Redis [Instance] resource
+  Instance instance = 3;
+}
+
+// Request for [UpdateInstance][google.cloud.redis.v1beta1.CloudRedis.UpdateInstance].
+message UpdateInstanceRequest {
+  // Required. Mask of fields to update. At least one path must be supplied in
+  // this field. The elements of the repeated paths field may only include these
+  // fields from [Instance][CloudRedis.Instance]:
+  // * `display_name`
+  // * `labels`
+  // * `memory_size_gb`
+  // * `redis_config`
+  google.protobuf.FieldMask update_mask = 1;
+
+  // Required. Update description.
+  // Only fields specified in update_mask are updated.
+  Instance instance = 2;
+}
+
+// Request for [DeleteInstance][google.cloud.redis.v1beta1.CloudRedis.DeleteInstance].
+message DeleteInstanceRequest {
+  // Required. Redis instance resource name using the form:
+  //     `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
+  // where `location_id` refers to a GCP region
+  string name = 1;
+}
+
+// This location metadata represents additional configuration options for a
+// given location where a Redis instance may be created. All fields are output
+// only. It is returned as content of the
+// `google.cloud.location.Location.metadata` field.
+message LocationMetadata {
+  // Output only. The set of available zones in the location. The map is keyed
+  // by the lowercase ID of each zone, as defined by GCE. These keys can be
+  // specified in `location_id` or `alternative_location_id` fields when
+  // creating a Redis instance.
+  map available_zones = 1;
+}
+
+// Defines specific information for a particular zone. Currently empty and
+// reserved for future use only.
+message ZoneMetadata {
+
+}
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
index a3d6886a011a..ea26dd2619f7 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-admin-database-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-spanner-admin-database-v1
   PROTO library for proto-google-cloud-spanner-admin-database-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
index ad34204b89db..7b70a60a1b22 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-admin-instance-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-spanner-admin-instance-v1
   PROTO library for proto-google-cloud-spanner-admin-instance-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
index 4d43955f93e2..a0b811ae3d21 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-spanner-v1
   PROTO library for proto-google-cloud-spanner-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
index b26f4ea7087d..824ae047ba64 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-speech-v1
   PROTO library for proto-google-cloud-speech-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
index 29725385bb06..5392806261bd 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-speech-v1beta1
   PROTO library for proto-google-cloud-speech-v1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
index 8d7514d140e7..d9ed66ea23ef 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1p1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-speech-v1p1beta1
   PROTO library for proto-google-cloud-speech-v1p1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
index 7588d9d4ad4a..220a105b8b15 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-texttospeech-v1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-texttospeech-v1beta1
   PROTO library for proto-google-cloud-texttospeech-v1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/pom.xml b/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
index 2ddec636bef2..43df0caa55de 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-trace-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-trace-v1
   PROTO library for proto-google-cloud-trace-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/pom.xml b/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
index cca5b1b617aa..1ac6e773a21d 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-trace-v2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-trace-v2
   PROTO library for proto-google-cloud-trace-v2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
index 8d92ac70d1b7..4610c55f5c05 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-video-intelligence-v1
   PROTO library for proto-google-cloud-video-intelligence-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
index d0187933485c..165fc4ea1db7 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-video-intelligence-v1beta1
   PROTO library for proto-google-cloud-video-intelligence-v1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
index daf02b44e31f..6631aacf22d5 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1beta2
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-video-intelligence-v1beta2
   PROTO library for proto-google-cloud-video-intelligence-v1beta2
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
index ab8aa4d878e0..fbeee0b2263a 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1p1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-video-intelligence-v1p1beta1
   PROTO library for proto-google-cloud-video-intelligence-v1p1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
index 822bce6cf733..9df1b531af60 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1
-  1.10.1-SNAPSHOT
+  1.11.1-SNAPSHOT
   proto-google-cloud-vision-v1
   PROTO library for proto-google-cloud-vision-v1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
index c37a92965959..a247af4a5480 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1p1beta1
-  0.11.1-SNAPSHOT
+  0.12.1-SNAPSHOT
   proto-google-cloud-vision-v1p1beta1
   PROTO library for proto-google-cloud-vision-v1p1beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
index a064eda62b32..f8b099faf0b5 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1p2beta1
-  1.10.1-SNAPSHOT
+  1.11.1-SNAPSHOT
   proto-google-cloud-vision-v1p2beta1
   PROTO library for proto-google-cloud-vision-v1p2beta1
   
     com.google.api.grpc
-    google-api-grpc-pom
-    0.11.1-SNAPSHOT
+    google-api-grpc
+    0.12.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
new file mode 100644
index 000000000000..14661ebff117
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
@@ -0,0 +1,31 @@
+
+  4.0.0
+  proto-google-cloud-websecurityscanner-v1alpha
+  0.12.1-SNAPSHOT
+  proto-google-cloud-websecurityscanner-v1alpha
+  PROTO library for proto-google-cloud-websecurityscanner-v1alpha
+  
+    com.google.api.grpc
+    google-api-grpc
+    0.12.1-SNAPSHOT
+  
+  
+    
+      com.google.protobuf
+      protobuf-java
+      compile
+    
+    
+      com.google.api
+      api-common
+      compile
+    
+    
+      com.google.api.grpc
+      proto-google-common-protos
+      compile
+    
+  
+
\ No newline at end of file
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrl.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrl.java
new file mode 100644
index 000000000000..fe32d8503539
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrl.java
@@ -0,0 +1,894 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/crawled_url.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * A CrawledUrl resource represents a URL that was crawled during a ScanRun. Web
+ * Security Scanner Service crawls the web applications, following all links
+ * within the scope of sites, to find the URLs to test against.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.CrawledUrl}
+ */
+public  final class CrawledUrl extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.CrawledUrl)
+    CrawledUrlOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use CrawledUrl.newBuilder() to construct.
+  private CrawledUrl(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private CrawledUrl() {
+    httpMethod_ = "";
+    url_ = "";
+    body_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private CrawledUrl(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            httpMethod_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            url_ = s;
+            break;
+          }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            body_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.CrawledUrlProto.internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.CrawledUrlProto.internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.class, com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.Builder.class);
+  }
+
+  public static final int HTTP_METHOD_FIELD_NUMBER = 1;
+  private volatile java.lang.Object httpMethod_;
+  /**
+   * 
+   * Output only.
+   * The http method of the request that was used to visit the URL, in
+   * uppercase.
+   * 

+   *
+   * string http_method = 1;
+   */
+  public java.lang.String getHttpMethod() {
+    java.lang.Object ref = httpMethod_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      httpMethod_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * The http method of the request that was used to visit the URL, in
+   * uppercase.
+   * 

+   *
+   * string http_method = 1;
+   */
+  public com.google.protobuf.ByteString
+      getHttpMethodBytes() {
+    java.lang.Object ref = httpMethod_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      httpMethod_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int URL_FIELD_NUMBER = 2;
+  private volatile java.lang.Object url_;
+  /**
+   * 
+   * Output only.
+   * The URL that was crawled.
+   * 

+   *
+   * string url = 2;
+   */
+  public java.lang.String getUrl() {
+    java.lang.Object ref = url_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      url_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * The URL that was crawled.
+   * 

+   *
+   * string url = 2;
+   */
+  public com.google.protobuf.ByteString
+      getUrlBytes() {
+    java.lang.Object ref = url_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      url_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int BODY_FIELD_NUMBER = 3;
+  private volatile java.lang.Object body_;
+  /**
+   * 
+   * Output only.
+   * The body of the request that was used to visit the URL.
+   * 

+   *
+   * string body = 3;
+   */
+  public java.lang.String getBody() {
+    java.lang.Object ref = body_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      body_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * The body of the request that was used to visit the URL.
+   * 

+   *
+   * string body = 3;
+   */
+  public com.google.protobuf.ByteString
+      getBodyBytes() {
+    java.lang.Object ref = body_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      body_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getHttpMethodBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, httpMethod_);
+    }
+    if (!getUrlBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, url_);
+    }
+    if (!getBodyBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, body_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getHttpMethodBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, httpMethod_);
+    }
+    if (!getUrlBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, url_);
+    }
+    if (!getBodyBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, body_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.CrawledUrl)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.CrawledUrl other = (com.google.cloud.websecurityscanner.v1alpha.CrawledUrl) obj;
+
+    boolean result = true;
+    result = result && getHttpMethod()
+        .equals(other.getHttpMethod());
+    result = result && getUrl()
+        .equals(other.getUrl());
+    result = result && getBody()
+        .equals(other.getBody());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + HTTP_METHOD_FIELD_NUMBER;
+    hash = (53 * hash) + getHttpMethod().hashCode();
+    hash = (37 * hash) + URL_FIELD_NUMBER;
+    hash = (53 * hash) + getUrl().hashCode();
+    hash = (37 * hash) + BODY_FIELD_NUMBER;
+    hash = (53 * hash) + getBody().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.CrawledUrl prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * A CrawledUrl resource represents a URL that was crawled during a ScanRun. Web
+   * Security Scanner Service crawls the web applications, following all links
+   * within the scope of sites, to find the URLs to test against.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.CrawledUrl}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.CrawledUrl)
+      com.google.cloud.websecurityscanner.v1alpha.CrawledUrlOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.CrawledUrlProto.internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.CrawledUrlProto.internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.class, com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      httpMethod_ = "";
+
+      url_ = "";
+
+      body_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.CrawledUrlProto.internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl build() {
+      com.google.cloud.websecurityscanner.v1alpha.CrawledUrl result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.CrawledUrl result = new com.google.cloud.websecurityscanner.v1alpha.CrawledUrl(this);
+      result.httpMethod_ = httpMethod_;
+      result.url_ = url_;
+      result.body_ = body_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.CrawledUrl) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.CrawledUrl)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.CrawledUrl other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.getDefaultInstance()) return this;
+      if (!other.getHttpMethod().isEmpty()) {
+        httpMethod_ = other.httpMethod_;
+        onChanged();
+      }
+      if (!other.getUrl().isEmpty()) {
+        url_ = other.url_;
+        onChanged();
+      }
+      if (!other.getBody().isEmpty()) {
+        body_ = other.body_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.CrawledUrl) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object httpMethod_ = "";
+    /**
+     * 
+     * Output only.
+     * The http method of the request that was used to visit the URL, in
+     * uppercase.
+     * 

+     *
+     * string http_method = 1;
+     */
+    public java.lang.String getHttpMethod() {
+      java.lang.Object ref = httpMethod_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        httpMethod_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The http method of the request that was used to visit the URL, in
+     * uppercase.
+     * 

+     *
+     * string http_method = 1;
+     */
+    public com.google.protobuf.ByteString
+        getHttpMethodBytes() {
+      java.lang.Object ref = httpMethod_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        httpMethod_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The http method of the request that was used to visit the URL, in
+     * uppercase.
+     * 

+     *
+     * string http_method = 1;
+     */
+    public Builder setHttpMethod(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      httpMethod_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The http method of the request that was used to visit the URL, in
+     * uppercase.
+     * 

+     *
+     * string http_method = 1;
+     */
+    public Builder clearHttpMethod() {
+      
+      httpMethod_ = getDefaultInstance().getHttpMethod();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The http method of the request that was used to visit the URL, in
+     * uppercase.
+     * 

+     *
+     * string http_method = 1;
+     */
+    public Builder setHttpMethodBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      httpMethod_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object url_ = "";
+    /**
+     * 
+     * Output only.
+     * The URL that was crawled.
+     * 

+     *
+     * string url = 2;
+     */
+    public java.lang.String getUrl() {
+      java.lang.Object ref = url_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        url_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The URL that was crawled.
+     * 

+     *
+     * string url = 2;
+     */
+    public com.google.protobuf.ByteString
+        getUrlBytes() {
+      java.lang.Object ref = url_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        url_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The URL that was crawled.
+     * 

+     *
+     * string url = 2;
+     */
+    public Builder setUrl(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      url_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The URL that was crawled.
+     * 

+     *
+     * string url = 2;
+     */
+    public Builder clearUrl() {
+      
+      url_ = getDefaultInstance().getUrl();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The URL that was crawled.
+     * 

+     *
+     * string url = 2;
+     */
+    public Builder setUrlBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      url_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object body_ = "";
+    /**
+     * 
+     * Output only.
+     * The body of the request that was used to visit the URL.
+     * 

+     *
+     * string body = 3;
+     */
+    public java.lang.String getBody() {
+      java.lang.Object ref = body_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        body_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The body of the request that was used to visit the URL.
+     * 

+     *
+     * string body = 3;
+     */
+    public com.google.protobuf.ByteString
+        getBodyBytes() {
+      java.lang.Object ref = body_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        body_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The body of the request that was used to visit the URL.
+     * 

+     *
+     * string body = 3;
+     */
+    public Builder setBody(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      body_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The body of the request that was used to visit the URL.
+     * 

+     *
+     * string body = 3;
+     */
+    public Builder clearBody() {
+      
+      body_ = getDefaultInstance().getBody();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The body of the request that was used to visit the URL.
+     * 

+     *
+     * string body = 3;
+     */
+    public Builder setBodyBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      body_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.CrawledUrl)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.CrawledUrl)
+  private static final com.google.cloud.websecurityscanner.v1alpha.CrawledUrl DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.CrawledUrl();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public CrawledUrl parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new CrawledUrl(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrlOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrlOrBuilder.java
new file mode 100644
index 000000000000..58ff114438e5
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrlOrBuilder.java
@@ -0,0 +1,71 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/crawled_url.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface CrawledUrlOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.CrawledUrl)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Output only.
+   * The http method of the request that was used to visit the URL, in
+   * uppercase.
+   * 

+   *
+   * string http_method = 1;
+   */
+  java.lang.String getHttpMethod();
+  /**
+   * 
+   * Output only.
+   * The http method of the request that was used to visit the URL, in
+   * uppercase.
+   * 

+   *
+   * string http_method = 1;
+   */
+  com.google.protobuf.ByteString
+      getHttpMethodBytes();
+
+  /**
+   * 
+   * Output only.
+   * The URL that was crawled.
+   * 

+   *
+   * string url = 2;
+   */
+  java.lang.String getUrl();
+  /**
+   * 
+   * Output only.
+   * The URL that was crawled.
+   * 

+   *
+   * string url = 2;
+   */
+  com.google.protobuf.ByteString
+      getUrlBytes();
+
+  /**
+   * 
+   * Output only.
+   * The body of the request that was used to visit the URL.
+   * 

+   *
+   * string body = 3;
+   */
+  java.lang.String getBody();
+  /**
+   * 
+   * Output only.
+   * The body of the request that was used to visit the URL.
+   * 

+   *
+   * string body = 3;
+   */
+  com.google.protobuf.ByteString
+      getBodyBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrlProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrlProto.java
new file mode 100644
index 000000000000..bdc903f0b6b0
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrlProto.java
@@ -0,0 +1,64 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/crawled_url.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public final class CrawledUrlProto {
+  private CrawledUrlProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n9google/cloud/websecurityscanner/v1alph" +
+      "a/crawled_url.proto\022\'google.cloud.websec" +
+      "urityscanner.v1alpha\032\034google/api/annotat" +
+      "ions.proto\"<\n\nCrawledUrl\022\023\n\013http_method\030" +
+      "\001 \001(\t\022\013\n\003url\030\002 \001(\t\022\014\n\004body\030\003 \001(\tB\233\001\n+com" +
+      ".google.cloud.websecurityscanner.v1alpha" +
+      "B\017CrawledUrlProtoP\001ZYgoogle.golang.org/g" +
+      "enproto/googleapis/cloud/websecurityscan" +
+      "ner/v1alpha;websecurityscannerb\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.api.AnnotationsProto.getDescriptor(),
+        }, assigner);
+    internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_descriptor,
+        new java.lang.String[] { "HttpMethod", "Url", "Body", });
+    com.google.api.AnnotationsProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequest.java
new file mode 100644
index 000000000000..bb048f596bd8
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequest.java
@@ -0,0 +1,807 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `CreateScanConfig` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest}
+ */
+public  final class CreateScanConfigRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest)
+    CreateScanConfigRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use CreateScanConfigRequest.newBuilder() to construct.
+  private CreateScanConfigRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private CreateScanConfigRequest() {
+    parent_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private CreateScanConfigRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
+          case 18: {
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder subBuilder = null;
+            if (scanConfig_ != null) {
+              subBuilder = scanConfig_.toBuilder();
+            }
+            scanConfig_ = input.readMessage(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(scanConfig_);
+              scanConfig_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest.class, com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest.Builder.class);
+  }
+
+  public static final int PARENT_FIELD_NUMBER = 1;
+  private volatile java.lang.Object parent_;
+  /**
+   * 
+   * Required.
+   * The parent resource name where the scan is created, which should be a
+   * project resource name in the format 'projects/{projectId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  public java.lang.String getParent() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      parent_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The parent resource name where the scan is created, which should be a
+   * project resource name in the format 'projects/{projectId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParentBytes() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      parent_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int SCAN_CONFIG_FIELD_NUMBER = 2;
+  private com.google.cloud.websecurityscanner.v1alpha.ScanConfig scanConfig_;
+  /**
+   * 
+   * Required.
+   * The ScanConfig to be created.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+   */
+  public boolean hasScanConfig() {
+    return scanConfig_ != null;
+  }
+  /**
+   * 
+   * Required.
+   * The ScanConfig to be created.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getScanConfig() {
+    return scanConfig_ == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance() : scanConfig_;
+  }
+  /**
+   * 
+   * Required.
+   * The ScanConfig to be created.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder getScanConfigOrBuilder() {
+    return getScanConfig();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getParentBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
+    }
+    if (scanConfig_ != null) {
+      output.writeMessage(2, getScanConfig());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getParentBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
+    }
+    if (scanConfig_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getScanConfig());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest other = (com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest) obj;
+
+    boolean result = true;
+    result = result && getParent()
+        .equals(other.getParent());
+    result = result && (hasScanConfig() == other.hasScanConfig());
+    if (hasScanConfig()) {
+      result = result && getScanConfig()
+          .equals(other.getScanConfig());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PARENT_FIELD_NUMBER;
+    hash = (53 * hash) + getParent().hashCode();
+    if (hasScanConfig()) {
+      hash = (37 * hash) + SCAN_CONFIG_FIELD_NUMBER;
+      hash = (53 * hash) + getScanConfig().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `CreateScanConfig` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest)
+      com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest.class, com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parent_ = "";
+
+      if (scanConfigBuilder_ == null) {
+        scanConfig_ = null;
+      } else {
+        scanConfig_ = null;
+        scanConfigBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest result = new com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest(this);
+      result.parent_ = parent_;
+      if (scanConfigBuilder_ == null) {
+        result.scanConfig_ = scanConfig_;
+      } else {
+        result.scanConfig_ = scanConfigBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest.getDefaultInstance()) return this;
+      if (!other.getParent().isEmpty()) {
+        parent_ = other.parent_;
+        onChanged();
+      }
+      if (other.hasScanConfig()) {
+        mergeScanConfig(other.getScanConfig());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object parent_ = "";
+    /**
+     * 
+     * Required.
+     * The parent resource name where the scan is created, which should be a
+     * project resource name in the format 'projects/{projectId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public java.lang.String getParent() {
+      java.lang.Object ref = parent_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        parent_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name where the scan is created, which should be a
+     * project resource name in the format 'projects/{projectId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParentBytes() {
+      java.lang.Object ref = parent_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        parent_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name where the scan is created, which should be a
+     * project resource name in the format 'projects/{projectId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParent(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name where the scan is created, which should be a
+     * project resource name in the format 'projects/{projectId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder clearParent() {
+      
+      parent_ = getDefaultInstance().getParent();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name where the scan is created, which should be a
+     * project resource name in the format 'projects/{projectId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParentBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.cloud.websecurityscanner.v1alpha.ScanConfig scanConfig_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder> scanConfigBuilder_;
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be created.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public boolean hasScanConfig() {
+      return scanConfigBuilder_ != null || scanConfig_ != null;
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be created.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getScanConfig() {
+      if (scanConfigBuilder_ == null) {
+        return scanConfig_ == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance() : scanConfig_;
+      } else {
+        return scanConfigBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be created.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public Builder setScanConfig(com.google.cloud.websecurityscanner.v1alpha.ScanConfig value) {
+      if (scanConfigBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        scanConfig_ = value;
+        onChanged();
+      } else {
+        scanConfigBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be created.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public Builder setScanConfig(
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder builderForValue) {
+      if (scanConfigBuilder_ == null) {
+        scanConfig_ = builderForValue.build();
+        onChanged();
+      } else {
+        scanConfigBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be created.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public Builder mergeScanConfig(com.google.cloud.websecurityscanner.v1alpha.ScanConfig value) {
+      if (scanConfigBuilder_ == null) {
+        if (scanConfig_ != null) {
+          scanConfig_ =
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.newBuilder(scanConfig_).mergeFrom(value).buildPartial();
+        } else {
+          scanConfig_ = value;
+        }
+        onChanged();
+      } else {
+        scanConfigBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be created.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public Builder clearScanConfig() {
+      if (scanConfigBuilder_ == null) {
+        scanConfig_ = null;
+        onChanged();
+      } else {
+        scanConfig_ = null;
+        scanConfigBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be created.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder getScanConfigBuilder() {
+      
+      onChanged();
+      return getScanConfigFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be created.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder getScanConfigOrBuilder() {
+      if (scanConfigBuilder_ != null) {
+        return scanConfigBuilder_.getMessageOrBuilder();
+      } else {
+        return scanConfig_ == null ?
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance() : scanConfig_;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be created.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder> 
+        getScanConfigFieldBuilder() {
+      if (scanConfigBuilder_ == null) {
+        scanConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder>(
+                getScanConfig(),
+                getParentForChildren(),
+                isClean());
+        scanConfig_ = null;
+      }
+      return scanConfigBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public CreateScanConfigRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new CreateScanConfigRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequestOrBuilder.java
new file mode 100644
index 000000000000..395117a2af4e
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequestOrBuilder.java
@@ -0,0 +1,59 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface CreateScanConfigRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The parent resource name where the scan is created, which should be a
+   * project resource name in the format 'projects/{projectId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  java.lang.String getParent();
+  /**
+   * 
+   * Required.
+   * The parent resource name where the scan is created, which should be a
+   * project resource name in the format 'projects/{projectId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  com.google.protobuf.ByteString
+      getParentBytes();
+
+  /**
+   * 
+   * Required.
+   * The ScanConfig to be created.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+   */
+  boolean hasScanConfig();
+  /**
+   * 
+   * Required.
+   * The ScanConfig to be created.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanConfig getScanConfig();
+  /**
+   * 
+   * Required.
+   * The ScanConfig to be created.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder getScanConfigOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequest.java
new file mode 100644
index 000000000000..aa5a8a6f74a2
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequest.java
@@ -0,0 +1,566 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `DeleteScanConfig` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest}
+ */
+public  final class DeleteScanConfigRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest)
+    DeleteScanConfigRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use DeleteScanConfigRequest.newBuilder() to construct.
+  private DeleteScanConfigRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private DeleteScanConfigRequest() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private DeleteScanConfigRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest.class, com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanConfig to be deleted. The name follows the
+   * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanConfig to be deleted. The name follows the
+   * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest other = (com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `DeleteScanConfig` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest)
+      com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest.class, com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest result = new com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest(this);
+      result.name_ = name_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be deleted. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be deleted. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be deleted. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be deleted. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be deleted. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public DeleteScanConfigRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new DeleteScanConfigRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequestOrBuilder.java
new file mode 100644
index 000000000000..71029d261077
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequestOrBuilder.java
@@ -0,0 +1,31 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface DeleteScanConfigRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanConfig to be deleted. The name follows the
+   * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanConfig to be deleted. The name follows the
+   * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Finding.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Finding.java
new file mode 100644
index 000000000000..3f43a76611ca
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Finding.java
@@ -0,0 +1,3259 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * A Finding resource represents a vulnerability instance identified during a
+ * ScanRun.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.Finding}
+ */
+public  final class Finding extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.Finding)
+    FindingOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use Finding.newBuilder() to construct.
+  private Finding(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private Finding() {
+    name_ = "";
+    findingType_ = 0;
+    httpMethod_ = "";
+    fuzzedUrl_ = "";
+    body_ = "";
+    description_ = "";
+    reproductionUrl_ = "";
+    frameUrl_ = "";
+    finalUrl_ = "";
+    trackingId_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private Finding(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 16: {
+            int rawValue = input.readEnum();
+
+            findingType_ = rawValue;
+            break;
+          }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            httpMethod_ = s;
+            break;
+          }
+          case 34: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            fuzzedUrl_ = s;
+            break;
+          }
+          case 42: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            body_ = s;
+            break;
+          }
+          case 50: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            description_ = s;
+            break;
+          }
+          case 58: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            reproductionUrl_ = s;
+            break;
+          }
+          case 66: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            frameUrl_ = s;
+            break;
+          }
+          case 74: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            finalUrl_ = s;
+            break;
+          }
+          case 82: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            trackingId_ = s;
+            break;
+          }
+          case 90: {
+            com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.Builder subBuilder = null;
+            if (outdatedLibrary_ != null) {
+              subBuilder = outdatedLibrary_.toBuilder();
+            }
+            outdatedLibrary_ = input.readMessage(com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(outdatedLibrary_);
+              outdatedLibrary_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 98: {
+            com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.Builder subBuilder = null;
+            if (violatingResource_ != null) {
+              subBuilder = violatingResource_.toBuilder();
+            }
+            violatingResource_ = input.readMessage(com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(violatingResource_);
+              violatingResource_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 106: {
+            com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.Builder subBuilder = null;
+            if (vulnerableParameters_ != null) {
+              subBuilder = vulnerableParameters_.toBuilder();
+            }
+            vulnerableParameters_ = input.readMessage(com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(vulnerableParameters_);
+              vulnerableParameters_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 114: {
+            com.google.cloud.websecurityscanner.v1alpha.Xss.Builder subBuilder = null;
+            if (xss_ != null) {
+              subBuilder = xss_.toBuilder();
+            }
+            xss_ = input.readMessage(com.google.cloud.websecurityscanner.v1alpha.Xss.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(xss_);
+              xss_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.FindingProto.internal_static_google_cloud_websecurityscanner_v1alpha_Finding_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.FindingProto.internal_static_google_cloud_websecurityscanner_v1alpha_Finding_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.Finding.class, com.google.cloud.websecurityscanner.v1alpha.Finding.Builder.class);
+  }
+
+  /**
+   * 
+   * Types of Findings.
+   * 

+   *
+   * Protobuf enum {@code google.cloud.websecurityscanner.v1alpha.Finding.FindingType}
+   */
+  public enum FindingType
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * 
+     * The invalid finding type.
+     * 

+     *
+     * FINDING_TYPE_UNSPECIFIED = 0;
+     */
+    FINDING_TYPE_UNSPECIFIED(0),
+    /**
+     * 
+     * A page that was served over HTTPS also resources over HTTP. A
+     * man-in-the-middle attacker could tamper with the HTTP resource and gain
+     * full access to the website that loads the resource or to monitor the
+     * actions taken by the user.
+     * 

+     *
+     * MIXED_CONTENT = 1;
+     */
+    MIXED_CONTENT(1),
+    /**
+     * 
+     * The version of an included library is known to contain a security issue.
+     * The scanner checks the version of library in use against a known list of
+     * vulnerable libraries. False positives are possible if the version
+     * detection fails or if the library has been manually patched.
+     * 

+     *
+     * OUTDATED_LIBRARY = 2;
+     */
+    OUTDATED_LIBRARY(2),
+    /**
+     * 
+     * This type of vulnerability occurs when the value of a request parameter
+     * is reflected at the beginning of the response, for example, in requests
+     * using JSONP. Under certain circumstances, an attacker may be able to
+     * supply an alphanumeric-only Flash file in the vulnerable parameter
+     * causing the browser to execute the Flash file as if it originated on the
+     * vulnerable server.
+     * 

+     *
+     * ROSETTA_FLASH = 5;
+     */
+    ROSETTA_FLASH(5),
+    /**
+     * 
+     * A cross-site scripting (XSS) bug is found via JavaScript callback. For
+     * detailed explanations on XSS, see
+     * https://www.google.com/about/appsecurity/learning/xss/.
+     * 

+     *
+     * XSS_CALLBACK = 3;
+     */
+    XSS_CALLBACK(3),
+    /**
+     * 
+     * A potential cross-site scripting (XSS) bug due to JavaScript breakage.
+     * In some circumstances, the application under test might modify the test
+     * string before it is parsed by the browser. When the browser attempts to
+     * runs this modified test string, it will likely break and throw a
+     * JavaScript execution error, thus an injection issue is occurring.
+     * However, it may not be exploitable. Manual verification is needed to see
+     * if the test string modifications can be evaded and confirm that the issue
+     * is in fact an XSS vulnerability. For detailed explanations on XSS, see
+     * https://www.google.com/about/appsecurity/learning/xss/.
+     * 

+     *
+     * XSS_ERROR = 4;
+     */
+    XSS_ERROR(4),
+    /**
+     * 
+     * An application appears to be transmitting a password field in clear text.
+     * An attacker can eavesdrop network traffic and sniff the password field.
+     * 

+     *
+     * CLEAR_TEXT_PASSWORD = 6;
+     */
+    CLEAR_TEXT_PASSWORD(6),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * 
+     * The invalid finding type.
+     * 

+     *
+     * FINDING_TYPE_UNSPECIFIED = 0;
+     */
+    public static final int FINDING_TYPE_UNSPECIFIED_VALUE = 0;
+    /**
+     * 
+     * A page that was served over HTTPS also resources over HTTP. A
+     * man-in-the-middle attacker could tamper with the HTTP resource and gain
+     * full access to the website that loads the resource or to monitor the
+     * actions taken by the user.
+     * 

+     *
+     * MIXED_CONTENT = 1;
+     */
+    public static final int MIXED_CONTENT_VALUE = 1;
+    /**
+     * 
+     * The version of an included library is known to contain a security issue.
+     * The scanner checks the version of library in use against a known list of
+     * vulnerable libraries. False positives are possible if the version
+     * detection fails or if the library has been manually patched.
+     * 

+     *
+     * OUTDATED_LIBRARY = 2;
+     */
+    public static final int OUTDATED_LIBRARY_VALUE = 2;
+    /**
+     * 
+     * This type of vulnerability occurs when the value of a request parameter
+     * is reflected at the beginning of the response, for example, in requests
+     * using JSONP. Under certain circumstances, an attacker may be able to
+     * supply an alphanumeric-only Flash file in the vulnerable parameter
+     * causing the browser to execute the Flash file as if it originated on the
+     * vulnerable server.
+     * 

+     *
+     * ROSETTA_FLASH = 5;
+     */
+    public static final int ROSETTA_FLASH_VALUE = 5;
+    /**
+     * 
+     * A cross-site scripting (XSS) bug is found via JavaScript callback. For
+     * detailed explanations on XSS, see
+     * https://www.google.com/about/appsecurity/learning/xss/.
+     * 

+     *
+     * XSS_CALLBACK = 3;
+     */
+    public static final int XSS_CALLBACK_VALUE = 3;
+    /**
+     * 
+     * A potential cross-site scripting (XSS) bug due to JavaScript breakage.
+     * In some circumstances, the application under test might modify the test
+     * string before it is parsed by the browser. When the browser attempts to
+     * runs this modified test string, it will likely break and throw a
+     * JavaScript execution error, thus an injection issue is occurring.
+     * However, it may not be exploitable. Manual verification is needed to see
+     * if the test string modifications can be evaded and confirm that the issue
+     * is in fact an XSS vulnerability. For detailed explanations on XSS, see
+     * https://www.google.com/about/appsecurity/learning/xss/.
+     * 

+     *
+     * XSS_ERROR = 4;
+     */
+    public static final int XSS_ERROR_VALUE = 4;
+    /**
+     * 
+     * An application appears to be transmitting a password field in clear text.
+     * An attacker can eavesdrop network traffic and sniff the password field.
+     * 

+     *
+     * CLEAR_TEXT_PASSWORD = 6;
+     */
+    public static final int CLEAR_TEXT_PASSWORD_VALUE = 6;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static FindingType valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static FindingType forNumber(int value) {
+      switch (value) {
+        case 0: return FINDING_TYPE_UNSPECIFIED;
+        case 1: return MIXED_CONTENT;
+        case 2: return OUTDATED_LIBRARY;
+        case 5: return ROSETTA_FLASH;
+        case 3: return XSS_CALLBACK;
+        case 4: return XSS_ERROR;
+        case 6: return CLEAR_TEXT_PASSWORD;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        FindingType> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public FindingType findValueByNumber(int number) {
+              return FindingType.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.Finding.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final FindingType[] VALUES = values();
+
+    public static FindingType valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private FindingType(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.cloud.websecurityscanner.v1alpha.Finding.FindingType)
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * Output only.
+   * The resource name of the Finding. The name follows the format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanruns/{scanRunId}/findings/{findingId}'.
+   * The finding IDs are generated by the system.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * The resource name of the Finding. The name follows the format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanruns/{scanRunId}/findings/{findingId}'.
+   * The finding IDs are generated by the system.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int FINDING_TYPE_FIELD_NUMBER = 2;
+  private int findingType_;
+  /**
+   * 
+   * Output only.
+   * The type of the Finding.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 2;
+   */
+  public int getFindingTypeValue() {
+    return findingType_;
+  }
+  /**
+   * 
+   * Output only.
+   * The type of the Finding.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 2;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType getFindingType() {
+    com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType result = com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.valueOf(findingType_);
+    return result == null ? com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.UNRECOGNIZED : result;
+  }
+
+  public static final int HTTP_METHOD_FIELD_NUMBER = 3;
+  private volatile java.lang.Object httpMethod_;
+  /**
+   * 
+   * Output only.
+   * The http method of the request that triggered the vulnerability, in
+   * uppercase.
+   * 

+   *
+   * string http_method = 3;
+   */
+  public java.lang.String getHttpMethod() {
+    java.lang.Object ref = httpMethod_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      httpMethod_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * The http method of the request that triggered the vulnerability, in
+   * uppercase.
+   * 

+   *
+   * string http_method = 3;
+   */
+  public com.google.protobuf.ByteString
+      getHttpMethodBytes() {
+    java.lang.Object ref = httpMethod_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      httpMethod_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int FUZZED_URL_FIELD_NUMBER = 4;
+  private volatile java.lang.Object fuzzedUrl_;
+  /**
+   * 
+   * Output only.
+   * The URL produced by the server-side fuzzer and used in the request that
+   * triggered the vulnerability.
+   * 

+   *
+   * string fuzzed_url = 4;
+   */
+  public java.lang.String getFuzzedUrl() {
+    java.lang.Object ref = fuzzedUrl_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      fuzzedUrl_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * The URL produced by the server-side fuzzer and used in the request that
+   * triggered the vulnerability.
+   * 

+   *
+   * string fuzzed_url = 4;
+   */
+  public com.google.protobuf.ByteString
+      getFuzzedUrlBytes() {
+    java.lang.Object ref = fuzzedUrl_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      fuzzedUrl_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int BODY_FIELD_NUMBER = 5;
+  private volatile java.lang.Object body_;
+  /**
+   * 
+   * Output only.
+   * The body of the request that triggered the vulnerability.
+   * 

+   *
+   * string body = 5;
+   */
+  public java.lang.String getBody() {
+    java.lang.Object ref = body_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      body_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * The body of the request that triggered the vulnerability.
+   * 

+   *
+   * string body = 5;
+   */
+  public com.google.protobuf.ByteString
+      getBodyBytes() {
+    java.lang.Object ref = body_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      body_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int DESCRIPTION_FIELD_NUMBER = 6;
+  private volatile java.lang.Object description_;
+  /**
+   * 
+   * Output only.
+   * The description of the vulnerability.
+   * 

+   *
+   * string description = 6;
+   */
+  public java.lang.String getDescription() {
+    java.lang.Object ref = description_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      description_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * The description of the vulnerability.
+   * 

+   *
+   * string description = 6;
+   */
+  public com.google.protobuf.ByteString
+      getDescriptionBytes() {
+    java.lang.Object ref = description_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      description_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int REPRODUCTION_URL_FIELD_NUMBER = 7;
+  private volatile java.lang.Object reproductionUrl_;
+  /**
+   * 
+   * Output only.
+   * The URL containing human-readable payload that user can leverage to
+   * reproduce the vulnerability.
+   * 

+   *
+   * string reproduction_url = 7;
+   */
+  public java.lang.String getReproductionUrl() {
+    java.lang.Object ref = reproductionUrl_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      reproductionUrl_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * The URL containing human-readable payload that user can leverage to
+   * reproduce the vulnerability.
+   * 

+   *
+   * string reproduction_url = 7;
+   */
+  public com.google.protobuf.ByteString
+      getReproductionUrlBytes() {
+    java.lang.Object ref = reproductionUrl_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      reproductionUrl_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int FRAME_URL_FIELD_NUMBER = 8;
+  private volatile java.lang.Object frameUrl_;
+  /**
+   * 
+   * Output only.
+   * If the vulnerability was originated from nested IFrame, the immediate
+   * parent IFrame is reported.
+   * 

+   *
+   * string frame_url = 8;
+   */
+  public java.lang.String getFrameUrl() {
+    java.lang.Object ref = frameUrl_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      frameUrl_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * If the vulnerability was originated from nested IFrame, the immediate
+   * parent IFrame is reported.
+   * 

+   *
+   * string frame_url = 8;
+   */
+  public com.google.protobuf.ByteString
+      getFrameUrlBytes() {
+    java.lang.Object ref = frameUrl_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      frameUrl_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int FINAL_URL_FIELD_NUMBER = 9;
+  private volatile java.lang.Object finalUrl_;
+  /**
+   * 
+   * Output only.
+   * The URL where the browser lands when the vulnerability is detected.
+   * 

+   *
+   * string final_url = 9;
+   */
+  public java.lang.String getFinalUrl() {
+    java.lang.Object ref = finalUrl_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      finalUrl_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * The URL where the browser lands when the vulnerability is detected.
+   * 

+   *
+   * string final_url = 9;
+   */
+  public com.google.protobuf.ByteString
+      getFinalUrlBytes() {
+    java.lang.Object ref = finalUrl_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      finalUrl_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int TRACKING_ID_FIELD_NUMBER = 10;
+  private volatile java.lang.Object trackingId_;
+  /**
+   * 
+   * Output only.
+   * The tracking ID uniquely identifies a vulnerability instance across
+   * multiple ScanRuns.
+   * 

+   *
+   * string tracking_id = 10;
+   */
+  public java.lang.String getTrackingId() {
+    java.lang.Object ref = trackingId_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      trackingId_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * The tracking ID uniquely identifies a vulnerability instance across
+   * multiple ScanRuns.
+   * 

+   *
+   * string tracking_id = 10;
+   */
+  public com.google.protobuf.ByteString
+      getTrackingIdBytes() {
+    java.lang.Object ref = trackingId_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      trackingId_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int OUTDATED_LIBRARY_FIELD_NUMBER = 11;
+  private com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdatedLibrary_;
+  /**
+   * 
+   * Output only.
+   * An addon containing information about outdated libraries.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+   */
+  public boolean hasOutdatedLibrary() {
+    return outdatedLibrary_ != null;
+  }
+  /**
+   * 
+   * Output only.
+   * An addon containing information about outdated libraries.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary getOutdatedLibrary() {
+    return outdatedLibrary_ == null ? com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.getDefaultInstance() : outdatedLibrary_;
+  }
+  /**
+   * 
+   * Output only.
+   * An addon containing information about outdated libraries.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibraryOrBuilder getOutdatedLibraryOrBuilder() {
+    return getOutdatedLibrary();
+  }
+
+  public static final int VIOLATING_RESOURCE_FIELD_NUMBER = 12;
+  private com.google.cloud.websecurityscanner.v1alpha.ViolatingResource violatingResource_;
+  /**
+   * 
+   * Output only.
+   * An addon containing detailed information regarding any resource causing the
+   * vulnerability such as JavaScript sources, image, audio files, etc.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+   */
+  public boolean hasViolatingResource() {
+    return violatingResource_ != null;
+  }
+  /**
+   * 
+   * Output only.
+   * An addon containing detailed information regarding any resource causing the
+   * vulnerability such as JavaScript sources, image, audio files, etc.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource getViolatingResource() {
+    return violatingResource_ == null ? com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.getDefaultInstance() : violatingResource_;
+  }
+  /**
+   * 
+   * Output only.
+   * An addon containing detailed information regarding any resource causing the
+   * vulnerability such as JavaScript sources, image, audio files, etc.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ViolatingResourceOrBuilder getViolatingResourceOrBuilder() {
+    return getViolatingResource();
+  }
+
+  public static final int VULNERABLE_PARAMETERS_FIELD_NUMBER = 13;
+  private com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerableParameters_;
+  /**
+   * 
+   * Output only.
+   * An addon containing information about request parameters which were found
+   * to be vulnerable.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+   */
+  public boolean hasVulnerableParameters() {
+    return vulnerableParameters_ != null;
+  }
+  /**
+   * 
+   * Output only.
+   * An addon containing information about request parameters which were found
+   * to be vulnerable.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters getVulnerableParameters() {
+    return vulnerableParameters_ == null ? com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.getDefaultInstance() : vulnerableParameters_;
+  }
+  /**
+   * 
+   * Output only.
+   * An addon containing information about request parameters which were found
+   * to be vulnerable.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.VulnerableParametersOrBuilder getVulnerableParametersOrBuilder() {
+    return getVulnerableParameters();
+  }
+
+  public static final int XSS_FIELD_NUMBER = 14;
+  private com.google.cloud.websecurityscanner.v1alpha.Xss xss_;
+  /**
+   * 
+   * Output only.
+   * An addon containing information reported for an XSS, if any.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+   */
+  public boolean hasXss() {
+    return xss_ != null;
+  }
+  /**
+   * 
+   * Output only.
+   * An addon containing information reported for an XSS, if any.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.Xss getXss() {
+    return xss_ == null ? com.google.cloud.websecurityscanner.v1alpha.Xss.getDefaultInstance() : xss_;
+  }
+  /**
+   * 
+   * Output only.
+   * An addon containing information reported for an XSS, if any.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.XssOrBuilder getXssOrBuilder() {
+    return getXss();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    if (findingType_ != com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.FINDING_TYPE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(2, findingType_);
+    }
+    if (!getHttpMethodBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, httpMethod_);
+    }
+    if (!getFuzzedUrlBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 4, fuzzedUrl_);
+    }
+    if (!getBodyBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 5, body_);
+    }
+    if (!getDescriptionBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 6, description_);
+    }
+    if (!getReproductionUrlBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 7, reproductionUrl_);
+    }
+    if (!getFrameUrlBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 8, frameUrl_);
+    }
+    if (!getFinalUrlBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 9, finalUrl_);
+    }
+    if (!getTrackingIdBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 10, trackingId_);
+    }
+    if (outdatedLibrary_ != null) {
+      output.writeMessage(11, getOutdatedLibrary());
+    }
+    if (violatingResource_ != null) {
+      output.writeMessage(12, getViolatingResource());
+    }
+    if (vulnerableParameters_ != null) {
+      output.writeMessage(13, getVulnerableParameters());
+    }
+    if (xss_ != null) {
+      output.writeMessage(14, getXss());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    if (findingType_ != com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.FINDING_TYPE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(2, findingType_);
+    }
+    if (!getHttpMethodBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, httpMethod_);
+    }
+    if (!getFuzzedUrlBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, fuzzedUrl_);
+    }
+    if (!getBodyBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, body_);
+    }
+    if (!getDescriptionBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, description_);
+    }
+    if (!getReproductionUrlBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, reproductionUrl_);
+    }
+    if (!getFrameUrlBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, frameUrl_);
+    }
+    if (!getFinalUrlBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, finalUrl_);
+    }
+    if (!getTrackingIdBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, trackingId_);
+    }
+    if (outdatedLibrary_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(11, getOutdatedLibrary());
+    }
+    if (violatingResource_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(12, getViolatingResource());
+    }
+    if (vulnerableParameters_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(13, getVulnerableParameters());
+    }
+    if (xss_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(14, getXss());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.Finding)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.Finding other = (com.google.cloud.websecurityscanner.v1alpha.Finding) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && findingType_ == other.findingType_;
+    result = result && getHttpMethod()
+        .equals(other.getHttpMethod());
+    result = result && getFuzzedUrl()
+        .equals(other.getFuzzedUrl());
+    result = result && getBody()
+        .equals(other.getBody());
+    result = result && getDescription()
+        .equals(other.getDescription());
+    result = result && getReproductionUrl()
+        .equals(other.getReproductionUrl());
+    result = result && getFrameUrl()
+        .equals(other.getFrameUrl());
+    result = result && getFinalUrl()
+        .equals(other.getFinalUrl());
+    result = result && getTrackingId()
+        .equals(other.getTrackingId());
+    result = result && (hasOutdatedLibrary() == other.hasOutdatedLibrary());
+    if (hasOutdatedLibrary()) {
+      result = result && getOutdatedLibrary()
+          .equals(other.getOutdatedLibrary());
+    }
+    result = result && (hasViolatingResource() == other.hasViolatingResource());
+    if (hasViolatingResource()) {
+      result = result && getViolatingResource()
+          .equals(other.getViolatingResource());
+    }
+    result = result && (hasVulnerableParameters() == other.hasVulnerableParameters());
+    if (hasVulnerableParameters()) {
+      result = result && getVulnerableParameters()
+          .equals(other.getVulnerableParameters());
+    }
+    result = result && (hasXss() == other.hasXss());
+    if (hasXss()) {
+      result = result && getXss()
+          .equals(other.getXss());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (37 * hash) + FINDING_TYPE_FIELD_NUMBER;
+    hash = (53 * hash) + findingType_;
+    hash = (37 * hash) + HTTP_METHOD_FIELD_NUMBER;
+    hash = (53 * hash) + getHttpMethod().hashCode();
+    hash = (37 * hash) + FUZZED_URL_FIELD_NUMBER;
+    hash = (53 * hash) + getFuzzedUrl().hashCode();
+    hash = (37 * hash) + BODY_FIELD_NUMBER;
+    hash = (53 * hash) + getBody().hashCode();
+    hash = (37 * hash) + DESCRIPTION_FIELD_NUMBER;
+    hash = (53 * hash) + getDescription().hashCode();
+    hash = (37 * hash) + REPRODUCTION_URL_FIELD_NUMBER;
+    hash = (53 * hash) + getReproductionUrl().hashCode();
+    hash = (37 * hash) + FRAME_URL_FIELD_NUMBER;
+    hash = (53 * hash) + getFrameUrl().hashCode();
+    hash = (37 * hash) + FINAL_URL_FIELD_NUMBER;
+    hash = (53 * hash) + getFinalUrl().hashCode();
+    hash = (37 * hash) + TRACKING_ID_FIELD_NUMBER;
+    hash = (53 * hash) + getTrackingId().hashCode();
+    if (hasOutdatedLibrary()) {
+      hash = (37 * hash) + OUTDATED_LIBRARY_FIELD_NUMBER;
+      hash = (53 * hash) + getOutdatedLibrary().hashCode();
+    }
+    if (hasViolatingResource()) {
+      hash = (37 * hash) + VIOLATING_RESOURCE_FIELD_NUMBER;
+      hash = (53 * hash) + getViolatingResource().hashCode();
+    }
+    if (hasVulnerableParameters()) {
+      hash = (37 * hash) + VULNERABLE_PARAMETERS_FIELD_NUMBER;
+      hash = (53 * hash) + getVulnerableParameters().hashCode();
+    }
+    if (hasXss()) {
+      hash = (37 * hash) + XSS_FIELD_NUMBER;
+      hash = (53 * hash) + getXss().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.Finding prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * A Finding resource represents a vulnerability instance identified during a
+   * ScanRun.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.Finding}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.Finding)
+      com.google.cloud.websecurityscanner.v1alpha.FindingOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingProto.internal_static_google_cloud_websecurityscanner_v1alpha_Finding_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingProto.internal_static_google_cloud_websecurityscanner_v1alpha_Finding_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.Finding.class, com.google.cloud.websecurityscanner.v1alpha.Finding.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.Finding.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      findingType_ = 0;
+
+      httpMethod_ = "";
+
+      fuzzedUrl_ = "";
+
+      body_ = "";
+
+      description_ = "";
+
+      reproductionUrl_ = "";
+
+      frameUrl_ = "";
+
+      finalUrl_ = "";
+
+      trackingId_ = "";
+
+      if (outdatedLibraryBuilder_ == null) {
+        outdatedLibrary_ = null;
+      } else {
+        outdatedLibrary_ = null;
+        outdatedLibraryBuilder_ = null;
+      }
+      if (violatingResourceBuilder_ == null) {
+        violatingResource_ = null;
+      } else {
+        violatingResource_ = null;
+        violatingResourceBuilder_ = null;
+      }
+      if (vulnerableParametersBuilder_ == null) {
+        vulnerableParameters_ = null;
+      } else {
+        vulnerableParameters_ = null;
+        vulnerableParametersBuilder_ = null;
+      }
+      if (xssBuilder_ == null) {
+        xss_ = null;
+      } else {
+        xss_ = null;
+        xssBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingProto.internal_static_google_cloud_websecurityscanner_v1alpha_Finding_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.Finding getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.Finding.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.Finding build() {
+      com.google.cloud.websecurityscanner.v1alpha.Finding result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.Finding buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.Finding result = new com.google.cloud.websecurityscanner.v1alpha.Finding(this);
+      result.name_ = name_;
+      result.findingType_ = findingType_;
+      result.httpMethod_ = httpMethod_;
+      result.fuzzedUrl_ = fuzzedUrl_;
+      result.body_ = body_;
+      result.description_ = description_;
+      result.reproductionUrl_ = reproductionUrl_;
+      result.frameUrl_ = frameUrl_;
+      result.finalUrl_ = finalUrl_;
+      result.trackingId_ = trackingId_;
+      if (outdatedLibraryBuilder_ == null) {
+        result.outdatedLibrary_ = outdatedLibrary_;
+      } else {
+        result.outdatedLibrary_ = outdatedLibraryBuilder_.build();
+      }
+      if (violatingResourceBuilder_ == null) {
+        result.violatingResource_ = violatingResource_;
+      } else {
+        result.violatingResource_ = violatingResourceBuilder_.build();
+      }
+      if (vulnerableParametersBuilder_ == null) {
+        result.vulnerableParameters_ = vulnerableParameters_;
+      } else {
+        result.vulnerableParameters_ = vulnerableParametersBuilder_.build();
+      }
+      if (xssBuilder_ == null) {
+        result.xss_ = xss_;
+      } else {
+        result.xss_ = xssBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.Finding) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.Finding)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.Finding other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.Finding.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (other.findingType_ != 0) {
+        setFindingTypeValue(other.getFindingTypeValue());
+      }
+      if (!other.getHttpMethod().isEmpty()) {
+        httpMethod_ = other.httpMethod_;
+        onChanged();
+      }
+      if (!other.getFuzzedUrl().isEmpty()) {
+        fuzzedUrl_ = other.fuzzedUrl_;
+        onChanged();
+      }
+      if (!other.getBody().isEmpty()) {
+        body_ = other.body_;
+        onChanged();
+      }
+      if (!other.getDescription().isEmpty()) {
+        description_ = other.description_;
+        onChanged();
+      }
+      if (!other.getReproductionUrl().isEmpty()) {
+        reproductionUrl_ = other.reproductionUrl_;
+        onChanged();
+      }
+      if (!other.getFrameUrl().isEmpty()) {
+        frameUrl_ = other.frameUrl_;
+        onChanged();
+      }
+      if (!other.getFinalUrl().isEmpty()) {
+        finalUrl_ = other.finalUrl_;
+        onChanged();
+      }
+      if (!other.getTrackingId().isEmpty()) {
+        trackingId_ = other.trackingId_;
+        onChanged();
+      }
+      if (other.hasOutdatedLibrary()) {
+        mergeOutdatedLibrary(other.getOutdatedLibrary());
+      }
+      if (other.hasViolatingResource()) {
+        mergeViolatingResource(other.getViolatingResource());
+      }
+      if (other.hasVulnerableParameters()) {
+        mergeVulnerableParameters(other.getVulnerableParameters());
+      }
+      if (other.hasXss()) {
+        mergeXss(other.getXss());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.Finding parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.Finding) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * Output only.
+     * The resource name of the Finding. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanruns/{scanRunId}/findings/{findingId}'.
+     * The finding IDs are generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The resource name of the Finding. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanruns/{scanRunId}/findings/{findingId}'.
+     * The finding IDs are generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The resource name of the Finding. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanruns/{scanRunId}/findings/{findingId}'.
+     * The finding IDs are generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The resource name of the Finding. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanruns/{scanRunId}/findings/{findingId}'.
+     * The finding IDs are generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The resource name of the Finding. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanruns/{scanRunId}/findings/{findingId}'.
+     * The finding IDs are generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int findingType_ = 0;
+    /**
+     * 
+     * Output only.
+     * The type of the Finding.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 2;
+     */
+    public int getFindingTypeValue() {
+      return findingType_;
+    }
+    /**
+     * 
+     * Output only.
+     * The type of the Finding.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 2;
+     */
+    public Builder setFindingTypeValue(int value) {
+      findingType_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The type of the Finding.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 2;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType getFindingType() {
+      com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType result = com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.valueOf(findingType_);
+      return result == null ? com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.UNRECOGNIZED : result;
+    }
+    /**
+     * 
+     * Output only.
+     * The type of the Finding.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 2;
+     */
+    public Builder setFindingType(com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      findingType_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The type of the Finding.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 2;
+     */
+    public Builder clearFindingType() {
+      
+      findingType_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object httpMethod_ = "";
+    /**
+     * 
+     * Output only.
+     * The http method of the request that triggered the vulnerability, in
+     * uppercase.
+     * 

+     *
+     * string http_method = 3;
+     */
+    public java.lang.String getHttpMethod() {
+      java.lang.Object ref = httpMethod_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        httpMethod_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The http method of the request that triggered the vulnerability, in
+     * uppercase.
+     * 

+     *
+     * string http_method = 3;
+     */
+    public com.google.protobuf.ByteString
+        getHttpMethodBytes() {
+      java.lang.Object ref = httpMethod_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        httpMethod_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The http method of the request that triggered the vulnerability, in
+     * uppercase.
+     * 

+     *
+     * string http_method = 3;
+     */
+    public Builder setHttpMethod(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      httpMethod_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The http method of the request that triggered the vulnerability, in
+     * uppercase.
+     * 

+     *
+     * string http_method = 3;
+     */
+    public Builder clearHttpMethod() {
+      
+      httpMethod_ = getDefaultInstance().getHttpMethod();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The http method of the request that triggered the vulnerability, in
+     * uppercase.
+     * 

+     *
+     * string http_method = 3;
+     */
+    public Builder setHttpMethodBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      httpMethod_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object fuzzedUrl_ = "";
+    /**
+     * 
+     * Output only.
+     * The URL produced by the server-side fuzzer and used in the request that
+     * triggered the vulnerability.
+     * 

+     *
+     * string fuzzed_url = 4;
+     */
+    public java.lang.String getFuzzedUrl() {
+      java.lang.Object ref = fuzzedUrl_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        fuzzedUrl_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The URL produced by the server-side fuzzer and used in the request that
+     * triggered the vulnerability.
+     * 

+     *
+     * string fuzzed_url = 4;
+     */
+    public com.google.protobuf.ByteString
+        getFuzzedUrlBytes() {
+      java.lang.Object ref = fuzzedUrl_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        fuzzedUrl_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The URL produced by the server-side fuzzer and used in the request that
+     * triggered the vulnerability.
+     * 

+     *
+     * string fuzzed_url = 4;
+     */
+    public Builder setFuzzedUrl(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      fuzzedUrl_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The URL produced by the server-side fuzzer and used in the request that
+     * triggered the vulnerability.
+     * 

+     *
+     * string fuzzed_url = 4;
+     */
+    public Builder clearFuzzedUrl() {
+      
+      fuzzedUrl_ = getDefaultInstance().getFuzzedUrl();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The URL produced by the server-side fuzzer and used in the request that
+     * triggered the vulnerability.
+     * 

+     *
+     * string fuzzed_url = 4;
+     */
+    public Builder setFuzzedUrlBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      fuzzedUrl_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object body_ = "";
+    /**
+     * 
+     * Output only.
+     * The body of the request that triggered the vulnerability.
+     * 

+     *
+     * string body = 5;
+     */
+    public java.lang.String getBody() {
+      java.lang.Object ref = body_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        body_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The body of the request that triggered the vulnerability.
+     * 

+     *
+     * string body = 5;
+     */
+    public com.google.protobuf.ByteString
+        getBodyBytes() {
+      java.lang.Object ref = body_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        body_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The body of the request that triggered the vulnerability.
+     * 

+     *
+     * string body = 5;
+     */
+    public Builder setBody(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      body_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The body of the request that triggered the vulnerability.
+     * 

+     *
+     * string body = 5;
+     */
+    public Builder clearBody() {
+      
+      body_ = getDefaultInstance().getBody();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The body of the request that triggered the vulnerability.
+     * 

+     *
+     * string body = 5;
+     */
+    public Builder setBodyBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      body_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object description_ = "";
+    /**
+     * 
+     * Output only.
+     * The description of the vulnerability.
+     * 

+     *
+     * string description = 6;
+     */
+    public java.lang.String getDescription() {
+      java.lang.Object ref = description_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        description_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The description of the vulnerability.
+     * 

+     *
+     * string description = 6;
+     */
+    public com.google.protobuf.ByteString
+        getDescriptionBytes() {
+      java.lang.Object ref = description_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        description_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The description of the vulnerability.
+     * 

+     *
+     * string description = 6;
+     */
+    public Builder setDescription(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      description_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The description of the vulnerability.
+     * 

+     *
+     * string description = 6;
+     */
+    public Builder clearDescription() {
+      
+      description_ = getDefaultInstance().getDescription();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The description of the vulnerability.
+     * 

+     *
+     * string description = 6;
+     */
+    public Builder setDescriptionBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      description_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object reproductionUrl_ = "";
+    /**
+     * 
+     * Output only.
+     * The URL containing human-readable payload that user can leverage to
+     * reproduce the vulnerability.
+     * 

+     *
+     * string reproduction_url = 7;
+     */
+    public java.lang.String getReproductionUrl() {
+      java.lang.Object ref = reproductionUrl_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        reproductionUrl_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The URL containing human-readable payload that user can leverage to
+     * reproduce the vulnerability.
+     * 

+     *
+     * string reproduction_url = 7;
+     */
+    public com.google.protobuf.ByteString
+        getReproductionUrlBytes() {
+      java.lang.Object ref = reproductionUrl_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        reproductionUrl_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The URL containing human-readable payload that user can leverage to
+     * reproduce the vulnerability.
+     * 

+     *
+     * string reproduction_url = 7;
+     */
+    public Builder setReproductionUrl(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      reproductionUrl_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The URL containing human-readable payload that user can leverage to
+     * reproduce the vulnerability.
+     * 

+     *
+     * string reproduction_url = 7;
+     */
+    public Builder clearReproductionUrl() {
+      
+      reproductionUrl_ = getDefaultInstance().getReproductionUrl();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The URL containing human-readable payload that user can leverage to
+     * reproduce the vulnerability.
+     * 

+     *
+     * string reproduction_url = 7;
+     */
+    public Builder setReproductionUrlBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      reproductionUrl_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object frameUrl_ = "";
+    /**
+     * 
+     * Output only.
+     * If the vulnerability was originated from nested IFrame, the immediate
+     * parent IFrame is reported.
+     * 

+     *
+     * string frame_url = 8;
+     */
+    public java.lang.String getFrameUrl() {
+      java.lang.Object ref = frameUrl_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        frameUrl_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * If the vulnerability was originated from nested IFrame, the immediate
+     * parent IFrame is reported.
+     * 

+     *
+     * string frame_url = 8;
+     */
+    public com.google.protobuf.ByteString
+        getFrameUrlBytes() {
+      java.lang.Object ref = frameUrl_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        frameUrl_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * If the vulnerability was originated from nested IFrame, the immediate
+     * parent IFrame is reported.
+     * 

+     *
+     * string frame_url = 8;
+     */
+    public Builder setFrameUrl(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      frameUrl_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * If the vulnerability was originated from nested IFrame, the immediate
+     * parent IFrame is reported.
+     * 

+     *
+     * string frame_url = 8;
+     */
+    public Builder clearFrameUrl() {
+      
+      frameUrl_ = getDefaultInstance().getFrameUrl();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * If the vulnerability was originated from nested IFrame, the immediate
+     * parent IFrame is reported.
+     * 

+     *
+     * string frame_url = 8;
+     */
+    public Builder setFrameUrlBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      frameUrl_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object finalUrl_ = "";
+    /**
+     * 
+     * Output only.
+     * The URL where the browser lands when the vulnerability is detected.
+     * 

+     *
+     * string final_url = 9;
+     */
+    public java.lang.String getFinalUrl() {
+      java.lang.Object ref = finalUrl_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        finalUrl_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The URL where the browser lands when the vulnerability is detected.
+     * 

+     *
+     * string final_url = 9;
+     */
+    public com.google.protobuf.ByteString
+        getFinalUrlBytes() {
+      java.lang.Object ref = finalUrl_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        finalUrl_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The URL where the browser lands when the vulnerability is detected.
+     * 

+     *
+     * string final_url = 9;
+     */
+    public Builder setFinalUrl(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      finalUrl_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The URL where the browser lands when the vulnerability is detected.
+     * 

+     *
+     * string final_url = 9;
+     */
+    public Builder clearFinalUrl() {
+      
+      finalUrl_ = getDefaultInstance().getFinalUrl();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The URL where the browser lands when the vulnerability is detected.
+     * 

+     *
+     * string final_url = 9;
+     */
+    public Builder setFinalUrlBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      finalUrl_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object trackingId_ = "";
+    /**
+     * 
+     * Output only.
+     * The tracking ID uniquely identifies a vulnerability instance across
+     * multiple ScanRuns.
+     * 

+     *
+     * string tracking_id = 10;
+     */
+    public java.lang.String getTrackingId() {
+      java.lang.Object ref = trackingId_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        trackingId_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The tracking ID uniquely identifies a vulnerability instance across
+     * multiple ScanRuns.
+     * 

+     *
+     * string tracking_id = 10;
+     */
+    public com.google.protobuf.ByteString
+        getTrackingIdBytes() {
+      java.lang.Object ref = trackingId_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        trackingId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The tracking ID uniquely identifies a vulnerability instance across
+     * multiple ScanRuns.
+     * 

+     *
+     * string tracking_id = 10;
+     */
+    public Builder setTrackingId(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      trackingId_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The tracking ID uniquely identifies a vulnerability instance across
+     * multiple ScanRuns.
+     * 

+     *
+     * string tracking_id = 10;
+     */
+    public Builder clearTrackingId() {
+      
+      trackingId_ = getDefaultInstance().getTrackingId();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The tracking ID uniquely identifies a vulnerability instance across
+     * multiple ScanRuns.
+     * 

+     *
+     * string tracking_id = 10;
+     */
+    public Builder setTrackingIdBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      trackingId_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdatedLibrary_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary, com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.Builder, com.google.cloud.websecurityscanner.v1alpha.OutdatedLibraryOrBuilder> outdatedLibraryBuilder_;
+    /**
+     * 
+     * Output only.
+     * An addon containing information about outdated libraries.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+     */
+    public boolean hasOutdatedLibrary() {
+      return outdatedLibraryBuilder_ != null || outdatedLibrary_ != null;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about outdated libraries.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary getOutdatedLibrary() {
+      if (outdatedLibraryBuilder_ == null) {
+        return outdatedLibrary_ == null ? com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.getDefaultInstance() : outdatedLibrary_;
+      } else {
+        return outdatedLibraryBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about outdated libraries.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+     */
+    public Builder setOutdatedLibrary(com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary value) {
+      if (outdatedLibraryBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        outdatedLibrary_ = value;
+        onChanged();
+      } else {
+        outdatedLibraryBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about outdated libraries.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+     */
+    public Builder setOutdatedLibrary(
+        com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.Builder builderForValue) {
+      if (outdatedLibraryBuilder_ == null) {
+        outdatedLibrary_ = builderForValue.build();
+        onChanged();
+      } else {
+        outdatedLibraryBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about outdated libraries.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+     */
+    public Builder mergeOutdatedLibrary(com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary value) {
+      if (outdatedLibraryBuilder_ == null) {
+        if (outdatedLibrary_ != null) {
+          outdatedLibrary_ =
+            com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.newBuilder(outdatedLibrary_).mergeFrom(value).buildPartial();
+        } else {
+          outdatedLibrary_ = value;
+        }
+        onChanged();
+      } else {
+        outdatedLibraryBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about outdated libraries.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+     */
+    public Builder clearOutdatedLibrary() {
+      if (outdatedLibraryBuilder_ == null) {
+        outdatedLibrary_ = null;
+        onChanged();
+      } else {
+        outdatedLibrary_ = null;
+        outdatedLibraryBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about outdated libraries.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.Builder getOutdatedLibraryBuilder() {
+      
+      onChanged();
+      return getOutdatedLibraryFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about outdated libraries.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibraryOrBuilder getOutdatedLibraryOrBuilder() {
+      if (outdatedLibraryBuilder_ != null) {
+        return outdatedLibraryBuilder_.getMessageOrBuilder();
+      } else {
+        return outdatedLibrary_ == null ?
+            com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.getDefaultInstance() : outdatedLibrary_;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about outdated libraries.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary, com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.Builder, com.google.cloud.websecurityscanner.v1alpha.OutdatedLibraryOrBuilder> 
+        getOutdatedLibraryFieldBuilder() {
+      if (outdatedLibraryBuilder_ == null) {
+        outdatedLibraryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary, com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.Builder, com.google.cloud.websecurityscanner.v1alpha.OutdatedLibraryOrBuilder>(
+                getOutdatedLibrary(),
+                getParentForChildren(),
+                isClean());
+        outdatedLibrary_ = null;
+      }
+      return outdatedLibraryBuilder_;
+    }
+
+    private com.google.cloud.websecurityscanner.v1alpha.ViolatingResource violatingResource_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ViolatingResource, com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.Builder, com.google.cloud.websecurityscanner.v1alpha.ViolatingResourceOrBuilder> violatingResourceBuilder_;
+    /**
+     * 
+     * Output only.
+     * An addon containing detailed information regarding any resource causing the
+     * vulnerability such as JavaScript sources, image, audio files, etc.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+     */
+    public boolean hasViolatingResource() {
+      return violatingResourceBuilder_ != null || violatingResource_ != null;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing detailed information regarding any resource causing the
+     * vulnerability such as JavaScript sources, image, audio files, etc.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource getViolatingResource() {
+      if (violatingResourceBuilder_ == null) {
+        return violatingResource_ == null ? com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.getDefaultInstance() : violatingResource_;
+      } else {
+        return violatingResourceBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing detailed information regarding any resource causing the
+     * vulnerability such as JavaScript sources, image, audio files, etc.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+     */
+    public Builder setViolatingResource(com.google.cloud.websecurityscanner.v1alpha.ViolatingResource value) {
+      if (violatingResourceBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        violatingResource_ = value;
+        onChanged();
+      } else {
+        violatingResourceBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing detailed information regarding any resource causing the
+     * vulnerability such as JavaScript sources, image, audio files, etc.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+     */
+    public Builder setViolatingResource(
+        com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.Builder builderForValue) {
+      if (violatingResourceBuilder_ == null) {
+        violatingResource_ = builderForValue.build();
+        onChanged();
+      } else {
+        violatingResourceBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing detailed information regarding any resource causing the
+     * vulnerability such as JavaScript sources, image, audio files, etc.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+     */
+    public Builder mergeViolatingResource(com.google.cloud.websecurityscanner.v1alpha.ViolatingResource value) {
+      if (violatingResourceBuilder_ == null) {
+        if (violatingResource_ != null) {
+          violatingResource_ =
+            com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.newBuilder(violatingResource_).mergeFrom(value).buildPartial();
+        } else {
+          violatingResource_ = value;
+        }
+        onChanged();
+      } else {
+        violatingResourceBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing detailed information regarding any resource causing the
+     * vulnerability such as JavaScript sources, image, audio files, etc.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+     */
+    public Builder clearViolatingResource() {
+      if (violatingResourceBuilder_ == null) {
+        violatingResource_ = null;
+        onChanged();
+      } else {
+        violatingResource_ = null;
+        violatingResourceBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing detailed information regarding any resource causing the
+     * vulnerability such as JavaScript sources, image, audio files, etc.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.Builder getViolatingResourceBuilder() {
+      
+      onChanged();
+      return getViolatingResourceFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing detailed information regarding any resource causing the
+     * vulnerability such as JavaScript sources, image, audio files, etc.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ViolatingResourceOrBuilder getViolatingResourceOrBuilder() {
+      if (violatingResourceBuilder_ != null) {
+        return violatingResourceBuilder_.getMessageOrBuilder();
+      } else {
+        return violatingResource_ == null ?
+            com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.getDefaultInstance() : violatingResource_;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing detailed information regarding any resource causing the
+     * vulnerability such as JavaScript sources, image, audio files, etc.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ViolatingResource, com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.Builder, com.google.cloud.websecurityscanner.v1alpha.ViolatingResourceOrBuilder> 
+        getViolatingResourceFieldBuilder() {
+      if (violatingResourceBuilder_ == null) {
+        violatingResourceBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.ViolatingResource, com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.Builder, com.google.cloud.websecurityscanner.v1alpha.ViolatingResourceOrBuilder>(
+                getViolatingResource(),
+                getParentForChildren(),
+                isClean());
+        violatingResource_ = null;
+      }
+      return violatingResourceBuilder_;
+    }
+
+    private com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerableParameters_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters, com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.Builder, com.google.cloud.websecurityscanner.v1alpha.VulnerableParametersOrBuilder> vulnerableParametersBuilder_;
+    /**
+     * 
+     * Output only.
+     * An addon containing information about request parameters which were found
+     * to be vulnerable.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+     */
+    public boolean hasVulnerableParameters() {
+      return vulnerableParametersBuilder_ != null || vulnerableParameters_ != null;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about request parameters which were found
+     * to be vulnerable.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters getVulnerableParameters() {
+      if (vulnerableParametersBuilder_ == null) {
+        return vulnerableParameters_ == null ? com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.getDefaultInstance() : vulnerableParameters_;
+      } else {
+        return vulnerableParametersBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about request parameters which were found
+     * to be vulnerable.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+     */
+    public Builder setVulnerableParameters(com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters value) {
+      if (vulnerableParametersBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        vulnerableParameters_ = value;
+        onChanged();
+      } else {
+        vulnerableParametersBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about request parameters which were found
+     * to be vulnerable.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+     */
+    public Builder setVulnerableParameters(
+        com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.Builder builderForValue) {
+      if (vulnerableParametersBuilder_ == null) {
+        vulnerableParameters_ = builderForValue.build();
+        onChanged();
+      } else {
+        vulnerableParametersBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about request parameters which were found
+     * to be vulnerable.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+     */
+    public Builder mergeVulnerableParameters(com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters value) {
+      if (vulnerableParametersBuilder_ == null) {
+        if (vulnerableParameters_ != null) {
+          vulnerableParameters_ =
+            com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.newBuilder(vulnerableParameters_).mergeFrom(value).buildPartial();
+        } else {
+          vulnerableParameters_ = value;
+        }
+        onChanged();
+      } else {
+        vulnerableParametersBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about request parameters which were found
+     * to be vulnerable.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+     */
+    public Builder clearVulnerableParameters() {
+      if (vulnerableParametersBuilder_ == null) {
+        vulnerableParameters_ = null;
+        onChanged();
+      } else {
+        vulnerableParameters_ = null;
+        vulnerableParametersBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about request parameters which were found
+     * to be vulnerable.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.Builder getVulnerableParametersBuilder() {
+      
+      onChanged();
+      return getVulnerableParametersFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about request parameters which were found
+     * to be vulnerable.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.VulnerableParametersOrBuilder getVulnerableParametersOrBuilder() {
+      if (vulnerableParametersBuilder_ != null) {
+        return vulnerableParametersBuilder_.getMessageOrBuilder();
+      } else {
+        return vulnerableParameters_ == null ?
+            com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.getDefaultInstance() : vulnerableParameters_;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information about request parameters which were found
+     * to be vulnerable.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters, com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.Builder, com.google.cloud.websecurityscanner.v1alpha.VulnerableParametersOrBuilder> 
+        getVulnerableParametersFieldBuilder() {
+      if (vulnerableParametersBuilder_ == null) {
+        vulnerableParametersBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters, com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.Builder, com.google.cloud.websecurityscanner.v1alpha.VulnerableParametersOrBuilder>(
+                getVulnerableParameters(),
+                getParentForChildren(),
+                isClean());
+        vulnerableParameters_ = null;
+      }
+      return vulnerableParametersBuilder_;
+    }
+
+    private com.google.cloud.websecurityscanner.v1alpha.Xss xss_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.Xss, com.google.cloud.websecurityscanner.v1alpha.Xss.Builder, com.google.cloud.websecurityscanner.v1alpha.XssOrBuilder> xssBuilder_;
+    /**
+     * 
+     * Output only.
+     * An addon containing information reported for an XSS, if any.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+     */
+    public boolean hasXss() {
+      return xssBuilder_ != null || xss_ != null;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information reported for an XSS, if any.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.Xss getXss() {
+      if (xssBuilder_ == null) {
+        return xss_ == null ? com.google.cloud.websecurityscanner.v1alpha.Xss.getDefaultInstance() : xss_;
+      } else {
+        return xssBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information reported for an XSS, if any.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+     */
+    public Builder setXss(com.google.cloud.websecurityscanner.v1alpha.Xss value) {
+      if (xssBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        xss_ = value;
+        onChanged();
+      } else {
+        xssBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information reported for an XSS, if any.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+     */
+    public Builder setXss(
+        com.google.cloud.websecurityscanner.v1alpha.Xss.Builder builderForValue) {
+      if (xssBuilder_ == null) {
+        xss_ = builderForValue.build();
+        onChanged();
+      } else {
+        xssBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information reported for an XSS, if any.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+     */
+    public Builder mergeXss(com.google.cloud.websecurityscanner.v1alpha.Xss value) {
+      if (xssBuilder_ == null) {
+        if (xss_ != null) {
+          xss_ =
+            com.google.cloud.websecurityscanner.v1alpha.Xss.newBuilder(xss_).mergeFrom(value).buildPartial();
+        } else {
+          xss_ = value;
+        }
+        onChanged();
+      } else {
+        xssBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information reported for an XSS, if any.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+     */
+    public Builder clearXss() {
+      if (xssBuilder_ == null) {
+        xss_ = null;
+        onChanged();
+      } else {
+        xss_ = null;
+        xssBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information reported for an XSS, if any.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.Xss.Builder getXssBuilder() {
+      
+      onChanged();
+      return getXssFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information reported for an XSS, if any.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.XssOrBuilder getXssOrBuilder() {
+      if (xssBuilder_ != null) {
+        return xssBuilder_.getMessageOrBuilder();
+      } else {
+        return xss_ == null ?
+            com.google.cloud.websecurityscanner.v1alpha.Xss.getDefaultInstance() : xss_;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * An addon containing information reported for an XSS, if any.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.Xss, com.google.cloud.websecurityscanner.v1alpha.Xss.Builder, com.google.cloud.websecurityscanner.v1alpha.XssOrBuilder> 
+        getXssFieldBuilder() {
+      if (xssBuilder_ == null) {
+        xssBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.Xss, com.google.cloud.websecurityscanner.v1alpha.Xss.Builder, com.google.cloud.websecurityscanner.v1alpha.XssOrBuilder>(
+                getXss(),
+                getParentForChildren(),
+                isClean());
+        xss_ = null;
+      }
+      return xssBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.Finding)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.Finding)
+  private static final com.google.cloud.websecurityscanner.v1alpha.Finding DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.Finding();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.Finding getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public Finding parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Finding(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.Finding getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingAddonProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingAddonProto.java
new file mode 100644
index 000000000000..1252f031c817
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingAddonProto.java
@@ -0,0 +1,102 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding_addon.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public final class FindingAddonProto {
+  private FindingAddonProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_Xss_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_Xss_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n;google/cloud/websecurityscanner/v1alph" +
+      "a/finding_addon.proto\022\'google.cloud.webs" +
+      "ecurityscanner.v1alpha\032\034google/api/annot" +
+      "ations.proto\"Q\n\017OutdatedLibrary\022\024\n\014libra" +
+      "ry_name\030\001 \001(\t\022\017\n\007version\030\002 \001(\t\022\027\n\017learn_" +
+      "more_urls\030\003 \003(\t\"?\n\021ViolatingResource\022\024\n\014" +
+      "content_type\030\001 \001(\t\022\024\n\014resource_url\030\002 \001(\t" +
+      "\"/\n\024VulnerableParameters\022\027\n\017parameter_na" +
+      "mes\030\001 \003(\t\"2\n\003Xss\022\024\n\014stack_traces\030\001 \003(\t\022\025" +
+      "\n\rerror_message\030\002 \001(\tB\235\001\n+com.google.clo" +
+      "ud.websecurityscanner.v1alphaB\021FindingAd" +
+      "donProtoP\001ZYgoogle.golang.org/genproto/g" +
+      "oogleapis/cloud/websecurityscanner/v1alp" +
+      "ha;websecurityscannerb\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.api.AnnotationsProto.getDescriptor(),
+        }, assigner);
+    internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_descriptor,
+        new java.lang.String[] { "LibraryName", "Version", "LearnMoreUrls", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_descriptor,
+        new java.lang.String[] { "ContentType", "ResourceUrl", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_descriptor,
+        new java.lang.String[] { "ParameterNames", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_Xss_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_google_cloud_websecurityscanner_v1alpha_Xss_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_Xss_descriptor,
+        new java.lang.String[] { "StackTraces", "ErrorMessage", });
+    com.google.api.AnnotationsProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingName.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingName.java
new file mode 100644
index 000000000000..ca7999bfc192
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingName.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, 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.
+ */
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.api.resourcenames.ResourceNameType;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class FindingName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/scanConfigs/{scan_config}/scanRuns/{scan_run}/findings/{finding}");
+
+  private volatile Map fieldValuesMap;
+
+  private final String project;
+  private final String scanConfig;
+  private final String scanRun;
+  private final String finding;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getScanConfig() {
+    return scanConfig;
+  }
+
+  public String getScanRun() {
+    return scanRun;
+  }
+
+  public String getFinding() {
+    return finding;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private FindingName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    scanConfig = Preconditions.checkNotNull(builder.getScanConfig());
+    scanRun = Preconditions.checkNotNull(builder.getScanRun());
+    finding = Preconditions.checkNotNull(builder.getFinding());
+  }
+
+  public static FindingName of(String project, String scanConfig, String scanRun, String finding) {
+    return newBuilder()
+      .setProject(project)
+      .setScanConfig(scanConfig)
+      .setScanRun(scanRun)
+      .setFinding(finding)
+      .build();
+  }
+
+  public static String format(String project, String scanConfig, String scanRun, String finding) {
+    return newBuilder()
+      .setProject(project)
+      .setScanConfig(scanConfig)
+      .setScanRun(scanRun)
+      .setFinding(finding)
+      .build()
+      .toString();
+  }
+
+  public static FindingName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map matchMap =
+        PATH_TEMPLATE.validatedMatch(formattedString, "FindingName.parse: formattedString not in valid format");
+    return of(matchMap.get("project"), matchMap.get("scan_config"), matchMap.get("scan_run"), matchMap.get("finding"));
+  }
+
+  public static List parseList(List formattedStrings) {
+    List list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List toStringList(List values) {
+    List list = new ArrayList(values.size());
+    for (FindingName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldMapBuilder.put("scanConfig", scanConfig);
+          fieldMapBuilder.put("scanRun", scanRun);
+          fieldMapBuilder.put("finding", finding);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  /**
+   * @deprecated This method is only present to satisfy the ResourceName interface.
+   */
+  @Deprecated
+  public ResourceNameType getType() {
+    throw new UnsupportedOperationException("FindingName.getType() not supported");
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate("project", project, "scan_config", scanConfig, "scan_run", scanRun, "finding", finding);
+  }
+
+  /** Builder for FindingName. */
+  public static class Builder {
+
+    private String project;
+    private String scanConfig;
+    private String scanRun;
+    private String finding;
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getScanConfig() {
+      return scanConfig;
+    }
+
+    public String getScanRun() {
+      return scanRun;
+    }
+
+    public String getFinding() {
+      return finding;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public Builder setScanConfig(String scanConfig) {
+      this.scanConfig = scanConfig;
+      return this;
+    }
+
+    public Builder setScanRun(String scanRun) {
+      this.scanRun = scanRun;
+      return this;
+    }
+
+    public Builder setFinding(String finding) {
+      this.finding = finding;
+      return this;
+    }
+
+    private Builder() {
+    }
+
+    private Builder(FindingName findingName) {
+      project = findingName.project;
+      scanConfig = findingName.scanConfig;
+      scanRun = findingName.scanRun;
+      finding = findingName.finding;
+    }
+
+    public FindingName build() {
+      return new FindingName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof FindingName) {
+      FindingName that = (FindingName) o;
+      return (this.project.equals(that.project))
+          && (this.scanConfig.equals(that.scanConfig))
+          && (this.scanRun.equals(that.scanRun))
+          && (this.finding.equals(that.finding));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    h *= 1000003;
+    h ^= scanConfig.hashCode();
+    h *= 1000003;
+    h ^= scanRun.hashCode();
+    h *= 1000003;
+    h ^= finding.hashCode();
+    return h;
+  }
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingOrBuilder.java
new file mode 100644
index 000000000000..eab017b868ff
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingOrBuilder.java
@@ -0,0 +1,340 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface FindingOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.Finding)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Output only.
+   * The resource name of the Finding. The name follows the format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanruns/{scanRunId}/findings/{findingId}'.
+   * The finding IDs are generated by the system.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * Output only.
+   * The resource name of the Finding. The name follows the format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanruns/{scanRunId}/findings/{findingId}'.
+   * The finding IDs are generated by the system.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * 
+   * Output only.
+   * The type of the Finding.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 2;
+   */
+  int getFindingTypeValue();
+  /**
+   * 
+   * Output only.
+   * The type of the Finding.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 2;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType getFindingType();
+
+  /**
+   * 
+   * Output only.
+   * The http method of the request that triggered the vulnerability, in
+   * uppercase.
+   * 

+   *
+   * string http_method = 3;
+   */
+  java.lang.String getHttpMethod();
+  /**
+   * 
+   * Output only.
+   * The http method of the request that triggered the vulnerability, in
+   * uppercase.
+   * 

+   *
+   * string http_method = 3;
+   */
+  com.google.protobuf.ByteString
+      getHttpMethodBytes();
+
+  /**
+   * 
+   * Output only.
+   * The URL produced by the server-side fuzzer and used in the request that
+   * triggered the vulnerability.
+   * 

+   *
+   * string fuzzed_url = 4;
+   */
+  java.lang.String getFuzzedUrl();
+  /**
+   * 
+   * Output only.
+   * The URL produced by the server-side fuzzer and used in the request that
+   * triggered the vulnerability.
+   * 

+   *
+   * string fuzzed_url = 4;
+   */
+  com.google.protobuf.ByteString
+      getFuzzedUrlBytes();
+
+  /**
+   * 
+   * Output only.
+   * The body of the request that triggered the vulnerability.
+   * 

+   *
+   * string body = 5;
+   */
+  java.lang.String getBody();
+  /**
+   * 
+   * Output only.
+   * The body of the request that triggered the vulnerability.
+   * 

+   *
+   * string body = 5;
+   */
+  com.google.protobuf.ByteString
+      getBodyBytes();
+
+  /**
+   * 
+   * Output only.
+   * The description of the vulnerability.
+   * 

+   *
+   * string description = 6;
+   */
+  java.lang.String getDescription();
+  /**
+   * 
+   * Output only.
+   * The description of the vulnerability.
+   * 

+   *
+   * string description = 6;
+   */
+  com.google.protobuf.ByteString
+      getDescriptionBytes();
+
+  /**
+   * 
+   * Output only.
+   * The URL containing human-readable payload that user can leverage to
+   * reproduce the vulnerability.
+   * 

+   *
+   * string reproduction_url = 7;
+   */
+  java.lang.String getReproductionUrl();
+  /**
+   * 
+   * Output only.
+   * The URL containing human-readable payload that user can leverage to
+   * reproduce the vulnerability.
+   * 

+   *
+   * string reproduction_url = 7;
+   */
+  com.google.protobuf.ByteString
+      getReproductionUrlBytes();
+
+  /**
+   * 
+   * Output only.
+   * If the vulnerability was originated from nested IFrame, the immediate
+   * parent IFrame is reported.
+   * 

+   *
+   * string frame_url = 8;
+   */
+  java.lang.String getFrameUrl();
+  /**
+   * 
+   * Output only.
+   * If the vulnerability was originated from nested IFrame, the immediate
+   * parent IFrame is reported.
+   * 

+   *
+   * string frame_url = 8;
+   */
+  com.google.protobuf.ByteString
+      getFrameUrlBytes();
+
+  /**
+   * 
+   * Output only.
+   * The URL where the browser lands when the vulnerability is detected.
+   * 

+   *
+   * string final_url = 9;
+   */
+  java.lang.String getFinalUrl();
+  /**
+   * 
+   * Output only.
+   * The URL where the browser lands when the vulnerability is detected.
+   * 

+   *
+   * string final_url = 9;
+   */
+  com.google.protobuf.ByteString
+      getFinalUrlBytes();
+
+  /**
+   * 
+   * Output only.
+   * The tracking ID uniquely identifies a vulnerability instance across
+   * multiple ScanRuns.
+   * 

+   *
+   * string tracking_id = 10;
+   */
+  java.lang.String getTrackingId();
+  /**
+   * 
+   * Output only.
+   * The tracking ID uniquely identifies a vulnerability instance across
+   * multiple ScanRuns.
+   * 

+   *
+   * string tracking_id = 10;
+   */
+  com.google.protobuf.ByteString
+      getTrackingIdBytes();
+
+  /**
+   * 
+   * Output only.
+   * An addon containing information about outdated libraries.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+   */
+  boolean hasOutdatedLibrary();
+  /**
+   * 
+   * Output only.
+   * An addon containing information about outdated libraries.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary getOutdatedLibrary();
+  /**
+   * 
+   * Output only.
+   * An addon containing information about outdated libraries.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.OutdatedLibrary outdated_library = 11;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.OutdatedLibraryOrBuilder getOutdatedLibraryOrBuilder();
+
+  /**
+   * 
+   * Output only.
+   * An addon containing detailed information regarding any resource causing the
+   * vulnerability such as JavaScript sources, image, audio files, etc.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+   */
+  boolean hasViolatingResource();
+  /**
+   * 
+   * Output only.
+   * An addon containing detailed information regarding any resource causing the
+   * vulnerability such as JavaScript sources, image, audio files, etc.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ViolatingResource getViolatingResource();
+  /**
+   * 
+   * Output only.
+   * An addon containing detailed information regarding any resource causing the
+   * vulnerability such as JavaScript sources, image, audio files, etc.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ViolatingResource violating_resource = 12;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ViolatingResourceOrBuilder getViolatingResourceOrBuilder();
+
+  /**
+   * 
+   * Output only.
+   * An addon containing information about request parameters which were found
+   * to be vulnerable.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+   */
+  boolean hasVulnerableParameters();
+  /**
+   * 
+   * Output only.
+   * An addon containing information about request parameters which were found
+   * to be vulnerable.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters getVulnerableParameters();
+  /**
+   * 
+   * Output only.
+   * An addon containing information about request parameters which were found
+   * to be vulnerable.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.VulnerableParameters vulnerable_parameters = 13;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.VulnerableParametersOrBuilder getVulnerableParametersOrBuilder();
+
+  /**
+   * 
+   * Output only.
+   * An addon containing information reported for an XSS, if any.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+   */
+  boolean hasXss();
+  /**
+   * 
+   * Output only.
+   * An addon containing information reported for an XSS, if any.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.Xss getXss();
+  /**
+   * 
+   * Output only.
+   * An addon containing information reported for an XSS, if any.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Xss xss = 14;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.XssOrBuilder getXssOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingProto.java
new file mode 100644
index 000000000000..5e456375cbbe
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingProto.java
@@ -0,0 +1,85 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public final class FindingProto {
+  private FindingProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_Finding_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_Finding_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n5google/cloud/websecurityscanner/v1alph" +
+      "a/finding.proto\022\'google.cloud.websecurit" +
+      "yscanner.v1alpha\032\034google/api/annotations" +
+      ".proto\032;google/cloud/websecurityscanner/" +
+      "v1alpha/finding_addon.proto\"\365\005\n\007Finding\022" +
+      "\014\n\004name\030\001 \001(\t\022R\n\014finding_type\030\002 \001(\0162<.go" +
+      "ogle.cloud.websecurityscanner.v1alpha.Fi" +
+      "nding.FindingType\022\023\n\013http_method\030\003 \001(\t\022\022" +
+      "\n\nfuzzed_url\030\004 \001(\t\022\014\n\004body\030\005 \001(\t\022\023\n\013desc" +
+      "ription\030\006 \001(\t\022\030\n\020reproduction_url\030\007 \001(\t\022" +
+      "\021\n\tframe_url\030\010 \001(\t\022\021\n\tfinal_url\030\t \001(\t\022\023\n" +
+      "\013tracking_id\030\n \001(\t\022R\n\020outdated_library\030\013" +
+      " \001(\01328.google.cloud.websecurityscanner.v" +
+      "1alpha.OutdatedLibrary\022V\n\022violating_reso" +
+      "urce\030\014 \001(\0132:.google.cloud.websecuritysca" +
+      "nner.v1alpha.ViolatingResource\022\\\n\025vulner" +
+      "able_parameters\030\r \001(\0132=.google.cloud.web" +
+      "securityscanner.v1alpha.VulnerableParame" +
+      "ters\0229\n\003xss\030\016 \001(\0132,.google.cloud.websecu" +
+      "rityscanner.v1alpha.Xss\"\241\001\n\013FindingType\022" +
+      "\034\n\030FINDING_TYPE_UNSPECIFIED\020\000\022\021\n\rMIXED_C" +
+      "ONTENT\020\001\022\024\n\020OUTDATED_LIBRARY\020\002\022\021\n\rROSETT" +
+      "A_FLASH\020\005\022\020\n\014XSS_CALLBACK\020\003\022\r\n\tXSS_ERROR" +
+      "\020\004\022\027\n\023CLEAR_TEXT_PASSWORD\020\006B\230\001\n+com.goog" +
+      "le.cloud.websecurityscanner.v1alphaB\014Fin" +
+      "dingProtoP\001ZYgoogle.golang.org/genproto/" +
+      "googleapis/cloud/websecurityscanner/v1al" +
+      "pha;websecurityscannerb\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.api.AnnotationsProto.getDescriptor(),
+          com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.getDescriptor(),
+        }, assigner);
+    internal_static_google_cloud_websecurityscanner_v1alpha_Finding_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_cloud_websecurityscanner_v1alpha_Finding_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_Finding_descriptor,
+        new java.lang.String[] { "Name", "FindingType", "HttpMethod", "FuzzedUrl", "Body", "Description", "ReproductionUrl", "FrameUrl", "FinalUrl", "TrackingId", "OutdatedLibrary", "ViolatingResource", "VulnerableParameters", "Xss", });
+    com.google.api.AnnotationsProto.getDescriptor();
+    com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStats.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStats.java
new file mode 100644
index 000000000000..ea62d55e4765
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStats.java
@@ -0,0 +1,595 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * A FindingTypeStats resource represents stats regarding a specific FindingType
+ * of Findings under a given ScanRun.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.FindingTypeStats}
+ */
+public  final class FindingTypeStats extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.FindingTypeStats)
+    FindingTypeStatsOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use FindingTypeStats.newBuilder() to construct.
+  private FindingTypeStats(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private FindingTypeStats() {
+    findingType_ = 0;
+    findingCount_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private FindingTypeStats(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            findingType_ = rawValue;
+            break;
+          }
+          case 16: {
+
+            findingCount_ = input.readInt32();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsProto.internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsProto.internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.class, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.Builder.class);
+  }
+
+  public static final int FINDING_TYPE_FIELD_NUMBER = 1;
+  private int findingType_;
+  /**
+   * 
+   * Output only.
+   * The finding type associated with the stats.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 1;
+   */
+  public int getFindingTypeValue() {
+    return findingType_;
+  }
+  /**
+   * 
+   * Output only.
+   * The finding type associated with the stats.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 1;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType getFindingType() {
+    com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType result = com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.valueOf(findingType_);
+    return result == null ? com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.UNRECOGNIZED : result;
+  }
+
+  public static final int FINDING_COUNT_FIELD_NUMBER = 2;
+  private int findingCount_;
+  /**
+   * 
+   * Output only.
+   * The count of findings belonging to this finding type.
+   * 

+   *
+   * int32 finding_count = 2;
+   */
+  public int getFindingCount() {
+    return findingCount_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (findingType_ != com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.FINDING_TYPE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(1, findingType_);
+    }
+    if (findingCount_ != 0) {
+      output.writeInt32(2, findingCount_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (findingType_ != com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.FINDING_TYPE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(1, findingType_);
+    }
+    if (findingCount_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(2, findingCount_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats other = (com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats) obj;
+
+    boolean result = true;
+    result = result && findingType_ == other.findingType_;
+    result = result && (getFindingCount()
+        == other.getFindingCount());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + FINDING_TYPE_FIELD_NUMBER;
+    hash = (53 * hash) + findingType_;
+    hash = (37 * hash) + FINDING_COUNT_FIELD_NUMBER;
+    hash = (53 * hash) + getFindingCount();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * A FindingTypeStats resource represents stats regarding a specific FindingType
+   * of Findings under a given ScanRun.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.FindingTypeStats}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.FindingTypeStats)
+      com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsProto.internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsProto.internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.class, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      findingType_ = 0;
+
+      findingCount_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsProto.internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats build() {
+      com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats result = new com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats(this);
+      result.findingType_ = findingType_;
+      result.findingCount_ = findingCount_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.getDefaultInstance()) return this;
+      if (other.findingType_ != 0) {
+        setFindingTypeValue(other.getFindingTypeValue());
+      }
+      if (other.getFindingCount() != 0) {
+        setFindingCount(other.getFindingCount());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int findingType_ = 0;
+    /**
+     * 
+     * Output only.
+     * The finding type associated with the stats.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 1;
+     */
+    public int getFindingTypeValue() {
+      return findingType_;
+    }
+    /**
+     * 
+     * Output only.
+     * The finding type associated with the stats.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 1;
+     */
+    public Builder setFindingTypeValue(int value) {
+      findingType_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The finding type associated with the stats.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType getFindingType() {
+      com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType result = com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.valueOf(findingType_);
+      return result == null ? com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.UNRECOGNIZED : result;
+    }
+    /**
+     * 
+     * Output only.
+     * The finding type associated with the stats.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 1;
+     */
+    public Builder setFindingType(com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      findingType_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The finding type associated with the stats.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 1;
+     */
+    public Builder clearFindingType() {
+      
+      findingType_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private int findingCount_ ;
+    /**
+     * 
+     * Output only.
+     * The count of findings belonging to this finding type.
+     * 

+     *
+     * int32 finding_count = 2;
+     */
+    public int getFindingCount() {
+      return findingCount_;
+    }
+    /**
+     * 
+     * Output only.
+     * The count of findings belonging to this finding type.
+     * 

+     *
+     * int32 finding_count = 2;
+     */
+    public Builder setFindingCount(int value) {
+      
+      findingCount_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The count of findings belonging to this finding type.
+     * 

+     *
+     * int32 finding_count = 2;
+     */
+    public Builder clearFindingCount() {
+      
+      findingCount_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.FindingTypeStats)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.FindingTypeStats)
+  private static final com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public FindingTypeStats parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new FindingTypeStats(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsOrBuilder.java
new file mode 100644
index 000000000000..b03c7a8f3da4
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsOrBuilder.java
@@ -0,0 +1,38 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface FindingTypeStatsOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.FindingTypeStats)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Output only.
+   * The finding type associated with the stats.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 1;
+   */
+  int getFindingTypeValue();
+  /**
+   * 
+   * Output only.
+   * The finding type associated with the stats.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 1;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType getFindingType();
+
+  /**
+   * 
+   * Output only.
+   * The count of findings belonging to this finding type.
+   * 

+   *
+   * int32 finding_count = 2;
+   */
+  int getFindingCount();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsProto.java
new file mode 100644
index 000000000000..d5309ac0ab9f
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsProto.java
@@ -0,0 +1,70 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public final class FindingTypeStatsProto {
+  private FindingTypeStatsProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n@google/cloud/websecurityscanner/v1alph" +
+      "a/finding_type_stats.proto\022\'google.cloud" +
+      ".websecurityscanner.v1alpha\032\034google/api/" +
+      "annotations.proto\0325google/cloud/websecur" +
+      "ityscanner/v1alpha/finding.proto\"}\n\020Find" +
+      "ingTypeStats\022R\n\014finding_type\030\001 \001(\0162<.goo" +
+      "gle.cloud.websecurityscanner.v1alpha.Fin" +
+      "ding.FindingType\022\025\n\rfinding_count\030\002 \001(\005B" +
+      "\241\001\n+com.google.cloud.websecurityscanner." +
+      "v1alphaB\025FindingTypeStatsProtoP\001ZYgoogle" +
+      ".golang.org/genproto/googleapis/cloud/we" +
+      "bsecurityscanner/v1alpha;websecurityscan" +
+      "nerb\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.api.AnnotationsProto.getDescriptor(),
+          com.google.cloud.websecurityscanner.v1alpha.FindingProto.getDescriptor(),
+        }, assigner);
+    internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_descriptor,
+        new java.lang.String[] { "FindingType", "FindingCount", });
+    com.google.api.AnnotationsProto.getDescriptor();
+    com.google.cloud.websecurityscanner.v1alpha.FindingProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequest.java
new file mode 100644
index 000000000000..addbdb521a1d
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequest.java
@@ -0,0 +1,573 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `GetFinding` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.GetFindingRequest}
+ */
+public  final class GetFindingRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.GetFindingRequest)
+    GetFindingRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use GetFindingRequest.newBuilder() to construct.
+  private GetFindingRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private GetFindingRequest() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private GetFindingRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest.class, com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * Required.
+   * The resource name of the Finding to be returned. The name follows the
+   * format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}/findings/{findingId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The resource name of the Finding to be returned. The name follows the
+   * format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}/findings/{findingId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest other = (com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `GetFinding` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.GetFindingRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.GetFindingRequest)
+      com.google.cloud.websecurityscanner.v1alpha.GetFindingRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest.class, com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest result = new com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest(this);
+      result.name_ = name_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * Required.
+     * The resource name of the Finding to be returned. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}/findings/{findingId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the Finding to be returned. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}/findings/{findingId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the Finding to be returned. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}/findings/{findingId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the Finding to be returned. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}/findings/{findingId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the Finding to be returned. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}/findings/{findingId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.GetFindingRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.GetFindingRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public GetFindingRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new GetFindingRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequestOrBuilder.java
new file mode 100644
index 000000000000..08efb3611e3f
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequestOrBuilder.java
@@ -0,0 +1,33 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface GetFindingRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.GetFindingRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The resource name of the Finding to be returned. The name follows the
+   * format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}/findings/{findingId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * Required.
+   * The resource name of the Finding to be returned. The name follows the
+   * format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}/findings/{findingId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequest.java
new file mode 100644
index 000000000000..ad10f3992be6
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequest.java
@@ -0,0 +1,566 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `GetScanConfig` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest}
+ */
+public  final class GetScanConfigRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest)
+    GetScanConfigRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use GetScanConfigRequest.newBuilder() to construct.
+  private GetScanConfigRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private GetScanConfigRequest() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private GetScanConfigRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest.class, com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanConfig to be returned. The name follows the
+   * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanConfig to be returned. The name follows the
+   * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest other = (com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `GetScanConfig` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest)
+      com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest.class, com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest result = new com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest(this);
+      result.name_ = name_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be returned. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be returned. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be returned. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be returned. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be returned. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public GetScanConfigRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new GetScanConfigRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequestOrBuilder.java
new file mode 100644
index 000000000000..6dceaab2631f
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequestOrBuilder.java
@@ -0,0 +1,31 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface GetScanConfigRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanConfig to be returned. The name follows the
+   * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanConfig to be returned. The name follows the
+   * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequest.java
new file mode 100644
index 000000000000..19cc53e6ddec
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequest.java
@@ -0,0 +1,573 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `GetScanRun` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.GetScanRunRequest}
+ */
+public  final class GetScanRunRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.GetScanRunRequest)
+    GetScanRunRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use GetScanRunRequest.newBuilder() to construct.
+  private GetScanRunRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private GetScanRunRequest() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private GetScanRunRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest.class, com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanRun to be returned. The name follows the
+   * format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanRun to be returned. The name follows the
+   * format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest other = (com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `GetScanRun` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.GetScanRunRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.GetScanRunRequest)
+      com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest.class, com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest result = new com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest(this);
+      result.name_ = name_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanRun to be returned. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanRun to be returned. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanRun to be returned. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanRun to be returned. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanRun to be returned. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.GetScanRunRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.GetScanRunRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public GetScanRunRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new GetScanRunRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequestOrBuilder.java
new file mode 100644
index 000000000000..2f788452ad90
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequestOrBuilder.java
@@ -0,0 +1,33 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface GetScanRunRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.GetScanRunRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanRun to be returned. The name follows the
+   * format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanRun to be returned. The name follows the
+   * format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequest.java
new file mode 100644
index 000000000000..c253351658b7
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequest.java
@@ -0,0 +1,824 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `ListCrawledUrls` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest}
+ */
+public  final class ListCrawledUrlsRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest)
+    ListCrawledUrlsRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListCrawledUrlsRequest.newBuilder() to construct.
+  private ListCrawledUrlsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListCrawledUrlsRequest() {
+    parent_ = "";
+    pageToken_ = "";
+    pageSize_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListCrawledUrlsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            pageToken_ = s;
+            break;
+          }
+          case 24: {
+
+            pageSize_ = input.readInt32();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest.class, com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest.Builder.class);
+  }
+
+  public static final int PARENT_FIELD_NUMBER = 1;
+  private volatile java.lang.Object parent_;
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan run resource name in the
+   * format
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  public java.lang.String getParent() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      parent_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan run resource name in the
+   * format
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParentBytes() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      parent_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PAGE_TOKEN_FIELD_NUMBER = 2;
+  private volatile java.lang.Object pageToken_;
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 2;
+   */
+  public java.lang.String getPageToken() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      pageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 2;
+   */
+  public com.google.protobuf.ByteString
+      getPageTokenBytes() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      pageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PAGE_SIZE_FIELD_NUMBER = 3;
+  private int pageSize_;
+  /**
+   * 
+   * The maximum number of CrawledUrls to return, can be limited by server.
+   * If not specified or not positive, the implementation will select a
+   * reasonable value.
+   * 

+   *
+   * int32 page_size = 3;
+   */
+  public int getPageSize() {
+    return pageSize_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getParentBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, pageToken_);
+    }
+    if (pageSize_ != 0) {
+      output.writeInt32(3, pageSize_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getParentBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, pageToken_);
+    }
+    if (pageSize_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(3, pageSize_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest other = (com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest) obj;
+
+    boolean result = true;
+    result = result && getParent()
+        .equals(other.getParent());
+    result = result && getPageToken()
+        .equals(other.getPageToken());
+    result = result && (getPageSize()
+        == other.getPageSize());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PARENT_FIELD_NUMBER;
+    hash = (53 * hash) + getParent().hashCode();
+    hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getPageToken().hashCode();
+    hash = (37 * hash) + PAGE_SIZE_FIELD_NUMBER;
+    hash = (53 * hash) + getPageSize();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `ListCrawledUrls` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest)
+      com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest.class, com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parent_ = "";
+
+      pageToken_ = "";
+
+      pageSize_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest result = new com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest(this);
+      result.parent_ = parent_;
+      result.pageToken_ = pageToken_;
+      result.pageSize_ = pageSize_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest.getDefaultInstance()) return this;
+      if (!other.getParent().isEmpty()) {
+        parent_ = other.parent_;
+        onChanged();
+      }
+      if (!other.getPageToken().isEmpty()) {
+        pageToken_ = other.pageToken_;
+        onChanged();
+      }
+      if (other.getPageSize() != 0) {
+        setPageSize(other.getPageSize());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object parent_ = "";
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public java.lang.String getParent() {
+      java.lang.Object ref = parent_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        parent_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParentBytes() {
+      java.lang.Object ref = parent_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        parent_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParent(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder clearParent() {
+      
+      parent_ = getDefaultInstance().getParent();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParentBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object pageToken_ = "";
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public java.lang.String getPageToken() {
+      java.lang.Object ref = pageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        pageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public com.google.protobuf.ByteString
+        getPageTokenBytes() {
+      java.lang.Object ref = pageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public Builder setPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public Builder clearPageToken() {
+      
+      pageToken_ = getDefaultInstance().getPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public Builder setPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int pageSize_ ;
+    /**
+     * 
+     * The maximum number of CrawledUrls to return, can be limited by server.
+     * If not specified or not positive, the implementation will select a
+     * reasonable value.
+     * 

+     *
+     * int32 page_size = 3;
+     */
+    public int getPageSize() {
+      return pageSize_;
+    }
+    /**
+     * 
+     * The maximum number of CrawledUrls to return, can be limited by server.
+     * If not specified or not positive, the implementation will select a
+     * reasonable value.
+     * 

+     *
+     * int32 page_size = 3;
+     */
+    public Builder setPageSize(int value) {
+      
+      pageSize_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The maximum number of CrawledUrls to return, can be limited by server.
+     * If not specified or not positive, the implementation will select a
+     * reasonable value.
+     * 

+     *
+     * int32 page_size = 3;
+     */
+    public Builder clearPageSize() {
+      
+      pageSize_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListCrawledUrlsRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListCrawledUrlsRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequestOrBuilder.java
new file mode 100644
index 000000000000..521f2c64cd17
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequestOrBuilder.java
@@ -0,0 +1,66 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ListCrawledUrlsRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan run resource name in the
+   * format
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  java.lang.String getParent();
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan run resource name in the
+   * format
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  com.google.protobuf.ByteString
+      getParentBytes();
+
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 2;
+   */
+  java.lang.String getPageToken();
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 2;
+   */
+  com.google.protobuf.ByteString
+      getPageTokenBytes();
+
+  /**
+   * 
+   * The maximum number of CrawledUrls to return, can be limited by server.
+   * If not specified or not positive, the implementation will select a
+   * reasonable value.
+   * 

+   *
+   * int32 page_size = 3;
+   */
+  int getPageSize();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponse.java
new file mode 100644
index 000000000000..38907231b551
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponse.java
@@ -0,0 +1,999 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Response for the `ListCrawledUrls` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse}
+ */
+public  final class ListCrawledUrlsResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse)
+    ListCrawledUrlsResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListCrawledUrlsResponse.newBuilder() to construct.
+  private ListCrawledUrlsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListCrawledUrlsResponse() {
+    crawledUrls_ = java.util.Collections.emptyList();
+    nextPageToken_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListCrawledUrlsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              crawledUrls_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            crawledUrls_.add(
+                input.readMessage(com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.parser(), extensionRegistry));
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            nextPageToken_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        crawledUrls_ = java.util.Collections.unmodifiableList(crawledUrls_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse.class, com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int CRAWLED_URLS_FIELD_NUMBER = 1;
+  private java.util.List crawledUrls_;
+  /**
+   * 
+   * The list of CrawledUrls returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+   */
+  public java.util.List getCrawledUrlsList() {
+    return crawledUrls_;
+  }
+  /**
+   * 
+   * The list of CrawledUrls returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+   */
+  public java.util.List 
+      getCrawledUrlsOrBuilderList() {
+    return crawledUrls_;
+  }
+  /**
+   * 
+   * The list of CrawledUrls returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+   */
+  public int getCrawledUrlsCount() {
+    return crawledUrls_.size();
+  }
+  /**
+   * 
+   * The list of CrawledUrls returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl getCrawledUrls(int index) {
+    return crawledUrls_.get(index);
+  }
+  /**
+   * 
+   * The list of CrawledUrls returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.CrawledUrlOrBuilder getCrawledUrlsOrBuilder(
+      int index) {
+    return crawledUrls_.get(index);
+  }
+
+  public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
+  private volatile java.lang.Object nextPageToken_;
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public java.lang.String getNextPageToken() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      nextPageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public com.google.protobuf.ByteString
+      getNextPageTokenBytes() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      nextPageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < crawledUrls_.size(); i++) {
+      output.writeMessage(1, crawledUrls_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < crawledUrls_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, crawledUrls_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse other = (com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse) obj;
+
+    boolean result = true;
+    result = result && getCrawledUrlsList()
+        .equals(other.getCrawledUrlsList());
+    result = result && getNextPageToken()
+        .equals(other.getNextPageToken());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getCrawledUrlsCount() > 0) {
+      hash = (37 * hash) + CRAWLED_URLS_FIELD_NUMBER;
+      hash = (53 * hash) + getCrawledUrlsList().hashCode();
+    }
+    hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getNextPageToken().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Response for the `ListCrawledUrls` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse)
+      com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse.class, com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getCrawledUrlsFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (crawledUrlsBuilder_ == null) {
+        crawledUrls_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        crawledUrlsBuilder_.clear();
+      }
+      nextPageToken_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse build() {
+      com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse result = new com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (crawledUrlsBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          crawledUrls_ = java.util.Collections.unmodifiableList(crawledUrls_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.crawledUrls_ = crawledUrls_;
+      } else {
+        result.crawledUrls_ = crawledUrlsBuilder_.build();
+      }
+      result.nextPageToken_ = nextPageToken_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse.getDefaultInstance()) return this;
+      if (crawledUrlsBuilder_ == null) {
+        if (!other.crawledUrls_.isEmpty()) {
+          if (crawledUrls_.isEmpty()) {
+            crawledUrls_ = other.crawledUrls_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureCrawledUrlsIsMutable();
+            crawledUrls_.addAll(other.crawledUrls_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.crawledUrls_.isEmpty()) {
+          if (crawledUrlsBuilder_.isEmpty()) {
+            crawledUrlsBuilder_.dispose();
+            crawledUrlsBuilder_ = null;
+            crawledUrls_ = other.crawledUrls_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            crawledUrlsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getCrawledUrlsFieldBuilder() : null;
+          } else {
+            crawledUrlsBuilder_.addAllMessages(other.crawledUrls_);
+          }
+        }
+      }
+      if (!other.getNextPageToken().isEmpty()) {
+        nextPageToken_ = other.nextPageToken_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List crawledUrls_ =
+      java.util.Collections.emptyList();
+    private void ensureCrawledUrlsIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        crawledUrls_ = new java.util.ArrayList(crawledUrls_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.CrawledUrl, com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.Builder, com.google.cloud.websecurityscanner.v1alpha.CrawledUrlOrBuilder> crawledUrlsBuilder_;
+
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public java.util.List getCrawledUrlsList() {
+      if (crawledUrlsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(crawledUrls_);
+      } else {
+        return crawledUrlsBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public int getCrawledUrlsCount() {
+      if (crawledUrlsBuilder_ == null) {
+        return crawledUrls_.size();
+      } else {
+        return crawledUrlsBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl getCrawledUrls(int index) {
+      if (crawledUrlsBuilder_ == null) {
+        return crawledUrls_.get(index);
+      } else {
+        return crawledUrlsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public Builder setCrawledUrls(
+        int index, com.google.cloud.websecurityscanner.v1alpha.CrawledUrl value) {
+      if (crawledUrlsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureCrawledUrlsIsMutable();
+        crawledUrls_.set(index, value);
+        onChanged();
+      } else {
+        crawledUrlsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public Builder setCrawledUrls(
+        int index, com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.Builder builderForValue) {
+      if (crawledUrlsBuilder_ == null) {
+        ensureCrawledUrlsIsMutable();
+        crawledUrls_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        crawledUrlsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public Builder addCrawledUrls(com.google.cloud.websecurityscanner.v1alpha.CrawledUrl value) {
+      if (crawledUrlsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureCrawledUrlsIsMutable();
+        crawledUrls_.add(value);
+        onChanged();
+      } else {
+        crawledUrlsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public Builder addCrawledUrls(
+        int index, com.google.cloud.websecurityscanner.v1alpha.CrawledUrl value) {
+      if (crawledUrlsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureCrawledUrlsIsMutable();
+        crawledUrls_.add(index, value);
+        onChanged();
+      } else {
+        crawledUrlsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public Builder addCrawledUrls(
+        com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.Builder builderForValue) {
+      if (crawledUrlsBuilder_ == null) {
+        ensureCrawledUrlsIsMutable();
+        crawledUrls_.add(builderForValue.build());
+        onChanged();
+      } else {
+        crawledUrlsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public Builder addCrawledUrls(
+        int index, com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.Builder builderForValue) {
+      if (crawledUrlsBuilder_ == null) {
+        ensureCrawledUrlsIsMutable();
+        crawledUrls_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        crawledUrlsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public Builder addAllCrawledUrls(
+        java.lang.Iterable values) {
+      if (crawledUrlsBuilder_ == null) {
+        ensureCrawledUrlsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, crawledUrls_);
+        onChanged();
+      } else {
+        crawledUrlsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public Builder clearCrawledUrls() {
+      if (crawledUrlsBuilder_ == null) {
+        crawledUrls_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        crawledUrlsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public Builder removeCrawledUrls(int index) {
+      if (crawledUrlsBuilder_ == null) {
+        ensureCrawledUrlsIsMutable();
+        crawledUrls_.remove(index);
+        onChanged();
+      } else {
+        crawledUrlsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.Builder getCrawledUrlsBuilder(
+        int index) {
+      return getCrawledUrlsFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.CrawledUrlOrBuilder getCrawledUrlsOrBuilder(
+        int index) {
+      if (crawledUrlsBuilder_ == null) {
+        return crawledUrls_.get(index);  } else {
+        return crawledUrlsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public java.util.List 
+         getCrawledUrlsOrBuilderList() {
+      if (crawledUrlsBuilder_ != null) {
+        return crawledUrlsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(crawledUrls_);
+      }
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.Builder addCrawledUrlsBuilder() {
+      return getCrawledUrlsFieldBuilder().addBuilder(
+          com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.getDefaultInstance());
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.Builder addCrawledUrlsBuilder(
+        int index) {
+      return getCrawledUrlsFieldBuilder().addBuilder(
+          index, com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.getDefaultInstance());
+    }
+    /**
+     * 
+     * The list of CrawledUrls returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+     */
+    public java.util.List 
+         getCrawledUrlsBuilderList() {
+      return getCrawledUrlsFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.CrawledUrl, com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.Builder, com.google.cloud.websecurityscanner.v1alpha.CrawledUrlOrBuilder> 
+        getCrawledUrlsFieldBuilder() {
+      if (crawledUrlsBuilder_ == null) {
+        crawledUrlsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.CrawledUrl, com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.Builder, com.google.cloud.websecurityscanner.v1alpha.CrawledUrlOrBuilder>(
+                crawledUrls_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        crawledUrls_ = null;
+      }
+      return crawledUrlsBuilder_;
+    }
+
+    private java.lang.Object nextPageToken_ = "";
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public java.lang.String getNextPageToken() {
+      java.lang.Object ref = nextPageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        nextPageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public com.google.protobuf.ByteString
+        getNextPageTokenBytes() {
+      java.lang.Object ref = nextPageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        nextPageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder clearNextPageToken() {
+      
+      nextPageToken_ = getDefaultInstance().getNextPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListCrawledUrlsResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListCrawledUrlsResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponseOrBuilder.java
new file mode 100644
index 000000000000..16cdf1b70a44
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponseOrBuilder.java
@@ -0,0 +1,73 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ListCrawledUrlsResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The list of CrawledUrls returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+   */
+  java.util.List 
+      getCrawledUrlsList();
+  /**
+   * 
+   * The list of CrawledUrls returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.CrawledUrl getCrawledUrls(int index);
+  /**
+   * 
+   * The list of CrawledUrls returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+   */
+  int getCrawledUrlsCount();
+  /**
+   * 
+   * The list of CrawledUrls returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+   */
+  java.util.List 
+      getCrawledUrlsOrBuilderList();
+  /**
+   * 
+   * The list of CrawledUrls returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.CrawledUrl crawled_urls = 1;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.CrawledUrlOrBuilder getCrawledUrlsOrBuilder(
+      int index);
+
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  java.lang.String getNextPageToken();
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  com.google.protobuf.ByteString
+      getNextPageTokenBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequest.java
new file mode 100644
index 000000000000..5203f54361cd
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequest.java
@@ -0,0 +1,573 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `ListFindingTypeStats` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest}
+ */
+public  final class ListFindingTypeStatsRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest)
+    ListFindingTypeStatsRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListFindingTypeStatsRequest.newBuilder() to construct.
+  private ListFindingTypeStatsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListFindingTypeStatsRequest() {
+    parent_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListFindingTypeStatsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest.class, com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest.Builder.class);
+  }
+
+  public static final int PARENT_FIELD_NUMBER = 1;
+  private volatile java.lang.Object parent_;
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan run resource name in the
+   * format
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  public java.lang.String getParent() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      parent_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan run resource name in the
+   * format
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParentBytes() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      parent_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getParentBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getParentBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest other = (com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest) obj;
+
+    boolean result = true;
+    result = result && getParent()
+        .equals(other.getParent());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PARENT_FIELD_NUMBER;
+    hash = (53 * hash) + getParent().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `ListFindingTypeStats` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest)
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest.class, com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parent_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest result = new com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest(this);
+      result.parent_ = parent_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest.getDefaultInstance()) return this;
+      if (!other.getParent().isEmpty()) {
+        parent_ = other.parent_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object parent_ = "";
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public java.lang.String getParent() {
+      java.lang.Object ref = parent_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        parent_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParentBytes() {
+      java.lang.Object ref = parent_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        parent_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParent(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder clearParent() {
+      
+      parent_ = getDefaultInstance().getParent();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParentBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListFindingTypeStatsRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListFindingTypeStatsRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequestOrBuilder.java
new file mode 100644
index 000000000000..b6385013dc43
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequestOrBuilder.java
@@ -0,0 +1,33 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ListFindingTypeStatsRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan run resource name in the
+   * format
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  java.lang.String getParent();
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan run resource name in the
+   * format
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  com.google.protobuf.ByteString
+      getParentBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponse.java
new file mode 100644
index 000000000000..55d2f451e6c2
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponse.java
@@ -0,0 +1,834 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Response for the `ListFindingTypeStats` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse}
+ */
+public  final class ListFindingTypeStatsResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse)
+    ListFindingTypeStatsResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListFindingTypeStatsResponse.newBuilder() to construct.
+  private ListFindingTypeStatsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListFindingTypeStatsResponse() {
+    findingTypeStats_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListFindingTypeStatsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              findingTypeStats_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            findingTypeStats_.add(
+                input.readMessage(com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.parser(), extensionRegistry));
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        findingTypeStats_ = java.util.Collections.unmodifiableList(findingTypeStats_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse.class, com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse.Builder.class);
+  }
+
+  public static final int FINDING_TYPE_STATS_FIELD_NUMBER = 1;
+  private java.util.List findingTypeStats_;
+  /**
+   * 
+   * The list of FindingTypeStats returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+   */
+  public java.util.List getFindingTypeStatsList() {
+    return findingTypeStats_;
+  }
+  /**
+   * 
+   * The list of FindingTypeStats returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+   */
+  public java.util.List 
+      getFindingTypeStatsOrBuilderList() {
+    return findingTypeStats_;
+  }
+  /**
+   * 
+   * The list of FindingTypeStats returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+   */
+  public int getFindingTypeStatsCount() {
+    return findingTypeStats_.size();
+  }
+  /**
+   * 
+   * The list of FindingTypeStats returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats getFindingTypeStats(int index) {
+    return findingTypeStats_.get(index);
+  }
+  /**
+   * 
+   * The list of FindingTypeStats returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsOrBuilder getFindingTypeStatsOrBuilder(
+      int index) {
+    return findingTypeStats_.get(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < findingTypeStats_.size(); i++) {
+      output.writeMessage(1, findingTypeStats_.get(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < findingTypeStats_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, findingTypeStats_.get(i));
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse other = (com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse) obj;
+
+    boolean result = true;
+    result = result && getFindingTypeStatsList()
+        .equals(other.getFindingTypeStatsList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getFindingTypeStatsCount() > 0) {
+      hash = (37 * hash) + FINDING_TYPE_STATS_FIELD_NUMBER;
+      hash = (53 * hash) + getFindingTypeStatsList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Response for the `ListFindingTypeStats` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse)
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse.class, com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getFindingTypeStatsFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (findingTypeStatsBuilder_ == null) {
+        findingTypeStats_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        findingTypeStatsBuilder_.clear();
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse build() {
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse result = new com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse(this);
+      int from_bitField0_ = bitField0_;
+      if (findingTypeStatsBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          findingTypeStats_ = java.util.Collections.unmodifiableList(findingTypeStats_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.findingTypeStats_ = findingTypeStats_;
+      } else {
+        result.findingTypeStats_ = findingTypeStatsBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse.getDefaultInstance()) return this;
+      if (findingTypeStatsBuilder_ == null) {
+        if (!other.findingTypeStats_.isEmpty()) {
+          if (findingTypeStats_.isEmpty()) {
+            findingTypeStats_ = other.findingTypeStats_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureFindingTypeStatsIsMutable();
+            findingTypeStats_.addAll(other.findingTypeStats_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.findingTypeStats_.isEmpty()) {
+          if (findingTypeStatsBuilder_.isEmpty()) {
+            findingTypeStatsBuilder_.dispose();
+            findingTypeStatsBuilder_ = null;
+            findingTypeStats_ = other.findingTypeStats_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            findingTypeStatsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getFindingTypeStatsFieldBuilder() : null;
+          } else {
+            findingTypeStatsBuilder_.addAllMessages(other.findingTypeStats_);
+          }
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List findingTypeStats_ =
+      java.util.Collections.emptyList();
+    private void ensureFindingTypeStatsIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        findingTypeStats_ = new java.util.ArrayList(findingTypeStats_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.Builder, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsOrBuilder> findingTypeStatsBuilder_;
+
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public java.util.List getFindingTypeStatsList() {
+      if (findingTypeStatsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(findingTypeStats_);
+      } else {
+        return findingTypeStatsBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public int getFindingTypeStatsCount() {
+      if (findingTypeStatsBuilder_ == null) {
+        return findingTypeStats_.size();
+      } else {
+        return findingTypeStatsBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats getFindingTypeStats(int index) {
+      if (findingTypeStatsBuilder_ == null) {
+        return findingTypeStats_.get(index);
+      } else {
+        return findingTypeStatsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public Builder setFindingTypeStats(
+        int index, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats value) {
+      if (findingTypeStatsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureFindingTypeStatsIsMutable();
+        findingTypeStats_.set(index, value);
+        onChanged();
+      } else {
+        findingTypeStatsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public Builder setFindingTypeStats(
+        int index, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.Builder builderForValue) {
+      if (findingTypeStatsBuilder_ == null) {
+        ensureFindingTypeStatsIsMutable();
+        findingTypeStats_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        findingTypeStatsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public Builder addFindingTypeStats(com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats value) {
+      if (findingTypeStatsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureFindingTypeStatsIsMutable();
+        findingTypeStats_.add(value);
+        onChanged();
+      } else {
+        findingTypeStatsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public Builder addFindingTypeStats(
+        int index, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats value) {
+      if (findingTypeStatsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureFindingTypeStatsIsMutable();
+        findingTypeStats_.add(index, value);
+        onChanged();
+      } else {
+        findingTypeStatsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public Builder addFindingTypeStats(
+        com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.Builder builderForValue) {
+      if (findingTypeStatsBuilder_ == null) {
+        ensureFindingTypeStatsIsMutable();
+        findingTypeStats_.add(builderForValue.build());
+        onChanged();
+      } else {
+        findingTypeStatsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public Builder addFindingTypeStats(
+        int index, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.Builder builderForValue) {
+      if (findingTypeStatsBuilder_ == null) {
+        ensureFindingTypeStatsIsMutable();
+        findingTypeStats_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        findingTypeStatsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public Builder addAllFindingTypeStats(
+        java.lang.Iterable values) {
+      if (findingTypeStatsBuilder_ == null) {
+        ensureFindingTypeStatsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, findingTypeStats_);
+        onChanged();
+      } else {
+        findingTypeStatsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public Builder clearFindingTypeStats() {
+      if (findingTypeStatsBuilder_ == null) {
+        findingTypeStats_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        findingTypeStatsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public Builder removeFindingTypeStats(int index) {
+      if (findingTypeStatsBuilder_ == null) {
+        ensureFindingTypeStatsIsMutable();
+        findingTypeStats_.remove(index);
+        onChanged();
+      } else {
+        findingTypeStatsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.Builder getFindingTypeStatsBuilder(
+        int index) {
+      return getFindingTypeStatsFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsOrBuilder getFindingTypeStatsOrBuilder(
+        int index) {
+      if (findingTypeStatsBuilder_ == null) {
+        return findingTypeStats_.get(index);  } else {
+        return findingTypeStatsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public java.util.List 
+         getFindingTypeStatsOrBuilderList() {
+      if (findingTypeStatsBuilder_ != null) {
+        return findingTypeStatsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(findingTypeStats_);
+      }
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.Builder addFindingTypeStatsBuilder() {
+      return getFindingTypeStatsFieldBuilder().addBuilder(
+          com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.getDefaultInstance());
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.Builder addFindingTypeStatsBuilder(
+        int index) {
+      return getFindingTypeStatsFieldBuilder().addBuilder(
+          index, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.getDefaultInstance());
+    }
+    /**
+     * 
+     * The list of FindingTypeStats returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+     */
+    public java.util.List 
+         getFindingTypeStatsBuilderList() {
+      return getFindingTypeStatsFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.Builder, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsOrBuilder> 
+        getFindingTypeStatsFieldBuilder() {
+      if (findingTypeStatsBuilder_ == null) {
+        findingTypeStatsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.Builder, com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsOrBuilder>(
+                findingTypeStats_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        findingTypeStats_ = null;
+      }
+      return findingTypeStatsBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListFindingTypeStatsResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListFindingTypeStatsResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponseOrBuilder.java
new file mode 100644
index 000000000000..c9d44f1c087d
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponseOrBuilder.java
@@ -0,0 +1,53 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ListFindingTypeStatsResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The list of FindingTypeStats returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+   */
+  java.util.List 
+      getFindingTypeStatsList();
+  /**
+   * 
+   * The list of FindingTypeStats returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats getFindingTypeStats(int index);
+  /**
+   * 
+   * The list of FindingTypeStats returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+   */
+  int getFindingTypeStatsCount();
+  /**
+   * 
+   * The list of FindingTypeStats returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+   */
+  java.util.List 
+      getFindingTypeStatsOrBuilderList();
+  /**
+   * 
+   * The list of FindingTypeStats returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.FindingTypeStats finding_type_stats = 1;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsOrBuilder getFindingTypeStatsOrBuilder(
+      int index);
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequest.java
new file mode 100644
index 000000000000..56035cf9446c
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequest.java
@@ -0,0 +1,1000 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `ListFindings` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListFindingsRequest}
+ */
+public  final class ListFindingsRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ListFindingsRequest)
+    ListFindingsRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListFindingsRequest.newBuilder() to construct.
+  private ListFindingsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListFindingsRequest() {
+    parent_ = "";
+    filter_ = "";
+    pageToken_ = "";
+    pageSize_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListFindingsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            filter_ = s;
+            break;
+          }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            pageToken_ = s;
+            break;
+          }
+          case 32: {
+
+            pageSize_ = input.readInt32();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest.class, com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest.Builder.class);
+  }
+
+  public static final int PARENT_FIELD_NUMBER = 1;
+  private volatile java.lang.Object parent_;
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan run resource name in the
+   * format
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  public java.lang.String getParent() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      parent_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan run resource name in the
+   * format
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParentBytes() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      parent_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int FILTER_FIELD_NUMBER = 2;
+  private volatile java.lang.Object filter_;
+  /**
+   * 
+   * The filter expression. The expression must be in the format: <field>
+   * <operator> <value>.
+   * Supported field: 'finding_type'.
+   * Supported operator: '='.
+   * 

+   *
+   * string filter = 2;
+   */
+  public java.lang.String getFilter() {
+    java.lang.Object ref = filter_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      filter_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The filter expression. The expression must be in the format: <field>
+   * <operator> <value>.
+   * Supported field: 'finding_type'.
+   * Supported operator: '='.
+   * 

+   *
+   * string filter = 2;
+   */
+  public com.google.protobuf.ByteString
+      getFilterBytes() {
+    java.lang.Object ref = filter_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      filter_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
+  private volatile java.lang.Object pageToken_;
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 3;
+   */
+  public java.lang.String getPageToken() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      pageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 3;
+   */
+  public com.google.protobuf.ByteString
+      getPageTokenBytes() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      pageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PAGE_SIZE_FIELD_NUMBER = 4;
+  private int pageSize_;
+  /**
+   * 
+   * The maximum number of Findings to return, can be limited by server.
+   * If not specified or not positive, the implementation will select a
+   * reasonable value.
+   * 

+   *
+   * int32 page_size = 4;
+   */
+  public int getPageSize() {
+    return pageSize_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getParentBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
+    }
+    if (!getFilterBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, filter_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
+    }
+    if (pageSize_ != 0) {
+      output.writeInt32(4, pageSize_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getParentBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
+    }
+    if (!getFilterBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, filter_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
+    }
+    if (pageSize_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(4, pageSize_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest other = (com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest) obj;
+
+    boolean result = true;
+    result = result && getParent()
+        .equals(other.getParent());
+    result = result && getFilter()
+        .equals(other.getFilter());
+    result = result && getPageToken()
+        .equals(other.getPageToken());
+    result = result && (getPageSize()
+        == other.getPageSize());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PARENT_FIELD_NUMBER;
+    hash = (53 * hash) + getParent().hashCode();
+    hash = (37 * hash) + FILTER_FIELD_NUMBER;
+    hash = (53 * hash) + getFilter().hashCode();
+    hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getPageToken().hashCode();
+    hash = (37 * hash) + PAGE_SIZE_FIELD_NUMBER;
+    hash = (53 * hash) + getPageSize();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `ListFindings` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListFindingsRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ListFindingsRequest)
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest.class, com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parent_ = "";
+
+      filter_ = "";
+
+      pageToken_ = "";
+
+      pageSize_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest result = new com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest(this);
+      result.parent_ = parent_;
+      result.filter_ = filter_;
+      result.pageToken_ = pageToken_;
+      result.pageSize_ = pageSize_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest.getDefaultInstance()) return this;
+      if (!other.getParent().isEmpty()) {
+        parent_ = other.parent_;
+        onChanged();
+      }
+      if (!other.getFilter().isEmpty()) {
+        filter_ = other.filter_;
+        onChanged();
+      }
+      if (!other.getPageToken().isEmpty()) {
+        pageToken_ = other.pageToken_;
+        onChanged();
+      }
+      if (other.getPageSize() != 0) {
+        setPageSize(other.getPageSize());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object parent_ = "";
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public java.lang.String getParent() {
+      java.lang.Object ref = parent_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        parent_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParentBytes() {
+      java.lang.Object ref = parent_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        parent_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParent(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder clearParent() {
+      
+      parent_ = getDefaultInstance().getParent();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan run resource name in the
+     * format
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParentBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object filter_ = "";
+    /**
+     * 
+     * The filter expression. The expression must be in the format: <field>
+     * <operator> <value>.
+     * Supported field: 'finding_type'.
+     * Supported operator: '='.
+     * 

+     *
+     * string filter = 2;
+     */
+    public java.lang.String getFilter() {
+      java.lang.Object ref = filter_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        filter_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The filter expression. The expression must be in the format: <field>
+     * <operator> <value>.
+     * Supported field: 'finding_type'.
+     * Supported operator: '='.
+     * 

+     *
+     * string filter = 2;
+     */
+    public com.google.protobuf.ByteString
+        getFilterBytes() {
+      java.lang.Object ref = filter_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        filter_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The filter expression. The expression must be in the format: <field>
+     * <operator> <value>.
+     * Supported field: 'finding_type'.
+     * Supported operator: '='.
+     * 

+     *
+     * string filter = 2;
+     */
+    public Builder setFilter(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      filter_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The filter expression. The expression must be in the format: <field>
+     * <operator> <value>.
+     * Supported field: 'finding_type'.
+     * Supported operator: '='.
+     * 

+     *
+     * string filter = 2;
+     */
+    public Builder clearFilter() {
+      
+      filter_ = getDefaultInstance().getFilter();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The filter expression. The expression must be in the format: <field>
+     * <operator> <value>.
+     * Supported field: 'finding_type'.
+     * Supported operator: '='.
+     * 

+     *
+     * string filter = 2;
+     */
+    public Builder setFilterBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      filter_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object pageToken_ = "";
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public java.lang.String getPageToken() {
+      java.lang.Object ref = pageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        pageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public com.google.protobuf.ByteString
+        getPageTokenBytes() {
+      java.lang.Object ref = pageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public Builder setPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public Builder clearPageToken() {
+      
+      pageToken_ = getDefaultInstance().getPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 3;
+     */
+    public Builder setPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int pageSize_ ;
+    /**
+     * 
+     * The maximum number of Findings to return, can be limited by server.
+     * If not specified or not positive, the implementation will select a
+     * reasonable value.
+     * 

+     *
+     * int32 page_size = 4;
+     */
+    public int getPageSize() {
+      return pageSize_;
+    }
+    /**
+     * 
+     * The maximum number of Findings to return, can be limited by server.
+     * If not specified or not positive, the implementation will select a
+     * reasonable value.
+     * 

+     *
+     * int32 page_size = 4;
+     */
+    public Builder setPageSize(int value) {
+      
+      pageSize_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The maximum number of Findings to return, can be limited by server.
+     * If not specified or not positive, the implementation will select a
+     * reasonable value.
+     * 

+     *
+     * int32 page_size = 4;
+     */
+    public Builder clearPageSize() {
+      
+      pageSize_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ListFindingsRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ListFindingsRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListFindingsRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListFindingsRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequestOrBuilder.java
new file mode 100644
index 000000000000..ac620cfdaecf
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequestOrBuilder.java
@@ -0,0 +1,90 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ListFindingsRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ListFindingsRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan run resource name in the
+   * format
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  java.lang.String getParent();
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan run resource name in the
+   * format
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  com.google.protobuf.ByteString
+      getParentBytes();
+
+  /**
+   * 
+   * The filter expression. The expression must be in the format: <field>
+   * <operator> <value>.
+   * Supported field: 'finding_type'.
+   * Supported operator: '='.
+   * 

+   *
+   * string filter = 2;
+   */
+  java.lang.String getFilter();
+  /**
+   * 
+   * The filter expression. The expression must be in the format: <field>
+   * <operator> <value>.
+   * Supported field: 'finding_type'.
+   * Supported operator: '='.
+   * 

+   *
+   * string filter = 2;
+   */
+  com.google.protobuf.ByteString
+      getFilterBytes();
+
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 3;
+   */
+  java.lang.String getPageToken();
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 3;
+   */
+  com.google.protobuf.ByteString
+      getPageTokenBytes();
+
+  /**
+   * 
+   * The maximum number of Findings to return, can be limited by server.
+   * If not specified or not positive, the implementation will select a
+   * reasonable value.
+   * 

+   *
+   * int32 page_size = 4;
+   */
+  int getPageSize();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponse.java
new file mode 100644
index 000000000000..cccafabdce8a
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponse.java
@@ -0,0 +1,999 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Response for the `ListFindings` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListFindingsResponse}
+ */
+public  final class ListFindingsResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ListFindingsResponse)
+    ListFindingsResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListFindingsResponse.newBuilder() to construct.
+  private ListFindingsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListFindingsResponse() {
+    findings_ = java.util.Collections.emptyList();
+    nextPageToken_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListFindingsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              findings_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            findings_.add(
+                input.readMessage(com.google.cloud.websecurityscanner.v1alpha.Finding.parser(), extensionRegistry));
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            nextPageToken_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        findings_ = java.util.Collections.unmodifiableList(findings_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse.class, com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int FINDINGS_FIELD_NUMBER = 1;
+  private java.util.List findings_;
+  /**
+   * 
+   * The list of Findings returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+   */
+  public java.util.List getFindingsList() {
+    return findings_;
+  }
+  /**
+   * 
+   * The list of Findings returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+   */
+  public java.util.List 
+      getFindingsOrBuilderList() {
+    return findings_;
+  }
+  /**
+   * 
+   * The list of Findings returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+   */
+  public int getFindingsCount() {
+    return findings_.size();
+  }
+  /**
+   * 
+   * The list of Findings returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.Finding getFindings(int index) {
+    return findings_.get(index);
+  }
+  /**
+   * 
+   * The list of Findings returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.FindingOrBuilder getFindingsOrBuilder(
+      int index) {
+    return findings_.get(index);
+  }
+
+  public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
+  private volatile java.lang.Object nextPageToken_;
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public java.lang.String getNextPageToken() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      nextPageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public com.google.protobuf.ByteString
+      getNextPageTokenBytes() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      nextPageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < findings_.size(); i++) {
+      output.writeMessage(1, findings_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < findings_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, findings_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse other = (com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse) obj;
+
+    boolean result = true;
+    result = result && getFindingsList()
+        .equals(other.getFindingsList());
+    result = result && getNextPageToken()
+        .equals(other.getNextPageToken());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getFindingsCount() > 0) {
+      hash = (37 * hash) + FINDINGS_FIELD_NUMBER;
+      hash = (53 * hash) + getFindingsList().hashCode();
+    }
+    hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getNextPageToken().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Response for the `ListFindings` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListFindingsResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ListFindingsResponse)
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse.class, com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getFindingsFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (findingsBuilder_ == null) {
+        findings_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        findingsBuilder_.clear();
+      }
+      nextPageToken_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse build() {
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse result = new com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (findingsBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          findings_ = java.util.Collections.unmodifiableList(findings_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.findings_ = findings_;
+      } else {
+        result.findings_ = findingsBuilder_.build();
+      }
+      result.nextPageToken_ = nextPageToken_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse.getDefaultInstance()) return this;
+      if (findingsBuilder_ == null) {
+        if (!other.findings_.isEmpty()) {
+          if (findings_.isEmpty()) {
+            findings_ = other.findings_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureFindingsIsMutable();
+            findings_.addAll(other.findings_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.findings_.isEmpty()) {
+          if (findingsBuilder_.isEmpty()) {
+            findingsBuilder_.dispose();
+            findingsBuilder_ = null;
+            findings_ = other.findings_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            findingsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getFindingsFieldBuilder() : null;
+          } else {
+            findingsBuilder_.addAllMessages(other.findings_);
+          }
+        }
+      }
+      if (!other.getNextPageToken().isEmpty()) {
+        nextPageToken_ = other.nextPageToken_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List findings_ =
+      java.util.Collections.emptyList();
+    private void ensureFindingsIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        findings_ = new java.util.ArrayList(findings_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.Finding, com.google.cloud.websecurityscanner.v1alpha.Finding.Builder, com.google.cloud.websecurityscanner.v1alpha.FindingOrBuilder> findingsBuilder_;
+
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public java.util.List getFindingsList() {
+      if (findingsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(findings_);
+      } else {
+        return findingsBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public int getFindingsCount() {
+      if (findingsBuilder_ == null) {
+        return findings_.size();
+      } else {
+        return findingsBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.Finding getFindings(int index) {
+      if (findingsBuilder_ == null) {
+        return findings_.get(index);
+      } else {
+        return findingsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public Builder setFindings(
+        int index, com.google.cloud.websecurityscanner.v1alpha.Finding value) {
+      if (findingsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureFindingsIsMutable();
+        findings_.set(index, value);
+        onChanged();
+      } else {
+        findingsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public Builder setFindings(
+        int index, com.google.cloud.websecurityscanner.v1alpha.Finding.Builder builderForValue) {
+      if (findingsBuilder_ == null) {
+        ensureFindingsIsMutable();
+        findings_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        findingsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public Builder addFindings(com.google.cloud.websecurityscanner.v1alpha.Finding value) {
+      if (findingsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureFindingsIsMutable();
+        findings_.add(value);
+        onChanged();
+      } else {
+        findingsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public Builder addFindings(
+        int index, com.google.cloud.websecurityscanner.v1alpha.Finding value) {
+      if (findingsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureFindingsIsMutable();
+        findings_.add(index, value);
+        onChanged();
+      } else {
+        findingsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public Builder addFindings(
+        com.google.cloud.websecurityscanner.v1alpha.Finding.Builder builderForValue) {
+      if (findingsBuilder_ == null) {
+        ensureFindingsIsMutable();
+        findings_.add(builderForValue.build());
+        onChanged();
+      } else {
+        findingsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public Builder addFindings(
+        int index, com.google.cloud.websecurityscanner.v1alpha.Finding.Builder builderForValue) {
+      if (findingsBuilder_ == null) {
+        ensureFindingsIsMutable();
+        findings_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        findingsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public Builder addAllFindings(
+        java.lang.Iterable values) {
+      if (findingsBuilder_ == null) {
+        ensureFindingsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, findings_);
+        onChanged();
+      } else {
+        findingsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public Builder clearFindings() {
+      if (findingsBuilder_ == null) {
+        findings_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        findingsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public Builder removeFindings(int index) {
+      if (findingsBuilder_ == null) {
+        ensureFindingsIsMutable();
+        findings_.remove(index);
+        onChanged();
+      } else {
+        findingsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.Finding.Builder getFindingsBuilder(
+        int index) {
+      return getFindingsFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.FindingOrBuilder getFindingsOrBuilder(
+        int index) {
+      if (findingsBuilder_ == null) {
+        return findings_.get(index);  } else {
+        return findingsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public java.util.List 
+         getFindingsOrBuilderList() {
+      if (findingsBuilder_ != null) {
+        return findingsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(findings_);
+      }
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.Finding.Builder addFindingsBuilder() {
+      return getFindingsFieldBuilder().addBuilder(
+          com.google.cloud.websecurityscanner.v1alpha.Finding.getDefaultInstance());
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.Finding.Builder addFindingsBuilder(
+        int index) {
+      return getFindingsFieldBuilder().addBuilder(
+          index, com.google.cloud.websecurityscanner.v1alpha.Finding.getDefaultInstance());
+    }
+    /**
+     * 
+     * The list of Findings returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+     */
+    public java.util.List 
+         getFindingsBuilderList() {
+      return getFindingsFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.Finding, com.google.cloud.websecurityscanner.v1alpha.Finding.Builder, com.google.cloud.websecurityscanner.v1alpha.FindingOrBuilder> 
+        getFindingsFieldBuilder() {
+      if (findingsBuilder_ == null) {
+        findingsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.Finding, com.google.cloud.websecurityscanner.v1alpha.Finding.Builder, com.google.cloud.websecurityscanner.v1alpha.FindingOrBuilder>(
+                findings_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        findings_ = null;
+      }
+      return findingsBuilder_;
+    }
+
+    private java.lang.Object nextPageToken_ = "";
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public java.lang.String getNextPageToken() {
+      java.lang.Object ref = nextPageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        nextPageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public com.google.protobuf.ByteString
+        getNextPageTokenBytes() {
+      java.lang.Object ref = nextPageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        nextPageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder clearNextPageToken() {
+      
+      nextPageToken_ = getDefaultInstance().getNextPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ListFindingsResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ListFindingsResponse)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListFindingsResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListFindingsResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponseOrBuilder.java
new file mode 100644
index 000000000000..711899641333
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponseOrBuilder.java
@@ -0,0 +1,73 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ListFindingsResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ListFindingsResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The list of Findings returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+   */
+  java.util.List 
+      getFindingsList();
+  /**
+   * 
+   * The list of Findings returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.Finding getFindings(int index);
+  /**
+   * 
+   * The list of Findings returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+   */
+  int getFindingsCount();
+  /**
+   * 
+   * The list of Findings returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+   */
+  java.util.List 
+      getFindingsOrBuilderList();
+  /**
+   * 
+   * The list of Findings returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.Finding findings = 1;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.FindingOrBuilder getFindingsOrBuilder(
+      int index);
+
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  java.lang.String getNextPageToken();
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  com.google.protobuf.ByteString
+      getNextPageTokenBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequest.java
new file mode 100644
index 000000000000..5a8077796603
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequest.java
@@ -0,0 +1,817 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `ListScanConfigs` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest}
+ */
+public  final class ListScanConfigsRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest)
+    ListScanConfigsRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListScanConfigsRequest.newBuilder() to construct.
+  private ListScanConfigsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListScanConfigsRequest() {
+    parent_ = "";
+    pageToken_ = "";
+    pageSize_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListScanConfigsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            pageToken_ = s;
+            break;
+          }
+          case 24: {
+
+            pageSize_ = input.readInt32();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest.class, com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest.Builder.class);
+  }
+
+  public static final int PARENT_FIELD_NUMBER = 1;
+  private volatile java.lang.Object parent_;
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a project resource name in the
+   * format 'projects/{projectId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  public java.lang.String getParent() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      parent_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a project resource name in the
+   * format 'projects/{projectId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParentBytes() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      parent_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PAGE_TOKEN_FIELD_NUMBER = 2;
+  private volatile java.lang.Object pageToken_;
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 2;
+   */
+  public java.lang.String getPageToken() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      pageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 2;
+   */
+  public com.google.protobuf.ByteString
+      getPageTokenBytes() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      pageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PAGE_SIZE_FIELD_NUMBER = 3;
+  private int pageSize_;
+  /**
+   * 
+   * The maximum number of ScanConfigs to return, can be limited by server.
+   * If not specified or not positive, the implementation will select a
+   * reasonable value.
+   * 

+   *
+   * int32 page_size = 3;
+   */
+  public int getPageSize() {
+    return pageSize_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getParentBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, pageToken_);
+    }
+    if (pageSize_ != 0) {
+      output.writeInt32(3, pageSize_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getParentBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, pageToken_);
+    }
+    if (pageSize_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(3, pageSize_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest other = (com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest) obj;
+
+    boolean result = true;
+    result = result && getParent()
+        .equals(other.getParent());
+    result = result && getPageToken()
+        .equals(other.getPageToken());
+    result = result && (getPageSize()
+        == other.getPageSize());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PARENT_FIELD_NUMBER;
+    hash = (53 * hash) + getParent().hashCode();
+    hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getPageToken().hashCode();
+    hash = (37 * hash) + PAGE_SIZE_FIELD_NUMBER;
+    hash = (53 * hash) + getPageSize();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `ListScanConfigs` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest)
+      com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest.class, com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parent_ = "";
+
+      pageToken_ = "";
+
+      pageSize_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest result = new com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest(this);
+      result.parent_ = parent_;
+      result.pageToken_ = pageToken_;
+      result.pageSize_ = pageSize_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest.getDefaultInstance()) return this;
+      if (!other.getParent().isEmpty()) {
+        parent_ = other.parent_;
+        onChanged();
+      }
+      if (!other.getPageToken().isEmpty()) {
+        pageToken_ = other.pageToken_;
+        onChanged();
+      }
+      if (other.getPageSize() != 0) {
+        setPageSize(other.getPageSize());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object parent_ = "";
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a project resource name in the
+     * format 'projects/{projectId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public java.lang.String getParent() {
+      java.lang.Object ref = parent_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        parent_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a project resource name in the
+     * format 'projects/{projectId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParentBytes() {
+      java.lang.Object ref = parent_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        parent_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a project resource name in the
+     * format 'projects/{projectId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParent(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a project resource name in the
+     * format 'projects/{projectId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder clearParent() {
+      
+      parent_ = getDefaultInstance().getParent();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a project resource name in the
+     * format 'projects/{projectId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParentBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object pageToken_ = "";
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public java.lang.String getPageToken() {
+      java.lang.Object ref = pageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        pageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public com.google.protobuf.ByteString
+        getPageTokenBytes() {
+      java.lang.Object ref = pageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public Builder setPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public Builder clearPageToken() {
+      
+      pageToken_ = getDefaultInstance().getPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public Builder setPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int pageSize_ ;
+    /**
+     * 
+     * The maximum number of ScanConfigs to return, can be limited by server.
+     * If not specified or not positive, the implementation will select a
+     * reasonable value.
+     * 

+     *
+     * int32 page_size = 3;
+     */
+    public int getPageSize() {
+      return pageSize_;
+    }
+    /**
+     * 
+     * The maximum number of ScanConfigs to return, can be limited by server.
+     * If not specified or not positive, the implementation will select a
+     * reasonable value.
+     * 

+     *
+     * int32 page_size = 3;
+     */
+    public Builder setPageSize(int value) {
+      
+      pageSize_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The maximum number of ScanConfigs to return, can be limited by server.
+     * If not specified or not positive, the implementation will select a
+     * reasonable value.
+     * 

+     *
+     * int32 page_size = 3;
+     */
+    public Builder clearPageSize() {
+      
+      pageSize_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListScanConfigsRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListScanConfigsRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequestOrBuilder.java
new file mode 100644
index 000000000000..f8ad6171e29a
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequestOrBuilder.java
@@ -0,0 +1,64 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ListScanConfigsRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a project resource name in the
+   * format 'projects/{projectId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  java.lang.String getParent();
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a project resource name in the
+   * format 'projects/{projectId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  com.google.protobuf.ByteString
+      getParentBytes();
+
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 2;
+   */
+  java.lang.String getPageToken();
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 2;
+   */
+  com.google.protobuf.ByteString
+      getPageTokenBytes();
+
+  /**
+   * 
+   * The maximum number of ScanConfigs to return, can be limited by server.
+   * If not specified or not positive, the implementation will select a
+   * reasonable value.
+   * 

+   *
+   * int32 page_size = 3;
+   */
+  int getPageSize();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponse.java
new file mode 100644
index 000000000000..91fe68f11066
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponse.java
@@ -0,0 +1,999 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Response for the `ListScanConfigs` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse}
+ */
+public  final class ListScanConfigsResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse)
+    ListScanConfigsResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListScanConfigsResponse.newBuilder() to construct.
+  private ListScanConfigsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListScanConfigsResponse() {
+    scanConfigs_ = java.util.Collections.emptyList();
+    nextPageToken_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListScanConfigsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              scanConfigs_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            scanConfigs_.add(
+                input.readMessage(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.parser(), extensionRegistry));
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            nextPageToken_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        scanConfigs_ = java.util.Collections.unmodifiableList(scanConfigs_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse.class, com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int SCAN_CONFIGS_FIELD_NUMBER = 1;
+  private java.util.List scanConfigs_;
+  /**
+   * 
+   * The list of ScanConfigs returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+   */
+  public java.util.List getScanConfigsList() {
+    return scanConfigs_;
+  }
+  /**
+   * 
+   * The list of ScanConfigs returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+   */
+  public java.util.List 
+      getScanConfigsOrBuilderList() {
+    return scanConfigs_;
+  }
+  /**
+   * 
+   * The list of ScanConfigs returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+   */
+  public int getScanConfigsCount() {
+    return scanConfigs_.size();
+  }
+  /**
+   * 
+   * The list of ScanConfigs returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getScanConfigs(int index) {
+    return scanConfigs_.get(index);
+  }
+  /**
+   * 
+   * The list of ScanConfigs returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder getScanConfigsOrBuilder(
+      int index) {
+    return scanConfigs_.get(index);
+  }
+
+  public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
+  private volatile java.lang.Object nextPageToken_;
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public java.lang.String getNextPageToken() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      nextPageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public com.google.protobuf.ByteString
+      getNextPageTokenBytes() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      nextPageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < scanConfigs_.size(); i++) {
+      output.writeMessage(1, scanConfigs_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < scanConfigs_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, scanConfigs_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse other = (com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse) obj;
+
+    boolean result = true;
+    result = result && getScanConfigsList()
+        .equals(other.getScanConfigsList());
+    result = result && getNextPageToken()
+        .equals(other.getNextPageToken());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getScanConfigsCount() > 0) {
+      hash = (37 * hash) + SCAN_CONFIGS_FIELD_NUMBER;
+      hash = (53 * hash) + getScanConfigsList().hashCode();
+    }
+    hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getNextPageToken().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Response for the `ListScanConfigs` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse)
+      com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse.class, com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getScanConfigsFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (scanConfigsBuilder_ == null) {
+        scanConfigs_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        scanConfigsBuilder_.clear();
+      }
+      nextPageToken_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse build() {
+      com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse result = new com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (scanConfigsBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          scanConfigs_ = java.util.Collections.unmodifiableList(scanConfigs_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.scanConfigs_ = scanConfigs_;
+      } else {
+        result.scanConfigs_ = scanConfigsBuilder_.build();
+      }
+      result.nextPageToken_ = nextPageToken_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse.getDefaultInstance()) return this;
+      if (scanConfigsBuilder_ == null) {
+        if (!other.scanConfigs_.isEmpty()) {
+          if (scanConfigs_.isEmpty()) {
+            scanConfigs_ = other.scanConfigs_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureScanConfigsIsMutable();
+            scanConfigs_.addAll(other.scanConfigs_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.scanConfigs_.isEmpty()) {
+          if (scanConfigsBuilder_.isEmpty()) {
+            scanConfigsBuilder_.dispose();
+            scanConfigsBuilder_ = null;
+            scanConfigs_ = other.scanConfigs_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            scanConfigsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getScanConfigsFieldBuilder() : null;
+          } else {
+            scanConfigsBuilder_.addAllMessages(other.scanConfigs_);
+          }
+        }
+      }
+      if (!other.getNextPageToken().isEmpty()) {
+        nextPageToken_ = other.nextPageToken_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List scanConfigs_ =
+      java.util.Collections.emptyList();
+    private void ensureScanConfigsIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        scanConfigs_ = new java.util.ArrayList(scanConfigs_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder> scanConfigsBuilder_;
+
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public java.util.List getScanConfigsList() {
+      if (scanConfigsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(scanConfigs_);
+      } else {
+        return scanConfigsBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public int getScanConfigsCount() {
+      if (scanConfigsBuilder_ == null) {
+        return scanConfigs_.size();
+      } else {
+        return scanConfigsBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getScanConfigs(int index) {
+      if (scanConfigsBuilder_ == null) {
+        return scanConfigs_.get(index);
+      } else {
+        return scanConfigsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public Builder setScanConfigs(
+        int index, com.google.cloud.websecurityscanner.v1alpha.ScanConfig value) {
+      if (scanConfigsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureScanConfigsIsMutable();
+        scanConfigs_.set(index, value);
+        onChanged();
+      } else {
+        scanConfigsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public Builder setScanConfigs(
+        int index, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder builderForValue) {
+      if (scanConfigsBuilder_ == null) {
+        ensureScanConfigsIsMutable();
+        scanConfigs_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        scanConfigsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public Builder addScanConfigs(com.google.cloud.websecurityscanner.v1alpha.ScanConfig value) {
+      if (scanConfigsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureScanConfigsIsMutable();
+        scanConfigs_.add(value);
+        onChanged();
+      } else {
+        scanConfigsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public Builder addScanConfigs(
+        int index, com.google.cloud.websecurityscanner.v1alpha.ScanConfig value) {
+      if (scanConfigsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureScanConfigsIsMutable();
+        scanConfigs_.add(index, value);
+        onChanged();
+      } else {
+        scanConfigsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public Builder addScanConfigs(
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder builderForValue) {
+      if (scanConfigsBuilder_ == null) {
+        ensureScanConfigsIsMutable();
+        scanConfigs_.add(builderForValue.build());
+        onChanged();
+      } else {
+        scanConfigsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public Builder addScanConfigs(
+        int index, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder builderForValue) {
+      if (scanConfigsBuilder_ == null) {
+        ensureScanConfigsIsMutable();
+        scanConfigs_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        scanConfigsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public Builder addAllScanConfigs(
+        java.lang.Iterable values) {
+      if (scanConfigsBuilder_ == null) {
+        ensureScanConfigsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, scanConfigs_);
+        onChanged();
+      } else {
+        scanConfigsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public Builder clearScanConfigs() {
+      if (scanConfigsBuilder_ == null) {
+        scanConfigs_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        scanConfigsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public Builder removeScanConfigs(int index) {
+      if (scanConfigsBuilder_ == null) {
+        ensureScanConfigsIsMutable();
+        scanConfigs_.remove(index);
+        onChanged();
+      } else {
+        scanConfigsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder getScanConfigsBuilder(
+        int index) {
+      return getScanConfigsFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder getScanConfigsOrBuilder(
+        int index) {
+      if (scanConfigsBuilder_ == null) {
+        return scanConfigs_.get(index);  } else {
+        return scanConfigsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public java.util.List 
+         getScanConfigsOrBuilderList() {
+      if (scanConfigsBuilder_ != null) {
+        return scanConfigsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(scanConfigs_);
+      }
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder addScanConfigsBuilder() {
+      return getScanConfigsFieldBuilder().addBuilder(
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance());
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder addScanConfigsBuilder(
+        int index) {
+      return getScanConfigsFieldBuilder().addBuilder(
+          index, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance());
+    }
+    /**
+     * 
+     * The list of ScanConfigs returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+     */
+    public java.util.List 
+         getScanConfigsBuilderList() {
+      return getScanConfigsFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder> 
+        getScanConfigsFieldBuilder() {
+      if (scanConfigsBuilder_ == null) {
+        scanConfigsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder>(
+                scanConfigs_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        scanConfigs_ = null;
+      }
+      return scanConfigsBuilder_;
+    }
+
+    private java.lang.Object nextPageToken_ = "";
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public java.lang.String getNextPageToken() {
+      java.lang.Object ref = nextPageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        nextPageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public com.google.protobuf.ByteString
+        getNextPageTokenBytes() {
+      java.lang.Object ref = nextPageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        nextPageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder clearNextPageToken() {
+      
+      nextPageToken_ = getDefaultInstance().getNextPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListScanConfigsResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListScanConfigsResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponseOrBuilder.java
new file mode 100644
index 000000000000..5a1ad3258236
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponseOrBuilder.java
@@ -0,0 +1,73 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ListScanConfigsResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The list of ScanConfigs returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+   */
+  java.util.List 
+      getScanConfigsList();
+  /**
+   * 
+   * The list of ScanConfigs returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanConfig getScanConfigs(int index);
+  /**
+   * 
+   * The list of ScanConfigs returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+   */
+  int getScanConfigsCount();
+  /**
+   * 
+   * The list of ScanConfigs returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+   */
+  java.util.List 
+      getScanConfigsOrBuilderList();
+  /**
+   * 
+   * The list of ScanConfigs returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_configs = 1;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder getScanConfigsOrBuilder(
+      int index);
+
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  java.lang.String getNextPageToken();
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  com.google.protobuf.ByteString
+      getNextPageTokenBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequest.java
new file mode 100644
index 000000000000..ce8219ef88da
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequest.java
@@ -0,0 +1,817 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `ListScanRuns` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest}
+ */
+public  final class ListScanRunsRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest)
+    ListScanRunsRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListScanRunsRequest.newBuilder() to construct.
+  private ListScanRunsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListScanRunsRequest() {
+    parent_ = "";
+    pageToken_ = "";
+    pageSize_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListScanRunsRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            pageToken_ = s;
+            break;
+          }
+          case 24: {
+
+            pageSize_ = input.readInt32();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest.class, com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest.Builder.class);
+  }
+
+  public static final int PARENT_FIELD_NUMBER = 1;
+  private volatile java.lang.Object parent_;
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan resource name in the
+   * format 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  public java.lang.String getParent() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      parent_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan resource name in the
+   * format 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParentBytes() {
+    java.lang.Object ref = parent_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      parent_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PAGE_TOKEN_FIELD_NUMBER = 2;
+  private volatile java.lang.Object pageToken_;
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 2;
+   */
+  public java.lang.String getPageToken() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      pageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 2;
+   */
+  public com.google.protobuf.ByteString
+      getPageTokenBytes() {
+    java.lang.Object ref = pageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      pageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int PAGE_SIZE_FIELD_NUMBER = 3;
+  private int pageSize_;
+  /**
+   * 
+   * The maximum number of ScanRuns to return, can be limited by server.
+   * If not specified or not positive, the implementation will select a
+   * reasonable value.
+   * 

+   *
+   * int32 page_size = 3;
+   */
+  public int getPageSize() {
+    return pageSize_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getParentBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, pageToken_);
+    }
+    if (pageSize_ != 0) {
+      output.writeInt32(3, pageSize_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getParentBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
+    }
+    if (!getPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, pageToken_);
+    }
+    if (pageSize_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(3, pageSize_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest other = (com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest) obj;
+
+    boolean result = true;
+    result = result && getParent()
+        .equals(other.getParent());
+    result = result && getPageToken()
+        .equals(other.getPageToken());
+    result = result && (getPageSize()
+        == other.getPageSize());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + PARENT_FIELD_NUMBER;
+    hash = (53 * hash) + getParent().hashCode();
+    hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getPageToken().hashCode();
+    hash = (37 * hash) + PAGE_SIZE_FIELD_NUMBER;
+    hash = (53 * hash) + getPageSize();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `ListScanRuns` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest)
+      com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest.class, com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parent_ = "";
+
+      pageToken_ = "";
+
+      pageSize_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest result = new com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest(this);
+      result.parent_ = parent_;
+      result.pageToken_ = pageToken_;
+      result.pageSize_ = pageSize_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest.getDefaultInstance()) return this;
+      if (!other.getParent().isEmpty()) {
+        parent_ = other.parent_;
+        onChanged();
+      }
+      if (!other.getPageToken().isEmpty()) {
+        pageToken_ = other.pageToken_;
+        onChanged();
+      }
+      if (other.getPageSize() != 0) {
+        setPageSize(other.getPageSize());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object parent_ = "";
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan resource name in the
+     * format 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public java.lang.String getParent() {
+      java.lang.Object ref = parent_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        parent_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan resource name in the
+     * format 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParentBytes() {
+      java.lang.Object ref = parent_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        parent_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan resource name in the
+     * format 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParent(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan resource name in the
+     * format 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder clearParent() {
+      
+      parent_ = getDefaultInstance().getParent();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The parent resource name, which should be a scan resource name in the
+     * format 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string parent = 1;
+     */
+    public Builder setParentBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      parent_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object pageToken_ = "";
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public java.lang.String getPageToken() {
+      java.lang.Object ref = pageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        pageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public com.google.protobuf.ByteString
+        getPageTokenBytes() {
+      java.lang.Object ref = pageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public Builder setPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public Builder clearPageToken() {
+      
+      pageToken_ = getDefaultInstance().getPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * A token identifying a page of results to be returned. This should be a
+     * `next_page_token` value returned from a previous List request.
+     * If unspecified, the first page of results is returned.
+     * 

+     *
+     * string page_token = 2;
+     */
+    public Builder setPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      pageToken_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int pageSize_ ;
+    /**
+     * 
+     * The maximum number of ScanRuns to return, can be limited by server.
+     * If not specified or not positive, the implementation will select a
+     * reasonable value.
+     * 

+     *
+     * int32 page_size = 3;
+     */
+    public int getPageSize() {
+      return pageSize_;
+    }
+    /**
+     * 
+     * The maximum number of ScanRuns to return, can be limited by server.
+     * If not specified or not positive, the implementation will select a
+     * reasonable value.
+     * 

+     *
+     * int32 page_size = 3;
+     */
+    public Builder setPageSize(int value) {
+      
+      pageSize_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The maximum number of ScanRuns to return, can be limited by server.
+     * If not specified or not positive, the implementation will select a
+     * reasonable value.
+     * 

+     *
+     * int32 page_size = 3;
+     */
+    public Builder clearPageSize() {
+      
+      pageSize_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListScanRunsRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListScanRunsRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequestOrBuilder.java
new file mode 100644
index 000000000000..284b517cf9f9
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequestOrBuilder.java
@@ -0,0 +1,64 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ListScanRunsRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan resource name in the
+   * format 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  java.lang.String getParent();
+  /**
+   * 
+   * Required.
+   * The parent resource name, which should be a scan resource name in the
+   * format 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string parent = 1;
+   */
+  com.google.protobuf.ByteString
+      getParentBytes();
+
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 2;
+   */
+  java.lang.String getPageToken();
+  /**
+   * 
+   * A token identifying a page of results to be returned. This should be a
+   * `next_page_token` value returned from a previous List request.
+   * If unspecified, the first page of results is returned.
+   * 

+   *
+   * string page_token = 2;
+   */
+  com.google.protobuf.ByteString
+      getPageTokenBytes();
+
+  /**
+   * 
+   * The maximum number of ScanRuns to return, can be limited by server.
+   * If not specified or not positive, the implementation will select a
+   * reasonable value.
+   * 

+   *
+   * int32 page_size = 3;
+   */
+  int getPageSize();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponse.java
new file mode 100644
index 000000000000..588e428b11b5
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponse.java
@@ -0,0 +1,999 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Response for the `ListScanRuns` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse}
+ */
+public  final class ListScanRunsResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse)
+    ListScanRunsResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListScanRunsResponse.newBuilder() to construct.
+  private ListScanRunsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListScanRunsResponse() {
+    scanRuns_ = java.util.Collections.emptyList();
+    nextPageToken_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListScanRunsResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              scanRuns_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            scanRuns_.add(
+                input.readMessage(com.google.cloud.websecurityscanner.v1alpha.ScanRun.parser(), extensionRegistry));
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            nextPageToken_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        scanRuns_ = java.util.Collections.unmodifiableList(scanRuns_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse.class, com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int SCAN_RUNS_FIELD_NUMBER = 1;
+  private java.util.List scanRuns_;
+  /**
+   * 
+   * The list of ScanRuns returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+   */
+  public java.util.List getScanRunsList() {
+    return scanRuns_;
+  }
+  /**
+   * 
+   * The list of ScanRuns returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+   */
+  public java.util.List 
+      getScanRunsOrBuilderList() {
+    return scanRuns_;
+  }
+  /**
+   * 
+   * The list of ScanRuns returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+   */
+  public int getScanRunsCount() {
+    return scanRuns_.size();
+  }
+  /**
+   * 
+   * The list of ScanRuns returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanRun getScanRuns(int index) {
+    return scanRuns_.get(index);
+  }
+  /**
+   * 
+   * The list of ScanRuns returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanRunOrBuilder getScanRunsOrBuilder(
+      int index) {
+    return scanRuns_.get(index);
+  }
+
+  public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
+  private volatile java.lang.Object nextPageToken_;
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public java.lang.String getNextPageToken() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      nextPageToken_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  public com.google.protobuf.ByteString
+      getNextPageTokenBytes() {
+    java.lang.Object ref = nextPageToken_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      nextPageToken_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < scanRuns_.size(); i++) {
+      output.writeMessage(1, scanRuns_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < scanRuns_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, scanRuns_.get(i));
+    }
+    if (!getNextPageTokenBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse other = (com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse) obj;
+
+    boolean result = true;
+    result = result && getScanRunsList()
+        .equals(other.getScanRunsList());
+    result = result && getNextPageToken()
+        .equals(other.getNextPageToken());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getScanRunsCount() > 0) {
+      hash = (37 * hash) + SCAN_RUNS_FIELD_NUMBER;
+      hash = (53 * hash) + getScanRunsList().hashCode();
+    }
+    hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
+    hash = (53 * hash) + getNextPageToken().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Response for the `ListScanRuns` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse)
+      com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse.class, com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getScanRunsFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (scanRunsBuilder_ == null) {
+        scanRuns_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        scanRunsBuilder_.clear();
+      }
+      nextPageToken_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse build() {
+      com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse result = new com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (scanRunsBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          scanRuns_ = java.util.Collections.unmodifiableList(scanRuns_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.scanRuns_ = scanRuns_;
+      } else {
+        result.scanRuns_ = scanRunsBuilder_.build();
+      }
+      result.nextPageToken_ = nextPageToken_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse.getDefaultInstance()) return this;
+      if (scanRunsBuilder_ == null) {
+        if (!other.scanRuns_.isEmpty()) {
+          if (scanRuns_.isEmpty()) {
+            scanRuns_ = other.scanRuns_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureScanRunsIsMutable();
+            scanRuns_.addAll(other.scanRuns_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.scanRuns_.isEmpty()) {
+          if (scanRunsBuilder_.isEmpty()) {
+            scanRunsBuilder_.dispose();
+            scanRunsBuilder_ = null;
+            scanRuns_ = other.scanRuns_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            scanRunsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getScanRunsFieldBuilder() : null;
+          } else {
+            scanRunsBuilder_.addAllMessages(other.scanRuns_);
+          }
+        }
+      }
+      if (!other.getNextPageToken().isEmpty()) {
+        nextPageToken_ = other.nextPageToken_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List scanRuns_ =
+      java.util.Collections.emptyList();
+    private void ensureScanRunsIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        scanRuns_ = new java.util.ArrayList(scanRuns_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ScanRun, com.google.cloud.websecurityscanner.v1alpha.ScanRun.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanRunOrBuilder> scanRunsBuilder_;
+
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public java.util.List getScanRunsList() {
+      if (scanRunsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(scanRuns_);
+      } else {
+        return scanRunsBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public int getScanRunsCount() {
+      if (scanRunsBuilder_ == null) {
+        return scanRuns_.size();
+      } else {
+        return scanRunsBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRun getScanRuns(int index) {
+      if (scanRunsBuilder_ == null) {
+        return scanRuns_.get(index);
+      } else {
+        return scanRunsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public Builder setScanRuns(
+        int index, com.google.cloud.websecurityscanner.v1alpha.ScanRun value) {
+      if (scanRunsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureScanRunsIsMutable();
+        scanRuns_.set(index, value);
+        onChanged();
+      } else {
+        scanRunsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public Builder setScanRuns(
+        int index, com.google.cloud.websecurityscanner.v1alpha.ScanRun.Builder builderForValue) {
+      if (scanRunsBuilder_ == null) {
+        ensureScanRunsIsMutable();
+        scanRuns_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        scanRunsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public Builder addScanRuns(com.google.cloud.websecurityscanner.v1alpha.ScanRun value) {
+      if (scanRunsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureScanRunsIsMutable();
+        scanRuns_.add(value);
+        onChanged();
+      } else {
+        scanRunsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public Builder addScanRuns(
+        int index, com.google.cloud.websecurityscanner.v1alpha.ScanRun value) {
+      if (scanRunsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureScanRunsIsMutable();
+        scanRuns_.add(index, value);
+        onChanged();
+      } else {
+        scanRunsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public Builder addScanRuns(
+        com.google.cloud.websecurityscanner.v1alpha.ScanRun.Builder builderForValue) {
+      if (scanRunsBuilder_ == null) {
+        ensureScanRunsIsMutable();
+        scanRuns_.add(builderForValue.build());
+        onChanged();
+      } else {
+        scanRunsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public Builder addScanRuns(
+        int index, com.google.cloud.websecurityscanner.v1alpha.ScanRun.Builder builderForValue) {
+      if (scanRunsBuilder_ == null) {
+        ensureScanRunsIsMutable();
+        scanRuns_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        scanRunsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public Builder addAllScanRuns(
+        java.lang.Iterable values) {
+      if (scanRunsBuilder_ == null) {
+        ensureScanRunsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, scanRuns_);
+        onChanged();
+      } else {
+        scanRunsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public Builder clearScanRuns() {
+      if (scanRunsBuilder_ == null) {
+        scanRuns_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        scanRunsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public Builder removeScanRuns(int index) {
+      if (scanRunsBuilder_ == null) {
+        ensureScanRunsIsMutable();
+        scanRuns_.remove(index);
+        onChanged();
+      } else {
+        scanRunsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRun.Builder getScanRunsBuilder(
+        int index) {
+      return getScanRunsFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRunOrBuilder getScanRunsOrBuilder(
+        int index) {
+      if (scanRunsBuilder_ == null) {
+        return scanRuns_.get(index);  } else {
+        return scanRunsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public java.util.List 
+         getScanRunsOrBuilderList() {
+      if (scanRunsBuilder_ != null) {
+        return scanRunsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(scanRuns_);
+      }
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRun.Builder addScanRunsBuilder() {
+      return getScanRunsFieldBuilder().addBuilder(
+          com.google.cloud.websecurityscanner.v1alpha.ScanRun.getDefaultInstance());
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRun.Builder addScanRunsBuilder(
+        int index) {
+      return getScanRunsFieldBuilder().addBuilder(
+          index, com.google.cloud.websecurityscanner.v1alpha.ScanRun.getDefaultInstance());
+    }
+    /**
+     * 
+     * The list of ScanRuns returned.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+     */
+    public java.util.List 
+         getScanRunsBuilderList() {
+      return getScanRunsFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ScanRun, com.google.cloud.websecurityscanner.v1alpha.ScanRun.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanRunOrBuilder> 
+        getScanRunsFieldBuilder() {
+      if (scanRunsBuilder_ == null) {
+        scanRunsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.ScanRun, com.google.cloud.websecurityscanner.v1alpha.ScanRun.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanRunOrBuilder>(
+                scanRuns_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        scanRuns_ = null;
+      }
+      return scanRunsBuilder_;
+    }
+
+    private java.lang.Object nextPageToken_ = "";
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public java.lang.String getNextPageToken() {
+      java.lang.Object ref = nextPageToken_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        nextPageToken_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public com.google.protobuf.ByteString
+        getNextPageTokenBytes() {
+      java.lang.Object ref = nextPageToken_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        nextPageToken_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageToken(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder clearNextPageToken() {
+      
+      nextPageToken_ = getDefaultInstance().getNextPageToken();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Token to retrieve the next page of results, or empty if there are no
+     * more results in the list.
+     * 

+     *
+     * string next_page_token = 2;
+     */
+    public Builder setNextPageTokenBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      nextPageToken_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListScanRunsResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListScanRunsResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponseOrBuilder.java
new file mode 100644
index 000000000000..3224646bdd67
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponseOrBuilder.java
@@ -0,0 +1,73 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ListScanRunsResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The list of ScanRuns returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+   */
+  java.util.List 
+      getScanRunsList();
+  /**
+   * 
+   * The list of ScanRuns returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanRun getScanRuns(int index);
+  /**
+   * 
+   * The list of ScanRuns returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+   */
+  int getScanRunsCount();
+  /**
+   * 
+   * The list of ScanRuns returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+   */
+  java.util.List 
+      getScanRunsOrBuilderList();
+  /**
+   * 
+   * The list of ScanRuns returned.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanRun scan_runs = 1;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanRunOrBuilder getScanRunsOrBuilder(
+      int index);
+
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  java.lang.String getNextPageToken();
+  /**
+   * 
+   * Token to retrieve the next page of results, or empty if there are no
+   * more results in the list.
+   * 

+   *
+   * string next_page_token = 2;
+   */
+  com.google.protobuf.ByteString
+      getNextPageTokenBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibrary.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibrary.java
new file mode 100644
index 000000000000..d2f5418cfb6d
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibrary.java
@@ -0,0 +1,934 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding_addon.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Information reported for an outdated library.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.OutdatedLibrary}
+ */
+public  final class OutdatedLibrary extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.OutdatedLibrary)
+    OutdatedLibraryOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use OutdatedLibrary.newBuilder() to construct.
+  private OutdatedLibrary(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private OutdatedLibrary() {
+    libraryName_ = "";
+    version_ = "";
+    learnMoreUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private OutdatedLibrary(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            libraryName_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            version_ = s;
+            break;
+          }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+              learnMoreUrls_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000004;
+            }
+            learnMoreUrls_.add(s);
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+        learnMoreUrls_ = learnMoreUrls_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.class, com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int LIBRARY_NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object libraryName_;
+  /**
+   * 
+   * The name of the outdated library.
+   * 

+   *
+   * string library_name = 1;
+   */
+  public java.lang.String getLibraryName() {
+    java.lang.Object ref = libraryName_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      libraryName_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The name of the outdated library.
+   * 

+   *
+   * string library_name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getLibraryNameBytes() {
+    java.lang.Object ref = libraryName_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      libraryName_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int VERSION_FIELD_NUMBER = 2;
+  private volatile java.lang.Object version_;
+  /**
+   * 
+   * The version number.
+   * 

+   *
+   * string version = 2;
+   */
+  public java.lang.String getVersion() {
+    java.lang.Object ref = version_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      version_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The version number.
+   * 

+   *
+   * string version = 2;
+   */
+  public com.google.protobuf.ByteString
+      getVersionBytes() {
+    java.lang.Object ref = version_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      version_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int LEARN_MORE_URLS_FIELD_NUMBER = 3;
+  private com.google.protobuf.LazyStringList learnMoreUrls_;
+  /**
+   * 
+   * URLs to learn more information about the vulnerabilities in the library.
+   * 

+   *
+   * repeated string learn_more_urls = 3;
+   */
+  public com.google.protobuf.ProtocolStringList
+      getLearnMoreUrlsList() {
+    return learnMoreUrls_;
+  }
+  /**
+   * 
+   * URLs to learn more information about the vulnerabilities in the library.
+   * 

+   *
+   * repeated string learn_more_urls = 3;
+   */
+  public int getLearnMoreUrlsCount() {
+    return learnMoreUrls_.size();
+  }
+  /**
+   * 
+   * URLs to learn more information about the vulnerabilities in the library.
+   * 

+   *
+   * repeated string learn_more_urls = 3;
+   */
+  public java.lang.String getLearnMoreUrls(int index) {
+    return learnMoreUrls_.get(index);
+  }
+  /**
+   * 
+   * URLs to learn more information about the vulnerabilities in the library.
+   * 

+   *
+   * repeated string learn_more_urls = 3;
+   */
+  public com.google.protobuf.ByteString
+      getLearnMoreUrlsBytes(int index) {
+    return learnMoreUrls_.getByteString(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getLibraryNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, libraryName_);
+    }
+    if (!getVersionBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, version_);
+    }
+    for (int i = 0; i < learnMoreUrls_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, learnMoreUrls_.getRaw(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getLibraryNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, libraryName_);
+    }
+    if (!getVersionBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, version_);
+    }
+    {
+      int dataSize = 0;
+      for (int i = 0; i < learnMoreUrls_.size(); i++) {
+        dataSize += computeStringSizeNoTag(learnMoreUrls_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getLearnMoreUrlsList().size();
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary other = (com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary) obj;
+
+    boolean result = true;
+    result = result && getLibraryName()
+        .equals(other.getLibraryName());
+    result = result && getVersion()
+        .equals(other.getVersion());
+    result = result && getLearnMoreUrlsList()
+        .equals(other.getLearnMoreUrlsList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + LIBRARY_NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getLibraryName().hashCode();
+    hash = (37 * hash) + VERSION_FIELD_NUMBER;
+    hash = (53 * hash) + getVersion().hashCode();
+    if (getLearnMoreUrlsCount() > 0) {
+      hash = (37 * hash) + LEARN_MORE_URLS_FIELD_NUMBER;
+      hash = (53 * hash) + getLearnMoreUrlsList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Information reported for an outdated library.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.OutdatedLibrary}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.OutdatedLibrary)
+      com.google.cloud.websecurityscanner.v1alpha.OutdatedLibraryOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.class, com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      libraryName_ = "";
+
+      version_ = "";
+
+      learnMoreUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary build() {
+      com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary result = new com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      result.libraryName_ = libraryName_;
+      result.version_ = version_;
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        learnMoreUrls_ = learnMoreUrls_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000004);
+      }
+      result.learnMoreUrls_ = learnMoreUrls_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.getDefaultInstance()) return this;
+      if (!other.getLibraryName().isEmpty()) {
+        libraryName_ = other.libraryName_;
+        onChanged();
+      }
+      if (!other.getVersion().isEmpty()) {
+        version_ = other.version_;
+        onChanged();
+      }
+      if (!other.learnMoreUrls_.isEmpty()) {
+        if (learnMoreUrls_.isEmpty()) {
+          learnMoreUrls_ = other.learnMoreUrls_;
+          bitField0_ = (bitField0_ & ~0x00000004);
+        } else {
+          ensureLearnMoreUrlsIsMutable();
+          learnMoreUrls_.addAll(other.learnMoreUrls_);
+        }
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.lang.Object libraryName_ = "";
+    /**
+     * 
+     * The name of the outdated library.
+     * 

+     *
+     * string library_name = 1;
+     */
+    public java.lang.String getLibraryName() {
+      java.lang.Object ref = libraryName_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        libraryName_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the outdated library.
+     * 

+     *
+     * string library_name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getLibraryNameBytes() {
+      java.lang.Object ref = libraryName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        libraryName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The name of the outdated library.
+     * 

+     *
+     * string library_name = 1;
+     */
+    public Builder setLibraryName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      libraryName_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the outdated library.
+     * 

+     *
+     * string library_name = 1;
+     */
+    public Builder clearLibraryName() {
+      
+      libraryName_ = getDefaultInstance().getLibraryName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The name of the outdated library.
+     * 

+     *
+     * string library_name = 1;
+     */
+    public Builder setLibraryNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      libraryName_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object version_ = "";
+    /**
+     * 
+     * The version number.
+     * 

+     *
+     * string version = 2;
+     */
+    public java.lang.String getVersion() {
+      java.lang.Object ref = version_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        version_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The version number.
+     * 

+     *
+     * string version = 2;
+     */
+    public com.google.protobuf.ByteString
+        getVersionBytes() {
+      java.lang.Object ref = version_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        version_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The version number.
+     * 

+     *
+     * string version = 2;
+     */
+    public Builder setVersion(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      version_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The version number.
+     * 

+     *
+     * string version = 2;
+     */
+    public Builder clearVersion() {
+      
+      version_ = getDefaultInstance().getVersion();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The version number.
+     * 

+     *
+     * string version = 2;
+     */
+    public Builder setVersionBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      version_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.LazyStringList learnMoreUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensureLearnMoreUrlsIsMutable() {
+      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
+        learnMoreUrls_ = new com.google.protobuf.LazyStringArrayList(learnMoreUrls_);
+        bitField0_ |= 0x00000004;
+       }
+    }
+    /**
+     * 
+     * URLs to learn more information about the vulnerabilities in the library.
+     * 

+     *
+     * repeated string learn_more_urls = 3;
+     */
+    public com.google.protobuf.ProtocolStringList
+        getLearnMoreUrlsList() {
+      return learnMoreUrls_.getUnmodifiableView();
+    }
+    /**
+     * 
+     * URLs to learn more information about the vulnerabilities in the library.
+     * 

+     *
+     * repeated string learn_more_urls = 3;
+     */
+    public int getLearnMoreUrlsCount() {
+      return learnMoreUrls_.size();
+    }
+    /**
+     * 
+     * URLs to learn more information about the vulnerabilities in the library.
+     * 

+     *
+     * repeated string learn_more_urls = 3;
+     */
+    public java.lang.String getLearnMoreUrls(int index) {
+      return learnMoreUrls_.get(index);
+    }
+    /**
+     * 
+     * URLs to learn more information about the vulnerabilities in the library.
+     * 

+     *
+     * repeated string learn_more_urls = 3;
+     */
+    public com.google.protobuf.ByteString
+        getLearnMoreUrlsBytes(int index) {
+      return learnMoreUrls_.getByteString(index);
+    }
+    /**
+     * 
+     * URLs to learn more information about the vulnerabilities in the library.
+     * 

+     *
+     * repeated string learn_more_urls = 3;
+     */
+    public Builder setLearnMoreUrls(
+        int index, java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureLearnMoreUrlsIsMutable();
+      learnMoreUrls_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * URLs to learn more information about the vulnerabilities in the library.
+     * 

+     *
+     * repeated string learn_more_urls = 3;
+     */
+    public Builder addLearnMoreUrls(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureLearnMoreUrlsIsMutable();
+      learnMoreUrls_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * URLs to learn more information about the vulnerabilities in the library.
+     * 

+     *
+     * repeated string learn_more_urls = 3;
+     */
+    public Builder addAllLearnMoreUrls(
+        java.lang.Iterable values) {
+      ensureLearnMoreUrlsIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, learnMoreUrls_);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * URLs to learn more information about the vulnerabilities in the library.
+     * 

+     *
+     * repeated string learn_more_urls = 3;
+     */
+    public Builder clearLearnMoreUrls() {
+      learnMoreUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000004);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * URLs to learn more information about the vulnerabilities in the library.
+     * 

+     *
+     * repeated string learn_more_urls = 3;
+     */
+    public Builder addLearnMoreUrlsBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      ensureLearnMoreUrlsIsMutable();
+      learnMoreUrls_.add(value);
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.OutdatedLibrary)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.OutdatedLibrary)
+  private static final com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public OutdatedLibrary parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new OutdatedLibrary(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibraryOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibraryOrBuilder.java
new file mode 100644
index 000000000000..7f3167f78162
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibraryOrBuilder.java
@@ -0,0 +1,80 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding_addon.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface OutdatedLibraryOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.OutdatedLibrary)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The name of the outdated library.
+   * 

+   *
+   * string library_name = 1;
+   */
+  java.lang.String getLibraryName();
+  /**
+   * 
+   * The name of the outdated library.
+   * 

+   *
+   * string library_name = 1;
+   */
+  com.google.protobuf.ByteString
+      getLibraryNameBytes();
+
+  /**
+   * 
+   * The version number.
+   * 

+   *
+   * string version = 2;
+   */
+  java.lang.String getVersion();
+  /**
+   * 
+   * The version number.
+   * 

+   *
+   * string version = 2;
+   */
+  com.google.protobuf.ByteString
+      getVersionBytes();
+
+  /**
+   * 
+   * URLs to learn more information about the vulnerabilities in the library.
+   * 

+   *
+   * repeated string learn_more_urls = 3;
+   */
+  java.util.List
+      getLearnMoreUrlsList();
+  /**
+   * 
+   * URLs to learn more information about the vulnerabilities in the library.
+   * 

+   *
+   * repeated string learn_more_urls = 3;
+   */
+  int getLearnMoreUrlsCount();
+  /**
+   * 
+   * URLs to learn more information about the vulnerabilities in the library.
+   * 

+   *
+   * repeated string learn_more_urls = 3;
+   */
+  java.lang.String getLearnMoreUrls(int index);
+  /**
+   * 
+   * URLs to learn more information about the vulnerabilities in the library.
+   * 

+   *
+   * repeated string learn_more_urls = 3;
+   */
+  com.google.protobuf.ByteString
+      getLearnMoreUrlsBytes(int index);
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ProjectName.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ProjectName.java
new file mode 100644
index 000000000000..e716b18c758c
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ProjectName.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, 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.
+ */
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.api.resourcenames.ResourceNameType;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class ProjectName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}");
+
+  private volatile Map fieldValuesMap;
+
+  private final String project;
+
+  public String getProject() {
+    return project;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private ProjectName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+  }
+
+  public static ProjectName of(String project) {
+    return newBuilder()
+      .setProject(project)
+      .build();
+  }
+
+  public static String format(String project) {
+    return newBuilder()
+      .setProject(project)
+      .build()
+      .toString();
+  }
+
+  public static ProjectName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map matchMap =
+        PATH_TEMPLATE.validatedMatch(formattedString, "ProjectName.parse: formattedString not in valid format");
+    return of(matchMap.get("project"));
+  }
+
+  public static List parseList(List formattedStrings) {
+    List list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List toStringList(List values) {
+    List list = new ArrayList(values.size());
+    for (ProjectName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  /**
+   * @deprecated This method is only present to satisfy the ResourceName interface.
+   */
+  @Deprecated
+  public ResourceNameType getType() {
+    throw new UnsupportedOperationException("ProjectName.getType() not supported");
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate("project", project);
+  }
+
+  /** Builder for ProjectName. */
+  public static class Builder {
+
+    private String project;
+
+    public String getProject() {
+      return project;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    private Builder() {
+    }
+
+    private Builder(ProjectName projectName) {
+      project = projectName.project;
+    }
+
+    public ProjectName build() {
+      return new ProjectName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof ProjectName) {
+      ProjectName that = (ProjectName) o;
+      return (this.project.equals(that.project));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    return h;
+  }
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfig.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfig.java
new file mode 100644
index 000000000000..81b5e84c1810
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfig.java
@@ -0,0 +1,6017 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/scan_config.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * A ScanConfig resource contains the configurations to launch a scan.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ScanConfig}
+ */
+public  final class ScanConfig extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ScanConfig)
+    ScanConfigOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ScanConfig.newBuilder() to construct.
+  private ScanConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ScanConfig() {
+    name_ = "";
+    displayName_ = "";
+    maxQps_ = 0;
+    startingUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    userAgent_ = 0;
+    blacklistPatterns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    targetPlatforms_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ScanConfig(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            displayName_ = s;
+            break;
+          }
+          case 24: {
+
+            maxQps_ = input.readInt32();
+            break;
+          }
+          case 34: {
+            java.lang.String s = input.readStringRequireUtf8();
+            if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+              startingUrls_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000008;
+            }
+            startingUrls_.add(s);
+            break;
+          }
+          case 42: {
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Builder subBuilder = null;
+            if (authentication_ != null) {
+              subBuilder = authentication_.toBuilder();
+            }
+            authentication_ = input.readMessage(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(authentication_);
+              authentication_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 48: {
+            int rawValue = input.readEnum();
+
+            userAgent_ = rawValue;
+            break;
+          }
+          case 58: {
+            java.lang.String s = input.readStringRequireUtf8();
+            if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+              blacklistPatterns_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000040;
+            }
+            blacklistPatterns_.add(s);
+            break;
+          }
+          case 66: {
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.Builder subBuilder = null;
+            if (schedule_ != null) {
+              subBuilder = schedule_.toBuilder();
+            }
+            schedule_ = input.readMessage(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(schedule_);
+              schedule_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 72: {
+            int rawValue = input.readEnum();
+            if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
+              targetPlatforms_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000100;
+            }
+            targetPlatforms_.add(rawValue);
+            break;
+          }
+          case 74: {
+            int length = input.readRawVarint32();
+            int oldLimit = input.pushLimit(length);
+            while(input.getBytesUntilLimit() > 0) {
+              int rawValue = input.readEnum();
+              if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
+                targetPlatforms_ = new java.util.ArrayList();
+                mutable_bitField0_ |= 0x00000100;
+              }
+              targetPlatforms_.add(rawValue);
+            }
+            input.popLimit(oldLimit);
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+        startingUrls_ = startingUrls_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+        blacklistPatterns_ = blacklistPatterns_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
+        targetPlatforms_ = java.util.Collections.unmodifiableList(targetPlatforms_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.class, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder.class);
+  }
+
+  /**
+   * 
+   * Type of user agents used for scanning.
+   * 

+   *
+   * Protobuf enum {@code google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent}
+   */
+  public enum UserAgent
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * 
+     * The user agent is unknown. Service will default to CHROME_LINUX.
+     * 

+     *
+     * USER_AGENT_UNSPECIFIED = 0;
+     */
+    USER_AGENT_UNSPECIFIED(0),
+    /**
+     * 
+     * Chrome on Linux. This is the service default if unspecified.
+     * 

+     *
+     * CHROME_LINUX = 1;
+     */
+    CHROME_LINUX(1),
+    /**
+     * 
+     * Chrome on Android.
+     * 

+     *
+     * CHROME_ANDROID = 2;
+     */
+    CHROME_ANDROID(2),
+    /**
+     * 
+     * Safari on IPhone.
+     * 

+     *
+     * SAFARI_IPHONE = 3;
+     */
+    SAFARI_IPHONE(3),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * 
+     * The user agent is unknown. Service will default to CHROME_LINUX.
+     * 

+     *
+     * USER_AGENT_UNSPECIFIED = 0;
+     */
+    public static final int USER_AGENT_UNSPECIFIED_VALUE = 0;
+    /**
+     * 
+     * Chrome on Linux. This is the service default if unspecified.
+     * 

+     *
+     * CHROME_LINUX = 1;
+     */
+    public static final int CHROME_LINUX_VALUE = 1;
+    /**
+     * 
+     * Chrome on Android.
+     * 

+     *
+     * CHROME_ANDROID = 2;
+     */
+    public static final int CHROME_ANDROID_VALUE = 2;
+    /**
+     * 
+     * Safari on IPhone.
+     * 

+     *
+     * SAFARI_IPHONE = 3;
+     */
+    public static final int SAFARI_IPHONE_VALUE = 3;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static UserAgent valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static UserAgent forNumber(int value) {
+      switch (value) {
+        case 0: return USER_AGENT_UNSPECIFIED;
+        case 1: return CHROME_LINUX;
+        case 2: return CHROME_ANDROID;
+        case 3: return SAFARI_IPHONE;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        UserAgent> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public UserAgent findValueByNumber(int number) {
+              return UserAgent.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final UserAgent[] VALUES = values();
+
+    public static UserAgent valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private UserAgent(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent)
+  }
+
+  /**
+   * 
+   * Cloud platforms supported by Cloud Web Security Scanner.
+   * 

+   *
+   * Protobuf enum {@code google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform}
+   */
+  public enum TargetPlatform
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * 
+     * The target platform is unknown. Requests with this enum value will be
+     * rejected with INVALID_ARGUMENT error.
+     * 

+     *
+     * TARGET_PLATFORM_UNSPECIFIED = 0;
+     */
+    TARGET_PLATFORM_UNSPECIFIED(0),
+    /**
+     * 
+     * Google App Engine service.
+     * 

+     *
+     * APP_ENGINE = 1;
+     */
+    APP_ENGINE(1),
+    /**
+     * 
+     * Google Compute Engine service.
+     * 

+     *
+     * COMPUTE = 2;
+     */
+    COMPUTE(2),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * 
+     * The target platform is unknown. Requests with this enum value will be
+     * rejected with INVALID_ARGUMENT error.
+     * 

+     *
+     * TARGET_PLATFORM_UNSPECIFIED = 0;
+     */
+    public static final int TARGET_PLATFORM_UNSPECIFIED_VALUE = 0;
+    /**
+     * 
+     * Google App Engine service.
+     * 

+     *
+     * APP_ENGINE = 1;
+     */
+    public static final int APP_ENGINE_VALUE = 1;
+    /**
+     * 
+     * Google Compute Engine service.
+     * 

+     *
+     * COMPUTE = 2;
+     */
+    public static final int COMPUTE_VALUE = 2;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static TargetPlatform valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static TargetPlatform forNumber(int value) {
+      switch (value) {
+        case 0: return TARGET_PLATFORM_UNSPECIFIED;
+        case 1: return APP_ENGINE;
+        case 2: return COMPUTE;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        TargetPlatform> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public TargetPlatform findValueByNumber(int number) {
+              return TargetPlatform.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDescriptor().getEnumTypes().get(1);
+    }
+
+    private static final TargetPlatform[] VALUES = values();
+
+    public static TargetPlatform valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private TargetPlatform(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform)
+  }
+
+  public interface AuthenticationOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * 
+     * Authentication using a Google account.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+     */
+    boolean hasGoogleAccount();
+    /**
+     * 
+     * Authentication using a Google account.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+     */
+    com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount getGoogleAccount();
+    /**
+     * 
+     * Authentication using a Google account.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+     */
+    com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccountOrBuilder getGoogleAccountOrBuilder();
+
+    /**
+     * 
+     * Authentication using a custom account.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+     */
+    boolean hasCustomAccount();
+    /**
+     * 
+     * Authentication using a custom account.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+     */
+    com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount getCustomAccount();
+    /**
+     * 
+     * Authentication using a custom account.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+     */
+    com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccountOrBuilder getCustomAccountOrBuilder();
+
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.AuthenticationCase getAuthenticationCase();
+  }
+  /**
+   * 
+   * Scan authentication configuration.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication}
+   */
+  public  static final class Authentication extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication)
+      AuthenticationOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use Authentication.newBuilder() to construct.
+    private Authentication(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+    private Authentication() {
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private Authentication(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 10: {
+              com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.Builder subBuilder = null;
+              if (authenticationCase_ == 1) {
+                subBuilder = ((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) authentication_).toBuilder();
+              }
+              authentication_ =
+                  input.readMessage(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) authentication_);
+                authentication_ = subBuilder.buildPartial();
+              }
+              authenticationCase_ = 1;
+              break;
+            }
+            case 18: {
+              com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.Builder subBuilder = null;
+              if (authenticationCase_ == 2) {
+                subBuilder = ((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) authentication_).toBuilder();
+              }
+              authentication_ =
+                  input.readMessage(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) authentication_);
+                authentication_ = subBuilder.buildPartial();
+              }
+              authenticationCase_ = 2;
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.class, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Builder.class);
+    }
+
+    public interface GoogleAccountOrBuilder extends
+        // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount)
+        com.google.protobuf.MessageOrBuilder {
+
+      /**
+       * 
+       * Required.
+       * The user name of the Google account.
+       * 

+       *
+       * string username = 1;
+       */
+      java.lang.String getUsername();
+      /**
+       * 
+       * Required.
+       * The user name of the Google account.
+       * 

+       *
+       * string username = 1;
+       */
+      com.google.protobuf.ByteString
+          getUsernameBytes();
+
+      /**
+       * 
+       * Input only.
+       * Required.
+       * The password of the Google account. The credential is stored encrypted
+       * and not returned in any response.
+       * 

+       *
+       * string password = 2;
+       */
+      java.lang.String getPassword();
+      /**
+       * 
+       * Input only.
+       * Required.
+       * The password of the Google account. The credential is stored encrypted
+       * and not returned in any response.
+       * 

+       *
+       * string password = 2;
+       */
+      com.google.protobuf.ByteString
+          getPasswordBytes();
+    }
+    /**
+     * 
+     * Describes authentication configuration that uses a Google account.
+     * 

+     *
+     * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount}
+     */
+    public  static final class GoogleAccount extends
+        com.google.protobuf.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount)
+        GoogleAccountOrBuilder {
+    private static final long serialVersionUID = 0L;
+      // Use GoogleAccount.newBuilder() to construct.
+      private GoogleAccount(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+        super(builder);
+      }
+      private GoogleAccount() {
+        username_ = "";
+        password_ = "";
+      }
+
+      @java.lang.Override
+      public final com.google.protobuf.UnknownFieldSet
+      getUnknownFields() {
+        return this.unknownFields;
+      }
+      private GoogleAccount(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        this();
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        int mutable_bitField0_ = 0;
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+            com.google.protobuf.UnknownFieldSet.newBuilder();
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+              case 10: {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                username_ = s;
+                break;
+              }
+              case 18: {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                password_ = s;
+                break;
+              }
+            }
+          }
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(this);
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(
+              e).setUnfinishedMessage(this);
+        } finally {
+          this.unknownFields = unknownFields.build();
+          makeExtensionsImmutable();
+        }
+      }
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.class, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.Builder.class);
+      }
+
+      public static final int USERNAME_FIELD_NUMBER = 1;
+      private volatile java.lang.Object username_;
+      /**
+       * 
+       * Required.
+       * The user name of the Google account.
+       * 

+       *
+       * string username = 1;
+       */
+      public java.lang.String getUsername() {
+        java.lang.Object ref = username_;
+        if (ref instanceof java.lang.String) {
+          return (java.lang.String) ref;
+        } else {
+          com.google.protobuf.ByteString bs = 
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          username_ = s;
+          return s;
+        }
+      }
+      /**
+       * 
+       * Required.
+       * The user name of the Google account.
+       * 

+       *
+       * string username = 1;
+       */
+      public com.google.protobuf.ByteString
+          getUsernameBytes() {
+        java.lang.Object ref = username_;
+        if (ref instanceof java.lang.String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          username_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+
+      public static final int PASSWORD_FIELD_NUMBER = 2;
+      private volatile java.lang.Object password_;
+      /**
+       * 
+       * Input only.
+       * Required.
+       * The password of the Google account. The credential is stored encrypted
+       * and not returned in any response.
+       * 

+       *
+       * string password = 2;
+       */
+      public java.lang.String getPassword() {
+        java.lang.Object ref = password_;
+        if (ref instanceof java.lang.String) {
+          return (java.lang.String) ref;
+        } else {
+          com.google.protobuf.ByteString bs = 
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          password_ = s;
+          return s;
+        }
+      }
+      /**
+       * 
+       * Input only.
+       * Required.
+       * The password of the Google account. The credential is stored encrypted
+       * and not returned in any response.
+       * 

+       *
+       * string password = 2;
+       */
+      public com.google.protobuf.ByteString
+          getPasswordBytes() {
+        java.lang.Object ref = password_;
+        if (ref instanceof java.lang.String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          password_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+
+      private byte memoizedIsInitialized = -1;
+      public final boolean isInitialized() {
+        byte isInitialized = memoizedIsInitialized;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
+
+        memoizedIsInitialized = 1;
+        return true;
+      }
+
+      public void writeTo(com.google.protobuf.CodedOutputStream output)
+                          throws java.io.IOException {
+        if (!getUsernameBytes().isEmpty()) {
+          com.google.protobuf.GeneratedMessageV3.writeString(output, 1, username_);
+        }
+        if (!getPasswordBytes().isEmpty()) {
+          com.google.protobuf.GeneratedMessageV3.writeString(output, 2, password_);
+        }
+        unknownFields.writeTo(output);
+      }
+
+      public int getSerializedSize() {
+        int size = memoizedSize;
+        if (size != -1) return size;
+
+        size = 0;
+        if (!getUsernameBytes().isEmpty()) {
+          size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, username_);
+        }
+        if (!getPasswordBytes().isEmpty()) {
+          size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, password_);
+        }
+        size += unknownFields.getSerializedSize();
+        memoizedSize = size;
+        return size;
+      }
+
+      @java.lang.Override
+      public boolean equals(final java.lang.Object obj) {
+        if (obj == this) {
+         return true;
+        }
+        if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount)) {
+          return super.equals(obj);
+        }
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount other = (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) obj;
+
+        boolean result = true;
+        result = result && getUsername()
+            .equals(other.getUsername());
+        result = result && getPassword()
+            .equals(other.getPassword());
+        result = result && unknownFields.equals(other.unknownFields);
+        return result;
+      }
+
+      @java.lang.Override
+      public int hashCode() {
+        if (memoizedHashCode != 0) {
+          return memoizedHashCode;
+        }
+        int hash = 41;
+        hash = (19 * hash) + getDescriptor().hashCode();
+        hash = (37 * hash) + USERNAME_FIELD_NUMBER;
+        hash = (53 * hash) + getUsername().hashCode();
+        hash = (37 * hash) + PASSWORD_FIELD_NUMBER;
+        hash = (53 * hash) + getPassword().hashCode();
+        hash = (29 * hash) + unknownFields.hashCode();
+        memoizedHashCode = hash;
+        return hash;
+      }
+
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parseFrom(
+          java.nio.ByteBuffer data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parseFrom(
+          java.nio.ByteBuffer data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parseFrom(
+          byte[] data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parseFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parseFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input, extensionRegistry);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parseDelimitedFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parseDelimitedFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parseFrom(
+          com.google.protobuf.CodedInputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      public Builder newBuilderForType() { return newBuilder(); }
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
+      }
+      public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount prototype) {
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+      }
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE
+            ? new Builder() : new Builder().mergeFrom(this);
+      }
+
+      @java.lang.Override
+      protected Builder newBuilderForType(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        Builder builder = new Builder(parent);
+        return builder;
+      }
+      /**
+       * 
+       * Describes authentication configuration that uses a Google account.
+       * 

+       *
+       * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount}
+       */
+      public static final class Builder extends
+          com.google.protobuf.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount)
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccountOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor
+            getDescriptor() {
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_descriptor;
+        }
+
+        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+            internalGetFieldAccessorTable() {
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_fieldAccessorTable
+              .ensureFieldAccessorsInitialized(
+                  com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.class, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.Builder.class);
+        }
+
+        // Construct using com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.newBuilder()
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
+
+        private Builder(
+            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+          super(parent);
+          maybeForceBuilderInitialization();
+        }
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessageV3
+                  .alwaysUseFieldBuilders) {
+          }
+        }
+        public Builder clear() {
+          super.clear();
+          username_ = "";
+
+          password_ = "";
+
+          return this;
+        }
+
+        public com.google.protobuf.Descriptors.Descriptor
+            getDescriptorForType() {
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_descriptor;
+        }
+
+        public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount getDefaultInstanceForType() {
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.getDefaultInstance();
+        }
+
+        public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount build() {
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount result = buildPartial();
+          if (!result.isInitialized()) {
+            throw newUninitializedMessageException(result);
+          }
+          return result;
+        }
+
+        public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount buildPartial() {
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount result = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount(this);
+          result.username_ = username_;
+          result.password_ = password_;
+          onBuilt();
+          return result;
+        }
+
+        public Builder clone() {
+          return (Builder) super.clone();
+        }
+        public Builder setField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
+          return (Builder) super.setField(field, value);
+        }
+        public Builder clearField(
+            com.google.protobuf.Descriptors.FieldDescriptor field) {
+          return (Builder) super.clearField(field);
+        }
+        public Builder clearOneof(
+            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+          return (Builder) super.clearOneof(oneof);
+        }
+        public Builder setRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            int index, java.lang.Object value) {
+          return (Builder) super.setRepeatedField(field, index, value);
+        }
+        public Builder addRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
+          return (Builder) super.addRepeatedField(field, value);
+        }
+        public Builder mergeFrom(com.google.protobuf.Message other) {
+          if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) {
+            return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount)other);
+          } else {
+            super.mergeFrom(other);
+            return this;
+          }
+        }
+
+        public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount other) {
+          if (other == com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.getDefaultInstance()) return this;
+          if (!other.getUsername().isEmpty()) {
+            username_ = other.username_;
+            onChanged();
+          }
+          if (!other.getPassword().isEmpty()) {
+            password_ = other.password_;
+            onChanged();
+          }
+          this.mergeUnknownFields(other.unknownFields);
+          onChanged();
+          return this;
+        }
+
+        public final boolean isInitialized() {
+          return true;
+        }
+
+        public Builder mergeFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount parsedMessage = null;
+          try {
+            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) e.getUnfinishedMessage();
+            throw e.unwrapIOException();
+          } finally {
+            if (parsedMessage != null) {
+              mergeFrom(parsedMessage);
+            }
+          }
+          return this;
+        }
+
+        private java.lang.Object username_ = "";
+        /**
+         * 
+         * Required.
+         * The user name of the Google account.
+         * 

+         *
+         * string username = 1;
+         */
+        public java.lang.String getUsername() {
+          java.lang.Object ref = username_;
+          if (!(ref instanceof java.lang.String)) {
+            com.google.protobuf.ByteString bs =
+                (com.google.protobuf.ByteString) ref;
+            java.lang.String s = bs.toStringUtf8();
+            username_ = s;
+            return s;
+          } else {
+            return (java.lang.String) ref;
+          }
+        }
+        /**
+         * 
+         * Required.
+         * The user name of the Google account.
+         * 

+         *
+         * string username = 1;
+         */
+        public com.google.protobuf.ByteString
+            getUsernameBytes() {
+          java.lang.Object ref = username_;
+          if (ref instanceof String) {
+            com.google.protobuf.ByteString b = 
+                com.google.protobuf.ByteString.copyFromUtf8(
+                    (java.lang.String) ref);
+            username_ = b;
+            return b;
+          } else {
+            return (com.google.protobuf.ByteString) ref;
+          }
+        }
+        /**
+         * 
+         * Required.
+         * The user name of the Google account.
+         * 

+         *
+         * string username = 1;
+         */
+        public Builder setUsername(
+            java.lang.String value) {
+          if (value == null) {
+    throw new NullPointerException();
+  }
+  
+          username_ = value;
+          onChanged();
+          return this;
+        }
+        /**
+         * 
+         * Required.
+         * The user name of the Google account.
+         * 

+         *
+         * string username = 1;
+         */
+        public Builder clearUsername() {
+          
+          username_ = getDefaultInstance().getUsername();
+          onChanged();
+          return this;
+        }
+        /**
+         * 
+         * Required.
+         * The user name of the Google account.
+         * 

+         *
+         * string username = 1;
+         */
+        public Builder setUsernameBytes(
+            com.google.protobuf.ByteString value) {
+          if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+          
+          username_ = value;
+          onChanged();
+          return this;
+        }
+
+        private java.lang.Object password_ = "";
+        /**
+         * 
+         * Input only.
+         * Required.
+         * The password of the Google account. The credential is stored encrypted
+         * and not returned in any response.
+         * 

+         *
+         * string password = 2;
+         */
+        public java.lang.String getPassword() {
+          java.lang.Object ref = password_;
+          if (!(ref instanceof java.lang.String)) {
+            com.google.protobuf.ByteString bs =
+                (com.google.protobuf.ByteString) ref;
+            java.lang.String s = bs.toStringUtf8();
+            password_ = s;
+            return s;
+          } else {
+            return (java.lang.String) ref;
+          }
+        }
+        /**
+         * 
+         * Input only.
+         * Required.
+         * The password of the Google account. The credential is stored encrypted
+         * and not returned in any response.
+         * 

+         *
+         * string password = 2;
+         */
+        public com.google.protobuf.ByteString
+            getPasswordBytes() {
+          java.lang.Object ref = password_;
+          if (ref instanceof String) {
+            com.google.protobuf.ByteString b = 
+                com.google.protobuf.ByteString.copyFromUtf8(
+                    (java.lang.String) ref);
+            password_ = b;
+            return b;
+          } else {
+            return (com.google.protobuf.ByteString) ref;
+          }
+        }
+        /**
+         * 
+         * Input only.
+         * Required.
+         * The password of the Google account. The credential is stored encrypted
+         * and not returned in any response.
+         * 

+         *
+         * string password = 2;
+         */
+        public Builder setPassword(
+            java.lang.String value) {
+          if (value == null) {
+    throw new NullPointerException();
+  }
+  
+          password_ = value;
+          onChanged();
+          return this;
+        }
+        /**
+         * 
+         * Input only.
+         * Required.
+         * The password of the Google account. The credential is stored encrypted
+         * and not returned in any response.
+         * 

+         *
+         * string password = 2;
+         */
+        public Builder clearPassword() {
+          
+          password_ = getDefaultInstance().getPassword();
+          onChanged();
+          return this;
+        }
+        /**
+         * 
+         * Input only.
+         * Required.
+         * The password of the Google account. The credential is stored encrypted
+         * and not returned in any response.
+         * 

+         *
+         * string password = 2;
+         */
+        public Builder setPasswordBytes(
+            com.google.protobuf.ByteString value) {
+          if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+          
+          password_ = value;
+          onChanged();
+          return this;
+        }
+        public final Builder setUnknownFields(
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
+          return super.setUnknownFieldsProto3(unknownFields);
+        }
+
+        public final Builder mergeUnknownFields(
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
+          return super.mergeUnknownFields(unknownFields);
+        }
+
+
+        // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount)
+      }
+
+      // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount)
+      private static final com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount DEFAULT_INSTANCE;
+      static {
+        DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount();
+      }
+
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      private static final com.google.protobuf.Parser
+          PARSER = new com.google.protobuf.AbstractParser() {
+        public GoogleAccount parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new GoogleAccount(input, extensionRegistry);
+        }
+      };
+
+      public static com.google.protobuf.Parser parser() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Parser getParserForType() {
+        return PARSER;
+      }
+
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
+      }
+
+    }
+
+    public interface CustomAccountOrBuilder extends
+        // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount)
+        com.google.protobuf.MessageOrBuilder {
+
+      /**
+       * 
+       * Required.
+       * The user name of the custom account.
+       * 

+       *
+       * string username = 1;
+       */
+      java.lang.String getUsername();
+      /**
+       * 
+       * Required.
+       * The user name of the custom account.
+       * 

+       *
+       * string username = 1;
+       */
+      com.google.protobuf.ByteString
+          getUsernameBytes();
+
+      /**
+       * 
+       * Input only.
+       * Required.
+       * The password of the custom account. The credential is stored encrypted
+       * and not returned in any response.
+       * 

+       *
+       * string password = 2;
+       */
+      java.lang.String getPassword();
+      /**
+       * 
+       * Input only.
+       * Required.
+       * The password of the custom account. The credential is stored encrypted
+       * and not returned in any response.
+       * 

+       *
+       * string password = 2;
+       */
+      com.google.protobuf.ByteString
+          getPasswordBytes();
+
+      /**
+       * 
+       * Required.
+       * The login form URL of the website.
+       * 

+       *
+       * string login_url = 3;
+       */
+      java.lang.String getLoginUrl();
+      /**
+       * 
+       * Required.
+       * The login form URL of the website.
+       * 

+       *
+       * string login_url = 3;
+       */
+      com.google.protobuf.ByteString
+          getLoginUrlBytes();
+    }
+    /**
+     * 
+     * Describes authentication configuration that uses a custom account.
+     * 

+     *
+     * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount}
+     */
+    public  static final class CustomAccount extends
+        com.google.protobuf.GeneratedMessageV3 implements
+        // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount)
+        CustomAccountOrBuilder {
+    private static final long serialVersionUID = 0L;
+      // Use CustomAccount.newBuilder() to construct.
+      private CustomAccount(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+        super(builder);
+      }
+      private CustomAccount() {
+        username_ = "";
+        password_ = "";
+        loginUrl_ = "";
+      }
+
+      @java.lang.Override
+      public final com.google.protobuf.UnknownFieldSet
+      getUnknownFields() {
+        return this.unknownFields;
+      }
+      private CustomAccount(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        this();
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
+        int mutable_bitField0_ = 0;
+        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+            com.google.protobuf.UnknownFieldSet.newBuilder();
+        try {
+          boolean done = false;
+          while (!done) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                done = true;
+                break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
+              case 10: {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                username_ = s;
+                break;
+              }
+              case 18: {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                password_ = s;
+                break;
+              }
+              case 26: {
+                java.lang.String s = input.readStringRequireUtf8();
+
+                loginUrl_ = s;
+                break;
+              }
+            }
+          }
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          throw e.setUnfinishedMessage(this);
+        } catch (java.io.IOException e) {
+          throw new com.google.protobuf.InvalidProtocolBufferException(
+              e).setUnfinishedMessage(this);
+        } finally {
+          this.unknownFields = unknownFields.build();
+          makeExtensionsImmutable();
+        }
+      }
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.class, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.Builder.class);
+      }
+
+      public static final int USERNAME_FIELD_NUMBER = 1;
+      private volatile java.lang.Object username_;
+      /**
+       * 
+       * Required.
+       * The user name of the custom account.
+       * 

+       *
+       * string username = 1;
+       */
+      public java.lang.String getUsername() {
+        java.lang.Object ref = username_;
+        if (ref instanceof java.lang.String) {
+          return (java.lang.String) ref;
+        } else {
+          com.google.protobuf.ByteString bs = 
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          username_ = s;
+          return s;
+        }
+      }
+      /**
+       * 
+       * Required.
+       * The user name of the custom account.
+       * 

+       *
+       * string username = 1;
+       */
+      public com.google.protobuf.ByteString
+          getUsernameBytes() {
+        java.lang.Object ref = username_;
+        if (ref instanceof java.lang.String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          username_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+
+      public static final int PASSWORD_FIELD_NUMBER = 2;
+      private volatile java.lang.Object password_;
+      /**
+       * 
+       * Input only.
+       * Required.
+       * The password of the custom account. The credential is stored encrypted
+       * and not returned in any response.
+       * 

+       *
+       * string password = 2;
+       */
+      public java.lang.String getPassword() {
+        java.lang.Object ref = password_;
+        if (ref instanceof java.lang.String) {
+          return (java.lang.String) ref;
+        } else {
+          com.google.protobuf.ByteString bs = 
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          password_ = s;
+          return s;
+        }
+      }
+      /**
+       * 
+       * Input only.
+       * Required.
+       * The password of the custom account. The credential is stored encrypted
+       * and not returned in any response.
+       * 

+       *
+       * string password = 2;
+       */
+      public com.google.protobuf.ByteString
+          getPasswordBytes() {
+        java.lang.Object ref = password_;
+        if (ref instanceof java.lang.String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          password_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+
+      public static final int LOGIN_URL_FIELD_NUMBER = 3;
+      private volatile java.lang.Object loginUrl_;
+      /**
+       * 
+       * Required.
+       * The login form URL of the website.
+       * 

+       *
+       * string login_url = 3;
+       */
+      public java.lang.String getLoginUrl() {
+        java.lang.Object ref = loginUrl_;
+        if (ref instanceof java.lang.String) {
+          return (java.lang.String) ref;
+        } else {
+          com.google.protobuf.ByteString bs = 
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          loginUrl_ = s;
+          return s;
+        }
+      }
+      /**
+       * 
+       * Required.
+       * The login form URL of the website.
+       * 

+       *
+       * string login_url = 3;
+       */
+      public com.google.protobuf.ByteString
+          getLoginUrlBytes() {
+        java.lang.Object ref = loginUrl_;
+        if (ref instanceof java.lang.String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          loginUrl_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+
+      private byte memoizedIsInitialized = -1;
+      public final boolean isInitialized() {
+        byte isInitialized = memoizedIsInitialized;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
+
+        memoizedIsInitialized = 1;
+        return true;
+      }
+
+      public void writeTo(com.google.protobuf.CodedOutputStream output)
+                          throws java.io.IOException {
+        if (!getUsernameBytes().isEmpty()) {
+          com.google.protobuf.GeneratedMessageV3.writeString(output, 1, username_);
+        }
+        if (!getPasswordBytes().isEmpty()) {
+          com.google.protobuf.GeneratedMessageV3.writeString(output, 2, password_);
+        }
+        if (!getLoginUrlBytes().isEmpty()) {
+          com.google.protobuf.GeneratedMessageV3.writeString(output, 3, loginUrl_);
+        }
+        unknownFields.writeTo(output);
+      }
+
+      public int getSerializedSize() {
+        int size = memoizedSize;
+        if (size != -1) return size;
+
+        size = 0;
+        if (!getUsernameBytes().isEmpty()) {
+          size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, username_);
+        }
+        if (!getPasswordBytes().isEmpty()) {
+          size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, password_);
+        }
+        if (!getLoginUrlBytes().isEmpty()) {
+          size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, loginUrl_);
+        }
+        size += unknownFields.getSerializedSize();
+        memoizedSize = size;
+        return size;
+      }
+
+      @java.lang.Override
+      public boolean equals(final java.lang.Object obj) {
+        if (obj == this) {
+         return true;
+        }
+        if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount)) {
+          return super.equals(obj);
+        }
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount other = (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) obj;
+
+        boolean result = true;
+        result = result && getUsername()
+            .equals(other.getUsername());
+        result = result && getPassword()
+            .equals(other.getPassword());
+        result = result && getLoginUrl()
+            .equals(other.getLoginUrl());
+        result = result && unknownFields.equals(other.unknownFields);
+        return result;
+      }
+
+      @java.lang.Override
+      public int hashCode() {
+        if (memoizedHashCode != 0) {
+          return memoizedHashCode;
+        }
+        int hash = 41;
+        hash = (19 * hash) + getDescriptor().hashCode();
+        hash = (37 * hash) + USERNAME_FIELD_NUMBER;
+        hash = (53 * hash) + getUsername().hashCode();
+        hash = (37 * hash) + PASSWORD_FIELD_NUMBER;
+        hash = (53 * hash) + getPassword().hashCode();
+        hash = (37 * hash) + LOGIN_URL_FIELD_NUMBER;
+        hash = (53 * hash) + getLoginUrl().hashCode();
+        hash = (29 * hash) + unknownFields.hashCode();
+        memoizedHashCode = hash;
+        return hash;
+      }
+
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parseFrom(
+          java.nio.ByteBuffer data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parseFrom(
+          java.nio.ByteBuffer data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parseFrom(
+          byte[] data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return PARSER.parseFrom(data, extensionRegistry);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parseFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parseFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input, extensionRegistry);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parseDelimitedFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parseDelimitedFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parseFrom(
+          com.google.protobuf.CodedInputStream input)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input);
+      }
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return com.google.protobuf.GeneratedMessageV3
+            .parseWithIOException(PARSER, input, extensionRegistry);
+      }
+
+      public Builder newBuilderForType() { return newBuilder(); }
+      public static Builder newBuilder() {
+        return DEFAULT_INSTANCE.toBuilder();
+      }
+      public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount prototype) {
+        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+      }
+      public Builder toBuilder() {
+        return this == DEFAULT_INSTANCE
+            ? new Builder() : new Builder().mergeFrom(this);
+      }
+
+      @java.lang.Override
+      protected Builder newBuilderForType(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        Builder builder = new Builder(parent);
+        return builder;
+      }
+      /**
+       * 
+       * Describes authentication configuration that uses a custom account.
+       * 

+       *
+       * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount}
+       */
+      public static final class Builder extends
+          com.google.protobuf.GeneratedMessageV3.Builder implements
+          // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount)
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccountOrBuilder {
+        public static final com.google.protobuf.Descriptors.Descriptor
+            getDescriptor() {
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_descriptor;
+        }
+
+        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+            internalGetFieldAccessorTable() {
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_fieldAccessorTable
+              .ensureFieldAccessorsInitialized(
+                  com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.class, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.Builder.class);
+        }
+
+        // Construct using com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.newBuilder()
+        private Builder() {
+          maybeForceBuilderInitialization();
+        }
+
+        private Builder(
+            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+          super(parent);
+          maybeForceBuilderInitialization();
+        }
+        private void maybeForceBuilderInitialization() {
+          if (com.google.protobuf.GeneratedMessageV3
+                  .alwaysUseFieldBuilders) {
+          }
+        }
+        public Builder clear() {
+          super.clear();
+          username_ = "";
+
+          password_ = "";
+
+          loginUrl_ = "";
+
+          return this;
+        }
+
+        public com.google.protobuf.Descriptors.Descriptor
+            getDescriptorForType() {
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_descriptor;
+        }
+
+        public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount getDefaultInstanceForType() {
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.getDefaultInstance();
+        }
+
+        public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount build() {
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount result = buildPartial();
+          if (!result.isInitialized()) {
+            throw newUninitializedMessageException(result);
+          }
+          return result;
+        }
+
+        public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount buildPartial() {
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount result = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount(this);
+          result.username_ = username_;
+          result.password_ = password_;
+          result.loginUrl_ = loginUrl_;
+          onBuilt();
+          return result;
+        }
+
+        public Builder clone() {
+          return (Builder) super.clone();
+        }
+        public Builder setField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
+          return (Builder) super.setField(field, value);
+        }
+        public Builder clearField(
+            com.google.protobuf.Descriptors.FieldDescriptor field) {
+          return (Builder) super.clearField(field);
+        }
+        public Builder clearOneof(
+            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+          return (Builder) super.clearOneof(oneof);
+        }
+        public Builder setRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            int index, java.lang.Object value) {
+          return (Builder) super.setRepeatedField(field, index, value);
+        }
+        public Builder addRepeatedField(
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
+          return (Builder) super.addRepeatedField(field, value);
+        }
+        public Builder mergeFrom(com.google.protobuf.Message other) {
+          if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) {
+            return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount)other);
+          } else {
+            super.mergeFrom(other);
+            return this;
+          }
+        }
+
+        public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount other) {
+          if (other == com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.getDefaultInstance()) return this;
+          if (!other.getUsername().isEmpty()) {
+            username_ = other.username_;
+            onChanged();
+          }
+          if (!other.getPassword().isEmpty()) {
+            password_ = other.password_;
+            onChanged();
+          }
+          if (!other.getLoginUrl().isEmpty()) {
+            loginUrl_ = other.loginUrl_;
+            onChanged();
+          }
+          this.mergeUnknownFields(other.unknownFields);
+          onChanged();
+          return this;
+        }
+
+        public final boolean isInitialized() {
+          return true;
+        }
+
+        public Builder mergeFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount parsedMessage = null;
+          try {
+            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+            parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) e.getUnfinishedMessage();
+            throw e.unwrapIOException();
+          } finally {
+            if (parsedMessage != null) {
+              mergeFrom(parsedMessage);
+            }
+          }
+          return this;
+        }
+
+        private java.lang.Object username_ = "";
+        /**
+         * 
+         * Required.
+         * The user name of the custom account.
+         * 

+         *
+         * string username = 1;
+         */
+        public java.lang.String getUsername() {
+          java.lang.Object ref = username_;
+          if (!(ref instanceof java.lang.String)) {
+            com.google.protobuf.ByteString bs =
+                (com.google.protobuf.ByteString) ref;
+            java.lang.String s = bs.toStringUtf8();
+            username_ = s;
+            return s;
+          } else {
+            return (java.lang.String) ref;
+          }
+        }
+        /**
+         * 
+         * Required.
+         * The user name of the custom account.
+         * 

+         *
+         * string username = 1;
+         */
+        public com.google.protobuf.ByteString
+            getUsernameBytes() {
+          java.lang.Object ref = username_;
+          if (ref instanceof String) {
+            com.google.protobuf.ByteString b = 
+                com.google.protobuf.ByteString.copyFromUtf8(
+                    (java.lang.String) ref);
+            username_ = b;
+            return b;
+          } else {
+            return (com.google.protobuf.ByteString) ref;
+          }
+        }
+        /**
+         * 
+         * Required.
+         * The user name of the custom account.
+         * 

+         *
+         * string username = 1;
+         */
+        public Builder setUsername(
+            java.lang.String value) {
+          if (value == null) {
+    throw new NullPointerException();
+  }
+  
+          username_ = value;
+          onChanged();
+          return this;
+        }
+        /**
+         * 
+         * Required.
+         * The user name of the custom account.
+         * 

+         *
+         * string username = 1;
+         */
+        public Builder clearUsername() {
+          
+          username_ = getDefaultInstance().getUsername();
+          onChanged();
+          return this;
+        }
+        /**
+         * 
+         * Required.
+         * The user name of the custom account.
+         * 

+         *
+         * string username = 1;
+         */
+        public Builder setUsernameBytes(
+            com.google.protobuf.ByteString value) {
+          if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+          
+          username_ = value;
+          onChanged();
+          return this;
+        }
+
+        private java.lang.Object password_ = "";
+        /**
+         * 
+         * Input only.
+         * Required.
+         * The password of the custom account. The credential is stored encrypted
+         * and not returned in any response.
+         * 

+         *
+         * string password = 2;
+         */
+        public java.lang.String getPassword() {
+          java.lang.Object ref = password_;
+          if (!(ref instanceof java.lang.String)) {
+            com.google.protobuf.ByteString bs =
+                (com.google.protobuf.ByteString) ref;
+            java.lang.String s = bs.toStringUtf8();
+            password_ = s;
+            return s;
+          } else {
+            return (java.lang.String) ref;
+          }
+        }
+        /**
+         * 
+         * Input only.
+         * Required.
+         * The password of the custom account. The credential is stored encrypted
+         * and not returned in any response.
+         * 

+         *
+         * string password = 2;
+         */
+        public com.google.protobuf.ByteString
+            getPasswordBytes() {
+          java.lang.Object ref = password_;
+          if (ref instanceof String) {
+            com.google.protobuf.ByteString b = 
+                com.google.protobuf.ByteString.copyFromUtf8(
+                    (java.lang.String) ref);
+            password_ = b;
+            return b;
+          } else {
+            return (com.google.protobuf.ByteString) ref;
+          }
+        }
+        /**
+         * 
+         * Input only.
+         * Required.
+         * The password of the custom account. The credential is stored encrypted
+         * and not returned in any response.
+         * 

+         *
+         * string password = 2;
+         */
+        public Builder setPassword(
+            java.lang.String value) {
+          if (value == null) {
+    throw new NullPointerException();
+  }
+  
+          password_ = value;
+          onChanged();
+          return this;
+        }
+        /**
+         * 
+         * Input only.
+         * Required.
+         * The password of the custom account. The credential is stored encrypted
+         * and not returned in any response.
+         * 

+         *
+         * string password = 2;
+         */
+        public Builder clearPassword() {
+          
+          password_ = getDefaultInstance().getPassword();
+          onChanged();
+          return this;
+        }
+        /**
+         * 
+         * Input only.
+         * Required.
+         * The password of the custom account. The credential is stored encrypted
+         * and not returned in any response.
+         * 

+         *
+         * string password = 2;
+         */
+        public Builder setPasswordBytes(
+            com.google.protobuf.ByteString value) {
+          if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+          
+          password_ = value;
+          onChanged();
+          return this;
+        }
+
+        private java.lang.Object loginUrl_ = "";
+        /**
+         * 
+         * Required.
+         * The login form URL of the website.
+         * 

+         *
+         * string login_url = 3;
+         */
+        public java.lang.String getLoginUrl() {
+          java.lang.Object ref = loginUrl_;
+          if (!(ref instanceof java.lang.String)) {
+            com.google.protobuf.ByteString bs =
+                (com.google.protobuf.ByteString) ref;
+            java.lang.String s = bs.toStringUtf8();
+            loginUrl_ = s;
+            return s;
+          } else {
+            return (java.lang.String) ref;
+          }
+        }
+        /**
+         * 
+         * Required.
+         * The login form URL of the website.
+         * 

+         *
+         * string login_url = 3;
+         */
+        public com.google.protobuf.ByteString
+            getLoginUrlBytes() {
+          java.lang.Object ref = loginUrl_;
+          if (ref instanceof String) {
+            com.google.protobuf.ByteString b = 
+                com.google.protobuf.ByteString.copyFromUtf8(
+                    (java.lang.String) ref);
+            loginUrl_ = b;
+            return b;
+          } else {
+            return (com.google.protobuf.ByteString) ref;
+          }
+        }
+        /**
+         * 
+         * Required.
+         * The login form URL of the website.
+         * 

+         *
+         * string login_url = 3;
+         */
+        public Builder setLoginUrl(
+            java.lang.String value) {
+          if (value == null) {
+    throw new NullPointerException();
+  }
+  
+          loginUrl_ = value;
+          onChanged();
+          return this;
+        }
+        /**
+         * 
+         * Required.
+         * The login form URL of the website.
+         * 

+         *
+         * string login_url = 3;
+         */
+        public Builder clearLoginUrl() {
+          
+          loginUrl_ = getDefaultInstance().getLoginUrl();
+          onChanged();
+          return this;
+        }
+        /**
+         * 
+         * Required.
+         * The login form URL of the website.
+         * 

+         *
+         * string login_url = 3;
+         */
+        public Builder setLoginUrlBytes(
+            com.google.protobuf.ByteString value) {
+          if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+          
+          loginUrl_ = value;
+          onChanged();
+          return this;
+        }
+        public final Builder setUnknownFields(
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
+          return super.setUnknownFieldsProto3(unknownFields);
+        }
+
+        public final Builder mergeUnknownFields(
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
+          return super.mergeUnknownFields(unknownFields);
+        }
+
+
+        // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount)
+      }
+
+      // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount)
+      private static final com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount DEFAULT_INSTANCE;
+      static {
+        DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount();
+      }
+
+      public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount getDefaultInstance() {
+        return DEFAULT_INSTANCE;
+      }
+
+      private static final com.google.protobuf.Parser
+          PARSER = new com.google.protobuf.AbstractParser() {
+        public CustomAccount parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new CustomAccount(input, extensionRegistry);
+        }
+      };
+
+      public static com.google.protobuf.Parser parser() {
+        return PARSER;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Parser getParserForType() {
+        return PARSER;
+      }
+
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount getDefaultInstanceForType() {
+        return DEFAULT_INSTANCE;
+      }
+
+    }
+
+    private int authenticationCase_ = 0;
+    private java.lang.Object authentication_;
+    public enum AuthenticationCase
+        implements com.google.protobuf.Internal.EnumLite {
+      GOOGLE_ACCOUNT(1),
+      CUSTOM_ACCOUNT(2),
+      AUTHENTICATION_NOT_SET(0);
+      private final int value;
+      private AuthenticationCase(int value) {
+        this.value = value;
+      }
+      /**
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static AuthenticationCase valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static AuthenticationCase forNumber(int value) {
+        switch (value) {
+          case 1: return GOOGLE_ACCOUNT;
+          case 2: return CUSTOM_ACCOUNT;
+          case 0: return AUTHENTICATION_NOT_SET;
+          default: return null;
+        }
+      }
+      public int getNumber() {
+        return this.value;
+      }
+    };
+
+    public AuthenticationCase
+    getAuthenticationCase() {
+      return AuthenticationCase.forNumber(
+          authenticationCase_);
+    }
+
+    public static final int GOOGLE_ACCOUNT_FIELD_NUMBER = 1;
+    /**
+     * 
+     * Authentication using a Google account.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+     */
+    public boolean hasGoogleAccount() {
+      return authenticationCase_ == 1;
+    }
+    /**
+     * 
+     * Authentication using a Google account.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount getGoogleAccount() {
+      if (authenticationCase_ == 1) {
+         return (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) authentication_;
+      }
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.getDefaultInstance();
+    }
+    /**
+     * 
+     * Authentication using a Google account.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccountOrBuilder getGoogleAccountOrBuilder() {
+      if (authenticationCase_ == 1) {
+         return (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) authentication_;
+      }
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.getDefaultInstance();
+    }
+
+    public static final int CUSTOM_ACCOUNT_FIELD_NUMBER = 2;
+    /**
+     * 
+     * Authentication using a custom account.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+     */
+    public boolean hasCustomAccount() {
+      return authenticationCase_ == 2;
+    }
+    /**
+     * 
+     * Authentication using a custom account.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount getCustomAccount() {
+      if (authenticationCase_ == 2) {
+         return (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) authentication_;
+      }
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.getDefaultInstance();
+    }
+    /**
+     * 
+     * Authentication using a custom account.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccountOrBuilder getCustomAccountOrBuilder() {
+      if (authenticationCase_ == 2) {
+         return (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) authentication_;
+      }
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.getDefaultInstance();
+    }
+
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (authenticationCase_ == 1) {
+        output.writeMessage(1, (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) authentication_);
+      }
+      if (authenticationCase_ == 2) {
+        output.writeMessage(2, (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) authentication_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (authenticationCase_ == 1) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) authentication_);
+      }
+      if (authenticationCase_ == 2) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) authentication_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication)) {
+        return super.equals(obj);
+      }
+      com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication other = (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication) obj;
+
+      boolean result = true;
+      result = result && getAuthenticationCase().equals(
+          other.getAuthenticationCase());
+      if (!result) return false;
+      switch (authenticationCase_) {
+        case 1:
+          result = result && getGoogleAccount()
+              .equals(other.getGoogleAccount());
+          break;
+        case 2:
+          result = result && getCustomAccount()
+              .equals(other.getCustomAccount());
+          break;
+        case 0:
+        default:
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      switch (authenticationCase_) {
+        case 1:
+          hash = (37 * hash) + GOOGLE_ACCOUNT_FIELD_NUMBER;
+          hash = (53 * hash) + getGoogleAccount().hashCode();
+          break;
+        case 2:
+          hash = (37 * hash) + CUSTOM_ACCOUNT_FIELD_NUMBER;
+          hash = (53 * hash) + getCustomAccount().hashCode();
+          break;
+        case 0:
+        default:
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * 
+     * Scan authentication configuration.
+     * 

+     *
+     * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication)
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.AuthenticationOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.class, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Builder.class);
+      }
+
+      // Construct using com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      public Builder clear() {
+        super.clear();
+        authenticationCase_ = 0;
+        authentication_ = null;
+        return this;
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_descriptor;
+      }
+
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication getDefaultInstanceForType() {
+        return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.getDefaultInstance();
+      }
+
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication build() {
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication buildPartial() {
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication result = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication(this);
+        if (authenticationCase_ == 1) {
+          if (googleAccountBuilder_ == null) {
+            result.authentication_ = authentication_;
+          } else {
+            result.authentication_ = googleAccountBuilder_.build();
+          }
+        }
+        if (authenticationCase_ == 2) {
+          if (customAccountBuilder_ == null) {
+            result.authentication_ = authentication_;
+          } else {
+            result.authentication_ = customAccountBuilder_.build();
+          }
+        }
+        result.authenticationCase_ = authenticationCase_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication) {
+          return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication other) {
+        if (other == com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.getDefaultInstance()) return this;
+        switch (other.getAuthenticationCase()) {
+          case GOOGLE_ACCOUNT: {
+            mergeGoogleAccount(other.getGoogleAccount());
+            break;
+          }
+          case CUSTOM_ACCOUNT: {
+            mergeCustomAccount(other.getCustomAccount());
+            break;
+          }
+          case AUTHENTICATION_NOT_SET: {
+            break;
+          }
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int authenticationCase_ = 0;
+      private java.lang.Object authentication_;
+      public AuthenticationCase
+          getAuthenticationCase() {
+        return AuthenticationCase.forNumber(
+            authenticationCase_);
+      }
+
+      public Builder clearAuthentication() {
+        authenticationCase_ = 0;
+        authentication_ = null;
+        onChanged();
+        return this;
+      }
+
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccountOrBuilder> googleAccountBuilder_;
+      /**
+       * 
+       * Authentication using a Google account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+       */
+      public boolean hasGoogleAccount() {
+        return authenticationCase_ == 1;
+      }
+      /**
+       * 
+       * Authentication using a Google account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+       */
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount getGoogleAccount() {
+        if (googleAccountBuilder_ == null) {
+          if (authenticationCase_ == 1) {
+            return (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) authentication_;
+          }
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.getDefaultInstance();
+        } else {
+          if (authenticationCase_ == 1) {
+            return googleAccountBuilder_.getMessage();
+          }
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.getDefaultInstance();
+        }
+      }
+      /**
+       * 
+       * Authentication using a Google account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+       */
+      public Builder setGoogleAccount(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount value) {
+        if (googleAccountBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          authentication_ = value;
+          onChanged();
+        } else {
+          googleAccountBuilder_.setMessage(value);
+        }
+        authenticationCase_ = 1;
+        return this;
+      }
+      /**
+       * 
+       * Authentication using a Google account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+       */
+      public Builder setGoogleAccount(
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.Builder builderForValue) {
+        if (googleAccountBuilder_ == null) {
+          authentication_ = builderForValue.build();
+          onChanged();
+        } else {
+          googleAccountBuilder_.setMessage(builderForValue.build());
+        }
+        authenticationCase_ = 1;
+        return this;
+      }
+      /**
+       * 
+       * Authentication using a Google account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+       */
+      public Builder mergeGoogleAccount(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount value) {
+        if (googleAccountBuilder_ == null) {
+          if (authenticationCase_ == 1 &&
+              authentication_ != com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.getDefaultInstance()) {
+            authentication_ = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.newBuilder((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) authentication_)
+                .mergeFrom(value).buildPartial();
+          } else {
+            authentication_ = value;
+          }
+          onChanged();
+        } else {
+          if (authenticationCase_ == 1) {
+            googleAccountBuilder_.mergeFrom(value);
+          }
+          googleAccountBuilder_.setMessage(value);
+        }
+        authenticationCase_ = 1;
+        return this;
+      }
+      /**
+       * 
+       * Authentication using a Google account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+       */
+      public Builder clearGoogleAccount() {
+        if (googleAccountBuilder_ == null) {
+          if (authenticationCase_ == 1) {
+            authenticationCase_ = 0;
+            authentication_ = null;
+            onChanged();
+          }
+        } else {
+          if (authenticationCase_ == 1) {
+            authenticationCase_ = 0;
+            authentication_ = null;
+          }
+          googleAccountBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * 
+       * Authentication using a Google account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+       */
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.Builder getGoogleAccountBuilder() {
+        return getGoogleAccountFieldBuilder().getBuilder();
+      }
+      /**
+       * 
+       * Authentication using a Google account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+       */
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccountOrBuilder getGoogleAccountOrBuilder() {
+        if ((authenticationCase_ == 1) && (googleAccountBuilder_ != null)) {
+          return googleAccountBuilder_.getMessageOrBuilder();
+        } else {
+          if (authenticationCase_ == 1) {
+            return (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) authentication_;
+          }
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.getDefaultInstance();
+        }
+      }
+      /**
+       * 
+       * Authentication using a Google account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount google_account = 1;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccountOrBuilder> 
+          getGoogleAccountFieldBuilder() {
+        if (googleAccountBuilder_ == null) {
+          if (!(authenticationCase_ == 1)) {
+            authentication_ = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.getDefaultInstance();
+          }
+          googleAccountBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccountOrBuilder>(
+                  (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) authentication_,
+                  getParentForChildren(),
+                  isClean());
+          authentication_ = null;
+        }
+        authenticationCase_ = 1;
+        onChanged();;
+        return googleAccountBuilder_;
+      }
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccountOrBuilder> customAccountBuilder_;
+      /**
+       * 
+       * Authentication using a custom account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+       */
+      public boolean hasCustomAccount() {
+        return authenticationCase_ == 2;
+      }
+      /**
+       * 
+       * Authentication using a custom account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+       */
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount getCustomAccount() {
+        if (customAccountBuilder_ == null) {
+          if (authenticationCase_ == 2) {
+            return (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) authentication_;
+          }
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.getDefaultInstance();
+        } else {
+          if (authenticationCase_ == 2) {
+            return customAccountBuilder_.getMessage();
+          }
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.getDefaultInstance();
+        }
+      }
+      /**
+       * 
+       * Authentication using a custom account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+       */
+      public Builder setCustomAccount(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount value) {
+        if (customAccountBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          authentication_ = value;
+          onChanged();
+        } else {
+          customAccountBuilder_.setMessage(value);
+        }
+        authenticationCase_ = 2;
+        return this;
+      }
+      /**
+       * 
+       * Authentication using a custom account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+       */
+      public Builder setCustomAccount(
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.Builder builderForValue) {
+        if (customAccountBuilder_ == null) {
+          authentication_ = builderForValue.build();
+          onChanged();
+        } else {
+          customAccountBuilder_.setMessage(builderForValue.build());
+        }
+        authenticationCase_ = 2;
+        return this;
+      }
+      /**
+       * 
+       * Authentication using a custom account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+       */
+      public Builder mergeCustomAccount(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount value) {
+        if (customAccountBuilder_ == null) {
+          if (authenticationCase_ == 2 &&
+              authentication_ != com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.getDefaultInstance()) {
+            authentication_ = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.newBuilder((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) authentication_)
+                .mergeFrom(value).buildPartial();
+          } else {
+            authentication_ = value;
+          }
+          onChanged();
+        } else {
+          if (authenticationCase_ == 2) {
+            customAccountBuilder_.mergeFrom(value);
+          }
+          customAccountBuilder_.setMessage(value);
+        }
+        authenticationCase_ = 2;
+        return this;
+      }
+      /**
+       * 
+       * Authentication using a custom account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+       */
+      public Builder clearCustomAccount() {
+        if (customAccountBuilder_ == null) {
+          if (authenticationCase_ == 2) {
+            authenticationCase_ = 0;
+            authentication_ = null;
+            onChanged();
+          }
+        } else {
+          if (authenticationCase_ == 2) {
+            authenticationCase_ = 0;
+            authentication_ = null;
+          }
+          customAccountBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * 
+       * Authentication using a custom account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+       */
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.Builder getCustomAccountBuilder() {
+        return getCustomAccountFieldBuilder().getBuilder();
+      }
+      /**
+       * 
+       * Authentication using a custom account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+       */
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccountOrBuilder getCustomAccountOrBuilder() {
+        if ((authenticationCase_ == 2) && (customAccountBuilder_ != null)) {
+          return customAccountBuilder_.getMessageOrBuilder();
+        } else {
+          if (authenticationCase_ == 2) {
+            return (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) authentication_;
+          }
+          return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.getDefaultInstance();
+        }
+      }
+      /**
+       * 
+       * Authentication using a custom account.
+       * 

+       *
+       * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount custom_account = 2;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccountOrBuilder> 
+          getCustomAccountFieldBuilder() {
+        if (customAccountBuilder_ == null) {
+          if (!(authenticationCase_ == 2)) {
+            authentication_ = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.getDefaultInstance();
+          }
+          customAccountBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccountOrBuilder>(
+                  (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) authentication_,
+                  getParentForChildren(),
+                  isClean());
+          authentication_ = null;
+        }
+        authenticationCase_ = 2;
+        onChanged();;
+        return customAccountBuilder_;
+      }
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFieldsProto3(unknownFields);
+      }
+
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication)
+    }
+
+    // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication)
+    private static final com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication();
+    }
+
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
+      public Authentication parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Authentication(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser getParserForType() {
+      return PARSER;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface ScheduleOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * 
+     * A timestamp indicates when the next run will be scheduled. The value is
+     * refreshed by the server after each run. If unspecified, it will default
+     * to current server time, which means the scan will be scheduled to start
+     * immediately.
+     * 

+     *
+     * .google.protobuf.Timestamp schedule_time = 1;
+     */
+    boolean hasScheduleTime();
+    /**
+     * 
+     * A timestamp indicates when the next run will be scheduled. The value is
+     * refreshed by the server after each run. If unspecified, it will default
+     * to current server time, which means the scan will be scheduled to start
+     * immediately.
+     * 

+     *
+     * .google.protobuf.Timestamp schedule_time = 1;
+     */
+    com.google.protobuf.Timestamp getScheduleTime();
+    /**
+     * 
+     * A timestamp indicates when the next run will be scheduled. The value is
+     * refreshed by the server after each run. If unspecified, it will default
+     * to current server time, which means the scan will be scheduled to start
+     * immediately.
+     * 

+     *
+     * .google.protobuf.Timestamp schedule_time = 1;
+     */
+    com.google.protobuf.TimestampOrBuilder getScheduleTimeOrBuilder();
+
+    /**
+     * 
+     * Required.
+     * The duration of time between executions in days.
+     * 

+     *
+     * int32 interval_duration_days = 2;
+     */
+    int getIntervalDurationDays();
+  }
+  /**
+   * 
+   * Scan schedule configuration.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule}
+   */
+  public  static final class Schedule extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule)
+      ScheduleOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use Schedule.newBuilder() to construct.
+    private Schedule(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+      super(builder);
+    }
+    private Schedule() {
+      intervalDurationDays_ = 0;
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private Schedule(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 10: {
+              com.google.protobuf.Timestamp.Builder subBuilder = null;
+              if (scheduleTime_ != null) {
+                subBuilder = scheduleTime_.toBuilder();
+              }
+              scheduleTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(scheduleTime_);
+                scheduleTime_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 16: {
+
+              intervalDurationDays_ = input.readInt32();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.class, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.Builder.class);
+    }
+
+    public static final int SCHEDULE_TIME_FIELD_NUMBER = 1;
+    private com.google.protobuf.Timestamp scheduleTime_;
+    /**
+     * 
+     * A timestamp indicates when the next run will be scheduled. The value is
+     * refreshed by the server after each run. If unspecified, it will default
+     * to current server time, which means the scan will be scheduled to start
+     * immediately.
+     * 

+     *
+     * .google.protobuf.Timestamp schedule_time = 1;
+     */
+    public boolean hasScheduleTime() {
+      return scheduleTime_ != null;
+    }
+    /**
+     * 
+     * A timestamp indicates when the next run will be scheduled. The value is
+     * refreshed by the server after each run. If unspecified, it will default
+     * to current server time, which means the scan will be scheduled to start
+     * immediately.
+     * 

+     *
+     * .google.protobuf.Timestamp schedule_time = 1;
+     */
+    public com.google.protobuf.Timestamp getScheduleTime() {
+      return scheduleTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : scheduleTime_;
+    }
+    /**
+     * 
+     * A timestamp indicates when the next run will be scheduled. The value is
+     * refreshed by the server after each run. If unspecified, it will default
+     * to current server time, which means the scan will be scheduled to start
+     * immediately.
+     * 

+     *
+     * .google.protobuf.Timestamp schedule_time = 1;
+     */
+    public com.google.protobuf.TimestampOrBuilder getScheduleTimeOrBuilder() {
+      return getScheduleTime();
+    }
+
+    public static final int INTERVAL_DURATION_DAYS_FIELD_NUMBER = 2;
+    private int intervalDurationDays_;
+    /**
+     * 
+     * Required.
+     * The duration of time between executions in days.
+     * 

+     *
+     * int32 interval_duration_days = 2;
+     */
+    public int getIntervalDurationDays() {
+      return intervalDurationDays_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (scheduleTime_ != null) {
+        output.writeMessage(1, getScheduleTime());
+      }
+      if (intervalDurationDays_ != 0) {
+        output.writeInt32(2, intervalDurationDays_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (scheduleTime_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, getScheduleTime());
+      }
+      if (intervalDurationDays_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(2, intervalDurationDays_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule)) {
+        return super.equals(obj);
+      }
+      com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule other = (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule) obj;
+
+      boolean result = true;
+      result = result && (hasScheduleTime() == other.hasScheduleTime());
+      if (hasScheduleTime()) {
+        result = result && getScheduleTime()
+            .equals(other.getScheduleTime());
+      }
+      result = result && (getIntervalDurationDays()
+          == other.getIntervalDurationDays());
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasScheduleTime()) {
+        hash = (37 * hash) + SCHEDULE_TIME_FIELD_NUMBER;
+        hash = (53 * hash) + getScheduleTime().hashCode();
+      }
+      hash = (37 * hash) + INTERVAL_DURATION_DAYS_FIELD_NUMBER;
+      hash = (53 * hash) + getIntervalDurationDays();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * 
+     * Scan schedule configuration.
+     * 

+     *
+     * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder implements
+        // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule)
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.ScheduleOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.class, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.Builder.class);
+      }
+
+      // Construct using com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      public Builder clear() {
+        super.clear();
+        if (scheduleTimeBuilder_ == null) {
+          scheduleTime_ = null;
+        } else {
+          scheduleTime_ = null;
+          scheduleTimeBuilder_ = null;
+        }
+        intervalDurationDays_ = 0;
+
+        return this;
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_descriptor;
+      }
+
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule getDefaultInstanceForType() {
+        return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.getDefaultInstance();
+      }
+
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule build() {
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule buildPartial() {
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule result = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule(this);
+        if (scheduleTimeBuilder_ == null) {
+          result.scheduleTime_ = scheduleTime_;
+        } else {
+          result.scheduleTime_ = scheduleTimeBuilder_.build();
+        }
+        result.intervalDurationDays_ = intervalDurationDays_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule) {
+          return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule other) {
+        if (other == com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.getDefaultInstance()) return this;
+        if (other.hasScheduleTime()) {
+          mergeScheduleTime(other.getScheduleTime());
+        }
+        if (other.getIntervalDurationDays() != 0) {
+          setIntervalDurationDays(other.getIntervalDurationDays());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private com.google.protobuf.Timestamp scheduleTime_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> scheduleTimeBuilder_;
+      /**
+       * 
+       * A timestamp indicates when the next run will be scheduled. The value is
+       * refreshed by the server after each run. If unspecified, it will default
+       * to current server time, which means the scan will be scheduled to start
+       * immediately.
+       * 

+       *
+       * .google.protobuf.Timestamp schedule_time = 1;
+       */
+      public boolean hasScheduleTime() {
+        return scheduleTimeBuilder_ != null || scheduleTime_ != null;
+      }
+      /**
+       * 
+       * A timestamp indicates when the next run will be scheduled. The value is
+       * refreshed by the server after each run. If unspecified, it will default
+       * to current server time, which means the scan will be scheduled to start
+       * immediately.
+       * 

+       *
+       * .google.protobuf.Timestamp schedule_time = 1;
+       */
+      public com.google.protobuf.Timestamp getScheduleTime() {
+        if (scheduleTimeBuilder_ == null) {
+          return scheduleTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : scheduleTime_;
+        } else {
+          return scheduleTimeBuilder_.getMessage();
+        }
+      }
+      /**
+       * 
+       * A timestamp indicates when the next run will be scheduled. The value is
+       * refreshed by the server after each run. If unspecified, it will default
+       * to current server time, which means the scan will be scheduled to start
+       * immediately.
+       * 

+       *
+       * .google.protobuf.Timestamp schedule_time = 1;
+       */
+      public Builder setScheduleTime(com.google.protobuf.Timestamp value) {
+        if (scheduleTimeBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          scheduleTime_ = value;
+          onChanged();
+        } else {
+          scheduleTimeBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * A timestamp indicates when the next run will be scheduled. The value is
+       * refreshed by the server after each run. If unspecified, it will default
+       * to current server time, which means the scan will be scheduled to start
+       * immediately.
+       * 

+       *
+       * .google.protobuf.Timestamp schedule_time = 1;
+       */
+      public Builder setScheduleTime(
+          com.google.protobuf.Timestamp.Builder builderForValue) {
+        if (scheduleTimeBuilder_ == null) {
+          scheduleTime_ = builderForValue.build();
+          onChanged();
+        } else {
+          scheduleTimeBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * A timestamp indicates when the next run will be scheduled. The value is
+       * refreshed by the server after each run. If unspecified, it will default
+       * to current server time, which means the scan will be scheduled to start
+       * immediately.
+       * 

+       *
+       * .google.protobuf.Timestamp schedule_time = 1;
+       */
+      public Builder mergeScheduleTime(com.google.protobuf.Timestamp value) {
+        if (scheduleTimeBuilder_ == null) {
+          if (scheduleTime_ != null) {
+            scheduleTime_ =
+              com.google.protobuf.Timestamp.newBuilder(scheduleTime_).mergeFrom(value).buildPartial();
+          } else {
+            scheduleTime_ = value;
+          }
+          onChanged();
+        } else {
+          scheduleTimeBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * A timestamp indicates when the next run will be scheduled. The value is
+       * refreshed by the server after each run. If unspecified, it will default
+       * to current server time, which means the scan will be scheduled to start
+       * immediately.
+       * 

+       *
+       * .google.protobuf.Timestamp schedule_time = 1;
+       */
+      public Builder clearScheduleTime() {
+        if (scheduleTimeBuilder_ == null) {
+          scheduleTime_ = null;
+          onChanged();
+        } else {
+          scheduleTime_ = null;
+          scheduleTimeBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * A timestamp indicates when the next run will be scheduled. The value is
+       * refreshed by the server after each run. If unspecified, it will default
+       * to current server time, which means the scan will be scheduled to start
+       * immediately.
+       * 

+       *
+       * .google.protobuf.Timestamp schedule_time = 1;
+       */
+      public com.google.protobuf.Timestamp.Builder getScheduleTimeBuilder() {
+        
+        onChanged();
+        return getScheduleTimeFieldBuilder().getBuilder();
+      }
+      /**
+       * 
+       * A timestamp indicates when the next run will be scheduled. The value is
+       * refreshed by the server after each run. If unspecified, it will default
+       * to current server time, which means the scan will be scheduled to start
+       * immediately.
+       * 

+       *
+       * .google.protobuf.Timestamp schedule_time = 1;
+       */
+      public com.google.protobuf.TimestampOrBuilder getScheduleTimeOrBuilder() {
+        if (scheduleTimeBuilder_ != null) {
+          return scheduleTimeBuilder_.getMessageOrBuilder();
+        } else {
+          return scheduleTime_ == null ?
+              com.google.protobuf.Timestamp.getDefaultInstance() : scheduleTime_;
+        }
+      }
+      /**
+       * 
+       * A timestamp indicates when the next run will be scheduled. The value is
+       * refreshed by the server after each run. If unspecified, it will default
+       * to current server time, which means the scan will be scheduled to start
+       * immediately.
+       * 

+       *
+       * .google.protobuf.Timestamp schedule_time = 1;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+          getScheduleTimeFieldBuilder() {
+        if (scheduleTimeBuilder_ == null) {
+          scheduleTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                  getScheduleTime(),
+                  getParentForChildren(),
+                  isClean());
+          scheduleTime_ = null;
+        }
+        return scheduleTimeBuilder_;
+      }
+
+      private int intervalDurationDays_ ;
+      /**
+       * 
+       * Required.
+       * The duration of time between executions in days.
+       * 

+       *
+       * int32 interval_duration_days = 2;
+       */
+      public int getIntervalDurationDays() {
+        return intervalDurationDays_;
+      }
+      /**
+       * 
+       * Required.
+       * The duration of time between executions in days.
+       * 

+       *
+       * int32 interval_duration_days = 2;
+       */
+      public Builder setIntervalDurationDays(int value) {
+        
+        intervalDurationDays_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * Required.
+       * The duration of time between executions in days.
+       * 

+       *
+       * int32 interval_duration_days = 2;
+       */
+      public Builder clearIntervalDurationDays() {
+        
+        intervalDurationDays_ = 0;
+        onChanged();
+        return this;
+      }
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFieldsProto3(unknownFields);
+      }
+
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule)
+    }
+
+    // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule)
+    private static final com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule();
+    }
+
+    public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
+      public Schedule parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Schedule(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser getParserForType() {
+      return PARSER;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private int bitField0_;
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * The resource name of the ScanConfig. The name follows the format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}'. The ScanConfig IDs are
+   * generated by the system.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The resource name of the ScanConfig. The name follows the format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}'. The ScanConfig IDs are
+   * generated by the system.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
+  private volatile java.lang.Object displayName_;
+  /**
+   * 
+   * Required.
+   * The user provided display name of the ScanConfig.
+   * 

+   *
+   * string display_name = 2;
+   */
+  public java.lang.String getDisplayName() {
+    java.lang.Object ref = displayName_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      displayName_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The user provided display name of the ScanConfig.
+   * 

+   *
+   * string display_name = 2;
+   */
+  public com.google.protobuf.ByteString
+      getDisplayNameBytes() {
+    java.lang.Object ref = displayName_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      displayName_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int MAX_QPS_FIELD_NUMBER = 3;
+  private int maxQps_;
+  /**
+   * 
+   * The maximum QPS during scanning. A valid value ranges from 5 to 20
+   * inclusively. If the field is unspecified or its value is set 0, server will
+   * default to 15. Other values outside of [5, 20] range will be rejected with
+   * INVALID_ARGUMENT error.
+   * 

+   *
+   * int32 max_qps = 3;
+   */
+  public int getMaxQps() {
+    return maxQps_;
+  }
+
+  public static final int STARTING_URLS_FIELD_NUMBER = 4;
+  private com.google.protobuf.LazyStringList startingUrls_;
+  /**
+   * 
+   * Required.
+   * The starting URLs from which the scanner finds site pages.
+   * 

+   *
+   * repeated string starting_urls = 4;
+   */
+  public com.google.protobuf.ProtocolStringList
+      getStartingUrlsList() {
+    return startingUrls_;
+  }
+  /**
+   * 
+   * Required.
+   * The starting URLs from which the scanner finds site pages.
+   * 

+   *
+   * repeated string starting_urls = 4;
+   */
+  public int getStartingUrlsCount() {
+    return startingUrls_.size();
+  }
+  /**
+   * 
+   * Required.
+   * The starting URLs from which the scanner finds site pages.
+   * 

+   *
+   * repeated string starting_urls = 4;
+   */
+  public java.lang.String getStartingUrls(int index) {
+    return startingUrls_.get(index);
+  }
+  /**
+   * 
+   * Required.
+   * The starting URLs from which the scanner finds site pages.
+   * 

+   *
+   * repeated string starting_urls = 4;
+   */
+  public com.google.protobuf.ByteString
+      getStartingUrlsBytes(int index) {
+    return startingUrls_.getByteString(index);
+  }
+
+  public static final int AUTHENTICATION_FIELD_NUMBER = 5;
+  private com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication_;
+  /**
+   * 
+   * The authentication configuration. If specified, service will use the
+   * authentication configuration during scanning.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+   */
+  public boolean hasAuthentication() {
+    return authentication_ != null;
+  }
+  /**
+   * 
+   * The authentication configuration. If specified, service will use the
+   * authentication configuration during scanning.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication getAuthentication() {
+    return authentication_ == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.getDefaultInstance() : authentication_;
+  }
+  /**
+   * 
+   * The authentication configuration. If specified, service will use the
+   * authentication configuration during scanning.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.AuthenticationOrBuilder getAuthenticationOrBuilder() {
+    return getAuthentication();
+  }
+
+  public static final int USER_AGENT_FIELD_NUMBER = 6;
+  private int userAgent_;
+  /**
+   * 
+   * The user agent used during scanning.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent user_agent = 6;
+   */
+  public int getUserAgentValue() {
+    return userAgent_;
+  }
+  /**
+   * 
+   * The user agent used during scanning.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent user_agent = 6;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent getUserAgent() {
+    com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent result = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent.valueOf(userAgent_);
+    return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent.UNRECOGNIZED : result;
+  }
+
+  public static final int BLACKLIST_PATTERNS_FIELD_NUMBER = 7;
+  private com.google.protobuf.LazyStringList blacklistPatterns_;
+  /**
+   * 
+   * The blacklist URL patterns as described in
+   * https://cloud.google.com/security-scanner/docs/excluded-urls
+   * 

+   *
+   * repeated string blacklist_patterns = 7;
+   */
+  public com.google.protobuf.ProtocolStringList
+      getBlacklistPatternsList() {
+    return blacklistPatterns_;
+  }
+  /**
+   * 
+   * The blacklist URL patterns as described in
+   * https://cloud.google.com/security-scanner/docs/excluded-urls
+   * 

+   *
+   * repeated string blacklist_patterns = 7;
+   */
+  public int getBlacklistPatternsCount() {
+    return blacklistPatterns_.size();
+  }
+  /**
+   * 
+   * The blacklist URL patterns as described in
+   * https://cloud.google.com/security-scanner/docs/excluded-urls
+   * 

+   *
+   * repeated string blacklist_patterns = 7;
+   */
+  public java.lang.String getBlacklistPatterns(int index) {
+    return blacklistPatterns_.get(index);
+  }
+  /**
+   * 
+   * The blacklist URL patterns as described in
+   * https://cloud.google.com/security-scanner/docs/excluded-urls
+   * 

+   *
+   * repeated string blacklist_patterns = 7;
+   */
+  public com.google.protobuf.ByteString
+      getBlacklistPatternsBytes(int index) {
+    return blacklistPatterns_.getByteString(index);
+  }
+
+  public static final int SCHEDULE_FIELD_NUMBER = 8;
+  private com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule_;
+  /**
+   * 
+   * The schedule of the ScanConfig.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+   */
+  public boolean hasSchedule() {
+    return schedule_ != null;
+  }
+  /**
+   * 
+   * The schedule of the ScanConfig.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule getSchedule() {
+    return schedule_ == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.getDefaultInstance() : schedule_;
+  }
+  /**
+   * 
+   * The schedule of the ScanConfig.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.ScheduleOrBuilder getScheduleOrBuilder() {
+    return getSchedule();
+  }
+
+  public static final int TARGET_PLATFORMS_FIELD_NUMBER = 9;
+  private java.util.List targetPlatforms_;
+  private static final com.google.protobuf.Internal.ListAdapter.Converter<
+      java.lang.Integer, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform> targetPlatforms_converter_ =
+          new com.google.protobuf.Internal.ListAdapter.Converter<
+              java.lang.Integer, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform>() {
+            public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform convert(java.lang.Integer from) {
+              com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform result = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform.valueOf(from);
+              return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform.UNRECOGNIZED : result;
+            }
+          };
+  /**
+   * 
+   * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+   * used as a default.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+   */
+  public java.util.List getTargetPlatformsList() {
+    return new com.google.protobuf.Internal.ListAdapter<
+        java.lang.Integer, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform>(targetPlatforms_, targetPlatforms_converter_);
+  }
+  /**
+   * 
+   * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+   * used as a default.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+   */
+  public int getTargetPlatformsCount() {
+    return targetPlatforms_.size();
+  }
+  /**
+   * 
+   * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+   * used as a default.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform getTargetPlatforms(int index) {
+    return targetPlatforms_converter_.convert(targetPlatforms_.get(index));
+  }
+  /**
+   * 
+   * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+   * used as a default.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+   */
+  public java.util.List
+  getTargetPlatformsValueList() {
+    return targetPlatforms_;
+  }
+  /**
+   * 
+   * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+   * used as a default.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+   */
+  public int getTargetPlatformsValue(int index) {
+    return targetPlatforms_.get(index);
+  }
+  private int targetPlatformsMemoizedSerializedSize;
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    getSerializedSize();
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    if (!getDisplayNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, displayName_);
+    }
+    if (maxQps_ != 0) {
+      output.writeInt32(3, maxQps_);
+    }
+    for (int i = 0; i < startingUrls_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 4, startingUrls_.getRaw(i));
+    }
+    if (authentication_ != null) {
+      output.writeMessage(5, getAuthentication());
+    }
+    if (userAgent_ != com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent.USER_AGENT_UNSPECIFIED.getNumber()) {
+      output.writeEnum(6, userAgent_);
+    }
+    for (int i = 0; i < blacklistPatterns_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 7, blacklistPatterns_.getRaw(i));
+    }
+    if (schedule_ != null) {
+      output.writeMessage(8, getSchedule());
+    }
+    if (getTargetPlatformsList().size() > 0) {
+      output.writeUInt32NoTag(74);
+      output.writeUInt32NoTag(targetPlatformsMemoizedSerializedSize);
+    }
+    for (int i = 0; i < targetPlatforms_.size(); i++) {
+      output.writeEnumNoTag(targetPlatforms_.get(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    if (!getDisplayNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, displayName_);
+    }
+    if (maxQps_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(3, maxQps_);
+    }
+    {
+      int dataSize = 0;
+      for (int i = 0; i < startingUrls_.size(); i++) {
+        dataSize += computeStringSizeNoTag(startingUrls_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getStartingUrlsList().size();
+    }
+    if (authentication_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(5, getAuthentication());
+    }
+    if (userAgent_ != com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent.USER_AGENT_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(6, userAgent_);
+    }
+    {
+      int dataSize = 0;
+      for (int i = 0; i < blacklistPatterns_.size(); i++) {
+        dataSize += computeStringSizeNoTag(blacklistPatterns_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getBlacklistPatternsList().size();
+    }
+    if (schedule_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(8, getSchedule());
+    }
+    {
+      int dataSize = 0;
+      for (int i = 0; i < targetPlatforms_.size(); i++) {
+        dataSize += com.google.protobuf.CodedOutputStream
+          .computeEnumSizeNoTag(targetPlatforms_.get(i));
+      }
+      size += dataSize;
+      if (!getTargetPlatformsList().isEmpty()) {  size += 1;
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32SizeNoTag(dataSize);
+      }targetPlatformsMemoizedSerializedSize = dataSize;
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ScanConfig other = (com.google.cloud.websecurityscanner.v1alpha.ScanConfig) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && getDisplayName()
+        .equals(other.getDisplayName());
+    result = result && (getMaxQps()
+        == other.getMaxQps());
+    result = result && getStartingUrlsList()
+        .equals(other.getStartingUrlsList());
+    result = result && (hasAuthentication() == other.hasAuthentication());
+    if (hasAuthentication()) {
+      result = result && getAuthentication()
+          .equals(other.getAuthentication());
+    }
+    result = result && userAgent_ == other.userAgent_;
+    result = result && getBlacklistPatternsList()
+        .equals(other.getBlacklistPatternsList());
+    result = result && (hasSchedule() == other.hasSchedule());
+    if (hasSchedule()) {
+      result = result && getSchedule()
+          .equals(other.getSchedule());
+    }
+    result = result && targetPlatforms_.equals(other.targetPlatforms_);
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getDisplayName().hashCode();
+    hash = (37 * hash) + MAX_QPS_FIELD_NUMBER;
+    hash = (53 * hash) + getMaxQps();
+    if (getStartingUrlsCount() > 0) {
+      hash = (37 * hash) + STARTING_URLS_FIELD_NUMBER;
+      hash = (53 * hash) + getStartingUrlsList().hashCode();
+    }
+    if (hasAuthentication()) {
+      hash = (37 * hash) + AUTHENTICATION_FIELD_NUMBER;
+      hash = (53 * hash) + getAuthentication().hashCode();
+    }
+    hash = (37 * hash) + USER_AGENT_FIELD_NUMBER;
+    hash = (53 * hash) + userAgent_;
+    if (getBlacklistPatternsCount() > 0) {
+      hash = (37 * hash) + BLACKLIST_PATTERNS_FIELD_NUMBER;
+      hash = (53 * hash) + getBlacklistPatternsList().hashCode();
+    }
+    if (hasSchedule()) {
+      hash = (37 * hash) + SCHEDULE_FIELD_NUMBER;
+      hash = (53 * hash) + getSchedule().hashCode();
+    }
+    if (getTargetPlatformsCount() > 0) {
+      hash = (37 * hash) + TARGET_PLATFORMS_FIELD_NUMBER;
+      hash = (53 * hash) + targetPlatforms_.hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ScanConfig prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * A ScanConfig resource contains the configurations to launch a scan.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ScanConfig}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ScanConfig)
+      com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ScanConfig.class, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ScanConfig.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      displayName_ = "";
+
+      maxQps_ = 0;
+
+      startingUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      if (authenticationBuilder_ == null) {
+        authentication_ = null;
+      } else {
+        authentication_ = null;
+        authenticationBuilder_ = null;
+      }
+      userAgent_ = 0;
+
+      blacklistPatterns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      if (scheduleBuilder_ == null) {
+        schedule_ = null;
+      } else {
+        schedule_ = null;
+        scheduleBuilder_ = null;
+      }
+      targetPlatforms_ = java.util.Collections.emptyList();
+      bitField0_ = (bitField0_ & ~0x00000100);
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig build() {
+      com.google.cloud.websecurityscanner.v1alpha.ScanConfig result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ScanConfig result = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      result.name_ = name_;
+      result.displayName_ = displayName_;
+      result.maxQps_ = maxQps_;
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        startingUrls_ = startingUrls_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000008);
+      }
+      result.startingUrls_ = startingUrls_;
+      if (authenticationBuilder_ == null) {
+        result.authentication_ = authentication_;
+      } else {
+        result.authentication_ = authenticationBuilder_.build();
+      }
+      result.userAgent_ = userAgent_;
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        blacklistPatterns_ = blacklistPatterns_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000040);
+      }
+      result.blacklistPatterns_ = blacklistPatterns_;
+      if (scheduleBuilder_ == null) {
+        result.schedule_ = schedule_;
+      } else {
+        result.schedule_ = scheduleBuilder_.build();
+      }
+      if (((bitField0_ & 0x00000100) == 0x00000100)) {
+        targetPlatforms_ = java.util.Collections.unmodifiableList(targetPlatforms_);
+        bitField0_ = (bitField0_ & ~0x00000100);
+      }
+      result.targetPlatforms_ = targetPlatforms_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanConfig)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ScanConfig other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (!other.getDisplayName().isEmpty()) {
+        displayName_ = other.displayName_;
+        onChanged();
+      }
+      if (other.getMaxQps() != 0) {
+        setMaxQps(other.getMaxQps());
+      }
+      if (!other.startingUrls_.isEmpty()) {
+        if (startingUrls_.isEmpty()) {
+          startingUrls_ = other.startingUrls_;
+          bitField0_ = (bitField0_ & ~0x00000008);
+        } else {
+          ensureStartingUrlsIsMutable();
+          startingUrls_.addAll(other.startingUrls_);
+        }
+        onChanged();
+      }
+      if (other.hasAuthentication()) {
+        mergeAuthentication(other.getAuthentication());
+      }
+      if (other.userAgent_ != 0) {
+        setUserAgentValue(other.getUserAgentValue());
+      }
+      if (!other.blacklistPatterns_.isEmpty()) {
+        if (blacklistPatterns_.isEmpty()) {
+          blacklistPatterns_ = other.blacklistPatterns_;
+          bitField0_ = (bitField0_ & ~0x00000040);
+        } else {
+          ensureBlacklistPatternsIsMutable();
+          blacklistPatterns_.addAll(other.blacklistPatterns_);
+        }
+        onChanged();
+      }
+      if (other.hasSchedule()) {
+        mergeSchedule(other.getSchedule());
+      }
+      if (!other.targetPlatforms_.isEmpty()) {
+        if (targetPlatforms_.isEmpty()) {
+          targetPlatforms_ = other.targetPlatforms_;
+          bitField0_ = (bitField0_ & ~0x00000100);
+        } else {
+          ensureTargetPlatformsIsMutable();
+          targetPlatforms_.addAll(other.targetPlatforms_);
+        }
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ScanConfig parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ScanConfig) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * The resource name of the ScanConfig. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}'. The ScanConfig IDs are
+     * generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The resource name of the ScanConfig. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}'. The ScanConfig IDs are
+     * generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The resource name of the ScanConfig. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}'. The ScanConfig IDs are
+     * generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The resource name of the ScanConfig. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}'. The ScanConfig IDs are
+     * generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The resource name of the ScanConfig. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}'. The ScanConfig IDs are
+     * generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object displayName_ = "";
+    /**
+     * 
+     * Required.
+     * The user provided display name of the ScanConfig.
+     * 

+     *
+     * string display_name = 2;
+     */
+    public java.lang.String getDisplayName() {
+      java.lang.Object ref = displayName_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        displayName_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The user provided display name of the ScanConfig.
+     * 

+     *
+     * string display_name = 2;
+     */
+    public com.google.protobuf.ByteString
+        getDisplayNameBytes() {
+      java.lang.Object ref = displayName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        displayName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The user provided display name of the ScanConfig.
+     * 

+     *
+     * string display_name = 2;
+     */
+    public Builder setDisplayName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      displayName_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The user provided display name of the ScanConfig.
+     * 

+     *
+     * string display_name = 2;
+     */
+    public Builder clearDisplayName() {
+      
+      displayName_ = getDefaultInstance().getDisplayName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The user provided display name of the ScanConfig.
+     * 

+     *
+     * string display_name = 2;
+     */
+    public Builder setDisplayNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      displayName_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int maxQps_ ;
+    /**
+     * 
+     * The maximum QPS during scanning. A valid value ranges from 5 to 20
+     * inclusively. If the field is unspecified or its value is set 0, server will
+     * default to 15. Other values outside of [5, 20] range will be rejected with
+     * INVALID_ARGUMENT error.
+     * 

+     *
+     * int32 max_qps = 3;
+     */
+    public int getMaxQps() {
+      return maxQps_;
+    }
+    /**
+     * 
+     * The maximum QPS during scanning. A valid value ranges from 5 to 20
+     * inclusively. If the field is unspecified or its value is set 0, server will
+     * default to 15. Other values outside of [5, 20] range will be rejected with
+     * INVALID_ARGUMENT error.
+     * 

+     *
+     * int32 max_qps = 3;
+     */
+    public Builder setMaxQps(int value) {
+      
+      maxQps_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The maximum QPS during scanning. A valid value ranges from 5 to 20
+     * inclusively. If the field is unspecified or its value is set 0, server will
+     * default to 15. Other values outside of [5, 20] range will be rejected with
+     * INVALID_ARGUMENT error.
+     * 

+     *
+     * int32 max_qps = 3;
+     */
+    public Builder clearMaxQps() {
+      
+      maxQps_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.LazyStringList startingUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensureStartingUrlsIsMutable() {
+      if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+        startingUrls_ = new com.google.protobuf.LazyStringArrayList(startingUrls_);
+        bitField0_ |= 0x00000008;
+       }
+    }
+    /**
+     * 
+     * Required.
+     * The starting URLs from which the scanner finds site pages.
+     * 

+     *
+     * repeated string starting_urls = 4;
+     */
+    public com.google.protobuf.ProtocolStringList
+        getStartingUrlsList() {
+      return startingUrls_.getUnmodifiableView();
+    }
+    /**
+     * 
+     * Required.
+     * The starting URLs from which the scanner finds site pages.
+     * 

+     *
+     * repeated string starting_urls = 4;
+     */
+    public int getStartingUrlsCount() {
+      return startingUrls_.size();
+    }
+    /**
+     * 
+     * Required.
+     * The starting URLs from which the scanner finds site pages.
+     * 

+     *
+     * repeated string starting_urls = 4;
+     */
+    public java.lang.String getStartingUrls(int index) {
+      return startingUrls_.get(index);
+    }
+    /**
+     * 
+     * Required.
+     * The starting URLs from which the scanner finds site pages.
+     * 

+     *
+     * repeated string starting_urls = 4;
+     */
+    public com.google.protobuf.ByteString
+        getStartingUrlsBytes(int index) {
+      return startingUrls_.getByteString(index);
+    }
+    /**
+     * 
+     * Required.
+     * The starting URLs from which the scanner finds site pages.
+     * 

+     *
+     * repeated string starting_urls = 4;
+     */
+    public Builder setStartingUrls(
+        int index, java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureStartingUrlsIsMutable();
+      startingUrls_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The starting URLs from which the scanner finds site pages.
+     * 

+     *
+     * repeated string starting_urls = 4;
+     */
+    public Builder addStartingUrls(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureStartingUrlsIsMutable();
+      startingUrls_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The starting URLs from which the scanner finds site pages.
+     * 

+     *
+     * repeated string starting_urls = 4;
+     */
+    public Builder addAllStartingUrls(
+        java.lang.Iterable values) {
+      ensureStartingUrlsIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, startingUrls_);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The starting URLs from which the scanner finds site pages.
+     * 

+     *
+     * repeated string starting_urls = 4;
+     */
+    public Builder clearStartingUrls() {
+      startingUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000008);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The starting URLs from which the scanner finds site pages.
+     * 

+     *
+     * repeated string starting_urls = 4;
+     */
+    public Builder addStartingUrlsBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      ensureStartingUrlsIsMutable();
+      startingUrls_.add(value);
+      onChanged();
+      return this;
+    }
+
+    private com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.AuthenticationOrBuilder> authenticationBuilder_;
+    /**
+     * 
+     * The authentication configuration. If specified, service will use the
+     * authentication configuration during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+     */
+    public boolean hasAuthentication() {
+      return authenticationBuilder_ != null || authentication_ != null;
+    }
+    /**
+     * 
+     * The authentication configuration. If specified, service will use the
+     * authentication configuration during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication getAuthentication() {
+      if (authenticationBuilder_ == null) {
+        return authentication_ == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.getDefaultInstance() : authentication_;
+      } else {
+        return authenticationBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The authentication configuration. If specified, service will use the
+     * authentication configuration during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+     */
+    public Builder setAuthentication(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication value) {
+      if (authenticationBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        authentication_ = value;
+        onChanged();
+      } else {
+        authenticationBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The authentication configuration. If specified, service will use the
+     * authentication configuration during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+     */
+    public Builder setAuthentication(
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Builder builderForValue) {
+      if (authenticationBuilder_ == null) {
+        authentication_ = builderForValue.build();
+        onChanged();
+      } else {
+        authenticationBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The authentication configuration. If specified, service will use the
+     * authentication configuration during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+     */
+    public Builder mergeAuthentication(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication value) {
+      if (authenticationBuilder_ == null) {
+        if (authentication_ != null) {
+          authentication_ =
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.newBuilder(authentication_).mergeFrom(value).buildPartial();
+        } else {
+          authentication_ = value;
+        }
+        onChanged();
+      } else {
+        authenticationBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The authentication configuration. If specified, service will use the
+     * authentication configuration during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+     */
+    public Builder clearAuthentication() {
+      if (authenticationBuilder_ == null) {
+        authentication_ = null;
+        onChanged();
+      } else {
+        authentication_ = null;
+        authenticationBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The authentication configuration. If specified, service will use the
+     * authentication configuration during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Builder getAuthenticationBuilder() {
+      
+      onChanged();
+      return getAuthenticationFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The authentication configuration. If specified, service will use the
+     * authentication configuration during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.AuthenticationOrBuilder getAuthenticationOrBuilder() {
+      if (authenticationBuilder_ != null) {
+        return authenticationBuilder_.getMessageOrBuilder();
+      } else {
+        return authentication_ == null ?
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.getDefaultInstance() : authentication_;
+      }
+    }
+    /**
+     * 
+     * The authentication configuration. If specified, service will use the
+     * authentication configuration during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.AuthenticationOrBuilder> 
+        getAuthenticationFieldBuilder() {
+      if (authenticationBuilder_ == null) {
+        authenticationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.AuthenticationOrBuilder>(
+                getAuthentication(),
+                getParentForChildren(),
+                isClean());
+        authentication_ = null;
+      }
+      return authenticationBuilder_;
+    }
+
+    private int userAgent_ = 0;
+    /**
+     * 
+     * The user agent used during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent user_agent = 6;
+     */
+    public int getUserAgentValue() {
+      return userAgent_;
+    }
+    /**
+     * 
+     * The user agent used during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent user_agent = 6;
+     */
+    public Builder setUserAgentValue(int value) {
+      userAgent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The user agent used during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent user_agent = 6;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent getUserAgent() {
+      com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent result = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent.valueOf(userAgent_);
+      return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent.UNRECOGNIZED : result;
+    }
+    /**
+     * 
+     * The user agent used during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent user_agent = 6;
+     */
+    public Builder setUserAgent(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      userAgent_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The user agent used during scanning.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent user_agent = 6;
+     */
+    public Builder clearUserAgent() {
+      
+      userAgent_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.LazyStringList blacklistPatterns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensureBlacklistPatternsIsMutable() {
+      if (!((bitField0_ & 0x00000040) == 0x00000040)) {
+        blacklistPatterns_ = new com.google.protobuf.LazyStringArrayList(blacklistPatterns_);
+        bitField0_ |= 0x00000040;
+       }
+    }
+    /**
+     * 
+     * The blacklist URL patterns as described in
+     * https://cloud.google.com/security-scanner/docs/excluded-urls
+     * 

+     *
+     * repeated string blacklist_patterns = 7;
+     */
+    public com.google.protobuf.ProtocolStringList
+        getBlacklistPatternsList() {
+      return blacklistPatterns_.getUnmodifiableView();
+    }
+    /**
+     * 
+     * The blacklist URL patterns as described in
+     * https://cloud.google.com/security-scanner/docs/excluded-urls
+     * 

+     *
+     * repeated string blacklist_patterns = 7;
+     */
+    public int getBlacklistPatternsCount() {
+      return blacklistPatterns_.size();
+    }
+    /**
+     * 
+     * The blacklist URL patterns as described in
+     * https://cloud.google.com/security-scanner/docs/excluded-urls
+     * 

+     *
+     * repeated string blacklist_patterns = 7;
+     */
+    public java.lang.String getBlacklistPatterns(int index) {
+      return blacklistPatterns_.get(index);
+    }
+    /**
+     * 
+     * The blacklist URL patterns as described in
+     * https://cloud.google.com/security-scanner/docs/excluded-urls
+     * 

+     *
+     * repeated string blacklist_patterns = 7;
+     */
+    public com.google.protobuf.ByteString
+        getBlacklistPatternsBytes(int index) {
+      return blacklistPatterns_.getByteString(index);
+    }
+    /**
+     * 
+     * The blacklist URL patterns as described in
+     * https://cloud.google.com/security-scanner/docs/excluded-urls
+     * 

+     *
+     * repeated string blacklist_patterns = 7;
+     */
+    public Builder setBlacklistPatterns(
+        int index, java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureBlacklistPatternsIsMutable();
+      blacklistPatterns_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The blacklist URL patterns as described in
+     * https://cloud.google.com/security-scanner/docs/excluded-urls
+     * 

+     *
+     * repeated string blacklist_patterns = 7;
+     */
+    public Builder addBlacklistPatterns(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureBlacklistPatternsIsMutable();
+      blacklistPatterns_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The blacklist URL patterns as described in
+     * https://cloud.google.com/security-scanner/docs/excluded-urls
+     * 

+     *
+     * repeated string blacklist_patterns = 7;
+     */
+    public Builder addAllBlacklistPatterns(
+        java.lang.Iterable values) {
+      ensureBlacklistPatternsIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, blacklistPatterns_);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The blacklist URL patterns as described in
+     * https://cloud.google.com/security-scanner/docs/excluded-urls
+     * 

+     *
+     * repeated string blacklist_patterns = 7;
+     */
+    public Builder clearBlacklistPatterns() {
+      blacklistPatterns_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000040);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The blacklist URL patterns as described in
+     * https://cloud.google.com/security-scanner/docs/excluded-urls
+     * 

+     *
+     * repeated string blacklist_patterns = 7;
+     */
+    public Builder addBlacklistPatternsBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      ensureBlacklistPatternsIsMutable();
+      blacklistPatterns_.add(value);
+      onChanged();
+      return this;
+    }
+
+    private com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.ScheduleOrBuilder> scheduleBuilder_;
+    /**
+     * 
+     * The schedule of the ScanConfig.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+     */
+    public boolean hasSchedule() {
+      return scheduleBuilder_ != null || schedule_ != null;
+    }
+    /**
+     * 
+     * The schedule of the ScanConfig.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule getSchedule() {
+      if (scheduleBuilder_ == null) {
+        return schedule_ == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.getDefaultInstance() : schedule_;
+      } else {
+        return scheduleBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The schedule of the ScanConfig.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+     */
+    public Builder setSchedule(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule value) {
+      if (scheduleBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        schedule_ = value;
+        onChanged();
+      } else {
+        scheduleBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The schedule of the ScanConfig.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+     */
+    public Builder setSchedule(
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.Builder builderForValue) {
+      if (scheduleBuilder_ == null) {
+        schedule_ = builderForValue.build();
+        onChanged();
+      } else {
+        scheduleBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The schedule of the ScanConfig.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+     */
+    public Builder mergeSchedule(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule value) {
+      if (scheduleBuilder_ == null) {
+        if (schedule_ != null) {
+          schedule_ =
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.newBuilder(schedule_).mergeFrom(value).buildPartial();
+        } else {
+          schedule_ = value;
+        }
+        onChanged();
+      } else {
+        scheduleBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The schedule of the ScanConfig.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+     */
+    public Builder clearSchedule() {
+      if (scheduleBuilder_ == null) {
+        schedule_ = null;
+        onChanged();
+      } else {
+        schedule_ = null;
+        scheduleBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The schedule of the ScanConfig.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.Builder getScheduleBuilder() {
+      
+      onChanged();
+      return getScheduleFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The schedule of the ScanConfig.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.ScheduleOrBuilder getScheduleOrBuilder() {
+      if (scheduleBuilder_ != null) {
+        return scheduleBuilder_.getMessageOrBuilder();
+      } else {
+        return schedule_ == null ?
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.getDefaultInstance() : schedule_;
+      }
+    }
+    /**
+     * 
+     * The schedule of the ScanConfig.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.ScheduleOrBuilder> 
+        getScheduleFieldBuilder() {
+      if (scheduleBuilder_ == null) {
+        scheduleBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.ScheduleOrBuilder>(
+                getSchedule(),
+                getParentForChildren(),
+                isClean());
+        schedule_ = null;
+      }
+      return scheduleBuilder_;
+    }
+
+    private java.util.List targetPlatforms_ =
+      java.util.Collections.emptyList();
+    private void ensureTargetPlatformsIsMutable() {
+      if (!((bitField0_ & 0x00000100) == 0x00000100)) {
+        targetPlatforms_ = new java.util.ArrayList(targetPlatforms_);
+        bitField0_ |= 0x00000100;
+      }
+    }
+    /**
+     * 
+     * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+     * used as a default.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+     */
+    public java.util.List getTargetPlatformsList() {
+      return new com.google.protobuf.Internal.ListAdapter<
+          java.lang.Integer, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform>(targetPlatforms_, targetPlatforms_converter_);
+    }
+    /**
+     * 
+     * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+     * used as a default.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+     */
+    public int getTargetPlatformsCount() {
+      return targetPlatforms_.size();
+    }
+    /**
+     * 
+     * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+     * used as a default.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform getTargetPlatforms(int index) {
+      return targetPlatforms_converter_.convert(targetPlatforms_.get(index));
+    }
+    /**
+     * 
+     * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+     * used as a default.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+     */
+    public Builder setTargetPlatforms(
+        int index, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensureTargetPlatformsIsMutable();
+      targetPlatforms_.set(index, value.getNumber());
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+     * used as a default.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+     */
+    public Builder addTargetPlatforms(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensureTargetPlatformsIsMutable();
+      targetPlatforms_.add(value.getNumber());
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+     * used as a default.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+     */
+    public Builder addAllTargetPlatforms(
+        java.lang.Iterable values) {
+      ensureTargetPlatformsIsMutable();
+      for (com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform value : values) {
+        targetPlatforms_.add(value.getNumber());
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+     * used as a default.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+     */
+    public Builder clearTargetPlatforms() {
+      targetPlatforms_ = java.util.Collections.emptyList();
+      bitField0_ = (bitField0_ & ~0x00000100);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+     * used as a default.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+     */
+    public java.util.List
+    getTargetPlatformsValueList() {
+      return java.util.Collections.unmodifiableList(targetPlatforms_);
+    }
+    /**
+     * 
+     * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+     * used as a default.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+     */
+    public int getTargetPlatformsValue(int index) {
+      return targetPlatforms_.get(index);
+    }
+    /**
+     * 
+     * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+     * used as a default.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+     */
+    public Builder setTargetPlatformsValue(
+        int index, int value) {
+      ensureTargetPlatformsIsMutable();
+      targetPlatforms_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+     * used as a default.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+     */
+    public Builder addTargetPlatformsValue(int value) {
+      ensureTargetPlatformsIsMutable();
+      targetPlatforms_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+     * used as a default.
+     * 

+     *
+     * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+     */
+    public Builder addAllTargetPlatformsValue(
+        java.lang.Iterable values) {
+      ensureTargetPlatformsIsMutable();
+      for (int value : values) {
+        targetPlatforms_.add(value);
+      }
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ScanConfig)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ScanConfig)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ScanConfig DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ScanConfig parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ScanConfig(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigName.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigName.java
new file mode 100644
index 000000000000..077b0d17f311
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigName.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, 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.
+ */
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.api.resourcenames.ResourceNameType;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class ScanConfigName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/scanConfigs/{scan_config}");
+
+  private volatile Map fieldValuesMap;
+
+  private final String project;
+  private final String scanConfig;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getScanConfig() {
+    return scanConfig;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private ScanConfigName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    scanConfig = Preconditions.checkNotNull(builder.getScanConfig());
+  }
+
+  public static ScanConfigName of(String project, String scanConfig) {
+    return newBuilder()
+      .setProject(project)
+      .setScanConfig(scanConfig)
+      .build();
+  }
+
+  public static String format(String project, String scanConfig) {
+    return newBuilder()
+      .setProject(project)
+      .setScanConfig(scanConfig)
+      .build()
+      .toString();
+  }
+
+  public static ScanConfigName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map matchMap =
+        PATH_TEMPLATE.validatedMatch(formattedString, "ScanConfigName.parse: formattedString not in valid format");
+    return of(matchMap.get("project"), matchMap.get("scan_config"));
+  }
+
+  public static List parseList(List formattedStrings) {
+    List list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List toStringList(List values) {
+    List list = new ArrayList(values.size());
+    for (ScanConfigName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldMapBuilder.put("scanConfig", scanConfig);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  /**
+   * @deprecated This method is only present to satisfy the ResourceName interface.
+   */
+  @Deprecated
+  public ResourceNameType getType() {
+    throw new UnsupportedOperationException("ScanConfigName.getType() not supported");
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate("project", project, "scan_config", scanConfig);
+  }
+
+  /** Builder for ScanConfigName. */
+  public static class Builder {
+
+    private String project;
+    private String scanConfig;
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getScanConfig() {
+      return scanConfig;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public Builder setScanConfig(String scanConfig) {
+      this.scanConfig = scanConfig;
+      return this;
+    }
+
+    private Builder() {
+    }
+
+    private Builder(ScanConfigName scanConfigName) {
+      project = scanConfigName.project;
+      scanConfig = scanConfigName.scanConfig;
+    }
+
+    public ScanConfigName build() {
+      return new ScanConfigName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof ScanConfigName) {
+      ScanConfigName that = (ScanConfigName) o;
+      return (this.project.equals(that.project))
+          && (this.scanConfig.equals(that.scanConfig));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    h *= 1000003;
+    h ^= scanConfig.hashCode();
+    return h;
+  }
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigOrBuilder.java
new file mode 100644
index 000000000000..117411668022
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigOrBuilder.java
@@ -0,0 +1,258 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/scan_config.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ScanConfigOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ScanConfig)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The resource name of the ScanConfig. The name follows the format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}'. The ScanConfig IDs are
+   * generated by the system.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * The resource name of the ScanConfig. The name follows the format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}'. The ScanConfig IDs are
+   * generated by the system.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * 
+   * Required.
+   * The user provided display name of the ScanConfig.
+   * 

+   *
+   * string display_name = 2;
+   */
+  java.lang.String getDisplayName();
+  /**
+   * 
+   * Required.
+   * The user provided display name of the ScanConfig.
+   * 

+   *
+   * string display_name = 2;
+   */
+  com.google.protobuf.ByteString
+      getDisplayNameBytes();
+
+  /**
+   * 
+   * The maximum QPS during scanning. A valid value ranges from 5 to 20
+   * inclusively. If the field is unspecified or its value is set 0, server will
+   * default to 15. Other values outside of [5, 20] range will be rejected with
+   * INVALID_ARGUMENT error.
+   * 

+   *
+   * int32 max_qps = 3;
+   */
+  int getMaxQps();
+
+  /**
+   * 
+   * Required.
+   * The starting URLs from which the scanner finds site pages.
+   * 

+   *
+   * repeated string starting_urls = 4;
+   */
+  java.util.List
+      getStartingUrlsList();
+  /**
+   * 
+   * Required.
+   * The starting URLs from which the scanner finds site pages.
+   * 

+   *
+   * repeated string starting_urls = 4;
+   */
+  int getStartingUrlsCount();
+  /**
+   * 
+   * Required.
+   * The starting URLs from which the scanner finds site pages.
+   * 

+   *
+   * repeated string starting_urls = 4;
+   */
+  java.lang.String getStartingUrls(int index);
+  /**
+   * 
+   * Required.
+   * The starting URLs from which the scanner finds site pages.
+   * 

+   *
+   * repeated string starting_urls = 4;
+   */
+  com.google.protobuf.ByteString
+      getStartingUrlsBytes(int index);
+
+  /**
+   * 
+   * The authentication configuration. If specified, service will use the
+   * authentication configuration during scanning.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+   */
+  boolean hasAuthentication();
+  /**
+   * 
+   * The authentication configuration. If specified, service will use the
+   * authentication configuration during scanning.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication getAuthentication();
+  /**
+   * 
+   * The authentication configuration. If specified, service will use the
+   * authentication configuration during scanning.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication authentication = 5;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanConfig.AuthenticationOrBuilder getAuthenticationOrBuilder();
+
+  /**
+   * 
+   * The user agent used during scanning.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent user_agent = 6;
+   */
+  int getUserAgentValue();
+  /**
+   * 
+   * The user agent used during scanning.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent user_agent = 6;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent getUserAgent();
+
+  /**
+   * 
+   * The blacklist URL patterns as described in
+   * https://cloud.google.com/security-scanner/docs/excluded-urls
+   * 

+   *
+   * repeated string blacklist_patterns = 7;
+   */
+  java.util.List
+      getBlacklistPatternsList();
+  /**
+   * 
+   * The blacklist URL patterns as described in
+   * https://cloud.google.com/security-scanner/docs/excluded-urls
+   * 

+   *
+   * repeated string blacklist_patterns = 7;
+   */
+  int getBlacklistPatternsCount();
+  /**
+   * 
+   * The blacklist URL patterns as described in
+   * https://cloud.google.com/security-scanner/docs/excluded-urls
+   * 

+   *
+   * repeated string blacklist_patterns = 7;
+   */
+  java.lang.String getBlacklistPatterns(int index);
+  /**
+   * 
+   * The blacklist URL patterns as described in
+   * https://cloud.google.com/security-scanner/docs/excluded-urls
+   * 

+   *
+   * repeated string blacklist_patterns = 7;
+   */
+  com.google.protobuf.ByteString
+      getBlacklistPatternsBytes(int index);
+
+  /**
+   * 
+   * The schedule of the ScanConfig.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+   */
+  boolean hasSchedule();
+  /**
+   * 
+   * The schedule of the ScanConfig.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule getSchedule();
+  /**
+   * 
+   * The schedule of the ScanConfig.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule schedule = 8;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanConfig.ScheduleOrBuilder getScheduleOrBuilder();
+
+  /**
+   * 
+   * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+   * used as a default.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+   */
+  java.util.List getTargetPlatformsList();
+  /**
+   * 
+   * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+   * used as a default.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+   */
+  int getTargetPlatformsCount();
+  /**
+   * 
+   * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+   * used as a default.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform getTargetPlatforms(int index);
+  /**
+   * 
+   * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+   * used as a default.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+   */
+  java.util.List
+  getTargetPlatformsValueList();
+  /**
+   * 
+   * Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+   * used as a default.
+   * 

+   *
+   * repeated .google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform target_platforms = 9;
+   */
+  int getTargetPlatformsValue(int index);
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigProto.java
new file mode 100644
index 000000000000..97cacbf2db6f
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigProto.java
@@ -0,0 +1,138 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/scan_config.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public final class ScanConfigProto {
+  private ScanConfigProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n9google/cloud/websecurityscanner/v1alph" +
+      "a/scan_config.proto\022\'google.cloud.websec" +
+      "urityscanner.v1alpha\032\034google/api/annotat" +
+      "ions.proto\032\037google/protobuf/timestamp.pr" +
+      "oto\"\334\010\n\nScanConfig\022\014\n\004name\030\001 \001(\t\022\024\n\014disp" +
+      "lay_name\030\002 \001(\t\022\017\n\007max_qps\030\003 \001(\005\022\025\n\rstart" +
+      "ing_urls\030\004 \003(\t\022Z\n\016authentication\030\005 \001(\0132B" +
+      ".google.cloud.websecurityscanner.v1alpha" +
+      ".ScanConfig.Authentication\022Q\n\nuser_agent" +
+      "\030\006 \001(\0162=.google.cloud.websecurityscanner" +
+      ".v1alpha.ScanConfig.UserAgent\022\032\n\022blackli" +
+      "st_patterns\030\007 \003(\t\022N\n\010schedule\030\010 \001(\0132<.go" +
+      "ogle.cloud.websecurityscanner.v1alpha.Sc" +
+      "anConfig.Schedule\022\\\n\020target_platforms\030\t " +
+      "\003(\0162B.google.cloud.websecurityscanner.v1" +
+      "alpha.ScanConfig.TargetPlatform\032\367\002\n\016Auth" +
+      "entication\022j\n\016google_account\030\001 \001(\0132P.goo" +
+      "gle.cloud.websecurityscanner.v1alpha.Sca" +
+      "nConfig.Authentication.GoogleAccountH\000\022j" +
+      "\n\016custom_account\030\002 \001(\0132P.google.cloud.we" +
+      "bsecurityscanner.v1alpha.ScanConfig.Auth" +
+      "entication.CustomAccountH\000\0323\n\rGoogleAcco" +
+      "unt\022\020\n\010username\030\001 \001(\t\022\020\n\010password\030\002 \001(\t\032" +
+      "F\n\rCustomAccount\022\020\n\010username\030\001 \001(\t\022\020\n\010pa" +
+      "ssword\030\002 \001(\t\022\021\n\tlogin_url\030\003 \001(\tB\020\n\016authe" +
+      "ntication\032]\n\010Schedule\0221\n\rschedule_time\030\001" +
+      " \001(\0132\032.google.protobuf.Timestamp\022\036\n\026inte" +
+      "rval_duration_days\030\002 \001(\005\"`\n\tUserAgent\022\032\n" +
+      "\026USER_AGENT_UNSPECIFIED\020\000\022\020\n\014CHROME_LINU" +
+      "X\020\001\022\022\n\016CHROME_ANDROID\020\002\022\021\n\rSAFARI_IPHONE" +
+      "\020\003\"N\n\016TargetPlatform\022\037\n\033TARGET_PLATFORM_" +
+      "UNSPECIFIED\020\000\022\016\n\nAPP_ENGINE\020\001\022\013\n\007COMPUTE" +
+      "\020\002B\233\001\n+com.google.cloud.websecurityscann" +
+      "er.v1alphaB\017ScanConfigProtoP\001ZYgoogle.go" +
+      "lang.org/genproto/googleapis/cloud/webse" +
+      "curityscanner/v1alpha;websecurityscanner" +
+      "b\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.api.AnnotationsProto.getDescriptor(),
+          com.google.protobuf.TimestampProto.getDescriptor(),
+        }, assigner);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_descriptor,
+        new java.lang.String[] { "Name", "DisplayName", "MaxQps", "StartingUrls", "Authentication", "UserAgent", "BlacklistPatterns", "Schedule", "TargetPlatforms", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_descriptor =
+      internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_descriptor.getNestedTypes().get(0);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_descriptor,
+        new java.lang.String[] { "GoogleAccount", "CustomAccount", "Authentication", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_descriptor =
+      internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_descriptor.getNestedTypes().get(0);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_descriptor,
+        new java.lang.String[] { "Username", "Password", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_descriptor =
+      internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_descriptor.getNestedTypes().get(1);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_descriptor,
+        new java.lang.String[] { "Username", "Password", "LoginUrl", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_descriptor =
+      internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_descriptor.getNestedTypes().get(1);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_descriptor,
+        new java.lang.String[] { "ScheduleTime", "IntervalDurationDays", });
+    com.google.api.AnnotationsProto.getDescriptor();
+    com.google.protobuf.TimestampProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRun.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRun.java
new file mode 100644
index 000000000000..79d8a4fc866b
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRun.java
@@ -0,0 +1,1961 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/scan_run.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * A ScanRun is a output-only resource representing an actual run of the scan.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ScanRun}
+ */
+public  final class ScanRun extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ScanRun)
+    ScanRunOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ScanRun.newBuilder() to construct.
+  private ScanRun(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ScanRun() {
+    name_ = "";
+    executionState_ = 0;
+    resultState_ = 0;
+    urlsCrawledCount_ = 0L;
+    urlsTestedCount_ = 0L;
+    hasVulnerabilities_ = false;
+    progressPercent_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ScanRun(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 16: {
+            int rawValue = input.readEnum();
+
+            executionState_ = rawValue;
+            break;
+          }
+          case 24: {
+            int rawValue = input.readEnum();
+
+            resultState_ = rawValue;
+            break;
+          }
+          case 34: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (startTime_ != null) {
+              subBuilder = startTime_.toBuilder();
+            }
+            startTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(startTime_);
+              startTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 42: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (endTime_ != null) {
+              subBuilder = endTime_.toBuilder();
+            }
+            endTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(endTime_);
+              endTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 48: {
+
+            urlsCrawledCount_ = input.readInt64();
+            break;
+          }
+          case 56: {
+
+            urlsTestedCount_ = input.readInt64();
+            break;
+          }
+          case 64: {
+
+            hasVulnerabilities_ = input.readBool();
+            break;
+          }
+          case 72: {
+
+            progressPercent_ = input.readInt32();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.ScanRunProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.ScanRunProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ScanRun.class, com.google.cloud.websecurityscanner.v1alpha.ScanRun.Builder.class);
+  }
+
+  /**
+   * 
+   * Types of ScanRun execution state.
+   * 

+   *
+   * Protobuf enum {@code google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState}
+   */
+  public enum ExecutionState
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * 
+     * Represents an invalid state caused by internal server error. This value
+     * should never be returned.
+     * 

+     *
+     * EXECUTION_STATE_UNSPECIFIED = 0;
+     */
+    EXECUTION_STATE_UNSPECIFIED(0),
+    /**
+     * 
+     * The scan is waiting in the queue.
+     * 

+     *
+     * QUEUED = 1;
+     */
+    QUEUED(1),
+    /**
+     * 
+     * The scan is in progress.
+     * 

+     *
+     * SCANNING = 2;
+     */
+    SCANNING(2),
+    /**
+     * 
+     * The scan is either finished or stopped by user.
+     * 

+     *
+     * FINISHED = 3;
+     */
+    FINISHED(3),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * 
+     * Represents an invalid state caused by internal server error. This value
+     * should never be returned.
+     * 

+     *
+     * EXECUTION_STATE_UNSPECIFIED = 0;
+     */
+    public static final int EXECUTION_STATE_UNSPECIFIED_VALUE = 0;
+    /**
+     * 
+     * The scan is waiting in the queue.
+     * 

+     *
+     * QUEUED = 1;
+     */
+    public static final int QUEUED_VALUE = 1;
+    /**
+     * 
+     * The scan is in progress.
+     * 

+     *
+     * SCANNING = 2;
+     */
+    public static final int SCANNING_VALUE = 2;
+    /**
+     * 
+     * The scan is either finished or stopped by user.
+     * 

+     *
+     * FINISHED = 3;
+     */
+    public static final int FINISHED_VALUE = 3;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static ExecutionState valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static ExecutionState forNumber(int value) {
+      switch (value) {
+        case 0: return EXECUTION_STATE_UNSPECIFIED;
+        case 1: return QUEUED;
+        case 2: return SCANNING;
+        case 3: return FINISHED;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ExecutionState> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public ExecutionState findValueByNumber(int number) {
+              return ExecutionState.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanRun.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final ExecutionState[] VALUES = values();
+
+    public static ExecutionState valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private ExecutionState(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState)
+  }
+
+  /**
+   * 
+   * Types of ScanRun result state.
+   * 

+   *
+   * Protobuf enum {@code google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState}
+   */
+  public enum ResultState
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * 
+     * Default value. This value is returned when the ScanRun is not yet
+     * finished.
+     * 

+     *
+     * RESULT_STATE_UNSPECIFIED = 0;
+     */
+    RESULT_STATE_UNSPECIFIED(0),
+    /**
+     * 
+     * The scan finished without errors.
+     * 

+     *
+     * SUCCESS = 1;
+     */
+    SUCCESS(1),
+    /**
+     * 
+     * The scan finished with errors.
+     * 

+     *
+     * ERROR = 2;
+     */
+    ERROR(2),
+    /**
+     * 
+     * The scan was terminated by user.
+     * 

+     *
+     * KILLED = 3;
+     */
+    KILLED(3),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * 
+     * Default value. This value is returned when the ScanRun is not yet
+     * finished.
+     * 

+     *
+     * RESULT_STATE_UNSPECIFIED = 0;
+     */
+    public static final int RESULT_STATE_UNSPECIFIED_VALUE = 0;
+    /**
+     * 
+     * The scan finished without errors.
+     * 

+     *
+     * SUCCESS = 1;
+     */
+    public static final int SUCCESS_VALUE = 1;
+    /**
+     * 
+     * The scan finished with errors.
+     * 

+     *
+     * ERROR = 2;
+     */
+    public static final int ERROR_VALUE = 2;
+    /**
+     * 
+     * The scan was terminated by user.
+     * 

+     *
+     * KILLED = 3;
+     */
+    public static final int KILLED_VALUE = 3;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static ResultState valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static ResultState forNumber(int value) {
+      switch (value) {
+        case 0: return RESULT_STATE_UNSPECIFIED;
+        case 1: return SUCCESS;
+        case 2: return ERROR;
+        case 3: return KILLED;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ResultState> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public ResultState findValueByNumber(int number) {
+              return ResultState.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanRun.getDescriptor().getEnumTypes().get(1);
+    }
+
+    private static final ResultState[] VALUES = values();
+
+    public static ResultState valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private ResultState(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState)
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * Output only.
+   * The resource name of the ScanRun. The name follows the format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * The ScanRun IDs are generated by the system.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Output only.
+   * The resource name of the ScanRun. The name follows the format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * The ScanRun IDs are generated by the system.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int EXECUTION_STATE_FIELD_NUMBER = 2;
+  private int executionState_;
+  /**
+   * 
+   * Output only.
+   * The execution state of the ScanRun.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState execution_state = 2;
+   */
+  public int getExecutionStateValue() {
+    return executionState_;
+  }
+  /**
+   * 
+   * Output only.
+   * The execution state of the ScanRun.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState execution_state = 2;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState getExecutionState() {
+    com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState result = com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState.valueOf(executionState_);
+    return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState.UNRECOGNIZED : result;
+  }
+
+  public static final int RESULT_STATE_FIELD_NUMBER = 3;
+  private int resultState_;
+  /**
+   * 
+   * Output only.
+   * The result state of the ScanRun. This field is only available after the
+   * execution state reaches "FINISHED".
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result_state = 3;
+   */
+  public int getResultStateValue() {
+    return resultState_;
+  }
+  /**
+   * 
+   * Output only.
+   * The result state of the ScanRun. This field is only available after the
+   * execution state reaches "FINISHED".
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result_state = 3;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState getResultState() {
+    com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result = com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState.valueOf(resultState_);
+    return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState.UNRECOGNIZED : result;
+  }
+
+  public static final int START_TIME_FIELD_NUMBER = 4;
+  private com.google.protobuf.Timestamp startTime_;
+  /**
+   * 
+   * Output only.
+   * The time at which the ScanRun started.
+   * 

+   *
+   * .google.protobuf.Timestamp start_time = 4;
+   */
+  public boolean hasStartTime() {
+    return startTime_ != null;
+  }
+  /**
+   * 
+   * Output only.
+   * The time at which the ScanRun started.
+   * 

+   *
+   * .google.protobuf.Timestamp start_time = 4;
+   */
+  public com.google.protobuf.Timestamp getStartTime() {
+    return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
+  }
+  /**
+   * 
+   * Output only.
+   * The time at which the ScanRun started.
+   * 

+   *
+   * .google.protobuf.Timestamp start_time = 4;
+   */
+  public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
+    return getStartTime();
+  }
+
+  public static final int END_TIME_FIELD_NUMBER = 5;
+  private com.google.protobuf.Timestamp endTime_;
+  /**
+   * 
+   * Output only.
+   * The time at which the ScanRun reached termination state - that the ScanRun
+   * is either finished or stopped by user.
+   * 

+   *
+   * .google.protobuf.Timestamp end_time = 5;
+   */
+  public boolean hasEndTime() {
+    return endTime_ != null;
+  }
+  /**
+   * 
+   * Output only.
+   * The time at which the ScanRun reached termination state - that the ScanRun
+   * is either finished or stopped by user.
+   * 

+   *
+   * .google.protobuf.Timestamp end_time = 5;
+   */
+  public com.google.protobuf.Timestamp getEndTime() {
+    return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
+  }
+  /**
+   * 
+   * Output only.
+   * The time at which the ScanRun reached termination state - that the ScanRun
+   * is either finished or stopped by user.
+   * 

+   *
+   * .google.protobuf.Timestamp end_time = 5;
+   */
+  public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
+    return getEndTime();
+  }
+
+  public static final int URLS_CRAWLED_COUNT_FIELD_NUMBER = 6;
+  private long urlsCrawledCount_;
+  /**
+   * 
+   * Output only.
+   * The number of URLs crawled during this ScanRun. If the scan is in progress,
+   * the value represents the number of URLs crawled up to now.
+   * 

+   *
+   * int64 urls_crawled_count = 6;
+   */
+  public long getUrlsCrawledCount() {
+    return urlsCrawledCount_;
+  }
+
+  public static final int URLS_TESTED_COUNT_FIELD_NUMBER = 7;
+  private long urlsTestedCount_;
+  /**
+   * 
+   * Output only.
+   * The number of URLs tested during this ScanRun. If the scan is in progress,
+   * the value represents the number of URLs tested up to now. The number of
+   * URLs tested is usually larger than the number URLS crawled because
+   * typically a crawled URL is tested with multiple test payloads.
+   * 

+   *
+   * int64 urls_tested_count = 7;
+   */
+  public long getUrlsTestedCount() {
+    return urlsTestedCount_;
+  }
+
+  public static final int HAS_VULNERABILITIES_FIELD_NUMBER = 8;
+  private boolean hasVulnerabilities_;
+  /**
+   * 
+   * Output only.
+   * Whether the scan run has found any vulnerabilities.
+   * 

+   *
+   * bool has_vulnerabilities = 8;
+   */
+  public boolean getHasVulnerabilities() {
+    return hasVulnerabilities_;
+  }
+
+  public static final int PROGRESS_PERCENT_FIELD_NUMBER = 9;
+  private int progressPercent_;
+  /**
+   * 
+   * Output only.
+   * The percentage of total completion ranging from 0 to 100.
+   * If the scan is in queue, the value is 0.
+   * If the scan is running, the value ranges from 0 to 100.
+   * If the scan is finished, the value is 100.
+   * 

+   *
+   * int32 progress_percent = 9;
+   */
+  public int getProgressPercent() {
+    return progressPercent_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    if (executionState_ != com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState.EXECUTION_STATE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(2, executionState_);
+    }
+    if (resultState_ != com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState.RESULT_STATE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(3, resultState_);
+    }
+    if (startTime_ != null) {
+      output.writeMessage(4, getStartTime());
+    }
+    if (endTime_ != null) {
+      output.writeMessage(5, getEndTime());
+    }
+    if (urlsCrawledCount_ != 0L) {
+      output.writeInt64(6, urlsCrawledCount_);
+    }
+    if (urlsTestedCount_ != 0L) {
+      output.writeInt64(7, urlsTestedCount_);
+    }
+    if (hasVulnerabilities_ != false) {
+      output.writeBool(8, hasVulnerabilities_);
+    }
+    if (progressPercent_ != 0) {
+      output.writeInt32(9, progressPercent_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    if (executionState_ != com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState.EXECUTION_STATE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(2, executionState_);
+    }
+    if (resultState_ != com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState.RESULT_STATE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(3, resultState_);
+    }
+    if (startTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(4, getStartTime());
+    }
+    if (endTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(5, getEndTime());
+    }
+    if (urlsCrawledCount_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(6, urlsCrawledCount_);
+    }
+    if (urlsTestedCount_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(7, urlsTestedCount_);
+    }
+    if (hasVulnerabilities_ != false) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(8, hasVulnerabilities_);
+    }
+    if (progressPercent_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(9, progressPercent_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ScanRun)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ScanRun other = (com.google.cloud.websecurityscanner.v1alpha.ScanRun) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && executionState_ == other.executionState_;
+    result = result && resultState_ == other.resultState_;
+    result = result && (hasStartTime() == other.hasStartTime());
+    if (hasStartTime()) {
+      result = result && getStartTime()
+          .equals(other.getStartTime());
+    }
+    result = result && (hasEndTime() == other.hasEndTime());
+    if (hasEndTime()) {
+      result = result && getEndTime()
+          .equals(other.getEndTime());
+    }
+    result = result && (getUrlsCrawledCount()
+        == other.getUrlsCrawledCount());
+    result = result && (getUrlsTestedCount()
+        == other.getUrlsTestedCount());
+    result = result && (getHasVulnerabilities()
+        == other.getHasVulnerabilities());
+    result = result && (getProgressPercent()
+        == other.getProgressPercent());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (37 * hash) + EXECUTION_STATE_FIELD_NUMBER;
+    hash = (53 * hash) + executionState_;
+    hash = (37 * hash) + RESULT_STATE_FIELD_NUMBER;
+    hash = (53 * hash) + resultState_;
+    if (hasStartTime()) {
+      hash = (37 * hash) + START_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getStartTime().hashCode();
+    }
+    if (hasEndTime()) {
+      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getEndTime().hashCode();
+    }
+    hash = (37 * hash) + URLS_CRAWLED_COUNT_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getUrlsCrawledCount());
+    hash = (37 * hash) + URLS_TESTED_COUNT_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getUrlsTestedCount());
+    hash = (37 * hash) + HAS_VULNERABILITIES_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getHasVulnerabilities());
+    hash = (37 * hash) + PROGRESS_PERCENT_FIELD_NUMBER;
+    hash = (53 * hash) + getProgressPercent();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ScanRun prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * A ScanRun is a output-only resource representing an actual run of the scan.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ScanRun}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ScanRun)
+      com.google.cloud.websecurityscanner.v1alpha.ScanRunOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanRunProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanRunProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ScanRun.class, com.google.cloud.websecurityscanner.v1alpha.ScanRun.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ScanRun.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      executionState_ = 0;
+
+      resultState_ = 0;
+
+      if (startTimeBuilder_ == null) {
+        startTime_ = null;
+      } else {
+        startTime_ = null;
+        startTimeBuilder_ = null;
+      }
+      if (endTimeBuilder_ == null) {
+        endTime_ = null;
+      } else {
+        endTime_ = null;
+        endTimeBuilder_ = null;
+      }
+      urlsCrawledCount_ = 0L;
+
+      urlsTestedCount_ = 0L;
+
+      hasVulnerabilities_ = false;
+
+      progressPercent_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanRunProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRun getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ScanRun.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRun build() {
+      com.google.cloud.websecurityscanner.v1alpha.ScanRun result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRun buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ScanRun result = new com.google.cloud.websecurityscanner.v1alpha.ScanRun(this);
+      result.name_ = name_;
+      result.executionState_ = executionState_;
+      result.resultState_ = resultState_;
+      if (startTimeBuilder_ == null) {
+        result.startTime_ = startTime_;
+      } else {
+        result.startTime_ = startTimeBuilder_.build();
+      }
+      if (endTimeBuilder_ == null) {
+        result.endTime_ = endTime_;
+      } else {
+        result.endTime_ = endTimeBuilder_.build();
+      }
+      result.urlsCrawledCount_ = urlsCrawledCount_;
+      result.urlsTestedCount_ = urlsTestedCount_;
+      result.hasVulnerabilities_ = hasVulnerabilities_;
+      result.progressPercent_ = progressPercent_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ScanRun) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanRun)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ScanRun other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ScanRun.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (other.executionState_ != 0) {
+        setExecutionStateValue(other.getExecutionStateValue());
+      }
+      if (other.resultState_ != 0) {
+        setResultStateValue(other.getResultStateValue());
+      }
+      if (other.hasStartTime()) {
+        mergeStartTime(other.getStartTime());
+      }
+      if (other.hasEndTime()) {
+        mergeEndTime(other.getEndTime());
+      }
+      if (other.getUrlsCrawledCount() != 0L) {
+        setUrlsCrawledCount(other.getUrlsCrawledCount());
+      }
+      if (other.getUrlsTestedCount() != 0L) {
+        setUrlsTestedCount(other.getUrlsTestedCount());
+      }
+      if (other.getHasVulnerabilities() != false) {
+        setHasVulnerabilities(other.getHasVulnerabilities());
+      }
+      if (other.getProgressPercent() != 0) {
+        setProgressPercent(other.getProgressPercent());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ScanRun parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ScanRun) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * Output only.
+     * The resource name of the ScanRun. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * The ScanRun IDs are generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The resource name of the ScanRun. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * The ScanRun IDs are generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The resource name of the ScanRun. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * The ScanRun IDs are generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The resource name of the ScanRun. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * The ScanRun IDs are generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The resource name of the ScanRun. The name follows the format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * The ScanRun IDs are generated by the system.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int executionState_ = 0;
+    /**
+     * 
+     * Output only.
+     * The execution state of the ScanRun.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState execution_state = 2;
+     */
+    public int getExecutionStateValue() {
+      return executionState_;
+    }
+    /**
+     * 
+     * Output only.
+     * The execution state of the ScanRun.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState execution_state = 2;
+     */
+    public Builder setExecutionStateValue(int value) {
+      executionState_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The execution state of the ScanRun.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState execution_state = 2;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState getExecutionState() {
+      com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState result = com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState.valueOf(executionState_);
+      return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState.UNRECOGNIZED : result;
+    }
+    /**
+     * 
+     * Output only.
+     * The execution state of the ScanRun.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState execution_state = 2;
+     */
+    public Builder setExecutionState(com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      executionState_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The execution state of the ScanRun.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState execution_state = 2;
+     */
+    public Builder clearExecutionState() {
+      
+      executionState_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private int resultState_ = 0;
+    /**
+     * 
+     * Output only.
+     * The result state of the ScanRun. This field is only available after the
+     * execution state reaches "FINISHED".
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result_state = 3;
+     */
+    public int getResultStateValue() {
+      return resultState_;
+    }
+    /**
+     * 
+     * Output only.
+     * The result state of the ScanRun. This field is only available after the
+     * execution state reaches "FINISHED".
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result_state = 3;
+     */
+    public Builder setResultStateValue(int value) {
+      resultState_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The result state of the ScanRun. This field is only available after the
+     * execution state reaches "FINISHED".
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result_state = 3;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState getResultState() {
+      com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result = com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState.valueOf(resultState_);
+      return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState.UNRECOGNIZED : result;
+    }
+    /**
+     * 
+     * Output only.
+     * The result state of the ScanRun. This field is only available after the
+     * execution state reaches "FINISHED".
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result_state = 3;
+     */
+    public Builder setResultState(com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      resultState_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The result state of the ScanRun. This field is only available after the
+     * execution state reaches "FINISHED".
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result_state = 3;
+     */
+    public Builder clearResultState() {
+      
+      resultState_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.Timestamp startTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> startTimeBuilder_;
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun started.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 4;
+     */
+    public boolean hasStartTime() {
+      return startTimeBuilder_ != null || startTime_ != null;
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun started.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 4;
+     */
+    public com.google.protobuf.Timestamp getStartTime() {
+      if (startTimeBuilder_ == null) {
+        return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
+      } else {
+        return startTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun started.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 4;
+     */
+    public Builder setStartTime(com.google.protobuf.Timestamp value) {
+      if (startTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        startTime_ = value;
+        onChanged();
+      } else {
+        startTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun started.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 4;
+     */
+    public Builder setStartTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (startTimeBuilder_ == null) {
+        startTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        startTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun started.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 4;
+     */
+    public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
+      if (startTimeBuilder_ == null) {
+        if (startTime_ != null) {
+          startTime_ =
+            com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial();
+        } else {
+          startTime_ = value;
+        }
+        onChanged();
+      } else {
+        startTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun started.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 4;
+     */
+    public Builder clearStartTime() {
+      if (startTimeBuilder_ == null) {
+        startTime_ = null;
+        onChanged();
+      } else {
+        startTime_ = null;
+        startTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun started.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 4;
+     */
+    public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
+      
+      onChanged();
+      return getStartTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun started.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 4;
+     */
+    public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
+      if (startTimeBuilder_ != null) {
+        return startTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return startTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : startTime_;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun started.
+     * 

+     *
+     * .google.protobuf.Timestamp start_time = 4;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getStartTimeFieldBuilder() {
+      if (startTimeBuilder_ == null) {
+        startTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getStartTime(),
+                getParentForChildren(),
+                isClean());
+        startTime_ = null;
+      }
+      return startTimeBuilder_;
+    }
+
+    private com.google.protobuf.Timestamp endTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> endTimeBuilder_;
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun reached termination state - that the ScanRun
+     * is either finished or stopped by user.
+     * 

+     *
+     * .google.protobuf.Timestamp end_time = 5;
+     */
+    public boolean hasEndTime() {
+      return endTimeBuilder_ != null || endTime_ != null;
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun reached termination state - that the ScanRun
+     * is either finished or stopped by user.
+     * 

+     *
+     * .google.protobuf.Timestamp end_time = 5;
+     */
+    public com.google.protobuf.Timestamp getEndTime() {
+      if (endTimeBuilder_ == null) {
+        return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
+      } else {
+        return endTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun reached termination state - that the ScanRun
+     * is either finished or stopped by user.
+     * 

+     *
+     * .google.protobuf.Timestamp end_time = 5;
+     */
+    public Builder setEndTime(com.google.protobuf.Timestamp value) {
+      if (endTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        endTime_ = value;
+        onChanged();
+      } else {
+        endTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun reached termination state - that the ScanRun
+     * is either finished or stopped by user.
+     * 

+     *
+     * .google.protobuf.Timestamp end_time = 5;
+     */
+    public Builder setEndTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (endTimeBuilder_ == null) {
+        endTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        endTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun reached termination state - that the ScanRun
+     * is either finished or stopped by user.
+     * 

+     *
+     * .google.protobuf.Timestamp end_time = 5;
+     */
+    public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
+      if (endTimeBuilder_ == null) {
+        if (endTime_ != null) {
+          endTime_ =
+            com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial();
+        } else {
+          endTime_ = value;
+        }
+        onChanged();
+      } else {
+        endTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun reached termination state - that the ScanRun
+     * is either finished or stopped by user.
+     * 

+     *
+     * .google.protobuf.Timestamp end_time = 5;
+     */
+    public Builder clearEndTime() {
+      if (endTimeBuilder_ == null) {
+        endTime_ = null;
+        onChanged();
+      } else {
+        endTime_ = null;
+        endTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun reached termination state - that the ScanRun
+     * is either finished or stopped by user.
+     * 

+     *
+     * .google.protobuf.Timestamp end_time = 5;
+     */
+    public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
+      
+      onChanged();
+      return getEndTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun reached termination state - that the ScanRun
+     * is either finished or stopped by user.
+     * 

+     *
+     * .google.protobuf.Timestamp end_time = 5;
+     */
+    public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
+      if (endTimeBuilder_ != null) {
+        return endTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return endTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : endTime_;
+      }
+    }
+    /**
+     * 
+     * Output only.
+     * The time at which the ScanRun reached termination state - that the ScanRun
+     * is either finished or stopped by user.
+     * 

+     *
+     * .google.protobuf.Timestamp end_time = 5;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getEndTimeFieldBuilder() {
+      if (endTimeBuilder_ == null) {
+        endTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getEndTime(),
+                getParentForChildren(),
+                isClean());
+        endTime_ = null;
+      }
+      return endTimeBuilder_;
+    }
+
+    private long urlsCrawledCount_ ;
+    /**
+     * 
+     * Output only.
+     * The number of URLs crawled during this ScanRun. If the scan is in progress,
+     * the value represents the number of URLs crawled up to now.
+     * 

+     *
+     * int64 urls_crawled_count = 6;
+     */
+    public long getUrlsCrawledCount() {
+      return urlsCrawledCount_;
+    }
+    /**
+     * 
+     * Output only.
+     * The number of URLs crawled during this ScanRun. If the scan is in progress,
+     * the value represents the number of URLs crawled up to now.
+     * 

+     *
+     * int64 urls_crawled_count = 6;
+     */
+    public Builder setUrlsCrawledCount(long value) {
+      
+      urlsCrawledCount_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The number of URLs crawled during this ScanRun. If the scan is in progress,
+     * the value represents the number of URLs crawled up to now.
+     * 

+     *
+     * int64 urls_crawled_count = 6;
+     */
+    public Builder clearUrlsCrawledCount() {
+      
+      urlsCrawledCount_ = 0L;
+      onChanged();
+      return this;
+    }
+
+    private long urlsTestedCount_ ;
+    /**
+     * 
+     * Output only.
+     * The number of URLs tested during this ScanRun. If the scan is in progress,
+     * the value represents the number of URLs tested up to now. The number of
+     * URLs tested is usually larger than the number URLS crawled because
+     * typically a crawled URL is tested with multiple test payloads.
+     * 

+     *
+     * int64 urls_tested_count = 7;
+     */
+    public long getUrlsTestedCount() {
+      return urlsTestedCount_;
+    }
+    /**
+     * 
+     * Output only.
+     * The number of URLs tested during this ScanRun. If the scan is in progress,
+     * the value represents the number of URLs tested up to now. The number of
+     * URLs tested is usually larger than the number URLS crawled because
+     * typically a crawled URL is tested with multiple test payloads.
+     * 

+     *
+     * int64 urls_tested_count = 7;
+     */
+    public Builder setUrlsTestedCount(long value) {
+      
+      urlsTestedCount_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The number of URLs tested during this ScanRun. If the scan is in progress,
+     * the value represents the number of URLs tested up to now. The number of
+     * URLs tested is usually larger than the number URLS crawled because
+     * typically a crawled URL is tested with multiple test payloads.
+     * 

+     *
+     * int64 urls_tested_count = 7;
+     */
+    public Builder clearUrlsTestedCount() {
+      
+      urlsTestedCount_ = 0L;
+      onChanged();
+      return this;
+    }
+
+    private boolean hasVulnerabilities_ ;
+    /**
+     * 
+     * Output only.
+     * Whether the scan run has found any vulnerabilities.
+     * 

+     *
+     * bool has_vulnerabilities = 8;
+     */
+    public boolean getHasVulnerabilities() {
+      return hasVulnerabilities_;
+    }
+    /**
+     * 
+     * Output only.
+     * Whether the scan run has found any vulnerabilities.
+     * 

+     *
+     * bool has_vulnerabilities = 8;
+     */
+    public Builder setHasVulnerabilities(boolean value) {
+      
+      hasVulnerabilities_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * Whether the scan run has found any vulnerabilities.
+     * 

+     *
+     * bool has_vulnerabilities = 8;
+     */
+    public Builder clearHasVulnerabilities() {
+      
+      hasVulnerabilities_ = false;
+      onChanged();
+      return this;
+    }
+
+    private int progressPercent_ ;
+    /**
+     * 
+     * Output only.
+     * The percentage of total completion ranging from 0 to 100.
+     * If the scan is in queue, the value is 0.
+     * If the scan is running, the value ranges from 0 to 100.
+     * If the scan is finished, the value is 100.
+     * 

+     *
+     * int32 progress_percent = 9;
+     */
+    public int getProgressPercent() {
+      return progressPercent_;
+    }
+    /**
+     * 
+     * Output only.
+     * The percentage of total completion ranging from 0 to 100.
+     * If the scan is in queue, the value is 0.
+     * If the scan is running, the value ranges from 0 to 100.
+     * If the scan is finished, the value is 100.
+     * 

+     *
+     * int32 progress_percent = 9;
+     */
+    public Builder setProgressPercent(int value) {
+      
+      progressPercent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Output only.
+     * The percentage of total completion ranging from 0 to 100.
+     * If the scan is in queue, the value is 0.
+     * If the scan is running, the value ranges from 0 to 100.
+     * If the scan is finished, the value is 100.
+     * 

+     *
+     * int32 progress_percent = 9;
+     */
+    public Builder clearProgressPercent() {
+      
+      progressPercent_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ScanRun)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ScanRun)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ScanRun DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ScanRun();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ScanRun getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ScanRun parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ScanRun(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ScanRun getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunName.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunName.java
new file mode 100644
index 000000000000..787bce3f3dc9
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunName.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, 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.
+ */
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.api.resourcenames.ResourceNameType;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class ScanRunName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/scanConfigs/{scan_config}/scanRuns/{scan_run}");
+
+  private volatile Map fieldValuesMap;
+
+  private final String project;
+  private final String scanConfig;
+  private final String scanRun;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getScanConfig() {
+    return scanConfig;
+  }
+
+  public String getScanRun() {
+    return scanRun;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private ScanRunName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    scanConfig = Preconditions.checkNotNull(builder.getScanConfig());
+    scanRun = Preconditions.checkNotNull(builder.getScanRun());
+  }
+
+  public static ScanRunName of(String project, String scanConfig, String scanRun) {
+    return newBuilder()
+      .setProject(project)
+      .setScanConfig(scanConfig)
+      .setScanRun(scanRun)
+      .build();
+  }
+
+  public static String format(String project, String scanConfig, String scanRun) {
+    return newBuilder()
+      .setProject(project)
+      .setScanConfig(scanConfig)
+      .setScanRun(scanRun)
+      .build()
+      .toString();
+  }
+
+  public static ScanRunName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map matchMap =
+        PATH_TEMPLATE.validatedMatch(formattedString, "ScanRunName.parse: formattedString not in valid format");
+    return of(matchMap.get("project"), matchMap.get("scan_config"), matchMap.get("scan_run"));
+  }
+
+  public static List parseList(List formattedStrings) {
+    List list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List toStringList(List values) {
+    List list = new ArrayList(values.size());
+    for (ScanRunName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldMapBuilder.put("scanConfig", scanConfig);
+          fieldMapBuilder.put("scanRun", scanRun);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  /**
+   * @deprecated This method is only present to satisfy the ResourceName interface.
+   */
+  @Deprecated
+  public ResourceNameType getType() {
+    throw new UnsupportedOperationException("ScanRunName.getType() not supported");
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate("project", project, "scan_config", scanConfig, "scan_run", scanRun);
+  }
+
+  /** Builder for ScanRunName. */
+  public static class Builder {
+
+    private String project;
+    private String scanConfig;
+    private String scanRun;
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getScanConfig() {
+      return scanConfig;
+    }
+
+    public String getScanRun() {
+      return scanRun;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public Builder setScanConfig(String scanConfig) {
+      this.scanConfig = scanConfig;
+      return this;
+    }
+
+    public Builder setScanRun(String scanRun) {
+      this.scanRun = scanRun;
+      return this;
+    }
+
+    private Builder() {
+    }
+
+    private Builder(ScanRunName scanRunName) {
+      project = scanRunName.project;
+      scanConfig = scanRunName.scanConfig;
+      scanRun = scanRunName.scanRun;
+    }
+
+    public ScanRunName build() {
+      return new ScanRunName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof ScanRunName) {
+      ScanRunName that = (ScanRunName) o;
+      return (this.project.equals(that.project))
+          && (this.scanConfig.equals(that.scanConfig))
+          && (this.scanRun.equals(that.scanRun));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    h *= 1000003;
+    h ^= scanConfig.hashCode();
+    h *= 1000003;
+    h ^= scanRun.hashCode();
+    return h;
+  }
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunOrBuilder.java
new file mode 100644
index 000000000000..458d08f88521
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunOrBuilder.java
@@ -0,0 +1,179 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/scan_run.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ScanRunOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ScanRun)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Output only.
+   * The resource name of the ScanRun. The name follows the format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * The ScanRun IDs are generated by the system.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * Output only.
+   * The resource name of the ScanRun. The name follows the format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * The ScanRun IDs are generated by the system.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * 
+   * Output only.
+   * The execution state of the ScanRun.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState execution_state = 2;
+   */
+  int getExecutionStateValue();
+  /**
+   * 
+   * Output only.
+   * The execution state of the ScanRun.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState execution_state = 2;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState getExecutionState();
+
+  /**
+   * 
+   * Output only.
+   * The result state of the ScanRun. This field is only available after the
+   * execution state reaches "FINISHED".
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result_state = 3;
+   */
+  int getResultStateValue();
+  /**
+   * 
+   * Output only.
+   * The result state of the ScanRun. This field is only available after the
+   * execution state reaches "FINISHED".
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result_state = 3;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState getResultState();
+
+  /**
+   * 
+   * Output only.
+   * The time at which the ScanRun started.
+   * 

+   *
+   * .google.protobuf.Timestamp start_time = 4;
+   */
+  boolean hasStartTime();
+  /**
+   * 
+   * Output only.
+   * The time at which the ScanRun started.
+   * 

+   *
+   * .google.protobuf.Timestamp start_time = 4;
+   */
+  com.google.protobuf.Timestamp getStartTime();
+  /**
+   * 
+   * Output only.
+   * The time at which the ScanRun started.
+   * 

+   *
+   * .google.protobuf.Timestamp start_time = 4;
+   */
+  com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder();
+
+  /**
+   * 
+   * Output only.
+   * The time at which the ScanRun reached termination state - that the ScanRun
+   * is either finished or stopped by user.
+   * 

+   *
+   * .google.protobuf.Timestamp end_time = 5;
+   */
+  boolean hasEndTime();
+  /**
+   * 
+   * Output only.
+   * The time at which the ScanRun reached termination state - that the ScanRun
+   * is either finished or stopped by user.
+   * 

+   *
+   * .google.protobuf.Timestamp end_time = 5;
+   */
+  com.google.protobuf.Timestamp getEndTime();
+  /**
+   * 
+   * Output only.
+   * The time at which the ScanRun reached termination state - that the ScanRun
+   * is either finished or stopped by user.
+   * 

+   *
+   * .google.protobuf.Timestamp end_time = 5;
+   */
+  com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder();
+
+  /**
+   * 
+   * Output only.
+   * The number of URLs crawled during this ScanRun. If the scan is in progress,
+   * the value represents the number of URLs crawled up to now.
+   * 

+   *
+   * int64 urls_crawled_count = 6;
+   */
+  long getUrlsCrawledCount();
+
+  /**
+   * 
+   * Output only.
+   * The number of URLs tested during this ScanRun. If the scan is in progress,
+   * the value represents the number of URLs tested up to now. The number of
+   * URLs tested is usually larger than the number URLS crawled because
+   * typically a crawled URL is tested with multiple test payloads.
+   * 

+   *
+   * int64 urls_tested_count = 7;
+   */
+  long getUrlsTestedCount();
+
+  /**
+   * 
+   * Output only.
+   * Whether the scan run has found any vulnerabilities.
+   * 

+   *
+   * bool has_vulnerabilities = 8;
+   */
+  boolean getHasVulnerabilities();
+
+  /**
+   * 
+   * Output only.
+   * The percentage of total completion ranging from 0 to 100.
+   * If the scan is in queue, the value is 0.
+   * If the scan is running, the value ranges from 0 to 100.
+   * If the scan is finished, the value is 100.
+   * 

+   *
+   * int32 progress_percent = 9;
+   */
+  int getProgressPercent();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunProto.java
new file mode 100644
index 000000000000..b3fb403b5615
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunProto.java
@@ -0,0 +1,80 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/scan_run.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public final class ScanRunProto {
+  private ScanRunProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n6google/cloud/websecurityscanner/v1alph" +
+      "a/scan_run.proto\022\'google.cloud.websecuri" +
+      "tyscanner.v1alpha\032\034google/api/annotation" +
+      "s.proto\032\037google/protobuf/timestamp.proto" +
+      "\"\275\004\n\007ScanRun\022\014\n\004name\030\001 \001(\t\022X\n\017execution_" +
+      "state\030\002 \001(\0162?.google.cloud.websecuritysc" +
+      "anner.v1alpha.ScanRun.ExecutionState\022R\n\014" +
+      "result_state\030\003 \001(\0162<.google.cloud.websec" +
+      "urityscanner.v1alpha.ScanRun.ResultState" +
+      "\022.\n\nstart_time\030\004 \001(\0132\032.google.protobuf.T" +
+      "imestamp\022,\n\010end_time\030\005 \001(\0132\032.google.prot" +
+      "obuf.Timestamp\022\032\n\022urls_crawled_count\030\006 \001" +
+      "(\003\022\031\n\021urls_tested_count\030\007 \001(\003\022\033\n\023has_vul" +
+      "nerabilities\030\010 \001(\010\022\030\n\020progress_percent\030\t" +
+      " \001(\005\"Y\n\016ExecutionState\022\037\n\033EXECUTION_STAT" +
+      "E_UNSPECIFIED\020\000\022\n\n\006QUEUED\020\001\022\014\n\010SCANNING\020" +
+      "\002\022\014\n\010FINISHED\020\003\"O\n\013ResultState\022\034\n\030RESULT" +
+      "_STATE_UNSPECIFIED\020\000\022\013\n\007SUCCESS\020\001\022\t\n\005ERR" +
+      "OR\020\002\022\n\n\006KILLED\020\003B\230\001\n+com.google.cloud.we" +
+      "bsecurityscanner.v1alphaB\014ScanRunProtoP\001" +
+      "ZYgoogle.golang.org/genproto/googleapis/" +
+      "cloud/websecurityscanner/v1alpha;websecu" +
+      "rityscannerb\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.api.AnnotationsProto.getDescriptor(),
+          com.google.protobuf.TimestampProto.getDescriptor(),
+        }, assigner);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_descriptor,
+        new java.lang.String[] { "Name", "ExecutionState", "ResultState", "StartTime", "EndTime", "UrlsCrawledCount", "UrlsTestedCount", "HasVulnerabilities", "ProgressPercent", });
+    com.google.api.AnnotationsProto.getDescriptor();
+    com.google.protobuf.TimestampProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequest.java
new file mode 100644
index 000000000000..ed36e662ebc2
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequest.java
@@ -0,0 +1,566 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `StartScanRun` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.StartScanRunRequest}
+ */
+public  final class StartScanRunRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.StartScanRunRequest)
+    StartScanRunRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use StartScanRunRequest.newBuilder() to construct.
+  private StartScanRunRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private StartScanRunRequest() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private StartScanRunRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest.class, com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanConfig to be used. The name follows the
+   * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanConfig to be used. The name follows the
+   * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest other = (com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `StartScanRun` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.StartScanRunRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.StartScanRunRequest)
+      com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest.class, com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest result = new com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest(this);
+      result.name_ = name_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be used. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be used. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be used. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be used. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanConfig to be used. The name follows the
+     * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.StartScanRunRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.StartScanRunRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public StartScanRunRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new StartScanRunRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequestOrBuilder.java
new file mode 100644
index 000000000000..836f1bb41ec2
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequestOrBuilder.java
@@ -0,0 +1,31 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface StartScanRunRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.StartScanRunRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanConfig to be used. The name follows the
+   * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanConfig to be used. The name follows the
+   * format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequest.java
new file mode 100644
index 000000000000..37d725242093
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequest.java
@@ -0,0 +1,573 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `StopScanRun` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.StopScanRunRequest}
+ */
+public  final class StopScanRunRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.StopScanRunRequest)
+    StopScanRunRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use StopScanRunRequest.newBuilder() to construct.
+  private StopScanRunRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private StopScanRunRequest() {
+    name_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private StopScanRunRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest.class, com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest.Builder.class);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 1;
+  private volatile java.lang.Object name_;
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanRun to be stopped. The name follows the
+   * format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanRun to be stopped. The name follows the
+   * format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest other = (com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest) obj;
+
+    boolean result = true;
+    result = result && getName()
+        .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `StopScanRun` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.StopScanRunRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.StopScanRunRequest)
+      com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest.class, com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      name_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest result = new com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest(this);
+      result.name_ = name_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest.getDefaultInstance()) return this;
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanRun to be stopped. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanRun to be stopped. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanRun to be stopped. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanRun to be stopped. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The resource name of the ScanRun to be stopped. The name follows the
+     * format of
+     * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+     * 

+     *
+     * string name = 1;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.StopScanRunRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.StopScanRunRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public StopScanRunRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new StopScanRunRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequestOrBuilder.java
new file mode 100644
index 000000000000..ca87a26d7ca1
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequestOrBuilder.java
@@ -0,0 +1,33 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface StopScanRunRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.StopScanRunRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanRun to be stopped. The name follows the
+   * format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  java.lang.String getName();
+  /**
+   * 
+   * Required.
+   * The resource name of the ScanRun to be stopped. The name follows the
+   * format of
+   * 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * 

+   *
+   * string name = 1;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequest.java
new file mode 100644
index 000000000000..1368cd873ece
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequest.java
@@ -0,0 +1,927 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Request for the `UpdateScanConfigRequest` method.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest}
+ */
+public  final class UpdateScanConfigRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest)
+    UpdateScanConfigRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use UpdateScanConfigRequest.newBuilder() to construct.
+  private UpdateScanConfigRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private UpdateScanConfigRequest() {
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private UpdateScanConfigRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 18: {
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder subBuilder = null;
+            if (scanConfig_ != null) {
+              subBuilder = scanConfig_.toBuilder();
+            }
+            scanConfig_ = input.readMessage(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(scanConfig_);
+              scanConfig_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 26: {
+            com.google.protobuf.FieldMask.Builder subBuilder = null;
+            if (updateMask_ != null) {
+              subBuilder = updateMask_.toBuilder();
+            }
+            updateMask_ = input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(updateMask_);
+              updateMask_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest.class, com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest.Builder.class);
+  }
+
+  public static final int SCAN_CONFIG_FIELD_NUMBER = 2;
+  private com.google.cloud.websecurityscanner.v1alpha.ScanConfig scanConfig_;
+  /**
+   * 
+   * Required.
+   * The ScanConfig to be updated. The name field must be set to identify the
+   * resource to be updated. The values of fields not covered by the mask
+   * will be ignored.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+   */
+  public boolean hasScanConfig() {
+    return scanConfig_ != null;
+  }
+  /**
+   * 
+   * Required.
+   * The ScanConfig to be updated. The name field must be set to identify the
+   * resource to be updated. The values of fields not covered by the mask
+   * will be ignored.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getScanConfig() {
+    return scanConfig_ == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance() : scanConfig_;
+  }
+  /**
+   * 
+   * Required.
+   * The ScanConfig to be updated. The name field must be set to identify the
+   * resource to be updated. The values of fields not covered by the mask
+   * will be ignored.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+   */
+  public com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder getScanConfigOrBuilder() {
+    return getScanConfig();
+  }
+
+  public static final int UPDATE_MASK_FIELD_NUMBER = 3;
+  private com.google.protobuf.FieldMask updateMask_;
+  /**
+   * 
+   * Required.
+   * The update mask applies to the resource. For the `FieldMask` definition,
+   * see
+   * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 3;
+   */
+  public boolean hasUpdateMask() {
+    return updateMask_ != null;
+  }
+  /**
+   * 
+   * Required.
+   * The update mask applies to the resource. For the `FieldMask` definition,
+   * see
+   * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 3;
+   */
+  public com.google.protobuf.FieldMask getUpdateMask() {
+    return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+  }
+  /**
+   * 
+   * Required.
+   * The update mask applies to the resource. For the `FieldMask` definition,
+   * see
+   * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 3;
+   */
+  public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
+    return getUpdateMask();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (scanConfig_ != null) {
+      output.writeMessage(2, getScanConfig());
+    }
+    if (updateMask_ != null) {
+      output.writeMessage(3, getUpdateMask());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (scanConfig_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getScanConfig());
+    }
+    if (updateMask_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, getUpdateMask());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest other = (com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest) obj;
+
+    boolean result = true;
+    result = result && (hasScanConfig() == other.hasScanConfig());
+    if (hasScanConfig()) {
+      result = result && getScanConfig()
+          .equals(other.getScanConfig());
+    }
+    result = result && (hasUpdateMask() == other.hasUpdateMask());
+    if (hasUpdateMask()) {
+      result = result && getUpdateMask()
+          .equals(other.getUpdateMask());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasScanConfig()) {
+      hash = (37 * hash) + SCAN_CONFIG_FIELD_NUMBER;
+      hash = (53 * hash) + getScanConfig().hashCode();
+    }
+    if (hasUpdateMask()) {
+      hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER;
+      hash = (53 * hash) + getUpdateMask().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Request for the `UpdateScanConfigRequest` method.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest)
+      com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest.class, com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (scanConfigBuilder_ == null) {
+        scanConfig_ = null;
+      } else {
+        scanConfig_ = null;
+        scanConfigBuilder_ = null;
+      }
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+      } else {
+        updateMask_ = null;
+        updateMaskBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest build() {
+      com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest result = new com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest(this);
+      if (scanConfigBuilder_ == null) {
+        result.scanConfig_ = scanConfig_;
+      } else {
+        result.scanConfig_ = scanConfigBuilder_.build();
+      }
+      if (updateMaskBuilder_ == null) {
+        result.updateMask_ = updateMask_;
+      } else {
+        result.updateMask_ = updateMaskBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest.getDefaultInstance()) return this;
+      if (other.hasScanConfig()) {
+        mergeScanConfig(other.getScanConfig());
+      }
+      if (other.hasUpdateMask()) {
+        mergeUpdateMask(other.getUpdateMask());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.cloud.websecurityscanner.v1alpha.ScanConfig scanConfig_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder> scanConfigBuilder_;
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be updated. The name field must be set to identify the
+     * resource to be updated. The values of fields not covered by the mask
+     * will be ignored.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public boolean hasScanConfig() {
+      return scanConfigBuilder_ != null || scanConfig_ != null;
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be updated. The name field must be set to identify the
+     * resource to be updated. The values of fields not covered by the mask
+     * will be ignored.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getScanConfig() {
+      if (scanConfigBuilder_ == null) {
+        return scanConfig_ == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance() : scanConfig_;
+      } else {
+        return scanConfigBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be updated. The name field must be set to identify the
+     * resource to be updated. The values of fields not covered by the mask
+     * will be ignored.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public Builder setScanConfig(com.google.cloud.websecurityscanner.v1alpha.ScanConfig value) {
+      if (scanConfigBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        scanConfig_ = value;
+        onChanged();
+      } else {
+        scanConfigBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be updated. The name field must be set to identify the
+     * resource to be updated. The values of fields not covered by the mask
+     * will be ignored.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public Builder setScanConfig(
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder builderForValue) {
+      if (scanConfigBuilder_ == null) {
+        scanConfig_ = builderForValue.build();
+        onChanged();
+      } else {
+        scanConfigBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be updated. The name field must be set to identify the
+     * resource to be updated. The values of fields not covered by the mask
+     * will be ignored.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public Builder mergeScanConfig(com.google.cloud.websecurityscanner.v1alpha.ScanConfig value) {
+      if (scanConfigBuilder_ == null) {
+        if (scanConfig_ != null) {
+          scanConfig_ =
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.newBuilder(scanConfig_).mergeFrom(value).buildPartial();
+        } else {
+          scanConfig_ = value;
+        }
+        onChanged();
+      } else {
+        scanConfigBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be updated. The name field must be set to identify the
+     * resource to be updated. The values of fields not covered by the mask
+     * will be ignored.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public Builder clearScanConfig() {
+      if (scanConfigBuilder_ == null) {
+        scanConfig_ = null;
+        onChanged();
+      } else {
+        scanConfig_ = null;
+        scanConfigBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be updated. The name field must be set to identify the
+     * resource to be updated. The values of fields not covered by the mask
+     * will be ignored.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder getScanConfigBuilder() {
+      
+      onChanged();
+      return getScanConfigFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be updated. The name field must be set to identify the
+     * resource to be updated. The values of fields not covered by the mask
+     * will be ignored.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    public com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder getScanConfigOrBuilder() {
+      if (scanConfigBuilder_ != null) {
+        return scanConfigBuilder_.getMessageOrBuilder();
+      } else {
+        return scanConfig_ == null ?
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance() : scanConfig_;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The ScanConfig to be updated. The name field must be set to identify the
+     * resource to be updated. The values of fields not covered by the mask
+     * will be ignored.
+     * 

+     *
+     * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.websecurityscanner.v1alpha.ScanConfig, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder> 
+        getScanConfigFieldBuilder() {
+      if (scanConfigBuilder_ == null) {
+        scanConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.websecurityscanner.v1alpha.ScanConfig, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder, com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder>(
+                getScanConfig(),
+                getParentForChildren(),
+                isClean());
+        scanConfig_ = null;
+      }
+      return scanConfigBuilder_;
+    }
+
+    private com.google.protobuf.FieldMask updateMask_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder> updateMaskBuilder_;
+    /**
+     * 
+     * Required.
+     * The update mask applies to the resource. For the `FieldMask` definition,
+     * see
+     * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public boolean hasUpdateMask() {
+      return updateMaskBuilder_ != null || updateMask_ != null;
+    }
+    /**
+     * 
+     * Required.
+     * The update mask applies to the resource. For the `FieldMask` definition,
+     * see
+     * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public com.google.protobuf.FieldMask getUpdateMask() {
+      if (updateMaskBuilder_ == null) {
+        return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+      } else {
+        return updateMaskBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The update mask applies to the resource. For the `FieldMask` definition,
+     * see
+     * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public Builder setUpdateMask(com.google.protobuf.FieldMask value) {
+      if (updateMaskBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        updateMask_ = value;
+        onChanged();
+      } else {
+        updateMaskBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The update mask applies to the resource. For the `FieldMask` definition,
+     * see
+     * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public Builder setUpdateMask(
+        com.google.protobuf.FieldMask.Builder builderForValue) {
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = builderForValue.build();
+        onChanged();
+      } else {
+        updateMaskBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The update mask applies to the resource. For the `FieldMask` definition,
+     * see
+     * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) {
+      if (updateMaskBuilder_ == null) {
+        if (updateMask_ != null) {
+          updateMask_ =
+            com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial();
+        } else {
+          updateMask_ = value;
+        }
+        onChanged();
+      } else {
+        updateMaskBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The update mask applies to the resource. For the `FieldMask` definition,
+     * see
+     * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public Builder clearUpdateMask() {
+      if (updateMaskBuilder_ == null) {
+        updateMask_ = null;
+        onChanged();
+      } else {
+        updateMask_ = null;
+        updateMaskBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required.
+     * The update mask applies to the resource. For the `FieldMask` definition,
+     * see
+     * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() {
+      
+      onChanged();
+      return getUpdateMaskFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Required.
+     * The update mask applies to the resource. For the `FieldMask` definition,
+     * see
+     * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
+      if (updateMaskBuilder_ != null) {
+        return updateMaskBuilder_.getMessageOrBuilder();
+      } else {
+        return updateMask_ == null ?
+            com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_;
+      }
+    }
+    /**
+     * 
+     * Required.
+     * The update mask applies to the resource. For the `FieldMask` definition,
+     * see
+     * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+     * 

+     *
+     * .google.protobuf.FieldMask update_mask = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder> 
+        getUpdateMaskFieldBuilder() {
+      if (updateMaskBuilder_ == null) {
+        updateMaskBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, com.google.protobuf.FieldMaskOrBuilder>(
+                getUpdateMask(),
+                getParentForChildren(),
+                isClean());
+        updateMask_ = null;
+      }
+      return updateMaskBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest)
+  private static final com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public UpdateScanConfigRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new UpdateScanConfigRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequestOrBuilder.java
new file mode 100644
index 000000000000..71c72c316ad6
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequestOrBuilder.java
@@ -0,0 +1,77 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface UpdateScanConfigRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required.
+   * The ScanConfig to be updated. The name field must be set to identify the
+   * resource to be updated. The values of fields not covered by the mask
+   * will be ignored.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+   */
+  boolean hasScanConfig();
+  /**
+   * 
+   * Required.
+   * The ScanConfig to be updated. The name field must be set to identify the
+   * resource to be updated. The values of fields not covered by the mask
+   * will be ignored.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanConfig getScanConfig();
+  /**
+   * 
+   * Required.
+   * The ScanConfig to be updated. The name field must be set to identify the
+   * resource to be updated. The values of fields not covered by the mask
+   * will be ignored.
+   * 

+   *
+   * .google.cloud.websecurityscanner.v1alpha.ScanConfig scan_config = 2;
+   */
+  com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder getScanConfigOrBuilder();
+
+  /**
+   * 
+   * Required.
+   * The update mask applies to the resource. For the `FieldMask` definition,
+   * see
+   * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 3;
+   */
+  boolean hasUpdateMask();
+  /**
+   * 
+   * Required.
+   * The update mask applies to the resource. For the `FieldMask` definition,
+   * see
+   * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 3;
+   */
+  com.google.protobuf.FieldMask getUpdateMask();
+  /**
+   * 
+   * Required.
+   * The update mask applies to the resource. For the `FieldMask` definition,
+   * see
+   * https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+   * 

+   *
+   * .google.protobuf.FieldMask update_mask = 3;
+   */
+  com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResource.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResource.java
new file mode 100644
index 000000000000..84e1ea10efe5
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResource.java
@@ -0,0 +1,709 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding_addon.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Information regarding any resource causing the vulnerability such
+ * as JavaScript sources, image, audio files, etc.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ViolatingResource}
+ */
+public  final class ViolatingResource extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.ViolatingResource)
+    ViolatingResourceOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ViolatingResource.newBuilder() to construct.
+  private ViolatingResource(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ViolatingResource() {
+    contentType_ = "";
+    resourceUrl_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ViolatingResource(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            contentType_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            resourceUrl_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.class, com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.Builder.class);
+  }
+
+  public static final int CONTENT_TYPE_FIELD_NUMBER = 1;
+  private volatile java.lang.Object contentType_;
+  /**
+   * 
+   * The MIME type of this resource.
+   * 

+   *
+   * string content_type = 1;
+   */
+  public java.lang.String getContentType() {
+    java.lang.Object ref = contentType_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      contentType_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The MIME type of this resource.
+   * 

+   *
+   * string content_type = 1;
+   */
+  public com.google.protobuf.ByteString
+      getContentTypeBytes() {
+    java.lang.Object ref = contentType_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      contentType_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int RESOURCE_URL_FIELD_NUMBER = 2;
+  private volatile java.lang.Object resourceUrl_;
+  /**
+   * 
+   * URL of this violating resource.
+   * 

+   *
+   * string resource_url = 2;
+   */
+  public java.lang.String getResourceUrl() {
+    java.lang.Object ref = resourceUrl_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      resourceUrl_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * URL of this violating resource.
+   * 

+   *
+   * string resource_url = 2;
+   */
+  public com.google.protobuf.ByteString
+      getResourceUrlBytes() {
+    java.lang.Object ref = resourceUrl_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      resourceUrl_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getContentTypeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, contentType_);
+    }
+    if (!getResourceUrlBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, resourceUrl_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getContentTypeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, contentType_);
+    }
+    if (!getResourceUrlBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, resourceUrl_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.ViolatingResource)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.ViolatingResource other = (com.google.cloud.websecurityscanner.v1alpha.ViolatingResource) obj;
+
+    boolean result = true;
+    result = result && getContentType()
+        .equals(other.getContentType());
+    result = result && getResourceUrl()
+        .equals(other.getResourceUrl());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + CONTENT_TYPE_FIELD_NUMBER;
+    hash = (53 * hash) + getContentType().hashCode();
+    hash = (37 * hash) + RESOURCE_URL_FIELD_NUMBER;
+    hash = (53 * hash) + getResourceUrl().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ViolatingResource prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Information regarding any resource causing the vulnerability such
+   * as JavaScript sources, image, audio files, etc.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.ViolatingResource}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.ViolatingResource)
+      com.google.cloud.websecurityscanner.v1alpha.ViolatingResourceOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.class, com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      contentType_ = "";
+
+      resourceUrl_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource build() {
+      com.google.cloud.websecurityscanner.v1alpha.ViolatingResource result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.ViolatingResource result = new com.google.cloud.websecurityscanner.v1alpha.ViolatingResource(this);
+      result.contentType_ = contentType_;
+      result.resourceUrl_ = resourceUrl_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ViolatingResource) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ViolatingResource)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ViolatingResource other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.getDefaultInstance()) return this;
+      if (!other.getContentType().isEmpty()) {
+        contentType_ = other.contentType_;
+        onChanged();
+      }
+      if (!other.getResourceUrl().isEmpty()) {
+        resourceUrl_ = other.resourceUrl_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.ViolatingResource parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.ViolatingResource) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object contentType_ = "";
+    /**
+     * 
+     * The MIME type of this resource.
+     * 

+     *
+     * string content_type = 1;
+     */
+    public java.lang.String getContentType() {
+      java.lang.Object ref = contentType_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        contentType_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The MIME type of this resource.
+     * 

+     *
+     * string content_type = 1;
+     */
+    public com.google.protobuf.ByteString
+        getContentTypeBytes() {
+      java.lang.Object ref = contentType_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        contentType_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The MIME type of this resource.
+     * 

+     *
+     * string content_type = 1;
+     */
+    public Builder setContentType(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      contentType_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The MIME type of this resource.
+     * 

+     *
+     * string content_type = 1;
+     */
+    public Builder clearContentType() {
+      
+      contentType_ = getDefaultInstance().getContentType();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The MIME type of this resource.
+     * 

+     *
+     * string content_type = 1;
+     */
+    public Builder setContentTypeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      contentType_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object resourceUrl_ = "";
+    /**
+     * 
+     * URL of this violating resource.
+     * 

+     *
+     * string resource_url = 2;
+     */
+    public java.lang.String getResourceUrl() {
+      java.lang.Object ref = resourceUrl_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        resourceUrl_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * URL of this violating resource.
+     * 

+     *
+     * string resource_url = 2;
+     */
+    public com.google.protobuf.ByteString
+        getResourceUrlBytes() {
+      java.lang.Object ref = resourceUrl_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        resourceUrl_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * URL of this violating resource.
+     * 

+     *
+     * string resource_url = 2;
+     */
+    public Builder setResourceUrl(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      resourceUrl_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * URL of this violating resource.
+     * 

+     *
+     * string resource_url = 2;
+     */
+    public Builder clearResourceUrl() {
+      
+      resourceUrl_ = getDefaultInstance().getResourceUrl();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * URL of this violating resource.
+     * 

+     *
+     * string resource_url = 2;
+     */
+    public Builder setResourceUrlBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      resourceUrl_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.ViolatingResource)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.ViolatingResource)
+  private static final com.google.cloud.websecurityscanner.v1alpha.ViolatingResource DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.ViolatingResource();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ViolatingResource parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ViolatingResource(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResourceOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResourceOrBuilder.java
new file mode 100644
index 000000000000..77eb342e9176
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResourceOrBuilder.java
@@ -0,0 +1,45 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding_addon.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface ViolatingResourceOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.ViolatingResource)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The MIME type of this resource.
+   * 

+   *
+   * string content_type = 1;
+   */
+  java.lang.String getContentType();
+  /**
+   * 
+   * The MIME type of this resource.
+   * 

+   *
+   * string content_type = 1;
+   */
+  com.google.protobuf.ByteString
+      getContentTypeBytes();
+
+  /**
+   * 
+   * URL of this violating resource.
+   * 

+   *
+   * string resource_url = 2;
+   */
+  java.lang.String getResourceUrl();
+  /**
+   * 
+   * URL of this violating resource.
+   * 

+   *
+   * string resource_url = 2;
+   */
+  com.google.protobuf.ByteString
+      getResourceUrlBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParameters.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParameters.java
new file mode 100644
index 000000000000..d292edc9c856
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParameters.java
@@ -0,0 +1,621 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding_addon.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Information about vulnerable request parameters.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.VulnerableParameters}
+ */
+public  final class VulnerableParameters extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.VulnerableParameters)
+    VulnerableParametersOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use VulnerableParameters.newBuilder() to construct.
+  private VulnerableParameters(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private VulnerableParameters() {
+    parameterNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private VulnerableParameters(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              parameterNames_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            parameterNames_.add(s);
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        parameterNames_ = parameterNames_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.class, com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.Builder.class);
+  }
+
+  public static final int PARAMETER_NAMES_FIELD_NUMBER = 1;
+  private com.google.protobuf.LazyStringList parameterNames_;
+  /**
+   * 
+   * The vulnerable parameter names.
+   * 

+   *
+   * repeated string parameter_names = 1;
+   */
+  public com.google.protobuf.ProtocolStringList
+      getParameterNamesList() {
+    return parameterNames_;
+  }
+  /**
+   * 
+   * The vulnerable parameter names.
+   * 

+   *
+   * repeated string parameter_names = 1;
+   */
+  public int getParameterNamesCount() {
+    return parameterNames_.size();
+  }
+  /**
+   * 
+   * The vulnerable parameter names.
+   * 

+   *
+   * repeated string parameter_names = 1;
+   */
+  public java.lang.String getParameterNames(int index) {
+    return parameterNames_.get(index);
+  }
+  /**
+   * 
+   * The vulnerable parameter names.
+   * 

+   *
+   * repeated string parameter_names = 1;
+   */
+  public com.google.protobuf.ByteString
+      getParameterNamesBytes(int index) {
+    return parameterNames_.getByteString(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < parameterNames_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parameterNames_.getRaw(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    {
+      int dataSize = 0;
+      for (int i = 0; i < parameterNames_.size(); i++) {
+        dataSize += computeStringSizeNoTag(parameterNames_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getParameterNamesList().size();
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters other = (com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters) obj;
+
+    boolean result = true;
+    result = result && getParameterNamesList()
+        .equals(other.getParameterNamesList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getParameterNamesCount() > 0) {
+      hash = (37 * hash) + PARAMETER_NAMES_FIELD_NUMBER;
+      hash = (53 * hash) + getParameterNamesList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Information about vulnerable request parameters.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.VulnerableParameters}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.VulnerableParameters)
+      com.google.cloud.websecurityscanner.v1alpha.VulnerableParametersOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.class, com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      parameterNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters build() {
+      com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters result = new com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters(this);
+      int from_bitField0_ = bitField0_;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        parameterNames_ = parameterNames_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      }
+      result.parameterNames_ = parameterNames_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.getDefaultInstance()) return this;
+      if (!other.parameterNames_.isEmpty()) {
+        if (parameterNames_.isEmpty()) {
+          parameterNames_ = other.parameterNames_;
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          ensureParameterNamesIsMutable();
+          parameterNames_.addAll(other.parameterNames_);
+        }
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private com.google.protobuf.LazyStringList parameterNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensureParameterNamesIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        parameterNames_ = new com.google.protobuf.LazyStringArrayList(parameterNames_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+    /**
+     * 
+     * The vulnerable parameter names.
+     * 

+     *
+     * repeated string parameter_names = 1;
+     */
+    public com.google.protobuf.ProtocolStringList
+        getParameterNamesList() {
+      return parameterNames_.getUnmodifiableView();
+    }
+    /**
+     * 
+     * The vulnerable parameter names.
+     * 

+     *
+     * repeated string parameter_names = 1;
+     */
+    public int getParameterNamesCount() {
+      return parameterNames_.size();
+    }
+    /**
+     * 
+     * The vulnerable parameter names.
+     * 

+     *
+     * repeated string parameter_names = 1;
+     */
+    public java.lang.String getParameterNames(int index) {
+      return parameterNames_.get(index);
+    }
+    /**
+     * 
+     * The vulnerable parameter names.
+     * 

+     *
+     * repeated string parameter_names = 1;
+     */
+    public com.google.protobuf.ByteString
+        getParameterNamesBytes(int index) {
+      return parameterNames_.getByteString(index);
+    }
+    /**
+     * 
+     * The vulnerable parameter names.
+     * 

+     *
+     * repeated string parameter_names = 1;
+     */
+    public Builder setParameterNames(
+        int index, java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureParameterNamesIsMutable();
+      parameterNames_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The vulnerable parameter names.
+     * 

+     *
+     * repeated string parameter_names = 1;
+     */
+    public Builder addParameterNames(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureParameterNamesIsMutable();
+      parameterNames_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The vulnerable parameter names.
+     * 

+     *
+     * repeated string parameter_names = 1;
+     */
+    public Builder addAllParameterNames(
+        java.lang.Iterable values) {
+      ensureParameterNamesIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, parameterNames_);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The vulnerable parameter names.
+     * 

+     *
+     * repeated string parameter_names = 1;
+     */
+    public Builder clearParameterNames() {
+      parameterNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The vulnerable parameter names.
+     * 

+     *
+     * repeated string parameter_names = 1;
+     */
+    public Builder addParameterNamesBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      ensureParameterNamesIsMutable();
+      parameterNames_.add(value);
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.VulnerableParameters)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.VulnerableParameters)
+  private static final com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public VulnerableParameters parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new VulnerableParameters(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParametersOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParametersOrBuilder.java
new file mode 100644
index 000000000000..afbb2f089ebc
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParametersOrBuilder.java
@@ -0,0 +1,44 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding_addon.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface VulnerableParametersOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.VulnerableParameters)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The vulnerable parameter names.
+   * 

+   *
+   * repeated string parameter_names = 1;
+   */
+  java.util.List
+      getParameterNamesList();
+  /**
+   * 
+   * The vulnerable parameter names.
+   * 

+   *
+   * repeated string parameter_names = 1;
+   */
+  int getParameterNamesCount();
+  /**
+   * 
+   * The vulnerable parameter names.
+   * 

+   *
+   * repeated string parameter_names = 1;
+   */
+  java.lang.String getParameterNames(int index);
+  /**
+   * 
+   * The vulnerable parameter names.
+   * 

+   *
+   * repeated string parameter_names = 1;
+   */
+  com.google.protobuf.ByteString
+      getParameterNamesBytes(int index);
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerProto.java
new file mode 100644
index 000000000000..643d134bdf38
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerProto.java
@@ -0,0 +1,381 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public final class WebSecurityScannerProto {
+  private WebSecurityScannerProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\nBgoogle/cloud/websecurityscanner/v1alph" +
+      "a/web_security_scanner.proto\022\'google.clo" +
+      "ud.websecurityscanner.v1alpha\032\034google/ap" +
+      "i/annotations.proto\0329google/cloud/websec" +
+      "urityscanner/v1alpha/crawled_url.proto\0325" +
+      "google/cloud/websecurityscanner/v1alpha/" +
+      "finding.proto\032@google/cloud/websecuritys" +
+      "canner/v1alpha/finding_type_stats.proto\032" +
+      "9google/cloud/websecurityscanner/v1alpha" +
+      "/scan_config.proto\0326google/cloud/websecu" +
+      "rityscanner/v1alpha/scan_run.proto\032\033goog" +
+      "le/protobuf/empty.proto\032 google/protobuf" +
+      "/field_mask.proto\"s\n\027CreateScanConfigReq" +
+      "uest\022\016\n\006parent\030\001 \001(\t\022H\n\013scan_config\030\002 \001(" +
+      "\01323.google.cloud.websecurityscanner.v1al" +
+      "pha.ScanConfig\"\'\n\027DeleteScanConfigReques" +
+      "t\022\014\n\004name\030\001 \001(\t\"$\n\024GetScanConfigRequest\022" +
+      "\014\n\004name\030\001 \001(\t\"O\n\026ListScanConfigsRequest\022" +
+      "\016\n\006parent\030\001 \001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tp" +
+      "age_size\030\003 \001(\005\"\224\001\n\027UpdateScanConfigReque" +
+      "st\022H\n\013scan_config\030\002 \001(\01323.google.cloud.w" +
+      "ebsecurityscanner.v1alpha.ScanConfig\022/\n\013" +
+      "update_mask\030\003 \001(\0132\032.google.protobuf.Fiel" +
+      "dMask\"}\n\027ListScanConfigsResponse\022I\n\014scan" +
+      "_configs\030\001 \003(\01323.google.cloud.websecurit" +
+      "yscanner.v1alpha.ScanConfig\022\027\n\017next_page" +
+      "_token\030\002 \001(\t\"#\n\023StartScanRunRequest\022\014\n\004n" +
+      "ame\030\001 \001(\t\"!\n\021GetScanRunRequest\022\014\n\004name\030\001" +
+      " \001(\t\"L\n\023ListScanRunsRequest\022\016\n\006parent\030\001 " +
+      "\001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tpage_size\030\003 \001" +
+      "(\005\"t\n\024ListScanRunsResponse\022C\n\tscan_runs\030" +
+      "\001 \003(\01320.google.cloud.websecurityscanner." +
+      "v1alpha.ScanRun\022\027\n\017next_page_token\030\002 \001(\t" +
+      "\"\"\n\022StopScanRunRequest\022\014\n\004name\030\001 \001(\t\"O\n\026" +
+      "ListCrawledUrlsRequest\022\016\n\006parent\030\001 \001(\t\022\022" +
+      "\n\npage_token\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\"}\n" +
+      "\027ListCrawledUrlsResponse\022I\n\014crawled_urls" +
+      "\030\001 \003(\01323.google.cloud.websecurityscanner" +
+      ".v1alpha.CrawledUrl\022\027\n\017next_page_token\030\002" +
+      " \001(\t\"!\n\021GetFindingRequest\022\014\n\004name\030\001 \001(\t\"" +
+      "\\\n\023ListFindingsRequest\022\016\n\006parent\030\001 \001(\t\022\016" +
+      "\n\006filter\030\002 \001(\t\022\022\n\npage_token\030\003 \001(\t\022\021\n\tpa" +
+      "ge_size\030\004 \001(\005\"s\n\024ListFindingsResponse\022B\n" +
+      "\010findings\030\001 \003(\01320.google.cloud.websecuri" +
+      "tyscanner.v1alpha.Finding\022\027\n\017next_page_t" +
+      "oken\030\002 \001(\t\"-\n\033ListFindingTypeStatsReques" +
+      "t\022\016\n\006parent\030\001 \001(\t\"u\n\034ListFindingTypeStat" +
+      "sResponse\022U\n\022finding_type_stats\030\001 \003(\01329." +
+      "google.cloud.websecurityscanner.v1alpha." +
+      "FindingTypeStats2\320\024\n\022WebSecurityScanner\022" +
+      "\310\001\n\020CreateScanConfig\022@.google.cloud.webs" +
+      "ecurityscanner.v1alpha.CreateScanConfigR" +
+      "equest\0323.google.cloud.websecurityscanner" +
+      ".v1alpha.ScanConfig\"=\202\323\344\223\0027\"(/v1alpha/{p" +
+      "arent=projects/*}/scanConfigs:\013scan_conf" +
+      "ig\022\236\001\n\020DeleteScanConfig\022@.google.cloud.w" +
+      "ebsecurityscanner.v1alpha.DeleteScanConf" +
+      "igRequest\032\026.google.protobuf.Empty\"0\202\323\344\223\002" +
+      "**(/v1alpha/{name=projects/*/scanConfigs" +
+      "/*}\022\265\001\n\rGetScanConfig\022=.google.cloud.web" +
+      "securityscanner.v1alpha.GetScanConfigReq" +
+      "uest\0323.google.cloud.websecurityscanner.v" +
+      "1alpha.ScanConfig\"0\202\323\344\223\002*\022(/v1alpha/{nam" +
+      "e=projects/*/scanConfigs/*}\022\306\001\n\017ListScan" +
+      "Configs\022?.google.cloud.websecurityscanne" +
+      "r.v1alpha.ListScanConfigsRequest\032@.googl" +
+      "e.cloud.websecurityscanner.v1alpha.ListS" +
+      "canConfigsResponse\"0\202\323\344\223\002*\022(/v1alpha/{pa" +
+      "rent=projects/*}/scanConfigs\022\324\001\n\020UpdateS" +
+      "canConfig\022@.google.cloud.websecurityscan" +
+      "ner.v1alpha.UpdateScanConfigRequest\0323.go" +
+      "ogle.cloud.websecurityscanner.v1alpha.Sc" +
+      "anConfig\"I\202\323\344\223\002C24/v1alpha/{scan_config." +
+      "name=projects/*/scanConfigs/*}:\013scan_con" +
+      "fig\022\271\001\n\014StartScanRun\022<.google.cloud.webs" +
+      "ecurityscanner.v1alpha.StartScanRunReque" +
+      "st\0320.google.cloud.websecurityscanner.v1a" +
+      "lpha.ScanRun\"9\202\323\344\223\0023\"./v1alpha/{name=pro" +
+      "jects/*/scanConfigs/*}:start:\001*\022\267\001\n\nGetS" +
+      "canRun\022:.google.cloud.websecurityscanner" +
+      ".v1alpha.GetScanRunRequest\0320.google.clou" +
+      "d.websecurityscanner.v1alpha.ScanRun\";\202\323" +
+      "\344\223\0025\0223/v1alpha/{name=projects/*/scanConf" +
+      "igs/*/scanRuns/*}\022\310\001\n\014ListScanRuns\022<.goo" +
+      "gle.cloud.websecurityscanner.v1alpha.Lis" +
+      "tScanRunsRequest\032=.google.cloud.websecur" +
+      "ityscanner.v1alpha.ListScanRunsResponse\"" +
+      ";\202\323\344\223\0025\0223/v1alpha/{parent=projects/*/sca" +
+      "nConfigs/*}/scanRuns\022\301\001\n\013StopScanRun\022;.g" +
+      "oogle.cloud.websecurityscanner.v1alpha.S" +
+      "topScanRunRequest\0320.google.cloud.websecu" +
+      "rityscanner.v1alpha.ScanRun\"C\202\323\344\223\002=\"8/v1" +
+      "alpha/{name=projects/*/scanConfigs/*/sca" +
+      "nRuns/*}:stop:\001*\022\337\001\n\017ListCrawledUrls\022?.g" +
+      "oogle.cloud.websecurityscanner.v1alpha.L" +
+      "istCrawledUrlsRequest\032@.google.cloud.web" +
+      "securityscanner.v1alpha.ListCrawledUrlsR" +
+      "esponse\"I\202\323\344\223\002C\022A/v1alpha/{parent=projec" +
+      "ts/*/scanConfigs/*/scanRuns/*}/crawledUr" +
+      "ls\022\302\001\n\nGetFinding\022:.google.cloud.websecu" +
+      "rityscanner.v1alpha.GetFindingRequest\0320." +
+      "google.cloud.websecurityscanner.v1alpha." +
+      "Finding\"F\202\323\344\223\002@\022>/v1alpha/{name=projects" +
+      "/*/scanConfigs/*/scanRuns/*/findings/*}\022" +
+      "\323\001\n\014ListFindings\022<.google.cloud.websecur" +
+      "ityscanner.v1alpha.ListFindingsRequest\032=" +
+      ".google.cloud.websecurityscanner.v1alpha" +
+      ".ListFindingsResponse\"F\202\323\344\223\002@\022>/v1alpha/" +
+      "{parent=projects/*/scanConfigs/*/scanRun" +
+      "s/*}/findings\022\363\001\n\024ListFindingTypeStats\022D" +
+      ".google.cloud.websecurityscanner.v1alpha" +
+      ".ListFindingTypeStatsRequest\032E.google.cl" +
+      "oud.websecurityscanner.v1alpha.ListFindi" +
+      "ngTypeStatsResponse\"N\202\323\344\223\002H\022F/v1alpha/{p" +
+      "arent=projects/*/scanConfigs/*/scanRuns/" +
+      "*}/findingTypeStatsB\243\001\n+com.google.cloud" +
+      ".websecurityscanner.v1alphaB\027WebSecurity" +
+      "ScannerProtoP\001ZYgoogle.golang.org/genpro" +
+      "to/googleapis/cloud/websecurityscanner/v" +
+      "1alpha;websecurityscannerb\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.api.AnnotationsProto.getDescriptor(),
+          com.google.cloud.websecurityscanner.v1alpha.CrawledUrlProto.getDescriptor(),
+          com.google.cloud.websecurityscanner.v1alpha.FindingProto.getDescriptor(),
+          com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsProto.getDescriptor(),
+          com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.getDescriptor(),
+          com.google.cloud.websecurityscanner.v1alpha.ScanRunProto.getDescriptor(),
+          com.google.protobuf.EmptyProto.getDescriptor(),
+          com.google.protobuf.FieldMaskProto.getDescriptor(),
+        }, assigner);
+    internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_descriptor,
+        new java.lang.String[] { "Parent", "ScanConfig", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_descriptor,
+        new java.lang.String[] { "Name", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_descriptor,
+        new java.lang.String[] { "Name", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_descriptor,
+        new java.lang.String[] { "Parent", "PageToken", "PageSize", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_descriptor =
+      getDescriptor().getMessageTypes().get(4);
+    internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_descriptor,
+        new java.lang.String[] { "ScanConfig", "UpdateMask", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_descriptor =
+      getDescriptor().getMessageTypes().get(5);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_descriptor,
+        new java.lang.String[] { "ScanConfigs", "NextPageToken", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_descriptor =
+      getDescriptor().getMessageTypes().get(6);
+    internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_descriptor,
+        new java.lang.String[] { "Name", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_descriptor =
+      getDescriptor().getMessageTypes().get(7);
+    internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_descriptor,
+        new java.lang.String[] { "Name", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_descriptor =
+      getDescriptor().getMessageTypes().get(8);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_descriptor,
+        new java.lang.String[] { "Parent", "PageToken", "PageSize", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_descriptor =
+      getDescriptor().getMessageTypes().get(9);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_descriptor,
+        new java.lang.String[] { "ScanRuns", "NextPageToken", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_descriptor =
+      getDescriptor().getMessageTypes().get(10);
+    internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_descriptor,
+        new java.lang.String[] { "Name", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_descriptor =
+      getDescriptor().getMessageTypes().get(11);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_descriptor,
+        new java.lang.String[] { "Parent", "PageToken", "PageSize", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_descriptor =
+      getDescriptor().getMessageTypes().get(12);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_descriptor,
+        new java.lang.String[] { "CrawledUrls", "NextPageToken", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_descriptor =
+      getDescriptor().getMessageTypes().get(13);
+    internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_descriptor,
+        new java.lang.String[] { "Name", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_descriptor =
+      getDescriptor().getMessageTypes().get(14);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_descriptor,
+        new java.lang.String[] { "Parent", "Filter", "PageToken", "PageSize", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_descriptor =
+      getDescriptor().getMessageTypes().get(15);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_descriptor,
+        new java.lang.String[] { "Findings", "NextPageToken", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_descriptor =
+      getDescriptor().getMessageTypes().get(16);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_descriptor,
+        new java.lang.String[] { "Parent", });
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_descriptor =
+      getDescriptor().getMessageTypes().get(17);
+    internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_descriptor,
+        new java.lang.String[] { "FindingTypeStats", });
+    com.google.protobuf.ExtensionRegistry registry =
+        com.google.protobuf.ExtensionRegistry.newInstance();
+    registry.add(com.google.api.AnnotationsProto.http);
+    com.google.protobuf.Descriptors.FileDescriptor
+        .internalUpdateFileDescriptor(descriptor, registry);
+    com.google.api.AnnotationsProto.getDescriptor();
+    com.google.cloud.websecurityscanner.v1alpha.CrawledUrlProto.getDescriptor();
+    com.google.cloud.websecurityscanner.v1alpha.FindingProto.getDescriptor();
+    com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsProto.getDescriptor();
+    com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.getDescriptor();
+    com.google.cloud.websecurityscanner.v1alpha.ScanRunProto.getDescriptor();
+    com.google.protobuf.EmptyProto.getDescriptor();
+    com.google.protobuf.FieldMaskProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Xss.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Xss.java
new file mode 100644
index 000000000000..fa21fa1534d1
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Xss.java
@@ -0,0 +1,779 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding_addon.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+/**
+ * 
+ * Information reported for an XSS.
+ * 

+ *
+ * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.Xss}
+ */
+public  final class Xss extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.websecurityscanner.v1alpha.Xss)
+    XssOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use Xss.newBuilder() to construct.
+  private Xss(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private Xss() {
+    stackTraces_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    errorMessage_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private Xss(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              stackTraces_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            stackTraces_.add(s);
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            errorMessage_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        stackTraces_ = stackTraces_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_Xss_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_Xss_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.websecurityscanner.v1alpha.Xss.class, com.google.cloud.websecurityscanner.v1alpha.Xss.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int STACK_TRACES_FIELD_NUMBER = 1;
+  private com.google.protobuf.LazyStringList stackTraces_;
+  /**
+   * 
+   * Stack traces leading to the point where the XSS occurred.
+   * 

+   *
+   * repeated string stack_traces = 1;
+   */
+  public com.google.protobuf.ProtocolStringList
+      getStackTracesList() {
+    return stackTraces_;
+  }
+  /**
+   * 
+   * Stack traces leading to the point where the XSS occurred.
+   * 

+   *
+   * repeated string stack_traces = 1;
+   */
+  public int getStackTracesCount() {
+    return stackTraces_.size();
+  }
+  /**
+   * 
+   * Stack traces leading to the point where the XSS occurred.
+   * 

+   *
+   * repeated string stack_traces = 1;
+   */
+  public java.lang.String getStackTraces(int index) {
+    return stackTraces_.get(index);
+  }
+  /**
+   * 
+   * Stack traces leading to the point where the XSS occurred.
+   * 

+   *
+   * repeated string stack_traces = 1;
+   */
+  public com.google.protobuf.ByteString
+      getStackTracesBytes(int index) {
+    return stackTraces_.getByteString(index);
+  }
+
+  public static final int ERROR_MESSAGE_FIELD_NUMBER = 2;
+  private volatile java.lang.Object errorMessage_;
+  /**
+   * 
+   * An error message generated by a javascript breakage.
+   * 

+   *
+   * string error_message = 2;
+   */
+  public java.lang.String getErrorMessage() {
+    java.lang.Object ref = errorMessage_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      errorMessage_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * An error message generated by a javascript breakage.
+   * 

+   *
+   * string error_message = 2;
+   */
+  public com.google.protobuf.ByteString
+      getErrorMessageBytes() {
+    java.lang.Object ref = errorMessage_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      errorMessage_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < stackTraces_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, stackTraces_.getRaw(i));
+    }
+    if (!getErrorMessageBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, errorMessage_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    {
+      int dataSize = 0;
+      for (int i = 0; i < stackTraces_.size(); i++) {
+        dataSize += computeStringSizeNoTag(stackTraces_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getStackTracesList().size();
+    }
+    if (!getErrorMessageBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, errorMessage_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.websecurityscanner.v1alpha.Xss)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.websecurityscanner.v1alpha.Xss other = (com.google.cloud.websecurityscanner.v1alpha.Xss) obj;
+
+    boolean result = true;
+    result = result && getStackTracesList()
+        .equals(other.getStackTracesList());
+    result = result && getErrorMessage()
+        .equals(other.getErrorMessage());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getStackTracesCount() > 0) {
+      hash = (37 * hash) + STACK_TRACES_FIELD_NUMBER;
+      hash = (53 * hash) + getStackTracesList().hashCode();
+    }
+    hash = (37 * hash) + ERROR_MESSAGE_FIELD_NUMBER;
+    hash = (53 * hash) + getErrorMessage().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.Xss prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Information reported for an XSS.
+   * 

+   *
+   * Protobuf type {@code google.cloud.websecurityscanner.v1alpha.Xss}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.websecurityscanner.v1alpha.Xss)
+      com.google.cloud.websecurityscanner.v1alpha.XssOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_Xss_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_Xss_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.websecurityscanner.v1alpha.Xss.class, com.google.cloud.websecurityscanner.v1alpha.Xss.Builder.class);
+    }
+
+    // Construct using com.google.cloud.websecurityscanner.v1alpha.Xss.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      stackTraces_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      errorMessage_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_Xss_descriptor;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.Xss getDefaultInstanceForType() {
+      return com.google.cloud.websecurityscanner.v1alpha.Xss.getDefaultInstance();
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.Xss build() {
+      com.google.cloud.websecurityscanner.v1alpha.Xss result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.websecurityscanner.v1alpha.Xss buildPartial() {
+      com.google.cloud.websecurityscanner.v1alpha.Xss result = new com.google.cloud.websecurityscanner.v1alpha.Xss(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        stackTraces_ = stackTraces_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      }
+      result.stackTraces_ = stackTraces_;
+      result.errorMessage_ = errorMessage_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.websecurityscanner.v1alpha.Xss) {
+        return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.Xss)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.Xss other) {
+      if (other == com.google.cloud.websecurityscanner.v1alpha.Xss.getDefaultInstance()) return this;
+      if (!other.stackTraces_.isEmpty()) {
+        if (stackTraces_.isEmpty()) {
+          stackTraces_ = other.stackTraces_;
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          ensureStackTracesIsMutable();
+          stackTraces_.addAll(other.stackTraces_);
+        }
+        onChanged();
+      }
+      if (!other.getErrorMessage().isEmpty()) {
+        errorMessage_ = other.errorMessage_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.websecurityscanner.v1alpha.Xss parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.websecurityscanner.v1alpha.Xss) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private com.google.protobuf.LazyStringList stackTraces_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensureStackTracesIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        stackTraces_ = new com.google.protobuf.LazyStringArrayList(stackTraces_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+    /**
+     * 
+     * Stack traces leading to the point where the XSS occurred.
+     * 

+     *
+     * repeated string stack_traces = 1;
+     */
+    public com.google.protobuf.ProtocolStringList
+        getStackTracesList() {
+      return stackTraces_.getUnmodifiableView();
+    }
+    /**
+     * 
+     * Stack traces leading to the point where the XSS occurred.
+     * 

+     *
+     * repeated string stack_traces = 1;
+     */
+    public int getStackTracesCount() {
+      return stackTraces_.size();
+    }
+    /**
+     * 
+     * Stack traces leading to the point where the XSS occurred.
+     * 

+     *
+     * repeated string stack_traces = 1;
+     */
+    public java.lang.String getStackTraces(int index) {
+      return stackTraces_.get(index);
+    }
+    /**
+     * 
+     * Stack traces leading to the point where the XSS occurred.
+     * 

+     *
+     * repeated string stack_traces = 1;
+     */
+    public com.google.protobuf.ByteString
+        getStackTracesBytes(int index) {
+      return stackTraces_.getByteString(index);
+    }
+    /**
+     * 
+     * Stack traces leading to the point where the XSS occurred.
+     * 

+     *
+     * repeated string stack_traces = 1;
+     */
+    public Builder setStackTraces(
+        int index, java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureStackTracesIsMutable();
+      stackTraces_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Stack traces leading to the point where the XSS occurred.
+     * 

+     *
+     * repeated string stack_traces = 1;
+     */
+    public Builder addStackTraces(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureStackTracesIsMutable();
+      stackTraces_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Stack traces leading to the point where the XSS occurred.
+     * 

+     *
+     * repeated string stack_traces = 1;
+     */
+    public Builder addAllStackTraces(
+        java.lang.Iterable values) {
+      ensureStackTracesIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, stackTraces_);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Stack traces leading to the point where the XSS occurred.
+     * 

+     *
+     * repeated string stack_traces = 1;
+     */
+    public Builder clearStackTraces() {
+      stackTraces_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Stack traces leading to the point where the XSS occurred.
+     * 

+     *
+     * repeated string stack_traces = 1;
+     */
+    public Builder addStackTracesBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      ensureStackTracesIsMutable();
+      stackTraces_.add(value);
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object errorMessage_ = "";
+    /**
+     * 
+     * An error message generated by a javascript breakage.
+     * 

+     *
+     * string error_message = 2;
+     */
+    public java.lang.String getErrorMessage() {
+      java.lang.Object ref = errorMessage_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        errorMessage_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * An error message generated by a javascript breakage.
+     * 

+     *
+     * string error_message = 2;
+     */
+    public com.google.protobuf.ByteString
+        getErrorMessageBytes() {
+      java.lang.Object ref = errorMessage_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        errorMessage_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * An error message generated by a javascript breakage.
+     * 

+     *
+     * string error_message = 2;
+     */
+    public Builder setErrorMessage(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      errorMessage_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * An error message generated by a javascript breakage.
+     * 

+     *
+     * string error_message = 2;
+     */
+    public Builder clearErrorMessage() {
+      
+      errorMessage_ = getDefaultInstance().getErrorMessage();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * An error message generated by a javascript breakage.
+     * 

+     *
+     * string error_message = 2;
+     */
+    public Builder setErrorMessageBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      errorMessage_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.websecurityscanner.v1alpha.Xss)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.websecurityscanner.v1alpha.Xss)
+  private static final com.google.cloud.websecurityscanner.v1alpha.Xss DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.websecurityscanner.v1alpha.Xss();
+  }
+
+  public static com.google.cloud.websecurityscanner.v1alpha.Xss getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public Xss parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Xss(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.websecurityscanner.v1alpha.Xss getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/XssOrBuilder.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/XssOrBuilder.java
new file mode 100644
index 000000000000..a213207876b1
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/XssOrBuilder.java
@@ -0,0 +1,62 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/websecurityscanner/v1alpha/finding_addon.proto
+
+package com.google.cloud.websecurityscanner.v1alpha;
+
+public interface XssOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.websecurityscanner.v1alpha.Xss)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Stack traces leading to the point where the XSS occurred.
+   * 

+   *
+   * repeated string stack_traces = 1;
+   */
+  java.util.List
+      getStackTracesList();
+  /**
+   * 
+   * Stack traces leading to the point where the XSS occurred.
+   * 

+   *
+   * repeated string stack_traces = 1;
+   */
+  int getStackTracesCount();
+  /**
+   * 
+   * Stack traces leading to the point where the XSS occurred.
+   * 

+   *
+   * repeated string stack_traces = 1;
+   */
+  java.lang.String getStackTraces(int index);
+  /**
+   * 
+   * Stack traces leading to the point where the XSS occurred.
+   * 

+   *
+   * repeated string stack_traces = 1;
+   */
+  com.google.protobuf.ByteString
+      getStackTracesBytes(int index);
+
+  /**
+   * 
+   * An error message generated by a javascript breakage.
+   * 

+   *
+   * string error_message = 2;
+   */
+  java.lang.String getErrorMessage();
+  /**
+   * 
+   * An error message generated by a javascript breakage.
+   * 

+   *
+   * string error_message = 2;
+   */
+  com.google.protobuf.ByteString
+      getErrorMessageBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/crawled_url.proto b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/crawled_url.proto
new file mode 100644
index 000000000000..8951e50bfc67
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/crawled_url.proto
@@ -0,0 +1,43 @@
+// Copyright 2018 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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";
+
+package google.cloud.websecurityscanner.v1alpha;
+
+import "google/api/annotations.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha;websecurityscanner";
+option java_multiple_files = true;
+option java_outer_classname = "CrawledUrlProto";
+option java_package = "com.google.cloud.websecurityscanner.v1alpha";
+
+
+// A CrawledUrl resource represents a URL that was crawled during a ScanRun. Web
+// Security Scanner Service crawls the web applications, following all links
+// within the scope of sites, to find the URLs to test against.
+message CrawledUrl {
+  // Output only.
+  // The http method of the request that was used to visit the URL, in
+  // uppercase.
+  string http_method = 1;
+
+  // Output only.
+  // The URL that was crawled.
+  string url = 2;
+
+  // Output only.
+  // The body of the request that was used to visit the URL.
+  string body = 3;
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/finding.proto b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/finding.proto
new file mode 100644
index 000000000000..bdb15152603c
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/finding.proto
@@ -0,0 +1,141 @@
+// Copyright 2018 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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";
+
+package google.cloud.websecurityscanner.v1alpha;
+
+import "google/api/annotations.proto";
+import "google/cloud/websecurityscanner/v1alpha/finding_addon.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha;websecurityscanner";
+option java_multiple_files = true;
+option java_outer_classname = "FindingProto";
+option java_package = "com.google.cloud.websecurityscanner.v1alpha";
+
+
+// A Finding resource represents a vulnerability instance identified during a
+// ScanRun.
+message Finding {
+  // Types of Findings.
+  enum FindingType {
+    // The invalid finding type.
+    FINDING_TYPE_UNSPECIFIED = 0;
+
+    // A page that was served over HTTPS also resources over HTTP. A
+    // man-in-the-middle attacker could tamper with the HTTP resource and gain
+    // full access to the website that loads the resource or to monitor the
+    // actions taken by the user.
+    MIXED_CONTENT = 1;
+
+    // The version of an included library is known to contain a security issue.
+    // The scanner checks the version of library in use against a known list of
+    // vulnerable libraries. False positives are possible if the version
+    // detection fails or if the library has been manually patched.
+    OUTDATED_LIBRARY = 2;
+
+    // This type of vulnerability occurs when the value of a request parameter
+    // is reflected at the beginning of the response, for example, in requests
+    // using JSONP. Under certain circumstances, an attacker may be able to
+    // supply an alphanumeric-only Flash file in the vulnerable parameter
+    // causing the browser to execute the Flash file as if it originated on the
+    // vulnerable server.
+    ROSETTA_FLASH = 5;
+
+    // A cross-site scripting (XSS) bug is found via JavaScript callback. For
+    // detailed explanations on XSS, see
+    // https://www.google.com/about/appsecurity/learning/xss/.
+    XSS_CALLBACK = 3;
+
+    // A potential cross-site scripting (XSS) bug due to JavaScript breakage.
+    // In some circumstances, the application under test might modify the test
+    // string before it is parsed by the browser. When the browser attempts to
+    // runs this modified test string, it will likely break and throw a
+    // JavaScript execution error, thus an injection issue is occurring.
+    // However, it may not be exploitable. Manual verification is needed to see
+    // if the test string modifications can be evaded and confirm that the issue
+    // is in fact an XSS vulnerability. For detailed explanations on XSS, see
+    // https://www.google.com/about/appsecurity/learning/xss/.
+    XSS_ERROR = 4;
+
+    // An application appears to be transmitting a password field in clear text.
+    // An attacker can eavesdrop network traffic and sniff the password field.
+    CLEAR_TEXT_PASSWORD = 6;
+  }
+
+  // Output only.
+  // The resource name of the Finding. The name follows the format of
+  // 'projects/{projectId}/scanConfigs/{scanConfigId}/scanruns/{scanRunId}/findings/{findingId}'.
+  // The finding IDs are generated by the system.
+  string name = 1;
+
+  // Output only.
+  // The type of the Finding.
+  FindingType finding_type = 2;
+
+  // Output only.
+  // The http method of the request that triggered the vulnerability, in
+  // uppercase.
+  string http_method = 3;
+
+  // Output only.
+  // The URL produced by the server-side fuzzer and used in the request that
+  // triggered the vulnerability.
+  string fuzzed_url = 4;
+
+  // Output only.
+  // The body of the request that triggered the vulnerability.
+  string body = 5;
+
+  // Output only.
+  // The description of the vulnerability.
+  string description = 6;
+
+  // Output only.
+  // The URL containing human-readable payload that user can leverage to
+  // reproduce the vulnerability.
+  string reproduction_url = 7;
+
+  // Output only.
+  // If the vulnerability was originated from nested IFrame, the immediate
+  // parent IFrame is reported.
+  string frame_url = 8;
+
+  // Output only.
+  // The URL where the browser lands when the vulnerability is detected.
+  string final_url = 9;
+
+  // Output only.
+  // The tracking ID uniquely identifies a vulnerability instance across
+  // multiple ScanRuns.
+  string tracking_id = 10;
+
+  // Output only.
+  // An addon containing information about outdated libraries.
+  OutdatedLibrary outdated_library = 11;
+
+  // Output only.
+  // An addon containing detailed information regarding any resource causing the
+  // vulnerability such as JavaScript sources, image, audio files, etc.
+  ViolatingResource violating_resource = 12;
+
+  // Output only.
+  // An addon containing information about request parameters which were found
+  // to be vulnerable.
+  VulnerableParameters vulnerable_parameters = 13;
+
+  // Output only.
+  // An addon containing information reported for an XSS, if any.
+  Xss xss = 14;
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/finding_addon.proto b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/finding_addon.proto
new file mode 100644
index 000000000000..d0777f64d683
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/finding_addon.proto
@@ -0,0 +1,62 @@
+// Copyright 2018 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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";
+
+package google.cloud.websecurityscanner.v1alpha;
+
+import "google/api/annotations.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha;websecurityscanner";
+option java_multiple_files = true;
+option java_outer_classname = "FindingAddonProto";
+option java_package = "com.google.cloud.websecurityscanner.v1alpha";
+
+
+// Information reported for an outdated library.
+message OutdatedLibrary {
+  // The name of the outdated library.
+  string library_name = 1;
+
+  // The version number.
+  string version = 2;
+
+  // URLs to learn more information about the vulnerabilities in the library.
+  repeated string learn_more_urls = 3;
+}
+
+// Information regarding any resource causing the vulnerability such
+// as JavaScript sources, image, audio files, etc.
+message ViolatingResource {
+  // The MIME type of this resource.
+  string content_type = 1;
+
+  // URL of this violating resource.
+  string resource_url = 2;
+}
+
+// Information about vulnerable request parameters.
+message VulnerableParameters {
+  // The vulnerable parameter names.
+  repeated string parameter_names = 1;
+}
+
+// Information reported for an XSS.
+message Xss {
+  // Stack traces leading to the point where the XSS occurred.
+  repeated string stack_traces = 1;
+
+  // An error message generated by a javascript breakage.
+  string error_message = 2;
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto
new file mode 100644
index 000000000000..6b324482b123
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto
@@ -0,0 +1,38 @@
+// Copyright 2018 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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";
+
+package google.cloud.websecurityscanner.v1alpha;
+
+import "google/api/annotations.proto";
+import "google/cloud/websecurityscanner/v1alpha/finding.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha;websecurityscanner";
+option java_multiple_files = true;
+option java_outer_classname = "FindingTypeStatsProto";
+option java_package = "com.google.cloud.websecurityscanner.v1alpha";
+
+
+// A FindingTypeStats resource represents stats regarding a specific FindingType
+// of Findings under a given ScanRun.
+message FindingTypeStats {
+  // Output only.
+  // The finding type associated with the stats.
+  Finding.FindingType finding_type = 1;
+
+  // Output only.
+  // The count of findings belonging to this finding type.
+  int32 finding_count = 2;
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/scan_config.proto b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/scan_config.proto
new file mode 100644
index 000000000000..ffebe6fd71f5
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/scan_config.proto
@@ -0,0 +1,150 @@
+// Copyright 2018 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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";
+
+package google.cloud.websecurityscanner.v1alpha;
+
+import "google/api/annotations.proto";
+import "google/protobuf/timestamp.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha;websecurityscanner";
+option java_multiple_files = true;
+option java_outer_classname = "ScanConfigProto";
+option java_package = "com.google.cloud.websecurityscanner.v1alpha";
+
+
+// A ScanConfig resource contains the configurations to launch a scan.
+message ScanConfig {
+  // Scan authentication configuration.
+  message Authentication {
+    // Describes authentication configuration that uses a Google account.
+    message GoogleAccount {
+      // Required.
+      // The user name of the Google account.
+      string username = 1;
+
+      // Input only.
+      // Required.
+      // The password of the Google account. The credential is stored encrypted
+      // and not returned in any response.
+      string password = 2;
+    }
+
+    // Describes authentication configuration that uses a custom account.
+    message CustomAccount {
+      // Required.
+      // The user name of the custom account.
+      string username = 1;
+
+      // Input only.
+      // Required.
+      // The password of the custom account. The credential is stored encrypted
+      // and not returned in any response.
+      string password = 2;
+
+      // Required.
+      // The login form URL of the website.
+      string login_url = 3;
+    }
+
+    // Required.
+    // Authentication configuration
+    oneof authentication {
+      // Authentication using a Google account.
+      GoogleAccount google_account = 1;
+
+      // Authentication using a custom account.
+      CustomAccount custom_account = 2;
+    }
+  }
+
+  // Scan schedule configuration.
+  message Schedule {
+    // A timestamp indicates when the next run will be scheduled. The value is
+    // refreshed by the server after each run. If unspecified, it will default
+    // to current server time, which means the scan will be scheduled to start
+    // immediately.
+    google.protobuf.Timestamp schedule_time = 1;
+
+    // Required.
+    // The duration of time between executions in days.
+    int32 interval_duration_days = 2;
+  }
+
+  // Type of user agents used for scanning.
+  enum UserAgent {
+    // The user agent is unknown. Service will default to CHROME_LINUX.
+    USER_AGENT_UNSPECIFIED = 0;
+
+    // Chrome on Linux. This is the service default if unspecified.
+    CHROME_LINUX = 1;
+
+    // Chrome on Android.
+    CHROME_ANDROID = 2;
+
+    // Safari on IPhone.
+    SAFARI_IPHONE = 3;
+  }
+
+  // Cloud platforms supported by Cloud Web Security Scanner.
+  enum TargetPlatform {
+    // The target platform is unknown. Requests with this enum value will be
+    // rejected with INVALID_ARGUMENT error.
+    TARGET_PLATFORM_UNSPECIFIED = 0;
+
+    // Google App Engine service.
+    APP_ENGINE = 1;
+
+    // Google Compute Engine service.
+    COMPUTE = 2;
+  }
+
+  // The resource name of the ScanConfig. The name follows the format of
+  // 'projects/{projectId}/scanConfigs/{scanConfigId}'. The ScanConfig IDs are
+  // generated by the system.
+  string name = 1;
+
+  // Required.
+  // The user provided display name of the ScanConfig.
+  string display_name = 2;
+
+  // The maximum QPS during scanning. A valid value ranges from 5 to 20
+  // inclusively. If the field is unspecified or its value is set 0, server will
+  // default to 15. Other values outside of [5, 20] range will be rejected with
+  // INVALID_ARGUMENT error.
+  int32 max_qps = 3;
+
+  // Required.
+  // The starting URLs from which the scanner finds site pages.
+  repeated string starting_urls = 4;
+
+  // The authentication configuration. If specified, service will use the
+  // authentication configuration during scanning.
+  Authentication authentication = 5;
+
+  // The user agent used during scanning.
+  UserAgent user_agent = 6;
+
+  // The blacklist URL patterns as described in
+  // https://cloud.google.com/security-scanner/docs/excluded-urls
+  repeated string blacklist_patterns = 7;
+
+  // The schedule of the ScanConfig.
+  Schedule schedule = 8;
+
+  // Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be
+  // used as a default.
+  repeated TargetPlatform target_platforms = 9;
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/scan_run.proto b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/scan_run.proto
new file mode 100644
index 000000000000..13b7e7578a87
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/scan_run.proto
@@ -0,0 +1,108 @@
+// Copyright 2018 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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";
+
+package google.cloud.websecurityscanner.v1alpha;
+
+import "google/api/annotations.proto";
+import "google/protobuf/timestamp.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha;websecurityscanner";
+option java_multiple_files = true;
+option java_outer_classname = "ScanRunProto";
+option java_package = "com.google.cloud.websecurityscanner.v1alpha";
+
+
+// A ScanRun is a output-only resource representing an actual run of the scan.
+message ScanRun {
+  // Types of ScanRun execution state.
+  enum ExecutionState {
+    // Represents an invalid state caused by internal server error. This value
+    // should never be returned.
+    EXECUTION_STATE_UNSPECIFIED = 0;
+
+    // The scan is waiting in the queue.
+    QUEUED = 1;
+
+    // The scan is in progress.
+    SCANNING = 2;
+
+    // The scan is either finished or stopped by user.
+    FINISHED = 3;
+  }
+
+  // Types of ScanRun result state.
+  enum ResultState {
+    // Default value. This value is returned when the ScanRun is not yet
+    // finished.
+    RESULT_STATE_UNSPECIFIED = 0;
+
+    // The scan finished without errors.
+    SUCCESS = 1;
+
+    // The scan finished with errors.
+    ERROR = 2;
+
+    // The scan was terminated by user.
+    KILLED = 3;
+  }
+
+  // Output only.
+  // The resource name of the ScanRun. The name follows the format of
+  // 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+  // The ScanRun IDs are generated by the system.
+  string name = 1;
+
+  // Output only.
+  // The execution state of the ScanRun.
+  ExecutionState execution_state = 2;
+
+  // Output only.
+  // The result state of the ScanRun. This field is only available after the
+  // execution state reaches "FINISHED".
+  ResultState result_state = 3;
+
+  // Output only.
+  // The time at which the ScanRun started.
+  google.protobuf.Timestamp start_time = 4;
+
+  // Output only.
+  // The time at which the ScanRun reached termination state - that the ScanRun
+  // is either finished or stopped by user.
+  google.protobuf.Timestamp end_time = 5;
+
+  // Output only.
+  // The number of URLs crawled during this ScanRun. If the scan is in progress,
+  // the value represents the number of URLs crawled up to now.
+  int64 urls_crawled_count = 6;
+
+  // Output only.
+  // The number of URLs tested during this ScanRun. If the scan is in progress,
+  // the value represents the number of URLs tested up to now. The number of
+  // URLs tested is usually larger than the number URLS crawled because
+  // typically a crawled URL is tested with multiple test payloads.
+  int64 urls_tested_count = 7;
+
+  // Output only.
+  // Whether the scan run has found any vulnerabilities.
+  bool has_vulnerabilities = 8;
+
+  // Output only.
+  // The percentage of total completion ranging from 0 to 100.
+  // If the scan is in queue, the value is 0.
+  // If the scan is running, the value ranges from 0 to 100.
+  // If the scan is finished, the value is 100.
+  int32 progress_percent = 9;
+}
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
new file mode 100644
index 000000000000..b23375359eb9
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/proto/google/cloud/websecurityscanner/v1alpha/web_security_scanner.proto
@@ -0,0 +1,346 @@
+// Copyright 2018 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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";
+
+package google.cloud.websecurityscanner.v1alpha;
+
+import "google/api/annotations.proto";
+import "google/cloud/websecurityscanner/v1alpha/crawled_url.proto";
+import "google/cloud/websecurityscanner/v1alpha/finding.proto";
+import "google/cloud/websecurityscanner/v1alpha/finding_type_stats.proto";
+import "google/cloud/websecurityscanner/v1alpha/scan_config.proto";
+import "google/cloud/websecurityscanner/v1alpha/scan_run.proto";
+import "google/protobuf/empty.proto";
+import "google/protobuf/field_mask.proto";
+
+option go_package = "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1alpha;websecurityscanner";
+option java_multiple_files = true;
+option java_outer_classname = "WebSecurityScannerProto";
+option java_package = "com.google.cloud.websecurityscanner.v1alpha";
+
+
+// Cloud Web Security Scanner Service identifies security vulnerabilities in web
+// applications hosted on Google Cloud Platform. It crawls your application, and
+// attempts to exercise as many user inputs and event handlers as possible.
+service WebSecurityScanner {
+  // Creates a new ScanConfig.
+  rpc CreateScanConfig(CreateScanConfigRequest) returns (ScanConfig) {
+    option (google.api.http) = {
+      post: "/v1alpha/{parent=projects/*}/scanConfigs"
+      body: "scan_config"
+    };
+  }
+
+  // Deletes an existing ScanConfig and its child resources.
+  rpc DeleteScanConfig(DeleteScanConfigRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      delete: "/v1alpha/{name=projects/*/scanConfigs/*}"
+    };
+  }
+
+  // Gets a ScanConfig.
+  rpc GetScanConfig(GetScanConfigRequest) returns (ScanConfig) {
+    option (google.api.http) = {
+      get: "/v1alpha/{name=projects/*/scanConfigs/*}"
+    };
+  }
+
+  // Lists ScanConfigs under a given project.
+  rpc ListScanConfigs(ListScanConfigsRequest) returns (ListScanConfigsResponse) {
+    option (google.api.http) = {
+      get: "/v1alpha/{parent=projects/*}/scanConfigs"
+    };
+  }
+
+  // Updates a ScanConfig. This method support partial update of a ScanConfig.
+  rpc UpdateScanConfig(UpdateScanConfigRequest) returns (ScanConfig) {
+    option (google.api.http) = {
+      patch: "/v1alpha/{scan_config.name=projects/*/scanConfigs/*}"
+      body: "scan_config"
+    };
+  }
+
+  // Start a ScanRun according to the given ScanConfig.
+  rpc StartScanRun(StartScanRunRequest) returns (ScanRun) {
+    option (google.api.http) = {
+      post: "/v1alpha/{name=projects/*/scanConfigs/*}:start"
+      body: "*"
+    };
+  }
+
+  // Gets a ScanRun.
+  rpc GetScanRun(GetScanRunRequest) returns (ScanRun) {
+    option (google.api.http) = {
+      get: "/v1alpha/{name=projects/*/scanConfigs/*/scanRuns/*}"
+    };
+  }
+
+  // Lists ScanRuns under a given ScanConfig, in descending order of ScanRun
+  // stop time.
+  rpc ListScanRuns(ListScanRunsRequest) returns (ListScanRunsResponse) {
+    option (google.api.http) = {
+      get: "/v1alpha/{parent=projects/*/scanConfigs/*}/scanRuns"
+    };
+  }
+
+  // Stops a ScanRun. The stopped ScanRun is returned.
+  rpc StopScanRun(StopScanRunRequest) returns (ScanRun) {
+    option (google.api.http) = {
+      post: "/v1alpha/{name=projects/*/scanConfigs/*/scanRuns/*}:stop"
+      body: "*"
+    };
+  }
+
+  // List CrawledUrls under a given ScanRun.
+  rpc ListCrawledUrls(ListCrawledUrlsRequest) returns (ListCrawledUrlsResponse) {
+    option (google.api.http) = {
+      get: "/v1alpha/{parent=projects/*/scanConfigs/*/scanRuns/*}/crawledUrls"
+    };
+  }
+
+  // Gets a Finding.
+  rpc GetFinding(GetFindingRequest) returns (Finding) {
+    option (google.api.http) = {
+      get: "/v1alpha/{name=projects/*/scanConfigs/*/scanRuns/*/findings/*}"
+    };
+  }
+
+  // List Findings under a given ScanRun.
+  rpc ListFindings(ListFindingsRequest) returns (ListFindingsResponse) {
+    option (google.api.http) = {
+      get: "/v1alpha/{parent=projects/*/scanConfigs/*/scanRuns/*}/findings"
+    };
+  }
+
+  // List all FindingTypeStats under a given ScanRun.
+  rpc ListFindingTypeStats(ListFindingTypeStatsRequest) returns (ListFindingTypeStatsResponse) {
+    option (google.api.http) = {
+      get: "/v1alpha/{parent=projects/*/scanConfigs/*/scanRuns/*}/findingTypeStats"
+    };
+  }
+}
+
+// Request for the `CreateScanConfig` method.
+message CreateScanConfigRequest {
+  // Required.
+  // The parent resource name where the scan is created, which should be a
+  // project resource name in the format 'projects/{projectId}'.
+  string parent = 1;
+
+  // Required.
+  // The ScanConfig to be created.
+  ScanConfig scan_config = 2;
+}
+
+// Request for the `DeleteScanConfig` method.
+message DeleteScanConfigRequest {
+  // Required.
+  // The resource name of the ScanConfig to be deleted. The name follows the
+  // format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+  string name = 1;
+}
+
+// Request for the `GetScanConfig` method.
+message GetScanConfigRequest {
+  // Required.
+  // The resource name of the ScanConfig to be returned. The name follows the
+  // format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+  string name = 1;
+}
+
+// Request for the `ListScanConfigs` method.
+message ListScanConfigsRequest {
+  // Required.
+  // The parent resource name, which should be a project resource name in the
+  // format 'projects/{projectId}'.
+  string parent = 1;
+
+  // A token identifying a page of results to be returned. This should be a
+  // `next_page_token` value returned from a previous List request.
+  // If unspecified, the first page of results is returned.
+  string page_token = 2;
+
+  // The maximum number of ScanConfigs to return, can be limited by server.
+  // If not specified or not positive, the implementation will select a
+  // reasonable value.
+  int32 page_size = 3;
+}
+
+// Request for the `UpdateScanConfigRequest` method.
+message UpdateScanConfigRequest {
+  // Required.
+  // The ScanConfig to be updated. The name field must be set to identify the
+  // resource to be updated. The values of fields not covered by the mask
+  // will be ignored.
+  ScanConfig scan_config = 2;
+
+  // Required.
+  // The update mask applies to the resource. For the `FieldMask` definition,
+  // see
+  // https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+  google.protobuf.FieldMask update_mask = 3;
+}
+
+// Response for the `ListScanConfigs` method.
+message ListScanConfigsResponse {
+  // The list of ScanConfigs returned.
+  repeated ScanConfig scan_configs = 1;
+
+  // Token to retrieve the next page of results, or empty if there are no
+  // more results in the list.
+  string next_page_token = 2;
+}
+
+// Request for the `StartScanRun` method.
+message StartScanRunRequest {
+  // Required.
+  // The resource name of the ScanConfig to be used. The name follows the
+  // format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+  string name = 1;
+}
+
+// Request for the `GetScanRun` method.
+message GetScanRunRequest {
+  // Required.
+  // The resource name of the ScanRun to be returned. The name follows the
+  // format of
+  // 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+  string name = 1;
+}
+
+// Request for the `ListScanRuns` method.
+message ListScanRunsRequest {
+  // Required.
+  // The parent resource name, which should be a scan resource name in the
+  // format 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+  string parent = 1;
+
+  // A token identifying a page of results to be returned. This should be a
+  // `next_page_token` value returned from a previous List request.
+  // If unspecified, the first page of results is returned.
+  string page_token = 2;
+
+  // The maximum number of ScanRuns to return, can be limited by server.
+  // If not specified or not positive, the implementation will select a
+  // reasonable value.
+  int32 page_size = 3;
+}
+
+// Response for the `ListScanRuns` method.
+message ListScanRunsResponse {
+  // The list of ScanRuns returned.
+  repeated ScanRun scan_runs = 1;
+
+  // Token to retrieve the next page of results, or empty if there are no
+  // more results in the list.
+  string next_page_token = 2;
+}
+
+// Request for the `StopScanRun` method.
+message StopScanRunRequest {
+  // Required.
+  // The resource name of the ScanRun to be stopped. The name follows the
+  // format of
+  // 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+  string name = 1;
+}
+
+// Request for the `ListCrawledUrls` method.
+message ListCrawledUrlsRequest {
+  // Required.
+  // The parent resource name, which should be a scan run resource name in the
+  // format
+  // 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+  string parent = 1;
+
+  // A token identifying a page of results to be returned. This should be a
+  // `next_page_token` value returned from a previous List request.
+  // If unspecified, the first page of results is returned.
+  string page_token = 2;
+
+  // The maximum number of CrawledUrls to return, can be limited by server.
+  // If not specified or not positive, the implementation will select a
+  // reasonable value.
+  int32 page_size = 3;
+}
+
+// Response for the `ListCrawledUrls` method.
+message ListCrawledUrlsResponse {
+  // The list of CrawledUrls returned.
+  repeated CrawledUrl crawled_urls = 1;
+
+  // Token to retrieve the next page of results, or empty if there are no
+  // more results in the list.
+  string next_page_token = 2;
+}
+
+// Request for the `GetFinding` method.
+message GetFindingRequest {
+  // Required.
+  // The resource name of the Finding to be returned. The name follows the
+  // format of
+  // 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}/findings/{findingId}'.
+  string name = 1;
+}
+
+// Request for the `ListFindings` method.
+message ListFindingsRequest {
+  // Required.
+  // The parent resource name, which should be a scan run resource name in the
+  // format
+  // 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+  string parent = 1;
+
+  // The filter expression. The expression must be in the format: 
+  //  .
+  // Supported field: 'finding_type'.
+  // Supported operator: '='.
+  string filter = 2;
+
+  // A token identifying a page of results to be returned. This should be a
+  // `next_page_token` value returned from a previous List request.
+  // If unspecified, the first page of results is returned.
+  string page_token = 3;
+
+  // The maximum number of Findings to return, can be limited by server.
+  // If not specified or not positive, the implementation will select a
+  // reasonable value.
+  int32 page_size = 4;
+}
+
+// Response for the `ListFindings` method.
+message ListFindingsResponse {
+  // The list of Findings returned.
+  repeated Finding findings = 1;
+
+  // Token to retrieve the next page of results, or empty if there are no
+  // more results in the list.
+  string next_page_token = 2;
+}
+
+// Request for the `ListFindingTypeStats` method.
+message ListFindingTypeStatsRequest {
+  // Required.
+  // The parent resource name, which should be a scan run resource name in the
+  // format
+  // 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+  string parent = 1;
+}
+
+// Response for the `ListFindingTypeStats` method.
+message ListFindingTypeStatsResponse {
+  // The list of FindingTypeStats returned.
+  repeated FindingTypeStats finding_type_stats = 1;
+}
diff --git a/google-cloud-bigtable/.gitignore b/google-cloud-bigtable/.gitignore
deleted file mode 100644
index fab07de50e34..000000000000
--- a/google-cloud-bigtable/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/deps
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index 01474752a808..619d9479698e 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -92,6 +92,22 @@
         Developer
       
     
+    
+      andreamlin
+      Andrea Lin
+      andrealin@google.com
+      
+        Developer
+      
+    
+    
+      hzyi-google
+      Hanzhen Yi
+      hzyi@google.com
+      
+        Developer
+      
+    
   
   
     Google
@@ -99,7 +115,7 @@
   
     scm:git:git@github.com:GoogleCloudPlatform/google-cloud.git
     scm:git:git@github.com:GoogleCloudPlatform/google-cloud.git
-    https://github.com/GoogleCloudPlatform/google-cloud
+    https://github.com/GoogleCloudPlatform/google-cloud-java
     HEAD
   
   
@@ -114,7 +130,7 @@
     
       github-pages-site
       Deployment through GitHub's site deployment plugin
-      site/${project.artifactId}
+      site/google-cloud-bom
     
   
   
@@ -123,839 +139,785 @@
       https://raw.githubusercontent.com/GoogleCloudPlatform/google-cloud-java/master/LICENSE
     
   
-  
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    1.29.1-SNAPSHOT
-    0.47.1-beta-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-beta-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    1.29.1-SNAPSHOT
-    1.29.1-SNAPSHOT
-    1.29.1-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    1.29.1-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-beta-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-beta-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-beta-SNAPSHOT
-    1.29.1-SNAPSHOT
-    1.29.1-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-beta-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-beta-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-beta-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-beta-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    1.29.1-SNAPSHOT
-    0.47.1-beta-SNAPSHOT
-    0.47.1-beta-SNAPSHOT
-    1.29.1-SNAPSHOT
-    0.47.1-beta-SNAPSHOT
-    1.29.1-SNAPSHOT
-
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-    0.47.1-alpha-SNAPSHOT
-
-    1.5.0
-    1.25.0
-    1.25.0
-    0.42.0
-    0.12.0
-    1.11.0
-  
   
     
+      
       
-        com.google.cloud
-        google-cloud
-        ${cloud.version}
+        com.google.api
+        api-common
+        1.5.0
       
       
-        com.google.cloud
-        google-cloud
-        ${cloud.version}
-        test-jar
+        com.google.api
+        gax
+        1.25.0
+      
+      
+        com.google.api
+        gax-grpc
+        1.25.0
+      
+      
+        com.google.api
+        gax-grpc
+        1.25.0
+        testlib
+      
+      
+        com.google.api
+        gax-httpjson
+        0.42.0
+      
+      
+        com.google.api
+        gax-httpjson
+        0.42.0
+        testlib
+      
+      
+        com.google.api.grpc
+        proto-google-common-protos
+        1.11.0
+      
+      
+        com.google.api.grpc
+        grpc-google-common-protos
+        1.11.0
+      
+      
+        com.google.api.grpc
+        proto-google-iam-v1
+        0.12.0
+      
+      
+        com.google.api.grpc
+        grpc-google-iam-v1
+        0.12.0
       
 
+      
       
         com.google.cloud
         google-cloud-bigtable
-        ${bigtable.version}
+        0.47.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-bigtable
-        ${bigtable.version}
+        0.47.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-v2
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-v2
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-admin-v2
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-admin-v2
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-bigquery
-        ${bigquery.version}
+        1.29.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-bigquery
-        ${bigquery.version}
+        1.29.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-bigquerydatatransfer
-        ${bigquerydatatransfer.version}
+        0.47.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-bigquerydatatransfer
-        ${bigquerydatatransfer.version}
+        0.47.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-bigquerydatatransfer-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigquerydatatransfer-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-compute
-        ${compute.version}
+        0.47.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-compute
-        ${compute.version}
+        0.47.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-container
-        ${container.version}
+        0.47.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-container
-        ${container.version}
+        0.47.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-container-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-container-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-contrib
-        ${contrib.version}
+        0.47.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-contrib
-        ${contrib.version}
+        0.47.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-nio
-        ${contrib.version}
+        0.47.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-nio
-        ${contrib.version}
+        0.47.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-core
-        ${core.version}
+        1.29.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-core
-        ${core.version}
+        1.29.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-core-grpc
-        ${core-grpc.version}
+        1.29.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-core-grpc
-        ${core-grpc.version}
+        1.29.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-core-http
-        ${core-http.version}
+        1.29.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-core-http
-        ${core-http.version}
+        1.29.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-dataproc
-        ${dataproc.version}
+        0.47.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dataproc
-        ${dataproc.version}
+        0.47.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dataproc-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dataproc-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        ${datastore.version}
+        1.29.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        ${datastore.version}
+        1.29.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dlp
-        ${dlp.version}
+        0.47.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dlp
-        ${dlp.version}
+        0.47.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dlp-v2beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dlp-v2
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dialogflow
-        ${dialogflow.version}
+        0.47.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dialogflow
-        ${dialogflow.version}
+        0.47.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dns
-        ${dns.version}
+        0.47.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dns
-        ${dns.version}
+        0.47.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-errorreporting
-        ${errorreporting.version}
+        0.47.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-errorreporting
-        ${errorreporting.version}
+        0.47.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-error-reporting-v1beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-error-reporting-v1beta1
-        ${generated-proto-beta.version}
-      
-      
-        com.google.cloud
-        google-cloud-examples
-        ${examples.version}
-      
-      
-        com.google.cloud
-        google-cloud-examples
-        ${examples.version}
-        test-jar
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-firestore
-        ${firestore.version}
+        0.47.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-firestore
-        ${firestore.version}
+        0.47.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-firestore-v1beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-firestore-v1beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-language
-        ${language.version}
+        1.29.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-language
-        ${language.version}
+        1.29.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1
-        ${generated-proto-ga.version}
+        1.11.1-SNAPSHOT
       
       
         com.google.api.grpc
-        proto-google-cloud-language-v1beta2
-        ${generated-proto-beta.version}
+        grpc-google-cloud-language-v1
+        1.11.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-cloud-language-v1
-        ${generated-proto-ga.version}
+        proto-google-cloud-language-v1beta2
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1beta2
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-logging
-        ${logging.version}
+        1.29.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-logging
-        ${logging.version}
+        1.29.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-logging-v2
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-logging-v2
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-logging-logback
-        ${logging-logback.version}
+        0.47.1-alpha-SNAPSHOT
       
 
       
         com.google.cloud
         google-cloud-monitoring
-        ${monitoring.version}
+        0.47.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-monitoring
-        ${monitoring.version}
+        0.47.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-monitoring-v3
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-monitoring-v3
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-os-login
-        ${os-login.version}
+        0.47.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-os-login
-        ${os-login.version}
+        0.47.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-os-login-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-os-login-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-pubsub
-        ${pubsub.version}
+        0.47.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-pubsub
-        ${pubsub.version}
+        0.47.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-pubsub-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-pubsub-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-redis
-        ${redis.version}
+        0.47.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-redis
-        ${redis.version}
+        0.47.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-redis-v1beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-redis-v1beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-resourcemanager
-        ${resourcemanager.version}
+        0.47.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-resourcemanager
-        ${resourcemanager.version}
+        0.47.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-spanner
-        ${spanner.version}
+        0.47.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-spanner
-        ${spanner.version}
+        0.47.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        proto-google-cloud-spanner-admin-database-v1
-        ${generated-proto-beta.version}
+        grpc-google-cloud-spanner-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        proto-google-cloud-spanner-admin-instance-v1
-        ${generated-proto-beta.version}
+        proto-google-cloud-spanner-admin-database-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-cloud-spanner-v1
-        ${generated-proto-beta.version}
+        grpc-google-cloud-spanner-admin-database-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-cloud-spanner-admin-database-v1
-        ${generated-proto-beta.version}
+        proto-google-cloud-spanner-admin-instance-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-instance-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-speech
-        ${speech.version}
+        0.47.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-speech
-        ${speech.version}
+        0.47.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        proto-google-cloud-speech-v1p1beta1
-        ${generated-proto-beta.version}
+        grpc-google-cloud-speech-v1beta1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        proto-google-cloud-speech-v1
-        ${generated-proto-beta.version}
+        proto-google-cloud-speech-v1p1beta1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-cloud-speech-v1beta1
-        ${generated-proto-beta.version}
+        grpc-google-cloud-speech-v1p1beta1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-cloud-speech-v1p1beta1
-        ${generated-proto-beta.version}
+        proto-google-cloud-speech-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-storage
-        ${storage.version}
+        1.29.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-storage
-        ${storage.version}
+        1.29.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-texttospeech
-        ${texttospeech.version}
+        0.47.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-texttospeech
-        ${texttospeech.version}
+        0.47.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-texttospeech-v1beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-texttospeech-v1beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-trace
-        ${trace.version}
+        0.47.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-trace
-        ${trace.version}
+        0.47.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        proto-google-cloud-trace-v2
-        ${generated-proto-beta.version}
+        grpc-google-cloud-trace-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-cloud-trace-v1
-        ${generated-proto-beta.version}
+        proto-google-cloud-trace-v2
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v2
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-translate
-        ${translate.version}
+        1.29.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-translate
-        ${translate.version}
+        1.29.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-vision
-        ${vision.version}
+        1.29.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-vision
-        ${vision.version}
+        1.29.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1
-        ${generated-proto-ga.version}
+        1.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1
-        ${generated-proto-ga.version}
+        1.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p1beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p1beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p2beta1
-        ${generated-proto-ga.version}
+        1.11.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p2beta1
-        ${generated-proto-ga.version}
+        1.11.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-video-intelligence
-        ${video-intelligence.version}
+        0.47.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-video-intelligence
-        ${video-intelligence.version}
+        0.47.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        proto-google-cloud-video-intelligence-v1beta2
-        ${generated-proto-beta.version}
+        grpc-google-cloud-video-intelligence-v1beta1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        proto-google-cloud-video-intelligence-v1
-        ${generated-proto-beta.version}
+        proto-google-cloud-video-intelligence-v1beta2
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        proto-google-cloud-video-intelligence-v1p1beta1
-        ${generated-proto-beta.version}
+        grpc-google-cloud-video-intelligence-v1beta2
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-cloud-video-intelligence-v1beta1
-        ${generated-proto-beta.version}
+        proto-google-cloud-video-intelligence-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-cloud-video-intelligence-v1beta2
-        ${generated-proto-beta.version}
+        grpc-google-cloud-video-intelligence-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-cloud-video-intelligence-v1
-        ${generated-proto-beta.version}
+        proto-google-cloud-video-intelligence-v1p1beta1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1p1beta1
-        ${generated-proto-beta.version}
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        proto-google-common-protos
-        ${generated-proto-ga.version}
+        proto-google-cloud-cloudiot-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-common-protos
-        ${generated-proto-ga.version}
+        grpc-google-cloud-cloudiot-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        proto-google-iam-v1
-        ${generated-proto-beta.version}
+        proto-google-cloud-websecurityscanner-v1alpha
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-iam-v1
-        ${generated-proto-beta.version}
-      
-      
-        com.google.api
-        api-common
-        ${api-common.version}
-      
-      
-        com.google.api
-        gax
-        ${gax.version}
-      
-      
-        com.google.api
-        gax-grpc
-        ${gax-grpc.version}
-      
-      
-        com.google.api
-        gax-grpc
-        ${gax-grpc.version}
-        testlib
-      
-      
-        com.google.api
-        gax-httpjson
-        ${gax-httpjson.version}
-      
-      
-        com.google.api
-        gax-httpjson
-        ${gax-httpjson.version}
-        testlib
+        grpc-google-cloud-websecurityscanner-v1alpha
+        0.12.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-bigquery/README.md b/google-cloud-clients/google-cloud-bigquery/README.md
similarity index 100%
rename from google-cloud-bigquery/README.md
rename to google-cloud-clients/google-cloud-bigquery/README.md
diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-clients/google-cloud-bigquery/pom.xml
similarity index 97%
rename from google-cloud-bigquery/pom.xml
rename to google-cloud-clients/google-cloud-bigquery/pom.xml
index 603d3192d4e5..1e5dfc09434b 100644
--- a/google-cloud-bigquery/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquery/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-bigquery
diff --git a/google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/Benchmark.java b/google-cloud-clients/google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/Benchmark.java
similarity index 100%
rename from google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/Benchmark.java
rename to google-cloud-clients/google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/Benchmark.java
diff --git a/google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/README.md b/google-cloud-clients/google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/README.md
similarity index 100%
rename from google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/README.md
rename to google-cloud-clients/google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/README.md
diff --git a/google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/queries.json b/google-cloud-clients/google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/queries.json
similarity index 100%
rename from google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/queries.json
rename to google-cloud-clients/google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/queries.json
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Acl.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Acl.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Acl.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Acl.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQuery.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryError.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryError.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryError.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryError.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryFactory.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryFactory.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryFactory.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryFactory.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/CopyJobConfiguration.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/CopyJobConfiguration.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/CopyJobConfiguration.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/CopyJobConfiguration.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/CsvOptions.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/CsvOptions.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/CsvOptions.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/CsvOptions.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetId.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetId.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetId.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetId.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetInfo.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetInfo.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetInfo.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatasetInfo.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatastoreBackupOptions.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatastoreBackupOptions.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatastoreBackupOptions.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DatastoreBackupOptions.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/EncryptionConfiguration.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/EncryptionConfiguration.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/EncryptionConfiguration.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/EncryptionConfiguration.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExternalTableDefinition.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExternalTableDefinition.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExternalTableDefinition.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExternalTableDefinition.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExtractJobConfiguration.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExtractJobConfiguration.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExtractJobConfiguration.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExtractJobConfiguration.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Field.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Field.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Field.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Field.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldList.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldList.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldList.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldList.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValue.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValue.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValue.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValue.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValueList.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValueList.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValueList.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValueList.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FormatOptions.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FormatOptions.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FormatOptions.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FormatOptions.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/GoogleSheetsOptions.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/GoogleSheetsOptions.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/GoogleSheetsOptions.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/GoogleSheetsOptions.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllRequest.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllRequest.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllRequest.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllRequest.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllResponse.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllResponse.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllResponse.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/InsertAllResponse.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobConfiguration.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobConfiguration.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobConfiguration.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobConfiguration.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobException.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobException.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobException.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobException.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobId.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobId.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobId.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobId.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobInfo.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobInfo.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobInfo.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobInfo.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatus.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatus.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatus.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatus.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Labels.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Labels.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Labels.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Labels.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LegacySQLTypeName.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LegacySQLTypeName.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LegacySQLTypeName.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LegacySQLTypeName.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadConfiguration.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadConfiguration.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadConfiguration.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadConfiguration.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadJobConfiguration.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadJobConfiguration.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadJobConfiguration.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadJobConfiguration.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Option.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Option.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Option.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Option.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResponse.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResponse.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResponse.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryResponse.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryStage.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryStage.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryStage.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryStage.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Schema.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Schema.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Schema.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Schema.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardSQLTypeName.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardSQLTypeName.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardSQLTypeName.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardSQLTypeName.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Table.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Table.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Table.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Table.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDataWriteChannel.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDataWriteChannel.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDataWriteChannel.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDataWriteChannel.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDefinition.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDefinition.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDefinition.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDefinition.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableId.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableId.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableId.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableId.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableInfo.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableInfo.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableInfo.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableInfo.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableResult.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableResult.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableResult.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableResult.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TimePartitioning.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TimePartitioning.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TimePartitioning.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TimePartitioning.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TimelineSample.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TimelineSample.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TimelineSample.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TimelineSample.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/UserDefinedFunction.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ViewDefinition.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ViewDefinition.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ViewDefinition.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ViewDefinition.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/WriteChannelConfiguration.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/WriteChannelConfiguration.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/WriteChannelConfiguration.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/WriteChannelConfiguration.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/package-info.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/package-info.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/package-info.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/package-info.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/BigQueryRpcFactory.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/BigQueryRpcFactory.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/BigQueryRpcFactory.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/BigQueryRpcFactory.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/BigQueryRpc.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/BigQueryRpc.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/BigQueryRpc.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/BigQueryRpc.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelper.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelper.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelper.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelper.java
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/package-info.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/package-info.java
similarity index 100%
rename from google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/package-info.java
rename to google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/package-info.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/AclTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/AclTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/AclTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/AclTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryErrorTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryExceptionTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryExceptionTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryExceptionTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryExceptionTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryOptionsTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryOptionsTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryOptionsTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryOptionsTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/CopyJobConfigurationTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/CopyJobConfigurationTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/CopyJobConfigurationTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/CopyJobConfigurationTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/CsvOptionsTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/CsvOptionsTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/CsvOptionsTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/CsvOptionsTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetIdTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetIdTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetIdTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetIdTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetInfoTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetInfoTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetInfoTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetInfoTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatasetTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatastoreBackupOptionsTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatastoreBackupOptionsTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatastoreBackupOptionsTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/DatastoreBackupOptionsTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExternalTableDefinitionTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExternalTableDefinitionTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExternalTableDefinitionTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExternalTableDefinitionTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExtractJobConfigurationTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExtractJobConfigurationTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExtractJobConfigurationTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ExtractJobConfigurationTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldListTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldListTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldListTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldListTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueListTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueListTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueListTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueListTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FormatOptionsTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FormatOptionsTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FormatOptionsTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FormatOptionsTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/GoogleSheetsOptionsTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/GoogleSheetsOptionsTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/GoogleSheetsOptionsTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/GoogleSheetsOptionsTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/InsertAllRequestTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/InsertAllRequestTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/InsertAllRequestTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/InsertAllRequestTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/InsertAllResponseTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/InsertAllResponseTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/InsertAllResponseTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/InsertAllResponseTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobIdTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobIdTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobIdTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobIdTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobInfoTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobInfoTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobInfoTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobInfoTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatusTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatusTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatusTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatusTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/LabelsTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/LabelsTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/LabelsTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/LabelsTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/LoadJobConfigurationTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/LoadJobConfigurationTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/LoadJobConfigurationTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/LoadJobConfigurationTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/OptionTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/OptionTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/OptionTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/OptionTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryJobConfigurationTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryJobConfigurationTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryJobConfigurationTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryJobConfigurationTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryStageTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryStageTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryStageTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryStageTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SchemaTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SchemaTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SchemaTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SchemaTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SerializationTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SerializationTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SerializationTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/SerializationTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/StandardTableDefinitionTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/StandardTableDefinitionTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/StandardTableDefinitionTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/StandardTableDefinitionTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableDataWriteChannelTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableDataWriteChannelTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableDataWriteChannelTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableDataWriteChannelTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableIdTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableIdTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableIdTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableIdTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableInfoTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableInfoTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableInfoTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableInfoTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableResultTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableResultTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableResultTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableResultTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TimePartitioningTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TimePartitioningTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TimePartitioningTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TimePartitioningTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TimelineSampleTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TimelineSampleTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TimelineSampleTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TimelineSampleTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/UserDefinedFunctionTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/UserDefinedFunctionTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/UserDefinedFunctionTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/UserDefinedFunctionTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ViewDefinitionTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ViewDefinitionTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ViewDefinitionTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/ViewDefinitionTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/WriteChannelConfigurationTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/WriteChannelConfigurationTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/WriteChannelConfigurationTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/WriteChannelConfigurationTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelperTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelperTest.java
similarity index 100%
rename from google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelperTest.java
rename to google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelperTest.java
diff --git a/google-cloud-bigquerydatatransfer/README.md b/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md
similarity index 100%
rename from google-cloud-bigquerydatatransfer/README.md
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/README.md
diff --git a/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
similarity index 97%
rename from google-cloud-bigquerydatatransfer/pom.xml
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
index b2b4f2f7f2a2..33fed2d92a66 100644
--- a/google-cloud-bigquerydatatransfer/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-bigquerydatatransfer
diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClient.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClient.java
similarity index 100%
rename from google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClient.java
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClient.java
diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSettings.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSettings.java
similarity index 100%
rename from google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSettings.java
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSettings.java
diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/SampleApp.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/SampleApp.java
similarity index 100%
rename from google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/SampleApp.java
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/SampleApp.java
diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/package-info.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/package-info.java
similarity index 100%
rename from google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/package-info.java
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/package-info.java
diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStub.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStub.java
similarity index 100%
rename from google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStub.java
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStub.java
diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStubSettings.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStubSettings.java
similarity index 100%
rename from google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStubSettings.java
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/DataTransferServiceStubSettings.java
diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceCallableFactory.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceCallableFactory.java
similarity index 100%
rename from google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceCallableFactory.java
diff --git a/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceStub.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceStub.java
similarity index 100%
rename from google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceStub.java
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceStub.java
diff --git a/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java
similarity index 100%
rename from google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java
diff --git a/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSmokeTest.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSmokeTest.java
similarity index 100%
rename from google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSmokeTest.java
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSmokeTest.java
diff --git a/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferService.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferService.java
similarity index 100%
rename from google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferService.java
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferService.java
diff --git a/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferServiceImpl.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferServiceImpl.java
similarity index 100%
rename from google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferServiceImpl.java
rename to google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferServiceImpl.java
diff --git a/google-cloud-bigtable/DEVELOPING.md b/google-cloud-clients/google-cloud-bigtable/DEVELOPING.md
similarity index 100%
rename from google-cloud-bigtable/DEVELOPING.md
rename to google-cloud-clients/google-cloud-bigtable/DEVELOPING.md
diff --git a/google-cloud-bigtable/README.md b/google-cloud-clients/google-cloud-bigtable/README.md
similarity index 100%
rename from google-cloud-bigtable/README.md
rename to google-cloud-clients/google-cloud-bigtable/README.md
diff --git a/google-cloud-bigtable/autogen_files.lst b/google-cloud-clients/google-cloud-bigtable/autogen_files.lst
similarity index 100%
rename from google-cloud-bigtable/autogen_files.lst
rename to google-cloud-clients/google-cloud-bigtable/autogen_files.lst
diff --git a/google-cloud-bigtable/handwritten_files.lst b/google-cloud-clients/google-cloud-bigtable/handwritten_files.lst
similarity index 100%
rename from google-cloud-bigtable/handwritten_files.lst
rename to google-cloud-clients/google-cloud-bigtable/handwritten_files.lst
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
similarity index 97%
rename from google-cloud-bigtable/pom.xml
rename to google-cloud-clients/google-cloud-bigtable/pom.xml
index e5e1daf3d704..cd86f1108dd9 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-bigtable
diff --git a/google-cloud-bigtable/scripts/README.md b/google-cloud-clients/google-cloud-bigtable/scripts/README.md
similarity index 100%
rename from google-cloud-bigtable/scripts/README.md
rename to google-cloud-clients/google-cloud-bigtable/scripts/README.md
diff --git a/google-cloud-bigtable/scripts/regenerate.sh b/google-cloud-clients/google-cloud-bigtable/scripts/regenerate.sh
similarity index 100%
rename from google-cloud-bigtable/scripts/regenerate.sh
rename to google-cloud-clients/google-cloud-bigtable/scripts/regenerate.sh
diff --git a/google-cloud-bigtable/scripts/setup-test-table.sh b/google-cloud-clients/google-cloud-bigtable/scripts/setup-test-table.sh
similarity index 100%
rename from google-cloud-bigtable/scripts/setup-test-table.sh
rename to google-cloud-clients/google-cloud-bigtable/scripts/setup-test-table.sh
diff --git a/google-cloud-bigtable/scripts/update-deps.sh b/google-cloud-clients/google-cloud-bigtable/scripts/update-deps.sh
similarity index 100%
rename from google-cloud-bigtable/scripts/update-deps.sh
rename to google-cloud-clients/google-cloud-bigtable/scripts/update-deps.sh
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/package-info.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataSettings.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataSettings.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataSettings.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataSettings.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparator.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparator.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparator.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparator.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/DummyBatchingDescriptor.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/DummyBatchingDescriptor.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/DummyBatchingDescriptor.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/DummyBatchingDescriptor.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/RegexUtil.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/RequestContext.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/RequestContext.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/RequestContext.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/RequestContext.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/BulkMutation.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/BulkMutation.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/BulkMutation.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/BulkMutation.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/BulkMutationBatcher.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/BulkMutationBatcher.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/BulkMutationBatcher.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/BulkMutationBatcher.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutation.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutation.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutation.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutation.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapter.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapter.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapter.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapter.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Filters.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/InstanceName.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/InstanceName.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/InstanceName.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/InstanceName.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/KeyOffset.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/KeyOffset.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/KeyOffset.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/KeyOffset.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MutateRowsException.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MutateRowsException.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MutateRowsException.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MutateRowsException.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Mutation.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Mutation.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Mutation.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Mutation.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Range.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Range.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Range.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Range.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRow.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRow.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRow.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRow.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Row.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Row.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Row.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Row.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/RowAdapter.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/RowAdapter.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/RowAdapter.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/RowAdapter.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/RowCell.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/RowCell.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/RowCell.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/RowCell.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/RowMutation.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/RowMutation.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/RowMutation.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/RowMutation.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Validations.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Validations.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Validations.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Validations.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/package-info.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/package-info.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/package-info.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/package-info.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStub.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStub.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStub.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStub.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableCallableFactory.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableCallableFactory.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableCallableFactory.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableCallableFactory.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/BulkMutateRowsUserFacingCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/BulkMutateRowsUserFacingCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/BulkMutateRowsUserFacingCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/BulkMutateRowsUserFacingCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptor.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptor.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptor.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptor.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsRetryingCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsRetryingCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsRetryingCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsRetryingCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsUserFacingCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsUserFacingCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsUserFacingCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsUserFacingCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/package-info.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/package-info.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/package-info.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/package-info.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsResumptionStrategy.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsResumptionStrategy.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsResumptionStrategy.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsResumptionStrategy.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryCompletedCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryCompletedCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryCompletedCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryCompletedCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMerger.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMerger.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMerger.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMerger.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallable.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallable.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallable.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallable.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/StateMachine.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/StateMachine.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/StateMachine.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/StateMachine.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/package-info.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/package-info.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/package-info.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/readrows/package-info.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/package-info.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/package-info.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/package-info.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/package-info.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/IncompleteStreamException.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/IncompleteStreamException.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/IncompleteStreamException.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/IncompleteStreamException.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/Reframer.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/Reframer.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/Reframer.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/Reframer.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/package-info.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/package-info.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/package-info.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/package-info.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/retrying/ApiResultRetryAlgorithm.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/retrying/ApiResultRetryAlgorithm.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/retrying/ApiResultRetryAlgorithm.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/retrying/ApiResultRetryAlgorithm.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/retrying/NonCancellableFuture.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/retrying/NonCancellableFuture.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/retrying/NonCancellableFuture.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/retrying/NonCancellableFuture.java
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/package-info.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/package-info.java
similarity index 100%
rename from google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/package-info.java
rename to google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/package-info.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdmin.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdmin.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdmin.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdmin.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparatorTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparatorTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparatorTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/ByteStringComparatorTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/RegexUtilTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/RegexUtilTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/RegexUtilTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/RegexUtilTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BulkMutationBatcherIT.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BulkMutationBatcherIT.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BulkMutationBatcherIT.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BulkMutationBatcherIT.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/CheckAndMutateIT.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/CheckAndMutateIT.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/CheckAndMutateIT.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/CheckAndMutateIT.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/MutateRowIT.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/MutateRowIT.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/MutateRowIT.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/MutateRowIT.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ReadIT.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ReadIT.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ReadIT.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ReadIT.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ReadModifyWriteIT.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ReadModifyWriteIT.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ReadModifyWriteIT.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/ReadModifyWriteIT.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/SampleRowsIT.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/SampleRowsIT.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/SampleRowsIT.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/SampleRowsIT.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/Emulator.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/Emulator.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/Emulator.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/Emulator.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/EmulatorEnv.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/EmulatorEnv.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/EmulatorEnv.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/EmulatorEnv.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/ProdEnv.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/ProdEnv.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/ProdEnv.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/ProdEnv.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/TestEnv.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/TestEnv.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/TestEnv.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/TestEnv.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/TestEnvRule.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/TestEnvRule.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/TestEnvRule.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/env/TestEnvRule.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/BulkMutationTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/BulkMutationTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/BulkMutationTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/BulkMutationTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutationTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutationTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutationTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/ConditionalRowMutationTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapterTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapterTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapterTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/DefaultRowAdapterTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/FiltersTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/RangeTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/RangeTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/RangeTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/RangeTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRowTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRowTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRowTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/ReadModifyWriteRowTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/RowMutationTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/RowMutationTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/RowMutationTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/RowMutationTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/RowTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/RowTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/RowTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/RowTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallableTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallableTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallableTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/CheckAndMutateRowCallableTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettingsTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettingsTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettingsTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettingsTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallableTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallableTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallableTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/MutateRowCallableTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallableTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallableTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallableTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/ReadModifyWriteRowCallableTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/ResourceHeaderTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/ResourceHeaderTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/ResourceHeaderTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/ResourceHeaderTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallableTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallableTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallableTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/SampleRowKeysCallableTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/BulkMutateRowsRetryTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/BulkMutateRowsRetryTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/BulkMutateRowsRetryTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/BulkMutateRowsRetryTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallableTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallableTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallableTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsAttemptCallableTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptorTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptorTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptorTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptorTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallableTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallableTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallableTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/FilterMarkerRowsCallableTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallableTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallableTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallableTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsFirstCallableTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsRetryTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallableTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallableTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallableTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsUserCallableTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallableTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallableTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallableTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/RowMergingCallableTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStatusCode.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStatusCode.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStatusCode.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStatusCode.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStreamingApi.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStreamingApi.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStreamingApi.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStreamingApi.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/MockStreamingApi.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/MockStreamingApi.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/MockStreamingApi.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/MockStreamingApi.java
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/package-info.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/package-info.java
similarity index 100%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/package-info.java
rename to google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/package-info.java
diff --git a/google-cloud-bigtable/src/test/resources/com/google/cloud/bigtable/data/v2/stub/readrows/read-rows-acceptance-test.json b/google-cloud-clients/google-cloud-bigtable/src/test/resources/com/google/cloud/bigtable/data/v2/stub/readrows/read-rows-acceptance-test.json
similarity index 100%
rename from google-cloud-bigtable/src/test/resources/com/google/cloud/bigtable/data/v2/stub/readrows/read-rows-acceptance-test.json
rename to google-cloud-clients/google-cloud-bigtable/src/test/resources/com/google/cloud/bigtable/data/v2/stub/readrows/read-rows-acceptance-test.json
diff --git a/google-cloud-compute/README.md b/google-cloud-clients/google-cloud-compute/README.md
similarity index 100%
rename from google-cloud-compute/README.md
rename to google-cloud-clients/google-cloud-compute/README.md
diff --git a/google-cloud-compute/pom.xml b/google-cloud-clients/google-cloud-compute/pom.xml
similarity index 96%
rename from google-cloud-compute/pom.xml
rename to google-cloud-clients/google-cloud-compute/pom.xml
index 838b5aa4ec28..e9de3d618212 100644
--- a/google-cloud-compute/pom.xml
+++ b/google-cloud-clients/google-cloud-compute/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-compute
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Address.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Address.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Address.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Address.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AddressId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AddressId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AddressId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AddressId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AddressInfo.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AddressInfo.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AddressInfo.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AddressInfo.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AttachedDisk.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AttachedDisk.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AttachedDisk.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AttachedDisk.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Compute.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Compute.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Compute.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Compute.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeException.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeException.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeException.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeException.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeFactory.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeFactory.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeFactory.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeFactory.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeImpl.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeImpl.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeImpl.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeImpl.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeOptions.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeOptions.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeOptions.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ComputeOptions.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DeprecationStatus.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DeprecationStatus.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DeprecationStatus.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DeprecationStatus.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Disk.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Disk.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Disk.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Disk.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskConfiguration.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskConfiguration.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskConfiguration.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskConfiguration.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskImageConfiguration.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskImageConfiguration.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskImageConfiguration.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskImageConfiguration.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskInfo.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskInfo.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskInfo.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskInfo.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskType.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskType.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskType.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskType.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskTypeId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskTypeId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskTypeId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskTypeId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ForwardingRuleId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ForwardingRuleId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ForwardingRuleId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ForwardingRuleId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/GlobalAddressId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/GlobalAddressId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/GlobalAddressId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/GlobalAddressId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/GlobalForwardingRuleId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/GlobalForwardingRuleId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/GlobalForwardingRuleId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/GlobalForwardingRuleId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/GlobalOperationId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/GlobalOperationId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/GlobalOperationId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/GlobalOperationId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Image.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Image.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Image.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Image.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageConfiguration.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageConfiguration.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageConfiguration.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageConfiguration.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageDiskConfiguration.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageDiskConfiguration.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageDiskConfiguration.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageDiskConfiguration.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageInfo.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageInfo.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageInfo.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageInfo.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Instance.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Instance.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Instance.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Instance.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/InstanceId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/InstanceId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/InstanceId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/InstanceId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/InstanceInfo.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/InstanceInfo.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/InstanceInfo.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/InstanceInfo.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/License.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/License.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/License.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/License.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/LicenseId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/LicenseId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/LicenseId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/LicenseId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/MachineType.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/MachineType.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/MachineType.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/MachineType.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/MachineTypeId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/MachineTypeId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/MachineTypeId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/MachineTypeId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Metadata.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Metadata.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Metadata.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Metadata.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Network.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Network.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Network.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Network.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkConfiguration.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkConfiguration.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkConfiguration.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkConfiguration.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkInfo.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkInfo.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkInfo.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkInfo.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkInterface.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkInterface.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkInterface.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/NetworkInterface.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Operation.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Operation.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Operation.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Operation.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/OperationId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/OperationId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/OperationId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/OperationId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Option.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Option.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Option.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Option.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Region.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Region.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Region.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Region.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionAddressId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionAddressId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionAddressId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionAddressId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionForwardingRuleId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionForwardingRuleId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionForwardingRuleId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionForwardingRuleId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionOperationId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionOperationId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionOperationId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/RegionOperationId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ResourceId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ResourceId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ResourceId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ResourceId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SchedulingOptions.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SchedulingOptions.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SchedulingOptions.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SchedulingOptions.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ServiceAccount.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ServiceAccount.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ServiceAccount.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ServiceAccount.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Snapshot.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Snapshot.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Snapshot.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Snapshot.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SnapshotDiskConfiguration.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SnapshotDiskConfiguration.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SnapshotDiskConfiguration.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SnapshotDiskConfiguration.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SnapshotId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SnapshotId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SnapshotId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SnapshotId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SnapshotInfo.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SnapshotInfo.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SnapshotInfo.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SnapshotInfo.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/StandardDiskConfiguration.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/StandardDiskConfiguration.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/StandardDiskConfiguration.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/StandardDiskConfiguration.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/StandardNetworkConfiguration.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/StandardNetworkConfiguration.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/StandardNetworkConfiguration.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/StandardNetworkConfiguration.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/StorageImageConfiguration.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/StorageImageConfiguration.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/StorageImageConfiguration.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/StorageImageConfiguration.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SubnetNetworkConfiguration.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SubnetNetworkConfiguration.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SubnetNetworkConfiguration.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SubnetNetworkConfiguration.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Subnetwork.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Subnetwork.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Subnetwork.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Subnetwork.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SubnetworkId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SubnetworkId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SubnetworkId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SubnetworkId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SubnetworkInfo.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SubnetworkInfo.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SubnetworkInfo.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/SubnetworkInfo.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Tags.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Tags.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Tags.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Tags.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Zone.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Zone.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Zone.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/Zone.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ZoneId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ZoneId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ZoneId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ZoneId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ZoneOperationId.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ZoneOperationId.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ZoneOperationId.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ZoneOperationId.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/package-info.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/package-info.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/package-info.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/package-info.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/ComputeRpcFactory.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/ComputeRpcFactory.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/ComputeRpcFactory.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/ComputeRpcFactory.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/v1/ComputeRpc.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/v1/ComputeRpc.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/v1/ComputeRpc.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/v1/ComputeRpc.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/v1/HttpComputeRpc.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/v1/HttpComputeRpc.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/v1/HttpComputeRpc.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/v1/HttpComputeRpc.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/testing/RemoteComputeHelper.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/testing/RemoteComputeHelper.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/testing/RemoteComputeHelper.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/testing/RemoteComputeHelper.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/testing/ResourceCleaner.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/testing/ResourceCleaner.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/testing/ResourceCleaner.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/testing/ResourceCleaner.java
diff --git a/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/testing/package-info.java b/google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/testing/package-info.java
similarity index 100%
rename from google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/testing/package-info.java
rename to google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/testing/package-info.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AddressIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AddressIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AddressIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AddressIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AddressInfoTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AddressInfoTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AddressInfoTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AddressInfoTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AddressTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AddressTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AddressTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AddressTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AttachedDiskTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AttachedDiskTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AttachedDiskTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/AttachedDiskTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeExceptionTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeExceptionTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeExceptionTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeExceptionTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeImplTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeImplTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeImplTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeImplTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeOptionsTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeOptionsTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeOptionsTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ComputeOptionsTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DeprecationStatusTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DeprecationStatusTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DeprecationStatusTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DeprecationStatusTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskImageConfigurationTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskImageConfigurationTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskImageConfigurationTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskImageConfigurationTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskInfoTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskInfoTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskInfoTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskInfoTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskTypeIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskTypeIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskTypeIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskTypeIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskTypeTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskTypeTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskTypeTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/DiskTypeTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ForwardingRuleIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ForwardingRuleIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ForwardingRuleIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ForwardingRuleIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageDiskConfigurationTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageDiskConfigurationTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageDiskConfigurationTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageDiskConfigurationTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageInfoTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageInfoTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageInfoTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageInfoTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ImageTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/InstanceIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/InstanceIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/InstanceIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/InstanceIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/InstanceInfoTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/InstanceInfoTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/InstanceInfoTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/InstanceInfoTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/InstanceTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/InstanceTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/InstanceTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/InstanceTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/LicenseIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/LicenseIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/LicenseIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/LicenseIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/LicenseTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/LicenseTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/LicenseTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/LicenseTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/MachineTypeIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/MachineTypeIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/MachineTypeIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/MachineTypeIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/MachineTypeTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/MachineTypeTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/MachineTypeTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/MachineTypeTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/MetadataTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/MetadataTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/MetadataTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/MetadataTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkInfoTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkInfoTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkInfoTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkInfoTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkInterfaceTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkInterfaceTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkInterfaceTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkInterfaceTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/NetworkTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/OperationIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/OperationIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/OperationIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/OperationIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/OperationTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/OperationTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/OperationTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/OperationTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/RegionIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/RegionIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/RegionIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/RegionIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/RegionTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/RegionTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/RegionTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/RegionTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SchedulingOptionsTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SchedulingOptionsTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SchedulingOptionsTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SchedulingOptionsTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SerializationTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SerializationTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SerializationTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SerializationTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ServiceAccountTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ServiceAccountTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ServiceAccountTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ServiceAccountTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotDiskConfigurationTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotDiskConfigurationTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotDiskConfigurationTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotDiskConfigurationTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotInfoTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotInfoTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotInfoTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotInfoTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SnapshotTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/StandardDiskConfigurationTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/StandardDiskConfigurationTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/StandardDiskConfigurationTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/StandardDiskConfigurationTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/StandardNetworkConfigurationTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/StandardNetworkConfigurationTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/StandardNetworkConfigurationTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/StandardNetworkConfigurationTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/StorageImageConfigurationTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/StorageImageConfigurationTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/StorageImageConfigurationTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/StorageImageConfigurationTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetNetworkConfigurationTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetNetworkConfigurationTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetNetworkConfigurationTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetNetworkConfigurationTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetworkIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetworkIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetworkIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetworkIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetworkInfoTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetworkInfoTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetworkInfoTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetworkInfoTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetworkTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetworkTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetworkTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/SubnetworkTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/TagsTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/TagsTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/TagsTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/TagsTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ZoneIdTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ZoneIdTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ZoneIdTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ZoneIdTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ZoneTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ZoneTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ZoneTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/ZoneTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/it/ITComputeTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/it/ITComputeTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/it/ITComputeTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/it/ITComputeTest.java
diff --git a/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/testing/RemoteComputeHelperTest.java b/google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/testing/RemoteComputeHelperTest.java
similarity index 100%
rename from google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/testing/RemoteComputeHelperTest.java
rename to google-cloud-clients/google-cloud-compute/src/test/java/com/google/cloud/compute/deprecated/testing/RemoteComputeHelperTest.java
diff --git a/google-cloud-container/README.md b/google-cloud-clients/google-cloud-container/README.md
similarity index 100%
rename from google-cloud-container/README.md
rename to google-cloud-clients/google-cloud-container/README.md
diff --git a/google-cloud-container/pom.xml b/google-cloud-clients/google-cloud-container/pom.xml
similarity index 97%
rename from google-cloud-container/pom.xml
rename to google-cloud-clients/google-cloud-container/pom.xml
index 2510281a5580..9764aaa3afbe 100644
--- a/google-cloud-container/pom.xml
+++ b/google-cloud-clients/google-cloud-container/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-container
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java
similarity index 100%
rename from google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java
rename to google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java
similarity index 100%
rename from google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java
rename to google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerSettings.java
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/SampleApp.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/SampleApp.java
similarity index 100%
rename from google-cloud-container/src/main/java/com/google/cloud/container/v1/SampleApp.java
rename to google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/SampleApp.java
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/package-info.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/package-info.java
similarity index 100%
rename from google-cloud-container/src/main/java/com/google/cloud/container/v1/package-info.java
rename to google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/package-info.java
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java
similarity index 100%
rename from google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java
rename to google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java
similarity index 100%
rename from google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java
rename to google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStubSettings.java
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java
similarity index 100%
rename from google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java
rename to google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java
diff --git a/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java
similarity index 100%
rename from google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java
rename to google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java
diff --git a/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java b/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java
similarity index 100%
rename from google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java
rename to google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java
diff --git a/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerSmokeTest.java b/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerSmokeTest.java
similarity index 100%
rename from google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerSmokeTest.java
rename to google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerSmokeTest.java
diff --git a/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManager.java b/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManager.java
similarity index 100%
rename from google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManager.java
rename to google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManager.java
diff --git a/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManagerImpl.java b/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManagerImpl.java
similarity index 100%
rename from google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManagerImpl.java
rename to google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManagerImpl.java
diff --git a/google-cloud-contrib/README.md b/google-cloud-clients/google-cloud-contrib/README.md
similarity index 100%
rename from google-cloud-contrib/README.md
rename to google-cloud-clients/google-cloud-contrib/README.md
diff --git a/google-cloud-contrib/google-cloud-logging-logback/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md
similarity index 100%
rename from google-cloud-contrib/google-cloud-logging-logback/README.md
rename to google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md
diff --git a/google-cloud-contrib/google-cloud-logging-logback/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
similarity index 100%
rename from google-cloud-contrib/google-cloud-logging-logback/pom.xml
rename to google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java
diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingEventEnhancer.java
diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/example/enhancers/AnotherTestLoggingEnhancer.java
diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/example/enhancers/TestLoggingEnhancer.java b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/example/enhancers/TestLoggingEnhancer.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/example/enhancers/TestLoggingEnhancer.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/example/enhancers/TestLoggingEnhancer.java
diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java
diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/StackTraceTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/StackTraceTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/StackTraceTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/logback/StackTraceTest.java
diff --git a/google-cloud-contrib/google-cloud-nio-examples/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio-examples/README.md
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
diff --git a/google-cloud-contrib/google-cloud-nio-examples/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio-examples/pom.xml
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
diff --git a/google-cloud-contrib/google-cloud-nio-examples/src/main/java/com/google/cloud/nio/examples/ListFilesystems.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/src/main/java/com/google/cloud/nio/examples/ListFilesystems.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio-examples/src/main/java/com/google/cloud/nio/examples/ListFilesystems.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/src/main/java/com/google/cloud/nio/examples/ListFilesystems.java
diff --git a/google-cloud-contrib/google-cloud-nio/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/README.md
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md
diff --git a/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
similarity index 99%
rename from google-cloud-contrib/google-cloud-nio/pom.xml
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
index 79b6b9b85b2c..9fd6307835d4 100644
--- a/google-cloud-contrib/google-cloud-nio/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.47.1-alpha-SNAPSHOT
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-nio
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageConfiguration.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageConfiguration.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageConfiguration.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageConfiguration.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeView.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeView.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeView.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeView.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectAttributes.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectAttributes.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectAttributes.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectAttributes.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectImmutableException.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectImmutableException.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectImmutableException.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageObjectImmutableException.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOption.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOption.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOption.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOption.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOptions.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOptions.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOptions.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageOptions.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePath.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePath.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePath.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePath.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryAttributes.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryAttributes.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryAttributes.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryAttributes.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryException.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryException.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryException.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePseudoDirectoryException.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannel.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannel.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannel.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannel.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageRetryHandler.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageRetryHandler.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageRetryHandler.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageRetryHandler.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageUtil.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageUtil.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageUtil.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageUtil.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannel.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannel.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannel.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannel.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionAcl.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionAcl.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionAcl.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionAcl.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionBlockSize.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionBlockSize.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionBlockSize.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionBlockSize.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionCacheControl.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionCacheControl.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionCacheControl.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionCacheControl.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentDisposition.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentDisposition.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentDisposition.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentDisposition.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentEncoding.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentEncoding.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentEncoding.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionContentEncoding.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMaxChannelReopens.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMaxChannelReopens.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMaxChannelReopens.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMaxChannelReopens.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMimeType.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMimeType.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMimeType.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionMimeType.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionUserMetadata.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionUserMetadata.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionUserMetadata.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/OptionUserMetadata.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/SeekableByteChannelPrefetcher.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/SeekableByteChannelPrefetcher.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/SeekableByteChannelPrefetcher.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/SeekableByteChannelPrefetcher.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/UnixPath.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/UnixPath.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/UnixPath.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/UnixPath.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/package-info.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/package-info.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/package-info.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/package-info.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelper.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelper.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelper.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelper.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageConfigurationTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageConfigurationTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageConfigurationTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageConfigurationTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributeViewTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributesTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageLateInitializationTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageLateInitializationTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageLateInitializationTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageLateInitializationTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageOptionsTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageOptionsTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageOptionsTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageOptionsTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStoragePathTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannelTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannelTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannelTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadChannelTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageReadTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannelTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannelTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannelTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageWriteChannelTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/SeekableByteChannelPrefetcherTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/SeekableByteChannelPrefetcherTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/SeekableByteChannelPrefetcherTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/SeekableByteChannelPrefetcherTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/UnixPathTest.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/UnixPathTest.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/UnixPathTest.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/UnixPathTest.java
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
similarity index 100%
rename from google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
rename to google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
diff --git a/google-cloud-contrib/pom.xml b/google-cloud-clients/google-cloud-contrib/pom.xml
similarity index 94%
rename from google-cloud-contrib/pom.xml
rename to google-cloud-clients/google-cloud-contrib/pom.xml
index 9c78c8381cdd..4bf5d6e32332 100644
--- a/google-cloud-contrib/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-contrib
diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-clients/google-cloud-core-grpc/pom.xml
similarity index 97%
rename from google-cloud-core-grpc/pom.xml
rename to google-cloud-clients/google-cloud-core-grpc/pom.xml
index bbd1adb19f0a..dfbbbf5b0d0e 100644
--- a/google-cloud-core-grpc/pom.xml
+++ b/google-cloud-clients/google-cloud-core-grpc/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-core-grpc
diff --git a/google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/BaseGrpcServiceException.java b/google-cloud-clients/google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/BaseGrpcServiceException.java
similarity index 100%
rename from google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/BaseGrpcServiceException.java
rename to google-cloud-clients/google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/BaseGrpcServiceException.java
diff --git a/google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/GrpcTransportOptions.java b/google-cloud-clients/google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/GrpcTransportOptions.java
similarity index 100%
rename from google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/GrpcTransportOptions.java
rename to google-cloud-clients/google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/GrpcTransportOptions.java
diff --git a/google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/BaseGrpcServiceExceptionTest.java b/google-cloud-clients/google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/BaseGrpcServiceExceptionTest.java
similarity index 100%
rename from google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/BaseGrpcServiceExceptionTest.java
rename to google-cloud-clients/google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/BaseGrpcServiceExceptionTest.java
diff --git a/google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/GrpcTransportOptionsTest.java b/google-cloud-clients/google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/GrpcTransportOptionsTest.java
similarity index 100%
rename from google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/GrpcTransportOptionsTest.java
rename to google-cloud-clients/google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/GrpcTransportOptionsTest.java
diff --git a/google-cloud-core-http/pom.xml b/google-cloud-clients/google-cloud-core-http/pom.xml
similarity index 98%
rename from google-cloud-core-http/pom.xml
rename to google-cloud-clients/google-cloud-core-http/pom.xml
index 44f19bce2aad..46149f6639c5 100644
--- a/google-cloud-core-http/pom.xml
+++ b/google-cloud-clients/google-cloud-core-http/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-core-http
diff --git a/google-cloud-core-http/src/main/java/com/google/cloud/http/BaseHttpServiceException.java b/google-cloud-clients/google-cloud-core-http/src/main/java/com/google/cloud/http/BaseHttpServiceException.java
similarity index 100%
rename from google-cloud-core-http/src/main/java/com/google/cloud/http/BaseHttpServiceException.java
rename to google-cloud-clients/google-cloud-core-http/src/main/java/com/google/cloud/http/BaseHttpServiceException.java
diff --git a/google-cloud-core-http/src/main/java/com/google/cloud/http/CensusHttpModule.java b/google-cloud-clients/google-cloud-core-http/src/main/java/com/google/cloud/http/CensusHttpModule.java
similarity index 100%
rename from google-cloud-core-http/src/main/java/com/google/cloud/http/CensusHttpModule.java
rename to google-cloud-clients/google-cloud-core-http/src/main/java/com/google/cloud/http/CensusHttpModule.java
diff --git a/google-cloud-core-http/src/main/java/com/google/cloud/http/HttpTransportOptions.java b/google-cloud-clients/google-cloud-core-http/src/main/java/com/google/cloud/http/HttpTransportOptions.java
similarity index 100%
rename from google-cloud-core-http/src/main/java/com/google/cloud/http/HttpTransportOptions.java
rename to google-cloud-clients/google-cloud-core-http/src/main/java/com/google/cloud/http/HttpTransportOptions.java
diff --git a/google-cloud-core-http/src/test/java/com/google/cloud/http/BaseHttpServiceExceptionTest.java b/google-cloud-clients/google-cloud-core-http/src/test/java/com/google/cloud/http/BaseHttpServiceExceptionTest.java
similarity index 100%
rename from google-cloud-core-http/src/test/java/com/google/cloud/http/BaseHttpServiceExceptionTest.java
rename to google-cloud-clients/google-cloud-core-http/src/test/java/com/google/cloud/http/BaseHttpServiceExceptionTest.java
diff --git a/google-cloud-core-http/src/test/java/com/google/cloud/http/CensusHttpModuleTest.java b/google-cloud-clients/google-cloud-core-http/src/test/java/com/google/cloud/http/CensusHttpModuleTest.java
similarity index 100%
rename from google-cloud-core-http/src/test/java/com/google/cloud/http/CensusHttpModuleTest.java
rename to google-cloud-clients/google-cloud-core-http/src/test/java/com/google/cloud/http/CensusHttpModuleTest.java
diff --git a/google-cloud-core-http/src/test/java/com/google/cloud/http/HttpTransportOptionsTest.java b/google-cloud-clients/google-cloud-core-http/src/test/java/com/google/cloud/http/HttpTransportOptionsTest.java
similarity index 100%
rename from google-cloud-core-http/src/test/java/com/google/cloud/http/HttpTransportOptionsTest.java
rename to google-cloud-clients/google-cloud-core-http/src/test/java/com/google/cloud/http/HttpTransportOptionsTest.java
diff --git a/google-cloud-core/README.md b/google-cloud-clients/google-cloud-core/README.md
similarity index 100%
rename from google-cloud-core/README.md
rename to google-cloud-clients/google-cloud-core/README.md
diff --git a/google-cloud-core/pom.xml b/google-cloud-clients/google-cloud-core/pom.xml
similarity index 97%
rename from google-cloud-core/pom.xml
rename to google-cloud-clients/google-cloud-core/pom.xml
index 583c810cfbfc..e8930bf751c0 100644
--- a/google-cloud-core/pom.xml
+++ b/google-cloud-clients/google-cloud-core/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-core
diff --git a/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/BaseService.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BaseService.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/BaseService.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BaseService.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/BaseServiceException.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BaseServiceException.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/BaseServiceException.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BaseServiceException.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/BaseWriteChannel.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BaseWriteChannel.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/BaseWriteChannel.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BaseWriteChannel.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/BatchResult.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BatchResult.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/BatchResult.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BatchResult.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/BillingName.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BillingName.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/BillingName.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BillingName.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ByteArray.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ByteArray.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/ByteArray.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ByteArray.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/Date.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Date.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/Date.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Date.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ExceptionHandler.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ExceptionHandler.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/ExceptionHandler.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ExceptionHandler.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/FieldSelector.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/FieldSelector.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/FieldSelector.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/FieldSelector.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/FolderName.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/FolderName.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/FolderName.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/FolderName.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/GcpLaunchStage.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/GcpLaunchStage.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/GcpLaunchStage.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/GcpLaunchStage.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/Identity.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Identity.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/Identity.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Identity.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/MonitoredResource.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MonitoredResource.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/MonitoredResource.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MonitoredResource.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/NoCredentials.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/NoCredentials.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/NoCredentials.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/NoCredentials.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/OrganizationName.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/OrganizationName.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/OrganizationName.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/OrganizationName.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/PageImpl.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/PageImpl.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/PageImpl.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/PageImpl.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ParentName.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ParentName.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/ParentName.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ParentName.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ParentNames.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ParentNames.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/ParentNames.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ParentNames.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/PlatformInformation.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/PlatformInformation.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/PlatformInformation.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/PlatformInformation.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/Policy.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Policy.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/Policy.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Policy.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ProjectName.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ProjectName.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/ProjectName.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ProjectName.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ReadChannel.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ReadChannel.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/ReadChannel.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ReadChannel.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/Restorable.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Restorable.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/Restorable.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Restorable.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/RestorableState.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/RestorableState.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/RestorableState.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/RestorableState.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/RetryHelper.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/RetryHelper.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/RetryHelper.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/RetryHelper.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/RetryOption.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/RetryOption.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/RetryOption.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/RetryOption.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/Role.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Role.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/Role.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Role.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/Service.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Service.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/Service.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Service.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceDefaults.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ServiceDefaults.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/ServiceDefaults.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ServiceDefaults.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceFactory.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ServiceFactory.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/ServiceFactory.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ServiceFactory.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceRpc.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ServiceRpc.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/ServiceRpc.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ServiceRpc.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/StringEnumType.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/StringEnumType.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/StringEnumType.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/StringEnumType.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/StringEnumValue.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/StringEnumValue.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/StringEnumValue.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/StringEnumValue.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/Timestamp.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/TransportOptions.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/TransportOptions.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/TransportOptions.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/TransportOptions.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/Tuple.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Tuple.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/Tuple.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Tuple.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/UntypedParentName.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/UntypedParentName.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/UntypedParentName.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/UntypedParentName.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/WriteChannel.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/WriteChannel.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/WriteChannel.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/WriteChannel.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/package-info.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/package-info.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/package-info.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/package-info.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/spi/ServiceRpcFactory.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/spi/ServiceRpcFactory.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/spi/ServiceRpcFactory.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/spi/ServiceRpcFactory.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/testing/BlockingProcessStreamReader.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/testing/BlockingProcessStreamReader.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/testing/BlockingProcessStreamReader.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/testing/BlockingProcessStreamReader.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/testing/CommandWrapper.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/testing/CommandWrapper.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/testing/CommandWrapper.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/testing/CommandWrapper.java
diff --git a/google-cloud-core/src/main/java/com/google/cloud/testing/Version.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/testing/Version.java
similarity index 100%
rename from google-cloud-core/src/main/java/com/google/cloud/testing/Version.java
rename to google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/testing/Version.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/AsyncPageImplTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/AsyncPageImplTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/AsyncPageImplTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/AsyncPageImplTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/BaseSerializationTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/BaseSerializationTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/BaseSerializationTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/BaseSerializationTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/BaseServiceExceptionTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/BaseServiceExceptionTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/BaseServiceExceptionTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/BaseServiceExceptionTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/BatchResultTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/BatchResultTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/BatchResultTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/BatchResultTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/ByteArrayTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/ByteArrayTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/ByteArrayTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/ByteArrayTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/DateTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/DateTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/DateTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/DateTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/FieldSelectorHelperTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/FieldSelectorHelperTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/FieldSelectorHelperTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/FieldSelectorHelperTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/MonitoredResourceDescriptorTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/MonitoredResourceDescriptorTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/MonitoredResourceDescriptorTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/MonitoredResourceDescriptorTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/MonitoredResourceTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/MonitoredResourceTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/MonitoredResourceTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/MonitoredResourceTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/PageImplTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/PageImplTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/PageImplTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/PageImplTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/PolicyTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/PolicyTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/PolicyTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/PolicyTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/RetryOptionTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/RetryOptionTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/RetryOptionTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/RetryOptionTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/RoleTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/RoleTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/RoleTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/RoleTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/SerializationTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/SerializationTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/SerializationTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/SerializationTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/testing/BlockingProcessStreamReaderTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/testing/BlockingProcessStreamReaderTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/testing/BlockingProcessStreamReaderTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/testing/BlockingProcessStreamReaderTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/testing/CommandWrapperTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/testing/CommandWrapperTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/testing/CommandWrapperTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/testing/CommandWrapperTest.java
diff --git a/google-cloud-core/src/test/java/com/google/cloud/testing/VersionTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/testing/VersionTest.java
similarity index 100%
rename from google-cloud-core/src/test/java/com/google/cloud/testing/VersionTest.java
rename to google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/testing/VersionTest.java
diff --git a/google-cloud-dataproc/README.md b/google-cloud-clients/google-cloud-dataproc/README.md
similarity index 100%
rename from google-cloud-dataproc/README.md
rename to google-cloud-clients/google-cloud-dataproc/README.md
diff --git a/google-cloud-dataproc/pom.xml b/google-cloud-clients/google-cloud-dataproc/pom.xml
similarity index 97%
rename from google-cloud-dataproc/pom.xml
rename to google-cloud-clients/google-cloud-dataproc/pom.xml
index 451b84bbcbdb..c06748864142 100644
--- a/google-cloud-dataproc/pom.xml
+++ b/google-cloud-clients/google-cloud-dataproc/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-dataproc
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerClient.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerClient.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerClient.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerClient.java
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerSettings.java
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/package-info.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/package-info.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/package-info.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/package-info.java
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStub.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStub.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStub.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStub.java
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerCallableFactory.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerCallableFactory.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerCallableFactory.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerCallableFactory.java
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerCallableFactory.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerCallableFactory.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerCallableFactory.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerCallableFactory.java
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerStub.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerStub.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerStub.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerStub.java
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStub.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStub.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStub.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStub.java
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java
similarity index 100%
rename from google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java
rename to google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/JobControllerStubSettings.java
diff --git a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java
similarity index 100%
rename from google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java
rename to google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java
diff --git a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerSmokeTest.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerSmokeTest.java
similarity index 100%
rename from google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerSmokeTest.java
rename to google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerSmokeTest.java
diff --git a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java
similarity index 100%
rename from google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java
rename to google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java
diff --git a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterController.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterController.java
similarity index 100%
rename from google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterController.java
rename to google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterController.java
diff --git a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterControllerImpl.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterControllerImpl.java
similarity index 100%
rename from google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterControllerImpl.java
rename to google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterControllerImpl.java
diff --git a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobController.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobController.java
similarity index 100%
rename from google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobController.java
rename to google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobController.java
diff --git a/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobControllerImpl.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobControllerImpl.java
similarity index 100%
rename from google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobControllerImpl.java
rename to google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobControllerImpl.java
diff --git a/google-cloud-datastore/README.md b/google-cloud-clients/google-cloud-datastore/README.md
similarity index 100%
rename from google-cloud-datastore/README.md
rename to google-cloud-clients/google-cloud-datastore/README.md
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-clients/google-cloud-datastore/pom.xml
similarity index 96%
rename from google-cloud-datastore/pom.xml
rename to google-cloud-clients/google-cloud-datastore/pom.xml
index c3cba7785987..1b9d8dde869c 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-clients/google-cloud-datastore/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseDatastoreBatchWriter.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Batch.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BatchImpl.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreFactory.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreHelper.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReaderWriter.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreWriter.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyFactory.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResults.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/QueryResultsImpl.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TimestampValue.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Transaction.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionImpl.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Validator.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueBuilder.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/package-info.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DatastoreRpcFactory.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/DatastoreRpc.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/HttpDatastoreRpc.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java b/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
rename to google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/package-info.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseDatastoreBatchWriterTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BlobValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BooleanValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/CursorTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreHelperTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/DoubleValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/EntityValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/FullEntityTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/IncompleteKeyTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyFactoryTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/KeyValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LatLngValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ListValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/LongValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/NullValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/PathElementTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ProjectionEntityTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/RawValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/SerializationTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StringValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TimestampValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/TransactionExceptionHandlerTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java b/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
similarity index 100%
rename from google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
rename to google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
diff --git a/google-cloud-dialogflow/README.md b/google-cloud-clients/google-cloud-dialogflow/README.md
similarity index 100%
rename from google-cloud-dialogflow/README.md
rename to google-cloud-clients/google-cloud-dialogflow/README.md
diff --git a/google-cloud-dialogflow/pom.xml b/google-cloud-clients/google-cloud-dialogflow/pom.xml
similarity index 97%
rename from google-cloud-dialogflow/pom.xml
rename to google-cloud-clients/google-cloud-dialogflow/pom.xml
index 84305502dfc6..013b6c9c78bb 100644
--- a/google-cloud-dialogflow/pom.xml
+++ b/google-cloud-clients/google-cloud-dialogflow/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-dialogflow
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ContextsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ContextsClient.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ContextsClient.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ContextsClient.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ContextsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ContextsSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ContextsSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ContextsSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClient.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClient.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClient.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/package-info.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/package-info.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/package-info.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/package-info.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStubSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStubSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/ContextsStubSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsCallableFactory.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsCallableFactory.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsCallableFactory.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsCallableFactory.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsCallableFactory.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsCallableFactory.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesCallableFactory.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesCallableFactory.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesCallableFactory.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsCallableFactory.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsCallableFactory.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsCallableFactory.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesCallableFactory.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesCallableFactory.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesCallableFactory.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsCallableFactory.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsCallableFactory.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsCallableFactory.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStubSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStubSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionEntityTypesStubSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionsStubSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionsStubSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/SessionsStubSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsCallableFactory.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsCallableFactory.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsCallableFactory.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsCallableFactory.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsCallableFactory.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsCallableFactory.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesCallableFactory.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesCallableFactory.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesCallableFactory.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsCallableFactory.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsCallableFactory.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsCallableFactory.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesCallableFactory.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesCallableFactory.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesCallableFactory.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsCallableFactory.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsCallableFactory.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsCallableFactory.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStub.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStub.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStub.java
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStubSettings.java
similarity index 100%
rename from google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStubSettings.java
rename to google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStubSettings.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ContextsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ContextsClientTest.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ContextsClientTest.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ContextsClientTest.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/EntityTypesClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/EntityTypesClientTest.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/EntityTypesClientTest.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/EntityTypesClientTest.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/IntentsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/IntentsClientTest.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/IntentsClientTest.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/IntentsClientTest.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgents.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgents.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgents.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgents.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgentsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgentsImpl.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgentsImpl.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgentsImpl.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContexts.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContexts.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContexts.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContexts.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContextsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContextsImpl.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContextsImpl.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContextsImpl.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypes.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypes.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypes.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypes.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypesImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypesImpl.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypesImpl.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypesImpl.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntents.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntents.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntents.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntents.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntentsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntentsImpl.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntentsImpl.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntentsImpl.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypes.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypes.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypes.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypes.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypesImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypesImpl.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypesImpl.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypesImpl.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessions.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessions.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessions.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessions.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionsImpl.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionsImpl.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionsImpl.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClientTest.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClientTest.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClientTest.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionsClientTest.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionsClientTest.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionsClientTest.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgents.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgents.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgents.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgents.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgentsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgentsImpl.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgentsImpl.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgentsImpl.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContexts.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContexts.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContexts.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContexts.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContextsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContextsImpl.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContextsImpl.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContextsImpl.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypes.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypes.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypes.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypes.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypesImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypesImpl.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypesImpl.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypesImpl.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntents.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntents.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntents.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntents.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntentsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntentsImpl.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntentsImpl.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntentsImpl.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypes.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypes.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypes.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypes.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypesImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypesImpl.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypesImpl.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypesImpl.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessions.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessions.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessions.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessions.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionsImpl.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionsImpl.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionsImpl.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java
similarity index 100%
rename from google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java
rename to google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java
diff --git a/google-cloud-dlp/README.md b/google-cloud-clients/google-cloud-dlp/README.md
similarity index 100%
rename from google-cloud-dlp/README.md
rename to google-cloud-clients/google-cloud-dlp/README.md
diff --git a/google-cloud-dlp/pom.xml b/google-cloud-clients/google-cloud-dlp/pom.xml
similarity index 97%
rename from google-cloud-dlp/pom.xml
rename to google-cloud-clients/google-cloud-dlp/pom.xml
index ac626f19908f..a744eabf8848 100644
--- a/google-cloud-dlp/pom.xml
+++ b/google-cloud-clients/google-cloud-dlp/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-dlp-v2beta1
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceClient.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceClient.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceClient.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceClient.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceSettings.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceSettings.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceSettings.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceSettings.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/package-info.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/package-info.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/package-info.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/package-info.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStub.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStub.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStub.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStub.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStubSettings.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStubSettings.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStubSettings.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStubSettings.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceCallableFactory.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceCallableFactory.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceCallableFactory.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceStub.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceStub.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceStub.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceStub.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceClient.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceClient.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceClient.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceClient.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceSettings.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceSettings.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceSettings.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceSettings.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/package-info.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/package-info.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/package-info.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/package-info.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStub.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStub.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStub.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStub.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStubSettings.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStubSettings.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStubSettings.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStubSettings.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceCallableFactory.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceCallableFactory.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceCallableFactory.java
diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceStub.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceStub.java
similarity index 100%
rename from google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceStub.java
rename to google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceStub.java
diff --git a/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/DlpServiceClientTest.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/DlpServiceClientTest.java
similarity index 100%
rename from google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/DlpServiceClientTest.java
rename to google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/DlpServiceClientTest.java
diff --git a/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpService.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpService.java
similarity index 100%
rename from google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpService.java
rename to google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpService.java
diff --git a/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpServiceImpl.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpServiceImpl.java
similarity index 100%
rename from google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpServiceImpl.java
rename to google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpServiceImpl.java
diff --git a/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java
similarity index 100%
rename from google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java
rename to google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java
diff --git a/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceClientTest.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceClientTest.java
similarity index 100%
rename from google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceClientTest.java
rename to google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceClientTest.java
diff --git a/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceSmokeTest.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceSmokeTest.java
similarity index 100%
rename from google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceSmokeTest.java
rename to google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceSmokeTest.java
diff --git a/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpService.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpService.java
similarity index 100%
rename from google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpService.java
rename to google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpService.java
diff --git a/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpServiceImpl.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpServiceImpl.java
similarity index 100%
rename from google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpServiceImpl.java
rename to google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpServiceImpl.java
diff --git a/google-cloud-dns/README.md b/google-cloud-clients/google-cloud-dns/README.md
similarity index 100%
rename from google-cloud-dns/README.md
rename to google-cloud-clients/google-cloud-dns/README.md
diff --git a/google-cloud-dns/pom.xml b/google-cloud-clients/google-cloud-dns/pom.xml
similarity index 96%
rename from google-cloud-dns/pom.xml
rename to google-cloud-clients/google-cloud-dns/pom.xml
index 2c1e1b8d25cf..a83aaf030ada 100644
--- a/google-cloud-dns/pom.xml
+++ b/google-cloud-clients/google-cloud-dns/pom.xml
@@ -13,8 +13,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-dns
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequest.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequest.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequest.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequest.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/Dns.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/Dns.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/Dns.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/Dns.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsBatch.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsBatch.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/DnsBatch.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsBatch.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsBatchResult.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsBatchResult.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/DnsBatchResult.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsBatchResult.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsException.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsException.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/DnsException.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsException.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsFactory.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsFactory.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/DnsFactory.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsFactory.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsImpl.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsImpl.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/DnsImpl.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsImpl.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsOptions.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsOptions.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/DnsOptions.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/DnsOptions.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/Option.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/Option.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/Option.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/Option.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/ProjectInfo.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ProjectInfo.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/ProjectInfo.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ProjectInfo.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/RecordSet.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/RecordSet.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/RecordSet.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/RecordSet.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/Zone.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/Zone.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/Zone.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/Zone.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/package-info.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/package-info.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/package-info.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/package-info.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/DnsRpcFactory.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/DnsRpcFactory.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/spi/DnsRpcFactory.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/DnsRpcFactory.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/DnsRpc.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/DnsRpc.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/DnsRpc.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/DnsRpc.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/HttpDnsRpc.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/HttpDnsRpc.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/HttpDnsRpc.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/HttpDnsRpc.java
diff --git a/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/RpcBatch.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/RpcBatch.java
similarity index 100%
rename from google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/RpcBatch.java
rename to google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/RpcBatch.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/ChangeRequestInfoTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/ChangeRequestInfoTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/ChangeRequestInfoTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/ChangeRequestInfoTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/ChangeRequestTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/ChangeRequestTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/ChangeRequestTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/ChangeRequestTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsBatchResultTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsBatchResultTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/DnsBatchResultTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsBatchResultTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsBatchTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsBatchTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/DnsBatchTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsBatchTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsExceptionTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsExceptionTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/DnsExceptionTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsExceptionTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsImplTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsImplTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/DnsImplTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsImplTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsOptionsTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsOptionsTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/DnsOptionsTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsOptionsTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/DnsTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/DnsTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/OptionTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/OptionTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/OptionTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/OptionTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/ProjectInfoTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/ProjectInfoTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/ProjectInfoTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/ProjectInfoTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/RecordSetTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/RecordSetTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/RecordSetTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/RecordSetTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/SerializationTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/SerializationTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/SerializationTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/SerializationTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/ZoneInfoTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/ZoneInfoTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/ZoneInfoTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/ZoneInfoTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/ZoneTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/ZoneTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/ZoneTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/ZoneTest.java
diff --git a/google-cloud-dns/src/test/java/com/google/cloud/dns/it/ITDnsTest.java b/google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/it/ITDnsTest.java
similarity index 100%
rename from google-cloud-dns/src/test/java/com/google/cloud/dns/it/ITDnsTest.java
rename to google-cloud-clients/google-cloud-dns/src/test/java/com/google/cloud/dns/it/ITDnsTest.java
diff --git a/google-cloud-errorreporting/README.md b/google-cloud-clients/google-cloud-errorreporting/README.md
similarity index 100%
rename from google-cloud-errorreporting/README.md
rename to google-cloud-clients/google-cloud-errorreporting/README.md
diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-clients/google-cloud-errorreporting/pom.xml
similarity index 96%
rename from google-cloud-errorreporting/pom.xml
rename to google-cloud-clients/google-cloud-errorreporting/pom.xml
index 7b0a9f2e6636..d1de3a366afa 100644
--- a/google-cloud-errorreporting/pom.xml
+++ b/google-cloud-clients/google-cloud-errorreporting/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-errorreporting
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClient.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClient.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClient.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClient.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClient.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClient.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClient.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClient.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClient.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClient.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClient.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClient.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStub.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStub.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStub.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStub.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStubSettings.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStubSettings.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStubSettings.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorGroupServiceStubSettings.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStub.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStub.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStub.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStub.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ErrorStatsServiceStubSettings.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceCallableFactory.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceCallableFactory.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceCallableFactory.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceStub.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceStub.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceStub.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceStub.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceCallableFactory.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceCallableFactory.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceCallableFactory.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceStub.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceStub.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceStub.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceStub.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceCallableFactory.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceCallableFactory.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceCallableFactory.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceStub.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceStub.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceStub.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceStub.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStub.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStub.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStub.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStub.java
diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStubSettings.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStubSettings.java
similarity index 100%
rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStubSettings.java
rename to google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/ReportErrorsServiceStubSettings.java
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java
similarity index 100%
rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java
rename to google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java
similarity index 100%
rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java
rename to google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupService.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupService.java
similarity index 100%
rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupService.java
rename to google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupService.java
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupServiceImpl.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupServiceImpl.java
similarity index 100%
rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupServiceImpl.java
rename to google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupServiceImpl.java
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsService.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsService.java
similarity index 100%
rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsService.java
rename to google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsService.java
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsServiceImpl.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsServiceImpl.java
similarity index 100%
rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsServiceImpl.java
rename to google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsServiceImpl.java
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsService.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsService.java
similarity index 100%
rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsService.java
rename to google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsService.java
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsServiceImpl.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsServiceImpl.java
similarity index 100%
rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsServiceImpl.java
rename to google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsServiceImpl.java
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java
similarity index 100%
rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java
rename to google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java
diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSmokeTest.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSmokeTest.java
similarity index 100%
rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSmokeTest.java
rename to google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSmokeTest.java
diff --git a/google-cloud-firestore/README.md b/google-cloud-clients/google-cloud-firestore/README.md
similarity index 100%
rename from google-cloud-firestore/README.md
rename to google-cloud-clients/google-cloud-firestore/README.md
diff --git a/google-cloud-firestore/pom.xml b/google-cloud-clients/google-cloud-firestore/pom.xml
similarity index 97%
rename from google-cloud-firestore/pom.xml
rename to google-cloud-clients/google-cloud-firestore/pom.xml
index 1bd29eb3e7ae..483793af9460 100644
--- a/google-cloud-firestore/pom.xml
+++ b/google-cloud-clients/google-cloud-firestore/pom.xml
@@ -14,8 +14,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-firestore
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/BasePath.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/BasePath.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/BasePath.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/BasePath.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Blob.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Blob.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/Blob.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Blob.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CustomClassMapper.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CustomClassMapper.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/CustomClassMapper.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CustomClassMapper.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentChange.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentChange.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentChange.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentChange.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentMask.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentMask.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentMask.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentMask.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentReference.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentReference.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentReference.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentReference.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSet.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSet.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSet.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSet.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentTransform.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentTransform.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentTransform.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentTransform.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/EventListener.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/EventListener.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/EventListener.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/EventListener.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldPath.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldPath.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldPath.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldPath.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldValue.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldValue.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldValue.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldValue.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Firestore.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Firestore.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/Firestore.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Firestore.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreException.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreException.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreException.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreException.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreFactory.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreFactory.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreFactory.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreFactory.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreRpcFactory.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreRpcFactory.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreRpcFactory.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreRpcFactory.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/GeoPoint.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/GeoPoint.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/GeoPoint.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/GeoPoint.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ListenerRegistration.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ListenerRegistration.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/ListenerRegistration.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ListenerRegistration.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Order.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Order.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/Order.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Order.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Precondition.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Precondition.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/Precondition.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Precondition.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/QueryDocumentSnapshot.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/QueryDocumentSnapshot.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/QueryDocumentSnapshot.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/QueryDocumentSnapshot.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/QuerySnapshot.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/QuerySnapshot.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/QuerySnapshot.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/QuerySnapshot.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/SetOptions.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/SetOptions.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/SetOptions.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/SetOptions.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TraceUtil.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TraceUtil.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/TraceUtil.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TraceUtil.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Transaction.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Transaction.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/Transaction.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Transaction.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TransactionOptions.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TransactionOptions.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/TransactionOptions.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/TransactionOptions.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UserDataConverter.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UserDataConverter.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/UserDataConverter.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UserDataConverter.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Watch.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Watch.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/Watch.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Watch.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteBatch.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteBatch.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteBatch.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteBatch.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteResult.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteResult.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteResult.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteResult.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/Exclude.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/Exclude.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/Exclude.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/Exclude.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/IgnoreExtraProperties.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/IgnoreExtraProperties.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/IgnoreExtraProperties.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/IgnoreExtraProperties.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/PropertyName.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/PropertyName.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/PropertyName.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/PropertyName.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/ServerTimestamp.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/ServerTimestamp.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/ServerTimestamp.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/ServerTimestamp.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/ThrowOnExtraProperties.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/ThrowOnExtraProperties.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/ThrowOnExtraProperties.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/annotation/ThrowOnExtraProperties.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ArraySortedMap.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ArraySortedMap.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ArraySortedMap.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ArraySortedMap.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedMap.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedMap.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedMap.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedMap.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedMapIterator.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedMapIterator.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedMapIterator.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedMapIterator.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedSet.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedSet.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedSet.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/ImmutableSortedSet.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBBlackValueNode.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBBlackValueNode.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBBlackValueNode.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBBlackValueNode.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBEmptyNode.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBEmptyNode.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBEmptyNode.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBEmptyNode.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBNode.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBNode.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBNode.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBNode.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBRedValueNode.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBRedValueNode.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBRedValueNode.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBRedValueNode.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBValueNode.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBValueNode.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBValueNode.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/LLRBValueNode.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/RBTreeSortedMap.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/RBTreeSortedMap.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/RBTreeSortedMap.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/RBTreeSortedMap.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/StandardComparator.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/StandardComparator.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/StandardComparator.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/collection/StandardComparator.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/FirestoreRpc.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/FirestoreRpc.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/FirestoreRpc.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/FirestoreRpc.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/GrpcFirestoreRpc.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/GrpcFirestoreRpc.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/GrpcFirestoreRpc.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/GrpcFirestoreRpc.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreClient.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreClient.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreClient.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreClient.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreSettings.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreSettings.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreSettings.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreSettings.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/package-info.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/package-info.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/package-info.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/package-info.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStub.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStub.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStub.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStub.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java
diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreStub.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreStub.java
similarity index 100%
rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreStub.java
rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreStub.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/CollectionReferenceTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/CollectionReferenceTest.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/CollectionReferenceTest.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/CollectionReferenceTest.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreTest.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreTest.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreTest.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/OrderTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/OrderTest.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/OrderTest.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/OrderTest.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/TransactionTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/TransactionTest.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/TransactionTest.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/TransactionTest.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WatchTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WatchTest.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/WatchTest.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WatchTest.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WriteBatchTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WriteBatchTest.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/WriteBatchTest.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WriteBatchTest.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/conformance/TestDefinition.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/conformance/TestDefinition.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/conformance/TestDefinition.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/conformance/TestDefinition.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java
similarity index 100%
rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java
rename to google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java
diff --git a/google-cloud-firestore/src/test/resources/test-suite.binproto b/google-cloud-clients/google-cloud-firestore/src/test/resources/test-suite.binproto
similarity index 100%
rename from google-cloud-firestore/src/test/resources/test-suite.binproto
rename to google-cloud-clients/google-cloud-firestore/src/test/resources/test-suite.binproto
diff --git a/google-cloud-language/README.md b/google-cloud-clients/google-cloud-language/README.md
similarity index 100%
rename from google-cloud-language/README.md
rename to google-cloud-clients/google-cloud-language/README.md
diff --git a/google-cloud-language/pom.xml b/google-cloud-clients/google-cloud-language/pom.xml
similarity index 97%
rename from google-cloud-language/pom.xml
rename to google-cloud-clients/google-cloud-language/pom.xml
index f392b39bd37b..edc53cf52067 100644
--- a/google-cloud-language/pom.xml
+++ b/google-cloud-clients/google-cloud-language/pom.xml
@@ -14,8 +14,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-language
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceStub.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceStub.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceStub.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceStub.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStub.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStub.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStub.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStub.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceClient.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceClient.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceClient.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceClient.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceSettings.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceSettings.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceSettings.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceSettings.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/package-info.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/package-info.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/package-info.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/package-info.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceCallableFactory.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceCallableFactory.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceCallableFactory.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceStub.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceStub.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceStub.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceStub.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStub.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStub.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStub.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStub.java
diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStubSettings.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStubSettings.java
similarity index 100%
rename from google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStubSettings.java
rename to google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/LanguageServiceStubSettings.java
diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java
similarity index 100%
rename from google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java
rename to google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java
diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceSmokeTest.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceSmokeTest.java
similarity index 100%
rename from google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceSmokeTest.java
rename to google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceSmokeTest.java
diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageService.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageService.java
similarity index 100%
rename from google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageService.java
rename to google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageService.java
diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageServiceImpl.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageServiceImpl.java
similarity index 100%
rename from google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageServiceImpl.java
rename to google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageServiceImpl.java
diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java
similarity index 100%
rename from google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java
rename to google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java
diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceSmokeTest.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceSmokeTest.java
similarity index 100%
rename from google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceSmokeTest.java
rename to google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceSmokeTest.java
diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageService.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageService.java
similarity index 100%
rename from google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageService.java
rename to google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageService.java
diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageServiceImpl.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageServiceImpl.java
similarity index 100%
rename from google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageServiceImpl.java
rename to google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageServiceImpl.java
diff --git a/google-cloud-logging/README.md b/google-cloud-clients/google-cloud-logging/README.md
similarity index 100%
rename from google-cloud-logging/README.md
rename to google-cloud-clients/google-cloud-logging/README.md
diff --git a/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
similarity index 97%
rename from google-cloud-logging/pom.xml
rename to google-cloud-clients/google-cloud-logging/pom.xml
index 0147f1dba7af..23bd35c606f1 100644
--- a/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-logging
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/HttpRequest.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/HttpRequest.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/HttpRequest.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/HttpRequest.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LogEntry.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LogEntry.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/LogEntry.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LogEntry.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingConfig.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingConfig.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingConfig.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingConfig.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingEnhancer.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingEnhancer.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingEnhancer.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingEnhancer.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingException.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingException.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingException.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingException.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingFactory.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingFactory.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingFactory.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingFactory.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingLevel.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingLevel.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingLevel.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingLevel.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingOptions.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingOptions.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingOptions.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingOptions.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Metric.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Metric.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/Metric.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Metric.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/MetricInfo.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/MetricInfo.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/MetricInfo.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/MetricInfo.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Operation.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Operation.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/Operation.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Operation.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Option.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Option.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/Option.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Option.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Payload.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Payload.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/Payload.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Payload.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Severity.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Severity.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/Severity.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Severity.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Sink.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Sink.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/Sink.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Sink.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/SinkInfo.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/SinkInfo.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/SinkInfo.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/SinkInfo.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/SourceLocation.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/SourceLocation.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/SourceLocation.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/SourceLocation.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Structs.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Structs.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/Structs.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Structs.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Synchronicity.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Synchronicity.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/Synchronicity.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/Synchronicity.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/package-info.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/package-info.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/package-info.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/package-info.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/LoggingRpcFactory.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/LoggingRpcFactory.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/spi/LoggingRpcFactory.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/LoggingRpcFactory.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingRpc.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingRpc.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingRpc.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingRpc.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/package-info.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/package-info.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/testing/package-info.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/package-info.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingSettings.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingSettings.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingSettings.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingSettings.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsClient.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsClient.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsClient.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsClient.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsSettings.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsSettings.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsSettings.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsSettings.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/package-info.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/package-info.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/package-info.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/package-info.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2Stub.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2Stub.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2Stub.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2Stub.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2CallableFactory.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2CallableFactory.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2CallableFactory.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2CallableFactory.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2Stub.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2Stub.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2Stub.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2Stub.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2CallableFactory.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2CallableFactory.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2CallableFactory.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2CallableFactory.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2Stub.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2Stub.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2Stub.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2Stub.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2CallableFactory.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2CallableFactory.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2CallableFactory.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2CallableFactory.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2Stub.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2Stub.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2Stub.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2Stub.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2Stub.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2Stub.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2Stub.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2Stub.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2Stub.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2Stub.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2Stub.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2Stub.java
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
similarity index 100%
rename from google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
rename to google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/BaseSystemTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/HttpRequestTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/HttpRequestTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/HttpRequestTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/HttpRequestTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/LogEntryTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LogEntryTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/LogEntryTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LogEntryTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingImplTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingImplTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingImplTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingImplTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingLevelTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingLevelTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingLevelTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingLevelTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingOptionsTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingOptionsTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingOptionsTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingOptionsTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/MetricInfoTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/MetricInfoTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/MetricInfoTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/MetricInfoTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/MetricTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/MetricTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/MetricTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/MetricTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/OperationTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/OperationTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/OperationTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/OperationTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/OptionTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/OptionTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/OptionTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/OptionTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/PayloadTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/PayloadTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/PayloadTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/PayloadTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/SerializationTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/SerializationTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/SerializationTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/SerializationTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/SinkInfoTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/SinkInfoTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/SinkInfoTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/SinkInfoTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/SinkTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/SinkTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/SinkTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/SinkTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/SourceLocationTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/SourceLocationTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/SourceLocationTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/SourceLocationTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/StructsTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/StructsTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/StructsTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/StructsTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITLoggingTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITLoggingTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITLoggingTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/it/ITLoggingTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingSmokeTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingSmokeTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingSmokeTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingSmokeTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingHelper.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingHelper.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingHelper.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingHelper.java
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingImpl.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingImpl.java
similarity index 100%
rename from google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingImpl.java
rename to google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingImpl.java
diff --git a/google-cloud-monitoring/README.md b/google-cloud-clients/google-cloud-monitoring/README.md
similarity index 100%
rename from google-cloud-monitoring/README.md
rename to google-cloud-clients/google-cloud-monitoring/README.md
diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-clients/google-cloud-monitoring/pom.xml
similarity index 96%
rename from google-cloud-monitoring/pom.xml
rename to google-cloud-clients/google-cloud-monitoring/pom.xml
index 3448997b7475..c9b563ed871e 100644
--- a/google-cloud-monitoring/pom.xml
+++ b/google-cloud-clients/google-cloud-monitoring/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-monitoring
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClient.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClient.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClient.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClient.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/AlertPolicyServiceSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/AlertPolicyServiceSettings.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/AlertPolicyServiceSettings.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/AlertPolicyServiceSettings.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceClient.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceClient.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceClient.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceClient.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceSettings.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceSettings.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceSettings.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceClient.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceClient.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceClient.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceClient.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceSettings.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceSettings.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceSettings.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClient.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClient.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClient.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClient.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceSettings.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceSettings.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/NotificationChannelServiceSettings.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClient.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClient.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClient.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClient.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/UptimeCheckServiceSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/UptimeCheckServiceSettings.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/UptimeCheckServiceSettings.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/UptimeCheckServiceSettings.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/package-info.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/package-info.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/package-info.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/package-info.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStub.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStub.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStub.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStub.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStubSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStubSettings.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStubSettings.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/AlertPolicyServiceStubSettings.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStub.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStub.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStub.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStub.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStubSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStubSettings.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStubSettings.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GroupServiceStubSettings.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceCallableFactory.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceCallableFactory.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceCallableFactory.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceStub.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceStub.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceStub.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceStub.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceCallableFactory.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceCallableFactory.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceCallableFactory.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceStub.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceStub.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceStub.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceStub.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceCallableFactory.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceCallableFactory.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceCallableFactory.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceStub.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceStub.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceStub.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceStub.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceCallableFactory.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceCallableFactory.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceCallableFactory.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceStub.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceStub.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceStub.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceStub.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceCallableFactory.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceCallableFactory.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceCallableFactory.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceStub.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceStub.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceStub.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceStub.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStub.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStub.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStub.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStub.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStubSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStubSettings.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStubSettings.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/MetricServiceStubSettings.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStub.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStub.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStub.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStub.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStubSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStubSettings.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStubSettings.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/NotificationChannelServiceStubSettings.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStub.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStub.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStub.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStub.java
diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStubSettings.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStubSettings.java
similarity index 100%
rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStubSettings.java
rename to google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/UptimeCheckServiceStubSettings.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClientTest.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClientTest.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClientTest.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClientTest.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/GroupServiceClientTest.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/GroupServiceClientTest.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/GroupServiceClientTest.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/GroupServiceClientTest.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceClientTest.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceClientTest.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceClientTest.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceClientTest.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceSmokeTest.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceSmokeTest.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceSmokeTest.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceSmokeTest.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyService.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyService.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyService.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyService.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyServiceImpl.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyServiceImpl.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyServiceImpl.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyServiceImpl.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupService.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupService.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupService.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupService.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupServiceImpl.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupServiceImpl.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupServiceImpl.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupServiceImpl.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricService.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricService.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricService.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricService.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricServiceImpl.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricServiceImpl.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricServiceImpl.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricServiceImpl.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelService.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelService.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelService.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelService.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelServiceImpl.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelServiceImpl.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelServiceImpl.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelServiceImpl.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckService.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckService.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckService.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckService.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckServiceImpl.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckServiceImpl.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckServiceImpl.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckServiceImpl.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClientTest.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClientTest.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClientTest.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClientTest.java
diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClientTest.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClientTest.java
similarity index 100%
rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClientTest.java
rename to google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClientTest.java
diff --git a/google-cloud-notification/README.md b/google-cloud-clients/google-cloud-notification/README.md
similarity index 100%
rename from google-cloud-notification/README.md
rename to google-cloud-clients/google-cloud-notification/README.md
diff --git a/google-cloud-notification/pom.xml b/google-cloud-clients/google-cloud-notification/pom.xml
similarity index 97%
rename from google-cloud-notification/pom.xml
rename to google-cloud-clients/google-cloud-notification/pom.xml
index a9a099550619..1380c4c3f576 100644
--- a/google-cloud-notification/pom.xml
+++ b/google-cloud-clients/google-cloud-notification/pom.xml
@@ -14,8 +14,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-notification
diff --git a/google-cloud-notification/src/main/java/com/google/cloud/notification/Notification.java b/google-cloud-clients/google-cloud-notification/src/main/java/com/google/cloud/notification/Notification.java
similarity index 100%
rename from google-cloud-notification/src/main/java/com/google/cloud/notification/Notification.java
rename to google-cloud-clients/google-cloud-notification/src/main/java/com/google/cloud/notification/Notification.java
diff --git a/google-cloud-notification/src/main/java/com/google/cloud/notification/NotificationImpl.java b/google-cloud-clients/google-cloud-notification/src/main/java/com/google/cloud/notification/NotificationImpl.java
similarity index 100%
rename from google-cloud-notification/src/main/java/com/google/cloud/notification/NotificationImpl.java
rename to google-cloud-clients/google-cloud-notification/src/main/java/com/google/cloud/notification/NotificationImpl.java
diff --git a/google-cloud-notification/src/main/java/com/google/cloud/notification/NotificationInfo.java b/google-cloud-clients/google-cloud-notification/src/main/java/com/google/cloud/notification/NotificationInfo.java
similarity index 100%
rename from google-cloud-notification/src/main/java/com/google/cloud/notification/NotificationInfo.java
rename to google-cloud-clients/google-cloud-notification/src/main/java/com/google/cloud/notification/NotificationInfo.java
diff --git a/google-cloud-notification/src/test/java/com/google/cloud/notification/NotificationInfoTest.java b/google-cloud-clients/google-cloud-notification/src/test/java/com/google/cloud/notification/NotificationInfoTest.java
similarity index 100%
rename from google-cloud-notification/src/test/java/com/google/cloud/notification/NotificationInfoTest.java
rename to google-cloud-clients/google-cloud-notification/src/test/java/com/google/cloud/notification/NotificationInfoTest.java
diff --git a/google-cloud-notification/src/test/java/com/google/cloud/notification/it/ITSystemTest.java b/google-cloud-clients/google-cloud-notification/src/test/java/com/google/cloud/notification/it/ITSystemTest.java
similarity index 100%
rename from google-cloud-notification/src/test/java/com/google/cloud/notification/it/ITSystemTest.java
rename to google-cloud-clients/google-cloud-notification/src/test/java/com/google/cloud/notification/it/ITSystemTest.java
diff --git a/google-cloud-os-login/README.md b/google-cloud-clients/google-cloud-os-login/README.md
similarity index 100%
rename from google-cloud-os-login/README.md
rename to google-cloud-clients/google-cloud-os-login/README.md
diff --git a/google-cloud-os-login/pom.xml b/google-cloud-clients/google-cloud-os-login/pom.xml
similarity index 97%
rename from google-cloud-os-login/pom.xml
rename to google-cloud-clients/google-cloud-os-login/pom.xml
index d7f4f129a2ee..0c9c569552e4 100644
--- a/google-cloud-os-login/pom.xml
+++ b/google-cloud-clients/google-cloud-os-login/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-os-login
diff --git a/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceClient.java b/google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceClient.java
similarity index 100%
rename from google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceClient.java
rename to google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceClient.java
diff --git a/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceSettings.java b/google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceSettings.java
similarity index 100%
rename from google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceSettings.java
rename to google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/OsLoginServiceSettings.java
diff --git a/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/package-info.java b/google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/package-info.java
similarity index 100%
rename from google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/package-info.java
rename to google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/package-info.java
diff --git a/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceCallableFactory.java b/google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceCallableFactory.java
similarity index 100%
rename from google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceCallableFactory.java
diff --git a/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceStub.java b/google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceStub.java
similarity index 100%
rename from google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceStub.java
rename to google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceStub.java
diff --git a/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/OsLoginServiceStub.java b/google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/OsLoginServiceStub.java
similarity index 100%
rename from google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/OsLoginServiceStub.java
rename to google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/OsLoginServiceStub.java
diff --git a/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/OsLoginServiceStubSettings.java b/google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/OsLoginServiceStubSettings.java
similarity index 100%
rename from google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/OsLoginServiceStubSettings.java
rename to google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/OsLoginServiceStubSettings.java
diff --git a/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginService.java b/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginService.java
similarity index 100%
rename from google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginService.java
rename to google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginService.java
diff --git a/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginServiceImpl.java b/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginServiceImpl.java
similarity index 100%
rename from google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginServiceImpl.java
rename to google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginServiceImpl.java
diff --git a/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java b/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java
similarity index 100%
rename from google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java
rename to google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java
diff --git a/google-cloud-pubsub/README.md b/google-cloud-clients/google-cloud-pubsub/README.md
similarity index 100%
rename from google-cloud-pubsub/README.md
rename to google-cloud-clients/google-cloud-pubsub/README.md
diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-clients/google-cloud-pubsub/pom.xml
similarity index 97%
rename from google-cloud-pubsub/pom.xml
rename to google-cloud-clients/google-cloud-pubsub/pom.xml
index 17c18a562680..9df6d8835a7f 100644
--- a/google-cloud-pubsub/pom.xml
+++ b/google-cloud-clients/google-cloud-pubsub/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-pubsub
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageReceiver.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageReceiver.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageReceiver.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageReceiver.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageWaiter.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageWaiter.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageWaiter.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageWaiter.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PublisherStats.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PublisherStats.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PublisherStats.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PublisherStats.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminSettings.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminSettings.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminSettings.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminSettings.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminSettings.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminSettings.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminSettings.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminSettings.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherCallableFactory.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherCallableFactory.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherCallableFactory.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherCallableFactory.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherStub.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberCallableFactory.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberCallableFactory.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberCallableFactory.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberCallableFactory.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberStub.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStub.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStub.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStub.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStub.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStub.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStub.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStub.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStub.java
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java
similarity index 100%
rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java
rename to google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeClock.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeClock.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeClock.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeClock.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakePublisherServiceImpl.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakePublisherServiceImpl.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakePublisherServiceImpl.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakePublisherServiceImpl.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeSubscriberServiceImpl.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeSubscriberServiceImpl.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeSubscriberServiceImpl.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeSubscriberServiceImpl.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageWaiterTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageWaiterTest.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageWaiterTest.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageWaiterTest.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicy.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicy.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicy.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicy.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisher.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisher.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisher.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisher.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriber.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriber.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriber.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriber.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java
similarity index 100%
rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java
rename to google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java
diff --git a/google-cloud-redis/README.md b/google-cloud-clients/google-cloud-redis/README.md
similarity index 100%
rename from google-cloud-redis/README.md
rename to google-cloud-clients/google-cloud-redis/README.md
diff --git a/google-cloud-redis/pom.xml b/google-cloud-clients/google-cloud-redis/pom.xml
similarity index 97%
rename from google-cloud-redis/pom.xml
rename to google-cloud-clients/google-cloud-redis/pom.xml
index 238ea4703767..83b2b9fde886 100644
--- a/google-cloud-redis/pom.xml
+++ b/google-cloud-clients/google-cloud-redis/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-redis
diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java
similarity index 100%
rename from google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java
rename to google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java
diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java
similarity index 100%
rename from google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java
rename to google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java
diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/package-info.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/package-info.java
similarity index 100%
rename from google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/package-info.java
rename to google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/package-info.java
diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java
similarity index 100%
rename from google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java
rename to google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java
diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
similarity index 100%
rename from google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
rename to google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java
similarity index 100%
rename from google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java
rename to google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java
diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java
similarity index 100%
rename from google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java
rename to google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java
diff --git a/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java
similarity index 100%
rename from google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java
rename to google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java
diff --git a/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java
similarity index 100%
rename from google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java
rename to google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java
diff --git a/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java
similarity index 100%
rename from google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java
rename to google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java
diff --git a/google-cloud-resourcemanager/README.md b/google-cloud-clients/google-cloud-resourcemanager/README.md
similarity index 100%
rename from google-cloud-resourcemanager/README.md
rename to google-cloud-clients/google-cloud-resourcemanager/README.md
diff --git a/google-cloud-resourcemanager/pom.xml b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
similarity index 96%
rename from google-cloud-resourcemanager/pom.xml
rename to google-cloud-clients/google-cloud-resourcemanager/pom.xml
index 571830b1288b..d74f7d931845 100644
--- a/google-cloud-resourcemanager/pom.xml
+++ b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-resourcemanager
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/package-info.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/package-info.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/package-info.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/package-info.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java
diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java
similarity index 100%
rename from google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java
diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OptionTest.java b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OptionTest.java
similarity index 100%
rename from google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OptionTest.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OptionTest.java
diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/PolicyMarshallerTest.java b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/PolicyMarshallerTest.java
similarity index 100%
rename from google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/PolicyMarshallerTest.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/PolicyMarshallerTest.java
diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java
similarity index 100%
rename from google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java
diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java
similarity index 100%
rename from google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java
diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java
similarity index 100%
rename from google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java
diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java
similarity index 100%
rename from google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java
diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java
similarity index 100%
rename from google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerOptionsTest.java
diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java
similarity index 100%
rename from google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java
diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java
similarity index 100%
rename from google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java
rename to google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java
diff --git a/google-cloud-spanner/README.md b/google-cloud-clients/google-cloud-spanner/README.md
similarity index 100%
rename from google-cloud-spanner/README.md
rename to google-cloud-clients/google-cloud-spanner/README.md
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
similarity index 98%
rename from google-cloud-spanner/pom.xml
rename to google-cloud-clients/google-cloud-spanner/pom.xml
index 8524590c2884..2fb1454fbb39 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -13,8 +13,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-spanner
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbortedException.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbortedException.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbortedException.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbortedException.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchClient.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchClient.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchClient.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchClient.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchClientImpl.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchClientImpl.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchClientImpl.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchClientImpl.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchReadOnlyTransaction.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchReadOnlyTransaction.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchReadOnlyTransaction.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchReadOnlyTransaction.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchTransactionId.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchTransactionId.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchTransactionId.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchTransactionId.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Database.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Database.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Database.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Database.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseAdminClient.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseAdminClient.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseAdminClient.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseAdminClient.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseId.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseId.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseId.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseId.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseInfo.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseInfo.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseInfo.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseInfo.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ErrorCode.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ErrorCode.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/ErrorCode.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ErrorCode.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ForwardingResultSet.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ForwardingResultSet.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/ForwardingResultSet.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ForwardingResultSet.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ForwardingStructReader.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ForwardingStructReader.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/ForwardingStructReader.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ForwardingStructReader.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Instance.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Instance.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Instance.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Instance.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClient.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClient.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClient.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClient.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceConfig.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceConfig.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceConfig.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceConfig.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceConfigId.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceConfigId.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceConfigId.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceConfigId.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceConfigInfo.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceConfigInfo.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceConfigInfo.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceConfigInfo.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceId.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceId.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceId.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceId.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceInfo.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceInfo.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceInfo.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceInfo.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Key.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Key.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Key.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Key.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/KeyRange.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/KeyRange.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/KeyRange.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/KeyRange.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/KeySet.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/KeySet.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/KeySet.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/KeySet.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Mutation.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Mutation.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Mutation.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Mutation.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Operation.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Operation.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Operation.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Operation.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Partition.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Partition.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Partition.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Partition.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionOptions.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionOptions.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionOptions.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionOptions.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ReadContext.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ReadContext.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/ReadContext.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ReadContext.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ReadOnlyTransaction.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ReadOnlyTransaction.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/ReadOnlyTransaction.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ReadOnlyTransaction.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSet.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSet.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSet.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSet.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSets.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSets.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSets.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSets.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Session.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Session.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Session.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Session.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Spanner.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Spanner.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Spanner.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Spanner.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerException.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerException.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerException.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerException.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerFactory.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerFactory.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerFactory.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerFactory.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Statement.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Statement.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Statement.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Statement.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Struct.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Struct.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Struct.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Struct.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/StructReader.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/StructReader.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/StructReader.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/StructReader.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TimestampBound.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TimestampBound.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/TimestampBound.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TimestampBound.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TraceUtil.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TraceUtil.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/TraceUtil.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TraceUtil.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionManager.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionManager.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionManager.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionManager.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionManagerImpl.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionManagerImpl.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionManagerImpl.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionManagerImpl.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunner.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunner.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunner.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunner.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Type.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Type.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Type.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Type.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ValueBinder.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ValueBinder.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/ValueBinder.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/ValueBinder.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/package-info.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/package-info.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/package-info.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/package-info.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminCallableFactory.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminCallableFactory.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminCallableFactory.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminCallableFactory.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/package-info.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/package-info.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/package-info.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/package-info.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminCallableFactory.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminCallableFactory.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminCallableFactory.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminCallableFactory.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStub.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStub.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStub.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStub.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/package-info.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/package-info.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/package-info.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/package-info.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/SpannerRpcFactory.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/SpannerRpcFactory.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/SpannerRpcFactory.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/SpannerRpcFactory.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GrpcSpannerRpc.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GrpcSpannerRpc.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GrpcSpannerRpc.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GrpcSpannerRpc.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerErrorInterceptor.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerErrorInterceptor.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerErrorInterceptor.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerErrorInterceptor.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerMetadataProvider.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerMetadataProvider.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerMetadataProvider.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerMetadataProvider.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerRpc.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerRpc.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerRpc.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerRpc.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/WatchdogInterceptor.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/WatchdogInterceptor.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/WatchdogInterceptor.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/WatchdogInterceptor.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/testing/RemoteSpannerHelper.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/testing/RemoteSpannerHelper.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/testing/RemoteSpannerHelper.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/testing/RemoteSpannerHelper.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerClient.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerClient.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerClient.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerClient.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerSettings.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerSettings.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerSettings.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerSettings.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/package-info.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/package-info.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/package-info.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/package-info.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerCallableFactory.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerCallableFactory.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerCallableFactory.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerCallableFactory.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerStub.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerStub.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerStub.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerStub.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStub.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStub.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStub.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStub.java
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java
similarity index 100%
rename from google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java
rename to google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BaseSessionPoolTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BaseSessionPoolTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/BaseSessionPoolTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BaseSessionPoolTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchClientImplTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchClientImplTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchClientImplTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchClientImplTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchTransactionIdTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchTransactionIdTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchTransactionIdTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchTransactionIdTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientImplTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientImplTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientImplTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientImplTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseIdTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseIdTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseIdTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseIdTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/FlakyTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/FlakyTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/FlakyTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/FlakyTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminClientImplTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminClientImplTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminClientImplTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminClientImplTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceConfigIdTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceConfigIdTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceConfigIdTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceConfigIdTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceIdTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceIdTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceIdTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceIdTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyRangeTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyRangeTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyRangeTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyRangeTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeySetTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeySetTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeySetTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeySetTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/KeyTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OperationTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OperationTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/OperationTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OperationTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionOptionsTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionOptionsTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionOptionsTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionOptionsTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ReadFormatTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ReadFormatTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/ReadFormatTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ReadFormatTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ReadFormatTestRunner.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ReadFormatTestRunner.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/ReadFormatTestRunner.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ReadFormatTestRunner.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResultSetsTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResultSetsTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResultSetsTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResultSetsTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResumableStreamIteratorTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResumableStreamIteratorTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResumableStreamIteratorTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResumableStreamIteratorTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolIntegrationTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolIntegrationTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolIntegrationTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolIntegrationTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerExceptionFactoryTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerExceptionFactoryTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerExceptionFactoryTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerExceptionFactoryTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplRetryTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplRetryTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplRetryTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplRetryTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerImplTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerMatchers.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerMatchers.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerMatchers.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerMatchers.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/StatementTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/StatementTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/StatementTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/StatementTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/StructTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/StructTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/StructTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/StructTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TestEnvConfig.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TestEnvConfig.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/TestEnvConfig.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TestEnvConfig.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TypeTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TypeTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/TypeTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TypeTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueBinderTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueBinderTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueBinderTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueBinderTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdmin.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdmin.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdmin.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdmin.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdminImpl.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdminImpl.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdminImpl.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdminImpl.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdmin.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdmin.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdmin.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdmin.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdminImpl.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdminImpl.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdminImpl.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdminImpl.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITBatchReadTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseAdminTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITLargeReadTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadOnlyTxnTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionManagerTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/RequestMetadataTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/RequestMetadataTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/RequestMetadataTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/RequestMetadataTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/SpannerMetadataProviderTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/SpannerMetadataProviderTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/SpannerMetadataProviderTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/SpannerMetadataProviderTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/WatchdogInterceptorTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/WatchdogInterceptorTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/WatchdogInterceptorTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/WatchdogInterceptorTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpanner.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpanner.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpanner.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpanner.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpannerImpl.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpannerImpl.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpannerImpl.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpannerImpl.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java
similarity index 100%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java
rename to google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java
diff --git a/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/read_tests.json b/google-cloud-clients/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/read_tests.json
similarity index 100%
rename from google-cloud-spanner/src/test/resources/com/google/cloud/spanner/read_tests.json
rename to google-cloud-clients/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/read_tests.json
diff --git a/google-cloud-speech/README.md b/google-cloud-clients/google-cloud-speech/README.md
similarity index 100%
rename from google-cloud-speech/README.md
rename to google-cloud-clients/google-cloud-speech/README.md
diff --git a/google-cloud-speech/pom.xml b/google-cloud-clients/google-cloud-speech/pom.xml
similarity index 97%
rename from google-cloud-speech/pom.xml
rename to google-cloud-clients/google-cloud-speech/pom.xml
index 8a9df6aa3005..ff0b98680418 100644
--- a/google-cloud-speech/pom.xml
+++ b/google-cloud-clients/google-cloud-speech/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-speech
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStubSettings.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStubSettings.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStubSettings.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStubSettings.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechClient.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechClient.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechClient.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechClient.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechSettings.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechSettings.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechSettings.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechSettings.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/package-info.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/package-info.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/package-info.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/package-info.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechCallableFactory.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechCallableFactory.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechCallableFactory.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechCallableFactory.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechStub.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechStub.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechStub.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStub.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStub.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStub.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStubSettings.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStubSettings.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStubSettings.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStubSettings.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechClient.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechClient.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechClient.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechClient.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechSettings.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechSettings.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechSettings.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechSettings.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/package-info.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/package-info.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/package-info.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/package-info.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechCallableFactory.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechCallableFactory.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechCallableFactory.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechCallableFactory.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechStub.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechStub.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechStub.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStub.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStub.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStub.java
diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStubSettings.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStubSettings.java
similarity index 100%
rename from google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStubSettings.java
rename to google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStubSettings.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeech.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeech.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeech.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeech.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeechImpl.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeechImpl.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeechImpl.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeechImpl.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechClientTest.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechClientTest.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechClientTest.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechClientTest.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechSmokeTest.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechSmokeTest.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechSmokeTest.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechSmokeTest.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/it/ITSpeechTest.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/it/ITSpeechTest.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1/it/ITSpeechTest.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/it/ITSpeechTest.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeech.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeech.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeech.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeech.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeechImpl.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeechImpl.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeechImpl.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeechImpl.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/SpeechClientTest.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/SpeechClientTest.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/SpeechClientTest.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/SpeechClientTest.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/SpeechSmokeTest.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/SpeechSmokeTest.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/SpeechSmokeTest.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/SpeechSmokeTest.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeech.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeech.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeech.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeech.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeechImpl.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeechImpl.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeechImpl.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeechImpl.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechClientTest.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechClientTest.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechClientTest.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechClientTest.java
diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechSmokeTest.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechSmokeTest.java
similarity index 100%
rename from google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechSmokeTest.java
rename to google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechSmokeTest.java
diff --git a/google-cloud-storage/README.md b/google-cloud-clients/google-cloud-storage/README.md
similarity index 100%
rename from google-cloud-storage/README.md
rename to google-cloud-clients/google-cloud-storage/README.md
diff --git a/google-cloud-storage/pom.xml b/google-cloud-clients/google-cloud-storage/pom.xml
similarity index 96%
rename from google-cloud-storage/pom.xml
rename to google-cloud-clients/google-cloud-storage/pom.xml
index 479f02dba01b..46a3b1a625a6 100644
--- a/google-cloud-storage/pom.xml
+++ b/google-cloud-clients/google-cloud-storage/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-storage
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Acl.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Acl.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/Acl.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Acl.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobId.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobId.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/BlobId.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobId.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobReadChannel.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobReadChannel.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/BlobReadChannel.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobReadChannel.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobWriteChannel.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobWriteChannel.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/BlobWriteChannel.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobWriteChannel.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializer.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializer.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializer.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializer.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/CopyWriter.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/CopyWriter.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/CopyWriter.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/CopyWriter.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Cors.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Cors.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/Cors.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Cors.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/HttpMethod.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/HttpMethod.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/HttpMethod.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/HttpMethod.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Option.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Option.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/Option.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Option.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/PolicyHelper.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/PolicyHelper.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/PolicyHelper.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/PolicyHelper.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/ServiceAccount.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/ServiceAccount.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/ServiceAccount.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/ServiceAccount.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/SignatureInfo.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/SignatureInfo.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/SignatureInfo.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/SignatureInfo.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageBatch.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageBatch.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/StorageBatch.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageBatch.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageBatchResult.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageBatchResult.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/StorageBatchResult.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageBatchResult.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageClass.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageClass.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/StorageClass.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageClass.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageException.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageException.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/StorageException.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageException.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageFactory.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageFactory.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/StorageFactory.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageFactory.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageRoles.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageRoles.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/StorageRoles.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageRoles.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/package-info.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/package-info.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/package-info.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/package-info.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/StorageRpcFactory.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/StorageRpcFactory.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/spi/StorageRpcFactory.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/StorageRpcFactory.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpcSpans.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpcSpans.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpcSpans.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpcSpans.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/RpcBatch.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/RpcBatch.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/RpcBatch.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/RpcBatch.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/testing/RemoteStorageHelper.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/testing/RemoteStorageHelper.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/testing/RemoteStorageHelper.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/testing/RemoteStorageHelper.java
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/testing/package-info.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/testing/package-info.java
similarity index 100%
rename from google-cloud-storage/src/main/java/com/google/cloud/storage/testing/package-info.java
rename to google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/testing/package-info.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/AclTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/AclTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/AclTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/AclTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobIdTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobIdTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/BlobIdTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobIdTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobInfoTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobReadChannelTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobReadChannelTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/BlobReadChannelTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobReadChannelTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobWriteChannelTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobWriteChannelTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/BlobWriteChannelTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BlobWriteChannelTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializerTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializerTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializerTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/CanonicalExtensionHeadersSerializerTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/CopyRequestTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/CopyRequestTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/CopyRequestTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/CopyRequestTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/CopyWriterTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/CopyWriterTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/CopyWriterTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/CopyWriterTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/CorsTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/CorsTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/CorsTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/CorsTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/OptionTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/OptionTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/OptionTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/OptionTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/PolicyHelperTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/PolicyHelperTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/PolicyHelperTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/PolicyHelperTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/SerializationTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/SerializationTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/SerializationTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/SerializationTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/ServiceAccountTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/ServiceAccountTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/ServiceAccountTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/ServiceAccountTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/SignatureInfoTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/SignatureInfoTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/SignatureInfoTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/SignatureInfoTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageBatchResultTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageBatchResultTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/StorageBatchResultTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageBatchResultTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageBatchTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageBatchTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/StorageBatchTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageBatchTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageExceptionTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageExceptionTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/StorageExceptionTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageExceptionTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageOptionsTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageOptionsTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/StorageOptionsTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageOptionsTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/ApiPolicyMatcher.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/ApiPolicyMatcher.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/testing/ApiPolicyMatcher.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/ApiPolicyMatcher.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/ApiPolicyMatcherTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/ApiPolicyMatcherTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/testing/ApiPolicyMatcherTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/ApiPolicyMatcherTest.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java
rename to google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/testing/RemoteStorageHelperTest.java
diff --git a/google-cloud-texttospeech/README.md b/google-cloud-clients/google-cloud-texttospeech/README.md
similarity index 100%
rename from google-cloud-texttospeech/README.md
rename to google-cloud-clients/google-cloud-texttospeech/README.md
diff --git a/google-cloud-texttospeech/pom.xml b/google-cloud-clients/google-cloud-texttospeech/pom.xml
similarity index 96%
rename from google-cloud-texttospeech/pom.xml
rename to google-cloud-clients/google-cloud-texttospeech/pom.xml
index a67efe71d541..0aea822163ca 100644
--- a/google-cloud-texttospeech/pom.xml
+++ b/google-cloud-clients/google-cloud-texttospeech/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-texttospeech-v1beta1
diff --git a/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClient.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClient.java
similarity index 100%
rename from google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClient.java
rename to google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClient.java
diff --git a/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechSettings.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechSettings.java
similarity index 100%
rename from google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechSettings.java
rename to google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechSettings.java
diff --git a/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/package-info.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/package-info.java
similarity index 100%
rename from google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/package-info.java
rename to google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/package-info.java
diff --git a/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechCallableFactory.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechCallableFactory.java
similarity index 100%
rename from google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechCallableFactory.java
rename to google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechCallableFactory.java
diff --git a/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechStub.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechStub.java
similarity index 100%
rename from google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechStub.java
rename to google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechStub.java
diff --git a/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/TextToSpeechStub.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/TextToSpeechStub.java
similarity index 100%
rename from google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/TextToSpeechStub.java
rename to google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/TextToSpeechStub.java
diff --git a/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/TextToSpeechStubSettings.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/TextToSpeechStubSettings.java
similarity index 100%
rename from google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/TextToSpeechStubSettings.java
rename to google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/TextToSpeechStubSettings.java
diff --git a/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeech.java b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeech.java
similarity index 100%
rename from google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeech.java
rename to google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeech.java
diff --git a/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeechImpl.java b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeechImpl.java
similarity index 100%
rename from google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeechImpl.java
rename to google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeechImpl.java
diff --git a/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java
similarity index 100%
rename from google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java
rename to google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java
diff --git a/google-cloud-trace/README.md b/google-cloud-clients/google-cloud-trace/README.md
similarity index 100%
rename from google-cloud-trace/README.md
rename to google-cloud-clients/google-cloud-trace/README.md
diff --git a/google-cloud-trace/pom.xml b/google-cloud-clients/google-cloud-trace/pom.xml
similarity index 97%
rename from google-cloud-trace/pom.xml
rename to google-cloud-clients/google-cloud-trace/pom.xml
index 004844f0a3a1..6989b96094cd 100644
--- a/google-cloud-trace/pom.xml
+++ b/google-cloud-clients/google-cloud-trace/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-trace
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceClient.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceClient.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceClient.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceClient.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceSettings.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceSettings.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceSettings.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceSettings.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/package-info.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/package-info.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v1/package-info.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/package-info.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceStub.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceStub.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceStub.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceStub.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStub.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStub.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStub.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStub.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/TraceServiceStubSettings.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceClient.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceClient.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceClient.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceClient.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceSettings.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceSettings.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceSettings.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/TraceServiceSettings.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/package-info.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/package-info.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v2/package-info.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/package-info.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceStub.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceStub.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceStub.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceStub.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStub.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStub.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStub.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStub.java
diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStubSettings.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStubSettings.java
similarity index 100%
rename from google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStubSettings.java
rename to google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/TraceServiceStubSettings.java
diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java
similarity index 100%
rename from google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java
rename to google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java
diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java
similarity index 100%
rename from google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java
rename to google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java
diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java
similarity index 100%
rename from google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java
rename to google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java
diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceSmokeTest.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceSmokeTest.java
similarity index 100%
rename from google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceSmokeTest.java
rename to google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceSmokeTest.java
diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceService.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceService.java
similarity index 100%
rename from google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceService.java
rename to google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceService.java
diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java
similarity index 100%
rename from google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java
rename to google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java
diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java
similarity index 100%
rename from google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java
rename to google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java
diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceSmokeTest.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceSmokeTest.java
similarity index 100%
rename from google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceSmokeTest.java
rename to google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceSmokeTest.java
diff --git a/google-cloud-translate/README.md b/google-cloud-clients/google-cloud-translate/README.md
similarity index 100%
rename from google-cloud-translate/README.md
rename to google-cloud-clients/google-cloud-translate/README.md
diff --git a/google-cloud-translate/pom.xml b/google-cloud-clients/google-cloud-translate/pom.xml
similarity index 96%
rename from google-cloud-translate/pom.xml
rename to google-cloud-clients/google-cloud-translate/pom.xml
index 018c11b7e3c6..350080b7979c 100644
--- a/google-cloud-translate/pom.xml
+++ b/google-cloud-clients/google-cloud-translate/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-translate
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/Detection.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Detection.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/Detection.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Detection.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/Language.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Language.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/Language.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Language.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/Option.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Option.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/Option.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Option.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateException.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateException.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateException.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateException.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateFactory.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateFactory.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateFactory.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateFactory.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateImpl.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateImpl.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateImpl.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateImpl.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/Translation.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Translation.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/Translation.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Translation.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/package-info.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/package-info.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/package-info.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/package-info.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/TranslateRpcFactory.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/TranslateRpcFactory.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/spi/TranslateRpcFactory.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/TranslateRpcFactory.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/HttpTranslateRpc.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/HttpTranslateRpc.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/HttpTranslateRpc.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/HttpTranslateRpc.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/TranslateRpc.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/TranslateRpc.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/TranslateRpc.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/TranslateRpc.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/testing/RemoteTranslateHelper.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/testing/RemoteTranslateHelper.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/testing/RemoteTranslateHelper.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/testing/RemoteTranslateHelper.java
diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/testing/package-info.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/testing/package-info.java
similarity index 100%
rename from google-cloud-translate/src/main/java/com/google/cloud/translate/testing/package-info.java
rename to google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/testing/package-info.java
diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/DetectionTest.java b/google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/DetectionTest.java
similarity index 100%
rename from google-cloud-translate/src/test/java/com/google/cloud/translate/DetectionTest.java
rename to google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/DetectionTest.java
diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/LanguageTest.java b/google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/LanguageTest.java
similarity index 100%
rename from google-cloud-translate/src/test/java/com/google/cloud/translate/LanguageTest.java
rename to google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/LanguageTest.java
diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/OptionTest.java b/google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/OptionTest.java
similarity index 100%
rename from google-cloud-translate/src/test/java/com/google/cloud/translate/OptionTest.java
rename to google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/OptionTest.java
diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/SerializationTest.java b/google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/SerializationTest.java
similarity index 100%
rename from google-cloud-translate/src/test/java/com/google/cloud/translate/SerializationTest.java
rename to google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/SerializationTest.java
diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateExceptionTest.java b/google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateExceptionTest.java
similarity index 100%
rename from google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateExceptionTest.java
rename to google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateExceptionTest.java
diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateImplTest.java b/google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateImplTest.java
similarity index 100%
rename from google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateImplTest.java
rename to google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateImplTest.java
diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateOptionsTest.java b/google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateOptionsTest.java
similarity index 100%
rename from google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateOptionsTest.java
rename to google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateOptionsTest.java
diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateTest.java b/google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateTest.java
similarity index 100%
rename from google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateTest.java
rename to google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslateTest.java
diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslationTest.java b/google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslationTest.java
similarity index 100%
rename from google-cloud-translate/src/test/java/com/google/cloud/translate/TranslationTest.java
rename to google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/TranslationTest.java
diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/it/ITTranslateTest.java b/google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/it/ITTranslateTest.java
similarity index 100%
rename from google-cloud-translate/src/test/java/com/google/cloud/translate/it/ITTranslateTest.java
rename to google-cloud-clients/google-cloud-translate/src/test/java/com/google/cloud/translate/it/ITTranslateTest.java
diff --git a/google-cloud-video-intelligence/README.md b/google-cloud-clients/google-cloud-video-intelligence/README.md
similarity index 100%
rename from google-cloud-video-intelligence/README.md
rename to google-cloud-clients/google-cloud-video-intelligence/README.md
diff --git a/google-cloud-video-intelligence/pom.xml b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
similarity index 97%
rename from google-cloud-video-intelligence/pom.xml
rename to google-cloud-clients/google-cloud-video-intelligence/pom.xml
index 7450c9d7709c..7c706a1f9021 100644
--- a/google-cloud-video-intelligence/pom.xml
+++ b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-video-intelligence
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/package-info.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/package-info.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/package-info.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/package-info.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceCallableFactory.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/package-info.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/package-info.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/package-info.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/package-info.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/package-info.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/package-info.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/package-info.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/package-info.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceCallableFactory.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceCallableFactory.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceCallableFactory.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClient.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClient.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClient.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClient.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSettings.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSettings.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSettings.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/package-info.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/package-info.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/package-info.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/package-info.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceStub.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceStub.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceStub.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStub.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStub.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStub.java
diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStubSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStubSettings.java
similarity index 100%
rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStubSettings.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStubSettings.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceService.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceService.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceService.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceService.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceServiceImpl.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceServiceImpl.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceServiceImpl.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceServiceImpl.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClientTest.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClientTest.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClientTest.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClientTest.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSmokeTest.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSmokeTest.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSmokeTest.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSmokeTest.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceService.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceService.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceService.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceService.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceServiceImpl.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceServiceImpl.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceServiceImpl.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceServiceImpl.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClientTest.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClientTest.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClientTest.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClientTest.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceService.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceService.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceService.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceService.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceServiceImpl.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceServiceImpl.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceServiceImpl.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceServiceImpl.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClientTest.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClientTest.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClientTest.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClientTest.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceService.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceService.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceService.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceService.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceServiceImpl.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceServiceImpl.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceServiceImpl.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceServiceImpl.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClientTest.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClientTest.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClientTest.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClientTest.java
diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSmokeTest.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSmokeTest.java
similarity index 100%
rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSmokeTest.java
rename to google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSmokeTest.java
diff --git a/google-cloud-vision/README.md b/google-cloud-clients/google-cloud-vision/README.md
similarity index 100%
rename from google-cloud-vision/README.md
rename to google-cloud-clients/google-cloud-vision/README.md
diff --git a/google-cloud-vision/pom.xml b/google-cloud-clients/google-cloud-vision/pom.xml
similarity index 97%
rename from google-cloud-vision/pom.xml
rename to google-cloud-clients/google-cloud-vision/pom.xml
index a9c62e19f88f..54e7ba1358e8 100644
--- a/google-cloud-vision/pom.xml
+++ b/google-cloud-clients/google-cloud-vision/pom.xml
@@ -11,8 +11,8 @@
   
   
     com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
   
   
     google-cloud-vision
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/package-info.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/package-info.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1/package-info.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/package-info.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorCallableFactory.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorCallableFactory.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorCallableFactory.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorCallableFactory.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStub.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStub.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStub.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStub.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClient.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClient.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClient.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClient.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/package-info.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/package-info.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/package-info.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/package-info.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorCallableFactory.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorCallableFactory.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorCallableFactory.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorCallableFactory.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStub.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStub.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStub.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStub.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClient.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClient.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClient.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClient.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/package-info.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/package-info.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/package-info.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/package-info.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorCallableFactory.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorCallableFactory.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorCallableFactory.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorCallableFactory.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStub.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStub.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStub.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStub.java
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java
similarity index 100%
rename from google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java
rename to google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java
similarity index 100%
rename from google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java
rename to google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorSmokeTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorSmokeTest.java
similarity index 100%
rename from google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorSmokeTest.java
rename to google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorSmokeTest.java
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotator.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotator.java
similarity index 100%
rename from google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotator.java
rename to google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotator.java
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java
similarity index 100%
rename from google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java
rename to google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClientTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClientTest.java
similarity index 100%
rename from google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClientTest.java
rename to google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClientTest.java
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSmokeTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSmokeTest.java
similarity index 100%
rename from google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSmokeTest.java
rename to google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSmokeTest.java
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotator.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotator.java
similarity index 100%
rename from google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotator.java
rename to google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotator.java
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java
similarity index 100%
rename from google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java
rename to google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClientTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClientTest.java
similarity index 100%
rename from google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClientTest.java
rename to google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClientTest.java
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSmokeTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSmokeTest.java
similarity index 100%
rename from google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSmokeTest.java
rename to google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSmokeTest.java
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotator.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotator.java
similarity index 100%
rename from google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotator.java
rename to google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotator.java
diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java
similarity index 100%
rename from google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java
rename to google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java
diff --git a/java.header b/google-cloud-clients/java.header
similarity index 100%
rename from java.header
rename to google-cloud-clients/java.header
diff --git a/license-checks.xml b/google-cloud-clients/license-checks.xml
similarity index 100%
rename from license-checks.xml
rename to google-cloud-clients/license-checks.xml
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
new file mode 100644
index 000000000000..4f6a41a5420e
--- /dev/null
+++ b/google-cloud-clients/pom.xml
@@ -0,0 +1,879 @@
+
+
+  4.0.0
+  com.google.cloud
+  google-cloud-clients
+  pom
+  0.47.1-alpha-SNAPSHOT
+  Google Cloud
+  https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients
+  
+    Java idiomatic client for Google Cloud Platform services.
+  
+  
+    
+      garrettjonesgoogle
+      Garrett Jones
+      garrettjones@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      pongad
+      Michael Darakananda
+      pongad@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      shinfan
+      Shin Fan
+      shinfan@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      michaelbausor
+      Micheal Bausor
+      michaelbausor@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      vam-google
+      Vadym Matsishevskyi
+      vam@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      tswast
+      Tim Swast
+      tswast@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      neozwu
+      Neo Wu
+      neowu@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      lesv
+      Les Vogel
+      lesv@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      schmidt_sebastian
+      Sebastian Schmidt
+      mrschmidt@google.com
+      Google
+      
+        Developer
+      
+    
+    
+      andreamlin
+      Andrea Lin
+      andrealin@google.com
+      
+        Developer
+      
+    
+    
+      hzyi-google
+      Hanzhen Yi
+      hzyi@google.com
+      
+        Developer
+      
+    
+  
+  
+    Google LLC
+  
+  
+    scm:git:git@github.com:GoogleCloudPlatform/google-cloud.git
+    scm:git:git@github.com:GoogleCloudPlatform/google-cloud.git
+    https://github.com/GoogleCloudPlatform/google-cloud-java
+    HEAD
+  
+  
+    Circle CI
+    https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java
+  
+  
+    https://github.com/GoogleCloudPlatform/google-cloud-java/issues
+    GitHub Issues
+  
+  
+    
+      sonatype-nexus-snapshots
+      https://oss.sonatype.org/content/repositories/snapshots
+    
+    
+      sonatype-nexus-staging
+      https://oss.sonatype.org/service/local/staging/deploy/maven2/
+    
+    
+      github-pages-site
+      Deployment through GitHub's site deployment plugin
+      site/google-cloud-clients
+    
+  
+  
+    
+      Apache-2.0
+      https://www.apache.org/licenses/LICENSE-2.0.txt
+    
+  
+  
+    UTF-8
+    UTF-8
+    github
+    google-cloud
+    0.47.1-alpha-SNAPSHOT
+    1.23.0
+    1.25.0
+    0.9.1
+    1.10.1
+    2.0.7.Final
+    20.0
+    1.23.0
+    3.5.1
+    0.11.1
+    
+    3.4
+    2.6
+  
+  
+  
+    
+      
+        com.google.cloud
+        google-cloud-bom
+        ${bom.version}
+        pom
+        import
+      
+      
+        com.google.apis
+        google-api-services-bigquery
+        v2-rev383-1.23.0
+      
+      
+        com.google.apis
+        google-api-services-compute
+        v1-rev103-1.21.0
+      
+      
+        com.google.cloud.datastore
+        datastore-v1-proto-client
+        1.6.0
+      
+
+      
+        com.google.apis
+        google-api-services-dns
+        v1-rev66-1.23.0
+      
+      
+        commons-fileupload
+        commons-fileupload
+        1.3.2
+      
+
+      
+        com.google.apis
+        google-api-services-cloudresourcemanager
+        v1-rev470-1.23.0
+      
+      
+        com.google.apis
+        google-api-services-storage
+        v1-rev114-1.23.0
+      
+      
+        com.google.apis
+        google-api-services-translate
+        v2-rev47-1.22.0
+      
+      
+        org.json
+        json
+        20160810
+      
+      
+        io.grpc
+        grpc-core
+        ${grpc.version}
+      
+      
+        io.grpc
+        grpc-netty
+        ${grpc.version}
+      
+      
+        io.grpc
+        grpc-netty-shaded
+        ${grpc.version}
+      
+      
+        io.grpc
+        grpc-stub
+        ${grpc.version}
+      
+      
+        io.grpc
+        grpc-auth
+        ${grpc.version}
+      
+      
+        io.grpc
+        grpc-protobuf
+        ${grpc.version}
+      
+      
+        io.grpc
+        grpc-context
+        ${grpc.version}
+      
+      
+        io.grpc
+        grpc-testing
+        ${grpc.version}
+      
+      
+        joda-time
+        joda-time
+        2.9.2
+      
+      
+        com.google.code.findbugs
+        jsr305
+        3.0.1
+      
+      
+        com.google.protobuf
+        protobuf-java
+        ${protobuf.version}
+      
+      
+        com.google.protobuf
+        protobuf-java-util
+        ${protobuf.version}
+      
+      
+        com.google.guava
+        guava
+        ${guava.version}
+      
+      
+        com.google.auto.value
+        auto-value
+        1.4
+      
+      
+        com.google.http-client
+        google-http-client
+        ${http-client.version}
+      
+      
+        com.google.http-client
+        google-http-client-appengine
+        ${http-client.version}
+      
+      
+        com.google.http-client
+        google-http-client-jackson2
+        ${http-client.version}
+      
+      
+        com.google.http-client
+        google-http-client-jackson
+        ${http-client.version}
+      
+      
+        com.google.oauth-client
+        google-oauth-client
+        1.23.0
+      
+      
+        com.google.api-client
+        google-api-client-appengine
+        ${api-client.version}
+      
+      
+        com.google.api-client
+        google-api-client
+        ${api-client.version}
+      
+      
+        com.google.auth
+        google-auth-library-credentials
+        ${google.auth.version}
+      
+      
+        com.google.auth
+        google-auth-library-oauth2-http
+        ${google.auth.version}
+      
+      
+        io.netty
+        netty-tcnative-boringssl-static
+        ${nettyssl.version}
+      
+      
+        io.opencensus
+        opencensus-api
+        ${opencensus.version}
+      
+      
+        io.opencensus
+        opencensus-contrib-grpc-util
+        ${opencensus.version}
+      
+      
+        io.opencensus
+        opencensus-contrib-http-util
+        ${opencensus.version}
+      
+      
+      
+        com.google.guava
+        guava-testlib
+        ${guava.version}
+      
+      
+        junit
+        junit
+        4.12
+      
+      
+        org.hamcrest
+        hamcrest-core
+        1.3
+      
+      
+        com.google.errorprone
+        error_prone_annotations
+        2.2.0
+      
+      
+        org.easymock
+        easymock
+        ${easymock.version}
+        
+          
+            org.objenesis
+            objenesis
+          
+        
+      
+      
+        org.objenesis
+        objenesis
+        ${objenesis.version}
+      
+      
+        org.mockito
+        mockito-all
+        1.9.5
+      
+      
+        com.google.truth
+        truth
+        0.30
+      
+    
+  
+  
+    google-cloud-bigtable
+    google-cloud-bigquery
+    google-cloud-bigquerydatatransfer
+    google-cloud-compute
+    google-cloud-container
+    google-cloud-contrib
+    google-cloud-core
+    google-cloud-core-http
+    google-cloud-core-grpc
+    google-cloud-dataproc
+    google-cloud-datastore
+    google-cloud-dlp
+    google-cloud-dialogflow
+    google-cloud-dns
+    google-cloud-errorreporting
+    google-cloud-firestore
+    google-cloud-language
+    google-cloud-logging
+    google-cloud-monitoring
+    google-cloud-notification
+    google-cloud-os-login
+    google-cloud-pubsub
+    google-cloud-redis
+    google-cloud-resourcemanager
+    google-cloud-spanner
+    google-cloud-speech
+    google-cloud-storage
+    google-cloud-texttospeech
+    google-cloud-trace
+    google-cloud-translate
+    google-cloud-vision
+    google-cloud-video-intelligence
+  
+  
+    
+      
+        never
+      
+      
+        false
+      
+      central
+      Central Repository
+      http://repo.maven.apache.org/maven2
+    
+  
+  
+    
+      
+        
+          org.codehaus.mojo
+          cobertura-maven-plugin
+          2.7
+        
+        
+          org.codehaus.mojo
+          exec-maven-plugin
+          1.4.0
+          
+            true
+            java
+          
+        
+      
+    
+    
+      
+        org.apache.maven.plugins
+        maven-surefire-plugin
+        2.19.1
+        
+          
+          
+            **/*SmokeTest.java
+            **/IT*.java
+            **/*SmokeTest.java
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-enforcer-plugin
+        3.0.0-M1
+        
+          
+            enforce
+            
+              enforce
+            
+            
+              
+                
+                  [3.0,)
+                
+                
+                  [1.7,)
+                
+                
+                
+              
+            
+          
+        
+      
+      
+        org.codehaus.mojo
+        exec-maven-plugin
+        1.4.0
+        
+          
+            
+              java
+            
+          
+        
+        
+          
+          -1
+        
+      
+      
+        org.apache.maven.plugins
+        maven-failsafe-plugin
+        2.19.1
+        
+          
+            
+              integration-test
+              verify
+            
+          
+        
+      
+      
+        maven-jar-plugin
+        2.6
+        
+          
+            true
+            true
+            
+              true
+              true
+            
+            
+              ${project.artifactId}
+              ${project.groupId}
+              ${project.version}
+            
+          
+        
+        
+          
+            
+              test-jar
+            
+          
+        
+      
+      
+        maven-compiler-plugin
+        3.5.1
+        
+          1.7
+          1.7
+          UTF-8
+          -Xlint:unchecked
+          -Xlint:deprecation
+          true
+        
+      
+      
+        org.apache.maven.plugins
+        maven-gpg-plugin
+        1.6
+        
+          
+            sign-artifacts
+            deploy
+            
+              sign
+            
+          
+        
+      
+      
+        org.sonatype.plugins
+        nexus-staging-maven-plugin
+        1.6.6
+        true
+        
+          sonatype-nexus-staging
+          https://oss.sonatype.org/
+          false
+        
+      
+      
+        org.eluder.coveralls
+        coveralls-maven-plugin
+        4.1.0
+        
+          
+            ${basedir}/target/coverage.xml
+          
+        
+      
+      
+        org.codehaus.mojo
+        cobertura-maven-plugin
+        2.7
+        
+          ${basedir}/target
+          
+            xml
+            html
+          
+          true
+          
+            true
+            
+              com/google/cloud/**/*.class
+            
+            
+              com/google/cloud/examples/**/*.class
+              com/google/cloud/**/AutoValue_*.class
+            
+          
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-checkstyle-plugin
+        2.17
+        
+          
+            com.puppycrawl.tools
+            checkstyle
+            6.15
+          
+        
+        
+          
+            checkstyle
+            validate
+            
+              check
+            
+            
+              java.header
+              license-checks.xml
+              true
+              true
+              error
+              true
+              true
+              com/google/cloud/*/v*/**
+            
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-site-plugin
+        3.4
+        
+          true
+          
+            
+              org.apache.maven.plugins
+              maven-project-info-reports-plugin
+              2.8.1
+              
+                
+                  
+                    index
+                    dependency-info
+                    project-team
+                    cim
+                    issue-tracking
+                    license
+                    scm
+                    dependency-management
+                    distribution-management
+                    summary
+                    modules
+                  
+                
+              
+              
+                true
+                true
+                true
+                true
+                ${site.installationModule}
+                jar
+              
+            
+            
+              org.apache.maven.plugins
+              maven-javadoc-plugin
+              2.10.3
+              
+                
+                  html
+                  
+                    javadoc
+                  
+                
+              
+              
+                true
+                protected
+                true
+                ${project.build.directory}/javadoc
+                
+                  
+                    API packages
+                    com.google.cloud*
+                  
+                  
+                    Test helpers packages
+                    com.google.cloud.bigquery.testing:com.google.cloud.datastore.testing:com.google.cloud.dns.testing:com.google.cloud.logging.testing:com.google.cloud.pubsub.testing:com.google.cloud.resourcemanager.testing:com.google.cloud.storage.testing:com.google.cloud.translate.testing:com.google.cloud.spanner.testing:com.google.cloud.storage.contrib.nio.testing
+                  
+                  
+                    Example packages
+                    com.google.cloud.examples.*:com.google.cloud.nio.examples
+                  
+                  
+                    SPI packages
+                    com.google.cloud.spi*:com.google.cloud.bigquery.spi*:com.google.cloud.datastore.spi*:com.google.cloud.dns.spi*:com.google.cloud.logging.spi*:com.google.cloud.resourcemanager.spi*:com.google.cloud.spanner.spi*:com.google.cloud.storage.spi*:com.google.cloud.translate.spi*
+                  
+                  
+                    Stub packages
+                    com.google.cloud.bigquerydatatransfer.v1.stub:com.google.cloud.container.v1.stub:com.google.cloud.dlp.v2beta1.stub:com.google.cloud.dlp.v2.stub:com.google.cloud.dialogflow.v2beta1.stub:com.google.cloud.dialogflow.v2.stub:com.google.cloud.errorreporting.v1beta1.stub:com.google.cloud.firestore.v1beta1.stub:com.google.cloud.language.v1beta2.stub:com.google.cloud.language.v1.stub:com.google.cloud.logging.v2.stub:com.google.cloud.monitoring.v3.stub:com.google.cloud.pubsub.v1.stub:com.google.cloud.speech.v1beta1.stub:com.google.cloud.speech.v1.stub:com.google.cloud.texttospeech.v1beta1.stub:com.google.cloud.trace.v1.stub:com.google.cloud.trace.v2.stub:com.google.cloud.videointelligence.v1beta1.stub:com.google.cloud.videointelligence.v1beta2.stub:com.google.cloud.videointelligence.v1.stub:com.google.cloud.videointelligence.v1p1beta1.stub:com.google.cloud.vision.v1.stub:com.google.cloud.vision.v1p1beta1.stub:com.google.cloud.vision.v1p2beta1.stub
+                  
+                  
+                    Deprecated packages
+                    com.google.cloud.compute.*
+                  
+                
+                
+                  https://developers.google.com/protocol-buffers/docs/reference/java/
+                  http://google.github.io/google-auth-library-java/releases/${google.auth.version}/apidocs/
+                  http://googleapis.github.io/gax-java/${gax.version}/apidocs/
+                  http://googleapis.github.io/googleapis/java/all/latest/apidocs/
+                
+              
+            
+          
+        
+      
+    
+  
+  
+    
+      release
+      
+        
+          
+            org.apache.maven.plugins
+            maven-source-plugin
+            
+            2.4
+            
+              
+                attach-sources
+                
+                  jar-no-fork
+                
+              
+            
+          
+          
+            org.apache.maven.plugins
+            maven-javadoc-plugin
+            2.10.3
+            
+              
+                attach-javadocs
+                
+                  jar
+                
+              
+            
+            
+              
+                http://google.github.io/google-auth-library-java/releases/${google.auth.version}/apidocs/
+              
+            
+          
+        
+      
+    
+
+    
+      
+      veneer-dev
+      
+        
+          
+            com.theoryinpractise
+            googleformatter-maven-plugin
+            1.5.1
+            
+              
+                reformat-sources
+                process-sources
+                
+                  format
+                
+                
+                  
+                  true
+                
+              
+            
+          
+        
+      
+    
+    
+      
+      smoke-test
+      
+        
+          
+            org.apache.maven.plugins
+            maven-failsafe-plugin
+            2.19.1
+            
+              
+                
+                  integration-test
+                  verify
+                
+              
+            
+            
+              
+                **/*SmokeTest.java
+              
+            
+          
+          
+            org.apache.maven.plugins
+            maven-surefire-plugin
+            
+              
+              true
+            
+          
+        
+      
+    
+  
+
diff --git a/google-cloud-clients/src/site/site.xml b/google-cloud-clients/src/site/site.xml
new file mode 100644
index 000000000000..9b017fa0c74a
--- /dev/null
+++ b/google-cloud-clients/src/site/site.xml
@@ -0,0 +1,32 @@
+
+
+
+  
+    org.apache.maven.skins
+    maven-fluido-skin
+    1.4
+  
+  
+  
+    
+    
+    
+  
+
+
diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
index 7f70ae22d9f4..56d7ea09f3eb 100644
--- a/google-cloud-examples/pom.xml
+++ b/google-cloud-examples/pom.xml
@@ -1,6 +1,7 @@
 
 
   4.0.0
+  com.google.cloud
   google-cloud-examples
   0.47.1-alpha-SNAPSHOT
   jar
@@ -9,32 +10,108 @@
   
     Examples for google-cloud.
   
-  
-    com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
-  
   
     google-cloud-examples
   
+  
+    
+      
+        com.google.cloud
+        google-cloud-bom
+        0.47.1-alpha-SNAPSHOT
+        pom
+        import
+      
+    
+  
   
     
-      ${project.groupId}
-      google-cloud
+      com.google.cloud
+      google-cloud-bigquery
     
     
-      ${project.groupId}
+      com.google.cloud
+      google-cloud-compute
+    
+    
+      com.google.cloud
+      google-cloud-datastore
+    
+    
+      com.google.cloud
+      google-cloud-dns
+    
+    
+      com.google.cloud
+      google-cloud-language
+    
+    
+      com.google.cloud
+      google-cloud-logging
+    
+    
+      com.google.cloud
       google-cloud-nio
-      ${project.version}
     
+    
+      com.google.cloud
+      google-cloud-pubsub
+    
+    
+      com.google.cloud
+      google-cloud-resourcemanager
+    
+    
+      com.google.cloud
+      google-cloud-spanner
+    
+    
+      com.google.cloud
+      google-cloud-speech
+    
+    
+      com.google.cloud
+      google-cloud-storage
+    
+    
+      com.google.cloud
+      google-cloud-translate
+    
+    
+      com.google.cloud
+      google-cloud-vision
+    
+
+    
     
       junit
       junit
+      4.12
       test
     
   
   
     
+      
+        maven-compiler-plugin
+        3.5.1
+        
+          1.7
+          1.7
+          UTF-8
+          -Xlint:unchecked
+          -Xlint:deprecation
+          true
+        
+      
+      
+        org.apache.maven.plugins
+        maven-site-plugin
+        3.4
+        
+          true
+        
+      
       
         org.codehaus.mojo
         exec-maven-plugin
diff --git a/google-cloud-testing/google-cloud-managedtest/pom.xml b/google-cloud-testing/google-cloud-managedtest/pom.xml
index ded4ef93af7c..97d490172194 100644
--- a/google-cloud-testing/google-cloud-managedtest/pom.xml
+++ b/google-cloud-testing/google-cloud-managedtest/pom.xml
@@ -44,16 +44,6 @@
       test-jar
     
 
-    
-      ${project.groupId}
-      google-cloud-examples
-    
-    
-      ${project.groupId}
-      google-cloud-examples
-      test-jar
-    
-
     
       ${project.groupId}
       google-cloud-core
diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml
index 02cd611796fc..561fe7c3437e 100644
--- a/google-cloud-testing/pom.xml
+++ b/google-cloud-testing/pom.xml
@@ -1,6 +1,9 @@
 
-
+
   4.0.0
+  com.google.cloud
   google-cloud-testing
   0.47.1-alpha-SNAPSHOT
   pom
@@ -10,11 +13,6 @@
   
     Contains packages used for testing google-cloud libraries on various platforms.
   
-  
-    com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
-  
   
     google-cloud-testing
     1.9.51
@@ -29,6 +27,13 @@
   
   
     
+      
+        com.google.cloud
+        google-cloud-bom
+        0.47.1-alpha-SNAPSHOT
+        pom
+        import
+      
       
         ${project.groupId}
         google-cloud-managedtest
@@ -39,6 +44,63 @@
         appengine-api-1.0-sdk
         ${appengine.sdk.version}
       
+
+      
+      
+        com.google.guava
+        guava-testlib
+        20.0
+      
+      
+        junit
+        junit
+        4.12
+      
+      
+        org.objenesis
+        objenesis
+        2.6
+      
+      
+        com.google.truth
+        truth
+        0.30
+      
+      
+        org.easymock
+        easymock
+        3.4
+        
+          
+            org.objenesis
+            objenesis
+          
+        
+      
     
   
+  
+    
+      
+        maven-compiler-plugin
+        3.5.1
+        
+          1.7
+          1.7
+          UTF-8
+          -Xlint:unchecked
+          -Xlint:deprecation
+          true
+        
+      
+      
+        org.apache.maven.plugins
+        maven-site-plugin
+        3.4
+        
+          true
+        
+      
+    
+  
 
diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml
index bcb585c2ef6c..348764adf9cf 100644
--- a/google-cloud-util/google-cloud-compat-checker/pom.xml
+++ b/google-cloud-util/google-cloud-compat-checker/pom.xml
@@ -21,6 +21,7 @@
     
       io.netty
       netty-tcnative-boringssl-static
+      2.0.7.Final
     
     
       
-  
   
     google-cloud-compat-checker
   
+  
+    
+      
+        org.apache.maven.plugins
+        maven-site-plugin
+        3.4
+        
+          true
+        
+      
+    
+  
 
diff --git a/google-cloud/README.md b/google-cloud/README.md
deleted file mode 100644
index d7a843a7fb72..000000000000
--- a/google-cloud/README.md
+++ /dev/null
@@ -1,78 +0,0 @@
-Google Cloud Java (All API Clients)
-===================================
-
-Umbrella package that declares a dependency on all currently-available Java clients for [Google Cloud Platform][cloud-platform] services.
-
-[![CircleCI](https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java/tree/master.svg?style=shield)](https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java/tree/master)
-[![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/google-cloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/google-cloud-java?branch=master)
-[![Maven](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud.svg)]( https://img.shields.io/maven-central/v/com.google.cloud/google-cloud.svg)
-[![Codacy Badge](https://api.codacy.com/project/badge/grade/9da006ad7c3a4fe1abd142e77c003917)](https://www.codacy.com/app/mziccard/google-cloud-java)
-[![Dependency Status](https://www.versioneye.com/user/projects/58fe4c8d6ac171426c414772/badge.svg?style=flat)](https://www.versioneye.com/user/projects/58fe4c8d6ac171426c414772)
-
-- See the [root README of google-cloud-java](https://github.com/GoogleCloudPlatform/google-cloud-java) for more details
-on which clients are alpha, beta, and GA.
-
-> Note: This package does not have guaranteed stability and may experience backwards-incompatible changes.
-> This does not imply anything about the stability of the packages it depends on (i.e. the individual API client
-> libraries), only that particular dependencies may be added or removed.
-
-Quickstart
-----------
-
-[//]: # ({x-version-update-start:google-cloud:released})
-If you are using Maven, add this to your pom.xml file
-```xml
-
-  com.google.cloud
-  google-cloud
-  0.47.0-alpha
-
-```
-If you are using Gradle, add this to your dependencies
-```Groovy
-compile 'com.google.cloud:google-cloud:0.47.0-alpha'
-```
-If you are using SBT, add this to your dependencies
-```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud" % "0.47.0-alpha"
-```
-[//]: # ({x-version-update-end})
-
-Troubleshooting
----------------
-
-To get help, follow the instructions in the [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/troubleshooting/readme.md#troubleshooting).
-
-Java Versions
--------------
-
-Java 7 or above is required for using this client.
-
-Versioning
-----------
-
-This library follows [Semantic Versioning](http://semver.org/).
-
-It is currently in major version zero (``0.y.z``), which means that anything
-may change at any time and the public API should not be considered
-stable.
-
-Contributing
-------------
-
-Contributions to this library are always welcome and highly encouraged.
-
-See `google-cloud-java`'s [CONTRIBUTING] documentation and the [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started.
-
-Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
-
-License
--------
-
-Apache 2.0 - See [LICENSE] for more information.
-
-
-[CONTRIBUTING]:https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/CONTRIBUTING.md
-[code-of-conduct]:https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
-[LICENSE]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/LICENSE
-[cloud-platform]: https://cloud.google.com/
diff --git a/google-cloud/pom.xml b/google-cloud/pom.xml
deleted file mode 100644
index 992be0d7674c..000000000000
--- a/google-cloud/pom.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-  4.0.0
-  google-cloud
-  0.47.1-alpha-SNAPSHOT
-  jar
-  Google Cloud
-  https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud
-  
-    Java idiomatic client for Google Cloud Platform services.
-  
-  
-    com.google.cloud
-    google-cloud-pom
-    0.47.1-alpha-SNAPSHOT
-  
-  
-    
-      ${project.groupId}
-      google-cloud-bigtable
-    
-    
-      ${project.groupId}
-      google-cloud-bigquery
-    
-    
-      ${project.groupId}
-      google-cloud-compute
-    
-    
-      ${project.groupId}
-      google-cloud-core
-    
-    
-      ${project.groupId}
-      google-cloud-datastore
-    
-    
-      ${project.groupId}
-      google-cloud-dialogflow
-    
-    
-      ${project.groupId}
-      google-cloud-dns
-    
-    
-      ${project.groupId}
-      google-cloud-errorreporting
-    
-    
-      ${project.groupId}
-      google-cloud-firestore
-    
-    
-      ${project.groupId}
-      google-cloud-language
-    
-    
-      ${project.groupId}
-      google-cloud-logging
-    
-    
-      ${project.groupId}
-      google-cloud-monitoring
-    
-    
-      ${project.groupId}
-      google-cloud-pubsub
-    
-    
-      ${project.groupId}
-      google-cloud-resourcemanager
-    
-    
-      ${project.groupId}
-      google-cloud-speech
-    
-    
-      ${project.groupId}
-      google-cloud-storage
-    
-    
-      ${project.groupId}
-      google-cloud-trace
-    
-    
-      ${project.groupId}
-      google-cloud-translate
-    
-    
-      ${project.groupId}
-      google-cloud-vision
-    
-    
-      ${project.groupId}
-      google-cloud-spanner
-    
-  
-
diff --git a/pom.xml b/pom.xml
index fde14b1386b6..f568bb6d57aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,123 +1,63 @@
 
-
+
   4.0.0
-  com.google.cloud
-  google-cloud-pom
+  com.google.api
+  google-cloud-java
   pom
-  0.47.1-alpha-SNAPSHOT
-  Google Cloud
+  0.0.1-SNAPSHOT
+  Google Cloud Java
   https://github.com/GoogleCloudPlatform/google-cloud-java
   
-    Java idiomatic client for Google Cloud Platform services.
+    Root project for Google Cloud clients and their dependencies
   
+  
+    UTF-8
+    UTF-8
+  
   
     
       garrettjonesgoogle
       Garrett Jones
       garrettjones@google.com
-      Google
-      
-        Developer
-      
     
     
       pongad
       Michael Darakananda
       pongad@google.com
-      Google
-      
-        Developer
-      
-    
-    
-      shinfan
-      Shin Fan
-      shinfan@google.com
-      Google
-      
-        Developer
-      
     
     
       michaelbausor
       Micheal Bausor
       michaelbausor@google.com
-      Google
-      
-        Developer
-      
     
     
       vam-google
       Vadym Matsishevskyi
       vam@google.com
-      Google
-      
-        Developer
-      
-    
-    
-      tswast
-      Tim Swast
-      tswast@google.com
-      Google
-      
-        Developer
-      
     
     
       neozwu
       Neo Wu
-      neowu@google.com
-      Google
-      
-        Developer
-      
-    
-    
-      lesv
-      Les Vogel
-      lesv@google.com
-      Google
-      
-        Developer
-      
-    
-    
-      schmidt_sebastian
-      Sebastian Schmidt
-      mrschmidt@google.com
-      Google
-      
-        Developer
-      
+      neowu@google.co
     
     
       andreamlin
       Andrea Lin
       andrealin@google.com
-      
-        Developer
-      
     
     
       hzyi-google
       Hanzhen Yi
       hzyi@google.com
-      
-        Developer
-      
     
   
   
     Google LLC
   
   
-    scm:git:git@github.com:GoogleCloudPlatform/google-cloud.git
-    scm:git:git@github.com:GoogleCloudPlatform/google-cloud.git
-    https://github.com/GoogleCloudPlatform/google-cloud
+    scm:git:git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    scm:git:git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    https://github.com/GoogleCloudPlatform/google-cloud-java
     HEAD
   
   
@@ -128,761 +68,18 @@
     https://github.com/GoogleCloudPlatform/google-cloud-java/issues
     GitHub Issues
   
-  
-    
-      sonatype-nexus-snapshots
-      https://oss.sonatype.org/content/repositories/snapshots
-    
-    
-      sonatype-nexus-staging
-      https://oss.sonatype.org/service/local/staging/deploy/maven2/
-    
-    
-      github-pages-site
-      Deployment through GitHub's site deployment plugin
-      site
-    
-  
   
     
       Apache-2.0
       https://www.apache.org/licenses/LICENSE-2.0.txt
     
   
-  
-    UTF-8
-    UTF-8
-    github
-    google-cloud
-    0.47.1-alpha-SNAPSHOT
-    1.23.0
-    1.25.0
-    0.9.1
-    1.10.1
-    2.0.7.Final
-    20.0
-    1.23.0
-    3.5.1
-    0.11.1
-    
-    3.4
-    2.6
-  
-  
-  
-    
-      
-        com.google.cloud
-        google-cloud-bom
-        ${bom.version}
-        pom
-        import
-      
-      
-        com.google.apis
-        google-api-services-bigquery
-        v2-rev383-1.23.0
-      
-      
-        com.google.apis
-        google-api-services-compute
-        v1-rev103-1.21.0
-      
-      
-        com.google.cloud.datastore
-        datastore-v1-proto-client
-        1.6.0
-      
-
-      
-        com.google.apis
-        google-api-services-dns
-        v1-rev66-1.23.0
-      
-      
-        commons-fileupload
-        commons-fileupload
-        1.3.2
-      
-
-      
-        com.google.apis
-        google-api-services-cloudresourcemanager
-        v1-rev470-1.23.0
-      
-      
-        com.google.apis
-        google-api-services-storage
-        v1-rev114-1.23.0
-      
-      
-        com.google.apis
-        google-api-services-translate
-        v2-rev47-1.22.0
-      
-      
-        org.json
-        json
-        20160810
-      
-      
-        io.grpc
-        grpc-core
-        ${grpc.version}
-      
-      
-        io.grpc
-        grpc-netty
-        ${grpc.version}
-      
-      
-        io.grpc
-        grpc-netty-shaded
-        ${grpc.version}
-      
-      
-        io.grpc
-        grpc-stub
-        ${grpc.version}
-      
-      
-        io.grpc
-        grpc-auth
-        ${grpc.version}
-      
-      
-        io.grpc
-        grpc-protobuf
-        ${grpc.version}
-      
-      
-        io.grpc
-        grpc-context
-        ${grpc.version}
-      
-      
-        io.grpc
-        grpc-testing
-        ${grpc.version}
-      
-      
-        joda-time
-        joda-time
-        2.9.2
-      
-      
-        com.google.code.findbugs
-        jsr305
-        3.0.1
-      
-      
-        com.google.protobuf
-        protobuf-java
-        ${protobuf.version}
-      
-      
-        com.google.protobuf
-        protobuf-java-util
-        ${protobuf.version}
-      
-      
-        com.google.guava
-        guava
-        ${guava.version}
-      
-      
-        com.google.auto.value
-        auto-value
-        1.4
-      
-      
-        com.google.http-client
-        google-http-client
-        ${http-client.version}
-      
-      
-        com.google.http-client
-        google-http-client-appengine
-        ${http-client.version}
-      
-      
-        com.google.http-client
-        google-http-client-jackson2
-        ${http-client.version}
-      
-      
-        com.google.http-client
-        google-http-client-jackson
-        ${http-client.version}
-      
-      
-        com.google.oauth-client
-        google-oauth-client
-        1.23.0
-      
-      
-        com.google.api-client
-        google-api-client-appengine
-        ${api-client.version}
-      
-      
-        com.google.api-client
-        google-api-client
-        ${api-client.version}
-      
-      
-        com.google.auth
-        google-auth-library-credentials
-        ${google.auth.version}
-      
-      
-        com.google.auth
-        google-auth-library-oauth2-http
-        ${google.auth.version}
-      
-      
-        io.netty
-        netty-tcnative-boringssl-static
-        ${nettyssl.version}
-      
-      
-        io.opencensus
-        opencensus-api
-        ${opencensus.version}
-      
-      
-        io.opencensus
-        opencensus-contrib-grpc-util
-        ${opencensus.version}
-      
-      
-        io.opencensus
-        opencensus-contrib-http-util
-        ${opencensus.version}
-      
-      
-      
-        com.google.guava
-        guava-testlib
-        ${guava.version}
-      
-      
-        junit
-        junit
-        4.12
-      
-      
-        org.hamcrest
-        hamcrest-core
-        1.3
-      
-      
-        com.google.errorprone
-        error_prone_annotations
-        2.2.0
-      
-      
-        org.easymock
-        easymock
-        ${easymock.version}
-        
-          
-            org.objenesis
-            objenesis
-          
-        
-      
-      
-        org.objenesis
-        objenesis
-        ${objenesis.version}
-      
-      
-        org.mockito
-        mockito-all
-        1.9.5
-      
-      
-        com.google.truth
-        truth
-        0.30
-      
-    
-  
   
+    google-api-grpc
     google-cloud-bom
-    google-cloud-bigtable
-    google-cloud-bigquery
-    google-cloud-bigquerydatatransfer
-    google-cloud-compute
-    google-cloud-container
-    google-cloud-contrib
-    google-cloud-core
-    google-cloud-core-http
-    google-cloud-core-grpc
-    google-cloud-dataproc
-    google-cloud-datastore
-    google-cloud-dlp
-    google-cloud-dialogflow
-    google-cloud-dns
-    google-cloud-errorreporting
+    google-cloud-clients
     google-cloud-examples
-    google-cloud-firestore
-    google-cloud-language
-    google-cloud-logging
-    google-cloud-monitoring
-    google-cloud-notification
-    google-cloud-os-login
-    google-cloud-pubsub
-    google-cloud-redis
-    google-cloud-resourcemanager
-    google-cloud-spanner
-    google-cloud-speech
-    google-cloud-storage
-    google-cloud-texttospeech
-    google-cloud-trace
-    google-cloud-translate
-    google-cloud-vision
-    google-cloud-video-intelligence
-    google-cloud
-
-    
-    
+    google-cloud-testing
+    google-cloud-util
   
-  
-    
-      
-        never
-      
-      
-        false
-      
-      central
-      Central Repository
-      http://repo.maven.apache.org/maven2
-    
-  
-  
-    
-      
-        
-          org.codehaus.mojo
-          cobertura-maven-plugin
-          2.7
-        
-        
-          org.codehaus.mojo
-          exec-maven-plugin
-          1.4.0
-          
-            true
-            java
-          
-        
-      
-    
-    
-      
-        org.apache.maven.plugins
-        maven-surefire-plugin
-        2.19.1
-        
-          
-          
-            **/*SmokeTest.java
-            **/IT*.java
-            **/*SmokeTest.java
-          
-        
-      
-      
-        org.apache.maven.plugins
-        maven-enforcer-plugin
-        3.0.0-M1
-        
-          
-            enforce
-            
-              enforce
-            
-            
-              
-                
-                  [3.0,)
-                
-                
-                  [1.7,)
-                
-                
-                
-              
-            
-          
-        
-      
-      
-        org.codehaus.mojo
-        exec-maven-plugin
-        1.4.0
-        
-          
-            
-              java
-            
-          
-        
-        
-          
-          -1
-        
-      
-      
-        org.apache.maven.plugins
-        maven-failsafe-plugin
-        2.19.1
-        
-          
-            
-              integration-test
-              verify
-            
-          
-        
-      
-      
-        maven-jar-plugin
-        2.6
-        
-          
-            true
-            true
-            
-              true
-              true
-            
-            
-              ${project.artifactId}
-              ${project.groupId}
-              ${project.version}
-            
-          
-        
-        
-          
-            
-              test-jar
-            
-          
-        
-      
-      
-        maven-compiler-plugin
-        3.5.1
-        
-          1.7
-          1.7
-          UTF-8
-          -Xlint:unchecked
-          -Xlint:deprecation
-          true
-        
-      
-      
-        org.apache.maven.plugins
-        maven-gpg-plugin
-        1.6
-        
-          
-            sign-artifacts
-            deploy
-            
-              sign
-            
-          
-        
-      
-      
-        org.sonatype.plugins
-        nexus-staging-maven-plugin
-        1.6.6
-        true
-        
-          sonatype-nexus-staging
-          https://oss.sonatype.org/
-          false
-        
-      
-      
-        org.eluder.coveralls
-        coveralls-maven-plugin
-        4.1.0
-        
-          
-            ${basedir}/target/coverage.xml
-          
-        
-      
-      
-        org.codehaus.mojo
-        cobertura-maven-plugin
-        2.7
-        
-          ${basedir}/target
-          
-            xml
-            html
-          
-          true
-          
-            true
-            
-              com/google/cloud/**/*.class
-            
-            
-              com/google/cloud/examples/**/*.class
-              com/google/cloud/**/AutoValue_*.class
-            
-          
-          
-        
-      
-      
-        org.apache.maven.plugins
-        maven-checkstyle-plugin
-        2.17
-        
-          
-            com.puppycrawl.tools
-            checkstyle
-            6.15
-          
-        
-        
-          
-            checkstyle
-            validate
-            
-              check
-            
-            
-              java.header
-              license-checks.xml
-              true
-              true
-              error
-              true
-              true
-              com/google/cloud/*/v*/**
-            
-          
-        
-      
-      
-        org.apache.maven.plugins
-        maven-site-plugin
-        3.4
-        
-          true
-          
-            
-              org.apache.maven.plugins
-              maven-project-info-reports-plugin
-              2.8.1
-              
-                
-                  
-                    index
-                    dependency-info
-                    project-team
-                    cim
-                    issue-tracking
-                    license
-                    scm
-                    dependency-management
-                    distribution-management
-                    summary
-                    modules
-                  
-                
-              
-              
-                true
-                true
-                true
-                true
-                ${site.installationModule}
-                jar
-              
-            
-            
-              org.apache.maven.plugins
-              maven-javadoc-plugin
-              2.10.3
-              
-                
-                  html
-                  
-                    javadoc
-                  
-                
-              
-              
-                true
-                protected
-                true
-                ${project.build.directory}/javadoc
-                
-                  
-                    API packages
-                    com.google.cloud*
-                  
-                  
-                    Test helpers packages
-                    com.google.cloud.bigquery.testing:com.google.cloud.datastore.testing:com.google.cloud.dns.testing:com.google.cloud.logging.testing:com.google.cloud.pubsub.testing:com.google.cloud.resourcemanager.testing:com.google.cloud.storage.testing:com.google.cloud.translate.testing:com.google.cloud.spanner.testing:com.google.cloud.storage.contrib.nio.testing
-                  
-                  
-                    Example packages
-                    com.google.cloud.examples.*:com.google.cloud.nio.examples
-                  
-                  
-                    SPI packages
-                    com.google.cloud.spi*:com.google.cloud.bigquery.spi*:com.google.cloud.datastore.spi*:com.google.cloud.dns.spi*:com.google.cloud.logging.spi*:com.google.cloud.resourcemanager.spi*:com.google.cloud.spanner.spi*:com.google.cloud.storage.spi*:com.google.cloud.translate.spi*
-                  
-                  
-                    Stub packages
-                    com.google.cloud.bigquerydatatransfer.v1.stub:com.google.cloud.container.v1.stub:com.google.cloud.dlp.v2beta1.stub:com.google.cloud.dlp.v2.stub:com.google.cloud.dialogflow.v2beta1.stub:com.google.cloud.dialogflow.v2.stub:com.google.cloud.errorreporting.v1beta1.stub:com.google.cloud.firestore.v1beta1.stub:com.google.cloud.language.v1beta2.stub:com.google.cloud.language.v1.stub:com.google.cloud.logging.v2.stub:com.google.cloud.monitoring.v3.stub:com.google.cloud.pubsub.v1.stub:com.google.cloud.speech.v1beta1.stub:com.google.cloud.speech.v1.stub:com.google.cloud.texttospeech.v1beta1.stub:com.google.cloud.trace.v1.stub:com.google.cloud.trace.v2.stub:com.google.cloud.videointelligence.v1beta1.stub:com.google.cloud.videointelligence.v1beta2.stub:com.google.cloud.videointelligence.v1.stub:com.google.cloud.videointelligence.v1p1beta1.stub:com.google.cloud.vision.v1.stub:com.google.cloud.vision.v1p1beta1.stub:com.google.cloud.vision.v1p2beta1.stub
-                  
-                  
-                    Deprecated packages
-                    com.google.cloud.compute.*
-                  
-                
-                
-                  https://developers.google.com/protocol-buffers/docs/reference/java/
-                  http://google.github.io/google-auth-library-java/releases/${google.auth.version}/apidocs/
-                  http://googleapis.github.io/gax-java/${gax.version}/apidocs/
-                  http://googleapis.github.io/googleapis/java/all/latest/apidocs/
-                
-              
-            
-          
-        
-      
-    
-  
-  
-    
-      release
-      
-        
-          
-            org.apache.maven.plugins
-            maven-source-plugin
-            
-            2.4
-            
-              
-                attach-sources
-                
-                  jar-no-fork
-                
-              
-            
-          
-          
-            org.apache.maven.plugins
-            maven-javadoc-plugin
-            2.10.3
-            
-              
-                attach-javadocs
-                
-                  jar
-                
-              
-            
-            
-              
-                http://google.github.io/google-auth-library-java/releases/${google.auth.version}/apidocs/
-              
-            
-          
-        
-      
-    
-
-    
-      
-      veneer-dev
-      
-        
-          
-            com.theoryinpractise
-            googleformatter-maven-plugin
-            1.5.1
-            
-              
-                reformat-sources
-                process-sources
-                
-                  format
-                
-                
-                  
-                  true
-                
-              
-            
-          
-        
-      
-    
-    
-      
-      smoke-test
-      
-        
-          
-            org.apache.maven.plugins
-            maven-failsafe-plugin
-            2.19.1
-            
-              
-                
-                  integration-test
-                  verify
-                
-              
-            
-            
-              
-                **/*SmokeTest.java
-              
-            
-          
-          
-            org.apache.maven.plugins
-            maven-surefire-plugin
-            
-              
-              true
-            
-          
-        
-      
-    
-  
 
diff --git a/versions.txt b/versions.txt
index 9f5adc3f844f..c884da50ec35 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,5 +1,93 @@
 # Format:
 # module:released-version:current-version
+
+#
+# google-api-grpc versions
+#
+# parent
+google-api-grpc:0.12.0:0.12.1-SNAPSHOT
+# children
+#grpc-google-cloud-datastore-v1
+grpc-google-cloud-bigquerydatatransfer-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-bigtable-admin-v2:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-bigtable-v2:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-container-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-dataproc-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-dialogflow-v2:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-dialogflow-v2beta1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-dlp-v2:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-dlp-v2beta1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-error-reporting-v1beta1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-firestore-v1beta1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-language-v1:1.11.0:1.11.1-SNAPSHOT
+grpc-google-cloud-language-v1beta2:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-logging-v2:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-monitoring-v3:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-os-login-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-pubsub-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-spanner-admin-database-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-spanner-admin-instance-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-spanner-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-speech-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-speech-v1beta1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-speech-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-texttospeech-v1beta1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-trace-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-trace-v2:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-video-intelligence-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-video-intelligence-v1beta1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-video-intelligence-v1beta2:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-video-intelligence-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-vision-v1:1.11.0:1.11.1-SNAPSHOT
+grpc-google-cloud-vision-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT
+grpc-google-cloud-cloudiot-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-redis-v1beta1:10.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-websecurityscanner-v1alpha:10.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-bigquerydatatransfer-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-bigtable-admin-v2:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-bigtable-v2:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-container-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-dataproc-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-dialogflow-v2:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-dialogflow-v2beta1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-dlp-v2:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-dlp-v2beta1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-error-reporting-v1beta1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-firestore-v1beta1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-language-v1:1.11.0:1.11.1-SNAPSHOT
+proto-google-cloud-language-v1beta2:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-logging-v2:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-monitoring-v3:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-os-login-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-pubsub-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-spanner-admin-database-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-spanner-admin-instance-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-spanner-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-speech-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-speech-v1beta1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-speech-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-texttospeech-v1beta1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-trace-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-trace-v2:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-video-intelligence-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-video-intelligence-v1beta1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-video-intelligence-v1beta2:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-video-intelligence-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-vision-v1:1.11.0:1.11.1-SNAPSHOT
+proto-google-cloud-vision-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT
+proto-google-cloud-cloudiot-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-redis-v1beta1:10.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-websecurityscanner-v1alpha:10.12.0:0.12.1-SNAPSHOT
+
+#
+# google-cloud-clients versions
+#
+# parent
+google-cloud-clients:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
+# children
 google-cloud-appengineflexcompat:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
 google-cloud-appengineflexcustom:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
 google-cloud-appengineflexjava:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
@@ -33,7 +121,6 @@ google-cloud-nio:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
 google-cloud-nio-examples:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
 google-cloud-notification:0.47.0-beta:0.47.1-beta-SNAPSHOT
 google-cloud-os-login:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-pom:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
 google-cloud-pubsub:0.47.0-beta:0.47.1-beta-SNAPSHOT
 google-cloud-redis:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
 google-cloud-resourcemanager:0.47.0-alpha:0.47.1-alpha-SNAPSHOT

From 82bcff340a12f0e2bc15d1b9286314c4c9f11b29 Mon Sep 17 00:00:00 2001
From: Seth Hollyman 
Date: Thu, 10 May 2018 15:42:46 -0700
Subject: [PATCH 23/65] BigQuery: add missing query statistics.

---
 .../google/cloud/bigquery/JobStatistics.java  | 128 ++++++++++++++++++
 .../cloud/bigquery/JobStatisticsTest.java     |  35 ++++-
 2 files changed, 162 insertions(+), 1 deletion(-)

diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
index 175e5f47f1fb..7e85b9d3b5fa 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
@@ -320,8 +320,16 @@ public static class QueryStatistics extends JobStatistics {
 
     private final Integer billingTier;
     private final Boolean cacheHit;
+    private final String ddlOperationPerformed;
+    private final TableId ddlTargetTable;
+    private final Long estimatedBytesProcessed;
+    private final Long numDmlAffectedRows;
+    private final List referencedTables;
+    private final String statementType;
     private final Long totalBytesBilled;
     private final Long totalBytesProcessed;
+    private final Long totalPartitionsProcessed;
+    private final Long totalSlotMs;
     private final List queryPlan;
     private final List timeline;
     private final Schema schema;
@@ -330,8 +338,16 @@ static final class Builder extends JobStatistics.Builder referencedTables;
+      private String statementType;
       private Long totalBytesBilled;
       private Long totalBytesProcessed;
+      private Long totalPartitionsProcessed;
+      private Long totalSlotMs;
       private List queryPlan;
       private List timeline;
       private Schema schema;
@@ -343,8 +359,22 @@ private Builder(com.google.api.services.bigquery.model.JobStatistics statisticsP
         if (statisticsPb.getQuery() != null) {
           this.billingTier = statisticsPb.getQuery().getBillingTier();
           this.cacheHit = statisticsPb.getQuery().getCacheHit();
+          this.ddlOperationPerformed = statisticsPb.getQuery().getDdlOperationPerformed();
+          if (statisticsPb.getQuery().getDdlTargetTable() != null) {
+            this.ddlTargetTable = TableId.fromPb(statisticsPb.getQuery().getDdlTargetTable());
+          }
+          this.estimatedBytesProcessed = statisticsPb.getQuery().getEstimatedBytesProcessed();
+          this.numDmlAffectedRows = statisticsPb.getQuery().getNumDmlAffectedRows();
+          this.statementType = statisticsPb.getQuery().getStatementType();
           this.totalBytesBilled = statisticsPb.getQuery().getTotalBytesBilled();
           this.totalBytesProcessed = statisticsPb.getQuery().getTotalBytesProcessed();
+          this.totalPartitionsProcessed = statisticsPb.getQuery().getTotalPartitionsProcessed();
+          this.totalSlotMs = statisticsPb.getQuery().getTotalSlotMs();
+          if (statisticsPb.getQuery().getReferencedTables() != null) {
+            this.referencedTables =
+                Lists.transform(
+                    statisticsPb.getQuery().getReferencedTables(), TableId.FROM_PB_FUNCTION);
+          }
           if (statisticsPb.getQuery().getQueryPlan() != null) {
             this.queryPlan =
                 Lists.transform(
@@ -371,6 +401,36 @@ Builder setCacheHit(Boolean cacheHit) {
         return self();
       }
 
+      Builder setDDLOperationPerformed(String ddlOperationPerformed) {
+        this.ddlOperationPerformed = ddlOperationPerformed;
+        return self();
+      }
+
+      Builder setDDLTargetTable(TableId ddlTargetTable) {
+        this.ddlTargetTable = ddlTargetTable;
+        return self();
+      }
+
+      Builder setEstimatedBytesProcessed(Long estimatedBytesProcessed) {
+        this.estimatedBytesProcessed = estimatedBytesProcessed;
+        return self();
+      }
+
+      Builder setNumDmlAffectedRows(Long numDmlAffectedRows) {
+        this.numDmlAffectedRows = numDmlAffectedRows;
+        return self();
+      }
+
+      Builder setReferenceTables(List referencedTables) {
+        this.referencedTables = referencedTables;
+        return self();
+      }
+
+      Builder setStatementType(String statementType) {
+        this.statementType = statementType;
+        return self();
+      }
+
       Builder setTotalBytesBilled(Long totalBytesBilled) {
         this.totalBytesBilled = totalBytesBilled;
         return self();
@@ -381,6 +441,16 @@ Builder setTotalBytesProcessed(Long totalBytesProcessed) {
         return self();
       }
 
+      Builder setTotalPartitionsProcessed(Long totalPartitionsProcessed) {
+        this.totalPartitionsProcessed = totalPartitionsProcessed;
+        return self();
+      }
+
+      Builder setTotalSlotMs(Long totalSlotMs) {
+        this.totalSlotMs = totalSlotMs;
+        return self();
+      }
+
       Builder setQueryPlan(List queryPlan) {
         this.queryPlan = queryPlan;
         return self();
@@ -406,8 +476,16 @@ private QueryStatistics(Builder builder) {
       super(builder);
       this.billingTier = builder.billingTier;
       this.cacheHit = builder.cacheHit;
+      this.ddlOperationPerformed = builder.ddlOperationPerformed;
+      this.ddlTargetTable = builder.ddlTargetTable;
+      this.estimatedBytesProcessed = builder.estimatedBytesProcessed;
+      this.numDmlAffectedRows = builder.numDmlAffectedRows;
+      this.referencedTables = builder.referencedTables;
+      this.statementType = builder.statementType;
       this.totalBytesBilled = builder.totalBytesBilled;
       this.totalBytesProcessed = builder.totalBytesProcessed;
+      this.totalPartitionsProcessed = builder.totalPartitionsProcessed;
+      this.totalSlotMs = builder.totalSlotMs;
       this.queryPlan = builder.queryPlan;
       this.timeline = builder.timeline;
       this.schema = builder.schema;
@@ -432,6 +510,47 @@ public Boolean getCacheHit() {
       return cacheHit;
     }
 
+    /**
+     * [BETA] For DDL queries, returns the operation applied to the DDL target table.
+     */
+    public String getDdlOperationPerformed() { return ddlOperationPerformed; }
+
+    /**
+     * [BETA] For DDL queries, returns the TableID of the targeted table.
+     */
+    public TableId getDdlTargetTable() { return ddlTargetTable; }
+
+    /**
+     * The original estimate of bytes processed for the job.
+     */
+    public Long getEstimatedBytesProcessed() { return estimatedBytesProcessed; }
+
+    /**
+     * The number of rows affected by a DML statement.
+     * Present only for DML statements INSERT, UPDATE or DELETE.
+     */
+    public Long getNumDmlAffectedRows() { return numDmlAffectedRows; }
+
+    /**
+     * Referenced tables for the job.
+     * Queries that reference more than 50 tables will not have a complete list.
+     */
+    public List getReferencedTables() { return referencedTables; }
+
+    /**
+     * [BETA] The type of query statement, if valid.
+     * Possible values include:
+     * SELECT
+     * INSERT
+     * UPDATE
+     * DELETE
+     * CREATE_TABLE
+     * CREATE_TABLE_AS_SELECT
+     * DROP_TABLE
+     * CREATE_VIEW
+     * DROP_VIEW
+     */
+    public String getStatementType() { return statementType; }
 
     /**
      * Returns the total number of bytes billed for the job.
@@ -448,6 +567,15 @@ public Long getTotalBytesProcessed() {
       return totalBytesProcessed;
     }
 
+    /**
+     * Total number of partitions processed from all partitioned tables referenced in the job.
+     */
+    public Long getTotalPartitionsProcessed() { return totalPartitionsProcessed; }
+
+    /**
+     * Returns the slot-milliseconds consumed by the query.
+     */
+    public Long getTotalSlotMs() { return totalSlotMs; }
 
     /**
      * Returns the query plan as a list of stages or {@code null} if a query plan is not available.
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
index be738c89b355..c4eaa4ab3a23 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
@@ -32,12 +32,22 @@ public class JobStatisticsTest {
 
   private static final Integer BILLING_TIER = 42;
   private static final Boolean CACHE_HIT = true;
+  private static final String DDL_OPERATION_PERFORMED = "SKIP";
+  private static final TableId DDL_TARGET_TABLE = TableId.of("foo", "bar", "baz");
+  private static final Long ESTIMATE_BYTES_PROCESSED = 101L;
+  private static final Long NUM_DML_AFFECTED_ROWS = 88L;
+  private static final String STATEMENT_TYPE = "SELECT";
   private static final Long TOTAL_BYTES_BILLED = 24L;
   private static final Long TOTAL_BYTES_PROCESSED = 42L;
+  private static final Long TOTAL_PARTITION_PROCESSED = 63L;
+  private static final Long TOTAL_SLOT_MS = 10202L;
   private static final Long INPUT_BYTES = 1L;
   private static final Long INPUT_FILES = 2L;
   private static final Long OUTPUT_BYTES = 3L;
   private static final Long OUTPUT_ROWS = 4L;
+  private static final List REFERENCED_TABLES = ImmutableList.of(
+      TableId.of("foo", "bar", "table1"),
+      TableId.of("foo","bar","table2"));
   private static final List FILE_COUNT = ImmutableList.of(1L, 2L, 3L);
   private static final Long CREATION_TIME = 10L;
   private static final Long END_TIME = 20L;
@@ -112,8 +122,16 @@ public class JobStatisticsTest {
       .setStartTime(START_TIME)
       .setBillingTier(BILLING_TIER)
       .setCacheHit(CACHE_HIT)
+      .setDDLOperationPerformed(DDL_OPERATION_PERFORMED)
+      .setDDLTargetTable(DDL_TARGET_TABLE)
+      .setEstimatedBytesProcessed(ESTIMATE_BYTES_PROCESSED)
+      .setNumDmlAffectedRows(NUM_DML_AFFECTED_ROWS)
+      .setReferenceTables(REFERENCED_TABLES)
+      .setStatementType(STATEMENT_TYPE)
       .setTotalBytesBilled(TOTAL_BYTES_BILLED)
       .setTotalBytesProcessed(TOTAL_BYTES_PROCESSED)
+      .setTotalPartitionsProcessed(TOTAL_PARTITION_PROCESSED)
+      .setTotalSlotMs(TOTAL_SLOT_MS)
       .setQueryPlan(QUERY_PLAN)
       .setTimeline(TIMELINE)
       .setSchema(SCHEMA)
@@ -146,9 +164,16 @@ public void testBuilder() {
     assertEquals(END_TIME, QUERY_STATISTICS.getEndTime());
     assertEquals(BILLING_TIER, QUERY_STATISTICS.getBillingTier());
     assertEquals(CACHE_HIT, QUERY_STATISTICS.getCacheHit());
+    assertEquals(DDL_OPERATION_PERFORMED, QUERY_STATISTICS.getDdlOperationPerformed());
+    assertEquals(DDL_TARGET_TABLE, QUERY_STATISTICS.getDdlTargetTable());
+    assertEquals(ESTIMATE_BYTES_PROCESSED, QUERY_STATISTICS.getEstimatedBytesProcessed());
+    assertEquals(NUM_DML_AFFECTED_ROWS, QUERY_STATISTICS.getNumDmlAffectedRows());
+    assertEquals(REFERENCED_TABLES, QUERY_STATISTICS.getReferencedTables());
+    assertEquals(STATEMENT_TYPE, QUERY_STATISTICS.getStatementType());
     assertEquals(TOTAL_BYTES_BILLED, QUERY_STATISTICS.getTotalBytesBilled());
     assertEquals(TOTAL_BYTES_PROCESSED, QUERY_STATISTICS.getTotalBytesProcessed());
-    assertEquals(TOTAL_BYTES_PROCESSED, QUERY_STATISTICS.getTotalBytesProcessed());
+    assertEquals(TOTAL_PARTITION_PROCESSED, QUERY_STATISTICS.getTotalPartitionsProcessed());
+    assertEquals(TOTAL_SLOT_MS, QUERY_STATISTICS.getTotalSlotMs());
     assertEquals(QUERY_PLAN, QUERY_STATISTICS.getQueryPlan());
     assertEquals(TIMELINE, QUERY_STATISTICS.getTimeline());
 
@@ -165,8 +190,16 @@ public void testBuilder() {
     assertEquals(END_TIME, QUERY_STATISTICS_INCOMPLETE.getEndTime());
     assertEquals(BILLING_TIER, QUERY_STATISTICS_INCOMPLETE.getBillingTier());
     assertEquals(CACHE_HIT, QUERY_STATISTICS_INCOMPLETE.getCacheHit());
+    assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getDdlOperationPerformed());
+    assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getDdlTargetTable());
+    assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getEstimatedBytesProcessed());
+    assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getNumDmlAffectedRows());
+    assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getStatementType());
     assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getTotalBytesBilled());
     assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getTotalBytesProcessed());
+    assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getTotalPartitionsProcessed());
+    assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getTotalSlotMs());
+    assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getReferencedTables());
     assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getQueryPlan());
   }
 

From 56f451de60edff05636f355aeade29397735838d Mon Sep 17 00:00:00 2001
From: Michael Darakananda 
Date: Fri, 11 May 2018 14:14:37 -0700
Subject: [PATCH 24/65] translate: document concurrent use (#3243)

Fixes #3191.
---
 .../src/main/java/com/google/cloud/translate/Translate.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java
index e05bf6f37756..77678b804748 100644
--- a/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java
+++ b/google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/Translate.java
@@ -18,11 +18,11 @@
 
 import com.google.cloud.Service;
 import com.google.cloud.translate.spi.v2.TranslateRpc;
-
 import java.util.List;
 
 /**
- * An interface for Google Translation.
+ * An interface for Google Translation. {@code Translate} and its {@code Option} classes can be used
+ * concurrently without external synchronizations.
  *
  * @see Google Translation
  */

From 7091435f0dd268a790f88f21e319b7128717b74c Mon Sep 17 00:00:00 2001
From: Michael Darakananda 
Date: Fri, 11 May 2018 14:14:55 -0700
Subject: [PATCH 25/65] all: fix integration CI (#3222)

Proto- and grpc- packages have moved to this repository.
When we run integration on CI, we must build them, otherwise the
tasks will fail from not being able to find dependencies.
---
 utilities/verify_single_it.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/utilities/verify_single_it.sh b/utilities/verify_single_it.sh
index 83a9e3f746c9..1925216f7fd1 100755
--- a/utilities/verify_single_it.sh
+++ b/utilities/verify_single_it.sh
@@ -15,16 +15,8 @@ fi
 export GCLOUD_PROJECT="$GCLOUD_PROJECT"
 export GOOGLE_APPLICATION_CREDENTIALS=$(realpath "$GOOGLE_APPLICATION_CREDENTIALS")
 
-echo "----- building and installing google-cloud-bom -----"
-mvn -B -pl google-cloud-bom install -DskipTests
-
-echo "----- building and installing parent pom -----"
-mvn -B -N install -DskipTests
-
-echo "----- building and installing shared modules -----"
-# storage is present because google-cloud-bigquery and google-cloud-notification depend on it
-# pubsub is present because google-cloud-notification depends on it
-mvn -B -pl google-cloud-core,google-cloud-core-http,google-cloud-core-grpc,google-cloud-storage,google-cloud-pubsub install -DskipTests
+echo "----- installing modules -----"
+mvn -B install -DskipTests
 
 echo "----- running integration tests -----"
 mvn -B -pl $MODULE -DtrimStackTrace=false -fae verify ${ARGS}

From 6176b53331858903d0c0f66900382953f913c925 Mon Sep 17 00:00:00 2001
From: Michael Darakananda 
Date: Fri, 11 May 2018 14:51:43 -0700
Subject: [PATCH 26/65] versions: fix typos in versions and docs (#3261)

---
 utilities/replace_versions.py | 2 +-
 versions.txt                  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/utilities/replace_versions.py b/utilities/replace_versions.py
index e62753378b1e..5867ed3d8afa 100644
--- a/utilities/replace_versions.py
+++ b/utilities/replace_versions.py
@@ -104,7 +104,7 @@ def replace_versions_all(target):
                     replace_versions(version_map, file_path)
 
 def main():
-    parser = argparse.ArgumentParser(description='Add snippets to Javadoc.')
+    parser = argparse.ArgumentParser(description='Replace version numbers in poms and READMEs.')
     parser.add_argument('target', nargs='?', help='File to update - all files scanned if omitted')
     args = parser.parse_args()
 
diff --git a/versions.txt b/versions.txt
index c884da50ec35..18d5f232c70c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -42,8 +42,8 @@ grpc-google-cloud-vision-v1:1.11.0:1.11.1-SNAPSHOT
 grpc-google-cloud-vision-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
 grpc-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT
 grpc-google-cloud-cloudiot-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-redis-v1beta1:10.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-websecurityscanner-v1alpha:10.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-redis-v1beta1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-websecurityscanner-v1alpha:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-bigquerydatatransfer-v1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-bigtable-admin-v2:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-bigtable-v2:0.12.0:0.12.1-SNAPSHOT
@@ -79,8 +79,8 @@ proto-google-cloud-vision-v1:1.11.0:1.11.1-SNAPSHOT
 proto-google-cloud-vision-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT
 proto-google-cloud-cloudiot-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-redis-v1beta1:10.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-websecurityscanner-v1alpha:10.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-redis-v1beta1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-websecurityscanner-v1alpha:0.12.0:0.12.1-SNAPSHOT
 
 #
 # google-cloud-clients versions

From b7ad17e9a5f2f96bc71caf4998f83021eca5b04d Mon Sep 17 00:00:00 2001
From: Michael Darakananda 
Date: Fri, 11 May 2018 14:53:28 -0700
Subject: [PATCH 27/65] move resource names (#3259)

---
 .../google-cloud-resource-name-common/pom.xml | 20 +++++++++++++++++++
 .../java/com/google/cloud/BillingName.java    |  0
 .../java/com/google/cloud/FolderName.java     |  0
 .../com/google/cloud/OrganizationName.java    |  0
 .../java/com/google/cloud/ParentName.java     |  0
 .../java/com/google/cloud/ParentNames.java    |  0
 .../java/com/google/cloud/ProjectName.java    |  0
 .../com/google/cloud/UntypedParentName.java   |  0
 google-api-grpc/pom.xml                       |  6 ++++++
 .../pom.xml                                   |  2 +-
 versions.txt                                  |  1 +
 11 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 google-api-grpc/google-cloud-resource-name-common/pom.xml
 rename {google-cloud-clients/google-cloud-core => google-api-grpc/google-cloud-resource-name-common}/src/main/java/com/google/cloud/BillingName.java (100%)
 rename {google-cloud-clients/google-cloud-core => google-api-grpc/google-cloud-resource-name-common}/src/main/java/com/google/cloud/FolderName.java (100%)
 rename {google-cloud-clients/google-cloud-core => google-api-grpc/google-cloud-resource-name-common}/src/main/java/com/google/cloud/OrganizationName.java (100%)
 rename {google-cloud-clients/google-cloud-core => google-api-grpc/google-cloud-resource-name-common}/src/main/java/com/google/cloud/ParentName.java (100%)
 rename {google-cloud-clients/google-cloud-core => google-api-grpc/google-cloud-resource-name-common}/src/main/java/com/google/cloud/ParentNames.java (100%)
 rename {google-cloud-clients/google-cloud-core => google-api-grpc/google-cloud-resource-name-common}/src/main/java/com/google/cloud/ProjectName.java (100%)
 rename {google-cloud-clients/google-cloud-core => google-api-grpc/google-cloud-resource-name-common}/src/main/java/com/google/cloud/UntypedParentName.java (100%)

diff --git a/google-api-grpc/google-cloud-resource-name-common/pom.xml b/google-api-grpc/google-cloud-resource-name-common/pom.xml
new file mode 100644
index 000000000000..d40ef408bb09
--- /dev/null
+++ b/google-api-grpc/google-cloud-resource-name-common/pom.xml
@@ -0,0 +1,20 @@
+
+  4.0.0
+  google-cloud-resource-name-common
+  0.12.1-SNAPSHOT
+  Google Cloud Common Resource Name
+  Common resource names used by Google Cloud libraries
+  
+    com.google.api.grpc
+    google-api-grpc
+    0.12.1-SNAPSHOT
+  
+  
+    
+      com.google.api
+      api-common
+    
+  
+
diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BillingName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/BillingName.java
similarity index 100%
rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/BillingName.java
rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/BillingName.java
diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/FolderName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/FolderName.java
similarity index 100%
rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/FolderName.java
rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/FolderName.java
diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/OrganizationName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/OrganizationName.java
similarity index 100%
rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/OrganizationName.java
rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/OrganizationName.java
diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ParentName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentName.java
similarity index 100%
rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ParentName.java
rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentName.java
diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ParentNames.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentNames.java
similarity index 100%
rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ParentNames.java
rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentNames.java
diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ProjectName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ProjectName.java
similarity index 100%
rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/ProjectName.java
rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ProjectName.java
diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/UntypedParentName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/UntypedParentName.java
similarity index 100%
rename from google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/UntypedParentName.java
rename to google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/UntypedParentName.java
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 3b398f94ab71..ea837b37140f 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -496,6 +496,11 @@
         grpc-google-cloud-websecurityscanner-v1alpha
         0.12.1-SNAPSHOT
       
+      
+        com.google.api.grpc
+        google-cloud-resource-name-common
+        0.12.1-SNAPSHOT
+      
     
   
 
@@ -573,6 +578,7 @@
     proto-google-cloud-cloudiot-v1
     proto-google-cloud-redis-v1beta1
     proto-google-cloud-websecurityscanner-v1alpha
+    google-cloud-resource-name-common
   
 
   
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
index 14661ebff117..6d21909cbe79 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
@@ -28,4 +28,4 @@
       compile
     
   
-
\ No newline at end of file
+
diff --git a/versions.txt b/versions.txt
index 18d5f232c70c..099df392c39f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -81,6 +81,7 @@ proto-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT
 proto-google-cloud-cloudiot-v1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-redis-v1beta1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-websecurityscanner-v1alpha:0.12.0:0.12.1-SNAPSHOT
+google-cloud-resource-name-common:0.12.0:0.12.1-SNAPSHOT
 
 #
 # google-cloud-clients versions

From 5211e401684239f6fc6cd9c7078aee4a24d87bf9 Mon Sep 17 00:00:00 2001
From: Michael Darakananda 
Date: Fri, 11 May 2018 15:04:27 -0700
Subject: [PATCH 28/65] fix integration tests, seriously for real this time
 (#3262)

We need to update the script since the clients moved.
---
 .circleci/config.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 87a87c4b3bc7..403835e47841 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -78,7 +78,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-bigquery
-          command: ./utilities/verify_single_it.sh google-cloud-bigquery
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-bigquery
 
   bigtable_it:
     working_directory: ~/googleapis
@@ -90,7 +90,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-bigtable
-          command: ./utilities/verify_single_it.sh google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.table=projects/gcloud-devel/instances/google-cloud-bigtable/tables/integration-tests
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.table=projects/gcloud-devel/instances/google-cloud-bigtable/tables/integration-tests
 
   compute_it:
     working_directory: ~/googleapis
@@ -102,7 +102,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-compute
-          command: ./utilities/verify_single_it.sh google-cloud-compute
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-compute
           no_output_timeout: 20m
   datastore_it:
     working_directory: ~/googleapis
@@ -114,7 +114,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-datastore
-          command: ./utilities/verify_single_it.sh google-cloud-datastore
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-datastore
   dns_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -125,7 +125,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-dns
-          command: ./utilities/verify_single_it.sh google-cloud-dns
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-dns
   firestore_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -143,7 +143,7 @@ jobs:
                 -out .circleci/firestore-it-service-account.json -k "${SYSTEM_TESTS_ENCRYPTION_KEY}"
       - run:
           name: Run integration tests for google-cloud-firestore
-          command: ./utilities/verify_single_it.sh google-cloud-firestore
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-firestore
   logging_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -154,7 +154,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-logging
-          command: ./utilities/verify_single_it.sh google-cloud-logging
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-logging
   notification_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -165,7 +165,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-notification
-          command: ./utilities/verify_single_it.sh google-cloud-notification
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-notification
   pubsub_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -176,7 +176,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-pubsub
-          command: ./utilities/verify_single_it.sh google-cloud-pubsub
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-pubsub
   spanner_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -187,7 +187,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-spanner
-          command: ./utilities/verify_single_it.sh google-cloud-spanner
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-spanner
   speech_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -198,7 +198,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-speech
-          command: ./utilities/verify_single_it.sh google-cloud-speech
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-speech
   storage_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -209,7 +209,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-storage
-          command: ./utilities/verify_single_it.sh google-cloud-storage
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-storage
   translate_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -220,7 +220,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-translate
-          command: ./utilities/verify_single_it.sh google-cloud-translate
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-translate
   javadoc_test:
     working_directory: ~/googleapis
     <<: *anchor_docker

From 72bc030140377141047fbe4a2239929cd5002c10 Mon Sep 17 00:00:00 2001
From: Michael Darakananda 
Date: Mon, 14 May 2018 12:19:33 -0700
Subject: [PATCH 29/65] remove resource name types; to be moved to
 api-client-staging (#3264)

---
 .../google-cloud-resource-name-common/pom.xml |  20 ---
 .../java/com/google/cloud/BillingName.java    | 162 ------------------
 .../java/com/google/cloud/FolderName.java     | 162 ------------------
 .../com/google/cloud/OrganizationName.java    | 162 ------------------
 .../java/com/google/cloud/ParentName.java     |  26 ---
 .../java/com/google/cloud/ParentNames.java    |  41 -----
 .../java/com/google/cloud/ProjectName.java    | 162 ------------------
 .../com/google/cloud/UntypedParentName.java   | 102 -----------
 google-api-grpc/pom.xml                       |   6 -
 versions.txt                                  |   1 -
 10 files changed, 844 deletions(-)
 delete mode 100644 google-api-grpc/google-cloud-resource-name-common/pom.xml
 delete mode 100644 google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/BillingName.java
 delete mode 100644 google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/FolderName.java
 delete mode 100644 google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/OrganizationName.java
 delete mode 100644 google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentName.java
 delete mode 100644 google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentNames.java
 delete mode 100644 google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ProjectName.java
 delete mode 100644 google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/UntypedParentName.java

diff --git a/google-api-grpc/google-cloud-resource-name-common/pom.xml b/google-api-grpc/google-cloud-resource-name-common/pom.xml
deleted file mode 100644
index d40ef408bb09..000000000000
--- a/google-api-grpc/google-cloud-resource-name-common/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-  4.0.0
-  google-cloud-resource-name-common
-  0.12.1-SNAPSHOT
-  Google Cloud Common Resource Name
-  Common resource names used by Google Cloud libraries
-  
-    com.google.api.grpc
-    google-api-grpc
-    0.12.1-SNAPSHOT
-  
-  
-    
-      com.google.api
-      api-common
-    
-  
-
diff --git a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/BillingName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/BillingName.java
deleted file mode 100644
index c0f29bff26b8..000000000000
--- a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/BillingName.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package com.google.cloud;
-
-import com.google.api.core.BetaApi;
-import com.google.api.pathtemplate.PathTemplate;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-// Formerly generated by GAPIC protoc plugin.
-@BetaApi
-public class BillingName extends ParentName {
-
-  private static final PathTemplate PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("billingAccounts/{billing_account}");
-
-  private volatile Map fieldValuesMap;
-
-  private final String billingAccount;
-
-  public String getBillingAccount() {
-    return billingAccount;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  private BillingName(Builder builder) {
-    billingAccount = Preconditions.checkNotNull(builder.getBillingAccount());
-  }
-
-  public static BillingName of(String billingAccount) {
-    return newBuilder().setBillingAccount(billingAccount).build();
-  }
-
-  public static String format(String billingAccount) {
-    return newBuilder().setBillingAccount(billingAccount).build().toString();
-  }
-
-  public static BillingName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map matchMap =
-        PATH_TEMPLATE.validatedMatch(
-            formattedString, "BillingName.parse: formattedString not in valid format");
-    return of(matchMap.get("billing_account"));
-  }
-
-  public static List parseList(List formattedStrings) {
-    List list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List toStringList(List values) {
-    List list = new ArrayList(values.size());
-    for (BillingName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PATH_TEMPLATE.matches(formattedString);
-  }
-
-  public Map getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
-          fieldMapBuilder.put("billingAccount", billingAccount);
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PATH_TEMPLATE.instantiate("billing_account", billingAccount);
-  }
-
-  /** Builder for BillingName. */
-  public static class Builder {
-
-    private String billingAccount;
-
-    public String getBillingAccount() {
-      return billingAccount;
-    }
-
-    public Builder setBillingAccount(String billingAccount) {
-      this.billingAccount = billingAccount;
-      return this;
-    }
-
-    private Builder() {}
-
-    private Builder(BillingName billingName) {
-      billingAccount = billingName.billingAccount;
-    }
-
-    public BillingName build() {
-      return new BillingName(this);
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o instanceof BillingName) {
-      BillingName that = (BillingName) o;
-      return this.billingAccount.equals(that.billingAccount);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= billingAccount.hashCode();
-    return h;
-  }
-}
diff --git a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/FolderName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/FolderName.java
deleted file mode 100644
index 9863a3a61e57..000000000000
--- a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/FolderName.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package com.google.cloud;
-
-import com.google.api.core.BetaApi;
-import com.google.api.pathtemplate.PathTemplate;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-// Formerly generated by GAPIC protoc plugin.
-@BetaApi
-public class FolderName extends ParentName {
-
-  private static final PathTemplate PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("folders/{folder}");
-
-  private volatile Map fieldValuesMap;
-
-  private final String folder;
-
-  public String getFolder() {
-    return folder;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  private FolderName(Builder builder) {
-    folder = Preconditions.checkNotNull(builder.getFolder());
-  }
-
-  public static FolderName of(String folder) {
-    return newBuilder().setFolder(folder).build();
-  }
-
-  public static String format(String folder) {
-    return newBuilder().setFolder(folder).build().toString();
-  }
-
-  public static FolderName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map matchMap =
-        PATH_TEMPLATE.validatedMatch(
-            formattedString, "FolderName.parse: formattedString not in valid format");
-    return of(matchMap.get("folder"));
-  }
-
-  public static List parseList(List formattedStrings) {
-    List list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List toStringList(List values) {
-    List list = new ArrayList(values.size());
-    for (FolderName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PATH_TEMPLATE.matches(formattedString);
-  }
-
-  public Map getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
-          fieldMapBuilder.put("folder", folder);
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PATH_TEMPLATE.instantiate("folder", folder);
-  }
-
-  /** Builder for FolderName. */
-  public static class Builder {
-
-    private String folder;
-
-    public String getFolder() {
-      return folder;
-    }
-
-    public Builder setFolder(String folder) {
-      this.folder = folder;
-      return this;
-    }
-
-    private Builder() {}
-
-    private Builder(FolderName folderName) {
-      folder = folderName.folder;
-    }
-
-    public FolderName build() {
-      return new FolderName(this);
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o instanceof FolderName) {
-      FolderName that = (FolderName) o;
-      return this.folder.equals(that.folder);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= folder.hashCode();
-    return h;
-  }
-}
diff --git a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/OrganizationName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/OrganizationName.java
deleted file mode 100644
index ff06d65eca9f..000000000000
--- a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/OrganizationName.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package com.google.cloud;
-
-import com.google.api.core.BetaApi;
-import com.google.api.pathtemplate.PathTemplate;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-// Formerly generated by GAPIC protoc plugin.
-@BetaApi
-public class OrganizationName extends ParentName {
-
-  private static final PathTemplate PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("organizations/{organization}");
-
-  private volatile Map fieldValuesMap;
-
-  private final String organization;
-
-  public String getOrganization() {
-    return organization;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  private OrganizationName(Builder builder) {
-    organization = Preconditions.checkNotNull(builder.getOrganization());
-  }
-
-  public static OrganizationName of(String organization) {
-    return newBuilder().setOrganization(organization).build();
-  }
-
-  public static String format(String organization) {
-    return newBuilder().setOrganization(organization).build().toString();
-  }
-
-  public static OrganizationName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map matchMap =
-        PATH_TEMPLATE.validatedMatch(
-            formattedString, "OrganizationName.parse: formattedString not in valid format");
-    return of(matchMap.get("organization"));
-  }
-
-  public static List parseList(List formattedStrings) {
-    List list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List toStringList(List values) {
-    List list = new ArrayList(values.size());
-    for (OrganizationName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PATH_TEMPLATE.matches(formattedString);
-  }
-
-  public Map getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
-          fieldMapBuilder.put("organization", organization);
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PATH_TEMPLATE.instantiate("organization", organization);
-  }
-
-  /** Builder for OrganizationName. */
-  public static class Builder {
-
-    private String organization;
-
-    public String getOrganization() {
-      return organization;
-    }
-
-    public Builder setOrganization(String organization) {
-      this.organization = organization;
-      return this;
-    }
-
-    private Builder() {}
-
-    private Builder(OrganizationName organizationName) {
-      organization = organizationName.organization;
-    }
-
-    public OrganizationName build() {
-      return new OrganizationName(this);
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o instanceof OrganizationName) {
-      OrganizationName that = (OrganizationName) o;
-      return this.organization.equals(that.organization);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= organization.hashCode();
-    return h;
-  }
-}
diff --git a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentName.java
deleted file mode 100644
index bd40991a56c0..000000000000
--- a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentName.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package com.google.cloud;
-
-import com.google.api.core.BetaApi;
-import com.google.api.resourcenames.ResourceName;
-
-// Formerly generated by GAPIC protoc plugin.
-@BetaApi
-public abstract class ParentName implements ResourceName {
-  protected ParentName() {}
-}
diff --git a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentNames.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentNames.java
deleted file mode 100644
index ef048fedb091..000000000000
--- a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ParentNames.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package com.google.cloud;
-
-import com.google.api.core.BetaApi;
-
-// Formerly generated by GAPIC protoc plugin.
-@BetaApi
-public class ParentNames {
-  private ParentNames() {}
-
-  public static ParentName parse(String resourceNameString) {
-    if (ProjectName.isParsableFrom(resourceNameString)) {
-      return ProjectName.parse(resourceNameString);
-    }
-    if (OrganizationName.isParsableFrom(resourceNameString)) {
-      return OrganizationName.parse(resourceNameString);
-    }
-    if (FolderName.isParsableFrom(resourceNameString)) {
-      return FolderName.parse(resourceNameString);
-    }
-    if (BillingName.isParsableFrom(resourceNameString)) {
-      return BillingName.parse(resourceNameString);
-    }
-    return UntypedParentName.parse(resourceNameString);
-  }
-}
diff --git a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ProjectName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ProjectName.java
deleted file mode 100644
index 81df8326623b..000000000000
--- a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/ProjectName.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package com.google.cloud;
-
-import com.google.api.core.BetaApi;
-import com.google.api.pathtemplate.PathTemplate;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-// Formerly generated by GAPIC protoc plugin.
-@BetaApi
-public class ProjectName extends ParentName {
-
-  private static final PathTemplate PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}");
-
-  private volatile Map fieldValuesMap;
-
-  private final String project;
-
-  public String getProject() {
-    return project;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  private ProjectName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-  }
-
-  public static ProjectName of(String project) {
-    return newBuilder().setProject(project).build();
-  }
-
-  public static String format(String project) {
-    return newBuilder().setProject(project).build().toString();
-  }
-
-  public static ProjectName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map matchMap =
-        PATH_TEMPLATE.validatedMatch(
-            formattedString, "ProjectName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"));
-  }
-
-  public static List parseList(List formattedStrings) {
-    List list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List toStringList(List values) {
-    List list = new ArrayList(values.size());
-    for (ProjectName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PATH_TEMPLATE.matches(formattedString);
-  }
-
-  public Map getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
-          fieldMapBuilder.put("project", project);
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PATH_TEMPLATE.instantiate("project", project);
-  }
-
-  /** Builder for ProjectName. */
-  public static class Builder {
-
-    private String project;
-
-    public String getProject() {
-      return project;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    private Builder() {}
-
-    private Builder(ProjectName projectName) {
-      project = projectName.project;
-    }
-
-    public ProjectName build() {
-      return new ProjectName(this);
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o instanceof ProjectName) {
-      ProjectName that = (ProjectName) o;
-      return this.project.equals(that.project);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= project.hashCode();
-    return h;
-  }
-}
diff --git a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/UntypedParentName.java b/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/UntypedParentName.java
deleted file mode 100644
index faaca106cbe9..000000000000
--- a/google-api-grpc/google-cloud-resource-name-common/src/main/java/com/google/cloud/UntypedParentName.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-package com.google.cloud;
-
-import com.google.api.core.BetaApi;
-import com.google.api.resourcenames.ResourceName;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-// Formerly generated by GAPIC protoc plugin.
-@BetaApi
-public class UntypedParentName extends ParentName {
-
-  private final String rawValue;
-  private Map valueMap;
-
-  private UntypedParentName(String rawValue) {
-    this.rawValue = Preconditions.checkNotNull(rawValue);
-    this.valueMap = ImmutableMap.of("", rawValue);
-  }
-
-  public static UntypedParentName from(ResourceName resourceName) {
-    return new UntypedParentName(resourceName.toString());
-  }
-
-  public static UntypedParentName parse(String formattedString) {
-    return new UntypedParentName(formattedString);
-  }
-
-  public static List parseList(List formattedStrings) {
-    List list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List toStringList(List values) {
-    List list = new ArrayList(values.size());
-    for (UntypedParentName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return true;
-  }
-
-  /** Return a map with a single value rawValue keyed on an empty String "". */
-  public Map getFieldValuesMap() {
-    return valueMap;
-  }
-
-  /** Return the initial rawValue if @param fieldName is an empty String, else return null. */
-  public String getFieldValue(String fieldName) {
-    return valueMap.get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return rawValue;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o instanceof UntypedParentName) {
-      UntypedParentName that = (UntypedParentName) o;
-      return this.rawValue.equals(that.rawValue);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    return rawValue.hashCode();
-  }
-}
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index ea837b37140f..3b398f94ab71 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -496,11 +496,6 @@
         grpc-google-cloud-websecurityscanner-v1alpha
         0.12.1-SNAPSHOT
       
-      
-        com.google.api.grpc
-        google-cloud-resource-name-common
-        0.12.1-SNAPSHOT
-      
     
   
 
@@ -578,7 +573,6 @@
     proto-google-cloud-cloudiot-v1
     proto-google-cloud-redis-v1beta1
     proto-google-cloud-websecurityscanner-v1alpha
-    google-cloud-resource-name-common
   
 
   
diff --git a/versions.txt b/versions.txt
index 099df392c39f..18d5f232c70c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -81,7 +81,6 @@ proto-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT
 proto-google-cloud-cloudiot-v1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-redis-v1beta1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-websecurityscanner-v1alpha:0.12.0:0.12.1-SNAPSHOT
-google-cloud-resource-name-common:0.12.0:0.12.1-SNAPSHOT
 
 #
 # google-cloud-clients versions

From 92a07265ed884a7f772146739684fc12d7e2ff56 Mon Sep 17 00:00:00 2001
From: Dan O'Meara 
Date: Mon, 14 May 2018 13:34:48 -0700
Subject: [PATCH 30/65] Add new clients to README.md (#3266)

- BigQuery Data Transfer
- Cloud Redis
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 8ec0a4b2688d..6651b874994e 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ This library supports the following Google Cloud Platform services with clients
 
 This library supports the following Google Cloud Platform services with clients at a [Beta](#versioning) quality level:
 
+-  [BigQuery Data Transfer](google-cloud-clients/google-cloud-bigquerydatatransfer) (Beta)
 -  [Cloud Data Loss Prevention](google-cloud-dlp) (Beta)
 -  [Stackdriver Error Reporting](google-cloud-errorreporting) (Beta)
 -  [Cloud Firestore](google-cloud-firestore) (Beta)
@@ -38,6 +39,7 @@ This library supports the following Google Cloud Platform services with clients
 -  [Cloud Dataproc](google-cloud-dataproc) (Alpha)
 -  [Cloud DNS](google-cloud-dns) (Alpha)
 -  [Cloud OS Login](google-cloud-os-login) (Alpha)
+-  [Cloud Redis](google-cloud-clients/google-cloud-redis) (Alpha)
 -  [Cloud Resource Manager](google-cloud-resourcemanager) (Alpha)
 -  [Cloud Speech](google-cloud-speech) (Alpha)
 -  [Dialogflow](google-cloud-dialogflow) (Alpha)

From 6fef9ffaee82a829076542b27042b19298f4530f Mon Sep 17 00:00:00 2001
From: Michael Darakananda 
Date: Tue, 15 May 2018 15:34:40 -0700
Subject: [PATCH 31/65] properly link Redis docs (#3272)

Fixes #3270.
---
 google-cloud-clients/google-cloud-redis/README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/google-cloud-clients/google-cloud-redis/README.md b/google-cloud-clients/google-cloud-redis/README.md
index dc95a552cfb8..7121136fb7e1 100644
--- a/google-cloud-clients/google-cloud-redis/README.md
+++ b/google-cloud-clients/google-cloud-redis/README.md
@@ -112,7 +112,6 @@ Apache 2.0 - See [LICENSE] for more information.
 [LICENSE]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/LICENSE
 [TESTING]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/TESTING.md#testing-code-that-uses-redis
 
-
-[cloud-redis]: https://cloud.google.com/
-[redis-product-docs]: https://cloud.google.com/
+[cloud-redis]: https://cloud.google.com/memorystore/
+[redis-product-docs]: https://cloud.google.com/memorystore/docs/redis/
 [redis-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/redis/v1/package-summary.html

From 92a205f0c3e756ed4e4ed770e41ee0837d14fce3 Mon Sep 17 00:00:00 2001
From: Michael Darakananda 
Date: Tue, 15 May 2018 16:14:27 -0700
Subject: [PATCH 32/65] fix README API link (#3273)

Fixes #3260.
---
 README.md | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 6651b874994e..493810735da9 100644
--- a/README.md
+++ b/README.md
@@ -13,40 +13,40 @@ Java idiomatic client for [Google Cloud Platform][cloud-platform] services.
 - [Client Library Documentation][client-lib-docs]
 
 This library supports the following Google Cloud Platform services with clients at a [GA](#versioning) quality level:
--  [BigQuery](google-cloud-bigquery) (GA)
--  [Stackdriver Logging](google-cloud-logging) (GA)
--  [Cloud Datastore](google-cloud-datastore) (GA)
--  [Cloud Natural Language](google-cloud-language) (GA)
--  [Cloud Storage](google-cloud-storage) (GA)
--  [Cloud Translation](google-cloud-translate) (GA)
--  [Cloud Vision](google-cloud-vision) (GA)
+-  [BigQuery](google-cloud-clients/google-cloud-bigquery) (GA)
+-  [Stackdriver Logging](google-cloud-clients/google-cloud-logging) (GA)
+-  [Cloud Datastore](google-cloud-clients/google-cloud-datastore) (GA)
+-  [Cloud Natural Language](google-cloud-clients/google-cloud-language) (GA)
+-  [Cloud Storage](google-cloud-clients/google-cloud-storage) (GA)
+-  [Cloud Translation](google-cloud-clients/google-cloud-translate) (GA)
+-  [Cloud Vision](google-cloud-clients/google-cloud-vision) (GA)
 
 This library supports the following Google Cloud Platform services with clients at a [Beta](#versioning) quality level:
 
 -  [BigQuery Data Transfer](google-cloud-clients/google-cloud-bigquerydatatransfer) (Beta)
--  [Cloud Data Loss Prevention](google-cloud-dlp) (Beta)
--  [Stackdriver Error Reporting](google-cloud-errorreporting) (Beta)
--  [Cloud Firestore](google-cloud-firestore) (Beta)
--  [Stackdriver Monitoring](google-cloud-monitoring) (Beta)
--  [Cloud Pub/Sub](google-cloud-pubsub) (Beta)
--  [Cloud Spanner](google-cloud-spanner) (Beta)
--  [Cloud Video Intelligence](google-cloud-video-intelligence) (Beta)
--  [Stackdriver Trace](google-cloud-trace) (Beta)
--  [Text-to-Speech](google-cloud-texttospeech) (Beta)
+-  [Cloud Data Loss Prevention](google-cloud-clients/google-cloud-dlp) (Beta)
+-  [Stackdriver Error Reporting](google-cloud-clients/google-cloud-errorreporting) (Beta)
+-  [Cloud Firestore](google-cloud-clients/google-cloud-firestore) (Beta)
+-  [Stackdriver Monitoring](google-cloud-clients/google-cloud-monitoring) (Beta)
+-  [Cloud Pub/Sub](google-cloud-clients/google-cloud-pubsub) (Beta)
+-  [Cloud Spanner](google-cloud-clients/google-cloud-spanner) (Beta)
+-  [Cloud Video Intelligence](google-cloud-clients/google-cloud-video-intelligence) (Beta)
+-  [Stackdriver Trace](google-cloud-clients/google-cloud-trace) (Beta)
+-  [Text-to-Speech](google-cloud-clients/google-cloud-texttospeech) (Beta)
 
 This library supports the following Google Cloud Platform services with clients at an [Alpha](#versioning) quality level:
 
--  [Cloud Dataproc](google-cloud-dataproc) (Alpha)
--  [Cloud DNS](google-cloud-dns) (Alpha)
--  [Cloud OS Login](google-cloud-os-login) (Alpha)
+-  [Cloud Dataproc](google-cloud-clients/google-cloud-dataproc) (Alpha)
+-  [Cloud DNS](google-cloud-clients/google-cloud-dns) (Alpha)
+-  [Cloud OS Login](google-cloud-clients/google-cloud-os-login) (Alpha)
 -  [Cloud Redis](google-cloud-clients/google-cloud-redis) (Alpha)
--  [Cloud Resource Manager](google-cloud-resourcemanager) (Alpha)
--  [Cloud Speech](google-cloud-speech) (Alpha)
--  [Dialogflow](google-cloud-dialogflow) (Alpha)
+-  [Cloud Resource Manager](google-cloud-clients/google-cloud-resourcemanager) (Alpha)
+-  [Cloud Speech](google-cloud-clients/google-cloud-speech) (Alpha)
+-  [Dialogflow](google-cloud-clients/google-cloud-dialogflow) (Alpha)
 
 These libraries are deprecated and no longer receive updates:
 
--  [Cloud Compute](google-cloud-compute) (Deprecated)
+-  [Cloud Compute](google-cloud-clients/google-cloud-compute) (Deprecated)
 
 Quickstart
 ----------

From 23ae95cfdfacc0372aa7ceb15e5736ea044edba7 Mon Sep 17 00:00:00 2001
From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com>
Date: Wed, 16 May 2018 10:15:22 -0700
Subject: [PATCH 33/65] Adjust documentation creation to new repo structure
 (#3274)

1) Add `utilities/stage_sites.py` (probably temporary solution).
2) Remove `utilities/create_site.sh` and `utilities/stage_release.sh` scripts. Other `.sh` releasing scripts will be removed soon. `RELEASING.md` was not update to reflect the changes. The readme will be updated after first successfull release with new structure (the only way to have an accurate releasing reame is to make the release first and record the steps).
3) Remove `.settings` folder. It is an eclipse-specific folder which hasn't been updated for 2 years. Nobody uses eclipse in our team, plus we should keep repo IDE-independent.
4) Move documentaiton look & feel files (.css, .html and .js files) to proper location (to `google-cloud-clients` from root).
5) Remove `google-cloud` maven dependency sample from landing page (since `google-cloud` metapackage was removed)
5) Several minor documentaiton-related fixes.
---
 .../com.google.appengine.eclipse.core.prefs   |   2 -
 .../de.loskutov.anyedit.AnyEditTools.prefs    |  18 --
 .settings/edu.umd.cs.findbugs.core.prefs      | 137 -----------
 .settings/org.eclipse.core.resources.prefs    |   3 -
 .settings/org.eclipse.jdt.core.prefs          |  98 --------
 .../org.eclipse.ltk.core.refactoring.prefs    |   2 -
 .settings/org.eclipse.m2e.core.prefs          |   4 -
 google-api-grpc/pom.xml                       |   2 +-
 google-cloud-clients/pom.xml                  |   2 +-
 .../src}/site/resources/css/github.min.css    |   0
 .../src}/site/resources/css/normalize.css     |   0
 .../src}/site/resources/css/site.css          |   0
 .../site/resources/img/icon-arrow-bullet.svg  |  14 +-
 .../site/resources/img/icon-dropdown-faq.svg  |  14 +-
 .../src}/site/resources/img/icon-dropdown.svg |  14 +-
 .../site/resources/img/icon-lang-dotnet.svg   |   0
 .../src}/site/resources/img/icon-lang-go.svg  |   0
 .../img/icon-lang-java-duke-white.svg         |   0
 .../resources/img/icon-lang-java-duke.svg     |   0
 .../site/resources/img/icon-lang-nodejs.svg   |  32 +--
 .../src}/site/resources/img/icon-lang-php.svg |   0
 .../site/resources/img/icon-lang-python.svg   |  42 ++--
 .../site/resources/img/icon-lang-ruby.svg     |   0
 .../site/resources/img/icon-link-github.svg   |  38 +--
 .../img/icon-link-package-manager.svg         |  38 +--
 .../resources/img/icon-link-stackoverflow.svg |  32 +--
 .../src}/site/resources/img/icon-menu.svg     |  22 +-
 .../site/resources/img/icon-table-check.svg   |  14 +-
 .../src}/site/resources/img/lang-bg.png       | Bin
 .../src}/site/resources/img/logo-full.svg     | 224 +++++++++---------
 .../src}/site/resources/img/logo.svg          |  50 ++--
 .../src}/site/resources/index.html            |   6 -
 .../src}/site/resources/js/main.js            |   0
 .../src}/site/resources/js/plugins.js         |   0
 .../resources/js/vendor/highlight.pack.js     |   0
 .../resources/js/vendor/jquery-1.10.2.min.js  |   0
 .../js/vendor/modernizr-2.6.2.min.js          |   0
 .../src}/site/resources/js/vendor/prettify.js |   0
 pom.xml                                       |   4 +-
 src/site/site.xml                             |  31 ---
 utilities/create_site.sh                      |  38 ---
 utilities/stage_release.sh                    |  21 --
 utilities/stage_sites.py                      |  56 +++++
 43 files changed, 328 insertions(+), 630 deletions(-)
 delete mode 100644 .settings/com.google.appengine.eclipse.core.prefs
 delete mode 100644 .settings/de.loskutov.anyedit.AnyEditTools.prefs
 delete mode 100644 .settings/edu.umd.cs.findbugs.core.prefs
 delete mode 100644 .settings/org.eclipse.core.resources.prefs
 delete mode 100644 .settings/org.eclipse.jdt.core.prefs
 delete mode 100644 .settings/org.eclipse.ltk.core.refactoring.prefs
 delete mode 100644 .settings/org.eclipse.m2e.core.prefs
 rename {src => google-cloud-clients/src}/site/resources/css/github.min.css (100%)
 rename {src => google-cloud-clients/src}/site/resources/css/normalize.css (100%)
 rename {src => google-cloud-clients/src}/site/resources/css/site.css (100%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-arrow-bullet.svg (98%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-dropdown-faq.svg (98%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-dropdown.svg (98%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-lang-dotnet.svg (100%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-lang-go.svg (100%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-lang-java-duke-white.svg (100%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-lang-java-duke.svg (100%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-lang-nodejs.svg (98%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-lang-php.svg (100%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-lang-python.svg (98%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-lang-ruby.svg (100%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-link-github.svg (99%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-link-package-manager.svg (97%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-link-stackoverflow.svg (98%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-menu.svg (98%)
 rename {src => google-cloud-clients/src}/site/resources/img/icon-table-check.svg (98%)
 rename {src => google-cloud-clients/src}/site/resources/img/lang-bg.png (100%)
 rename {src => google-cloud-clients/src}/site/resources/img/logo-full.svg (99%)
 rename {src => google-cloud-clients/src}/site/resources/img/logo.svg (98%)
 rename {src => google-cloud-clients/src}/site/resources/index.html (97%)
 rename {src => google-cloud-clients/src}/site/resources/js/main.js (100%)
 rename {src => google-cloud-clients/src}/site/resources/js/plugins.js (100%)
 rename {src => google-cloud-clients/src}/site/resources/js/vendor/highlight.pack.js (100%)
 rename {src => google-cloud-clients/src}/site/resources/js/vendor/jquery-1.10.2.min.js (100%)
 rename {src => google-cloud-clients/src}/site/resources/js/vendor/modernizr-2.6.2.min.js (100%)
 rename {src => google-cloud-clients/src}/site/resources/js/vendor/prettify.js (100%)
 delete mode 100644 src/site/site.xml
 delete mode 100755 utilities/create_site.sh
 delete mode 100755 utilities/stage_release.sh
 create mode 100644 utilities/stage_sites.py

diff --git a/.settings/com.google.appengine.eclipse.core.prefs b/.settings/com.google.appengine.eclipse.core.prefs
deleted file mode 100644
index 82c36afe4e35..000000000000
--- a/.settings/com.google.appengine.eclipse.core.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-filesCopiedToWebInfLib=
diff --git a/.settings/de.loskutov.anyedit.AnyEditTools.prefs b/.settings/de.loskutov.anyedit.AnyEditTools.prefs
deleted file mode 100644
index c9ca2a972d8a..000000000000
--- a/.settings/de.loskutov.anyedit.AnyEditTools.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-activeContentFilterList=*.makefile,makefile,*.Makefile,Makefile,Makefile.*,*.mk,MANIFEST.MF,.project
-addNewLine=true
-convertActionOnSaave=AnyEdit.CnvrtTabToSpaces
-eclipse.preferences.version=1
-fixLineDelimiters=false
-ignoreBlankLinesWhenTrimming=false
-inActiveContentFilterList=
-javaTabWidthForJava=true
-org.eclipse.jdt.ui.editor.tab.width=2
-projectPropsEnabled=false
-removeTrailingSpaces=true
-replaceAllSpaces=false
-replaceAllTabs=false
-saveAndAddLine=false
-saveAndConvert=false
-saveAndFixLineDelimiters=false
-saveAndTrim=true
-useModulo4Tabs=false
diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
deleted file mode 100644
index f2b5b2f9de9c..000000000000
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ /dev/null
@@ -1,137 +0,0 @@
-#FindBugs User Preferences
-#Wed Nov 19 14:11:27 PST 2014
-cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud
-detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true
-detectorAtomicityProblem=AtomicityProblem|true
-detectorBadAppletConstructor=BadAppletConstructor|false
-detectorBadResultSetAccess=BadResultSetAccess|true
-detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true
-detectorBadUseOfReturnValue=BadUseOfReturnValue|true
-detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true
-detectorBooleanReturnNull=BooleanReturnNull|true
-detectorCallToUnsupportedMethod=CallToUnsupportedMethod|false
-detectorCheckExpectedWarnings=CheckExpectedWarnings|false
-detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true
-detectorCheckRelaxingNullnessAnnotation=CheckRelaxingNullnessAnnotation|true
-detectorCheckTypeQualifiers=CheckTypeQualifiers|true
-detectorCloneIdiom=CloneIdiom|true
-detectorComparatorIdiom=ComparatorIdiom|true
-detectorConfusedInheritance=ConfusedInheritance|true
-detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true
-detectorCrossSiteScripting=CrossSiteScripting|true
-detectorDefaultEncodingDetector=DefaultEncodingDetector|true
-detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true
-detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true
-detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true
-detectorDontUseEnum=DontUseEnum|true
-detectorDroppedException=DroppedException|true
-detectorDumbMethodInvocations=DumbMethodInvocations|true
-detectorDumbMethods=DumbMethods|true
-detectorDuplicateBranches=DuplicateBranches|true
-detectorEmptyZipFileEntry=EmptyZipFileEntry|false
-detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true
-detectorExplicitSerialization=ExplicitSerialization|true
-detectorFinalizerNullsFields=FinalizerNullsFields|true
-detectorFindBadCast2=FindBadCast2|true
-detectorFindBadForLoop=FindBadForLoop|true
-detectorFindCircularDependencies=FindCircularDependencies|false
-detectorFindDeadLocalStores=FindDeadLocalStores|true
-detectorFindDoubleCheck=FindDoubleCheck|true
-detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true
-detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true
-detectorFindFinalizeInvocations=FindFinalizeInvocations|true
-detectorFindFloatEquality=FindFloatEquality|true
-detectorFindHEmismatch=FindHEmismatch|true
-detectorFindInconsistentSync2=FindInconsistentSync2|true
-detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true
-detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true
-detectorFindMaskedFields=FindMaskedFields|true
-detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true
-detectorFindNakedNotify=FindNakedNotify|true
-detectorFindNonShortCircuit=FindNonShortCircuit|true
-detectorFindNullDeref=FindNullDeref|true
-detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true
-detectorFindOpenStream=FindOpenStream|true
-detectorFindPuzzlers=FindPuzzlers|true
-detectorFindRefComparison=FindRefComparison|true
-detectorFindReturnRef=FindReturnRef|true
-detectorFindRoughConstants=FindRoughConstants|true
-detectorFindRunInvocations=FindRunInvocations|true
-detectorFindSelfComparison=FindSelfComparison|true
-detectorFindSelfComparison2=FindSelfComparison2|true
-detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true
-detectorFindSpinLoop=FindSpinLoop|true
-detectorFindSqlInjection=FindSqlInjection|true
-detectorFindTwoLockWait=FindTwoLockWait|true
-detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true
-detectorFindUnconditionalWait=FindUnconditionalWait|true
-detectorFindUninitializedGet=FindUninitializedGet|true
-detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true
-detectorFindUnreleasedLock=FindUnreleasedLock|true
-detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true
-detectorFindUnsyncGet=FindUnsyncGet|true
-detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true
-detectorFindUselessControlFlow=FindUselessControlFlow|true
-detectorFormatStringChecker=FormatStringChecker|true
-detectorHugeSharedStringConstants=HugeSharedStringConstants|true
-detectorIDivResultCastToDouble=IDivResultCastToDouble|true
-detectorIncompatMask=IncompatMask|true
-detectorInconsistentAnnotations=InconsistentAnnotations|true
-detectorInefficientIndexOf=InefficientIndexOf|true
-detectorInefficientMemberAccess=InefficientMemberAccess|false
-detectorInefficientToArray=InefficientToArray|true
-detectorInfiniteLoop=InfiniteLoop|true
-detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true
-detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true
-detectorInitializationChain=InitializationChain|true
-detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true
-detectorInstantiateStaticClass=InstantiateStaticClass|true
-detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true
-detectorInvalidJUnitTest=InvalidJUnitTest|true
-detectorIteratorIdioms=IteratorIdioms|true
-detectorLazyInit=LazyInit|true
-detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true
-detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true
-detectorMethodReturnCheck=MethodReturnCheck|true
-detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true
-detectorMutableLock=MutableLock|true
-detectorMutableStaticFields=MutableStaticFields|true
-detectorNaming=Naming|true
-detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true
-detectorNumberConstructor=NumberConstructor|true
-detectorOptionalReturnNull=OptionalReturnNull|true
-detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true
-detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true
-detectorPublicSemaphores=PublicSemaphores|false
-detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true
-detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true
-detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true
-detectorRedundantInterfaces=RedundantInterfaces|true
-detectorRepeatedConditionals=RepeatedConditionals|true
-detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true
-detectorSerializableIdiom=SerializableIdiom|true
-detectorStartInConstructor=StartInConstructor|true
-detectorStaticCalendarDetector=StaticCalendarDetector|true
-detectorStringConcatenation=StringConcatenation|true
-detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true
-detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true
-detectorSwitchFallthrough=SwitchFallthrough|true
-detectorSynchronizationOnSharedBuiltinConstant=SynchronizationOnSharedBuiltinConstant|true
-detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true
-detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true
-detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true
-detectorURLProblems=URLProblems|true
-detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true
-detectorUnnecessaryMath=UnnecessaryMath|true
-detectorUnreadFields=UnreadFields|true
-detectorUselessSubclassMethod=UselessSubclassMethod|false
-detectorVarArgsProblems=VarArgsProblems|true
-detectorVolatileUsage=VolatileUsage|true
-detectorWaitInLoop=WaitInLoop|true
-detectorWrongMapIterator=WrongMapIterator|true
-detectorXMLFactoryBypass=XMLFactoryBypass|true
-detector_threshold=2
-effort=default
-filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,EXPERIMENTAL,MT_CORRECTNESS,PERFORMANCE,STYLE|false|15
-filter_settings_neg=MALICIOUS_CODE,SECURITY,NOISE,I18N|
-run_at_full_build=true
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 5b781ec6d952..000000000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 83d343fa7442..000000000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-=\=\=\=\=\=\=
-<<<<<<<=HEAD
->>>>>>>=ef72daa81c73f99e2156f5bfe8127591fc6358e9
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index b196c64a3418..000000000000
--- a/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb23..000000000000
--- a/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 3b398f94ab71..37c720b4f4cd 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -80,7 +80,7 @@
     
       github-pages-site
       Deployment through GitHub's site deployment plugin
-      site
+      site/google-api-grpc
     
   
   
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 4f6a41a5420e..4c4d2edd4eaa 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -153,7 +153,7 @@
     UTF-8
     UTF-8
     github
-    google-cloud
+    google-cloud-clients
     0.47.1-alpha-SNAPSHOT
     1.23.0
     1.25.0
diff --git a/src/site/resources/css/github.min.css b/google-cloud-clients/src/site/resources/css/github.min.css
similarity index 100%
rename from src/site/resources/css/github.min.css
rename to google-cloud-clients/src/site/resources/css/github.min.css
diff --git a/src/site/resources/css/normalize.css b/google-cloud-clients/src/site/resources/css/normalize.css
similarity index 100%
rename from src/site/resources/css/normalize.css
rename to google-cloud-clients/src/site/resources/css/normalize.css
diff --git a/src/site/resources/css/site.css b/google-cloud-clients/src/site/resources/css/site.css
similarity index 100%
rename from src/site/resources/css/site.css
rename to google-cloud-clients/src/site/resources/css/site.css
diff --git a/src/site/resources/img/icon-arrow-bullet.svg b/google-cloud-clients/src/site/resources/img/icon-arrow-bullet.svg
similarity index 98%
rename from src/site/resources/img/icon-arrow-bullet.svg
rename to google-cloud-clients/src/site/resources/img/icon-arrow-bullet.svg
index dd9acb566eb8..cdeb36e55885 100644
--- a/src/site/resources/img/icon-arrow-bullet.svg
+++ b/google-cloud-clients/src/site/resources/img/icon-arrow-bullet.svg
@@ -1,7 +1,7 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/site/resources/img/icon-dropdown-faq.svg b/google-cloud-clients/src/site/resources/img/icon-dropdown-faq.svg
similarity index 98%
rename from src/site/resources/img/icon-dropdown-faq.svg
rename to google-cloud-clients/src/site/resources/img/icon-dropdown-faq.svg
index 786bcdc7d131..16128ef4e132 100644
--- a/src/site/resources/img/icon-dropdown-faq.svg
+++ b/google-cloud-clients/src/site/resources/img/icon-dropdown-faq.svg
@@ -1,7 +1,7 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/site/resources/img/icon-dropdown.svg b/google-cloud-clients/src/site/resources/img/icon-dropdown.svg
similarity index 98%
rename from src/site/resources/img/icon-dropdown.svg
rename to google-cloud-clients/src/site/resources/img/icon-dropdown.svg
index 3642565ff6b5..6c3105889369 100644
--- a/src/site/resources/img/icon-dropdown.svg
+++ b/google-cloud-clients/src/site/resources/img/icon-dropdown.svg
@@ -1,7 +1,7 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/site/resources/img/icon-lang-dotnet.svg b/google-cloud-clients/src/site/resources/img/icon-lang-dotnet.svg
similarity index 100%
rename from src/site/resources/img/icon-lang-dotnet.svg
rename to google-cloud-clients/src/site/resources/img/icon-lang-dotnet.svg
diff --git a/src/site/resources/img/icon-lang-go.svg b/google-cloud-clients/src/site/resources/img/icon-lang-go.svg
similarity index 100%
rename from src/site/resources/img/icon-lang-go.svg
rename to google-cloud-clients/src/site/resources/img/icon-lang-go.svg
diff --git a/src/site/resources/img/icon-lang-java-duke-white.svg b/google-cloud-clients/src/site/resources/img/icon-lang-java-duke-white.svg
similarity index 100%
rename from src/site/resources/img/icon-lang-java-duke-white.svg
rename to google-cloud-clients/src/site/resources/img/icon-lang-java-duke-white.svg
diff --git a/src/site/resources/img/icon-lang-java-duke.svg b/google-cloud-clients/src/site/resources/img/icon-lang-java-duke.svg
similarity index 100%
rename from src/site/resources/img/icon-lang-java-duke.svg
rename to google-cloud-clients/src/site/resources/img/icon-lang-java-duke.svg
diff --git a/src/site/resources/img/icon-lang-nodejs.svg b/google-cloud-clients/src/site/resources/img/icon-lang-nodejs.svg
similarity index 98%
rename from src/site/resources/img/icon-lang-nodejs.svg
rename to google-cloud-clients/src/site/resources/img/icon-lang-nodejs.svg
index 24a4addc3c57..e7a2fe475c41 100644
--- a/src/site/resources/img/icon-lang-nodejs.svg
+++ b/google-cloud-clients/src/site/resources/img/icon-lang-nodejs.svg
@@ -1,16 +1,16 @@
-
-
-
-
-
-	
-	
-	
-	
-	
-
-
+
+
+
+
+
+	
+	
+	
+	
+	
+
+
diff --git a/src/site/resources/img/icon-lang-php.svg b/google-cloud-clients/src/site/resources/img/icon-lang-php.svg
similarity index 100%
rename from src/site/resources/img/icon-lang-php.svg
rename to google-cloud-clients/src/site/resources/img/icon-lang-php.svg
diff --git a/src/site/resources/img/icon-lang-python.svg b/google-cloud-clients/src/site/resources/img/icon-lang-python.svg
similarity index 98%
rename from src/site/resources/img/icon-lang-python.svg
rename to google-cloud-clients/src/site/resources/img/icon-lang-python.svg
index bc4737703c35..d6da4a5d3592 100644
--- a/src/site/resources/img/icon-lang-python.svg
+++ b/google-cloud-clients/src/site/resources/img/icon-lang-python.svg
@@ -1,21 +1,21 @@
-
-
-
-
-
-	
-		
-		
-	
-
-
+
+
+
+
+
+	
+		
+		
+	
+
+
diff --git a/src/site/resources/img/icon-lang-ruby.svg b/google-cloud-clients/src/site/resources/img/icon-lang-ruby.svg
similarity index 100%
rename from src/site/resources/img/icon-lang-ruby.svg
rename to google-cloud-clients/src/site/resources/img/icon-lang-ruby.svg
diff --git a/src/site/resources/img/icon-link-github.svg b/google-cloud-clients/src/site/resources/img/icon-link-github.svg
similarity index 99%
rename from src/site/resources/img/icon-link-github.svg
rename to google-cloud-clients/src/site/resources/img/icon-link-github.svg
index 2404f8b0be06..af74605fc6d1 100644
--- a/src/site/resources/img/icon-link-github.svg
+++ b/google-cloud-clients/src/site/resources/img/icon-link-github.svg
@@ -1,19 +1,19 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/site/resources/img/icon-link-package-manager.svg b/google-cloud-clients/src/site/resources/img/icon-link-package-manager.svg
similarity index 97%
rename from src/site/resources/img/icon-link-package-manager.svg
rename to google-cloud-clients/src/site/resources/img/icon-link-package-manager.svg
index 3a12655fe6f9..d9d77111a14b 100644
--- a/src/site/resources/img/icon-link-package-manager.svg
+++ b/google-cloud-clients/src/site/resources/img/icon-link-package-manager.svg
@@ -1,19 +1,19 @@
-
-
-
-
-
-	
-		
-	
-	
-		
-	
-	
-		
-			
-		
-	
-
-
+
+
+
+
+
+	
+		
+	
+	
+		
+	
+	
+		
+			
+		
+	
+
+
diff --git a/src/site/resources/img/icon-link-stackoverflow.svg b/google-cloud-clients/src/site/resources/img/icon-link-stackoverflow.svg
similarity index 98%
rename from src/site/resources/img/icon-link-stackoverflow.svg
rename to google-cloud-clients/src/site/resources/img/icon-link-stackoverflow.svg
index e1a1f789a897..d59125875d35 100644
--- a/src/site/resources/img/icon-link-stackoverflow.svg
+++ b/google-cloud-clients/src/site/resources/img/icon-link-stackoverflow.svg
@@ -1,16 +1,16 @@
-
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-
-
+
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+
+
diff --git a/src/site/resources/img/icon-menu.svg b/google-cloud-clients/src/site/resources/img/icon-menu.svg
similarity index 98%
rename from src/site/resources/img/icon-menu.svg
rename to google-cloud-clients/src/site/resources/img/icon-menu.svg
index 98d3e7073cde..a184966934d1 100644
--- a/src/site/resources/img/icon-menu.svg
+++ b/google-cloud-clients/src/site/resources/img/icon-menu.svg
@@ -1,11 +1,11 @@
-
-
-
-
-
-	
-	
-	
-
-
+
+
+
+
+
+	
+	
+	
+
+
diff --git a/src/site/resources/img/icon-table-check.svg b/google-cloud-clients/src/site/resources/img/icon-table-check.svg
similarity index 98%
rename from src/site/resources/img/icon-table-check.svg
rename to google-cloud-clients/src/site/resources/img/icon-table-check.svg
index 7934bef97f06..3ad540204b97 100644
--- a/src/site/resources/img/icon-table-check.svg
+++ b/google-cloud-clients/src/site/resources/img/icon-table-check.svg
@@ -1,7 +1,7 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/site/resources/img/lang-bg.png b/google-cloud-clients/src/site/resources/img/lang-bg.png
similarity index 100%
rename from src/site/resources/img/lang-bg.png
rename to google-cloud-clients/src/site/resources/img/lang-bg.png
diff --git a/src/site/resources/img/logo-full.svg b/google-cloud-clients/src/site/resources/img/logo-full.svg
similarity index 99%
rename from src/site/resources/img/logo-full.svg
rename to google-cloud-clients/src/site/resources/img/logo-full.svg
index 3b84037fccc6..b70ddbbddaa0 100644
--- a/src/site/resources/img/logo-full.svg
+++ b/google-cloud-clients/src/site/resources/img/logo-full.svg
@@ -1,112 +1,112 @@
-
-
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
+
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
diff --git a/src/site/resources/img/logo.svg b/google-cloud-clients/src/site/resources/img/logo.svg
similarity index 98%
rename from src/site/resources/img/logo.svg
rename to google-cloud-clients/src/site/resources/img/logo.svg
index 6c515095c5ad..385c7ff95349 100644
--- a/src/site/resources/img/logo.svg
+++ b/google-cloud-clients/src/site/resources/img/logo.svg
@@ -1,25 +1,25 @@
-
-
-
-
-
-	
-	
-
-
+
+
+
+
+
+	
+	
+
+
diff --git a/src/site/resources/index.html b/google-cloud-clients/src/site/resources/index.html
similarity index 97%
rename from src/site/resources/index.html
rename to google-cloud-clients/src/site/resources/index.html
index 6eebe47daff6..a7be38cfb3dd 100644
--- a/src/site/resources/index.html
+++ b/google-cloud-clients/src/site/resources/index.html
@@ -77,12 +77,6 @@ 
google-cloud

                         
Google Cloud Client Library for Java - an idiomatic, intuitive, and natural way for Java developers to integrate with Google Cloud Platform services, like Cloud Datastore and Cloud Storage.

                     
                     

-                        
Quickstart with Maven: add google-cloud to your pom.xml

-                        
<dependency>
-  <groupId>com.google.cloud</groupId>
-  <artifactId>google-cloud</artifactId>
-  <version>{{SITE_VERSION}}</version>
-</dependency>

                     

                 
             
diff --git a/src/site/resources/js/main.js b/google-cloud-clients/src/site/resources/js/main.js
similarity index 100%
rename from src/site/resources/js/main.js
rename to google-cloud-clients/src/site/resources/js/main.js
diff --git a/src/site/resources/js/plugins.js b/google-cloud-clients/src/site/resources/js/plugins.js
similarity index 100%
rename from src/site/resources/js/plugins.js
rename to google-cloud-clients/src/site/resources/js/plugins.js
diff --git a/src/site/resources/js/vendor/highlight.pack.js b/google-cloud-clients/src/site/resources/js/vendor/highlight.pack.js
similarity index 100%
rename from src/site/resources/js/vendor/highlight.pack.js
rename to google-cloud-clients/src/site/resources/js/vendor/highlight.pack.js
diff --git a/src/site/resources/js/vendor/jquery-1.10.2.min.js b/google-cloud-clients/src/site/resources/js/vendor/jquery-1.10.2.min.js
similarity index 100%
rename from src/site/resources/js/vendor/jquery-1.10.2.min.js
rename to google-cloud-clients/src/site/resources/js/vendor/jquery-1.10.2.min.js
diff --git a/src/site/resources/js/vendor/modernizr-2.6.2.min.js b/google-cloud-clients/src/site/resources/js/vendor/modernizr-2.6.2.min.js
similarity index 100%
rename from src/site/resources/js/vendor/modernizr-2.6.2.min.js
rename to google-cloud-clients/src/site/resources/js/vendor/modernizr-2.6.2.min.js
diff --git a/src/site/resources/js/vendor/prettify.js b/google-cloud-clients/src/site/resources/js/vendor/prettify.js
similarity index 100%
rename from src/site/resources/js/vendor/prettify.js
rename to google-cloud-clients/src/site/resources/js/vendor/prettify.js
diff --git a/pom.xml b/pom.xml
index f568bb6d57aa..d743fdb89e22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,7 @@
 
-
+
   4.0.0
   com.google.api
   google-cloud-java
diff --git a/src/site/site.xml b/src/site/site.xml
deleted file mode 100644
index 13981f041d2b..000000000000
--- a/src/site/site.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-  
-    org.apache.maven.skins
-    maven-fluido-skin
-    1.4
-  
-  
-  
-    
-    
-    
-  
-
diff --git a/utilities/create_site.sh b/utilities/create_site.sh
deleted file mode 100755
index 980611ff2e3d..000000000000
--- a/utilities/create_site.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SITE_VERSION=$1
-SITE_VERSION_BASE=$(sed -r 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/' <<< "$SITE_VERSION")
-
-echo "Creating site for google-cloud-java $SITE_VERSION_BASE"
-
-if [ -z "$SITE_VERSION_BASE" ]; then
-    echo "First arg (version) not provided, so we're exiting."
-    exit 1
-fi
-
-git clone --branch gh-pages --single-branch https://github.com/GoogleCloudPlatform/google-cloud-java/ tmp_gh-pages
-mkdir -p tmp_gh-pages/$SITE_VERSION_BASE
-mvn site -Djava.util.logging.config.file=logging.properties
-mvn site:stage --quiet -Djava.util.logging.config.file=logging.properties -DtopSiteURL=https://googlecloudplatform.github.io/google-cloud-java
-
-rm -rf tmp_gh-pages/latest
-mkdir tmp_gh-pages/latest
-version_bases=(${SITE_VERSION_BASE} latest)
-for version_base in ${version_bases[@]}
-do
-  cd tmp_gh-pages
-  cp -r ../target/staging/*/* $version_base
-  sed -i "s/{{SITE_VERSION}}/$SITE_VERSION/g" ${version_base}/index.html # Update "Quickstart with Maven" to reflect version change
-  git add $version_base
-  cd ..
-done
-
-cd tmp_gh-pages
-echo "" > index.html
-git add index.html
-echo "" > apidocs/index.html
-git add apidocs/index.html
-
-echo "Site generated under tmp_gh-pages/. The changes must be committed from that directory."
diff --git a/utilities/stage_release.sh b/utilities/stage_release.sh
deleted file mode 100755
index 2a5193fa0de8..000000000000
--- a/utilities/stage_release.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)')
-echo "Used the maven-help-plugin to determine that the version is $SITE_VERSION"
-if [ -z "$SITE_VERSION" ]; then
-    echo "Could not determine the version, so we're exiting."
-    exit 1
-fi
-
-# Deploy the build artifacts to Sonatype
-./utilities/deploy.sh "$SITE_VERSION"
-
-if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then
-    # Create website
-    ./utilities/create_site.sh "$SITE_VERSION"
-
-    cd tmp_gh-pages
-    git commit --quiet -m "Added a new site for version $SITE_VERSION and updated the root directory's redirect. [ci skip]"
-fi
diff --git a/utilities/stage_sites.py b/utilities/stage_sites.py
new file mode 100644
index 000000000000..ef5852926225
--- /dev/null
+++ b/utilities/stage_sites.py
@@ -0,0 +1,56 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+# This scripts creates sites for `google-cloud-clients` and `google-api-grpc`
+# modules and commits (but does not push) them to gh-pages branch of
+# GoogleCloudPlatform/google-cloud-java github repository.
+
+# Usage:
+#   python utilities/stage_sites.py
+
+import subprocess
+import sys
+
+
+def stage_sites(sites, gh_pages, git_url, top_site_url):
+  _run(['git', 'clone', '--branch', 'gh-pages', '--single-branch', git_url,
+        gh_pages])
+  _run(['mkdir', '-p', gh_pages])
+  for site in sites:
+    _create_site(site, gh_pages, top_site_url)
+  _run(['git', 'add', '.'], gh_pages)
+  _run(['git', 'commit', '-m',
+        "Regenerate documentation for %s. [ci skip]" % ', '.join(sites)],
+       gh_pages)
+
+
+def _create_site(site_name, gh_pages, top_site_url):
+  _run(['mvn', 'site'], site_name)
+  _run(['mvn', 'site:stage', '-q',
+        "-DtopSiteURL=%s/%s" % (top_site_url, site_name)],
+       site_name)
+  _run(['rm', '-rf', site_name], gh_pages)
+  _run(['cp', '-r', "%s/target/staging/site/%s" % (site_name, site_name),
+        gh_pages])
+
+
+def _run(command, cwd=None):
+  print("\033[1;36mExecute command:\033[0m %s" % ' '.join(command))
+  subprocess.check_call(command, cwd=cwd, stdout=sys.stdout, stderr=sys.stderr)
+
+
+if __name__ == '__main__':
+  stage_sites(['google-api-grpc', 'google-cloud-clients'], 'tmp_gh-pages',
+              'https://github.com/GoogleCloudPlatform/google-cloud-java',
+              'https://googlecloudplatform.github.io/google-cloud-java')

From 277eebc2d3abd73fa376a1d6f39fcb93a9f0335d Mon Sep 17 00:00:00 2001
From: Alix Hamilton 
Date: Wed, 16 May 2018 14:08:53 -0700
Subject: [PATCH 34/65] PubSub: Update region tags to standard

---
 .../examples/pubsub/snippets/SubscriberSnippets.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java
index 44cde5558ada..059665282a61 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java
@@ -100,7 +100,7 @@ public void failed(Subscriber.State from, Throwable failure) {
   }
 
   private void createSubscriber() throws Exception {
-    // [START pubsub_pull]
+    // [START pubsub_subscriber_async_pull]
     String projectId = "my-project-id";
     String subscriptionId = "my-subscription-id";
 
@@ -129,7 +129,7 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
         subscriber.stopAsync();
       }
     }
-    // [END pubsub_pull]
+    // [END pubsub_subscriber_async_pull]
   }
 
   private Subscriber createSubscriberWithErrorListener(Subscriber subscriber) throws Exception {
@@ -190,7 +190,7 @@ private Subscriber createSubscriberWithCustomCredentials() throws Exception {
 
   static List createSubscriberWithSyncPull(
       String projectId, String subscriptionId, int numOfMessages) throws Exception {
-    // [START subscriber_sync_pull]
+    // [START pubsub_subscriber_sync_pull]
     SubscriberStubSettings subscriberStubSettings =
         SubscriberStubSettings.newBuilder().build();
     try (SubscriberStub subscriber = GrpcSubscriberStub.create(subscriberStubSettings)) {
@@ -223,6 +223,6 @@ static List createSubscriberWithSyncPull(
       subscriber.acknowledgeCallable().call(acknowledgeRequest);
       return pullResponse.getReceivedMessagesList();
     }
-    // [END subscriber_sync_pull]
+    // [END pubsub_subscriber_sync_pull]
   }
 }

From 626e5b255cd38d35e99c13c9edfed87e28e68859 Mon Sep 17 00:00:00 2001
From: Seth Hollyman 
Date: Wed, 16 May 2018 15:31:01 -0700
Subject: [PATCH 35/65] Switch StatementType to a StringEnumType, more complete
 testing.

---
 .../google/cloud/bigquery/JobStatistics.java  | 94 ++++++++++++++++++-
 .../cloud/bigquery/JobStatisticsTest.java     | 11 ++-
 2 files changed, 98 insertions(+), 7 deletions(-)

diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
index 7e85b9d3b5fa..c137abcfd261 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
@@ -16,10 +16,14 @@
 
 package com.google.cloud.bigquery;
 
+import com.google.api.core.ApiFunction;
 import com.google.api.services.bigquery.model.JobConfiguration;
 import com.google.api.services.bigquery.model.JobStatistics2;
 import com.google.api.services.bigquery.model.JobStatistics3;
 import com.google.api.services.bigquery.model.JobStatistics4;
+import com.google.api.services.bigquery.model.TableReference;
+import com.google.cloud.StringEnumType;
+import com.google.cloud.StringEnumValue;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.Lists;
@@ -311,6 +315,7 @@ static LoadStatistics fromPb(com.google.api.services.bigquery.model.JobStatistic
     }
   }
 
+
   /**
    * A Google BigQuery Query Job statistics.
    */
@@ -325,7 +330,7 @@ public static class QueryStatistics extends JobStatistics {
     private final Long estimatedBytesProcessed;
     private final Long numDmlAffectedRows;
     private final List referencedTables;
-    private final String statementType;
+    private final StatementType statementType;
     private final Long totalBytesBilled;
     private final Long totalBytesProcessed;
     private final Long totalPartitionsProcessed;
@@ -334,6 +339,64 @@ public static class QueryStatistics extends JobStatistics {
     private final List timeline;
     private final Schema schema;
 
+
+    /**
+     * StatementType represents possible types of SQL statements reported as part of the
+     * QueryStatistics of a BigQuery job.
+     */
+    public static final class StatementType extends StringEnumValue {
+      private static final long serialVersionUID = 818920627219751204L;
+
+      private static final ApiFunction CONSTRUCTOR =
+          new ApiFunction() {
+            @Override
+            public StatementType apply(String constant) {
+              return new StatementType(constant);
+            }
+          };
+
+      private static final StringEnumType type = new StringEnumType(
+          StatementType.class,
+          CONSTRUCTOR);
+
+      public static final StatementType SELECT = type.createAndRegister("SELECT");
+      public static final StatementType UPDATE = type.createAndRegister("UPDATE");
+      public static final StatementType INSERT = type.createAndRegister("INSERT");
+      public static final StatementType DELETE = type.createAndRegister("DELETE");
+      public static final StatementType CREATE_TABLE = type.createAndRegister("CREATE_TABLE");
+      public static final StatementType CREATE_TABLE_AS_SELECT = type.createAndRegister("CREATE_TABLE_AS_SELECT");
+      public static final StatementType CREATE_VIEW = type.createAndRegister("CREATE_VIEW");
+      public static final StatementType DROP_TABLE = type.createAndRegister("DROP_TABLE");
+      public static final StatementType DROP_VIEW = type.createAndRegister("DROP_VIEW");
+      public static final StatementType MERGE = type.createAndRegister("MERGE");
+
+      private StatementType(String constant) {
+        super(constant);
+      }
+
+      /**
+       * Get the StatementType for the given String constant, and throw an exception if the constant is
+       * not recognized.
+       */
+      public static StatementType valueOfStrict(String constant) {
+        return type.valueOfStrict(constant);
+      }
+
+      /**
+       * Get the State for the given String constant, and allow unrecognized values.
+       */
+      public static StatementType valueOf(String constant) {
+        return type.valueOf(constant);
+      }
+
+      /**
+       * Return the known values for State.
+       */
+      public static StatementType[] values() {
+        return type.values();
+      }
+    }
+
     static final class Builder extends JobStatistics.Builder {
 
       private Integer billingTier;
@@ -343,7 +406,7 @@ static final class Builder extends JobStatistics.Builder referencedTables;
-      private String statementType;
+      private StatementType statementType;
       private Long totalBytesBilled;
       private Long totalBytesProcessed;
       private Long totalPartitionsProcessed;
@@ -365,11 +428,14 @@ private Builder(com.google.api.services.bigquery.model.JobStatistics statisticsP
           }
           this.estimatedBytesProcessed = statisticsPb.getQuery().getEstimatedBytesProcessed();
           this.numDmlAffectedRows = statisticsPb.getQuery().getNumDmlAffectedRows();
-          this.statementType = statisticsPb.getQuery().getStatementType();
           this.totalBytesBilled = statisticsPb.getQuery().getTotalBytesBilled();
           this.totalBytesProcessed = statisticsPb.getQuery().getTotalBytesProcessed();
           this.totalPartitionsProcessed = statisticsPb.getQuery().getTotalPartitionsProcessed();
           this.totalSlotMs = statisticsPb.getQuery().getTotalSlotMs();
+          if (statisticsPb.getQuery().getStatementType() != null) {
+            this.statementType = StatementType.valueOf(statisticsPb.getQuery().getStatementType());
+          }
+
           if (statisticsPb.getQuery().getReferencedTables() != null) {
             this.referencedTables =
                 Lists.transform(
@@ -426,11 +492,16 @@ Builder setReferenceTables(List referencedTables) {
         return self();
       }
 
-      Builder setStatementType(String statementType) {
+      Builder setStatementType(StatementType statementType) {
         this.statementType = statementType;
         return self();
       }
 
+      Builder setStatementType(String strStatementType) {
+        this.statementType = StatementType.valueOf(strStatementType);
+        return self();
+      }
+
       Builder setTotalBytesBilled(Long totalBytesBilled) {
         this.totalBytesBilled = totalBytesBilled;
         return self();
@@ -550,7 +621,7 @@ public Boolean getCacheHit() {
      * CREATE_VIEW
      * DROP_VIEW
      */
-    public String getStatementType() { return statementType; }
+    public StatementType getStatementType() { return statementType; }
 
     /**
      * Returns the total number of bytes billed for the job.
@@ -637,8 +708,21 @@ com.google.api.services.bigquery.model.JobStatistics toPb() {
       JobStatistics2 queryStatisticsPb = new JobStatistics2();
       queryStatisticsPb.setBillingTier(billingTier);
       queryStatisticsPb.setCacheHit(cacheHit);
+      queryStatisticsPb.setDdlOperationPerformed(ddlOperationPerformed);
       queryStatisticsPb.setTotalBytesBilled(totalBytesBilled);
       queryStatisticsPb.setTotalBytesProcessed(totalBytesProcessed);
+      queryStatisticsPb.setTotalPartitionsProcessed(totalPartitionsProcessed);
+      queryStatisticsPb.setTotalSlotMs(totalSlotMs);
+      if (ddlTargetTable != null) {
+        queryStatisticsPb.setDdlTargetTable(ddlTargetTable.toPb());
+      }
+
+      if (referencedTables != null) {
+        queryStatisticsPb.setReferencedTables(Lists.transform(referencedTables, TableId.TO_PB_FUNCTION));
+      }
+      if (statementType != null) {
+        queryStatisticsPb.setStatementType(statementType.toString());
+      }
       if (queryPlan != null) {
         queryStatisticsPb.setQueryPlan(Lists.transform(queryPlan, QueryStage.TO_PB_FUNCTION));
       }
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
index c4eaa4ab3a23..7e5963d622e8 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
@@ -23,6 +23,7 @@
 import com.google.cloud.bigquery.JobStatistics.ExtractStatistics;
 import com.google.cloud.bigquery.JobStatistics.LoadStatistics;
 import com.google.cloud.bigquery.JobStatistics.QueryStatistics;
+import com.google.cloud.bigquery.JobStatistics.QueryStatistics.StatementType;
 import com.google.cloud.bigquery.QueryStage.QueryStep;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
@@ -36,7 +37,7 @@ public class JobStatisticsTest {
   private static final TableId DDL_TARGET_TABLE = TableId.of("foo", "bar", "baz");
   private static final Long ESTIMATE_BYTES_PROCESSED = 101L;
   private static final Long NUM_DML_AFFECTED_ROWS = 88L;
-  private static final String STATEMENT_TYPE = "SELECT";
+  private static final QueryStatistics.StatementType STATEMENT_TYPE = QueryStatistics.StatementType.SELECT;
   private static final Long TOTAL_BYTES_BILLED = 24L;
   private static final Long TOTAL_BYTES_PROCESSED = 42L;
   private static final Long TOTAL_PARTITION_PROCESSED = 63L;
@@ -194,7 +195,6 @@ public void testBuilder() {
     assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getDdlTargetTable());
     assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getEstimatedBytesProcessed());
     assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getNumDmlAffectedRows());
-    assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getStatementType());
     assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getTotalBytesBilled());
     assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getTotalBytesProcessed());
     assertEquals(null, QUERY_STATISTICS_INCOMPLETE.getTotalPartitionsProcessed());
@@ -268,10 +268,17 @@ private void compareQueryStatistics(QueryStatistics expected, QueryStatistics va
     compareStatistics(expected, value);
     assertEquals(expected.getBillingTier(), value.getBillingTier());
     assertEquals(expected.getCacheHit(), value.getCacheHit());
+    assertEquals(expected.getDdlOperationPerformed(), value.getDdlOperationPerformed());
+    assertEquals(expected.getDdlTargetTable(), value.getDdlTargetTable());
     assertEquals(expected.getTotalBytesBilled(), value.getTotalBytesBilled());
     assertEquals(expected.getTotalBytesProcessed(), value.getTotalBytesProcessed());
+    assertEquals(expected.getTotalPartitionsProcessed(), value.getTotalPartitionsProcessed());
+    assertEquals(expected.getTotalSlotMs(), value.getTotalSlotMs());
     assertEquals(expected.getQueryPlan(), value.getQueryPlan());
+    assertEquals(expected.getReferencedTables(), value.getReferencedTables());
     assertEquals(expected.getSchema(), value.getSchema());
+    assertEquals(expected.getStatementType(), value.getStatementType());
+    assertEquals(expected.getTimeline(), value.getTimeline());
   }
 
   private void compareStatistics(JobStatistics expected, JobStatistics value) {

From 6a1e9f43e900205ba139bb8436ed9fefd07bef11 Mon Sep 17 00:00:00 2001
From: Seth Hollyman 
Date: Wed, 16 May 2018 15:45:21 -0700
Subject: [PATCH 36/65] remove unused imports

---
 .../src/main/java/com/google/cloud/bigquery/JobStatistics.java   | 1 -
 .../test/java/com/google/cloud/bigquery/JobStatisticsTest.java   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
index c137abcfd261..a27b94636b80 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
@@ -21,7 +21,6 @@
 import com.google.api.services.bigquery.model.JobStatistics2;
 import com.google.api.services.bigquery.model.JobStatistics3;
 import com.google.api.services.bigquery.model.JobStatistics4;
-import com.google.api.services.bigquery.model.TableReference;
 import com.google.cloud.StringEnumType;
 import com.google.cloud.StringEnumValue;
 import com.google.common.base.MoreObjects;
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
index 7e5963d622e8..c33b3ef251ca 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
@@ -23,7 +23,6 @@
 import com.google.cloud.bigquery.JobStatistics.ExtractStatistics;
 import com.google.cloud.bigquery.JobStatistics.LoadStatistics;
 import com.google.cloud.bigquery.JobStatistics.QueryStatistics;
-import com.google.cloud.bigquery.JobStatistics.QueryStatistics.StatementType;
 import com.google.cloud.bigquery.QueryStage.QueryStep;
 import com.google.common.collect.ImmutableList;
 import java.util.List;

From ddb1ce4094c3254df21a63d24a947e434ce6aee6 Mon Sep 17 00:00:00 2001
From: Seth Hollyman 
Date: Wed, 16 May 2018 15:54:36 -0700
Subject: [PATCH 37/65] push setEstimatedBytesProcessed in toPb()

---
 .../src/main/java/com/google/cloud/bigquery/JobStatistics.java   | 1 +
 .../test/java/com/google/cloud/bigquery/JobStatisticsTest.java   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
index a27b94636b80..5ec974e19ef5 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java
@@ -708,6 +708,7 @@ com.google.api.services.bigquery.model.JobStatistics toPb() {
       queryStatisticsPb.setBillingTier(billingTier);
       queryStatisticsPb.setCacheHit(cacheHit);
       queryStatisticsPb.setDdlOperationPerformed(ddlOperationPerformed);
+      queryStatisticsPb.setEstimatedBytesProcessed(estimatedBytesProcessed);
       queryStatisticsPb.setTotalBytesBilled(totalBytesBilled);
       queryStatisticsPb.setTotalBytesProcessed(totalBytesProcessed);
       queryStatisticsPb.setTotalPartitionsProcessed(totalPartitionsProcessed);
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
index c33b3ef251ca..cae861be6d85 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java
@@ -269,6 +269,7 @@ private void compareQueryStatistics(QueryStatistics expected, QueryStatistics va
     assertEquals(expected.getCacheHit(), value.getCacheHit());
     assertEquals(expected.getDdlOperationPerformed(), value.getDdlOperationPerformed());
     assertEquals(expected.getDdlTargetTable(), value.getDdlTargetTable());
+    assertEquals(expected.getEstimatedBytesProcessed(), value.getEstimatedBytesProcessed());
     assertEquals(expected.getTotalBytesBilled(), value.getTotalBytesBilled());
     assertEquals(expected.getTotalBytesProcessed(), value.getTotalBytesProcessed());
     assertEquals(expected.getTotalPartitionsProcessed(), value.getTotalPartitionsProcessed());

From c9fe645708ff56bb51cdbc84914301c63434411b Mon Sep 17 00:00:00 2001
From: Steven Tran <35081873+stetra@users.noreply.github.com>
Date: Thu, 17 May 2018 14:34:52 -0700
Subject: [PATCH 38/65] Update pubsub sample links (#3285)

---
 google-cloud-clients/google-cloud-pubsub/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/google-cloud-pubsub/README.md b/google-cloud-clients/google-cloud-pubsub/README.md
index dd6cb3b0b6c3..e17b587ebd87 100644
--- a/google-cloud-clients/google-cloud-pubsub/README.md
+++ b/google-cloud-clients/google-cloud-pubsub/README.md
@@ -196,7 +196,7 @@ try {
 ```
 #### Complete source code
 
-In [CreateTopicAndPublishMessages.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java) and [CreateSubscriptionAndConsumeMessages.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java) we put together all the code shown above into two programs. The programs assume that you are running on Compute Engine, App Engine Flexible or from your own desktop.
+In [CreateTopicAndPublishMessages.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java) and [CreateSubscriptionAndConsumeMessages.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java) we put together all the code shown above into two programs. The programs assume that you are running on Compute Engine, App Engine Flexible or from your own desktop.
 
 Transport
 ---------

From 871b87eae8eff46c92a66c86bb96e18ed5893c95 Mon Sep 17 00:00:00 2001
From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com>
Date: Thu, 17 May 2018 16:00:08 -0700
Subject: [PATCH 39/65] Regenerate gapic clients, add IoT and Web Security
 Scanner clients (#3282)

Also remove beta packages for dlp, as they are removed from googleapis. IoT packages were moved from `cloudiot` to just `iot`.

Also regenerate clients with @BetaApi annotation for LRO-specific code.
---
 codacy-conf.json                              |     6 +-
 .../grpc-google-cloud-dlp-v2beta1/pom.xml     |    31 -
 .../privacy/dlp/v2beta1/DlpServiceGrpc.java   |  1002 --
 .../pom.xml                                   |    10 +-
 .../cloud/iot/v1/DeviceManagerGrpc.java       |     0
 .../cloud/vision/v1/ImageAnnotatorGrpc.java   |   112 +
 google-api-grpc/pom.xml                       |    26 +-
 .../proto-google-cloud-dlp-v2beta1/pom.xml    |    31 -
 .../v2beta1/AnalyzeDataSourceRiskRequest.java |   855 --
 ...AnalyzeDataSourceRiskRequestOrBuilder.java |    59 -
 .../privacy/dlp/v2beta1/BigQueryOptions.java  |  1089 --
 .../dlp/v2beta1/BigQueryOptionsOrBuilder.java |    83 -
 .../privacy/dlp/v2beta1/BigQueryTable.java    |   877 --
 .../dlp/v2beta1/BigQueryTableOrBuilder.java   |    65 -
 .../privacy/dlp/v2beta1/BucketingConfig.java  |  1946 ---
 .../dlp/v2beta1/BucketingConfigOrBuilder.java |    33 -
 .../dlp/v2beta1/CategoryDescription.java      |   707 -
 .../v2beta1/CategoryDescriptionOrBuilder.java |    45 -
 .../dlp/v2beta1/CharacterMaskConfig.java      |  1238 --
 .../v2beta1/CharacterMaskConfigOrBuilder.java |   110 -
 .../privacy/dlp/v2beta1/CharsToIgnore.java    |   900 --
 .../dlp/v2beta1/CharsToIgnoreOrBuilder.java   |    30 -
 .../dlp/v2beta1/CloudStorageKeyOrBuilder.java |    36 -
 .../dlp/v2beta1/CloudStorageOptions.java      |  1158 --
 .../v2beta1/CloudStorageOptionsOrBuilder.java |    22 -
 .../privacy/dlp/v2beta1/CloudStoragePath.java |   552 -
 .../v2beta1/CloudStoragePathOrBuilder.java    |    27 -
 .../com/google/privacy/dlp/v2beta1/Color.java |   628 -
 .../privacy/dlp/v2beta1/ColorOrBuilder.java   |    36 -
 .../privacy/dlp/v2beta1/ContentItem.java      |  1159 --
 .../dlp/v2beta1/ContentItemOrBuilder.java     |    85 -
 .../CreateInspectOperationRequest.java        |  1315 --
 ...reateInspectOperationRequestOrBuilder.java |   109 -
 .../privacy/dlp/v2beta1/CryptoHashConfig.java |   634 -
 .../v2beta1/CryptoHashConfigOrBuilder.java    |    34 -
 .../google/privacy/dlp/v2beta1/CryptoKey.java |  1085 --
 .../dlp/v2beta1/CryptoKeyOrBuilder.java       |    50 -
 .../v2beta1/CryptoReplaceFfxFpeConfig.java    |  1731 ---
 .../CryptoReplaceFfxFpeConfigOrBuilder.java   |   163 -
 .../privacy/dlp/v2beta1/CustomInfoType.java   |  2424 ----
 .../dlp/v2beta1/CustomInfoTypeOrBuilder.java  |    64 -
 .../privacy/dlp/v2beta1/DatastoreKey.java     |   626 -
 .../dlp/v2beta1/DatastoreKeyOrBuilder.java    |    34 -
 .../privacy/dlp/v2beta1/DatastoreOptions.java |  1330 --
 .../v2beta1/DatastoreOptionsOrBuilder.java    |   111 -
 .../dlp/v2beta1/DeidentificationSummary.java  |   912 --
 .../DeidentificationSummaryOrBuilder.java     |    62 -
 .../privacy/dlp/v2beta1/DeidentifyConfig.java |  1005 --
 .../v2beta1/DeidentifyConfigOrBuilder.java    |    70 -
 .../dlp/v2beta1/DeidentifyContentRequest.java |  1318 --
 .../DeidentifyContentRequestOrBuilder.java    |   108 -
 .../v2beta1/DeidentifyContentResponse.java    |  1177 --
 .../DeidentifyContentResponseOrBuilder.java   |    77 -
 .../google/privacy/dlp/v2beta1/DlpProto.java  |  1370 --
 .../privacy/dlp/v2beta1/DlpStorage.java       |   345 -
 .../google/privacy/dlp/v2beta1/EntityId.java  |   634 -
 .../dlp/v2beta1/EntityIdOrBuilder.java        |    34 -
 .../privacy/dlp/v2beta1/FieldIdOrBuilder.java |    27 -
 .../dlp/v2beta1/FieldTransformation.java      |  1722 ---
 .../v2beta1/FieldTransformationOrBuilder.java |   151 -
 .../google/privacy/dlp/v2beta1/Finding.java   |  1350 --
 .../privacy/dlp/v2beta1/FindingOrBuilder.java |   119 -
 .../dlp/v2beta1/FixedSizeBucketingConfig.java |  1022 --
 .../FixedSizeBucketingConfigOrBuilder.java    |    86 -
 .../privacy/dlp/v2beta1/ImageLocation.java    |   693 -
 .../dlp/v2beta1/ImageLocationOrBuilder.java   |    45 -
 .../google/privacy/dlp/v2beta1/InfoType.java  |   552 -
 .../dlp/v2beta1/InfoTypeDescription.java      |  1147 --
 .../v2beta1/InfoTypeDescriptionOrBuilder.java |    89 -
 .../dlp/v2beta1/InfoTypeOrBuilder.java        |    27 -
 .../dlp/v2beta1/InfoTypeStatistics.java       |   701 -
 .../v2beta1/InfoTypeStatisticsOrBuilder.java  |    43 -
 .../dlp/v2beta1/InfoTypeTransformations.java  |  2027 ---
 .../InfoTypeTransformationsOrBuilder.java     |    58 -
 .../privacy/dlp/v2beta1/InspectConfig.java    |  2876 ----
 .../dlp/v2beta1/InspectConfigOrBuilder.java   |   196 -
 .../dlp/v2beta1/InspectContentRequest.java    |  1112 --
 .../InspectContentRequestOrBuilder.java       |    88 -
 .../dlp/v2beta1/InspectContentResponse.java   |   857 --
 .../InspectContentResponseOrBuilder.java      |    58 -
 .../dlp/v2beta1/InspectOperationMetadata.java |  1811 ---
 .../InspectOperationMetadataOrBuilder.java    |   151 -
 .../dlp/v2beta1/InspectOperationResult.java   |   566 -
 .../InspectOperationResultOrBuilder.java      |    31 -
 .../privacy/dlp/v2beta1/InspectResult.java    |   932 --
 .../dlp/v2beta1/InspectResultOrBuilder.java   |    67 -
 .../com/google/privacy/dlp/v2beta1/Key.java   |  2262 ---
 .../privacy/dlp/v2beta1/KeyOrBuilder.java     |   119 -
 .../dlp/v2beta1/KindExpressionOrBuilder.java  |    27 -
 .../dlp/v2beta1/KmsWrappedCryptoKey.java      |   635 -
 .../v2beta1/KmsWrappedCryptoKeyOrBuilder.java |    36 -
 .../privacy/dlp/v2beta1/Likelihood.java       |   176 -
 .../dlp/v2beta1/ListInfoTypesRequest.java     |   723 -
 .../ListInfoTypesRequestOrBuilder.java        |    49 -
 .../dlp/v2beta1/ListInfoTypesResponse.java    |   834 --
 .../ListInfoTypesResponseOrBuilder.java       |    53 -
 .../v2beta1/ListInspectFindingsRequest.java   |  1010 --
 .../ListInspectFindingsRequestOrBuilder.java  |    93 -
 .../v2beta1/ListInspectFindingsResponse.java  |   788 --
 .../ListInspectFindingsResponseOrBuilder.java |    54 -
 .../v2beta1/ListRootCategoriesRequest.java    |   568 -
 .../ListRootCategoriesRequestOrBuilder.java   |    31 -
 .../v2beta1/ListRootCategoriesResponse.java   |   834 --
 .../ListRootCategoriesResponseOrBuilder.java  |    53 -
 .../google/privacy/dlp/v2beta1/Location.java  |  1994 ---
 .../dlp/v2beta1/LocationOrBuilder.java        |   181 -
 .../privacy/dlp/v2beta1/OperationConfig.java  |   472 -
 .../dlp/v2beta1/OperationConfigOrBuilder.java |    18 -
 .../dlp/v2beta1/OutputStorageConfig.java      |  1329 --
 .../v2beta1/OutputStorageConfigOrBuilder.java |   151 -
 .../privacy/dlp/v2beta1/PartitionId.java      |   715 -
 .../dlp/v2beta1/PartitionIdOrBuilder.java     |    45 -
 .../dlp/v2beta1/PrimitiveTransformation.java  |  2301 ----
 .../PrimitiveTransformationOrBuilder.java     |   128 -
 .../privacy/dlp/v2beta1/PrivacyMetric.java    |  5096 -------
 .../dlp/v2beta1/PrivacyMetricOrBuilder.java   |    63 -
 .../privacy/dlp/v2beta1/Projection.java       |   626 -
 .../dlp/v2beta1/ProjectionOrBuilder.java      |    34 -
 .../dlp/v2beta1/PropertyReference.java        |   559 -
 .../v2beta1/PropertyReferenceOrBuilder.java   |    29 -
 .../privacy/dlp/v2beta1/RangeOrBuilder.java   |    27 -
 .../privacy/dlp/v2beta1/RecordCondition.java  |  3315 -----
 .../dlp/v2beta1/RecordConditionOrBuilder.java |    22 -
 .../google/privacy/dlp/v2beta1/RecordKey.java |   873 --
 .../dlp/v2beta1/RecordKeyOrBuilder.java       |    37 -
 .../dlp/v2beta1/RecordSuppression.java        |   580 -
 .../v2beta1/RecordSuppressionOrBuilder.java   |    22 -
 .../dlp/v2beta1/RecordTransformations.java    |  1294 --
 .../RecordTransformationsOrBuilder.java       |   102 -
 .../privacy/dlp/v2beta1/RedactConfig.java     |   400 -
 .../dlp/v2beta1/RedactConfigOrBuilder.java    |     9 -
 .../dlp/v2beta1/RedactContentRequest.java     |  3981 ------
 .../RedactContentRequestOrBuilder.java        |   171 -
 .../dlp/v2beta1/RedactContentResponse.java    |   834 --
 .../RedactContentResponseOrBuilder.java       |    53 -
 .../dlp/v2beta1/RelationalOperator.java       |   217 -
 .../dlp/v2beta1/ReplaceValueConfig.java       |   626 -
 .../v2beta1/ReplaceValueConfigOrBuilder.java  |    34 -
 .../v2beta1/ReplaceWithInfoTypeConfig.java    |   396 -
 .../ReplaceWithInfoTypeConfigOrBuilder.java   |     9 -
 .../privacy/dlp/v2beta1/ResultName.java       |   175 -
 .../RiskAnalysisOperationMetadata.java        |  1088 --
 ...iskAnalysisOperationMetadataOrBuilder.java |    84 -
 .../v2beta1/RiskAnalysisOperationResult.java  | 11402 ----------------
 .../RiskAnalysisOperationResultOrBuilder.java |    63 -
 .../privacy/dlp/v2beta1/StorageConfig.java    |  1221 --
 .../dlp/v2beta1/StorageConfigOrBuilder.java   |    86 -
 .../com/google/privacy/dlp/v2beta1/Table.java |  1842 ---
 .../privacy/dlp/v2beta1/TableLocation.java    |   472 -
 .../dlp/v2beta1/TableLocationOrBuilder.java   |    18 -
 .../privacy/dlp/v2beta1/TableOrBuilder.java   |    57 -
 .../privacy/dlp/v2beta1/TimePartConfig.java   |   673 -
 .../dlp/v2beta1/TimePartConfigOrBuilder.java  |    18 -
 .../dlp/v2beta1/TransformationSummary.java    |  2966 ----
 .../TransformationSummaryOrBuilder.java       |   182 -
 .../dlp/v2beta1/TransientCryptoKey.java       |   589 -
 .../v2beta1/TransientCryptoKeyOrBuilder.java  |    37 -
 .../dlp/v2beta1/UnwrappedCryptoKey.java       |   476 -
 .../v2beta1/UnwrappedCryptoKeyOrBuilder.java  |    18 -
 .../com/google/privacy/dlp/v2beta1/Value.java |  1452 --
 .../privacy/dlp/v2beta1/ValueFrequency.java   |   701 -
 .../dlp/v2beta1/ValueFrequencyOrBuilder.java  |    43 -
 .../privacy/dlp/v2beta1/ValueOrBuilder.java   |    75 -
 .../google/privacy/dlp/v2beta1/dlp.proto      |  1329 --
 .../google/privacy/dlp/v2beta1/storage.proto  |   276 -
 .../pom.xml                                   |     8 +-
 .../iot/v1/CreateDeviceRegistryRequest.java   |     0
 .../CreateDeviceRegistryRequestOrBuilder.java |     0
 .../cloud/iot/v1/CreateDeviceRequest.java     |     0
 .../iot/v1/CreateDeviceRequestOrBuilder.java  |     0
 .../iot/v1/DeleteDeviceRegistryRequest.java   |     0
 .../DeleteDeviceRegistryRequestOrBuilder.java |     0
 .../cloud/iot/v1/DeleteDeviceRequest.java     |     0
 .../iot/v1/DeleteDeviceRequestOrBuilder.java  |     0
 .../java/com/google/cloud/iot/v1/Device.java  |     0
 .../com/google/cloud/iot/v1/DeviceConfig.java |     0
 .../cloud/iot/v1/DeviceConfigOrBuilder.java   |     0
 .../google/cloud/iot/v1/DeviceCredential.java |     0
 .../iot/v1/DeviceCredentialOrBuilder.java     |     0
 .../cloud/iot/v1/DeviceManagerProto.java      |     0
 .../com/google/cloud/iot/v1/DeviceName.java   |     0
 .../google/cloud/iot/v1/DeviceOrBuilder.java  |     0
 .../google/cloud/iot/v1/DeviceRegistry.java   |     0
 .../cloud/iot/v1/DeviceRegistryOrBuilder.java |     0
 .../com/google/cloud/iot/v1/DeviceState.java  |     0
 .../cloud/iot/v1/DeviceStateOrBuilder.java    |     0
 .../cloud/iot/v1/EventNotificationConfig.java |     0
 .../v1/EventNotificationConfigOrBuilder.java  |     0
 .../iot/v1/GetDeviceRegistryRequest.java      |     0
 .../v1/GetDeviceRegistryRequestOrBuilder.java |     0
 .../google/cloud/iot/v1/GetDeviceRequest.java |     0
 .../iot/v1/GetDeviceRequestOrBuilder.java     |     0
 .../com/google/cloud/iot/v1/HttpConfig.java   |     0
 .../cloud/iot/v1/HttpConfigOrBuilder.java     |     0
 .../com/google/cloud/iot/v1/HttpState.java    |     0
 .../v1/ListDeviceConfigVersionsRequest.java   |     0
 ...tDeviceConfigVersionsRequestOrBuilder.java |     0
 .../v1/ListDeviceConfigVersionsResponse.java  |     0
 ...DeviceConfigVersionsResponseOrBuilder.java |     0
 .../iot/v1/ListDeviceRegistriesRequest.java   |     0
 .../ListDeviceRegistriesRequestOrBuilder.java |     0
 .../iot/v1/ListDeviceRegistriesResponse.java  |     0
 ...ListDeviceRegistriesResponseOrBuilder.java |     0
 .../cloud/iot/v1/ListDeviceStatesRequest.java |     0
 .../v1/ListDeviceStatesRequestOrBuilder.java  |     0
 .../iot/v1/ListDeviceStatesResponse.java      |     0
 .../v1/ListDeviceStatesResponseOrBuilder.java |     0
 .../cloud/iot/v1/ListDevicesRequest.java      |     0
 .../iot/v1/ListDevicesRequestOrBuilder.java   |     0
 .../cloud/iot/v1/ListDevicesResponse.java     |     0
 .../iot/v1/ListDevicesResponseOrBuilder.java  |     0
 .../com/google/cloud/iot/v1/LocationName.java |     0
 .../v1/ModifyCloudToDeviceConfigRequest.java  |     0
 ...fyCloudToDeviceConfigRequestOrBuilder.java |     0
 .../com/google/cloud/iot/v1/MqttConfig.java   |     0
 .../cloud/iot/v1/MqttConfigOrBuilder.java     |     0
 .../com/google/cloud/iot/v1/MqttState.java    |     0
 .../cloud/iot/v1/PublicKeyCertificate.java    |     0
 .../iot/v1/PublicKeyCertificateFormat.java    |     0
 .../iot/v1/PublicKeyCertificateOrBuilder.java |     0
 .../cloud/iot/v1/PublicKeyCredential.java     |     0
 .../iot/v1/PublicKeyCredentialOrBuilder.java  |     0
 .../google/cloud/iot/v1/PublicKeyFormat.java  |     0
 .../cloud/iot/v1/RegistryCredential.java      |     0
 .../iot/v1/RegistryCredentialOrBuilder.java   |     0
 .../com/google/cloud/iot/v1/RegistryName.java |     0
 .../google/cloud/iot/v1/ResourcesProto.java   |     0
 .../cloud/iot/v1/StateNotificationConfig.java |     0
 .../v1/StateNotificationConfigOrBuilder.java  |     0
 .../iot/v1/UpdateDeviceRegistryRequest.java   |     0
 .../UpdateDeviceRegistryRequestOrBuilder.java |     0
 .../cloud/iot/v1/UpdateDeviceRequest.java     |     0
 .../iot/v1/UpdateDeviceRequestOrBuilder.java  |     0
 .../cloud/iot/v1/X509CertificateDetails.java  |     0
 .../v1/X509CertificateDetailsOrBuilder.java   |     0
 .../google/cloud/iot/v1/device_manager.proto  |     0
 .../proto/google/cloud/iot/v1/resources.proto |     0
 .../cloud/vision/v1/AnnotateFileResponse.java |  1068 ++
 .../v1/AnnotateFileResponseOrBuilder.java     |    78 +
 .../vision/v1/AnnotateImageResponse.java      |   241 +
 .../v1/AnnotateImageResponseOrBuilder.java    |    28 +
 .../vision/v1/AsyncAnnotateFileRequest.java   |  1524 +++
 .../v1/AsyncAnnotateFileRequestOrBuilder.java |   128 +
 .../vision/v1/AsyncAnnotateFileResponse.java  |   626 +
 .../AsyncAnnotateFileResponseOrBuilder.java   |    34 +
 .../v1/AsyncBatchAnnotateFilesRequest.java    |   836 ++
 ...yncBatchAnnotateFilesRequestOrBuilder.java |    53 +
 .../v1/AsyncBatchAnnotateFilesResponse.java   |   857 ++
 ...ncBatchAnnotateFilesResponseOrBuilder.java |    58 +
 .../google/cloud/vision/v1/BoundingPoly.java  |   435 +
 .../vision/v1/BoundingPolyOrBuilder.java      |    44 +
 .../cloud/vision/v1/GcsDestination.java}      |   299 +-
 .../vision/v1/GcsDestinationOrBuilder.java    |    49 +
 .../google/cloud/vision/v1/GcsSource.java}    |   229 +-
 .../cloud/vision/v1/GcsSourceOrBuilder.java   |    29 +
 .../google/cloud/vision/v1/GeometryProto.java |    33 +-
 .../vision/v1/ImageAnnotationContext.java}    |   295 +-
 .../v1/ImageAnnotationContextOrBuilder.java   |    37 +
 .../cloud/vision/v1/ImageAnnotatorProto.java  |   447 +-
 .../google/cloud/vision/v1/ImageContext.java  |    24 +-
 .../vision/v1/ImageContextOrBuilder.java      |     6 +-
 .../google/cloud/vision/v1/InputConfig.java   |   788 ++
 .../cloud/vision/v1/InputConfigOrBuilder.java |    54 +
 .../cloud/vision/v1/NormalizedVertex.java}    |   272 +-
 .../vision/v1/NormalizedVertexOrBuilder.java  |    27 +
 .../cloud/vision/v1/OperationMetadata.java    |  1135 ++
 .../vision/v1/OperationMetadataOrBuilder.java |    76 +
 .../google/cloud/vision/v1/OutputConfig.java  |   732 +
 .../vision/v1/OutputConfigOrBuilder.java      |    51 +
 .../java/com/google/cloud/vision/v1/Page.java |    24 +-
 .../google/cloud/vision/v1/PageOrBuilder.java |     6 +-
 .../google/cloud/vision/v1/geometry.proto     |    14 +
 .../cloud/vision/v1/image_annotator.proto     |   169 +-
 .../cloud/vision/v1/text_annotation.proto     |     6 +-
 .../pom.xml                                   |     2 +-
 google-cloud-bom/pom.xml                      |    18 +-
 ...rpcDataTransferServiceCallableFactory.java |     2 +
 .../admin/v2/BigtableInstanceAdminClient.java |    29 +
 .../v2/BigtableInstanceAdminSettings.java     |    20 +
 .../admin/v2/BigtableTableAdminClient.java    |    16 +
 .../admin/v2/BigtableTableAdminSettings.java  |     8 +
 .../v2/stub/BigtableInstanceAdminStub.java    |     6 +
 .../BigtableInstanceAdminStubSettings.java    |    15 +
 .../admin/v2/stub/BigtableTableAdminStub.java |     3 +
 .../stub/BigtableTableAdminStubSettings.java  |     6 +
 ...cBigtableInstanceAdminCallableFactory.java |     2 +
 .../stub/GrpcBigtableInstanceAdminStub.java   |     6 +
 ...GrpcBigtableTableAdminCallableFactory.java |     2 +
 .../v2/stub/GrpcBigtableTableAdminStub.java   |     3 +
 .../v2/stub/GrpcBigtableCallableFactory.java  |     2 +
 .../GrpcClusterManagerCallableFactory.java    |     2 +
 .../dataproc/v1/ClusterControllerClient.java  |    20 +
 .../v1/ClusterControllerSettings.java         |    16 +
 .../v1/stub/ClusterControllerStub.java        |     5 +
 .../stub/ClusterControllerStubSettings.java   |    12 +
 .../GrpcClusterControllerCallableFactory.java |     2 +
 .../v1/stub/GrpcClusterControllerStub.java    |     5 +
 .../GrpcJobControllerCallableFactory.java     |     2 +
 .../cloud/dialogflow/v2/AgentsClient.java     |    22 +
 .../cloud/dialogflow/v2/AgentsSettings.java   |    16 +
 .../dialogflow/v2/EntityTypesClient.java      |    45 +
 .../dialogflow/v2/EntityTypesSettings.java    |    20 +
 .../cloud/dialogflow/v2/IntentsClient.java    |    12 +
 .../cloud/dialogflow/v2/IntentsSettings.java  |     8 +
 .../cloud/dialogflow/v2/stub/AgentsStub.java  |     5 +
 .../v2/stub/AgentsStubSettings.java           |    12 +
 .../dialogflow/v2/stub/EntityTypesStub.java   |     6 +
 .../v2/stub/EntityTypesStubSettings.java      |    15 +
 .../v2/stub/GrpcAgentsCallableFactory.java    |     2 +
 .../dialogflow/v2/stub/GrpcAgentsStub.java    |     5 +
 .../v2/stub/GrpcContextsCallableFactory.java  |     2 +
 .../stub/GrpcEntityTypesCallableFactory.java  |     2 +
 .../v2/stub/GrpcEntityTypesStub.java          |     6 +
 .../v2/stub/GrpcIntentsCallableFactory.java   |     2 +
 .../dialogflow/v2/stub/GrpcIntentsStub.java   |     3 +
 ...GrpcSessionEntityTypesCallableFactory.java |     2 +
 .../v2/stub/GrpcSessionsCallableFactory.java  |     2 +
 .../cloud/dialogflow/v2/stub/IntentsStub.java |     3 +
 .../v2/stub/IntentsStubSettings.java          |     6 +
 .../dialogflow/v2beta1/AgentsClient.java      |    22 +
 .../dialogflow/v2beta1/AgentsSettings.java    |    16 +
 .../dialogflow/v2beta1/EntityTypesClient.java |    45 +
 .../v2beta1/EntityTypesSettings.java          |    20 +
 .../dialogflow/v2beta1/IntentsClient.java     |    12 +
 .../dialogflow/v2beta1/IntentsSettings.java   |     8 +
 .../dialogflow/v2beta1/stub/AgentsStub.java   |     5 +
 .../v2beta1/stub/AgentsStubSettings.java      |    12 +
 .../v2beta1/stub/EntityTypesStub.java         |     6 +
 .../v2beta1/stub/EntityTypesStubSettings.java |    15 +
 .../stub/GrpcAgentsCallableFactory.java       |     2 +
 .../v2beta1/stub/GrpcAgentsStub.java          |     5 +
 .../stub/GrpcContextsCallableFactory.java     |     2 +
 .../stub/GrpcEntityTypesCallableFactory.java  |     2 +
 .../v2beta1/stub/GrpcEntityTypesStub.java     |     6 +
 .../stub/GrpcIntentsCallableFactory.java      |     2 +
 .../v2beta1/stub/GrpcIntentsStub.java         |     3 +
 ...GrpcSessionEntityTypesCallableFactory.java |     2 +
 .../stub/GrpcSessionsCallableFactory.java     |     2 +
 .../dialogflow/v2beta1/stub/IntentsStub.java  |     3 +
 .../v2beta1/stub/IntentsStubSettings.java     |     6 +
 google-cloud-clients/google-cloud-dlp/pom.xml |    11 +-
 .../stub/GrpcDlpServiceCallableFactory.java   |     2 +
 .../com/google/cloud/dlp/v2beta1/Colors.java  |    35 -
 .../cloud/dlp/v2beta1/DlpServiceClient.java   |  1080 --
 .../cloud/dlp/v2beta1/DlpServiceSettings.java |   305 -
 .../cloud/dlp/v2beta1/package-info.java       |    54 -
 .../dlp/v2beta1/stub/DlpServiceStub.java      |   109 -
 .../v2beta1/stub/DlpServiceStubSettings.java  |   579 -
 .../dlp/v2beta1/stub/GrpcDlpServiceStub.java  |   373 -
 .../google/cloud/dlp/v2beta1/ColorTest.java   |    26 -
 .../dlp/v2beta1/DlpServiceClientTest.java     |   446 -
 .../cloud/dlp/v2beta1/MockDlpServiceImpl.java |   196 -
 .../GrpcErrorGroupServiceCallableFactory.java |     2 +
 .../GrpcErrorStatsServiceCallableFactory.java |     2 +
 ...rpcReportErrorsServiceCallableFactory.java |     2 +
 .../stub/GrpcFirestoreCallableFactory.java    |     2 +
 .../google-cloud-iot/README.md                |   102 +
 google-cloud-clients/google-cloud-iot/pom.xml |    68 +
 .../cloud/iot/v1/DeviceManagerClient.java     |  2013 +++
 .../cloud/iot/v1/DeviceManagerSettings.java   |   358 +
 .../com/google/cloud/iot/v1/package-info.java |    39 +
 .../cloud/iot/v1/stub/DeviceManagerStub.java  |   142 +
 .../v1/stub/DeviceManagerStubSettings.java    |   826 ++
 .../GrpcDeviceManagerCallableFactory.java}    |     8 +-
 .../iot/v1/stub/GrpcDeviceManagerStub.java    |   683 +
 .../cloud/iot/v1/DeviceManagerClientTest.java |   784 ++
 .../cloud/iot/v1/DeviceManagerSmokeTest.java} |    28 +-
 .../cloud/iot/v1/MockDeviceManager.java}      |    10 +-
 .../cloud/iot/v1/MockDeviceManagerImpl.java   |   301 +
 .../GrpcLanguageServiceCallableFactory.java   |     2 +
 .../GrpcLanguageServiceCallableFactory.java   |     2 +
 .../GrpcConfigServiceV2CallableFactory.java   |     2 +
 .../GrpcLoggingServiceV2CallableFactory.java  |     2 +
 .../GrpcMetricsServiceV2CallableFactory.java  |     2 +
 ...GrpcAlertPolicyServiceCallableFactory.java |     2 +
 .../stub/GrpcGroupServiceCallableFactory.java |     2 +
 .../GrpcMetricServiceCallableFactory.java     |     2 +
 ...ficationChannelServiceCallableFactory.java |     2 +
 ...GrpcUptimeCheckServiceCallableFactory.java |     2 +
 .../GrpcOsLoginServiceCallableFactory.java    |     2 +
 .../v1/stub/GrpcPublisherCallableFactory.java |     2 +
 .../stub/GrpcSubscriberCallableFactory.java   |     2 +
 .../cloud/redis/v1beta1/CloudRedisClient.java |    21 +
 .../redis/v1beta1/CloudRedisSettings.java     |    12 +
 .../redis/v1beta1/stub/CloudRedisStub.java    |     4 +
 .../v1beta1/stub/CloudRedisStubSettings.java  |     9 +
 .../stub/GrpcCloudRedisCallableFactory.java   |     2 +
 .../v1beta1/stub/GrpcCloudRedisStub.java      |     4 +
 .../database/v1/DatabaseAdminClient.java      |    16 +
 .../database/v1/DatabaseAdminSettings.java    |     8 +
 .../database/v1/stub/DatabaseAdminStub.java   |     3 +
 .../v1/stub/DatabaseAdminStubSettings.java    |     6 +
 .../GrpcDatabaseAdminCallableFactory.java     |     2 +
 .../v1/stub/GrpcDatabaseAdminStub.java        |     3 +
 .../instance/v1/InstanceAdminClient.java      |    14 +
 .../instance/v1/InstanceAdminSettings.java    |     8 +
 .../GrpcInstanceAdminCallableFactory.java     |     2 +
 .../v1/stub/GrpcInstanceAdminStub.java        |     3 +
 .../instance/v1/stub/InstanceAdminStub.java   |     3 +
 .../v1/stub/InstanceAdminStubSettings.java    |     6 +
 .../v1/stub/GrpcSpannerCallableFactory.java   |     2 +
 .../google/cloud/speech/v1/SpeechClient.java  |     7 +
 .../cloud/speech/v1/SpeechSettings.java       |     4 +
 .../v1/stub/GrpcSpeechCallableFactory.java    |     2 +
 .../cloud/speech/v1/stub/GrpcSpeechStub.java  |     2 +
 .../cloud/speech/v1/stub/SpeechStub.java      |     2 +
 .../speech/v1/stub/SpeechStubSettings.java    |     3 +
 .../cloud/speech/v1beta1/SpeechClient.java    |     7 +
 .../cloud/speech/v1beta1/SpeechSettings.java  |     4 +
 .../stub/GrpcSpeechCallableFactory.java       |     2 +
 .../speech/v1beta1/stub/GrpcSpeechStub.java   |     2 +
 .../cloud/speech/v1beta1/stub/SpeechStub.java |     2 +
 .../v1beta1/stub/SpeechStubSettings.java      |     3 +
 .../cloud/speech/v1p1beta1/SpeechClient.java  |     7 +
 .../speech/v1p1beta1/SpeechSettings.java      |     4 +
 .../stub/GrpcSpeechCallableFactory.java       |     2 +
 .../speech/v1p1beta1/stub/GrpcSpeechStub.java |     2 +
 .../speech/v1p1beta1/stub/SpeechStub.java     |     2 +
 .../v1p1beta1/stub/SpeechStubSettings.java    |     3 +
 .../stub/GrpcTextToSpeechCallableFactory.java |     2 +
 .../stub/GrpcTraceServiceCallableFactory.java |     2 +
 .../stub/GrpcTraceServiceCallableFactory.java |     2 +
 .../v1/VideoIntelligenceServiceClient.java    |     7 +
 .../v1/VideoIntelligenceServiceSettings.java  |     4 +
 ...deoIntelligenceServiceCallableFactory.java |     2 +
 .../GrpcVideoIntelligenceServiceStub.java     |     2 +
 .../v1/stub/VideoIntelligenceServiceStub.java |     2 +
 .../VideoIntelligenceServiceStubSettings.java |     3 +
 .../VideoIntelligenceServiceClient.java       |     7 +
 .../VideoIntelligenceServiceSettings.java     |     4 +
 ...deoIntelligenceServiceCallableFactory.java |     2 +
 .../GrpcVideoIntelligenceServiceStub.java     |     2 +
 .../stub/VideoIntelligenceServiceStub.java    |     2 +
 .../VideoIntelligenceServiceStubSettings.java |     3 +
 .../VideoIntelligenceServiceClient.java       |     7 +
 .../VideoIntelligenceServiceSettings.java     |     4 +
 ...deoIntelligenceServiceCallableFactory.java |     2 +
 .../GrpcVideoIntelligenceServiceStub.java     |     2 +
 .../stub/VideoIntelligenceServiceStub.java    |     2 +
 .../VideoIntelligenceServiceStubSettings.java |     3 +
 .../VideoIntelligenceServiceClient.java       |     7 +
 .../VideoIntelligenceServiceSettings.java     |     4 +
 ...deoIntelligenceServiceCallableFactory.java |     2 +
 .../GrpcVideoIntelligenceServiceStub.java     |     2 +
 .../stub/VideoIntelligenceServiceStub.java    |     2 +
 .../VideoIntelligenceServiceStubSettings.java |     3 +
 .../cloud/vision/v1/ImageAnnotatorClient.java |   133 +
 .../vision/v1/ImageAnnotatorSettings.java     |    33 +
 .../google/cloud/vision/v1/package-info.java  |     2 +-
 .../GrpcImageAnnotatorCallableFactory.java    |     4 +-
 .../v1/stub/GrpcImageAnnotatorStub.java       |    57 +-
 .../vision/v1/stub/ImageAnnotatorStub.java    |    26 +-
 .../v1/stub/ImageAnnotatorStubSettings.java   |    92 +-
 .../GrpcImageAnnotatorCallableFactory.java    |     2 +
 .../v1p2beta1/ImageAnnotatorClient.java       |     7 +
 .../v1p2beta1/ImageAnnotatorSettings.java     |     4 +
 .../GrpcImageAnnotatorCallableFactory.java    |     2 +
 .../stub/GrpcImageAnnotatorStub.java          |     2 +
 .../v1p2beta1/stub/ImageAnnotatorStub.java    |     2 +
 .../stub/ImageAnnotatorStubSettings.java      |     3 +
 .../vision/v1/ImageAnnotatorClientTest.java   |    53 +
 .../vision/v1/MockImageAnnotatorImpl.java     |    16 +
 .../google-cloud-websecurityscanner/README.md |   102 +
 .../google-cloud-websecurityscanner/pom.xml   |    68 +
 .../v1alpha/WebSecurityScannerClient.java     |  1669 +++
 .../v1alpha/WebSecurityScannerSettings.java   |   320 +
 .../v1alpha/package-info.java                 |    40 +
 ...GrpcWebSecurityScannerCallableFactory.java |   116 +
 .../stub/GrpcWebSecurityScannerStub.java      |   475 +
 .../v1alpha/stub/WebSecurityScannerStub.java  |   133 +
 .../stub/WebSecurityScannerStubSettings.java  |   827 ++
 .../v1alpha/MockWebSecurityScanner.java       |    57 +
 .../v1alpha/MockWebSecurityScannerImpl.java   |   251 +
 .../v1alpha/WebSecurityScannerClientTest.java |   720 +
 google-cloud-clients/pom.xml                  |     2 +
 versions.txt                                  |     8 +-
 476 files changed, 21707 insertions(+), 112636 deletions(-)
 delete mode 100644 google-api-grpc/grpc-google-cloud-dlp-v2beta1/pom.xml
 delete mode 100644 google-api-grpc/grpc-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpServiceGrpc.java
 rename google-api-grpc/{grpc-google-cloud-cloudiot-v1 => grpc-google-cloud-iot-v1}/pom.xml (77%)
 rename google-api-grpc/{grpc-google-cloud-cloudiot-v1 => grpc-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeviceManagerGrpc.java (100%)
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/pom.xml
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/AnalyzeDataSourceRiskRequest.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/AnalyzeDataSourceRiskRequestOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryOptions.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryOptionsOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryTable.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryTableOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BucketingConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BucketingConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CategoryDescription.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CategoryDescriptionOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharacterMaskConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharacterMaskConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharsToIgnore.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharsToIgnoreOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageKeyOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageOptions.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageOptionsOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStoragePath.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStoragePathOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Color.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ColorOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ContentItem.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ContentItemOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CreateInspectOperationRequest.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CreateInspectOperationRequestOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoHashConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoHashConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoKey.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoKeyOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoReplaceFfxFpeConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoReplaceFfxFpeConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CustomInfoType.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CustomInfoTypeOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreKey.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreKeyOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreOptions.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreOptionsOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentificationSummary.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentificationSummaryOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentRequest.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentRequestOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentResponse.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentResponseOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpProto.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpStorage.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/EntityId.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/EntityIdOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldIdOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldTransformation.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldTransformationOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Finding.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FindingOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FixedSizeBucketingConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FixedSizeBucketingConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ImageLocation.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ImageLocationOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoType.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeDescription.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeDescriptionOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeStatistics.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeStatisticsOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeTransformations.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeTransformationsOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentRequest.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentRequestOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentResponse.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentResponseOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationMetadata.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationMetadataOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationResult.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationResultOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectResult.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectResultOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Key.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KeyOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KindExpressionOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KmsWrappedCryptoKey.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KmsWrappedCryptoKeyOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Likelihood.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesRequest.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesRequestOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesResponse.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesResponseOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsRequest.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsRequestOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsResponse.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsResponseOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesRequest.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesRequestOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesResponse.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesResponseOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Location.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/LocationOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OperationConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OperationConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OutputStorageConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OutputStorageConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PartitionId.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PartitionIdOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrimitiveTransformation.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrimitiveTransformationOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrivacyMetric.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrivacyMetricOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Projection.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ProjectionOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PropertyReference.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PropertyReferenceOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RangeOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordCondition.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordConditionOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordKey.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordKeyOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordSuppression.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordSuppressionOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordTransformations.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordTransformationsOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentRequest.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentRequestOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentResponse.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentResponseOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RelationalOperator.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceValueConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceValueConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceWithInfoTypeConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceWithInfoTypeConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ResultName.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationMetadata.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationMetadataOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationResult.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationResultOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/StorageConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/StorageConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Table.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TableLocation.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TableLocationOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TableOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TimePartConfig.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TimePartConfigOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransformationSummary.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransformationSummaryOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransientCryptoKey.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransientCryptoKeyOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/UnwrappedCryptoKey.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/UnwrappedCryptoKeyOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Value.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ValueFrequency.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ValueFrequencyOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ValueOrBuilder.java
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/proto/google/privacy/dlp/v2beta1/dlp.proto
 delete mode 100644 google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/proto/google/privacy/dlp/v2beta1/storage.proto
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/pom.xml (84%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/Device.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeviceConfigOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeviceCredentialOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeviceName.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeviceOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeviceRegistryOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeviceState.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/DeviceStateOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/EventNotificationConfigOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/GetDeviceRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/HttpConfig.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/HttpConfigOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/HttpState.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponseOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponseOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponseOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDevicesRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ListDevicesResponseOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/LocationName.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/MqttConfig.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/MqttConfigOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/MqttState.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateFormat.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/PublicKeyCredentialOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/PublicKeyFormat.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/RegistryCredentialOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/RegistryName.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/StateNotificationConfigOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequestOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/java/com/google/cloud/iot/v1/X509CertificateDetailsOrBuilder.java (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/proto/google/cloud/iot/v1/device_manager.proto (100%)
 rename google-api-grpc/{proto-google-cloud-cloudiot-v1 => proto-google-cloud-iot-v1}/src/main/proto/google/cloud/iot/v1/resources.proto (100%)
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponseOrBuilder.java
 rename google-api-grpc/{proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KindExpression.java => proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestination.java} (51%)
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestinationOrBuilder.java
 rename google-api-grpc/{proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldId.java => proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSource.java} (63%)
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSourceOrBuilder.java
 rename google-api-grpc/{proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageKey.java => proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotationContext.java} (58%)
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotationContextOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/InputConfig.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/InputConfigOrBuilder.java
 rename google-api-grpc/{proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Range.java => proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/NormalizedVertex.java} (59%)
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/NormalizedVertexOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OperationMetadata.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OperationMetadataOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OutputConfig.java
 create mode 100644 google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OutputConfigOrBuilder.java
 delete mode 100644 google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java
 delete mode 100644 google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceClient.java
 delete mode 100644 google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceSettings.java
 delete mode 100644 google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/package-info.java
 delete mode 100644 google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStub.java
 delete mode 100644 google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStubSettings.java
 delete mode 100644 google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceStub.java
 delete mode 100644 google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java
 delete mode 100644 google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceClientTest.java
 delete mode 100644 google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpServiceImpl.java
 create mode 100644 google-cloud-clients/google-cloud-iot/README.md
 create mode 100644 google-cloud-clients/google-cloud-iot/pom.xml
 create mode 100644 google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/DeviceManagerClient.java
 create mode 100644 google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/DeviceManagerSettings.java
 create mode 100644 google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/package-info.java
 create mode 100644 google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/DeviceManagerStub.java
 create mode 100644 google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/DeviceManagerStubSettings.java
 rename google-cloud-clients/{google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceCallableFactory.java => google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/GrpcDeviceManagerCallableFactory.java} (94%)
 create mode 100644 google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/GrpcDeviceManagerStub.java
 create mode 100644 google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/DeviceManagerClientTest.java
 rename google-cloud-clients/{google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceSmokeTest.java => google-cloud-iot/src/test/java/com/google/cloud/iot/v1/DeviceManagerSmokeTest.java} (62%)
 rename google-cloud-clients/{google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpService.java => google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManager.java} (85%)
 create mode 100644 google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManagerImpl.java
 create mode 100644 google-cloud-clients/google-cloud-websecurityscanner/README.md
 create mode 100644 google-cloud-clients/google-cloud-websecurityscanner/pom.xml
 create mode 100644 google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClient.java
 create mode 100644 google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerSettings.java
 create mode 100644 google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/package-info.java
 create mode 100644 google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/GrpcWebSecurityScannerCallableFactory.java
 create mode 100644 google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/GrpcWebSecurityScannerStub.java
 create mode 100644 google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStub.java
 create mode 100644 google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStubSettings.java
 create mode 100644 google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScanner.java
 create mode 100644 google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScannerImpl.java
 create mode 100644 google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java

diff --git a/codacy-conf.json b/codacy-conf.json
index 156abaccb39a..d3c4145bcd4e 100644
--- a/codacy-conf.json
+++ b/codacy-conf.json
@@ -698,7 +698,7 @@
     },
     {
       "patternId": "design_FieldDeclarationsShouldBeAtStartOfClass",
-      "enabled": true
+      "enabled": false
     },
     {
       "patternId": "unnecessary_UnnecessaryConversionTemporary",
@@ -986,7 +986,7 @@
     },
     {
       "patternId": "unnecessary_UselessParentheses",
-      "enabled": true
+      "enabled": false
     },
     {
       "patternId": "design_IdempotentOperations",
@@ -994,7 +994,7 @@
     },
     {
       "patternId": "braces_IfStmtsMustUseBraces",
-      "enabled": true
+      "enabled": false
     },
     {
       "patternId": "strings_UseIndexOfChar",
diff --git a/google-api-grpc/grpc-google-cloud-dlp-v2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-dlp-v2beta1/pom.xml
deleted file mode 100644
index c5d0689e585b..000000000000
--- a/google-api-grpc/grpc-google-cloud-dlp-v2beta1/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-  4.0.0
-  grpc-google-cloud-dlp-v2beta1
-  0.12.1-SNAPSHOT
-  grpc-google-cloud-dlp-v2beta1
-  GRPC library for grpc-google-cloud-dlp-v2beta1
-  
-    com.google.api.grpc
-    google-api-grpc
-    0.12.1-SNAPSHOT
-  
-  
-    
-      io.grpc
-      grpc-stub
-      compile
-    
-    
-      io.grpc
-      grpc-protobuf
-      compile
-    
-    
-      com.google.api.grpc
-      proto-google-cloud-dlp-v2beta1
-      compile
-    
-  
-
\ No newline at end of file
diff --git a/google-api-grpc/grpc-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpServiceGrpc.java b/google-api-grpc/grpc-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpServiceGrpc.java
deleted file mode 100644
index 5d26e51cb104..000000000000
--- a/google-api-grpc/grpc-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpServiceGrpc.java
+++ /dev/null
@@ -1,1002 +0,0 @@
-package com.google.privacy.dlp.v2beta1;
-
-import static io.grpc.MethodDescriptor.generateFullMethodName;
-import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
-import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
-import static io.grpc.stub.ClientCalls.asyncUnaryCall;
-import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
-import static io.grpc.stub.ClientCalls.blockingUnaryCall;
-import static io.grpc.stub.ClientCalls.futureUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
-
-/**
- * 
- * The DLP API is a service that allows clients
- * to detect the presence of Personally Identifiable Information (PII) and other
- * privacy-sensitive data in user-supplied, unstructured data streams, like text
- * blocks or images.
- * The service also includes methods for sensitive data redaction and
- * scheduling of data scans on Google Cloud Platform based data sets.
- * 

- */
-@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.10.0)",
-    comments = "Source: google/privacy/dlp/v2beta1/dlp.proto")
-public final class DlpServiceGrpc {
-
-  private DlpServiceGrpc() {}
-
-  public static final String SERVICE_NAME = "google.privacy.dlp.v2beta1.DlpService";
-
-  // Static method descriptors that strictly reflect the proto.
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  @java.lang.Deprecated // Use {@link #getInspectContentMethod()} instead. 
-  public static final io.grpc.MethodDescriptor METHOD_INSPECT_CONTENT = getInspectContentMethodHelper();
-
-  private static volatile io.grpc.MethodDescriptor getInspectContentMethod;
-
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  public static io.grpc.MethodDescriptor getInspectContentMethod() {
-    return getInspectContentMethodHelper();
-  }
-
-  private static io.grpc.MethodDescriptor getInspectContentMethodHelper() {
-    io.grpc.MethodDescriptor getInspectContentMethod;
-    if ((getInspectContentMethod = DlpServiceGrpc.getInspectContentMethod) == null) {
-      synchronized (DlpServiceGrpc.class) {
-        if ((getInspectContentMethod = DlpServiceGrpc.getInspectContentMethod) == null) {
-          DlpServiceGrpc.getInspectContentMethod = getInspectContentMethod = 
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName(generateFullMethodName(
-                  "google.privacy.dlp.v2beta1.DlpService", "InspectContent"))
-              .setSampledToLocalTracing(true)
-              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.InspectContentRequest.getDefaultInstance()))
-              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.InspectContentResponse.getDefaultInstance()))
-                  .setSchemaDescriptor(new DlpServiceMethodDescriptorSupplier("InspectContent"))
-                  .build();
-          }
-        }
-     }
-     return getInspectContentMethod;
-  }
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  @java.lang.Deprecated // Use {@link #getRedactContentMethod()} instead. 
-  public static final io.grpc.MethodDescriptor METHOD_REDACT_CONTENT = getRedactContentMethodHelper();
-
-  private static volatile io.grpc.MethodDescriptor getRedactContentMethod;
-
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  public static io.grpc.MethodDescriptor getRedactContentMethod() {
-    return getRedactContentMethodHelper();
-  }
-
-  private static io.grpc.MethodDescriptor getRedactContentMethodHelper() {
-    io.grpc.MethodDescriptor getRedactContentMethod;
-    if ((getRedactContentMethod = DlpServiceGrpc.getRedactContentMethod) == null) {
-      synchronized (DlpServiceGrpc.class) {
-        if ((getRedactContentMethod = DlpServiceGrpc.getRedactContentMethod) == null) {
-          DlpServiceGrpc.getRedactContentMethod = getRedactContentMethod = 
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName(generateFullMethodName(
-                  "google.privacy.dlp.v2beta1.DlpService", "RedactContent"))
-              .setSampledToLocalTracing(true)
-              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.RedactContentRequest.getDefaultInstance()))
-              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.RedactContentResponse.getDefaultInstance()))
-                  .setSchemaDescriptor(new DlpServiceMethodDescriptorSupplier("RedactContent"))
-                  .build();
-          }
-        }
-     }
-     return getRedactContentMethod;
-  }
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  @java.lang.Deprecated // Use {@link #getDeidentifyContentMethod()} instead. 
-  public static final io.grpc.MethodDescriptor METHOD_DEIDENTIFY_CONTENT = getDeidentifyContentMethodHelper();
-
-  private static volatile io.grpc.MethodDescriptor getDeidentifyContentMethod;
-
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  public static io.grpc.MethodDescriptor getDeidentifyContentMethod() {
-    return getDeidentifyContentMethodHelper();
-  }
-
-  private static io.grpc.MethodDescriptor getDeidentifyContentMethodHelper() {
-    io.grpc.MethodDescriptor getDeidentifyContentMethod;
-    if ((getDeidentifyContentMethod = DlpServiceGrpc.getDeidentifyContentMethod) == null) {
-      synchronized (DlpServiceGrpc.class) {
-        if ((getDeidentifyContentMethod = DlpServiceGrpc.getDeidentifyContentMethod) == null) {
-          DlpServiceGrpc.getDeidentifyContentMethod = getDeidentifyContentMethod = 
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName(generateFullMethodName(
-                  "google.privacy.dlp.v2beta1.DlpService", "DeidentifyContent"))
-              .setSampledToLocalTracing(true)
-              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.DeidentifyContentRequest.getDefaultInstance()))
-              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.DeidentifyContentResponse.getDefaultInstance()))
-                  .setSchemaDescriptor(new DlpServiceMethodDescriptorSupplier("DeidentifyContent"))
-                  .build();
-          }
-        }
-     }
-     return getDeidentifyContentMethod;
-  }
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  @java.lang.Deprecated // Use {@link #getCreateInspectOperationMethod()} instead. 
-  public static final io.grpc.MethodDescriptor METHOD_CREATE_INSPECT_OPERATION = getCreateInspectOperationMethodHelper();
-
-  private static volatile io.grpc.MethodDescriptor getCreateInspectOperationMethod;
-
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  public static io.grpc.MethodDescriptor getCreateInspectOperationMethod() {
-    return getCreateInspectOperationMethodHelper();
-  }
-
-  private static io.grpc.MethodDescriptor getCreateInspectOperationMethodHelper() {
-    io.grpc.MethodDescriptor getCreateInspectOperationMethod;
-    if ((getCreateInspectOperationMethod = DlpServiceGrpc.getCreateInspectOperationMethod) == null) {
-      synchronized (DlpServiceGrpc.class) {
-        if ((getCreateInspectOperationMethod = DlpServiceGrpc.getCreateInspectOperationMethod) == null) {
-          DlpServiceGrpc.getCreateInspectOperationMethod = getCreateInspectOperationMethod = 
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName(generateFullMethodName(
-                  "google.privacy.dlp.v2beta1.DlpService", "CreateInspectOperation"))
-              .setSampledToLocalTracing(true)
-              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest.getDefaultInstance()))
-              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.longrunning.Operation.getDefaultInstance()))
-                  .setSchemaDescriptor(new DlpServiceMethodDescriptorSupplier("CreateInspectOperation"))
-                  .build();
-          }
-        }
-     }
-     return getCreateInspectOperationMethod;
-  }
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  @java.lang.Deprecated // Use {@link #getAnalyzeDataSourceRiskMethod()} instead. 
-  public static final io.grpc.MethodDescriptor METHOD_ANALYZE_DATA_SOURCE_RISK = getAnalyzeDataSourceRiskMethodHelper();
-
-  private static volatile io.grpc.MethodDescriptor getAnalyzeDataSourceRiskMethod;
-
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  public static io.grpc.MethodDescriptor getAnalyzeDataSourceRiskMethod() {
-    return getAnalyzeDataSourceRiskMethodHelper();
-  }
-
-  private static io.grpc.MethodDescriptor getAnalyzeDataSourceRiskMethodHelper() {
-    io.grpc.MethodDescriptor getAnalyzeDataSourceRiskMethod;
-    if ((getAnalyzeDataSourceRiskMethod = DlpServiceGrpc.getAnalyzeDataSourceRiskMethod) == null) {
-      synchronized (DlpServiceGrpc.class) {
-        if ((getAnalyzeDataSourceRiskMethod = DlpServiceGrpc.getAnalyzeDataSourceRiskMethod) == null) {
-          DlpServiceGrpc.getAnalyzeDataSourceRiskMethod = getAnalyzeDataSourceRiskMethod = 
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName(generateFullMethodName(
-                  "google.privacy.dlp.v2beta1.DlpService", "AnalyzeDataSourceRisk"))
-              .setSampledToLocalTracing(true)
-              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest.getDefaultInstance()))
-              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.longrunning.Operation.getDefaultInstance()))
-                  .setSchemaDescriptor(new DlpServiceMethodDescriptorSupplier("AnalyzeDataSourceRisk"))
-                  .build();
-          }
-        }
-     }
-     return getAnalyzeDataSourceRiskMethod;
-  }
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  @java.lang.Deprecated // Use {@link #getListInspectFindingsMethod()} instead. 
-  public static final io.grpc.MethodDescriptor METHOD_LIST_INSPECT_FINDINGS = getListInspectFindingsMethodHelper();
-
-  private static volatile io.grpc.MethodDescriptor getListInspectFindingsMethod;
-
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  public static io.grpc.MethodDescriptor getListInspectFindingsMethod() {
-    return getListInspectFindingsMethodHelper();
-  }
-
-  private static io.grpc.MethodDescriptor getListInspectFindingsMethodHelper() {
-    io.grpc.MethodDescriptor getListInspectFindingsMethod;
-    if ((getListInspectFindingsMethod = DlpServiceGrpc.getListInspectFindingsMethod) == null) {
-      synchronized (DlpServiceGrpc.class) {
-        if ((getListInspectFindingsMethod = DlpServiceGrpc.getListInspectFindingsMethod) == null) {
-          DlpServiceGrpc.getListInspectFindingsMethod = getListInspectFindingsMethod = 
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName(generateFullMethodName(
-                  "google.privacy.dlp.v2beta1.DlpService", "ListInspectFindings"))
-              .setSampledToLocalTracing(true)
-              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest.getDefaultInstance()))
-              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse.getDefaultInstance()))
-                  .setSchemaDescriptor(new DlpServiceMethodDescriptorSupplier("ListInspectFindings"))
-                  .build();
-          }
-        }
-     }
-     return getListInspectFindingsMethod;
-  }
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  @java.lang.Deprecated // Use {@link #getListInfoTypesMethod()} instead. 
-  public static final io.grpc.MethodDescriptor METHOD_LIST_INFO_TYPES = getListInfoTypesMethodHelper();
-
-  private static volatile io.grpc.MethodDescriptor getListInfoTypesMethod;
-
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  public static io.grpc.MethodDescriptor getListInfoTypesMethod() {
-    return getListInfoTypesMethodHelper();
-  }
-
-  private static io.grpc.MethodDescriptor getListInfoTypesMethodHelper() {
-    io.grpc.MethodDescriptor getListInfoTypesMethod;
-    if ((getListInfoTypesMethod = DlpServiceGrpc.getListInfoTypesMethod) == null) {
-      synchronized (DlpServiceGrpc.class) {
-        if ((getListInfoTypesMethod = DlpServiceGrpc.getListInfoTypesMethod) == null) {
-          DlpServiceGrpc.getListInfoTypesMethod = getListInfoTypesMethod = 
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName(generateFullMethodName(
-                  "google.privacy.dlp.v2beta1.DlpService", "ListInfoTypes"))
-              .setSampledToLocalTracing(true)
-              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.ListInfoTypesRequest.getDefaultInstance()))
-              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.ListInfoTypesResponse.getDefaultInstance()))
-                  .setSchemaDescriptor(new DlpServiceMethodDescriptorSupplier("ListInfoTypes"))
-                  .build();
-          }
-        }
-     }
-     return getListInfoTypesMethod;
-  }
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  @java.lang.Deprecated // Use {@link #getListRootCategoriesMethod()} instead. 
-  public static final io.grpc.MethodDescriptor METHOD_LIST_ROOT_CATEGORIES = getListRootCategoriesMethodHelper();
-
-  private static volatile io.grpc.MethodDescriptor getListRootCategoriesMethod;
-
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  public static io.grpc.MethodDescriptor getListRootCategoriesMethod() {
-    return getListRootCategoriesMethodHelper();
-  }
-
-  private static io.grpc.MethodDescriptor getListRootCategoriesMethodHelper() {
-    io.grpc.MethodDescriptor getListRootCategoriesMethod;
-    if ((getListRootCategoriesMethod = DlpServiceGrpc.getListRootCategoriesMethod) == null) {
-      synchronized (DlpServiceGrpc.class) {
-        if ((getListRootCategoriesMethod = DlpServiceGrpc.getListRootCategoriesMethod) == null) {
-          DlpServiceGrpc.getListRootCategoriesMethod = getListRootCategoriesMethod = 
-              io.grpc.MethodDescriptor.newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName(generateFullMethodName(
-                  "google.privacy.dlp.v2beta1.DlpService", "ListRootCategories"))
-              .setSampledToLocalTracing(true)
-              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest.getDefaultInstance()))
-              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-                  com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse.getDefaultInstance()))
-                  .setSchemaDescriptor(new DlpServiceMethodDescriptorSupplier("ListRootCategories"))
-                  .build();
-          }
-        }
-     }
-     return getListRootCategoriesMethod;
-  }
-
-  /**
-   * Creates a new async stub that supports all call types for the service
-   */
-  public static DlpServiceStub newStub(io.grpc.Channel channel) {
-    return new DlpServiceStub(channel);
-  }
-
-  /**
-   * Creates a new blocking-style stub that supports unary and streaming output calls on the service
-   */
-  public static DlpServiceBlockingStub newBlockingStub(
-      io.grpc.Channel channel) {
-    return new DlpServiceBlockingStub(channel);
-  }
-
-  /**
-   * Creates a new ListenableFuture-style stub that supports unary calls on the service
-   */
-  public static DlpServiceFutureStub newFutureStub(
-      io.grpc.Channel channel) {
-    return new DlpServiceFutureStub(channel);
-  }
-
-  /**
-   * 
-   * The DLP API is a service that allows clients
-   * to detect the presence of Personally Identifiable Information (PII) and other
-   * privacy-sensitive data in user-supplied, unstructured data streams, like text
-   * blocks or images.
-   * The service also includes methods for sensitive data redaction and
-   * scheduling of data scans on Google Cloud Platform based data sets.
-   * 

-   */
-  public static abstract class DlpServiceImplBase implements io.grpc.BindableService {
-
-    /**
-     * 
-     * Finds potentially sensitive info in a list of strings.
-     * This method has limits on input size, processing time, and output size.
-     * 

-     */
-    public void inspectContent(com.google.privacy.dlp.v2beta1.InspectContentRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnimplementedUnaryCall(getInspectContentMethodHelper(), responseObserver);
-    }
-
-    /**
-     * 
-     * Redacts potentially sensitive info from a list of strings.
-     * This method has limits on input size, processing time, and output size.
-     * 

-     */
-    public void redactContent(com.google.privacy.dlp.v2beta1.RedactContentRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnimplementedUnaryCall(getRedactContentMethodHelper(), responseObserver);
-    }
-
-    /**
-     * 
-     * De-identifies potentially sensitive info from a list of strings.
-     * This method has limits on input size and output size.
-     * 

-     */
-    public void deidentifyContent(com.google.privacy.dlp.v2beta1.DeidentifyContentRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnimplementedUnaryCall(getDeidentifyContentMethodHelper(), responseObserver);
-    }
-
-    /**
-     * 
-     * Schedules a job scanning content in a Google Cloud Platform data
-     * repository.
-     * 

-     */
-    public void createInspectOperation(com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnimplementedUnaryCall(getCreateInspectOperationMethodHelper(), responseObserver);
-    }
-
-    /**
-     * 
-     * Schedules a job to compute risk analysis metrics over content in a Google
-     * Cloud Platform repository.
-     * 

-     */
-    public void analyzeDataSourceRisk(com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnimplementedUnaryCall(getAnalyzeDataSourceRiskMethodHelper(), responseObserver);
-    }
-
-    /**
-     * 
-     * Returns list of results for given inspect operation result set id.
-     * 

-     */
-    public void listInspectFindings(com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnimplementedUnaryCall(getListInspectFindingsMethodHelper(), responseObserver);
-    }
-
-    /**
-     * 
-     * Returns sensitive information types for given category.
-     * 

-     */
-    public void listInfoTypes(com.google.privacy.dlp.v2beta1.ListInfoTypesRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnimplementedUnaryCall(getListInfoTypesMethodHelper(), responseObserver);
-    }
-
-    /**
-     * 
-     * Returns the list of root categories of sensitive information.
-     * 

-     */
-    public void listRootCategories(com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnimplementedUnaryCall(getListRootCategoriesMethodHelper(), responseObserver);
-    }
-
-    @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
-      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
-          .addMethod(
-            getInspectContentMethodHelper(),
-            asyncUnaryCall(
-              new MethodHandlers<
-                com.google.privacy.dlp.v2beta1.InspectContentRequest,
-                com.google.privacy.dlp.v2beta1.InspectContentResponse>(
-                  this, METHODID_INSPECT_CONTENT)))
-          .addMethod(
-            getRedactContentMethodHelper(),
-            asyncUnaryCall(
-              new MethodHandlers<
-                com.google.privacy.dlp.v2beta1.RedactContentRequest,
-                com.google.privacy.dlp.v2beta1.RedactContentResponse>(
-                  this, METHODID_REDACT_CONTENT)))
-          .addMethod(
-            getDeidentifyContentMethodHelper(),
-            asyncUnaryCall(
-              new MethodHandlers<
-                com.google.privacy.dlp.v2beta1.DeidentifyContentRequest,
-                com.google.privacy.dlp.v2beta1.DeidentifyContentResponse>(
-                  this, METHODID_DEIDENTIFY_CONTENT)))
-          .addMethod(
-            getCreateInspectOperationMethodHelper(),
-            asyncUnaryCall(
-              new MethodHandlers<
-                com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest,
-                com.google.longrunning.Operation>(
-                  this, METHODID_CREATE_INSPECT_OPERATION)))
-          .addMethod(
-            getAnalyzeDataSourceRiskMethodHelper(),
-            asyncUnaryCall(
-              new MethodHandlers<
-                com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest,
-                com.google.longrunning.Operation>(
-                  this, METHODID_ANALYZE_DATA_SOURCE_RISK)))
-          .addMethod(
-            getListInspectFindingsMethodHelper(),
-            asyncUnaryCall(
-              new MethodHandlers<
-                com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest,
-                com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse>(
-                  this, METHODID_LIST_INSPECT_FINDINGS)))
-          .addMethod(
-            getListInfoTypesMethodHelper(),
-            asyncUnaryCall(
-              new MethodHandlers<
-                com.google.privacy.dlp.v2beta1.ListInfoTypesRequest,
-                com.google.privacy.dlp.v2beta1.ListInfoTypesResponse>(
-                  this, METHODID_LIST_INFO_TYPES)))
-          .addMethod(
-            getListRootCategoriesMethodHelper(),
-            asyncUnaryCall(
-              new MethodHandlers<
-                com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest,
-                com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse>(
-                  this, METHODID_LIST_ROOT_CATEGORIES)))
-          .build();
-    }
-  }
-
-  /**
-   * 
-   * The DLP API is a service that allows clients
-   * to detect the presence of Personally Identifiable Information (PII) and other
-   * privacy-sensitive data in user-supplied, unstructured data streams, like text
-   * blocks or images.
-   * The service also includes methods for sensitive data redaction and
-   * scheduling of data scans on Google Cloud Platform based data sets.
-   * 

-   */
-  public static final class DlpServiceStub extends io.grpc.stub.AbstractStub {
-    private DlpServiceStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
-    private DlpServiceStub(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      super(channel, callOptions);
-    }
-
-    @java.lang.Override
-    protected DlpServiceStub build(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      return new DlpServiceStub(channel, callOptions);
-    }
-
-    /**
-     * 
-     * Finds potentially sensitive info in a list of strings.
-     * This method has limits on input size, processing time, and output size.
-     * 

-     */
-    public void inspectContent(com.google.privacy.dlp.v2beta1.InspectContentRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnaryCall(
-          getChannel().newCall(getInspectContentMethodHelper(), getCallOptions()), request, responseObserver);
-    }
-
-    /**
-     * 
-     * Redacts potentially sensitive info from a list of strings.
-     * This method has limits on input size, processing time, and output size.
-     * 

-     */
-    public void redactContent(com.google.privacy.dlp.v2beta1.RedactContentRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnaryCall(
-          getChannel().newCall(getRedactContentMethodHelper(), getCallOptions()), request, responseObserver);
-    }
-
-    /**
-     * 
-     * De-identifies potentially sensitive info from a list of strings.
-     * This method has limits on input size and output size.
-     * 

-     */
-    public void deidentifyContent(com.google.privacy.dlp.v2beta1.DeidentifyContentRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnaryCall(
-          getChannel().newCall(getDeidentifyContentMethodHelper(), getCallOptions()), request, responseObserver);
-    }
-
-    /**
-     * 
-     * Schedules a job scanning content in a Google Cloud Platform data
-     * repository.
-     * 

-     */
-    public void createInspectOperation(com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnaryCall(
-          getChannel().newCall(getCreateInspectOperationMethodHelper(), getCallOptions()), request, responseObserver);
-    }
-
-    /**
-     * 
-     * Schedules a job to compute risk analysis metrics over content in a Google
-     * Cloud Platform repository.
-     * 

-     */
-    public void analyzeDataSourceRisk(com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnaryCall(
-          getChannel().newCall(getAnalyzeDataSourceRiskMethodHelper(), getCallOptions()), request, responseObserver);
-    }
-
-    /**
-     * 
-     * Returns list of results for given inspect operation result set id.
-     * 

-     */
-    public void listInspectFindings(com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnaryCall(
-          getChannel().newCall(getListInspectFindingsMethodHelper(), getCallOptions()), request, responseObserver);
-    }
-
-    /**
-     * 
-     * Returns sensitive information types for given category.
-     * 

-     */
-    public void listInfoTypes(com.google.privacy.dlp.v2beta1.ListInfoTypesRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnaryCall(
-          getChannel().newCall(getListInfoTypesMethodHelper(), getCallOptions()), request, responseObserver);
-    }
-
-    /**
-     * 
-     * Returns the list of root categories of sensitive information.
-     * 

-     */
-    public void listRootCategories(com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest request,
-        io.grpc.stub.StreamObserver responseObserver) {
-      asyncUnaryCall(
-          getChannel().newCall(getListRootCategoriesMethodHelper(), getCallOptions()), request, responseObserver);
-    }
-  }
-
-  /**
-   * 
-   * The DLP API is a service that allows clients
-   * to detect the presence of Personally Identifiable Information (PII) and other
-   * privacy-sensitive data in user-supplied, unstructured data streams, like text
-   * blocks or images.
-   * The service also includes methods for sensitive data redaction and
-   * scheduling of data scans on Google Cloud Platform based data sets.
-   * 

-   */
-  public static final class DlpServiceBlockingStub extends io.grpc.stub.AbstractStub {
-    private DlpServiceBlockingStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
-    private DlpServiceBlockingStub(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      super(channel, callOptions);
-    }
-
-    @java.lang.Override
-    protected DlpServiceBlockingStub build(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      return new DlpServiceBlockingStub(channel, callOptions);
-    }
-
-    /**
-     * 
-     * Finds potentially sensitive info in a list of strings.
-     * This method has limits on input size, processing time, and output size.
-     * 

-     */
-    public com.google.privacy.dlp.v2beta1.InspectContentResponse inspectContent(com.google.privacy.dlp.v2beta1.InspectContentRequest request) {
-      return blockingUnaryCall(
-          getChannel(), getInspectContentMethodHelper(), getCallOptions(), request);
-    }
-
-    /**
-     * 
-     * Redacts potentially sensitive info from a list of strings.
-     * This method has limits on input size, processing time, and output size.
-     * 

-     */
-    public com.google.privacy.dlp.v2beta1.RedactContentResponse redactContent(com.google.privacy.dlp.v2beta1.RedactContentRequest request) {
-      return blockingUnaryCall(
-          getChannel(), getRedactContentMethodHelper(), getCallOptions(), request);
-    }
-
-    /**
-     * 
-     * De-identifies potentially sensitive info from a list of strings.
-     * This method has limits on input size and output size.
-     * 

-     */
-    public com.google.privacy.dlp.v2beta1.DeidentifyContentResponse deidentifyContent(com.google.privacy.dlp.v2beta1.DeidentifyContentRequest request) {
-      return blockingUnaryCall(
-          getChannel(), getDeidentifyContentMethodHelper(), getCallOptions(), request);
-    }
-
-    /**
-     * 
-     * Schedules a job scanning content in a Google Cloud Platform data
-     * repository.
-     * 

-     */
-    public com.google.longrunning.Operation createInspectOperation(com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest request) {
-      return blockingUnaryCall(
-          getChannel(), getCreateInspectOperationMethodHelper(), getCallOptions(), request);
-    }
-
-    /**
-     * 
-     * Schedules a job to compute risk analysis metrics over content in a Google
-     * Cloud Platform repository.
-     * 

-     */
-    public com.google.longrunning.Operation analyzeDataSourceRisk(com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest request) {
-      return blockingUnaryCall(
-          getChannel(), getAnalyzeDataSourceRiskMethodHelper(), getCallOptions(), request);
-    }
-
-    /**
-     * 
-     * Returns list of results for given inspect operation result set id.
-     * 

-     */
-    public com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse listInspectFindings(com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest request) {
-      return blockingUnaryCall(
-          getChannel(), getListInspectFindingsMethodHelper(), getCallOptions(), request);
-    }
-
-    /**
-     * 
-     * Returns sensitive information types for given category.
-     * 

-     */
-    public com.google.privacy.dlp.v2beta1.ListInfoTypesResponse listInfoTypes(com.google.privacy.dlp.v2beta1.ListInfoTypesRequest request) {
-      return blockingUnaryCall(
-          getChannel(), getListInfoTypesMethodHelper(), getCallOptions(), request);
-    }
-
-    /**
-     * 
-     * Returns the list of root categories of sensitive information.
-     * 

-     */
-    public com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse listRootCategories(com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest request) {
-      return blockingUnaryCall(
-          getChannel(), getListRootCategoriesMethodHelper(), getCallOptions(), request);
-    }
-  }
-
-  /**
-   * 
-   * The DLP API is a service that allows clients
-   * to detect the presence of Personally Identifiable Information (PII) and other
-   * privacy-sensitive data in user-supplied, unstructured data streams, like text
-   * blocks or images.
-   * The service also includes methods for sensitive data redaction and
-   * scheduling of data scans on Google Cloud Platform based data sets.
-   * 

-   */
-  public static final class DlpServiceFutureStub extends io.grpc.stub.AbstractStub {
-    private DlpServiceFutureStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
-    private DlpServiceFutureStub(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      super(channel, callOptions);
-    }
-
-    @java.lang.Override
-    protected DlpServiceFutureStub build(io.grpc.Channel channel,
-        io.grpc.CallOptions callOptions) {
-      return new DlpServiceFutureStub(channel, callOptions);
-    }
-
-    /**
-     * 
-     * Finds potentially sensitive info in a list of strings.
-     * This method has limits on input size, processing time, and output size.
-     * 

-     */
-    public com.google.common.util.concurrent.ListenableFuture inspectContent(
-        com.google.privacy.dlp.v2beta1.InspectContentRequest request) {
-      return futureUnaryCall(
-          getChannel().newCall(getInspectContentMethodHelper(), getCallOptions()), request);
-    }
-
-    /**
-     * 
-     * Redacts potentially sensitive info from a list of strings.
-     * This method has limits on input size, processing time, and output size.
-     * 

-     */
-    public com.google.common.util.concurrent.ListenableFuture redactContent(
-        com.google.privacy.dlp.v2beta1.RedactContentRequest request) {
-      return futureUnaryCall(
-          getChannel().newCall(getRedactContentMethodHelper(), getCallOptions()), request);
-    }
-
-    /**
-     * 
-     * De-identifies potentially sensitive info from a list of strings.
-     * This method has limits on input size and output size.
-     * 

-     */
-    public com.google.common.util.concurrent.ListenableFuture deidentifyContent(
-        com.google.privacy.dlp.v2beta1.DeidentifyContentRequest request) {
-      return futureUnaryCall(
-          getChannel().newCall(getDeidentifyContentMethodHelper(), getCallOptions()), request);
-    }
-
-    /**
-     * 
-     * Schedules a job scanning content in a Google Cloud Platform data
-     * repository.
-     * 

-     */
-    public com.google.common.util.concurrent.ListenableFuture createInspectOperation(
-        com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest request) {
-      return futureUnaryCall(
-          getChannel().newCall(getCreateInspectOperationMethodHelper(), getCallOptions()), request);
-    }
-
-    /**
-     * 
-     * Schedules a job to compute risk analysis metrics over content in a Google
-     * Cloud Platform repository.
-     * 

-     */
-    public com.google.common.util.concurrent.ListenableFuture analyzeDataSourceRisk(
-        com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest request) {
-      return futureUnaryCall(
-          getChannel().newCall(getAnalyzeDataSourceRiskMethodHelper(), getCallOptions()), request);
-    }
-
-    /**
-     * 
-     * Returns list of results for given inspect operation result set id.
-     * 

-     */
-    public com.google.common.util.concurrent.ListenableFuture listInspectFindings(
-        com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest request) {
-      return futureUnaryCall(
-          getChannel().newCall(getListInspectFindingsMethodHelper(), getCallOptions()), request);
-    }
-
-    /**
-     * 
-     * Returns sensitive information types for given category.
-     * 

-     */
-    public com.google.common.util.concurrent.ListenableFuture listInfoTypes(
-        com.google.privacy.dlp.v2beta1.ListInfoTypesRequest request) {
-      return futureUnaryCall(
-          getChannel().newCall(getListInfoTypesMethodHelper(), getCallOptions()), request);
-    }
-
-    /**
-     * 
-     * Returns the list of root categories of sensitive information.
-     * 

-     */
-    public com.google.common.util.concurrent.ListenableFuture listRootCategories(
-        com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest request) {
-      return futureUnaryCall(
-          getChannel().newCall(getListRootCategoriesMethodHelper(), getCallOptions()), request);
-    }
-  }
-
-  private static final int METHODID_INSPECT_CONTENT = 0;
-  private static final int METHODID_REDACT_CONTENT = 1;
-  private static final int METHODID_DEIDENTIFY_CONTENT = 2;
-  private static final int METHODID_CREATE_INSPECT_OPERATION = 3;
-  private static final int METHODID_ANALYZE_DATA_SOURCE_RISK = 4;
-  private static final int METHODID_LIST_INSPECT_FINDINGS = 5;
-  private static final int METHODID_LIST_INFO_TYPES = 6;
-  private static final int METHODID_LIST_ROOT_CATEGORIES = 7;
-
-  private static final class MethodHandlers implements
-      io.grpc.stub.ServerCalls.UnaryMethod,
-      io.grpc.stub.ServerCalls.ServerStreamingMethod,
-      io.grpc.stub.ServerCalls.ClientStreamingMethod,
-      io.grpc.stub.ServerCalls.BidiStreamingMethod {
-    private final DlpServiceImplBase serviceImpl;
-    private final int methodId;
-
-    MethodHandlers(DlpServiceImplBase serviceImpl, int methodId) {
-      this.serviceImpl = serviceImpl;
-      this.methodId = methodId;
-    }
-
-    @java.lang.Override
-    @java.lang.SuppressWarnings("unchecked")
-    public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) {
-      switch (methodId) {
-        case METHODID_INSPECT_CONTENT:
-          serviceImpl.inspectContent((com.google.privacy.dlp.v2beta1.InspectContentRequest) request,
-              (io.grpc.stub.StreamObserver) responseObserver);
-          break;
-        case METHODID_REDACT_CONTENT:
-          serviceImpl.redactContent((com.google.privacy.dlp.v2beta1.RedactContentRequest) request,
-              (io.grpc.stub.StreamObserver) responseObserver);
-          break;
-        case METHODID_DEIDENTIFY_CONTENT:
-          serviceImpl.deidentifyContent((com.google.privacy.dlp.v2beta1.DeidentifyContentRequest) request,
-              (io.grpc.stub.StreamObserver) responseObserver);
-          break;
-        case METHODID_CREATE_INSPECT_OPERATION:
-          serviceImpl.createInspectOperation((com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest) request,
-              (io.grpc.stub.StreamObserver) responseObserver);
-          break;
-        case METHODID_ANALYZE_DATA_SOURCE_RISK:
-          serviceImpl.analyzeDataSourceRisk((com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest) request,
-              (io.grpc.stub.StreamObserver) responseObserver);
-          break;
-        case METHODID_LIST_INSPECT_FINDINGS:
-          serviceImpl.listInspectFindings((com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest) request,
-              (io.grpc.stub.StreamObserver) responseObserver);
-          break;
-        case METHODID_LIST_INFO_TYPES:
-          serviceImpl.listInfoTypes((com.google.privacy.dlp.v2beta1.ListInfoTypesRequest) request,
-              (io.grpc.stub.StreamObserver) responseObserver);
-          break;
-        case METHODID_LIST_ROOT_CATEGORIES:
-          serviceImpl.listRootCategories((com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest) request,
-              (io.grpc.stub.StreamObserver) responseObserver);
-          break;
-        default:
-          throw new AssertionError();
-      }
-    }
-
-    @java.lang.Override
-    @java.lang.SuppressWarnings("unchecked")
-    public io.grpc.stub.StreamObserver invoke(
-        io.grpc.stub.StreamObserver responseObserver) {
-      switch (methodId) {
-        default:
-          throw new AssertionError();
-      }
-    }
-  }
-
-  private static abstract class DlpServiceBaseDescriptorSupplier
-      implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
-    DlpServiceBaseDescriptorSupplier() {}
-
-    @java.lang.Override
-    public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.getDescriptor();
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
-      return getFileDescriptor().findServiceByName("DlpService");
-    }
-  }
-
-  private static final class DlpServiceFileDescriptorSupplier
-      extends DlpServiceBaseDescriptorSupplier {
-    DlpServiceFileDescriptorSupplier() {}
-  }
-
-  private static final class DlpServiceMethodDescriptorSupplier
-      extends DlpServiceBaseDescriptorSupplier
-      implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
-
-    DlpServiceMethodDescriptorSupplier(String methodName) {
-      this.methodName = methodName;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
-      return getServiceDescriptor().findMethodByName(methodName);
-    }
-  }
-
-  private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
-
-  public static io.grpc.ServiceDescriptor getServiceDescriptor() {
-    io.grpc.ServiceDescriptor result = serviceDescriptor;
-    if (result == null) {
-      synchronized (DlpServiceGrpc.class) {
-        result = serviceDescriptor;
-        if (result == null) {
-          serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
-              .setSchemaDescriptor(new DlpServiceFileDescriptorSupplier())
-              .addMethod(getInspectContentMethodHelper())
-              .addMethod(getRedactContentMethodHelper())
-              .addMethod(getDeidentifyContentMethodHelper())
-              .addMethod(getCreateInspectOperationMethodHelper())
-              .addMethod(getAnalyzeDataSourceRiskMethodHelper())
-              .addMethod(getListInspectFindingsMethodHelper())
-              .addMethod(getListInfoTypesMethodHelper())
-              .addMethod(getListRootCategoriesMethodHelper())
-              .build();
-        }
-      }
-    }
-    return result;
-  }
-}
diff --git a/google-api-grpc/grpc-google-cloud-cloudiot-v1/pom.xml b/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
similarity index 77%
rename from google-api-grpc/grpc-google-cloud-cloudiot-v1/pom.xml
rename to google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
index f17ba8986003..562c1df967c3 100644
--- a/google-api-grpc/grpc-google-cloud-cloudiot-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
@@ -2,10 +2,10 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
-  grpc-google-cloud-cloudiot-v1
-  0.12.1-SNAPSHOT
-  grpc-google-cloud-cloudiot-v1
-  GRPC library for grpc-google-cloud-cloudiot-v1
+  grpc-google-cloud-iot-v1
+  0.12.1-SNAPSHOT
+  grpc-google-cloud-iot-v1
+  GRPC library for grpc-google-cloud-iot-v1
   
     com.google.api.grpc
     google-api-grpc
@@ -24,7 +24,7 @@
     
     
       com.google.api.grpc
-      proto-google-cloud-cloudiot-v1
+      proto-google-cloud-iot-v1
       compile
     
   
diff --git a/google-api-grpc/grpc-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerGrpc.java b/google-api-grpc/grpc-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerGrpc.java
similarity index 100%
rename from google-api-grpc/grpc-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerGrpc.java
rename to google-api-grpc/grpc-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerGrpc.java
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorGrpc.java b/google-api-grpc/grpc-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorGrpc.java
index 3440b19728ef..e7b853ac2d2e 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorGrpc.java
+++ b/google-api-grpc/grpc-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorGrpc.java
@@ -69,6 +69,43 @@ com.google.cloud.vision.v1.BatchAnnotateImagesResponse> getBatchAnnotateImagesMe
      }
      return getBatchAnnotateImagesMethod;
   }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getAsyncBatchAnnotateFilesMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_ASYNC_BATCH_ANNOTATE_FILES = getAsyncBatchAnnotateFilesMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getAsyncBatchAnnotateFilesMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getAsyncBatchAnnotateFilesMethod() {
+    return getAsyncBatchAnnotateFilesMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getAsyncBatchAnnotateFilesMethodHelper() {
+    io.grpc.MethodDescriptor getAsyncBatchAnnotateFilesMethod;
+    if ((getAsyncBatchAnnotateFilesMethod = ImageAnnotatorGrpc.getAsyncBatchAnnotateFilesMethod) == null) {
+      synchronized (ImageAnnotatorGrpc.class) {
+        if ((getAsyncBatchAnnotateFilesMethod = ImageAnnotatorGrpc.getAsyncBatchAnnotateFilesMethod) == null) {
+          ImageAnnotatorGrpc.getAsyncBatchAnnotateFilesMethod = getAsyncBatchAnnotateFilesMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.vision.v1.ImageAnnotator", "AsyncBatchAnnotateFiles"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.longrunning.Operation.getDefaultInstance()))
+                  .setSchemaDescriptor(new ImageAnnotatorMethodDescriptorSupplier("AsyncBatchAnnotateFiles"))
+                  .build();
+          }
+        }
+     }
+     return getAsyncBatchAnnotateFilesMethod;
+  }
 
   /**
    * Creates a new async stub that supports all call types for the service
@@ -112,6 +149,21 @@ public void batchAnnotateImages(com.google.cloud.vision.v1.BatchAnnotateImagesRe
       asyncUnimplementedUnaryCall(getBatchAnnotateImagesMethodHelper(), responseObserver);
     }
 
+    /**
+     * 
+     * Run asynchronous image detection and annotation for a list of generic
+     * files, such as PDF files, which may contain multiple pages and multiple
+     * images per page. Progress and results can be retrieved through the
+     * `google.longrunning.Operations` interface.
+     * `Operation.metadata` contains `OperationMetadata` (metadata).
+     * `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+     * 

+     */
+    public void asyncBatchAnnotateFiles(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getAsyncBatchAnnotateFilesMethodHelper(), responseObserver);
+    }
+
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
@@ -121,6 +173,13 @@ public void batchAnnotateImages(com.google.cloud.vision.v1.BatchAnnotateImagesRe
                 com.google.cloud.vision.v1.BatchAnnotateImagesRequest,
                 com.google.cloud.vision.v1.BatchAnnotateImagesResponse>(
                   this, METHODID_BATCH_ANNOTATE_IMAGES)))
+          .addMethod(
+            getAsyncBatchAnnotateFilesMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest,
+                com.google.longrunning.Operation>(
+                  this, METHODID_ASYNC_BATCH_ANNOTATE_FILES)))
           .build();
     }
   }
@@ -158,6 +217,22 @@ public void batchAnnotateImages(com.google.cloud.vision.v1.BatchAnnotateImagesRe
       asyncUnaryCall(
           getChannel().newCall(getBatchAnnotateImagesMethodHelper(), getCallOptions()), request, responseObserver);
     }
+
+    /**
+     * 
+     * Run asynchronous image detection and annotation for a list of generic
+     * files, such as PDF files, which may contain multiple pages and multiple
+     * images per page. Progress and results can be retrieved through the
+     * `google.longrunning.Operations` interface.
+     * `Operation.metadata` contains `OperationMetadata` (metadata).
+     * `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+     * 

+     */
+    public void asyncBatchAnnotateFiles(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getAsyncBatchAnnotateFilesMethodHelper(), getCallOptions()), request, responseObserver);
+    }
   }
 
   /**
@@ -192,6 +267,21 @@ public com.google.cloud.vision.v1.BatchAnnotateImagesResponse batchAnnotateImage
       return blockingUnaryCall(
           getChannel(), getBatchAnnotateImagesMethodHelper(), getCallOptions(), request);
     }
+
+    /**
+     * 
+     * Run asynchronous image detection and annotation for a list of generic
+     * files, such as PDF files, which may contain multiple pages and multiple
+     * images per page. Progress and results can be retrieved through the
+     * `google.longrunning.Operations` interface.
+     * `Operation.metadata` contains `OperationMetadata` (metadata).
+     * `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+     * 

+     */
+    public com.google.longrunning.Operation asyncBatchAnnotateFiles(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getAsyncBatchAnnotateFilesMethodHelper(), getCallOptions(), request);
+    }
   }
 
   /**
@@ -227,9 +317,26 @@ public com.google.common.util.concurrent.ListenableFuture
+     * Run asynchronous image detection and annotation for a list of generic
+     * files, such as PDF files, which may contain multiple pages and multiple
+     * images per page. Progress and results can be retrieved through the
+     * `google.longrunning.Operations` interface.
+     * `Operation.metadata` contains `OperationMetadata` (metadata).
+     * `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+     * 

+     */
+    public com.google.common.util.concurrent.ListenableFuture asyncBatchAnnotateFiles(
+        com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getAsyncBatchAnnotateFilesMethodHelper(), getCallOptions()), request);
+    }
   }
 
   private static final int METHODID_BATCH_ANNOTATE_IMAGES = 0;
+  private static final int METHODID_ASYNC_BATCH_ANNOTATE_FILES = 1;
 
   private static final class MethodHandlers implements
       io.grpc.stub.ServerCalls.UnaryMethod,
@@ -252,6 +359,10 @@ public void invoke(Req request, io.grpc.stub.StreamObserver responseObserv
           serviceImpl.batchAnnotateImages((com.google.cloud.vision.v1.BatchAnnotateImagesRequest) request,
               (io.grpc.stub.StreamObserver) responseObserver);
           break;
+        case METHODID_ASYNC_BATCH_ANNOTATE_FILES:
+          serviceImpl.asyncBatchAnnotateFiles((com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
         default:
           throw new AssertionError();
       }
@@ -314,6 +425,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
           serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
               .setSchemaDescriptor(new ImageAnnotatorFileDescriptorSupplier())
               .addMethod(getBatchAnnotateImagesMethodHelper())
+              .addMethod(getAsyncBatchAnnotateFilesMethodHelper())
               .build();
         }
       }
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 37c720b4f4cd..cee1b7c5f9f8 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -186,16 +186,6 @@
         proto-google-cloud-datastore-v1
         0.12.1-SNAPSHOT
       
-      
-        com.google.api.grpc
-        proto-google-cloud-dlp-v2beta1
-        0.12.1-SNAPSHOT
-      
-      
-        com.google.api.grpc
-        grpc-google-cloud-dlp-v2beta1
-        0.12.1-SNAPSHOT
-      
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2
@@ -468,13 +458,13 @@
       
       
         com.google.api.grpc
-        proto-google-cloud-cloudiot-v1
-        0.12.1-SNAPSHOT
+        proto-google-cloud-iot-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-cloud-cloudiot-v1
-        0.12.1-SNAPSHOT
+        grpc-google-cloud-iot-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
@@ -508,7 +498,6 @@
     grpc-google-cloud-dialogflow-v2
     grpc-google-cloud-dialogflow-v2beta1
     grpc-google-cloud-dlp-v2
-    grpc-google-cloud-dlp-v2beta1
     grpc-google-cloud-error-reporting-v1beta1
     grpc-google-cloud-firestore-v1beta1
     grpc-google-cloud-language-v1
@@ -533,7 +522,7 @@
     grpc-google-cloud-vision-v1
     grpc-google-cloud-vision-v1p1beta1
     grpc-google-cloud-vision-v1p2beta1
-    grpc-google-cloud-cloudiot-v1
+    grpc-google-cloud-iot-v1
     grpc-google-cloud-redis-v1beta1
     grpc-google-cloud-websecurityscanner-v1alpha
     proto-google-cloud-bigquerydatatransfer-v1
@@ -545,7 +534,6 @@
     proto-google-cloud-dialogflow-v2
     proto-google-cloud-dialogflow-v2beta1
     proto-google-cloud-dlp-v2
-    proto-google-cloud-dlp-v2beta1
     proto-google-cloud-error-reporting-v1beta1
     proto-google-cloud-firestore-v1beta1
     proto-google-cloud-language-v1
@@ -570,7 +558,7 @@
     proto-google-cloud-vision-v1
     proto-google-cloud-vision-v1p1beta1
     proto-google-cloud-vision-v1p2beta1
-    proto-google-cloud-cloudiot-v1
+    proto-google-cloud-iot-v1
     proto-google-cloud-redis-v1beta1
     proto-google-cloud-websecurityscanner-v1alpha
   
@@ -647,7 +635,7 @@
                 true
                 true
                 true
-                google-cloud-bom
+                ${project.artifactId}
                 jar
               
             
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/pom.xml b/google-api-grpc/proto-google-cloud-dlp-v2beta1/pom.xml
deleted file mode 100644
index fc23a6b340e9..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-  4.0.0
-  proto-google-cloud-dlp-v2beta1
-  0.12.1-SNAPSHOT
-  proto-google-cloud-dlp-v2beta1
-  PROTO library for proto-google-cloud-dlp-v2beta1
-  
-    com.google.api.grpc
-    google-api-grpc
-    0.12.1-SNAPSHOT
-  
-  
-    
-      com.google.protobuf
-      protobuf-java
-      compile
-    
-    
-      com.google.api
-      api-common
-      compile
-    
-    
-      com.google.api.grpc
-      proto-google-common-protos
-      compile
-    
-  
-
\ No newline at end of file
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/AnalyzeDataSourceRiskRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/AnalyzeDataSourceRiskRequest.java
deleted file mode 100644
index 466352d42464..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/AnalyzeDataSourceRiskRequest.java
+++ /dev/null
@@ -1,855 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Request for creating a risk analysis operation.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest}
- */
-public  final class AnalyzeDataSourceRiskRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest)
-    AnalyzeDataSourceRiskRequestOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use AnalyzeDataSourceRiskRequest.newBuilder() to construct.
-  private AnalyzeDataSourceRiskRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private AnalyzeDataSourceRiskRequest() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private AnalyzeDataSourceRiskRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder subBuilder = null;
-            if (privacyMetric_ != null) {
-              subBuilder = privacyMetric_.toBuilder();
-            }
-            privacyMetric_ = input.readMessage(com.google.privacy.dlp.v2beta1.PrivacyMetric.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(privacyMetric_);
-              privacyMetric_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 26: {
-            com.google.privacy.dlp.v2beta1.BigQueryTable.Builder subBuilder = null;
-            if (sourceTable_ != null) {
-              subBuilder = sourceTable_.toBuilder();
-            }
-            sourceTable_ = input.readMessage(com.google.privacy.dlp.v2beta1.BigQueryTable.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(sourceTable_);
-              sourceTable_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_AnalyzeDataSourceRiskRequest_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_AnalyzeDataSourceRiskRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest.class, com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest.Builder.class);
-  }
-
-  public static final int PRIVACY_METRIC_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.PrivacyMetric privacyMetric_;
-  /**
-   * 
-   * Privacy metric to compute.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-   */
-  public boolean hasPrivacyMetric() {
-    return privacyMetric_ != null;
-  }
-  /**
-   * 
-   * Privacy metric to compute.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.PrivacyMetric getPrivacyMetric() {
-    return privacyMetric_ == null ? com.google.privacy.dlp.v2beta1.PrivacyMetric.getDefaultInstance() : privacyMetric_;
-  }
-  /**
-   * 
-   * Privacy metric to compute.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder getPrivacyMetricOrBuilder() {
-    return getPrivacyMetric();
-  }
-
-  public static final int SOURCE_TABLE_FIELD_NUMBER = 3;
-  private com.google.privacy.dlp.v2beta1.BigQueryTable sourceTable_;
-  /**
-   * 
-   * Input dataset to compute metrics over.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-   */
-  public boolean hasSourceTable() {
-    return sourceTable_ != null;
-  }
-  /**
-   * 
-   * Input dataset to compute metrics over.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.BigQueryTable getSourceTable() {
-    return sourceTable_ == null ? com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance() : sourceTable_;
-  }
-  /**
-   * 
-   * Input dataset to compute metrics over.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder getSourceTableOrBuilder() {
-    return getSourceTable();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (privacyMetric_ != null) {
-      output.writeMessage(1, getPrivacyMetric());
-    }
-    if (sourceTable_ != null) {
-      output.writeMessage(3, getSourceTable());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (privacyMetric_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getPrivacyMetric());
-    }
-    if (sourceTable_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, getSourceTable());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest other = (com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest) obj;
-
-    boolean result = true;
-    result = result && (hasPrivacyMetric() == other.hasPrivacyMetric());
-    if (hasPrivacyMetric()) {
-      result = result && getPrivacyMetric()
-          .equals(other.getPrivacyMetric());
-    }
-    result = result && (hasSourceTable() == other.hasSourceTable());
-    if (hasSourceTable()) {
-      result = result && getSourceTable()
-          .equals(other.getSourceTable());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasPrivacyMetric()) {
-      hash = (37 * hash) + PRIVACY_METRIC_FIELD_NUMBER;
-      hash = (53 * hash) + getPrivacyMetric().hashCode();
-    }
-    if (hasSourceTable()) {
-      hash = (37 * hash) + SOURCE_TABLE_FIELD_NUMBER;
-      hash = (53 * hash) + getSourceTable().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Request for creating a risk analysis operation.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest)
-      com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_AnalyzeDataSourceRiskRequest_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_AnalyzeDataSourceRiskRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest.class, com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (privacyMetricBuilder_ == null) {
-        privacyMetric_ = null;
-      } else {
-        privacyMetric_ = null;
-        privacyMetricBuilder_ = null;
-      }
-      if (sourceTableBuilder_ == null) {
-        sourceTable_ = null;
-      } else {
-        sourceTable_ = null;
-        sourceTableBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_AnalyzeDataSourceRiskRequest_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest build() {
-      com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest buildPartial() {
-      com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest result = new com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest(this);
-      if (privacyMetricBuilder_ == null) {
-        result.privacyMetric_ = privacyMetric_;
-      } else {
-        result.privacyMetric_ = privacyMetricBuilder_.build();
-      }
-      if (sourceTableBuilder_ == null) {
-        result.sourceTable_ = sourceTable_;
-      } else {
-        result.sourceTable_ = sourceTableBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest other) {
-      if (other == com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest.getDefaultInstance()) return this;
-      if (other.hasPrivacyMetric()) {
-        mergePrivacyMetric(other.getPrivacyMetric());
-      }
-      if (other.hasSourceTable()) {
-        mergeSourceTable(other.getSourceTable());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.PrivacyMetric privacyMetric_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrivacyMetric, com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder> privacyMetricBuilder_;
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-     */
-    public boolean hasPrivacyMetric() {
-      return privacyMetricBuilder_ != null || privacyMetric_ != null;
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric getPrivacyMetric() {
-      if (privacyMetricBuilder_ == null) {
-        return privacyMetric_ == null ? com.google.privacy.dlp.v2beta1.PrivacyMetric.getDefaultInstance() : privacyMetric_;
-      } else {
-        return privacyMetricBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-     */
-    public Builder setPrivacyMetric(com.google.privacy.dlp.v2beta1.PrivacyMetric value) {
-      if (privacyMetricBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        privacyMetric_ = value;
-        onChanged();
-      } else {
-        privacyMetricBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-     */
-    public Builder setPrivacyMetric(
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder builderForValue) {
-      if (privacyMetricBuilder_ == null) {
-        privacyMetric_ = builderForValue.build();
-        onChanged();
-      } else {
-        privacyMetricBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-     */
-    public Builder mergePrivacyMetric(com.google.privacy.dlp.v2beta1.PrivacyMetric value) {
-      if (privacyMetricBuilder_ == null) {
-        if (privacyMetric_ != null) {
-          privacyMetric_ =
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.newBuilder(privacyMetric_).mergeFrom(value).buildPartial();
-        } else {
-          privacyMetric_ = value;
-        }
-        onChanged();
-      } else {
-        privacyMetricBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-     */
-    public Builder clearPrivacyMetric() {
-      if (privacyMetricBuilder_ == null) {
-        privacyMetric_ = null;
-        onChanged();
-      } else {
-        privacyMetric_ = null;
-        privacyMetricBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder getPrivacyMetricBuilder() {
-      
-      onChanged();
-      return getPrivacyMetricFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder getPrivacyMetricOrBuilder() {
-      if (privacyMetricBuilder_ != null) {
-        return privacyMetricBuilder_.getMessageOrBuilder();
-      } else {
-        return privacyMetric_ == null ?
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.getDefaultInstance() : privacyMetric_;
-      }
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrivacyMetric, com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder> 
-        getPrivacyMetricFieldBuilder() {
-      if (privacyMetricBuilder_ == null) {
-        privacyMetricBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.PrivacyMetric, com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder>(
-                getPrivacyMetric(),
-                getParentForChildren(),
-                isClean());
-        privacyMetric_ = null;
-      }
-      return privacyMetricBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.BigQueryTable sourceTable_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BigQueryTable, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder, com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder> sourceTableBuilder_;
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-     */
-    public boolean hasSourceTable() {
-      return sourceTableBuilder_ != null || sourceTable_ != null;
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryTable getSourceTable() {
-      if (sourceTableBuilder_ == null) {
-        return sourceTable_ == null ? com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance() : sourceTable_;
-      } else {
-        return sourceTableBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-     */
-    public Builder setSourceTable(com.google.privacy.dlp.v2beta1.BigQueryTable value) {
-      if (sourceTableBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        sourceTable_ = value;
-        onChanged();
-      } else {
-        sourceTableBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-     */
-    public Builder setSourceTable(
-        com.google.privacy.dlp.v2beta1.BigQueryTable.Builder builderForValue) {
-      if (sourceTableBuilder_ == null) {
-        sourceTable_ = builderForValue.build();
-        onChanged();
-      } else {
-        sourceTableBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-     */
-    public Builder mergeSourceTable(com.google.privacy.dlp.v2beta1.BigQueryTable value) {
-      if (sourceTableBuilder_ == null) {
-        if (sourceTable_ != null) {
-          sourceTable_ =
-            com.google.privacy.dlp.v2beta1.BigQueryTable.newBuilder(sourceTable_).mergeFrom(value).buildPartial();
-        } else {
-          sourceTable_ = value;
-        }
-        onChanged();
-      } else {
-        sourceTableBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-     */
-    public Builder clearSourceTable() {
-      if (sourceTableBuilder_ == null) {
-        sourceTable_ = null;
-        onChanged();
-      } else {
-        sourceTable_ = null;
-        sourceTableBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryTable.Builder getSourceTableBuilder() {
-      
-      onChanged();
-      return getSourceTableFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder getSourceTableOrBuilder() {
-      if (sourceTableBuilder_ != null) {
-        return sourceTableBuilder_.getMessageOrBuilder();
-      } else {
-        return sourceTable_ == null ?
-            com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance() : sourceTable_;
-      }
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BigQueryTable, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder, com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder> 
-        getSourceTableFieldBuilder() {
-      if (sourceTableBuilder_ == null) {
-        sourceTableBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.BigQueryTable, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder, com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder>(
-                getSourceTable(),
-                getParentForChildren(),
-                isClean());
-        sourceTable_ = null;
-      }
-      return sourceTableBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest)
-  private static final com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public AnalyzeDataSourceRiskRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeDataSourceRiskRequest(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/AnalyzeDataSourceRiskRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/AnalyzeDataSourceRiskRequestOrBuilder.java
deleted file mode 100644
index b3a9e6591191..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/AnalyzeDataSourceRiskRequestOrBuilder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface AnalyzeDataSourceRiskRequestOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Privacy metric to compute.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-   */
-  boolean hasPrivacyMetric();
-  /**
-   * 
-   * Privacy metric to compute.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-   */
-  com.google.privacy.dlp.v2beta1.PrivacyMetric getPrivacyMetric();
-  /**
-   * 
-   * Privacy metric to compute.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrivacyMetric privacy_metric = 1;
-   */
-  com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder getPrivacyMetricOrBuilder();
-
-  /**
-   * 
-   * Input dataset to compute metrics over.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-   */
-  boolean hasSourceTable();
-  /**
-   * 
-   * Input dataset to compute metrics over.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-   */
-  com.google.privacy.dlp.v2beta1.BigQueryTable getSourceTable();
-  /**
-   * 
-   * Input dataset to compute metrics over.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable source_table = 3;
-   */
-  com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder getSourceTableOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryOptions.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryOptions.java
deleted file mode 100644
index ed2ef8bd3c8e..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryOptions.java
+++ /dev/null
@@ -1,1089 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Options defining BigQuery table and row identifiers.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.BigQueryOptions}
- */
-public  final class BigQueryOptions extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.BigQueryOptions)
-    BigQueryOptionsOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use BigQueryOptions.newBuilder() to construct.
-  private BigQueryOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private BigQueryOptions() {
-    identifyingFields_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private BigQueryOptions(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.BigQueryTable.Builder subBuilder = null;
-            if (tableReference_ != null) {
-              subBuilder = tableReference_.toBuilder();
-            }
-            tableReference_ = input.readMessage(com.google.privacy.dlp.v2beta1.BigQueryTable.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(tableReference_);
-              tableReference_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              identifyingFields_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
-            }
-            identifyingFields_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-        identifyingFields_ = java.util.Collections.unmodifiableList(identifyingFields_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_BigQueryOptions_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_BigQueryOptions_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.BigQueryOptions.class, com.google.privacy.dlp.v2beta1.BigQueryOptions.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int TABLE_REFERENCE_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.BigQueryTable tableReference_;
-  /**
-   * 
-   * Complete BigQuery table reference.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-   */
-  public boolean hasTableReference() {
-    return tableReference_ != null;
-  }
-  /**
-   * 
-   * Complete BigQuery table reference.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.BigQueryTable getTableReference() {
-    return tableReference_ == null ? com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance() : tableReference_;
-  }
-  /**
-   * 
-   * Complete BigQuery table reference.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder getTableReferenceOrBuilder() {
-    return getTableReference();
-  }
-
-  public static final int IDENTIFYING_FIELDS_FIELD_NUMBER = 2;
-  private java.util.List identifyingFields_;
-  /**
-   * 
-   * References to fields uniquely identifying rows within the table.
-   * Nested fields in the format, like `person.birthdate.year`, are allowed.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-   */
-  public java.util.List getIdentifyingFieldsList() {
-    return identifyingFields_;
-  }
-  /**
-   * 
-   * References to fields uniquely identifying rows within the table.
-   * Nested fields in the format, like `person.birthdate.year`, are allowed.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-   */
-  public java.util.List 
-      getIdentifyingFieldsOrBuilderList() {
-    return identifyingFields_;
-  }
-  /**
-   * 
-   * References to fields uniquely identifying rows within the table.
-   * Nested fields in the format, like `person.birthdate.year`, are allowed.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-   */
-  public int getIdentifyingFieldsCount() {
-    return identifyingFields_.size();
-  }
-  /**
-   * 
-   * References to fields uniquely identifying rows within the table.
-   * Nested fields in the format, like `person.birthdate.year`, are allowed.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldId getIdentifyingFields(int index) {
-    return identifyingFields_.get(index);
-  }
-  /**
-   * 
-   * References to fields uniquely identifying rows within the table.
-   * Nested fields in the format, like `person.birthdate.year`, are allowed.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getIdentifyingFieldsOrBuilder(
-      int index) {
-    return identifyingFields_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (tableReference_ != null) {
-      output.writeMessage(1, getTableReference());
-    }
-    for (int i = 0; i < identifyingFields_.size(); i++) {
-      output.writeMessage(2, identifyingFields_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (tableReference_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getTableReference());
-    }
-    for (int i = 0; i < identifyingFields_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, identifyingFields_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.BigQueryOptions)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.BigQueryOptions other = (com.google.privacy.dlp.v2beta1.BigQueryOptions) obj;
-
-    boolean result = true;
-    result = result && (hasTableReference() == other.hasTableReference());
-    if (hasTableReference()) {
-      result = result && getTableReference()
-          .equals(other.getTableReference());
-    }
-    result = result && getIdentifyingFieldsList()
-        .equals(other.getIdentifyingFieldsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasTableReference()) {
-      hash = (37 * hash) + TABLE_REFERENCE_FIELD_NUMBER;
-      hash = (53 * hash) + getTableReference().hashCode();
-    }
-    if (getIdentifyingFieldsCount() > 0) {
-      hash = (37 * hash) + IDENTIFYING_FIELDS_FIELD_NUMBER;
-      hash = (53 * hash) + getIdentifyingFieldsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.BigQueryOptions prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Options defining BigQuery table and row identifiers.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.BigQueryOptions}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.BigQueryOptions)
-      com.google.privacy.dlp.v2beta1.BigQueryOptionsOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_BigQueryOptions_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_BigQueryOptions_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.BigQueryOptions.class, com.google.privacy.dlp.v2beta1.BigQueryOptions.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.BigQueryOptions.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getIdentifyingFieldsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (tableReferenceBuilder_ == null) {
-        tableReference_ = null;
-      } else {
-        tableReference_ = null;
-        tableReferenceBuilder_ = null;
-      }
-      if (identifyingFieldsBuilder_ == null) {
-        identifyingFields_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-      } else {
-        identifyingFieldsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_BigQueryOptions_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.BigQueryOptions getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.BigQueryOptions.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.BigQueryOptions build() {
-      com.google.privacy.dlp.v2beta1.BigQueryOptions result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.BigQueryOptions buildPartial() {
-      com.google.privacy.dlp.v2beta1.BigQueryOptions result = new com.google.privacy.dlp.v2beta1.BigQueryOptions(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (tableReferenceBuilder_ == null) {
-        result.tableReference_ = tableReference_;
-      } else {
-        result.tableReference_ = tableReferenceBuilder_.build();
-      }
-      if (identifyingFieldsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          identifyingFields_ = java.util.Collections.unmodifiableList(identifyingFields_);
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.identifyingFields_ = identifyingFields_;
-      } else {
-        result.identifyingFields_ = identifyingFieldsBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.BigQueryOptions) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.BigQueryOptions)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.BigQueryOptions other) {
-      if (other == com.google.privacy.dlp.v2beta1.BigQueryOptions.getDefaultInstance()) return this;
-      if (other.hasTableReference()) {
-        mergeTableReference(other.getTableReference());
-      }
-      if (identifyingFieldsBuilder_ == null) {
-        if (!other.identifyingFields_.isEmpty()) {
-          if (identifyingFields_.isEmpty()) {
-            identifyingFields_ = other.identifyingFields_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureIdentifyingFieldsIsMutable();
-            identifyingFields_.addAll(other.identifyingFields_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.identifyingFields_.isEmpty()) {
-          if (identifyingFieldsBuilder_.isEmpty()) {
-            identifyingFieldsBuilder_.dispose();
-            identifyingFieldsBuilder_ = null;
-            identifyingFields_ = other.identifyingFields_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-            identifyingFieldsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getIdentifyingFieldsFieldBuilder() : null;
-          } else {
-            identifyingFieldsBuilder_.addAllMessages(other.identifyingFields_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.BigQueryOptions parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.BigQueryOptions) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private com.google.privacy.dlp.v2beta1.BigQueryTable tableReference_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BigQueryTable, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder, com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder> tableReferenceBuilder_;
-    /**
-     * 
-     * Complete BigQuery table reference.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-     */
-    public boolean hasTableReference() {
-      return tableReferenceBuilder_ != null || tableReference_ != null;
-    }
-    /**
-     * 
-     * Complete BigQuery table reference.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryTable getTableReference() {
-      if (tableReferenceBuilder_ == null) {
-        return tableReference_ == null ? com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance() : tableReference_;
-      } else {
-        return tableReferenceBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Complete BigQuery table reference.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-     */
-    public Builder setTableReference(com.google.privacy.dlp.v2beta1.BigQueryTable value) {
-      if (tableReferenceBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        tableReference_ = value;
-        onChanged();
-      } else {
-        tableReferenceBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Complete BigQuery table reference.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-     */
-    public Builder setTableReference(
-        com.google.privacy.dlp.v2beta1.BigQueryTable.Builder builderForValue) {
-      if (tableReferenceBuilder_ == null) {
-        tableReference_ = builderForValue.build();
-        onChanged();
-      } else {
-        tableReferenceBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Complete BigQuery table reference.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-     */
-    public Builder mergeTableReference(com.google.privacy.dlp.v2beta1.BigQueryTable value) {
-      if (tableReferenceBuilder_ == null) {
-        if (tableReference_ != null) {
-          tableReference_ =
-            com.google.privacy.dlp.v2beta1.BigQueryTable.newBuilder(tableReference_).mergeFrom(value).buildPartial();
-        } else {
-          tableReference_ = value;
-        }
-        onChanged();
-      } else {
-        tableReferenceBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Complete BigQuery table reference.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-     */
-    public Builder clearTableReference() {
-      if (tableReferenceBuilder_ == null) {
-        tableReference_ = null;
-        onChanged();
-      } else {
-        tableReference_ = null;
-        tableReferenceBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Complete BigQuery table reference.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryTable.Builder getTableReferenceBuilder() {
-      
-      onChanged();
-      return getTableReferenceFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Complete BigQuery table reference.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder getTableReferenceOrBuilder() {
-      if (tableReferenceBuilder_ != null) {
-        return tableReferenceBuilder_.getMessageOrBuilder();
-      } else {
-        return tableReference_ == null ?
-            com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance() : tableReference_;
-      }
-    }
-    /**
-     * 
-     * Complete BigQuery table reference.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BigQueryTable, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder, com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder> 
-        getTableReferenceFieldBuilder() {
-      if (tableReferenceBuilder_ == null) {
-        tableReferenceBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.BigQueryTable, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder, com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder>(
-                getTableReference(),
-                getParentForChildren(),
-                isClean());
-        tableReference_ = null;
-      }
-      return tableReferenceBuilder_;
-    }
-
-    private java.util.List identifyingFields_ =
-      java.util.Collections.emptyList();
-    private void ensureIdentifyingFieldsIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-        identifyingFields_ = new java.util.ArrayList(identifyingFields_);
-        bitField0_ |= 0x00000002;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> identifyingFieldsBuilder_;
-
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public java.util.List getIdentifyingFieldsList() {
-      if (identifyingFieldsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(identifyingFields_);
-      } else {
-        return identifyingFieldsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public int getIdentifyingFieldsCount() {
-      if (identifyingFieldsBuilder_ == null) {
-        return identifyingFields_.size();
-      } else {
-        return identifyingFieldsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getIdentifyingFields(int index) {
-      if (identifyingFieldsBuilder_ == null) {
-        return identifyingFields_.get(index);
-      } else {
-        return identifyingFieldsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public Builder setIdentifyingFields(
-        int index, com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (identifyingFieldsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureIdentifyingFieldsIsMutable();
-        identifyingFields_.set(index, value);
-        onChanged();
-      } else {
-        identifyingFieldsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public Builder setIdentifyingFields(
-        int index, com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (identifyingFieldsBuilder_ == null) {
-        ensureIdentifyingFieldsIsMutable();
-        identifyingFields_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        identifyingFieldsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public Builder addIdentifyingFields(com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (identifyingFieldsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureIdentifyingFieldsIsMutable();
-        identifyingFields_.add(value);
-        onChanged();
-      } else {
-        identifyingFieldsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public Builder addIdentifyingFields(
-        int index, com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (identifyingFieldsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureIdentifyingFieldsIsMutable();
-        identifyingFields_.add(index, value);
-        onChanged();
-      } else {
-        identifyingFieldsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public Builder addIdentifyingFields(
-        com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (identifyingFieldsBuilder_ == null) {
-        ensureIdentifyingFieldsIsMutable();
-        identifyingFields_.add(builderForValue.build());
-        onChanged();
-      } else {
-        identifyingFieldsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public Builder addIdentifyingFields(
-        int index, com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (identifyingFieldsBuilder_ == null) {
-        ensureIdentifyingFieldsIsMutable();
-        identifyingFields_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        identifyingFieldsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public Builder addAllIdentifyingFields(
-        java.lang.Iterable values) {
-      if (identifyingFieldsBuilder_ == null) {
-        ensureIdentifyingFieldsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, identifyingFields_);
-        onChanged();
-      } else {
-        identifyingFieldsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public Builder clearIdentifyingFields() {
-      if (identifyingFieldsBuilder_ == null) {
-        identifyingFields_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-      } else {
-        identifyingFieldsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public Builder removeIdentifyingFields(int index) {
-      if (identifyingFieldsBuilder_ == null) {
-        ensureIdentifyingFieldsIsMutable();
-        identifyingFields_.remove(index);
-        onChanged();
-      } else {
-        identifyingFieldsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder getIdentifyingFieldsBuilder(
-        int index) {
-      return getIdentifyingFieldsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getIdentifyingFieldsOrBuilder(
-        int index) {
-      if (identifyingFieldsBuilder_ == null) {
-        return identifyingFields_.get(index);  } else {
-        return identifyingFieldsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public java.util.List 
-         getIdentifyingFieldsOrBuilderList() {
-      if (identifyingFieldsBuilder_ != null) {
-        return identifyingFieldsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(identifyingFields_);
-      }
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder addIdentifyingFieldsBuilder() {
-      return getIdentifyingFieldsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance());
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder addIdentifyingFieldsBuilder(
-        int index) {
-      return getIdentifyingFieldsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance());
-    }
-    /**
-     * 
-     * References to fields uniquely identifying rows within the table.
-     * Nested fields in the format, like `person.birthdate.year`, are allowed.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-     */
-    public java.util.List 
-         getIdentifyingFieldsBuilderList() {
-      return getIdentifyingFieldsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-        getIdentifyingFieldsFieldBuilder() {
-      if (identifyingFieldsBuilder_ == null) {
-        identifyingFieldsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                identifyingFields_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
-        identifyingFields_ = null;
-      }
-      return identifyingFieldsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.BigQueryOptions)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.BigQueryOptions)
-  private static final com.google.privacy.dlp.v2beta1.BigQueryOptions DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.BigQueryOptions();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.BigQueryOptions getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public BigQueryOptions parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BigQueryOptions(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.BigQueryOptions getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryOptionsOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryOptionsOrBuilder.java
deleted file mode 100644
index 6c28561a3c7f..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryOptionsOrBuilder.java
+++ /dev/null
@@ -1,83 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface BigQueryOptionsOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.BigQueryOptions)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Complete BigQuery table reference.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-   */
-  boolean hasTableReference();
-  /**
-   * 
-   * Complete BigQuery table reference.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-   */
-  com.google.privacy.dlp.v2beta1.BigQueryTable getTableReference();
-  /**
-   * 
-   * Complete BigQuery table reference.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable table_reference = 1;
-   */
-  com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder getTableReferenceOrBuilder();
-
-  /**
-   * 
-   * References to fields uniquely identifying rows within the table.
-   * Nested fields in the format, like `person.birthdate.year`, are allowed.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-   */
-  java.util.List 
-      getIdentifyingFieldsList();
-  /**
-   * 
-   * References to fields uniquely identifying rows within the table.
-   * Nested fields in the format, like `person.birthdate.year`, are allowed.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-   */
-  com.google.privacy.dlp.v2beta1.FieldId getIdentifyingFields(int index);
-  /**
-   * 
-   * References to fields uniquely identifying rows within the table.
-   * Nested fields in the format, like `person.birthdate.year`, are allowed.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-   */
-  int getIdentifyingFieldsCount();
-  /**
-   * 
-   * References to fields uniquely identifying rows within the table.
-   * Nested fields in the format, like `person.birthdate.year`, are allowed.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-   */
-  java.util.List 
-      getIdentifyingFieldsOrBuilderList();
-  /**
-   * 
-   * References to fields uniquely identifying rows within the table.
-   * Nested fields in the format, like `person.birthdate.year`, are allowed.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId identifying_fields = 2;
-   */
-  com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getIdentifyingFieldsOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryTable.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryTable.java
deleted file mode 100644
index e160354df33e..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryTable.java
+++ /dev/null
@@ -1,877 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Message defining the location of a BigQuery table. A table is uniquely
- * identified  by its project_id, dataset_id, and table_name. Within a query
- * a table is often referenced with a string in the format of:
- * `<project_id>:<dataset_id>.<table_id>` or
- * `<project_id>.<dataset_id>.<table_id>`.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.BigQueryTable}
- */
-public  final class BigQueryTable extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.BigQueryTable)
-    BigQueryTableOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use BigQueryTable.newBuilder() to construct.
-  private BigQueryTable(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private BigQueryTable() {
-    projectId_ = "";
-    datasetId_ = "";
-    tableId_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private BigQueryTable(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            projectId_ = s;
-            break;
-          }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            datasetId_ = s;
-            break;
-          }
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            tableId_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_BigQueryTable_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_BigQueryTable_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.BigQueryTable.class, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder.class);
-  }
-
-  public static final int PROJECT_ID_FIELD_NUMBER = 1;
-  private volatile java.lang.Object projectId_;
-  /**
-   * 
-   * The Google Cloud Platform project ID of the project containing the table.
-   * If omitted, project ID is inferred from the API call.
-   * 

-   *
-   * string project_id = 1;
-   */
-  public java.lang.String getProjectId() {
-    java.lang.Object ref = projectId_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      projectId_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * The Google Cloud Platform project ID of the project containing the table.
-   * If omitted, project ID is inferred from the API call.
-   * 

-   *
-   * string project_id = 1;
-   */
-  public com.google.protobuf.ByteString
-      getProjectIdBytes() {
-    java.lang.Object ref = projectId_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      projectId_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int DATASET_ID_FIELD_NUMBER = 2;
-  private volatile java.lang.Object datasetId_;
-  /**
-   * 
-   * Dataset ID of the table.
-   * 

-   *
-   * string dataset_id = 2;
-   */
-  public java.lang.String getDatasetId() {
-    java.lang.Object ref = datasetId_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      datasetId_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Dataset ID of the table.
-   * 

-   *
-   * string dataset_id = 2;
-   */
-  public com.google.protobuf.ByteString
-      getDatasetIdBytes() {
-    java.lang.Object ref = datasetId_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      datasetId_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int TABLE_ID_FIELD_NUMBER = 3;
-  private volatile java.lang.Object tableId_;
-  /**
-   * 
-   * Name of the table.
-   * 

-   *
-   * string table_id = 3;
-   */
-  public java.lang.String getTableId() {
-    java.lang.Object ref = tableId_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      tableId_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Name of the table.
-   * 

-   *
-   * string table_id = 3;
-   */
-  public com.google.protobuf.ByteString
-      getTableIdBytes() {
-    java.lang.Object ref = tableId_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      tableId_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getProjectIdBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, projectId_);
-    }
-    if (!getDatasetIdBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, datasetId_);
-    }
-    if (!getTableIdBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, tableId_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getProjectIdBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, projectId_);
-    }
-    if (!getDatasetIdBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, datasetId_);
-    }
-    if (!getTableIdBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, tableId_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.BigQueryTable)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.BigQueryTable other = (com.google.privacy.dlp.v2beta1.BigQueryTable) obj;
-
-    boolean result = true;
-    result = result && getProjectId()
-        .equals(other.getProjectId());
-    result = result && getDatasetId()
-        .equals(other.getDatasetId());
-    result = result && getTableId()
-        .equals(other.getTableId());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
-    hash = (53 * hash) + getProjectId().hashCode();
-    hash = (37 * hash) + DATASET_ID_FIELD_NUMBER;
-    hash = (53 * hash) + getDatasetId().hashCode();
-    hash = (37 * hash) + TABLE_ID_FIELD_NUMBER;
-    hash = (53 * hash) + getTableId().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.BigQueryTable prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Message defining the location of a BigQuery table. A table is uniquely
-   * identified  by its project_id, dataset_id, and table_name. Within a query
-   * a table is often referenced with a string in the format of:
-   * `<project_id>:<dataset_id>.<table_id>` or
-   * `<project_id>.<dataset_id>.<table_id>`.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.BigQueryTable}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.BigQueryTable)
-      com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_BigQueryTable_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_BigQueryTable_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.BigQueryTable.class, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.BigQueryTable.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      projectId_ = "";
-
-      datasetId_ = "";
-
-      tableId_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_BigQueryTable_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.BigQueryTable getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.BigQueryTable build() {
-      com.google.privacy.dlp.v2beta1.BigQueryTable result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.BigQueryTable buildPartial() {
-      com.google.privacy.dlp.v2beta1.BigQueryTable result = new com.google.privacy.dlp.v2beta1.BigQueryTable(this);
-      result.projectId_ = projectId_;
-      result.datasetId_ = datasetId_;
-      result.tableId_ = tableId_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.BigQueryTable) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.BigQueryTable)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.BigQueryTable other) {
-      if (other == com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance()) return this;
-      if (!other.getProjectId().isEmpty()) {
-        projectId_ = other.projectId_;
-        onChanged();
-      }
-      if (!other.getDatasetId().isEmpty()) {
-        datasetId_ = other.datasetId_;
-        onChanged();
-      }
-      if (!other.getTableId().isEmpty()) {
-        tableId_ = other.tableId_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.BigQueryTable parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.BigQueryTable) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object projectId_ = "";
-    /**
-     * 
-     * The Google Cloud Platform project ID of the project containing the table.
-     * If omitted, project ID is inferred from the API call.
-     * 

-     *
-     * string project_id = 1;
-     */
-    public java.lang.String getProjectId() {
-      java.lang.Object ref = projectId_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        projectId_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * The Google Cloud Platform project ID of the project containing the table.
-     * If omitted, project ID is inferred from the API call.
-     * 

-     *
-     * string project_id = 1;
-     */
-    public com.google.protobuf.ByteString
-        getProjectIdBytes() {
-      java.lang.Object ref = projectId_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        projectId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * The Google Cloud Platform project ID of the project containing the table.
-     * If omitted, project ID is inferred from the API call.
-     * 

-     *
-     * string project_id = 1;
-     */
-    public Builder setProjectId(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      projectId_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The Google Cloud Platform project ID of the project containing the table.
-     * If omitted, project ID is inferred from the API call.
-     * 

-     *
-     * string project_id = 1;
-     */
-    public Builder clearProjectId() {
-      
-      projectId_ = getDefaultInstance().getProjectId();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The Google Cloud Platform project ID of the project containing the table.
-     * If omitted, project ID is inferred from the API call.
-     * 

-     *
-     * string project_id = 1;
-     */
-    public Builder setProjectIdBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      projectId_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object datasetId_ = "";
-    /**
-     * 
-     * Dataset ID of the table.
-     * 

-     *
-     * string dataset_id = 2;
-     */
-    public java.lang.String getDatasetId() {
-      java.lang.Object ref = datasetId_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        datasetId_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Dataset ID of the table.
-     * 

-     *
-     * string dataset_id = 2;
-     */
-    public com.google.protobuf.ByteString
-        getDatasetIdBytes() {
-      java.lang.Object ref = datasetId_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        datasetId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Dataset ID of the table.
-     * 

-     *
-     * string dataset_id = 2;
-     */
-    public Builder setDatasetId(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      datasetId_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Dataset ID of the table.
-     * 

-     *
-     * string dataset_id = 2;
-     */
-    public Builder clearDatasetId() {
-      
-      datasetId_ = getDefaultInstance().getDatasetId();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Dataset ID of the table.
-     * 

-     *
-     * string dataset_id = 2;
-     */
-    public Builder setDatasetIdBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      datasetId_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object tableId_ = "";
-    /**
-     * 
-     * Name of the table.
-     * 

-     *
-     * string table_id = 3;
-     */
-    public java.lang.String getTableId() {
-      java.lang.Object ref = tableId_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        tableId_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Name of the table.
-     * 

-     *
-     * string table_id = 3;
-     */
-    public com.google.protobuf.ByteString
-        getTableIdBytes() {
-      java.lang.Object ref = tableId_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        tableId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Name of the table.
-     * 

-     *
-     * string table_id = 3;
-     */
-    public Builder setTableId(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      tableId_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Name of the table.
-     * 

-     *
-     * string table_id = 3;
-     */
-    public Builder clearTableId() {
-      
-      tableId_ = getDefaultInstance().getTableId();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Name of the table.
-     * 

-     *
-     * string table_id = 3;
-     */
-    public Builder setTableIdBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      tableId_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.BigQueryTable)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.BigQueryTable)
-  private static final com.google.privacy.dlp.v2beta1.BigQueryTable DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.BigQueryTable();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.BigQueryTable getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public BigQueryTable parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BigQueryTable(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.BigQueryTable getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryTableOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryTableOrBuilder.java
deleted file mode 100644
index fe2e1bb954f8..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BigQueryTableOrBuilder.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface BigQueryTableOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.BigQueryTable)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The Google Cloud Platform project ID of the project containing the table.
-   * If omitted, project ID is inferred from the API call.
-   * 

-   *
-   * string project_id = 1;
-   */
-  java.lang.String getProjectId();
-  /**
-   * 
-   * The Google Cloud Platform project ID of the project containing the table.
-   * If omitted, project ID is inferred from the API call.
-   * 

-   *
-   * string project_id = 1;
-   */
-  com.google.protobuf.ByteString
-      getProjectIdBytes();
-
-  /**
-   * 
-   * Dataset ID of the table.
-   * 

-   *
-   * string dataset_id = 2;
-   */
-  java.lang.String getDatasetId();
-  /**
-   * 
-   * Dataset ID of the table.
-   * 

-   *
-   * string dataset_id = 2;
-   */
-  com.google.protobuf.ByteString
-      getDatasetIdBytes();
-
-  /**
-   * 
-   * Name of the table.
-   * 

-   *
-   * string table_id = 3;
-   */
-  java.lang.String getTableId();
-  /**
-   * 
-   * Name of the table.
-   * 

-   *
-   * string table_id = 3;
-   */
-  com.google.protobuf.ByteString
-      getTableIdBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BucketingConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BucketingConfig.java
deleted file mode 100644
index d4a5b793fbac..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BucketingConfig.java
+++ /dev/null
@@ -1,1946 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Generalization function that buckets values based on ranges. The ranges and
- * replacement values are dynamically provided by the user for custom behavior,
- * such as 1-30 -> LOW 31-65 -> MEDIUM 66-100 -> HIGH
- * This can be used on
- * data of type: number, long, string, timestamp.
- * If the bound `Value` type differs from the type of data being transformed, we
- * will first attempt converting the type of the data to be transformed to match
- * the type of the bound before comparing.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.BucketingConfig}
- */
-public  final class BucketingConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.BucketingConfig)
-    BucketingConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use BucketingConfig.newBuilder() to construct.
-  private BucketingConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private BucketingConfig() {
-    buckets_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private BucketingConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              buckets_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            buckets_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        buckets_ = java.util.Collections.unmodifiableList(buckets_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_BucketingConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_BucketingConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.BucketingConfig.class, com.google.privacy.dlp.v2beta1.BucketingConfig.Builder.class);
-  }
-
-  public interface BucketOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.BucketingConfig.Bucket)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Lower bound of the range, inclusive. Type should be the same as max if
-     * used.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value min = 1;
-     */
-    boolean hasMin();
-    /**
-     * 
-     * Lower bound of the range, inclusive. Type should be the same as max if
-     * used.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value min = 1;
-     */
-    com.google.privacy.dlp.v2beta1.Value getMin();
-    /**
-     * 
-     * Lower bound of the range, inclusive. Type should be the same as max if
-     * used.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value min = 1;
-     */
-    com.google.privacy.dlp.v2beta1.ValueOrBuilder getMinOrBuilder();
-
-    /**
-     * 
-     * Upper bound of the range, exclusive; type must match min.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value max = 2;
-     */
-    boolean hasMax();
-    /**
-     * 
-     * Upper bound of the range, exclusive; type must match min.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value max = 2;
-     */
-    com.google.privacy.dlp.v2beta1.Value getMax();
-    /**
-     * 
-     * Upper bound of the range, exclusive; type must match min.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value max = 2;
-     */
-    com.google.privacy.dlp.v2beta1.ValueOrBuilder getMaxOrBuilder();
-
-    /**
-     * 
-     * Replacement value for this bucket. If not provided
-     * the default behavior will be to hyphenate the min-max range.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-     */
-    boolean hasReplacementValue();
-    /**
-     * 
-     * Replacement value for this bucket. If not provided
-     * the default behavior will be to hyphenate the min-max range.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-     */
-    com.google.privacy.dlp.v2beta1.Value getReplacementValue();
-    /**
-     * 
-     * Replacement value for this bucket. If not provided
-     * the default behavior will be to hyphenate the min-max range.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-     */
-    com.google.privacy.dlp.v2beta1.ValueOrBuilder getReplacementValueOrBuilder();
-  }
-  /**
-   * 
-   * Buckets represented as ranges, along with replacement values. Ranges must
-   * be non-overlapping.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.BucketingConfig.Bucket}
-   */
-  public  static final class Bucket extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.BucketingConfig.Bucket)
-      BucketOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use Bucket.newBuilder() to construct.
-    private Bucket(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private Bucket() {
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Bucket(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              com.google.privacy.dlp.v2beta1.Value.Builder subBuilder = null;
-              if (min_ != null) {
-                subBuilder = min_.toBuilder();
-              }
-              min_ = input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(min_);
-                min_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 18: {
-              com.google.privacy.dlp.v2beta1.Value.Builder subBuilder = null;
-              if (max_ != null) {
-                subBuilder = max_.toBuilder();
-              }
-              max_ = input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(max_);
-                max_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 26: {
-              com.google.privacy.dlp.v2beta1.Value.Builder subBuilder = null;
-              if (replacementValue_ != null) {
-                subBuilder = replacementValue_.toBuilder();
-              }
-              replacementValue_ = input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(replacementValue_);
-                replacementValue_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_BucketingConfig_Bucket_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_BucketingConfig_Bucket_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.class, com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.Builder.class);
-    }
-
-    public static final int MIN_FIELD_NUMBER = 1;
-    private com.google.privacy.dlp.v2beta1.Value min_;
-    /**
-     * 
-     * Lower bound of the range, inclusive. Type should be the same as max if
-     * used.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value min = 1;
-     */
-    public boolean hasMin() {
-      return min_ != null;
-    }
-    /**
-     * 
-     * Lower bound of the range, inclusive. Type should be the same as max if
-     * used.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value min = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Value getMin() {
-      return min_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : min_;
-    }
-    /**
-     * 
-     * Lower bound of the range, inclusive. Type should be the same as max if
-     * used.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value min = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ValueOrBuilder getMinOrBuilder() {
-      return getMin();
-    }
-
-    public static final int MAX_FIELD_NUMBER = 2;
-    private com.google.privacy.dlp.v2beta1.Value max_;
-    /**
-     * 
-     * Upper bound of the range, exclusive; type must match min.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value max = 2;
-     */
-    public boolean hasMax() {
-      return max_ != null;
-    }
-    /**
-     * 
-     * Upper bound of the range, exclusive; type must match min.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value max = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Value getMax() {
-      return max_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : max_;
-    }
-    /**
-     * 
-     * Upper bound of the range, exclusive; type must match min.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value max = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ValueOrBuilder getMaxOrBuilder() {
-      return getMax();
-    }
-
-    public static final int REPLACEMENT_VALUE_FIELD_NUMBER = 3;
-    private com.google.privacy.dlp.v2beta1.Value replacementValue_;
-    /**
-     * 
-     * Replacement value for this bucket. If not provided
-     * the default behavior will be to hyphenate the min-max range.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-     */
-    public boolean hasReplacementValue() {
-      return replacementValue_ != null;
-    }
-    /**
-     * 
-     * Replacement value for this bucket. If not provided
-     * the default behavior will be to hyphenate the min-max range.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.Value getReplacementValue() {
-      return replacementValue_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : replacementValue_;
-    }
-    /**
-     * 
-     * Replacement value for this bucket. If not provided
-     * the default behavior will be to hyphenate the min-max range.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ValueOrBuilder getReplacementValueOrBuilder() {
-      return getReplacementValue();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (min_ != null) {
-        output.writeMessage(1, getMin());
-      }
-      if (max_ != null) {
-        output.writeMessage(2, getMax());
-      }
-      if (replacementValue_ != null) {
-        output.writeMessage(3, getReplacementValue());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (min_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getMin());
-      }
-      if (max_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getMax());
-      }
-      if (replacementValue_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getReplacementValue());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket other = (com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket) obj;
-
-      boolean result = true;
-      result = result && (hasMin() == other.hasMin());
-      if (hasMin()) {
-        result = result && getMin()
-            .equals(other.getMin());
-      }
-      result = result && (hasMax() == other.hasMax());
-      if (hasMax()) {
-        result = result && getMax()
-            .equals(other.getMax());
-      }
-      result = result && (hasReplacementValue() == other.hasReplacementValue());
-      if (hasReplacementValue()) {
-        result = result && getReplacementValue()
-            .equals(other.getReplacementValue());
-      }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasMin()) {
-        hash = (37 * hash) + MIN_FIELD_NUMBER;
-        hash = (53 * hash) + getMin().hashCode();
-      }
-      if (hasMax()) {
-        hash = (37 * hash) + MAX_FIELD_NUMBER;
-        hash = (53 * hash) + getMax().hashCode();
-      }
-      if (hasReplacementValue()) {
-        hash = (37 * hash) + REPLACEMENT_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + getReplacementValue().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Buckets represented as ranges, along with replacement values. Ranges must
-     * be non-overlapping.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.BucketingConfig.Bucket}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.BucketingConfig.Bucket)
-        com.google.privacy.dlp.v2beta1.BucketingConfig.BucketOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_BucketingConfig_Bucket_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_BucketingConfig_Bucket_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.class, com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (minBuilder_ == null) {
-          min_ = null;
-        } else {
-          min_ = null;
-          minBuilder_ = null;
-        }
-        if (maxBuilder_ == null) {
-          max_ = null;
-        } else {
-          max_ = null;
-          maxBuilder_ = null;
-        }
-        if (replacementValueBuilder_ == null) {
-          replacementValue_ = null;
-        } else {
-          replacementValue_ = null;
-          replacementValueBuilder_ = null;
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_BucketingConfig_Bucket_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket build() {
-        com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket buildPartial() {
-        com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket result = new com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket(this);
-        if (minBuilder_ == null) {
-          result.min_ = min_;
-        } else {
-          result.min_ = minBuilder_.build();
-        }
-        if (maxBuilder_ == null) {
-          result.max_ = max_;
-        } else {
-          result.max_ = maxBuilder_.build();
-        }
-        if (replacementValueBuilder_ == null) {
-          result.replacementValue_ = replacementValue_;
-        } else {
-          result.replacementValue_ = replacementValueBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket other) {
-        if (other == com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.getDefaultInstance()) return this;
-        if (other.hasMin()) {
-          mergeMin(other.getMin());
-        }
-        if (other.hasMax()) {
-          mergeMax(other.getMax());
-        }
-        if (other.hasReplacementValue()) {
-          mergeReplacementValue(other.getReplacementValue());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private com.google.privacy.dlp.v2beta1.Value min_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> minBuilder_;
-      /**
-       * 
-       * Lower bound of the range, inclusive. Type should be the same as max if
-       * used.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min = 1;
-       */
-      public boolean hasMin() {
-        return minBuilder_ != null || min_ != null;
-      }
-      /**
-       * 
-       * Lower bound of the range, inclusive. Type should be the same as max if
-       * used.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.Value getMin() {
-        if (minBuilder_ == null) {
-          return min_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : min_;
-        } else {
-          return minBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Lower bound of the range, inclusive. Type should be the same as max if
-       * used.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min = 1;
-       */
-      public Builder setMin(com.google.privacy.dlp.v2beta1.Value value) {
-        if (minBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          min_ = value;
-          onChanged();
-        } else {
-          minBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Lower bound of the range, inclusive. Type should be the same as max if
-       * used.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min = 1;
-       */
-      public Builder setMin(
-          com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-        if (minBuilder_ == null) {
-          min_ = builderForValue.build();
-          onChanged();
-        } else {
-          minBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Lower bound of the range, inclusive. Type should be the same as max if
-       * used.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min = 1;
-       */
-      public Builder mergeMin(com.google.privacy.dlp.v2beta1.Value value) {
-        if (minBuilder_ == null) {
-          if (min_ != null) {
-            min_ =
-              com.google.privacy.dlp.v2beta1.Value.newBuilder(min_).mergeFrom(value).buildPartial();
-          } else {
-            min_ = value;
-          }
-          onChanged();
-        } else {
-          minBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Lower bound of the range, inclusive. Type should be the same as max if
-       * used.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min = 1;
-       */
-      public Builder clearMin() {
-        if (minBuilder_ == null) {
-          min_ = null;
-          onChanged();
-        } else {
-          min_ = null;
-          minBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Lower bound of the range, inclusive. Type should be the same as max if
-       * used.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.Value.Builder getMinBuilder() {
-        
-        onChanged();
-        return getMinFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Lower bound of the range, inclusive. Type should be the same as max if
-       * used.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueOrBuilder getMinOrBuilder() {
-        if (minBuilder_ != null) {
-          return minBuilder_.getMessageOrBuilder();
-        } else {
-          return min_ == null ?
-              com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : min_;
-        }
-      }
-      /**
-       * 
-       * Lower bound of the range, inclusive. Type should be the same as max if
-       * used.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-          getMinFieldBuilder() {
-        if (minBuilder_ == null) {
-          minBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                  getMin(),
-                  getParentForChildren(),
-                  isClean());
-          min_ = null;
-        }
-        return minBuilder_;
-      }
-
-      private com.google.privacy.dlp.v2beta1.Value max_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> maxBuilder_;
-      /**
-       * 
-       * Upper bound of the range, exclusive; type must match min.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max = 2;
-       */
-      public boolean hasMax() {
-        return maxBuilder_ != null || max_ != null;
-      }
-      /**
-       * 
-       * Upper bound of the range, exclusive; type must match min.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.Value getMax() {
-        if (maxBuilder_ == null) {
-          return max_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : max_;
-        } else {
-          return maxBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Upper bound of the range, exclusive; type must match min.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max = 2;
-       */
-      public Builder setMax(com.google.privacy.dlp.v2beta1.Value value) {
-        if (maxBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          max_ = value;
-          onChanged();
-        } else {
-          maxBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Upper bound of the range, exclusive; type must match min.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max = 2;
-       */
-      public Builder setMax(
-          com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-        if (maxBuilder_ == null) {
-          max_ = builderForValue.build();
-          onChanged();
-        } else {
-          maxBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Upper bound of the range, exclusive; type must match min.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max = 2;
-       */
-      public Builder mergeMax(com.google.privacy.dlp.v2beta1.Value value) {
-        if (maxBuilder_ == null) {
-          if (max_ != null) {
-            max_ =
-              com.google.privacy.dlp.v2beta1.Value.newBuilder(max_).mergeFrom(value).buildPartial();
-          } else {
-            max_ = value;
-          }
-          onChanged();
-        } else {
-          maxBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Upper bound of the range, exclusive; type must match min.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max = 2;
-       */
-      public Builder clearMax() {
-        if (maxBuilder_ == null) {
-          max_ = null;
-          onChanged();
-        } else {
-          max_ = null;
-          maxBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Upper bound of the range, exclusive; type must match min.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.Value.Builder getMaxBuilder() {
-        
-        onChanged();
-        return getMaxFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Upper bound of the range, exclusive; type must match min.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueOrBuilder getMaxOrBuilder() {
-        if (maxBuilder_ != null) {
-          return maxBuilder_.getMessageOrBuilder();
-        } else {
-          return max_ == null ?
-              com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : max_;
-        }
-      }
-      /**
-       * 
-       * Upper bound of the range, exclusive; type must match min.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max = 2;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-          getMaxFieldBuilder() {
-        if (maxBuilder_ == null) {
-          maxBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                  getMax(),
-                  getParentForChildren(),
-                  isClean());
-          max_ = null;
-        }
-        return maxBuilder_;
-      }
-
-      private com.google.privacy.dlp.v2beta1.Value replacementValue_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> replacementValueBuilder_;
-      /**
-       * 
-       * Replacement value for this bucket. If not provided
-       * the default behavior will be to hyphenate the min-max range.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-       */
-      public boolean hasReplacementValue() {
-        return replacementValueBuilder_ != null || replacementValue_ != null;
-      }
-      /**
-       * 
-       * Replacement value for this bucket. If not provided
-       * the default behavior will be to hyphenate the min-max range.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-       */
-      public com.google.privacy.dlp.v2beta1.Value getReplacementValue() {
-        if (replacementValueBuilder_ == null) {
-          return replacementValue_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : replacementValue_;
-        } else {
-          return replacementValueBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Replacement value for this bucket. If not provided
-       * the default behavior will be to hyphenate the min-max range.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-       */
-      public Builder setReplacementValue(com.google.privacy.dlp.v2beta1.Value value) {
-        if (replacementValueBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          replacementValue_ = value;
-          onChanged();
-        } else {
-          replacementValueBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Replacement value for this bucket. If not provided
-       * the default behavior will be to hyphenate the min-max range.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-       */
-      public Builder setReplacementValue(
-          com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-        if (replacementValueBuilder_ == null) {
-          replacementValue_ = builderForValue.build();
-          onChanged();
-        } else {
-          replacementValueBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Replacement value for this bucket. If not provided
-       * the default behavior will be to hyphenate the min-max range.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-       */
-      public Builder mergeReplacementValue(com.google.privacy.dlp.v2beta1.Value value) {
-        if (replacementValueBuilder_ == null) {
-          if (replacementValue_ != null) {
-            replacementValue_ =
-              com.google.privacy.dlp.v2beta1.Value.newBuilder(replacementValue_).mergeFrom(value).buildPartial();
-          } else {
-            replacementValue_ = value;
-          }
-          onChanged();
-        } else {
-          replacementValueBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Replacement value for this bucket. If not provided
-       * the default behavior will be to hyphenate the min-max range.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-       */
-      public Builder clearReplacementValue() {
-        if (replacementValueBuilder_ == null) {
-          replacementValue_ = null;
-          onChanged();
-        } else {
-          replacementValue_ = null;
-          replacementValueBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Replacement value for this bucket. If not provided
-       * the default behavior will be to hyphenate the min-max range.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-       */
-      public com.google.privacy.dlp.v2beta1.Value.Builder getReplacementValueBuilder() {
-        
-        onChanged();
-        return getReplacementValueFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Replacement value for this bucket. If not provided
-       * the default behavior will be to hyphenate the min-max range.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueOrBuilder getReplacementValueOrBuilder() {
-        if (replacementValueBuilder_ != null) {
-          return replacementValueBuilder_.getMessageOrBuilder();
-        } else {
-          return replacementValue_ == null ?
-              com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : replacementValue_;
-        }
-      }
-      /**
-       * 
-       * Replacement value for this bucket. If not provided
-       * the default behavior will be to hyphenate the min-max range.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value replacement_value = 3;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-          getReplacementValueFieldBuilder() {
-        if (replacementValueBuilder_ == null) {
-          replacementValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                  getReplacementValue(),
-                  getParentForChildren(),
-                  isClean());
-          replacementValue_ = null;
-        }
-        return replacementValueBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.BucketingConfig.Bucket)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.BucketingConfig.Bucket)
-    private static final com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public Bucket parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Bucket(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public static final int BUCKETS_FIELD_NUMBER = 1;
-  private java.util.List buckets_;
-  /**
-   * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-   */
-  public java.util.List getBucketsList() {
-    return buckets_;
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-   */
-  public java.util.List 
-      getBucketsOrBuilderList() {
-    return buckets_;
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-   */
-  public int getBucketsCount() {
-    return buckets_.size();
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket getBuckets(int index) {
-    return buckets_.get(index);
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.BucketingConfig.BucketOrBuilder getBucketsOrBuilder(
-      int index) {
-    return buckets_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < buckets_.size(); i++) {
-      output.writeMessage(1, buckets_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < buckets_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, buckets_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.BucketingConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.BucketingConfig other = (com.google.privacy.dlp.v2beta1.BucketingConfig) obj;
-
-    boolean result = true;
-    result = result && getBucketsList()
-        .equals(other.getBucketsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getBucketsCount() > 0) {
-      hash = (37 * hash) + BUCKETS_FIELD_NUMBER;
-      hash = (53 * hash) + getBucketsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.BucketingConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Generalization function that buckets values based on ranges. The ranges and
-   * replacement values are dynamically provided by the user for custom behavior,
-   * such as 1-30 -> LOW 31-65 -> MEDIUM 66-100 -> HIGH
-   * This can be used on
-   * data of type: number, long, string, timestamp.
-   * If the bound `Value` type differs from the type of data being transformed, we
-   * will first attempt converting the type of the data to be transformed to match
-   * the type of the bound before comparing.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.BucketingConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.BucketingConfig)
-      com.google.privacy.dlp.v2beta1.BucketingConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_BucketingConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_BucketingConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.BucketingConfig.class, com.google.privacy.dlp.v2beta1.BucketingConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.BucketingConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getBucketsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (bucketsBuilder_ == null) {
-        buckets_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        bucketsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_BucketingConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.BucketingConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.BucketingConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.BucketingConfig build() {
-      com.google.privacy.dlp.v2beta1.BucketingConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.BucketingConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.BucketingConfig result = new com.google.privacy.dlp.v2beta1.BucketingConfig(this);
-      int from_bitField0_ = bitField0_;
-      if (bucketsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          buckets_ = java.util.Collections.unmodifiableList(buckets_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.buckets_ = buckets_;
-      } else {
-        result.buckets_ = bucketsBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.BucketingConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.BucketingConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.BucketingConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.BucketingConfig.getDefaultInstance()) return this;
-      if (bucketsBuilder_ == null) {
-        if (!other.buckets_.isEmpty()) {
-          if (buckets_.isEmpty()) {
-            buckets_ = other.buckets_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureBucketsIsMutable();
-            buckets_.addAll(other.buckets_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.buckets_.isEmpty()) {
-          if (bucketsBuilder_.isEmpty()) {
-            bucketsBuilder_.dispose();
-            bucketsBuilder_ = null;
-            buckets_ = other.buckets_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            bucketsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getBucketsFieldBuilder() : null;
-          } else {
-            bucketsBuilder_.addAllMessages(other.buckets_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.BucketingConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.BucketingConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List buckets_ =
-      java.util.Collections.emptyList();
-    private void ensureBucketsIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        buckets_ = new java.util.ArrayList(buckets_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket, com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.Builder, com.google.privacy.dlp.v2beta1.BucketingConfig.BucketOrBuilder> bucketsBuilder_;
-
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public java.util.List getBucketsList() {
-      if (bucketsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(buckets_);
-      } else {
-        return bucketsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public int getBucketsCount() {
-      if (bucketsBuilder_ == null) {
-        return buckets_.size();
-      } else {
-        return bucketsBuilder_.getCount();
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket getBuckets(int index) {
-      if (bucketsBuilder_ == null) {
-        return buckets_.get(index);
-      } else {
-        return bucketsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public Builder setBuckets(
-        int index, com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket value) {
-      if (bucketsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureBucketsIsMutable();
-        buckets_.set(index, value);
-        onChanged();
-      } else {
-        bucketsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public Builder setBuckets(
-        int index, com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.Builder builderForValue) {
-      if (bucketsBuilder_ == null) {
-        ensureBucketsIsMutable();
-        buckets_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        bucketsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public Builder addBuckets(com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket value) {
-      if (bucketsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureBucketsIsMutable();
-        buckets_.add(value);
-        onChanged();
-      } else {
-        bucketsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public Builder addBuckets(
-        int index, com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket value) {
-      if (bucketsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureBucketsIsMutable();
-        buckets_.add(index, value);
-        onChanged();
-      } else {
-        bucketsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public Builder addBuckets(
-        com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.Builder builderForValue) {
-      if (bucketsBuilder_ == null) {
-        ensureBucketsIsMutable();
-        buckets_.add(builderForValue.build());
-        onChanged();
-      } else {
-        bucketsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public Builder addBuckets(
-        int index, com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.Builder builderForValue) {
-      if (bucketsBuilder_ == null) {
-        ensureBucketsIsMutable();
-        buckets_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        bucketsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public Builder addAllBuckets(
-        java.lang.Iterable values) {
-      if (bucketsBuilder_ == null) {
-        ensureBucketsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, buckets_);
-        onChanged();
-      } else {
-        bucketsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public Builder clearBuckets() {
-      if (bucketsBuilder_ == null) {
-        buckets_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        bucketsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public Builder removeBuckets(int index) {
-      if (bucketsBuilder_ == null) {
-        ensureBucketsIsMutable();
-        buckets_.remove(index);
-        onChanged();
-      } else {
-        bucketsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.Builder getBucketsBuilder(
-        int index) {
-      return getBucketsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.BucketingConfig.BucketOrBuilder getBucketsOrBuilder(
-        int index) {
-      if (bucketsBuilder_ == null) {
-        return buckets_.get(index);  } else {
-        return bucketsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public java.util.List 
-         getBucketsOrBuilderList() {
-      if (bucketsBuilder_ != null) {
-        return bucketsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(buckets_);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.Builder addBucketsBuilder() {
-      return getBucketsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.getDefaultInstance());
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.Builder addBucketsBuilder(
-        int index) {
-      return getBucketsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.getDefaultInstance());
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-     */
-    public java.util.List 
-         getBucketsBuilderList() {
-      return getBucketsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket, com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.Builder, com.google.privacy.dlp.v2beta1.BucketingConfig.BucketOrBuilder> 
-        getBucketsFieldBuilder() {
-      if (bucketsBuilder_ == null) {
-        bucketsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket, com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket.Builder, com.google.privacy.dlp.v2beta1.BucketingConfig.BucketOrBuilder>(
-                buckets_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        buckets_ = null;
-      }
-      return bucketsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.BucketingConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.BucketingConfig)
-  private static final com.google.privacy.dlp.v2beta1.BucketingConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.BucketingConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.BucketingConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public BucketingConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BucketingConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.BucketingConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BucketingConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BucketingConfigOrBuilder.java
deleted file mode 100644
index eac243bb490e..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/BucketingConfigOrBuilder.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface BucketingConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.BucketingConfig)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-   */
-  java.util.List 
-      getBucketsList();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-   */
-  com.google.privacy.dlp.v2beta1.BucketingConfig.Bucket getBuckets(int index);
-  /**
-   * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-   */
-  int getBucketsCount();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-   */
-  java.util.List 
-      getBucketsOrBuilderList();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.BucketingConfig.Bucket buckets = 1;
-   */
-  com.google.privacy.dlp.v2beta1.BucketingConfig.BucketOrBuilder getBucketsOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CategoryDescription.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CategoryDescription.java
deleted file mode 100644
index cc4060d1c136..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CategoryDescription.java
+++ /dev/null
@@ -1,707 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Info Type Category description.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.CategoryDescription}
- */
-public  final class CategoryDescription extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CategoryDescription)
-    CategoryDescriptionOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use CategoryDescription.newBuilder() to construct.
-  private CategoryDescription(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private CategoryDescription() {
-    name_ = "";
-    displayName_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private CategoryDescription(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            displayName_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CategoryDescription_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CategoryDescription_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.CategoryDescription.class, com.google.privacy.dlp.v2beta1.CategoryDescription.Builder.class);
-  }
-
-  public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
-  /**
-   * 
-   * Internal name of the category.
-   * 

-   *
-   * string name = 1;
-   */
-  public java.lang.String getName() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      name_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Internal name of the category.
-   * 

-   *
-   * string name = 1;
-   */
-  public com.google.protobuf.ByteString
-      getNameBytes() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      name_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
-  /**
-   * 
-   * Human readable form of the category name.
-   * 

-   *
-   * string display_name = 2;
-   */
-  public java.lang.String getDisplayName() {
-    java.lang.Object ref = displayName_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      displayName_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Human readable form of the category name.
-   * 

-   *
-   * string display_name = 2;
-   */
-  public com.google.protobuf.ByteString
-      getDisplayNameBytes() {
-    java.lang.Object ref = displayName_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      displayName_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
-    }
-    if (!getDisplayNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, displayName_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
-    }
-    if (!getDisplayNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, displayName_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.CategoryDescription)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.CategoryDescription other = (com.google.privacy.dlp.v2beta1.CategoryDescription) obj;
-
-    boolean result = true;
-    result = result && getName()
-        .equals(other.getName());
-    result = result && getDisplayName()
-        .equals(other.getDisplayName());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getName().hashCode();
-    hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getDisplayName().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CategoryDescription prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Info Type Category description.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CategoryDescription}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CategoryDescription)
-      com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CategoryDescription_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CategoryDescription_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CategoryDescription.class, com.google.privacy.dlp.v2beta1.CategoryDescription.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.CategoryDescription.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      name_ = "";
-
-      displayName_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CategoryDescription_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CategoryDescription getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.CategoryDescription.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.CategoryDescription build() {
-      com.google.privacy.dlp.v2beta1.CategoryDescription result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CategoryDescription buildPartial() {
-      com.google.privacy.dlp.v2beta1.CategoryDescription result = new com.google.privacy.dlp.v2beta1.CategoryDescription(this);
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.CategoryDescription) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.CategoryDescription)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CategoryDescription other) {
-      if (other == com.google.privacy.dlp.v2beta1.CategoryDescription.getDefaultInstance()) return this;
-      if (!other.getName().isEmpty()) {
-        name_ = other.name_;
-        onChanged();
-      }
-      if (!other.getDisplayName().isEmpty()) {
-        displayName_ = other.displayName_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.CategoryDescription parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.CategoryDescription) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object name_ = "";
-    /**
-     * 
-     * Internal name of the category.
-     * 

-     *
-     * string name = 1;
-     */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        name_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Internal name of the category.
-     * 

-     *
-     * string name = 1;
-     */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
-      java.lang.Object ref = name_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        name_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Internal name of the category.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder setName(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Internal name of the category.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder clearName() {
-      
-      name_ = getDefaultInstance().getName();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Internal name of the category.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder setNameBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      name_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object displayName_ = "";
-    /**
-     * 
-     * Human readable form of the category name.
-     * 

-     *
-     * string display_name = 2;
-     */
-    public java.lang.String getDisplayName() {
-      java.lang.Object ref = displayName_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        displayName_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Human readable form of the category name.
-     * 

-     *
-     * string display_name = 2;
-     */
-    public com.google.protobuf.ByteString
-        getDisplayNameBytes() {
-      java.lang.Object ref = displayName_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        displayName_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Human readable form of the category name.
-     * 

-     *
-     * string display_name = 2;
-     */
-    public Builder setDisplayName(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      displayName_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Human readable form of the category name.
-     * 

-     *
-     * string display_name = 2;
-     */
-    public Builder clearDisplayName() {
-      
-      displayName_ = getDefaultInstance().getDisplayName();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Human readable form of the category name.
-     * 

-     *
-     * string display_name = 2;
-     */
-    public Builder setDisplayNameBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      displayName_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CategoryDescription)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CategoryDescription)
-  private static final com.google.privacy.dlp.v2beta1.CategoryDescription DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CategoryDescription();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CategoryDescription getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public CategoryDescription parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CategoryDescription(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.CategoryDescription getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CategoryDescriptionOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CategoryDescriptionOrBuilder.java
deleted file mode 100644
index f4245e72dc48..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CategoryDescriptionOrBuilder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface CategoryDescriptionOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CategoryDescription)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Internal name of the category.
-   * 

-   *
-   * string name = 1;
-   */
-  java.lang.String getName();
-  /**
-   * 
-   * Internal name of the category.
-   * 

-   *
-   * string name = 1;
-   */
-  com.google.protobuf.ByteString
-      getNameBytes();
-
-  /**
-   * 
-   * Human readable form of the category name.
-   * 

-   *
-   * string display_name = 2;
-   */
-  java.lang.String getDisplayName();
-  /**
-   * 
-   * Human readable form of the category name.
-   * 

-   *
-   * string display_name = 2;
-   */
-  com.google.protobuf.ByteString
-      getDisplayNameBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharacterMaskConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharacterMaskConfig.java
deleted file mode 100644
index fe7578ab9c63..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharacterMaskConfig.java
+++ /dev/null
@@ -1,1238 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Partially mask a string by replacing a given number of characters with a
- * fixed character. Masking can start from the beginning or end of the string.
- * This can be used on data of any type (numbers, longs, and so on) and when
- * de-identifying structured data we'll attempt to preserve the original data's
- * type. (This allows you to take a long like 123 and modify it to a string like
- * **3.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.CharacterMaskConfig}
- */
-public  final class CharacterMaskConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CharacterMaskConfig)
-    CharacterMaskConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use CharacterMaskConfig.newBuilder() to construct.
-  private CharacterMaskConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private CharacterMaskConfig() {
-    maskingCharacter_ = "";
-    numberToMask_ = 0;
-    reverseOrder_ = false;
-    charactersToIgnore_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private CharacterMaskConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            maskingCharacter_ = s;
-            break;
-          }
-          case 16: {
-
-            numberToMask_ = input.readInt32();
-            break;
-          }
-          case 24: {
-
-            reverseOrder_ = input.readBool();
-            break;
-          }
-          case 34: {
-            if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-              charactersToIgnore_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000008;
-            }
-            charactersToIgnore_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.CharsToIgnore.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-        charactersToIgnore_ = java.util.Collections.unmodifiableList(charactersToIgnore_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CharacterMaskConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CharacterMaskConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.CharacterMaskConfig.class, com.google.privacy.dlp.v2beta1.CharacterMaskConfig.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int MASKING_CHARACTER_FIELD_NUMBER = 1;
-  private volatile java.lang.Object maskingCharacter_;
-  /**
-   * 
-   * Character to mask the sensitive values&mdash;for example, "*" for an
-   * alphabetic string such as name, or "0" for a numeric string such as ZIP
-   * code or credit card number. String must have length 1. If not supplied, we
-   * will default to "*" for strings, 0 for digits.
-   * 

-   *
-   * string masking_character = 1;
-   */
-  public java.lang.String getMaskingCharacter() {
-    java.lang.Object ref = maskingCharacter_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      maskingCharacter_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Character to mask the sensitive values&mdash;for example, "*" for an
-   * alphabetic string such as name, or "0" for a numeric string such as ZIP
-   * code or credit card number. String must have length 1. If not supplied, we
-   * will default to "*" for strings, 0 for digits.
-   * 

-   *
-   * string masking_character = 1;
-   */
-  public com.google.protobuf.ByteString
-      getMaskingCharacterBytes() {
-    java.lang.Object ref = maskingCharacter_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      maskingCharacter_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int NUMBER_TO_MASK_FIELD_NUMBER = 2;
-  private int numberToMask_;
-  /**
-   * 
-   * Number of characters to mask. If not set, all matching chars will be
-   * masked. Skipped characters do not count towards this tally.
-   * 

-   *
-   * int32 number_to_mask = 2;
-   */
-  public int getNumberToMask() {
-    return numberToMask_;
-  }
-
-  public static final int REVERSE_ORDER_FIELD_NUMBER = 3;
-  private boolean reverseOrder_;
-  /**
-   * 
-   * Mask characters in reverse order. For example, if `masking_character` is
-   * '0', number_to_mask is 14, and `reverse_order` is false, then
-   * 1234-5678-9012-3456 -> 00000000000000-3456
-   * If `masking_character` is '*', `number_to_mask` is 3, and `reverse_order`
-   * is true, then 12345 -> 12***
-   * 

-   *
-   * bool reverse_order = 3;
-   */
-  public boolean getReverseOrder() {
-    return reverseOrder_;
-  }
-
-  public static final int CHARACTERS_TO_IGNORE_FIELD_NUMBER = 4;
-  private java.util.List charactersToIgnore_;
-  /**
-   * 
-   * When masking a string, items in this list will be skipped when replacing.
-   * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-   * mask 5 chars with * we would produce ***-*55-5555.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-   */
-  public java.util.List getCharactersToIgnoreList() {
-    return charactersToIgnore_;
-  }
-  /**
-   * 
-   * When masking a string, items in this list will be skipped when replacing.
-   * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-   * mask 5 chars with * we would produce ***-*55-5555.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-   */
-  public java.util.List 
-      getCharactersToIgnoreOrBuilderList() {
-    return charactersToIgnore_;
-  }
-  /**
-   * 
-   * When masking a string, items in this list will be skipped when replacing.
-   * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-   * mask 5 chars with * we would produce ***-*55-5555.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-   */
-  public int getCharactersToIgnoreCount() {
-    return charactersToIgnore_.size();
-  }
-  /**
-   * 
-   * When masking a string, items in this list will be skipped when replacing.
-   * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-   * mask 5 chars with * we would produce ***-*55-5555.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.CharsToIgnore getCharactersToIgnore(int index) {
-    return charactersToIgnore_.get(index);
-  }
-  /**
-   * 
-   * When masking a string, items in this list will be skipped when replacing.
-   * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-   * mask 5 chars with * we would produce ***-*55-5555.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.CharsToIgnoreOrBuilder getCharactersToIgnoreOrBuilder(
-      int index) {
-    return charactersToIgnore_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getMaskingCharacterBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, maskingCharacter_);
-    }
-    if (numberToMask_ != 0) {
-      output.writeInt32(2, numberToMask_);
-    }
-    if (reverseOrder_ != false) {
-      output.writeBool(3, reverseOrder_);
-    }
-    for (int i = 0; i < charactersToIgnore_.size(); i++) {
-      output.writeMessage(4, charactersToIgnore_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getMaskingCharacterBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, maskingCharacter_);
-    }
-    if (numberToMask_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(2, numberToMask_);
-    }
-    if (reverseOrder_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(3, reverseOrder_);
-    }
-    for (int i = 0; i < charactersToIgnore_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, charactersToIgnore_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.CharacterMaskConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.CharacterMaskConfig other = (com.google.privacy.dlp.v2beta1.CharacterMaskConfig) obj;
-
-    boolean result = true;
-    result = result && getMaskingCharacter()
-        .equals(other.getMaskingCharacter());
-    result = result && (getNumberToMask()
-        == other.getNumberToMask());
-    result = result && (getReverseOrder()
-        == other.getReverseOrder());
-    result = result && getCharactersToIgnoreList()
-        .equals(other.getCharactersToIgnoreList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + MASKING_CHARACTER_FIELD_NUMBER;
-    hash = (53 * hash) + getMaskingCharacter().hashCode();
-    hash = (37 * hash) + NUMBER_TO_MASK_FIELD_NUMBER;
-    hash = (53 * hash) + getNumberToMask();
-    hash = (37 * hash) + REVERSE_ORDER_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getReverseOrder());
-    if (getCharactersToIgnoreCount() > 0) {
-      hash = (37 * hash) + CHARACTERS_TO_IGNORE_FIELD_NUMBER;
-      hash = (53 * hash) + getCharactersToIgnoreList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CharacterMaskConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Partially mask a string by replacing a given number of characters with a
-   * fixed character. Masking can start from the beginning or end of the string.
-   * This can be used on data of any type (numbers, longs, and so on) and when
-   * de-identifying structured data we'll attempt to preserve the original data's
-   * type. (This allows you to take a long like 123 and modify it to a string like
-   * **3.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CharacterMaskConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CharacterMaskConfig)
-      com.google.privacy.dlp.v2beta1.CharacterMaskConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CharacterMaskConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CharacterMaskConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CharacterMaskConfig.class, com.google.privacy.dlp.v2beta1.CharacterMaskConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.CharacterMaskConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getCharactersToIgnoreFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      maskingCharacter_ = "";
-
-      numberToMask_ = 0;
-
-      reverseOrder_ = false;
-
-      if (charactersToIgnoreBuilder_ == null) {
-        charactersToIgnore_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-      } else {
-        charactersToIgnoreBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CharacterMaskConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CharacterMaskConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.CharacterMaskConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.CharacterMaskConfig build() {
-      com.google.privacy.dlp.v2beta1.CharacterMaskConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CharacterMaskConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.CharacterMaskConfig result = new com.google.privacy.dlp.v2beta1.CharacterMaskConfig(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      result.maskingCharacter_ = maskingCharacter_;
-      result.numberToMask_ = numberToMask_;
-      result.reverseOrder_ = reverseOrder_;
-      if (charactersToIgnoreBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
-          charactersToIgnore_ = java.util.Collections.unmodifiableList(charactersToIgnore_);
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.charactersToIgnore_ = charactersToIgnore_;
-      } else {
-        result.charactersToIgnore_ = charactersToIgnoreBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.CharacterMaskConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.CharacterMaskConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CharacterMaskConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.CharacterMaskConfig.getDefaultInstance()) return this;
-      if (!other.getMaskingCharacter().isEmpty()) {
-        maskingCharacter_ = other.maskingCharacter_;
-        onChanged();
-      }
-      if (other.getNumberToMask() != 0) {
-        setNumberToMask(other.getNumberToMask());
-      }
-      if (other.getReverseOrder() != false) {
-        setReverseOrder(other.getReverseOrder());
-      }
-      if (charactersToIgnoreBuilder_ == null) {
-        if (!other.charactersToIgnore_.isEmpty()) {
-          if (charactersToIgnore_.isEmpty()) {
-            charactersToIgnore_ = other.charactersToIgnore_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            ensureCharactersToIgnoreIsMutable();
-            charactersToIgnore_.addAll(other.charactersToIgnore_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.charactersToIgnore_.isEmpty()) {
-          if (charactersToIgnoreBuilder_.isEmpty()) {
-            charactersToIgnoreBuilder_.dispose();
-            charactersToIgnoreBuilder_ = null;
-            charactersToIgnore_ = other.charactersToIgnore_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-            charactersToIgnoreBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getCharactersToIgnoreFieldBuilder() : null;
-          } else {
-            charactersToIgnoreBuilder_.addAllMessages(other.charactersToIgnore_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.CharacterMaskConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.CharacterMaskConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.lang.Object maskingCharacter_ = "";
-    /**
-     * 
-     * Character to mask the sensitive values&mdash;for example, "*" for an
-     * alphabetic string such as name, or "0" for a numeric string such as ZIP
-     * code or credit card number. String must have length 1. If not supplied, we
-     * will default to "*" for strings, 0 for digits.
-     * 

-     *
-     * string masking_character = 1;
-     */
-    public java.lang.String getMaskingCharacter() {
-      java.lang.Object ref = maskingCharacter_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        maskingCharacter_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Character to mask the sensitive values&mdash;for example, "*" for an
-     * alphabetic string such as name, or "0" for a numeric string such as ZIP
-     * code or credit card number. String must have length 1. If not supplied, we
-     * will default to "*" for strings, 0 for digits.
-     * 

-     *
-     * string masking_character = 1;
-     */
-    public com.google.protobuf.ByteString
-        getMaskingCharacterBytes() {
-      java.lang.Object ref = maskingCharacter_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        maskingCharacter_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Character to mask the sensitive values&mdash;for example, "*" for an
-     * alphabetic string such as name, or "0" for a numeric string such as ZIP
-     * code or credit card number. String must have length 1. If not supplied, we
-     * will default to "*" for strings, 0 for digits.
-     * 

-     *
-     * string masking_character = 1;
-     */
-    public Builder setMaskingCharacter(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      maskingCharacter_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Character to mask the sensitive values&mdash;for example, "*" for an
-     * alphabetic string such as name, or "0" for a numeric string such as ZIP
-     * code or credit card number. String must have length 1. If not supplied, we
-     * will default to "*" for strings, 0 for digits.
-     * 

-     *
-     * string masking_character = 1;
-     */
-    public Builder clearMaskingCharacter() {
-      
-      maskingCharacter_ = getDefaultInstance().getMaskingCharacter();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Character to mask the sensitive values&mdash;for example, "*" for an
-     * alphabetic string such as name, or "0" for a numeric string such as ZIP
-     * code or credit card number. String must have length 1. If not supplied, we
-     * will default to "*" for strings, 0 for digits.
-     * 

-     *
-     * string masking_character = 1;
-     */
-    public Builder setMaskingCharacterBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      maskingCharacter_ = value;
-      onChanged();
-      return this;
-    }
-
-    private int numberToMask_ ;
-    /**
-     * 
-     * Number of characters to mask. If not set, all matching chars will be
-     * masked. Skipped characters do not count towards this tally.
-     * 

-     *
-     * int32 number_to_mask = 2;
-     */
-    public int getNumberToMask() {
-      return numberToMask_;
-    }
-    /**
-     * 
-     * Number of characters to mask. If not set, all matching chars will be
-     * masked. Skipped characters do not count towards this tally.
-     * 

-     *
-     * int32 number_to_mask = 2;
-     */
-    public Builder setNumberToMask(int value) {
-      
-      numberToMask_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Number of characters to mask. If not set, all matching chars will be
-     * masked. Skipped characters do not count towards this tally.
-     * 

-     *
-     * int32 number_to_mask = 2;
-     */
-    public Builder clearNumberToMask() {
-      
-      numberToMask_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private boolean reverseOrder_ ;
-    /**
-     * 
-     * Mask characters in reverse order. For example, if `masking_character` is
-     * '0', number_to_mask is 14, and `reverse_order` is false, then
-     * 1234-5678-9012-3456 -> 00000000000000-3456
-     * If `masking_character` is '*', `number_to_mask` is 3, and `reverse_order`
-     * is true, then 12345 -> 12***
-     * 

-     *
-     * bool reverse_order = 3;
-     */
-    public boolean getReverseOrder() {
-      return reverseOrder_;
-    }
-    /**
-     * 
-     * Mask characters in reverse order. For example, if `masking_character` is
-     * '0', number_to_mask is 14, and `reverse_order` is false, then
-     * 1234-5678-9012-3456 -> 00000000000000-3456
-     * If `masking_character` is '*', `number_to_mask` is 3, and `reverse_order`
-     * is true, then 12345 -> 12***
-     * 

-     *
-     * bool reverse_order = 3;
-     */
-    public Builder setReverseOrder(boolean value) {
-      
-      reverseOrder_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Mask characters in reverse order. For example, if `masking_character` is
-     * '0', number_to_mask is 14, and `reverse_order` is false, then
-     * 1234-5678-9012-3456 -> 00000000000000-3456
-     * If `masking_character` is '*', `number_to_mask` is 3, and `reverse_order`
-     * is true, then 12345 -> 12***
-     * 

-     *
-     * bool reverse_order = 3;
-     */
-    public Builder clearReverseOrder() {
-      
-      reverseOrder_ = false;
-      onChanged();
-      return this;
-    }
-
-    private java.util.List charactersToIgnore_ =
-      java.util.Collections.emptyList();
-    private void ensureCharactersToIgnoreIsMutable() {
-      if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-        charactersToIgnore_ = new java.util.ArrayList(charactersToIgnore_);
-        bitField0_ |= 0x00000008;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CharsToIgnore, com.google.privacy.dlp.v2beta1.CharsToIgnore.Builder, com.google.privacy.dlp.v2beta1.CharsToIgnoreOrBuilder> charactersToIgnoreBuilder_;
-
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public java.util.List getCharactersToIgnoreList() {
-      if (charactersToIgnoreBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(charactersToIgnore_);
-      } else {
-        return charactersToIgnoreBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public int getCharactersToIgnoreCount() {
-      if (charactersToIgnoreBuilder_ == null) {
-        return charactersToIgnore_.size();
-      } else {
-        return charactersToIgnoreBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.CharsToIgnore getCharactersToIgnore(int index) {
-      if (charactersToIgnoreBuilder_ == null) {
-        return charactersToIgnore_.get(index);
-      } else {
-        return charactersToIgnoreBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public Builder setCharactersToIgnore(
-        int index, com.google.privacy.dlp.v2beta1.CharsToIgnore value) {
-      if (charactersToIgnoreBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureCharactersToIgnoreIsMutable();
-        charactersToIgnore_.set(index, value);
-        onChanged();
-      } else {
-        charactersToIgnoreBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public Builder setCharactersToIgnore(
-        int index, com.google.privacy.dlp.v2beta1.CharsToIgnore.Builder builderForValue) {
-      if (charactersToIgnoreBuilder_ == null) {
-        ensureCharactersToIgnoreIsMutable();
-        charactersToIgnore_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        charactersToIgnoreBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public Builder addCharactersToIgnore(com.google.privacy.dlp.v2beta1.CharsToIgnore value) {
-      if (charactersToIgnoreBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureCharactersToIgnoreIsMutable();
-        charactersToIgnore_.add(value);
-        onChanged();
-      } else {
-        charactersToIgnoreBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public Builder addCharactersToIgnore(
-        int index, com.google.privacy.dlp.v2beta1.CharsToIgnore value) {
-      if (charactersToIgnoreBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureCharactersToIgnoreIsMutable();
-        charactersToIgnore_.add(index, value);
-        onChanged();
-      } else {
-        charactersToIgnoreBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public Builder addCharactersToIgnore(
-        com.google.privacy.dlp.v2beta1.CharsToIgnore.Builder builderForValue) {
-      if (charactersToIgnoreBuilder_ == null) {
-        ensureCharactersToIgnoreIsMutable();
-        charactersToIgnore_.add(builderForValue.build());
-        onChanged();
-      } else {
-        charactersToIgnoreBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public Builder addCharactersToIgnore(
-        int index, com.google.privacy.dlp.v2beta1.CharsToIgnore.Builder builderForValue) {
-      if (charactersToIgnoreBuilder_ == null) {
-        ensureCharactersToIgnoreIsMutable();
-        charactersToIgnore_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        charactersToIgnoreBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public Builder addAllCharactersToIgnore(
-        java.lang.Iterable values) {
-      if (charactersToIgnoreBuilder_ == null) {
-        ensureCharactersToIgnoreIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, charactersToIgnore_);
-        onChanged();
-      } else {
-        charactersToIgnoreBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public Builder clearCharactersToIgnore() {
-      if (charactersToIgnoreBuilder_ == null) {
-        charactersToIgnore_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-        onChanged();
-      } else {
-        charactersToIgnoreBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public Builder removeCharactersToIgnore(int index) {
-      if (charactersToIgnoreBuilder_ == null) {
-        ensureCharactersToIgnoreIsMutable();
-        charactersToIgnore_.remove(index);
-        onChanged();
-      } else {
-        charactersToIgnoreBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.CharsToIgnore.Builder getCharactersToIgnoreBuilder(
-        int index) {
-      return getCharactersToIgnoreFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.CharsToIgnoreOrBuilder getCharactersToIgnoreOrBuilder(
-        int index) {
-      if (charactersToIgnoreBuilder_ == null) {
-        return charactersToIgnore_.get(index);  } else {
-        return charactersToIgnoreBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public java.util.List 
-         getCharactersToIgnoreOrBuilderList() {
-      if (charactersToIgnoreBuilder_ != null) {
-        return charactersToIgnoreBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(charactersToIgnore_);
-      }
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.CharsToIgnore.Builder addCharactersToIgnoreBuilder() {
-      return getCharactersToIgnoreFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.CharsToIgnore.getDefaultInstance());
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.CharsToIgnore.Builder addCharactersToIgnoreBuilder(
-        int index) {
-      return getCharactersToIgnoreFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.CharsToIgnore.getDefaultInstance());
-    }
-    /**
-     * 
-     * When masking a string, items in this list will be skipped when replacing.
-     * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-     * mask 5 chars with * we would produce ***-*55-5555.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-     */
-    public java.util.List 
-         getCharactersToIgnoreBuilderList() {
-      return getCharactersToIgnoreFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CharsToIgnore, com.google.privacy.dlp.v2beta1.CharsToIgnore.Builder, com.google.privacy.dlp.v2beta1.CharsToIgnoreOrBuilder> 
-        getCharactersToIgnoreFieldBuilder() {
-      if (charactersToIgnoreBuilder_ == null) {
-        charactersToIgnoreBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CharsToIgnore, com.google.privacy.dlp.v2beta1.CharsToIgnore.Builder, com.google.privacy.dlp.v2beta1.CharsToIgnoreOrBuilder>(
-                charactersToIgnore_,
-                ((bitField0_ & 0x00000008) == 0x00000008),
-                getParentForChildren(),
-                isClean());
-        charactersToIgnore_ = null;
-      }
-      return charactersToIgnoreBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CharacterMaskConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CharacterMaskConfig)
-  private static final com.google.privacy.dlp.v2beta1.CharacterMaskConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CharacterMaskConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CharacterMaskConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public CharacterMaskConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CharacterMaskConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.CharacterMaskConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharacterMaskConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharacterMaskConfigOrBuilder.java
deleted file mode 100644
index 263da697c011..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharacterMaskConfigOrBuilder.java
+++ /dev/null
@@ -1,110 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface CharacterMaskConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CharacterMaskConfig)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Character to mask the sensitive values&mdash;for example, "*" for an
-   * alphabetic string such as name, or "0" for a numeric string such as ZIP
-   * code or credit card number. String must have length 1. If not supplied, we
-   * will default to "*" for strings, 0 for digits.
-   * 

-   *
-   * string masking_character = 1;
-   */
-  java.lang.String getMaskingCharacter();
-  /**
-   * 
-   * Character to mask the sensitive values&mdash;for example, "*" for an
-   * alphabetic string such as name, or "0" for a numeric string such as ZIP
-   * code or credit card number. String must have length 1. If not supplied, we
-   * will default to "*" for strings, 0 for digits.
-   * 

-   *
-   * string masking_character = 1;
-   */
-  com.google.protobuf.ByteString
-      getMaskingCharacterBytes();
-
-  /**
-   * 
-   * Number of characters to mask. If not set, all matching chars will be
-   * masked. Skipped characters do not count towards this tally.
-   * 

-   *
-   * int32 number_to_mask = 2;
-   */
-  int getNumberToMask();
-
-  /**
-   * 
-   * Mask characters in reverse order. For example, if `masking_character` is
-   * '0', number_to_mask is 14, and `reverse_order` is false, then
-   * 1234-5678-9012-3456 -> 00000000000000-3456
-   * If `masking_character` is '*', `number_to_mask` is 3, and `reverse_order`
-   * is true, then 12345 -> 12***
-   * 

-   *
-   * bool reverse_order = 3;
-   */
-  boolean getReverseOrder();
-
-  /**
-   * 
-   * When masking a string, items in this list will be skipped when replacing.
-   * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-   * mask 5 chars with * we would produce ***-*55-5555.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-   */
-  java.util.List 
-      getCharactersToIgnoreList();
-  /**
-   * 
-   * When masking a string, items in this list will be skipped when replacing.
-   * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-   * mask 5 chars with * we would produce ***-*55-5555.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-   */
-  com.google.privacy.dlp.v2beta1.CharsToIgnore getCharactersToIgnore(int index);
-  /**
-   * 
-   * When masking a string, items in this list will be skipped when replacing.
-   * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-   * mask 5 chars with * we would produce ***-*55-5555.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-   */
-  int getCharactersToIgnoreCount();
-  /**
-   * 
-   * When masking a string, items in this list will be skipped when replacing.
-   * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-   * mask 5 chars with * we would produce ***-*55-5555.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-   */
-  java.util.List 
-      getCharactersToIgnoreOrBuilderList();
-  /**
-   * 
-   * When masking a string, items in this list will be skipped when replacing.
-   * For example, if your string is 555-555-5555 and you ask us to skip `-` and
-   * mask 5 chars with * we would produce ***-*55-5555.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CharsToIgnore characters_to_ignore = 4;
-   */
-  com.google.privacy.dlp.v2beta1.CharsToIgnoreOrBuilder getCharactersToIgnoreOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharsToIgnore.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharsToIgnore.java
deleted file mode 100644
index 7b2472f28ebe..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharsToIgnore.java
+++ /dev/null
@@ -1,900 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Characters to skip when doing deidentification of a value. These will be left
- * alone and skipped.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.CharsToIgnore}
- */
-public  final class CharsToIgnore extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CharsToIgnore)
-    CharsToIgnoreOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use CharsToIgnore.newBuilder() to construct.
-  private CharsToIgnore(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private CharsToIgnore() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private CharsToIgnore(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-            charactersCase_ = 1;
-            characters_ = s;
-            break;
-          }
-          case 16: {
-            int rawValue = input.readEnum();
-            charactersCase_ = 2;
-            characters_ = rawValue;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CharsToIgnore_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CharsToIgnore_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.CharsToIgnore.class, com.google.privacy.dlp.v2beta1.CharsToIgnore.Builder.class);
-  }
-
-  /**
-   * Protobuf enum {@code google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup}
-   */
-  public enum CharacterGroup
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * CHARACTER_GROUP_UNSPECIFIED = 0;
-     */
-    CHARACTER_GROUP_UNSPECIFIED(0),
-    /**
-     * 
-     * 0-9
-     * 

-     *
-     * NUMERIC = 1;
-     */
-    NUMERIC(1),
-    /**
-     * 
-     * A-Z
-     * 

-     *
-     * ALPHA_UPPER_CASE = 2;
-     */
-    ALPHA_UPPER_CASE(2),
-    /**
-     * 
-     * a-z
-     * 

-     *
-     * ALPHA_LOWER_CASE = 3;
-     */
-    ALPHA_LOWER_CASE(3),
-    /**
-     * 
-     * US Punctuation, one of !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
-     * 

-     *
-     * PUNCTUATION = 4;
-     */
-    PUNCTUATION(4),
-    /**
-     * 
-     * Whitespace character, one of [ \t\n\x0B\f\r]
-     * 

-     *
-     * WHITESPACE = 5;
-     */
-    WHITESPACE(5),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * CHARACTER_GROUP_UNSPECIFIED = 0;
-     */
-    public static final int CHARACTER_GROUP_UNSPECIFIED_VALUE = 0;
-    /**
-     * 
-     * 0-9
-     * 

-     *
-     * NUMERIC = 1;
-     */
-    public static final int NUMERIC_VALUE = 1;
-    /**
-     * 
-     * A-Z
-     * 

-     *
-     * ALPHA_UPPER_CASE = 2;
-     */
-    public static final int ALPHA_UPPER_CASE_VALUE = 2;
-    /**
-     * 
-     * a-z
-     * 

-     *
-     * ALPHA_LOWER_CASE = 3;
-     */
-    public static final int ALPHA_LOWER_CASE_VALUE = 3;
-    /**
-     * 
-     * US Punctuation, one of !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
-     * 

-     *
-     * PUNCTUATION = 4;
-     */
-    public static final int PUNCTUATION_VALUE = 4;
-    /**
-     * 
-     * Whitespace character, one of [ \t\n\x0B\f\r]
-     * 

-     *
-     * WHITESPACE = 5;
-     */
-    public static final int WHITESPACE_VALUE = 5;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static CharacterGroup valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static CharacterGroup forNumber(int value) {
-      switch (value) {
-        case 0: return CHARACTER_GROUP_UNSPECIFIED;
-        case 1: return NUMERIC;
-        case 2: return ALPHA_UPPER_CASE;
-        case 3: return ALPHA_LOWER_CASE;
-        case 4: return PUNCTUATION;
-        case 5: return WHITESPACE;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        CharacterGroup> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap() {
-            public CharacterGroup findValueByNumber(int number) {
-              return CharacterGroup.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.CharsToIgnore.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final CharacterGroup[] VALUES = values();
-
-    public static CharacterGroup valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private CharacterGroup(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup)
-  }
-
-  private int charactersCase_ = 0;
-  private java.lang.Object characters_;
-  public enum CharactersCase
-      implements com.google.protobuf.Internal.EnumLite {
-    CHARACTERS_TO_SKIP(1),
-    COMMON_CHARACTERS_TO_IGNORE(2),
-    CHARACTERS_NOT_SET(0);
-    private final int value;
-    private CharactersCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static CharactersCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static CharactersCase forNumber(int value) {
-      switch (value) {
-        case 1: return CHARACTERS_TO_SKIP;
-        case 2: return COMMON_CHARACTERS_TO_IGNORE;
-        case 0: return CHARACTERS_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public CharactersCase
-  getCharactersCase() {
-    return CharactersCase.forNumber(
-        charactersCase_);
-  }
-
-  public static final int CHARACTERS_TO_SKIP_FIELD_NUMBER = 1;
-  /**
-   * string characters_to_skip = 1;
-   */
-  public java.lang.String getCharactersToSkip() {
-    java.lang.Object ref = "";
-    if (charactersCase_ == 1) {
-      ref = characters_;
-    }
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      if (charactersCase_ == 1) {
-        characters_ = s;
-      }
-      return s;
-    }
-  }
-  /**
-   * string characters_to_skip = 1;
-   */
-  public com.google.protobuf.ByteString
-      getCharactersToSkipBytes() {
-    java.lang.Object ref = "";
-    if (charactersCase_ == 1) {
-      ref = characters_;
-    }
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      if (charactersCase_ == 1) {
-        characters_ = b;
-      }
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int COMMON_CHARACTERS_TO_IGNORE_FIELD_NUMBER = 2;
-  /**
-   * .google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup common_characters_to_ignore = 2;
-   */
-  public int getCommonCharactersToIgnoreValue() {
-    if (charactersCase_ == 2) {
-      return (java.lang.Integer) characters_;
-    }
-    return 0;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup common_characters_to_ignore = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup getCommonCharactersToIgnore() {
-    if (charactersCase_ == 2) {
-      com.google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup result = com.google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup.valueOf(
-          (java.lang.Integer) characters_);
-      return result == null ? com.google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup.UNRECOGNIZED : result;
-    }
-    return com.google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup.CHARACTER_GROUP_UNSPECIFIED;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (charactersCase_ == 1) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, characters_);
-    }
-    if (charactersCase_ == 2) {
-      output.writeEnum(2, ((java.lang.Integer) characters_));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (charactersCase_ == 1) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, characters_);
-    }
-    if (charactersCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(2, ((java.lang.Integer) characters_));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.CharsToIgnore)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.CharsToIgnore other = (com.google.privacy.dlp.v2beta1.CharsToIgnore) obj;
-
-    boolean result = true;
-    result = result && getCharactersCase().equals(
-        other.getCharactersCase());
-    if (!result) return false;
-    switch (charactersCase_) {
-      case 1:
-        result = result && getCharactersToSkip()
-            .equals(other.getCharactersToSkip());
-        break;
-      case 2:
-        result = result && getCommonCharactersToIgnoreValue()
-            == other.getCommonCharactersToIgnoreValue();
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    switch (charactersCase_) {
-      case 1:
-        hash = (37 * hash) + CHARACTERS_TO_SKIP_FIELD_NUMBER;
-        hash = (53 * hash) + getCharactersToSkip().hashCode();
-        break;
-      case 2:
-        hash = (37 * hash) + COMMON_CHARACTERS_TO_IGNORE_FIELD_NUMBER;
-        hash = (53 * hash) + getCommonCharactersToIgnoreValue();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CharsToIgnore prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Characters to skip when doing deidentification of a value. These will be left
-   * alone and skipped.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CharsToIgnore}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CharsToIgnore)
-      com.google.privacy.dlp.v2beta1.CharsToIgnoreOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CharsToIgnore_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CharsToIgnore_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CharsToIgnore.class, com.google.privacy.dlp.v2beta1.CharsToIgnore.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.CharsToIgnore.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      charactersCase_ = 0;
-      characters_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CharsToIgnore_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CharsToIgnore getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.CharsToIgnore.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.CharsToIgnore build() {
-      com.google.privacy.dlp.v2beta1.CharsToIgnore result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CharsToIgnore buildPartial() {
-      com.google.privacy.dlp.v2beta1.CharsToIgnore result = new com.google.privacy.dlp.v2beta1.CharsToIgnore(this);
-      if (charactersCase_ == 1) {
-        result.characters_ = characters_;
-      }
-      if (charactersCase_ == 2) {
-        result.characters_ = characters_;
-      }
-      result.charactersCase_ = charactersCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.CharsToIgnore) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.CharsToIgnore)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CharsToIgnore other) {
-      if (other == com.google.privacy.dlp.v2beta1.CharsToIgnore.getDefaultInstance()) return this;
-      switch (other.getCharactersCase()) {
-        case CHARACTERS_TO_SKIP: {
-          charactersCase_ = 1;
-          characters_ = other.characters_;
-          onChanged();
-          break;
-        }
-        case COMMON_CHARACTERS_TO_IGNORE: {
-          setCommonCharactersToIgnoreValue(other.getCommonCharactersToIgnoreValue());
-          break;
-        }
-        case CHARACTERS_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.CharsToIgnore parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.CharsToIgnore) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int charactersCase_ = 0;
-    private java.lang.Object characters_;
-    public CharactersCase
-        getCharactersCase() {
-      return CharactersCase.forNumber(
-          charactersCase_);
-    }
-
-    public Builder clearCharacters() {
-      charactersCase_ = 0;
-      characters_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    /**
-     * string characters_to_skip = 1;
-     */
-    public java.lang.String getCharactersToSkip() {
-      java.lang.Object ref = "";
-      if (charactersCase_ == 1) {
-        ref = characters_;
-      }
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (charactersCase_ == 1) {
-          characters_ = s;
-        }
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * string characters_to_skip = 1;
-     */
-    public com.google.protobuf.ByteString
-        getCharactersToSkipBytes() {
-      java.lang.Object ref = "";
-      if (charactersCase_ == 1) {
-        ref = characters_;
-      }
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        if (charactersCase_ == 1) {
-          characters_ = b;
-        }
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * string characters_to_skip = 1;
-     */
-    public Builder setCharactersToSkip(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  charactersCase_ = 1;
-      characters_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * string characters_to_skip = 1;
-     */
-    public Builder clearCharactersToSkip() {
-      if (charactersCase_ == 1) {
-        charactersCase_ = 0;
-        characters_ = null;
-        onChanged();
-      }
-      return this;
-    }
-    /**
-     * string characters_to_skip = 1;
-     */
-    public Builder setCharactersToSkipBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      charactersCase_ = 1;
-      characters_ = value;
-      onChanged();
-      return this;
-    }
-
-    /**
-     * .google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup common_characters_to_ignore = 2;
-     */
-    public int getCommonCharactersToIgnoreValue() {
-      if (charactersCase_ == 2) {
-        return ((java.lang.Integer) characters_).intValue();
-      }
-      return 0;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup common_characters_to_ignore = 2;
-     */
-    public Builder setCommonCharactersToIgnoreValue(int value) {
-      charactersCase_ = 2;
-      characters_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup common_characters_to_ignore = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup getCommonCharactersToIgnore() {
-      if (charactersCase_ == 2) {
-        com.google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup result = com.google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup.valueOf(
-            (java.lang.Integer) characters_);
-        return result == null ? com.google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup.UNRECOGNIZED : result;
-      }
-      return com.google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup.CHARACTER_GROUP_UNSPECIFIED;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup common_characters_to_ignore = 2;
-     */
-    public Builder setCommonCharactersToIgnore(com.google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      charactersCase_ = 2;
-      characters_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup common_characters_to_ignore = 2;
-     */
-    public Builder clearCommonCharactersToIgnore() {
-      if (charactersCase_ == 2) {
-        charactersCase_ = 0;
-        characters_ = null;
-        onChanged();
-      }
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CharsToIgnore)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CharsToIgnore)
-  private static final com.google.privacy.dlp.v2beta1.CharsToIgnore DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CharsToIgnore();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CharsToIgnore getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public CharsToIgnore parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CharsToIgnore(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.CharsToIgnore getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharsToIgnoreOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharsToIgnoreOrBuilder.java
deleted file mode 100644
index f1cffae2daf2..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CharsToIgnoreOrBuilder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface CharsToIgnoreOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CharsToIgnore)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * string characters_to_skip = 1;
-   */
-  java.lang.String getCharactersToSkip();
-  /**
-   * string characters_to_skip = 1;
-   */
-  com.google.protobuf.ByteString
-      getCharactersToSkipBytes();
-
-  /**
-   * .google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup common_characters_to_ignore = 2;
-   */
-  int getCommonCharactersToIgnoreValue();
-  /**
-   * .google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup common_characters_to_ignore = 2;
-   */
-  com.google.privacy.dlp.v2beta1.CharsToIgnore.CharacterGroup getCommonCharactersToIgnore();
-
-  public com.google.privacy.dlp.v2beta1.CharsToIgnore.CharactersCase getCharactersCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageKeyOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageKeyOrBuilder.java
deleted file mode 100644
index 21d3ae3f8f26..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageKeyOrBuilder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface CloudStorageKeyOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CloudStorageKey)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Path to the file.
-   * 

-   *
-   * string file_path = 1;
-   */
-  java.lang.String getFilePath();
-  /**
-   * 
-   * Path to the file.
-   * 

-   *
-   * string file_path = 1;
-   */
-  com.google.protobuf.ByteString
-      getFilePathBytes();
-
-  /**
-   * 
-   * Byte offset of the referenced data in the file.
-   * 

-   *
-   * int64 start_offset = 2;
-   */
-  long getStartOffset();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageOptions.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageOptions.java
deleted file mode 100644
index 4f79576f82d8..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageOptions.java
+++ /dev/null
@@ -1,1158 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Options defining a file or a set of files (path ending with *) within
- * a Google Cloud Storage bucket.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.CloudStorageOptions}
- */
-public  final class CloudStorageOptions extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CloudStorageOptions)
-    CloudStorageOptionsOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use CloudStorageOptions.newBuilder() to construct.
-  private CloudStorageOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private CloudStorageOptions() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private CloudStorageOptions(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.Builder subBuilder = null;
-            if (fileSet_ != null) {
-              subBuilder = fileSet_.toBuilder();
-            }
-            fileSet_ = input.readMessage(com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(fileSet_);
-              fileSet_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.CloudStorageOptions.class, com.google.privacy.dlp.v2beta1.CloudStorageOptions.Builder.class);
-  }
-
-  public interface FileSetOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
-     * path is allowed.
-     * 

-     *
-     * string url = 1;
-     */
-    java.lang.String getUrl();
-    /**
-     * 
-     * The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
-     * path is allowed.
-     * 

-     *
-     * string url = 1;
-     */
-    com.google.protobuf.ByteString
-        getUrlBytes();
-  }
-  /**
-   * 
-   * Set of files to scan.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet}
-   */
-  public  static final class FileSet extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet)
-      FileSetOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use FileSet.newBuilder() to construct.
-    private FileSet(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private FileSet() {
-      url_ = "";
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private FileSet(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              url_ = s;
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_FileSet_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_FileSet_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.class, com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.Builder.class);
-    }
-
-    public static final int URL_FIELD_NUMBER = 1;
-    private volatile java.lang.Object url_;
-    /**
-     * 
-     * The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
-     * path is allowed.
-     * 

-     *
-     * string url = 1;
-     */
-    public java.lang.String getUrl() {
-      java.lang.Object ref = url_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        url_ = s;
-        return s;
-      }
-    }
-    /**
-     * 
-     * The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
-     * path is allowed.
-     * 

-     *
-     * string url = 1;
-     */
-    public com.google.protobuf.ByteString
-        getUrlBytes() {
-      java.lang.Object ref = url_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        url_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (!getUrlBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, url_);
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (!getUrlBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, url_);
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet other = (com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet) obj;
-
-      boolean result = true;
-      result = result && getUrl()
-          .equals(other.getUrl());
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + URL_FIELD_NUMBER;
-      hash = (53 * hash) + getUrl().hashCode();
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Set of files to scan.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet)
-        com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSetOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_FileSet_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_FileSet_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.class, com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        url_ = "";
-
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_FileSet_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet build() {
-        com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet buildPartial() {
-        com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet result = new com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet(this);
-        result.url_ = url_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet other) {
-        if (other == com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.getDefaultInstance()) return this;
-        if (!other.getUrl().isEmpty()) {
-          url_ = other.url_;
-          onChanged();
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private java.lang.Object url_ = "";
-      /**
-       * 
-       * The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
-       * path is allowed.
-       * 

-       *
-       * string url = 1;
-       */
-      public java.lang.String getUrl() {
-        java.lang.Object ref = url_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          url_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * 
-       * The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
-       * path is allowed.
-       * 

-       *
-       * string url = 1;
-       */
-      public com.google.protobuf.ByteString
-          getUrlBytes() {
-        java.lang.Object ref = url_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          url_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * 
-       * The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
-       * path is allowed.
-       * 

-       *
-       * string url = 1;
-       */
-      public Builder setUrl(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        url_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
-       * path is allowed.
-       * 

-       *
-       * string url = 1;
-       */
-      public Builder clearUrl() {
-        
-        url_ = getDefaultInstance().getUrl();
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The url, in the format `gs://<bucket>/<path>`. Trailing wildcard in the
-       * path is allowed.
-       * 

-       *
-       * string url = 1;
-       */
-      public Builder setUrlBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        url_ = value;
-        onChanged();
-        return this;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet)
-    private static final com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public FileSet parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FileSet(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public static final int FILE_SET_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet fileSet_;
-  /**
-   * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-   */
-  public boolean hasFileSet() {
-    return fileSet_ != null;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet getFileSet() {
-    return fileSet_ == null ? com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.getDefaultInstance() : fileSet_;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSetOrBuilder getFileSetOrBuilder() {
-    return getFileSet();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (fileSet_ != null) {
-      output.writeMessage(1, getFileSet());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (fileSet_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getFileSet());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.CloudStorageOptions)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.CloudStorageOptions other = (com.google.privacy.dlp.v2beta1.CloudStorageOptions) obj;
-
-    boolean result = true;
-    result = result && (hasFileSet() == other.hasFileSet());
-    if (hasFileSet()) {
-      result = result && getFileSet()
-          .equals(other.getFileSet());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasFileSet()) {
-      hash = (37 * hash) + FILE_SET_FIELD_NUMBER;
-      hash = (53 * hash) + getFileSet().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CloudStorageOptions prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Options defining a file or a set of files (path ending with *) within
-   * a Google Cloud Storage bucket.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CloudStorageOptions}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CloudStorageOptions)
-      com.google.privacy.dlp.v2beta1.CloudStorageOptionsOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CloudStorageOptions.class, com.google.privacy.dlp.v2beta1.CloudStorageOptions.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.CloudStorageOptions.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (fileSetBuilder_ == null) {
-        fileSet_ = null;
-      } else {
-        fileSet_ = null;
-        fileSetBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CloudStorageOptions getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.CloudStorageOptions.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.CloudStorageOptions build() {
-      com.google.privacy.dlp.v2beta1.CloudStorageOptions result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CloudStorageOptions buildPartial() {
-      com.google.privacy.dlp.v2beta1.CloudStorageOptions result = new com.google.privacy.dlp.v2beta1.CloudStorageOptions(this);
-      if (fileSetBuilder_ == null) {
-        result.fileSet_ = fileSet_;
-      } else {
-        result.fileSet_ = fileSetBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.CloudStorageOptions) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.CloudStorageOptions)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CloudStorageOptions other) {
-      if (other == com.google.privacy.dlp.v2beta1.CloudStorageOptions.getDefaultInstance()) return this;
-      if (other.hasFileSet()) {
-        mergeFileSet(other.getFileSet());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.CloudStorageOptions parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.CloudStorageOptions) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet fileSet_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet, com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.Builder, com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSetOrBuilder> fileSetBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-     */
-    public boolean hasFileSet() {
-      return fileSetBuilder_ != null || fileSet_ != null;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet getFileSet() {
-      if (fileSetBuilder_ == null) {
-        return fileSet_ == null ? com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.getDefaultInstance() : fileSet_;
-      } else {
-        return fileSetBuilder_.getMessage();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-     */
-    public Builder setFileSet(com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet value) {
-      if (fileSetBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        fileSet_ = value;
-        onChanged();
-      } else {
-        fileSetBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-     */
-    public Builder setFileSet(
-        com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.Builder builderForValue) {
-      if (fileSetBuilder_ == null) {
-        fileSet_ = builderForValue.build();
-        onChanged();
-      } else {
-        fileSetBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-     */
-    public Builder mergeFileSet(com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet value) {
-      if (fileSetBuilder_ == null) {
-        if (fileSet_ != null) {
-          fileSet_ =
-            com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.newBuilder(fileSet_).mergeFrom(value).buildPartial();
-        } else {
-          fileSet_ = value;
-        }
-        onChanged();
-      } else {
-        fileSetBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-     */
-    public Builder clearFileSet() {
-      if (fileSetBuilder_ == null) {
-        fileSet_ = null;
-        onChanged();
-      } else {
-        fileSet_ = null;
-        fileSetBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.Builder getFileSetBuilder() {
-      
-      onChanged();
-      return getFileSetFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSetOrBuilder getFileSetOrBuilder() {
-      if (fileSetBuilder_ != null) {
-        return fileSetBuilder_.getMessageOrBuilder();
-      } else {
-        return fileSet_ == null ?
-            com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.getDefaultInstance() : fileSet_;
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet, com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.Builder, com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSetOrBuilder> 
-        getFileSetFieldBuilder() {
-      if (fileSetBuilder_ == null) {
-        fileSetBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet, com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet.Builder, com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSetOrBuilder>(
-                getFileSet(),
-                getParentForChildren(),
-                isClean());
-        fileSet_ = null;
-      }
-      return fileSetBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CloudStorageOptions)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CloudStorageOptions)
-  private static final com.google.privacy.dlp.v2beta1.CloudStorageOptions DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CloudStorageOptions();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CloudStorageOptions getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public CloudStorageOptions parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CloudStorageOptions(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.CloudStorageOptions getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageOptionsOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageOptionsOrBuilder.java
deleted file mode 100644
index e0d893925e67..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStorageOptionsOrBuilder.java
+++ /dev/null
@@ -1,22 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface CloudStorageOptionsOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CloudStorageOptions)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-   */
-  boolean hasFileSet();
-  /**
-   * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-   */
-  com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet getFileSet();
-  /**
-   * .google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet file_set = 1;
-   */
-  com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSetOrBuilder getFileSetOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStoragePath.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStoragePath.java
deleted file mode 100644
index c03e01ecae3d..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStoragePath.java
+++ /dev/null
@@ -1,552 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * A location in Cloud Storage.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.CloudStoragePath}
- */
-public  final class CloudStoragePath extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CloudStoragePath)
-    CloudStoragePathOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use CloudStoragePath.newBuilder() to construct.
-  private CloudStoragePath(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private CloudStoragePath() {
-    path_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private CloudStoragePath(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            path_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStoragePath_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStoragePath_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.CloudStoragePath.class, com.google.privacy.dlp.v2beta1.CloudStoragePath.Builder.class);
-  }
-
-  public static final int PATH_FIELD_NUMBER = 1;
-  private volatile java.lang.Object path_;
-  /**
-   * 
-   * The url, in the format of `gs://bucket/<path>`.
-   * 

-   *
-   * string path = 1;
-   */
-  public java.lang.String getPath() {
-    java.lang.Object ref = path_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      path_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * The url, in the format of `gs://bucket/<path>`.
-   * 

-   *
-   * string path = 1;
-   */
-  public com.google.protobuf.ByteString
-      getPathBytes() {
-    java.lang.Object ref = path_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      path_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getPathBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, path_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getPathBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, path_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.CloudStoragePath)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.CloudStoragePath other = (com.google.privacy.dlp.v2beta1.CloudStoragePath) obj;
-
-    boolean result = true;
-    result = result && getPath()
-        .equals(other.getPath());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + PATH_FIELD_NUMBER;
-    hash = (53 * hash) + getPath().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CloudStoragePath prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * A location in Cloud Storage.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CloudStoragePath}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CloudStoragePath)
-      com.google.privacy.dlp.v2beta1.CloudStoragePathOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStoragePath_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStoragePath_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CloudStoragePath.class, com.google.privacy.dlp.v2beta1.CloudStoragePath.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.CloudStoragePath.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      path_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStoragePath_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CloudStoragePath getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.CloudStoragePath.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.CloudStoragePath build() {
-      com.google.privacy.dlp.v2beta1.CloudStoragePath result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CloudStoragePath buildPartial() {
-      com.google.privacy.dlp.v2beta1.CloudStoragePath result = new com.google.privacy.dlp.v2beta1.CloudStoragePath(this);
-      result.path_ = path_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.CloudStoragePath) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.CloudStoragePath)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CloudStoragePath other) {
-      if (other == com.google.privacy.dlp.v2beta1.CloudStoragePath.getDefaultInstance()) return this;
-      if (!other.getPath().isEmpty()) {
-        path_ = other.path_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.CloudStoragePath parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.CloudStoragePath) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object path_ = "";
-    /**
-     * 
-     * The url, in the format of `gs://bucket/<path>`.
-     * 

-     *
-     * string path = 1;
-     */
-    public java.lang.String getPath() {
-      java.lang.Object ref = path_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        path_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * The url, in the format of `gs://bucket/<path>`.
-     * 

-     *
-     * string path = 1;
-     */
-    public com.google.protobuf.ByteString
-        getPathBytes() {
-      java.lang.Object ref = path_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        path_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * The url, in the format of `gs://bucket/<path>`.
-     * 

-     *
-     * string path = 1;
-     */
-    public Builder setPath(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      path_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The url, in the format of `gs://bucket/<path>`.
-     * 

-     *
-     * string path = 1;
-     */
-    public Builder clearPath() {
-      
-      path_ = getDefaultInstance().getPath();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The url, in the format of `gs://bucket/<path>`.
-     * 

-     *
-     * string path = 1;
-     */
-    public Builder setPathBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      path_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CloudStoragePath)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CloudStoragePath)
-  private static final com.google.privacy.dlp.v2beta1.CloudStoragePath DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CloudStoragePath();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CloudStoragePath getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public CloudStoragePath parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CloudStoragePath(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.CloudStoragePath getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStoragePathOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStoragePathOrBuilder.java
deleted file mode 100644
index 6217a87da394..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CloudStoragePathOrBuilder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface CloudStoragePathOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CloudStoragePath)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The url, in the format of `gs://bucket/<path>`.
-   * 

-   *
-   * string path = 1;
-   */
-  java.lang.String getPath();
-  /**
-   * 
-   * The url, in the format of `gs://bucket/<path>`.
-   * 

-   *
-   * string path = 1;
-   */
-  com.google.protobuf.ByteString
-      getPathBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Color.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Color.java
deleted file mode 100644
index 8d7836712f1c..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Color.java
+++ /dev/null
@@ -1,628 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Represents a color in the RGB color space.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.Color}
- */
-public  final class Color extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.Color)
-    ColorOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Color.newBuilder() to construct.
-  private Color(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private Color() {
-    red_ = 0F;
-    green_ = 0F;
-    blue_ = 0F;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Color(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 13: {
-
-            red_ = input.readFloat();
-            break;
-          }
-          case 21: {
-
-            green_ = input.readFloat();
-            break;
-          }
-          case 29: {
-
-            blue_ = input.readFloat();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Color_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Color_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.Color.class, com.google.privacy.dlp.v2beta1.Color.Builder.class);
-  }
-
-  public static final int RED_FIELD_NUMBER = 1;
-  private float red_;
-  /**
-   * 
-   * The amount of red in the color as a value in the interval [0, 1].
-   * 

-   *
-   * float red = 1;
-   */
-  public float getRed() {
-    return red_;
-  }
-
-  public static final int GREEN_FIELD_NUMBER = 2;
-  private float green_;
-  /**
-   * 
-   * The amount of green in the color as a value in the interval [0, 1].
-   * 

-   *
-   * float green = 2;
-   */
-  public float getGreen() {
-    return green_;
-  }
-
-  public static final int BLUE_FIELD_NUMBER = 3;
-  private float blue_;
-  /**
-   * 
-   * The amount of blue in the color as a value in the interval [0, 1].
-   * 

-   *
-   * float blue = 3;
-   */
-  public float getBlue() {
-    return blue_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (red_ != 0F) {
-      output.writeFloat(1, red_);
-    }
-    if (green_ != 0F) {
-      output.writeFloat(2, green_);
-    }
-    if (blue_ != 0F) {
-      output.writeFloat(3, blue_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (red_ != 0F) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeFloatSize(1, red_);
-    }
-    if (green_ != 0F) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeFloatSize(2, green_);
-    }
-    if (blue_ != 0F) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeFloatSize(3, blue_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.Color)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.Color other = (com.google.privacy.dlp.v2beta1.Color) obj;
-
-    boolean result = true;
-    result = result && (
-        java.lang.Float.floatToIntBits(getRed())
-        == java.lang.Float.floatToIntBits(
-            other.getRed()));
-    result = result && (
-        java.lang.Float.floatToIntBits(getGreen())
-        == java.lang.Float.floatToIntBits(
-            other.getGreen()));
-    result = result && (
-        java.lang.Float.floatToIntBits(getBlue())
-        == java.lang.Float.floatToIntBits(
-            other.getBlue()));
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + RED_FIELD_NUMBER;
-    hash = (53 * hash) + java.lang.Float.floatToIntBits(
-        getRed());
-    hash = (37 * hash) + GREEN_FIELD_NUMBER;
-    hash = (53 * hash) + java.lang.Float.floatToIntBits(
-        getGreen());
-    hash = (37 * hash) + BLUE_FIELD_NUMBER;
-    hash = (53 * hash) + java.lang.Float.floatToIntBits(
-        getBlue());
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Color parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Color parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Color parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Color parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Color parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Color parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Color parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Color parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Color parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Color parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Color parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Color parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.Color prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Represents a color in the RGB color space.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.Color}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.Color)
-      com.google.privacy.dlp.v2beta1.ColorOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Color_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Color_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.Color.class, com.google.privacy.dlp.v2beta1.Color.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.Color.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      red_ = 0F;
-
-      green_ = 0F;
-
-      blue_ = 0F;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Color_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Color getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.Color.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.Color build() {
-      com.google.privacy.dlp.v2beta1.Color result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Color buildPartial() {
-      com.google.privacy.dlp.v2beta1.Color result = new com.google.privacy.dlp.v2beta1.Color(this);
-      result.red_ = red_;
-      result.green_ = green_;
-      result.blue_ = blue_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.Color) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.Color)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.Color other) {
-      if (other == com.google.privacy.dlp.v2beta1.Color.getDefaultInstance()) return this;
-      if (other.getRed() != 0F) {
-        setRed(other.getRed());
-      }
-      if (other.getGreen() != 0F) {
-        setGreen(other.getGreen());
-      }
-      if (other.getBlue() != 0F) {
-        setBlue(other.getBlue());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.Color parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.Color) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private float red_ ;
-    /**
-     * 
-     * The amount of red in the color as a value in the interval [0, 1].
-     * 

-     *
-     * float red = 1;
-     */
-    public float getRed() {
-      return red_;
-    }
-    /**
-     * 
-     * The amount of red in the color as a value in the interval [0, 1].
-     * 

-     *
-     * float red = 1;
-     */
-    public Builder setRed(float value) {
-      
-      red_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The amount of red in the color as a value in the interval [0, 1].
-     * 

-     *
-     * float red = 1;
-     */
-    public Builder clearRed() {
-      
-      red_ = 0F;
-      onChanged();
-      return this;
-    }
-
-    private float green_ ;
-    /**
-     * 
-     * The amount of green in the color as a value in the interval [0, 1].
-     * 

-     *
-     * float green = 2;
-     */
-    public float getGreen() {
-      return green_;
-    }
-    /**
-     * 
-     * The amount of green in the color as a value in the interval [0, 1].
-     * 

-     *
-     * float green = 2;
-     */
-    public Builder setGreen(float value) {
-      
-      green_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The amount of green in the color as a value in the interval [0, 1].
-     * 

-     *
-     * float green = 2;
-     */
-    public Builder clearGreen() {
-      
-      green_ = 0F;
-      onChanged();
-      return this;
-    }
-
-    private float blue_ ;
-    /**
-     * 
-     * The amount of blue in the color as a value in the interval [0, 1].
-     * 

-     *
-     * float blue = 3;
-     */
-    public float getBlue() {
-      return blue_;
-    }
-    /**
-     * 
-     * The amount of blue in the color as a value in the interval [0, 1].
-     * 

-     *
-     * float blue = 3;
-     */
-    public Builder setBlue(float value) {
-      
-      blue_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The amount of blue in the color as a value in the interval [0, 1].
-     * 

-     *
-     * float blue = 3;
-     */
-    public Builder clearBlue() {
-      
-      blue_ = 0F;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.Color)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.Color)
-  private static final com.google.privacy.dlp.v2beta1.Color DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.Color();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Color getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public Color parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Color(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.Color getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ColorOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ColorOrBuilder.java
deleted file mode 100644
index 94c856a417ff..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ColorOrBuilder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ColorOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.Color)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The amount of red in the color as a value in the interval [0, 1].
-   * 

-   *
-   * float red = 1;
-   */
-  float getRed();
-
-  /**
-   * 
-   * The amount of green in the color as a value in the interval [0, 1].
-   * 

-   *
-   * float green = 2;
-   */
-  float getGreen();
-
-  /**
-   * 
-   * The amount of blue in the color as a value in the interval [0, 1].
-   * 

-   *
-   * float blue = 3;
-   */
-  float getBlue();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ContentItem.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ContentItem.java
deleted file mode 100644
index 7fd2012b8806..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ContentItem.java
+++ /dev/null
@@ -1,1159 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Container structure for the content to inspect.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.ContentItem}
- */
-public  final class ContentItem extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.ContentItem)
-    ContentItemOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ContentItem.newBuilder() to construct.
-  private ContentItem(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private ContentItem() {
-    type_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ContentItem(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            type_ = s;
-            break;
-          }
-          case 18: {
-            dataItemCase_ = 2;
-            dataItem_ = input.readBytes();
-            break;
-          }
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-            dataItemCase_ = 3;
-            dataItem_ = s;
-            break;
-          }
-          case 34: {
-            com.google.privacy.dlp.v2beta1.Table.Builder subBuilder = null;
-            if (dataItemCase_ == 4) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.Table) dataItem_).toBuilder();
-            }
-            dataItem_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.Table.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.Table) dataItem_);
-              dataItem_ = subBuilder.buildPartial();
-            }
-            dataItemCase_ = 4;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ContentItem_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ContentItem_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.ContentItem.class, com.google.privacy.dlp.v2beta1.ContentItem.Builder.class);
-  }
-
-  private int dataItemCase_ = 0;
-  private java.lang.Object dataItem_;
-  public enum DataItemCase
-      implements com.google.protobuf.Internal.EnumLite {
-    DATA(2),
-    VALUE(3),
-    TABLE(4),
-    DATAITEM_NOT_SET(0);
-    private final int value;
-    private DataItemCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static DataItemCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static DataItemCase forNumber(int value) {
-      switch (value) {
-        case 2: return DATA;
-        case 3: return VALUE;
-        case 4: return TABLE;
-        case 0: return DATAITEM_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public DataItemCase
-  getDataItemCase() {
-    return DataItemCase.forNumber(
-        dataItemCase_);
-  }
-
-  public static final int TYPE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object type_;
-  /**
-   * 
-   * Type of the content, as defined in Content-Type HTTP header.
-   * Supported types are: all "text" types, octet streams, PNG images,
-   * JPEG images.
-   * 

-   *
-   * string type = 1;
-   */
-  public java.lang.String getType() {
-    java.lang.Object ref = type_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      type_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Type of the content, as defined in Content-Type HTTP header.
-   * Supported types are: all "text" types, octet streams, PNG images,
-   * JPEG images.
-   * 

-   *
-   * string type = 1;
-   */
-  public com.google.protobuf.ByteString
-      getTypeBytes() {
-    java.lang.Object ref = type_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      type_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int DATA_FIELD_NUMBER = 2;
-  /**
-   * 
-   * Content data to inspect or redact.
-   * 

-   *
-   * bytes data = 2;
-   */
-  public com.google.protobuf.ByteString getData() {
-    if (dataItemCase_ == 2) {
-      return (com.google.protobuf.ByteString) dataItem_;
-    }
-    return com.google.protobuf.ByteString.EMPTY;
-  }
-
-  public static final int VALUE_FIELD_NUMBER = 3;
-  /**
-   * 
-   * String data to inspect or redact.
-   * 

-   *
-   * string value = 3;
-   */
-  public java.lang.String getValue() {
-    java.lang.Object ref = "";
-    if (dataItemCase_ == 3) {
-      ref = dataItem_;
-    }
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      if (dataItemCase_ == 3) {
-        dataItem_ = s;
-      }
-      return s;
-    }
-  }
-  /**
-   * 
-   * String data to inspect or redact.
-   * 

-   *
-   * string value = 3;
-   */
-  public com.google.protobuf.ByteString
-      getValueBytes() {
-    java.lang.Object ref = "";
-    if (dataItemCase_ == 3) {
-      ref = dataItem_;
-    }
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      if (dataItemCase_ == 3) {
-        dataItem_ = b;
-      }
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int TABLE_FIELD_NUMBER = 4;
-  /**
-   * 
-   * Structured content for inspection.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Table table = 4;
-   */
-  public boolean hasTable() {
-    return dataItemCase_ == 4;
-  }
-  /**
-   * 
-   * Structured content for inspection.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Table table = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.Table getTable() {
-    if (dataItemCase_ == 4) {
-       return (com.google.privacy.dlp.v2beta1.Table) dataItem_;
-    }
-    return com.google.privacy.dlp.v2beta1.Table.getDefaultInstance();
-  }
-  /**
-   * 
-   * Structured content for inspection.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Table table = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.TableOrBuilder getTableOrBuilder() {
-    if (dataItemCase_ == 4) {
-       return (com.google.privacy.dlp.v2beta1.Table) dataItem_;
-    }
-    return com.google.privacy.dlp.v2beta1.Table.getDefaultInstance();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getTypeBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, type_);
-    }
-    if (dataItemCase_ == 2) {
-      output.writeBytes(
-          2, (com.google.protobuf.ByteString) dataItem_);
-    }
-    if (dataItemCase_ == 3) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, dataItem_);
-    }
-    if (dataItemCase_ == 4) {
-      output.writeMessage(4, (com.google.privacy.dlp.v2beta1.Table) dataItem_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getTypeBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, type_);
-    }
-    if (dataItemCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(
-            2, (com.google.protobuf.ByteString) dataItem_);
-    }
-    if (dataItemCase_ == 3) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, dataItem_);
-    }
-    if (dataItemCase_ == 4) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, (com.google.privacy.dlp.v2beta1.Table) dataItem_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.ContentItem)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.ContentItem other = (com.google.privacy.dlp.v2beta1.ContentItem) obj;
-
-    boolean result = true;
-    result = result && getType()
-        .equals(other.getType());
-    result = result && getDataItemCase().equals(
-        other.getDataItemCase());
-    if (!result) return false;
-    switch (dataItemCase_) {
-      case 2:
-        result = result && getData()
-            .equals(other.getData());
-        break;
-      case 3:
-        result = result && getValue()
-            .equals(other.getValue());
-        break;
-      case 4:
-        result = result && getTable()
-            .equals(other.getTable());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + TYPE_FIELD_NUMBER;
-    hash = (53 * hash) + getType().hashCode();
-    switch (dataItemCase_) {
-      case 2:
-        hash = (37 * hash) + DATA_FIELD_NUMBER;
-        hash = (53 * hash) + getData().hashCode();
-        break;
-      case 3:
-        hash = (37 * hash) + VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + getValue().hashCode();
-        break;
-      case 4:
-        hash = (37 * hash) + TABLE_FIELD_NUMBER;
-        hash = (53 * hash) + getTable().hashCode();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ContentItem parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ContentItem parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ContentItem parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ContentItem parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ContentItem parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ContentItem parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ContentItem parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ContentItem parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ContentItem parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ContentItem parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ContentItem parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ContentItem parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.ContentItem prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Container structure for the content to inspect.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.ContentItem}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.ContentItem)
-      com.google.privacy.dlp.v2beta1.ContentItemOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ContentItem_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ContentItem_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.ContentItem.class, com.google.privacy.dlp.v2beta1.ContentItem.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.ContentItem.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      type_ = "";
-
-      dataItemCase_ = 0;
-      dataItem_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ContentItem_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ContentItem getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.ContentItem.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.ContentItem build() {
-      com.google.privacy.dlp.v2beta1.ContentItem result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ContentItem buildPartial() {
-      com.google.privacy.dlp.v2beta1.ContentItem result = new com.google.privacy.dlp.v2beta1.ContentItem(this);
-      result.type_ = type_;
-      if (dataItemCase_ == 2) {
-        result.dataItem_ = dataItem_;
-      }
-      if (dataItemCase_ == 3) {
-        result.dataItem_ = dataItem_;
-      }
-      if (dataItemCase_ == 4) {
-        if (tableBuilder_ == null) {
-          result.dataItem_ = dataItem_;
-        } else {
-          result.dataItem_ = tableBuilder_.build();
-        }
-      }
-      result.dataItemCase_ = dataItemCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.ContentItem) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.ContentItem)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.ContentItem other) {
-      if (other == com.google.privacy.dlp.v2beta1.ContentItem.getDefaultInstance()) return this;
-      if (!other.getType().isEmpty()) {
-        type_ = other.type_;
-        onChanged();
-      }
-      switch (other.getDataItemCase()) {
-        case DATA: {
-          setData(other.getData());
-          break;
-        }
-        case VALUE: {
-          dataItemCase_ = 3;
-          dataItem_ = other.dataItem_;
-          onChanged();
-          break;
-        }
-        case TABLE: {
-          mergeTable(other.getTable());
-          break;
-        }
-        case DATAITEM_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.ContentItem parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.ContentItem) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int dataItemCase_ = 0;
-    private java.lang.Object dataItem_;
-    public DataItemCase
-        getDataItemCase() {
-      return DataItemCase.forNumber(
-          dataItemCase_);
-    }
-
-    public Builder clearDataItem() {
-      dataItemCase_ = 0;
-      dataItem_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    private java.lang.Object type_ = "";
-    /**
-     * 
-     * Type of the content, as defined in Content-Type HTTP header.
-     * Supported types are: all "text" types, octet streams, PNG images,
-     * JPEG images.
-     * 

-     *
-     * string type = 1;
-     */
-    public java.lang.String getType() {
-      java.lang.Object ref = type_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        type_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Type of the content, as defined in Content-Type HTTP header.
-     * Supported types are: all "text" types, octet streams, PNG images,
-     * JPEG images.
-     * 

-     *
-     * string type = 1;
-     */
-    public com.google.protobuf.ByteString
-        getTypeBytes() {
-      java.lang.Object ref = type_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        type_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Type of the content, as defined in Content-Type HTTP header.
-     * Supported types are: all "text" types, octet streams, PNG images,
-     * JPEG images.
-     * 

-     *
-     * string type = 1;
-     */
-    public Builder setType(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      type_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Type of the content, as defined in Content-Type HTTP header.
-     * Supported types are: all "text" types, octet streams, PNG images,
-     * JPEG images.
-     * 

-     *
-     * string type = 1;
-     */
-    public Builder clearType() {
-      
-      type_ = getDefaultInstance().getType();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Type of the content, as defined in Content-Type HTTP header.
-     * Supported types are: all "text" types, octet streams, PNG images,
-     * JPEG images.
-     * 

-     *
-     * string type = 1;
-     */
-    public Builder setTypeBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      type_ = value;
-      onChanged();
-      return this;
-    }
-
-    /**
-     * 
-     * Content data to inspect or redact.
-     * 

-     *
-     * bytes data = 2;
-     */
-    public com.google.protobuf.ByteString getData() {
-      if (dataItemCase_ == 2) {
-        return (com.google.protobuf.ByteString) dataItem_;
-      }
-      return com.google.protobuf.ByteString.EMPTY;
-    }
-    /**
-     * 
-     * Content data to inspect or redact.
-     * 

-     *
-     * bytes data = 2;
-     */
-    public Builder setData(com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  dataItemCase_ = 2;
-      dataItem_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Content data to inspect or redact.
-     * 

-     *
-     * bytes data = 2;
-     */
-    public Builder clearData() {
-      if (dataItemCase_ == 2) {
-        dataItemCase_ = 0;
-        dataItem_ = null;
-        onChanged();
-      }
-      return this;
-    }
-
-    /**
-     * 
-     * String data to inspect or redact.
-     * 

-     *
-     * string value = 3;
-     */
-    public java.lang.String getValue() {
-      java.lang.Object ref = "";
-      if (dataItemCase_ == 3) {
-        ref = dataItem_;
-      }
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (dataItemCase_ == 3) {
-          dataItem_ = s;
-        }
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * String data to inspect or redact.
-     * 

-     *
-     * string value = 3;
-     */
-    public com.google.protobuf.ByteString
-        getValueBytes() {
-      java.lang.Object ref = "";
-      if (dataItemCase_ == 3) {
-        ref = dataItem_;
-      }
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        if (dataItemCase_ == 3) {
-          dataItem_ = b;
-        }
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * String data to inspect or redact.
-     * 

-     *
-     * string value = 3;
-     */
-    public Builder setValue(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  dataItemCase_ = 3;
-      dataItem_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * String data to inspect or redact.
-     * 

-     *
-     * string value = 3;
-     */
-    public Builder clearValue() {
-      if (dataItemCase_ == 3) {
-        dataItemCase_ = 0;
-        dataItem_ = null;
-        onChanged();
-      }
-      return this;
-    }
-    /**
-     * 
-     * String data to inspect or redact.
-     * 

-     *
-     * string value = 3;
-     */
-    public Builder setValueBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      dataItemCase_ = 3;
-      dataItem_ = value;
-      onChanged();
-      return this;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Table, com.google.privacy.dlp.v2beta1.Table.Builder, com.google.privacy.dlp.v2beta1.TableOrBuilder> tableBuilder_;
-    /**
-     * 
-     * Structured content for inspection.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Table table = 4;
-     */
-    public boolean hasTable() {
-      return dataItemCase_ == 4;
-    }
-    /**
-     * 
-     * Structured content for inspection.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Table table = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.Table getTable() {
-      if (tableBuilder_ == null) {
-        if (dataItemCase_ == 4) {
-          return (com.google.privacy.dlp.v2beta1.Table) dataItem_;
-        }
-        return com.google.privacy.dlp.v2beta1.Table.getDefaultInstance();
-      } else {
-        if (dataItemCase_ == 4) {
-          return tableBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.Table.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Structured content for inspection.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Table table = 4;
-     */
-    public Builder setTable(com.google.privacy.dlp.v2beta1.Table value) {
-      if (tableBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        dataItem_ = value;
-        onChanged();
-      } else {
-        tableBuilder_.setMessage(value);
-      }
-      dataItemCase_ = 4;
-      return this;
-    }
-    /**
-     * 
-     * Structured content for inspection.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Table table = 4;
-     */
-    public Builder setTable(
-        com.google.privacy.dlp.v2beta1.Table.Builder builderForValue) {
-      if (tableBuilder_ == null) {
-        dataItem_ = builderForValue.build();
-        onChanged();
-      } else {
-        tableBuilder_.setMessage(builderForValue.build());
-      }
-      dataItemCase_ = 4;
-      return this;
-    }
-    /**
-     * 
-     * Structured content for inspection.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Table table = 4;
-     */
-    public Builder mergeTable(com.google.privacy.dlp.v2beta1.Table value) {
-      if (tableBuilder_ == null) {
-        if (dataItemCase_ == 4 &&
-            dataItem_ != com.google.privacy.dlp.v2beta1.Table.getDefaultInstance()) {
-          dataItem_ = com.google.privacy.dlp.v2beta1.Table.newBuilder((com.google.privacy.dlp.v2beta1.Table) dataItem_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          dataItem_ = value;
-        }
-        onChanged();
-      } else {
-        if (dataItemCase_ == 4) {
-          tableBuilder_.mergeFrom(value);
-        }
-        tableBuilder_.setMessage(value);
-      }
-      dataItemCase_ = 4;
-      return this;
-    }
-    /**
-     * 
-     * Structured content for inspection.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Table table = 4;
-     */
-    public Builder clearTable() {
-      if (tableBuilder_ == null) {
-        if (dataItemCase_ == 4) {
-          dataItemCase_ = 0;
-          dataItem_ = null;
-          onChanged();
-        }
-      } else {
-        if (dataItemCase_ == 4) {
-          dataItemCase_ = 0;
-          dataItem_ = null;
-        }
-        tableBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Structured content for inspection.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Table table = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.Table.Builder getTableBuilder() {
-      return getTableFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Structured content for inspection.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Table table = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.TableOrBuilder getTableOrBuilder() {
-      if ((dataItemCase_ == 4) && (tableBuilder_ != null)) {
-        return tableBuilder_.getMessageOrBuilder();
-      } else {
-        if (dataItemCase_ == 4) {
-          return (com.google.privacy.dlp.v2beta1.Table) dataItem_;
-        }
-        return com.google.privacy.dlp.v2beta1.Table.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Structured content for inspection.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Table table = 4;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Table, com.google.privacy.dlp.v2beta1.Table.Builder, com.google.privacy.dlp.v2beta1.TableOrBuilder> 
-        getTableFieldBuilder() {
-      if (tableBuilder_ == null) {
-        if (!(dataItemCase_ == 4)) {
-          dataItem_ = com.google.privacy.dlp.v2beta1.Table.getDefaultInstance();
-        }
-        tableBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Table, com.google.privacy.dlp.v2beta1.Table.Builder, com.google.privacy.dlp.v2beta1.TableOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.Table) dataItem_,
-                getParentForChildren(),
-                isClean());
-        dataItem_ = null;
-      }
-      dataItemCase_ = 4;
-      onChanged();;
-      return tableBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.ContentItem)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.ContentItem)
-  private static final com.google.privacy.dlp.v2beta1.ContentItem DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.ContentItem();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ContentItem getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public ContentItem parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ContentItem(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.ContentItem getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ContentItemOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ContentItemOrBuilder.java
deleted file mode 100644
index 19942f13f610..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ContentItemOrBuilder.java
+++ /dev/null
@@ -1,85 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ContentItemOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.ContentItem)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Type of the content, as defined in Content-Type HTTP header.
-   * Supported types are: all "text" types, octet streams, PNG images,
-   * JPEG images.
-   * 

-   *
-   * string type = 1;
-   */
-  java.lang.String getType();
-  /**
-   * 
-   * Type of the content, as defined in Content-Type HTTP header.
-   * Supported types are: all "text" types, octet streams, PNG images,
-   * JPEG images.
-   * 

-   *
-   * string type = 1;
-   */
-  com.google.protobuf.ByteString
-      getTypeBytes();
-
-  /**
-   * 
-   * Content data to inspect or redact.
-   * 

-   *
-   * bytes data = 2;
-   */
-  com.google.protobuf.ByteString getData();
-
-  /**
-   * 
-   * String data to inspect or redact.
-   * 

-   *
-   * string value = 3;
-   */
-  java.lang.String getValue();
-  /**
-   * 
-   * String data to inspect or redact.
-   * 

-   *
-   * string value = 3;
-   */
-  com.google.protobuf.ByteString
-      getValueBytes();
-
-  /**
-   * 
-   * Structured content for inspection.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Table table = 4;
-   */
-  boolean hasTable();
-  /**
-   * 
-   * Structured content for inspection.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Table table = 4;
-   */
-  com.google.privacy.dlp.v2beta1.Table getTable();
-  /**
-   * 
-   * Structured content for inspection.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Table table = 4;
-   */
-  com.google.privacy.dlp.v2beta1.TableOrBuilder getTableOrBuilder();
-
-  public com.google.privacy.dlp.v2beta1.ContentItem.DataItemCase getDataItemCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CreateInspectOperationRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CreateInspectOperationRequest.java
deleted file mode 100644
index 1b9f3c826f40..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CreateInspectOperationRequest.java
+++ /dev/null
@@ -1,1315 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Request for scheduling a scan of a data subset from a Google Platform data
- * repository.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.CreateInspectOperationRequest}
- */
-public  final class CreateInspectOperationRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CreateInspectOperationRequest)
-    CreateInspectOperationRequestOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use CreateInspectOperationRequest.newBuilder() to construct.
-  private CreateInspectOperationRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private CreateInspectOperationRequest() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private CreateInspectOperationRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.InspectConfig.Builder subBuilder = null;
-            if (inspectConfig_ != null) {
-              subBuilder = inspectConfig_.toBuilder();
-            }
-            inspectConfig_ = input.readMessage(com.google.privacy.dlp.v2beta1.InspectConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(inspectConfig_);
-              inspectConfig_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.StorageConfig.Builder subBuilder = null;
-            if (storageConfig_ != null) {
-              subBuilder = storageConfig_.toBuilder();
-            }
-            storageConfig_ = input.readMessage(com.google.privacy.dlp.v2beta1.StorageConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(storageConfig_);
-              storageConfig_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 26: {
-            com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder subBuilder = null;
-            if (outputConfig_ != null) {
-              subBuilder = outputConfig_.toBuilder();
-            }
-            outputConfig_ = input.readMessage(com.google.privacy.dlp.v2beta1.OutputStorageConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(outputConfig_);
-              outputConfig_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 42: {
-            com.google.privacy.dlp.v2beta1.OperationConfig.Builder subBuilder = null;
-            if (operationConfig_ != null) {
-              subBuilder = operationConfig_.toBuilder();
-            }
-            operationConfig_ = input.readMessage(com.google.privacy.dlp.v2beta1.OperationConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(operationConfig_);
-              operationConfig_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CreateInspectOperationRequest_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CreateInspectOperationRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest.class, com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest.Builder.class);
-  }
-
-  public static final int INSPECT_CONFIG_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.InspectConfig inspectConfig_;
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  public boolean hasInspectConfig() {
-    return inspectConfig_ != null;
-  }
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectConfig getInspectConfig() {
-    return inspectConfig_ == null ? com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : inspectConfig_;
-  }
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getInspectConfigOrBuilder() {
-    return getInspectConfig();
-  }
-
-  public static final int STORAGE_CONFIG_FIELD_NUMBER = 2;
-  private com.google.privacy.dlp.v2beta1.StorageConfig storageConfig_;
-  /**
-   * 
-   * Specification of the data set to process.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-   */
-  public boolean hasStorageConfig() {
-    return storageConfig_ != null;
-  }
-  /**
-   * 
-   * Specification of the data set to process.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.StorageConfig getStorageConfig() {
-    return storageConfig_ == null ? com.google.privacy.dlp.v2beta1.StorageConfig.getDefaultInstance() : storageConfig_;
-  }
-  /**
-   * 
-   * Specification of the data set to process.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder getStorageConfigOrBuilder() {
-    return getStorageConfig();
-  }
-
-  public static final int OUTPUT_CONFIG_FIELD_NUMBER = 3;
-  private com.google.privacy.dlp.v2beta1.OutputStorageConfig outputConfig_;
-  /**
-   * 
-   * Optional location to store findings.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-   */
-  public boolean hasOutputConfig() {
-    return outputConfig_ != null;
-  }
-  /**
-   * 
-   * Optional location to store findings.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.OutputStorageConfig getOutputConfig() {
-    return outputConfig_ == null ? com.google.privacy.dlp.v2beta1.OutputStorageConfig.getDefaultInstance() : outputConfig_;
-  }
-  /**
-   * 
-   * Optional location to store findings.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder getOutputConfigOrBuilder() {
-    return getOutputConfig();
-  }
-
-  public static final int OPERATION_CONFIG_FIELD_NUMBER = 5;
-  private com.google.privacy.dlp.v2beta1.OperationConfig operationConfig_;
-  /**
-   * 
-   * Additional configuration settings for long running operations.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-   */
-  public boolean hasOperationConfig() {
-    return operationConfig_ != null;
-  }
-  /**
-   * 
-   * Additional configuration settings for long running operations.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.OperationConfig getOperationConfig() {
-    return operationConfig_ == null ? com.google.privacy.dlp.v2beta1.OperationConfig.getDefaultInstance() : operationConfig_;
-  }
-  /**
-   * 
-   * Additional configuration settings for long running operations.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.OperationConfigOrBuilder getOperationConfigOrBuilder() {
-    return getOperationConfig();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (inspectConfig_ != null) {
-      output.writeMessage(1, getInspectConfig());
-    }
-    if (storageConfig_ != null) {
-      output.writeMessage(2, getStorageConfig());
-    }
-    if (outputConfig_ != null) {
-      output.writeMessage(3, getOutputConfig());
-    }
-    if (operationConfig_ != null) {
-      output.writeMessage(5, getOperationConfig());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (inspectConfig_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getInspectConfig());
-    }
-    if (storageConfig_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getStorageConfig());
-    }
-    if (outputConfig_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, getOutputConfig());
-    }
-    if (operationConfig_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, getOperationConfig());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest other = (com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest) obj;
-
-    boolean result = true;
-    result = result && (hasInspectConfig() == other.hasInspectConfig());
-    if (hasInspectConfig()) {
-      result = result && getInspectConfig()
-          .equals(other.getInspectConfig());
-    }
-    result = result && (hasStorageConfig() == other.hasStorageConfig());
-    if (hasStorageConfig()) {
-      result = result && getStorageConfig()
-          .equals(other.getStorageConfig());
-    }
-    result = result && (hasOutputConfig() == other.hasOutputConfig());
-    if (hasOutputConfig()) {
-      result = result && getOutputConfig()
-          .equals(other.getOutputConfig());
-    }
-    result = result && (hasOperationConfig() == other.hasOperationConfig());
-    if (hasOperationConfig()) {
-      result = result && getOperationConfig()
-          .equals(other.getOperationConfig());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasInspectConfig()) {
-      hash = (37 * hash) + INSPECT_CONFIG_FIELD_NUMBER;
-      hash = (53 * hash) + getInspectConfig().hashCode();
-    }
-    if (hasStorageConfig()) {
-      hash = (37 * hash) + STORAGE_CONFIG_FIELD_NUMBER;
-      hash = (53 * hash) + getStorageConfig().hashCode();
-    }
-    if (hasOutputConfig()) {
-      hash = (37 * hash) + OUTPUT_CONFIG_FIELD_NUMBER;
-      hash = (53 * hash) + getOutputConfig().hashCode();
-    }
-    if (hasOperationConfig()) {
-      hash = (37 * hash) + OPERATION_CONFIG_FIELD_NUMBER;
-      hash = (53 * hash) + getOperationConfig().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Request for scheduling a scan of a data subset from a Google Platform data
-   * repository.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CreateInspectOperationRequest}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CreateInspectOperationRequest)
-      com.google.privacy.dlp.v2beta1.CreateInspectOperationRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CreateInspectOperationRequest_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CreateInspectOperationRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest.class, com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (inspectConfigBuilder_ == null) {
-        inspectConfig_ = null;
-      } else {
-        inspectConfig_ = null;
-        inspectConfigBuilder_ = null;
-      }
-      if (storageConfigBuilder_ == null) {
-        storageConfig_ = null;
-      } else {
-        storageConfig_ = null;
-        storageConfigBuilder_ = null;
-      }
-      if (outputConfigBuilder_ == null) {
-        outputConfig_ = null;
-      } else {
-        outputConfig_ = null;
-        outputConfigBuilder_ = null;
-      }
-      if (operationConfigBuilder_ == null) {
-        operationConfig_ = null;
-      } else {
-        operationConfig_ = null;
-        operationConfigBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CreateInspectOperationRequest_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest build() {
-      com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest buildPartial() {
-      com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest result = new com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest(this);
-      if (inspectConfigBuilder_ == null) {
-        result.inspectConfig_ = inspectConfig_;
-      } else {
-        result.inspectConfig_ = inspectConfigBuilder_.build();
-      }
-      if (storageConfigBuilder_ == null) {
-        result.storageConfig_ = storageConfig_;
-      } else {
-        result.storageConfig_ = storageConfigBuilder_.build();
-      }
-      if (outputConfigBuilder_ == null) {
-        result.outputConfig_ = outputConfig_;
-      } else {
-        result.outputConfig_ = outputConfigBuilder_.build();
-      }
-      if (operationConfigBuilder_ == null) {
-        result.operationConfig_ = operationConfig_;
-      } else {
-        result.operationConfig_ = operationConfigBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest other) {
-      if (other == com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest.getDefaultInstance()) return this;
-      if (other.hasInspectConfig()) {
-        mergeInspectConfig(other.getInspectConfig());
-      }
-      if (other.hasStorageConfig()) {
-        mergeStorageConfig(other.getStorageConfig());
-      }
-      if (other.hasOutputConfig()) {
-        mergeOutputConfig(other.getOutputConfig());
-      }
-      if (other.hasOperationConfig()) {
-        mergeOperationConfig(other.getOperationConfig());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.InspectConfig inspectConfig_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder> inspectConfigBuilder_;
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public boolean hasInspectConfig() {
-      return inspectConfigBuilder_ != null || inspectConfig_ != null;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig getInspectConfig() {
-      if (inspectConfigBuilder_ == null) {
-        return inspectConfig_ == null ? com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : inspectConfig_;
-      } else {
-        return inspectConfigBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public Builder setInspectConfig(com.google.privacy.dlp.v2beta1.InspectConfig value) {
-      if (inspectConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        inspectConfig_ = value;
-        onChanged();
-      } else {
-        inspectConfigBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public Builder setInspectConfig(
-        com.google.privacy.dlp.v2beta1.InspectConfig.Builder builderForValue) {
-      if (inspectConfigBuilder_ == null) {
-        inspectConfig_ = builderForValue.build();
-        onChanged();
-      } else {
-        inspectConfigBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public Builder mergeInspectConfig(com.google.privacy.dlp.v2beta1.InspectConfig value) {
-      if (inspectConfigBuilder_ == null) {
-        if (inspectConfig_ != null) {
-          inspectConfig_ =
-            com.google.privacy.dlp.v2beta1.InspectConfig.newBuilder(inspectConfig_).mergeFrom(value).buildPartial();
-        } else {
-          inspectConfig_ = value;
-        }
-        onChanged();
-      } else {
-        inspectConfigBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public Builder clearInspectConfig() {
-      if (inspectConfigBuilder_ == null) {
-        inspectConfig_ = null;
-        onChanged();
-      } else {
-        inspectConfig_ = null;
-        inspectConfigBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig.Builder getInspectConfigBuilder() {
-      
-      onChanged();
-      return getInspectConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getInspectConfigOrBuilder() {
-      if (inspectConfigBuilder_ != null) {
-        return inspectConfigBuilder_.getMessageOrBuilder();
-      } else {
-        return inspectConfig_ == null ?
-            com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : inspectConfig_;
-      }
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder> 
-        getInspectConfigFieldBuilder() {
-      if (inspectConfigBuilder_ == null) {
-        inspectConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder>(
-                getInspectConfig(),
-                getParentForChildren(),
-                isClean());
-        inspectConfig_ = null;
-      }
-      return inspectConfigBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.StorageConfig storageConfig_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.StorageConfig, com.google.privacy.dlp.v2beta1.StorageConfig.Builder, com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder> storageConfigBuilder_;
-    /**
-     * 
-     * Specification of the data set to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-     */
-    public boolean hasStorageConfig() {
-      return storageConfigBuilder_ != null || storageConfig_ != null;
-    }
-    /**
-     * 
-     * Specification of the data set to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.StorageConfig getStorageConfig() {
-      if (storageConfigBuilder_ == null) {
-        return storageConfig_ == null ? com.google.privacy.dlp.v2beta1.StorageConfig.getDefaultInstance() : storageConfig_;
-      } else {
-        return storageConfigBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Specification of the data set to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-     */
-    public Builder setStorageConfig(com.google.privacy.dlp.v2beta1.StorageConfig value) {
-      if (storageConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        storageConfig_ = value;
-        onChanged();
-      } else {
-        storageConfigBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Specification of the data set to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-     */
-    public Builder setStorageConfig(
-        com.google.privacy.dlp.v2beta1.StorageConfig.Builder builderForValue) {
-      if (storageConfigBuilder_ == null) {
-        storageConfig_ = builderForValue.build();
-        onChanged();
-      } else {
-        storageConfigBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Specification of the data set to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-     */
-    public Builder mergeStorageConfig(com.google.privacy.dlp.v2beta1.StorageConfig value) {
-      if (storageConfigBuilder_ == null) {
-        if (storageConfig_ != null) {
-          storageConfig_ =
-            com.google.privacy.dlp.v2beta1.StorageConfig.newBuilder(storageConfig_).mergeFrom(value).buildPartial();
-        } else {
-          storageConfig_ = value;
-        }
-        onChanged();
-      } else {
-        storageConfigBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Specification of the data set to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-     */
-    public Builder clearStorageConfig() {
-      if (storageConfigBuilder_ == null) {
-        storageConfig_ = null;
-        onChanged();
-      } else {
-        storageConfig_ = null;
-        storageConfigBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Specification of the data set to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.StorageConfig.Builder getStorageConfigBuilder() {
-      
-      onChanged();
-      return getStorageConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Specification of the data set to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder getStorageConfigOrBuilder() {
-      if (storageConfigBuilder_ != null) {
-        return storageConfigBuilder_.getMessageOrBuilder();
-      } else {
-        return storageConfig_ == null ?
-            com.google.privacy.dlp.v2beta1.StorageConfig.getDefaultInstance() : storageConfig_;
-      }
-    }
-    /**
-     * 
-     * Specification of the data set to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.StorageConfig, com.google.privacy.dlp.v2beta1.StorageConfig.Builder, com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder> 
-        getStorageConfigFieldBuilder() {
-      if (storageConfigBuilder_ == null) {
-        storageConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.StorageConfig, com.google.privacy.dlp.v2beta1.StorageConfig.Builder, com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder>(
-                getStorageConfig(),
-                getParentForChildren(),
-                isClean());
-        storageConfig_ = null;
-      }
-      return storageConfigBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.OutputStorageConfig outputConfig_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.OutputStorageConfig, com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder, com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder> outputConfigBuilder_;
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-     */
-    public boolean hasOutputConfig() {
-      return outputConfigBuilder_ != null || outputConfig_ != null;
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.OutputStorageConfig getOutputConfig() {
-      if (outputConfigBuilder_ == null) {
-        return outputConfig_ == null ? com.google.privacy.dlp.v2beta1.OutputStorageConfig.getDefaultInstance() : outputConfig_;
-      } else {
-        return outputConfigBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-     */
-    public Builder setOutputConfig(com.google.privacy.dlp.v2beta1.OutputStorageConfig value) {
-      if (outputConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        outputConfig_ = value;
-        onChanged();
-      } else {
-        outputConfigBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-     */
-    public Builder setOutputConfig(
-        com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder builderForValue) {
-      if (outputConfigBuilder_ == null) {
-        outputConfig_ = builderForValue.build();
-        onChanged();
-      } else {
-        outputConfigBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-     */
-    public Builder mergeOutputConfig(com.google.privacy.dlp.v2beta1.OutputStorageConfig value) {
-      if (outputConfigBuilder_ == null) {
-        if (outputConfig_ != null) {
-          outputConfig_ =
-            com.google.privacy.dlp.v2beta1.OutputStorageConfig.newBuilder(outputConfig_).mergeFrom(value).buildPartial();
-        } else {
-          outputConfig_ = value;
-        }
-        onChanged();
-      } else {
-        outputConfigBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-     */
-    public Builder clearOutputConfig() {
-      if (outputConfigBuilder_ == null) {
-        outputConfig_ = null;
-        onChanged();
-      } else {
-        outputConfig_ = null;
-        outputConfigBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder getOutputConfigBuilder() {
-      
-      onChanged();
-      return getOutputConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder getOutputConfigOrBuilder() {
-      if (outputConfigBuilder_ != null) {
-        return outputConfigBuilder_.getMessageOrBuilder();
-      } else {
-        return outputConfig_ == null ?
-            com.google.privacy.dlp.v2beta1.OutputStorageConfig.getDefaultInstance() : outputConfig_;
-      }
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.OutputStorageConfig, com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder, com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder> 
-        getOutputConfigFieldBuilder() {
-      if (outputConfigBuilder_ == null) {
-        outputConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.OutputStorageConfig, com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder, com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder>(
-                getOutputConfig(),
-                getParentForChildren(),
-                isClean());
-        outputConfig_ = null;
-      }
-      return outputConfigBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.OperationConfig operationConfig_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.OperationConfig, com.google.privacy.dlp.v2beta1.OperationConfig.Builder, com.google.privacy.dlp.v2beta1.OperationConfigOrBuilder> operationConfigBuilder_;
-    /**
-     * 
-     * Additional configuration settings for long running operations.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-     */
-    public boolean hasOperationConfig() {
-      return operationConfigBuilder_ != null || operationConfig_ != null;
-    }
-    /**
-     * 
-     * Additional configuration settings for long running operations.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.OperationConfig getOperationConfig() {
-      if (operationConfigBuilder_ == null) {
-        return operationConfig_ == null ? com.google.privacy.dlp.v2beta1.OperationConfig.getDefaultInstance() : operationConfig_;
-      } else {
-        return operationConfigBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Additional configuration settings for long running operations.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-     */
-    public Builder setOperationConfig(com.google.privacy.dlp.v2beta1.OperationConfig value) {
-      if (operationConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        operationConfig_ = value;
-        onChanged();
-      } else {
-        operationConfigBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Additional configuration settings for long running operations.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-     */
-    public Builder setOperationConfig(
-        com.google.privacy.dlp.v2beta1.OperationConfig.Builder builderForValue) {
-      if (operationConfigBuilder_ == null) {
-        operationConfig_ = builderForValue.build();
-        onChanged();
-      } else {
-        operationConfigBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Additional configuration settings for long running operations.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-     */
-    public Builder mergeOperationConfig(com.google.privacy.dlp.v2beta1.OperationConfig value) {
-      if (operationConfigBuilder_ == null) {
-        if (operationConfig_ != null) {
-          operationConfig_ =
-            com.google.privacy.dlp.v2beta1.OperationConfig.newBuilder(operationConfig_).mergeFrom(value).buildPartial();
-        } else {
-          operationConfig_ = value;
-        }
-        onChanged();
-      } else {
-        operationConfigBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Additional configuration settings for long running operations.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-     */
-    public Builder clearOperationConfig() {
-      if (operationConfigBuilder_ == null) {
-        operationConfig_ = null;
-        onChanged();
-      } else {
-        operationConfig_ = null;
-        operationConfigBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Additional configuration settings for long running operations.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.OperationConfig.Builder getOperationConfigBuilder() {
-      
-      onChanged();
-      return getOperationConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Additional configuration settings for long running operations.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.OperationConfigOrBuilder getOperationConfigOrBuilder() {
-      if (operationConfigBuilder_ != null) {
-        return operationConfigBuilder_.getMessageOrBuilder();
-      } else {
-        return operationConfig_ == null ?
-            com.google.privacy.dlp.v2beta1.OperationConfig.getDefaultInstance() : operationConfig_;
-      }
-    }
-    /**
-     * 
-     * Additional configuration settings for long running operations.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.OperationConfig, com.google.privacy.dlp.v2beta1.OperationConfig.Builder, com.google.privacy.dlp.v2beta1.OperationConfigOrBuilder> 
-        getOperationConfigFieldBuilder() {
-      if (operationConfigBuilder_ == null) {
-        operationConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.OperationConfig, com.google.privacy.dlp.v2beta1.OperationConfig.Builder, com.google.privacy.dlp.v2beta1.OperationConfigOrBuilder>(
-                getOperationConfig(),
-                getParentForChildren(),
-                isClean());
-        operationConfig_ = null;
-      }
-      return operationConfigBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CreateInspectOperationRequest)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CreateInspectOperationRequest)
-  private static final com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public CreateInspectOperationRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateInspectOperationRequest(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CreateInspectOperationRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CreateInspectOperationRequestOrBuilder.java
deleted file mode 100644
index 983fed9533db..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CreateInspectOperationRequestOrBuilder.java
+++ /dev/null
@@ -1,109 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface CreateInspectOperationRequestOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CreateInspectOperationRequest)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  boolean hasInspectConfig();
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InspectConfig getInspectConfig();
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getInspectConfigOrBuilder();
-
-  /**
-   * 
-   * Specification of the data set to process.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-   */
-  boolean hasStorageConfig();
-  /**
-   * 
-   * Specification of the data set to process.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-   */
-  com.google.privacy.dlp.v2beta1.StorageConfig getStorageConfig();
-  /**
-   * 
-   * Specification of the data set to process.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.StorageConfig storage_config = 2;
-   */
-  com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder getStorageConfigOrBuilder();
-
-  /**
-   * 
-   * Optional location to store findings.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-   */
-  boolean hasOutputConfig();
-  /**
-   * 
-   * Optional location to store findings.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-   */
-  com.google.privacy.dlp.v2beta1.OutputStorageConfig getOutputConfig();
-  /**
-   * 
-   * Optional location to store findings.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OutputStorageConfig output_config = 3;
-   */
-  com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder getOutputConfigOrBuilder();
-
-  /**
-   * 
-   * Additional configuration settings for long running operations.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-   */
-  boolean hasOperationConfig();
-  /**
-   * 
-   * Additional configuration settings for long running operations.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-   */
-  com.google.privacy.dlp.v2beta1.OperationConfig getOperationConfig();
-  /**
-   * 
-   * Additional configuration settings for long running operations.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OperationConfig operation_config = 5;
-   */
-  com.google.privacy.dlp.v2beta1.OperationConfigOrBuilder getOperationConfigOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoHashConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoHashConfig.java
deleted file mode 100644
index 7e3b0ae292ce..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoHashConfig.java
+++ /dev/null
@@ -1,634 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Pseudonymization method that generates surrogates via cryptographic hashing.
- * Uses SHA-256.
- * Outputs a 32 byte digest as an uppercase hex string
- * (for example, 41D1567F7F99F1DC2A5FAB886DEE5BEE).
- * Currently, only string and integer values can be hashed.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.CryptoHashConfig}
- */
-public  final class CryptoHashConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CryptoHashConfig)
-    CryptoHashConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use CryptoHashConfig.newBuilder() to construct.
-  private CryptoHashConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private CryptoHashConfig() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private CryptoHashConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.CryptoKey.Builder subBuilder = null;
-            if (cryptoKey_ != null) {
-              subBuilder = cryptoKey_.toBuilder();
-            }
-            cryptoKey_ = input.readMessage(com.google.privacy.dlp.v2beta1.CryptoKey.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(cryptoKey_);
-              cryptoKey_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoHashConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoHashConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.CryptoHashConfig.class, com.google.privacy.dlp.v2beta1.CryptoHashConfig.Builder.class);
-  }
-
-  public static final int CRYPTO_KEY_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.CryptoKey cryptoKey_;
-  /**
-   * 
-   * The key used by the hash function.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-   */
-  public boolean hasCryptoKey() {
-    return cryptoKey_ != null;
-  }
-  /**
-   * 
-   * The key used by the hash function.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.CryptoKey getCryptoKey() {
-    return cryptoKey_ == null ? com.google.privacy.dlp.v2beta1.CryptoKey.getDefaultInstance() : cryptoKey_;
-  }
-  /**
-   * 
-   * The key used by the hash function.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder getCryptoKeyOrBuilder() {
-    return getCryptoKey();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (cryptoKey_ != null) {
-      output.writeMessage(1, getCryptoKey());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (cryptoKey_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getCryptoKey());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.CryptoHashConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.CryptoHashConfig other = (com.google.privacy.dlp.v2beta1.CryptoHashConfig) obj;
-
-    boolean result = true;
-    result = result && (hasCryptoKey() == other.hasCryptoKey());
-    if (hasCryptoKey()) {
-      result = result && getCryptoKey()
-          .equals(other.getCryptoKey());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasCryptoKey()) {
-      hash = (37 * hash) + CRYPTO_KEY_FIELD_NUMBER;
-      hash = (53 * hash) + getCryptoKey().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CryptoHashConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Pseudonymization method that generates surrogates via cryptographic hashing.
-   * Uses SHA-256.
-   * Outputs a 32 byte digest as an uppercase hex string
-   * (for example, 41D1567F7F99F1DC2A5FAB886DEE5BEE).
-   * Currently, only string and integer values can be hashed.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CryptoHashConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CryptoHashConfig)
-      com.google.privacy.dlp.v2beta1.CryptoHashConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoHashConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoHashConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CryptoHashConfig.class, com.google.privacy.dlp.v2beta1.CryptoHashConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.CryptoHashConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (cryptoKeyBuilder_ == null) {
-        cryptoKey_ = null;
-      } else {
-        cryptoKey_ = null;
-        cryptoKeyBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoHashConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CryptoHashConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.CryptoHashConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.CryptoHashConfig build() {
-      com.google.privacy.dlp.v2beta1.CryptoHashConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CryptoHashConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.CryptoHashConfig result = new com.google.privacy.dlp.v2beta1.CryptoHashConfig(this);
-      if (cryptoKeyBuilder_ == null) {
-        result.cryptoKey_ = cryptoKey_;
-      } else {
-        result.cryptoKey_ = cryptoKeyBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.CryptoHashConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.CryptoHashConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CryptoHashConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.CryptoHashConfig.getDefaultInstance()) return this;
-      if (other.hasCryptoKey()) {
-        mergeCryptoKey(other.getCryptoKey());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.CryptoHashConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.CryptoHashConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.CryptoKey cryptoKey_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CryptoKey, com.google.privacy.dlp.v2beta1.CryptoKey.Builder, com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder> cryptoKeyBuilder_;
-    /**
-     * 
-     * The key used by the hash function.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public boolean hasCryptoKey() {
-      return cryptoKeyBuilder_ != null || cryptoKey_ != null;
-    }
-    /**
-     * 
-     * The key used by the hash function.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoKey getCryptoKey() {
-      if (cryptoKeyBuilder_ == null) {
-        return cryptoKey_ == null ? com.google.privacy.dlp.v2beta1.CryptoKey.getDefaultInstance() : cryptoKey_;
-      } else {
-        return cryptoKeyBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The key used by the hash function.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public Builder setCryptoKey(com.google.privacy.dlp.v2beta1.CryptoKey value) {
-      if (cryptoKeyBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        cryptoKey_ = value;
-        onChanged();
-      } else {
-        cryptoKeyBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The key used by the hash function.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public Builder setCryptoKey(
-        com.google.privacy.dlp.v2beta1.CryptoKey.Builder builderForValue) {
-      if (cryptoKeyBuilder_ == null) {
-        cryptoKey_ = builderForValue.build();
-        onChanged();
-      } else {
-        cryptoKeyBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The key used by the hash function.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public Builder mergeCryptoKey(com.google.privacy.dlp.v2beta1.CryptoKey value) {
-      if (cryptoKeyBuilder_ == null) {
-        if (cryptoKey_ != null) {
-          cryptoKey_ =
-            com.google.privacy.dlp.v2beta1.CryptoKey.newBuilder(cryptoKey_).mergeFrom(value).buildPartial();
-        } else {
-          cryptoKey_ = value;
-        }
-        onChanged();
-      } else {
-        cryptoKeyBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The key used by the hash function.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public Builder clearCryptoKey() {
-      if (cryptoKeyBuilder_ == null) {
-        cryptoKey_ = null;
-        onChanged();
-      } else {
-        cryptoKey_ = null;
-        cryptoKeyBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The key used by the hash function.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoKey.Builder getCryptoKeyBuilder() {
-      
-      onChanged();
-      return getCryptoKeyFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The key used by the hash function.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder getCryptoKeyOrBuilder() {
-      if (cryptoKeyBuilder_ != null) {
-        return cryptoKeyBuilder_.getMessageOrBuilder();
-      } else {
-        return cryptoKey_ == null ?
-            com.google.privacy.dlp.v2beta1.CryptoKey.getDefaultInstance() : cryptoKey_;
-      }
-    }
-    /**
-     * 
-     * The key used by the hash function.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CryptoKey, com.google.privacy.dlp.v2beta1.CryptoKey.Builder, com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder> 
-        getCryptoKeyFieldBuilder() {
-      if (cryptoKeyBuilder_ == null) {
-        cryptoKeyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CryptoKey, com.google.privacy.dlp.v2beta1.CryptoKey.Builder, com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder>(
-                getCryptoKey(),
-                getParentForChildren(),
-                isClean());
-        cryptoKey_ = null;
-      }
-      return cryptoKeyBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CryptoHashConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CryptoHashConfig)
-  private static final com.google.privacy.dlp.v2beta1.CryptoHashConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CryptoHashConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CryptoHashConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public CryptoHashConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CryptoHashConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.CryptoHashConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoHashConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoHashConfigOrBuilder.java
deleted file mode 100644
index 77d2ee083d19..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoHashConfigOrBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface CryptoHashConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CryptoHashConfig)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The key used by the hash function.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-   */
-  boolean hasCryptoKey();
-  /**
-   * 
-   * The key used by the hash function.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-   */
-  com.google.privacy.dlp.v2beta1.CryptoKey getCryptoKey();
-  /**
-   * 
-   * The key used by the hash function.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-   */
-  com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder getCryptoKeyOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoKey.java
deleted file mode 100644
index 5b42dfdfb54f..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoKey.java
+++ /dev/null
@@ -1,1085 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * This is a data encryption key (DEK) (as opposed to
- * a key encryption key (KEK) stored by KMS).
- * When using KMS to wrap/unwrap DEKs, be sure to set an appropriate
- * IAM policy on the KMS CryptoKey (KEK) to ensure an attacker cannot
- * unwrap the data crypto key.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.CryptoKey}
- */
-public  final class CryptoKey extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CryptoKey)
-    CryptoKeyOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use CryptoKey.newBuilder() to construct.
-  private CryptoKey(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private CryptoKey() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private CryptoKey(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.TransientCryptoKey.Builder subBuilder = null;
-            if (sourceCase_ == 1) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.TransientCryptoKey) source_).toBuilder();
-            }
-            source_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.TransientCryptoKey.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.TransientCryptoKey) source_);
-              source_ = subBuilder.buildPartial();
-            }
-            sourceCase_ = 1;
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.Builder subBuilder = null;
-            if (sourceCase_ == 2) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) source_).toBuilder();
-            }
-            source_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) source_);
-              source_ = subBuilder.buildPartial();
-            }
-            sourceCase_ = 2;
-            break;
-          }
-          case 26: {
-            com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.Builder subBuilder = null;
-            if (sourceCase_ == 3) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) source_).toBuilder();
-            }
-            source_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) source_);
-              source_ = subBuilder.buildPartial();
-            }
-            sourceCase_ = 3;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoKey_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoKey_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.CryptoKey.class, com.google.privacy.dlp.v2beta1.CryptoKey.Builder.class);
-  }
-
-  private int sourceCase_ = 0;
-  private java.lang.Object source_;
-  public enum SourceCase
-      implements com.google.protobuf.Internal.EnumLite {
-    TRANSIENT(1),
-    UNWRAPPED(2),
-    KMS_WRAPPED(3),
-    SOURCE_NOT_SET(0);
-    private final int value;
-    private SourceCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static SourceCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static SourceCase forNumber(int value) {
-      switch (value) {
-        case 1: return TRANSIENT;
-        case 2: return UNWRAPPED;
-        case 3: return KMS_WRAPPED;
-        case 0: return SOURCE_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public SourceCase
-  getSourceCase() {
-    return SourceCase.forNumber(
-        sourceCase_);
-  }
-
-  public static final int TRANSIENT_FIELD_NUMBER = 1;
-  /**
-   * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-   */
-  public boolean hasTransient() {
-    return sourceCase_ == 1;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.TransientCryptoKey getTransient() {
-    if (sourceCase_ == 1) {
-       return (com.google.privacy.dlp.v2beta1.TransientCryptoKey) source_;
-    }
-    return com.google.privacy.dlp.v2beta1.TransientCryptoKey.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.TransientCryptoKeyOrBuilder getTransientOrBuilder() {
-    if (sourceCase_ == 1) {
-       return (com.google.privacy.dlp.v2beta1.TransientCryptoKey) source_;
-    }
-    return com.google.privacy.dlp.v2beta1.TransientCryptoKey.getDefaultInstance();
-  }
-
-  public static final int UNWRAPPED_FIELD_NUMBER = 2;
-  /**
-   * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-   */
-  public boolean hasUnwrapped() {
-    return sourceCase_ == 2;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey getUnwrapped() {
-    if (sourceCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) source_;
-    }
-    return com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.UnwrappedCryptoKeyOrBuilder getUnwrappedOrBuilder() {
-    if (sourceCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) source_;
-    }
-    return com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.getDefaultInstance();
-  }
-
-  public static final int KMS_WRAPPED_FIELD_NUMBER = 3;
-  /**
-   * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-   */
-  public boolean hasKmsWrapped() {
-    return sourceCase_ == 3;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey getKmsWrapped() {
-    if (sourceCase_ == 3) {
-       return (com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) source_;
-    }
-    return com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKeyOrBuilder getKmsWrappedOrBuilder() {
-    if (sourceCase_ == 3) {
-       return (com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) source_;
-    }
-    return com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.getDefaultInstance();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (sourceCase_ == 1) {
-      output.writeMessage(1, (com.google.privacy.dlp.v2beta1.TransientCryptoKey) source_);
-    }
-    if (sourceCase_ == 2) {
-      output.writeMessage(2, (com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) source_);
-    }
-    if (sourceCase_ == 3) {
-      output.writeMessage(3, (com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) source_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (sourceCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, (com.google.privacy.dlp.v2beta1.TransientCryptoKey) source_);
-    }
-    if (sourceCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, (com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) source_);
-    }
-    if (sourceCase_ == 3) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, (com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) source_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.CryptoKey)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.CryptoKey other = (com.google.privacy.dlp.v2beta1.CryptoKey) obj;
-
-    boolean result = true;
-    result = result && getSourceCase().equals(
-        other.getSourceCase());
-    if (!result) return false;
-    switch (sourceCase_) {
-      case 1:
-        result = result && getTransient()
-            .equals(other.getTransient());
-        break;
-      case 2:
-        result = result && getUnwrapped()
-            .equals(other.getUnwrapped());
-        break;
-      case 3:
-        result = result && getKmsWrapped()
-            .equals(other.getKmsWrapped());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    switch (sourceCase_) {
-      case 1:
-        hash = (37 * hash) + TRANSIENT_FIELD_NUMBER;
-        hash = (53 * hash) + getTransient().hashCode();
-        break;
-      case 2:
-        hash = (37 * hash) + UNWRAPPED_FIELD_NUMBER;
-        hash = (53 * hash) + getUnwrapped().hashCode();
-        break;
-      case 3:
-        hash = (37 * hash) + KMS_WRAPPED_FIELD_NUMBER;
-        hash = (53 * hash) + getKmsWrapped().hashCode();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CryptoKey parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoKey parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoKey parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoKey parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoKey parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoKey parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoKey parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoKey parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoKey parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoKey parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoKey parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoKey parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CryptoKey prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * This is a data encryption key (DEK) (as opposed to
-   * a key encryption key (KEK) stored by KMS).
-   * When using KMS to wrap/unwrap DEKs, be sure to set an appropriate
-   * IAM policy on the KMS CryptoKey (KEK) to ensure an attacker cannot
-   * unwrap the data crypto key.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CryptoKey}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CryptoKey)
-      com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoKey_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoKey_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CryptoKey.class, com.google.privacy.dlp.v2beta1.CryptoKey.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.CryptoKey.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      sourceCase_ = 0;
-      source_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoKey_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CryptoKey getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.CryptoKey.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.CryptoKey build() {
-      com.google.privacy.dlp.v2beta1.CryptoKey result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CryptoKey buildPartial() {
-      com.google.privacy.dlp.v2beta1.CryptoKey result = new com.google.privacy.dlp.v2beta1.CryptoKey(this);
-      if (sourceCase_ == 1) {
-        if (transientBuilder_ == null) {
-          result.source_ = source_;
-        } else {
-          result.source_ = transientBuilder_.build();
-        }
-      }
-      if (sourceCase_ == 2) {
-        if (unwrappedBuilder_ == null) {
-          result.source_ = source_;
-        } else {
-          result.source_ = unwrappedBuilder_.build();
-        }
-      }
-      if (sourceCase_ == 3) {
-        if (kmsWrappedBuilder_ == null) {
-          result.source_ = source_;
-        } else {
-          result.source_ = kmsWrappedBuilder_.build();
-        }
-      }
-      result.sourceCase_ = sourceCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.CryptoKey) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.CryptoKey)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CryptoKey other) {
-      if (other == com.google.privacy.dlp.v2beta1.CryptoKey.getDefaultInstance()) return this;
-      switch (other.getSourceCase()) {
-        case TRANSIENT: {
-          mergeTransient(other.getTransient());
-          break;
-        }
-        case UNWRAPPED: {
-          mergeUnwrapped(other.getUnwrapped());
-          break;
-        }
-        case KMS_WRAPPED: {
-          mergeKmsWrapped(other.getKmsWrapped());
-          break;
-        }
-        case SOURCE_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.CryptoKey parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.CryptoKey) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int sourceCase_ = 0;
-    private java.lang.Object source_;
-    public SourceCase
-        getSourceCase() {
-      return SourceCase.forNumber(
-          sourceCase_);
-    }
-
-    public Builder clearSource() {
-      sourceCase_ = 0;
-      source_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.TransientCryptoKey, com.google.privacy.dlp.v2beta1.TransientCryptoKey.Builder, com.google.privacy.dlp.v2beta1.TransientCryptoKeyOrBuilder> transientBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-     */
-    public boolean hasTransient() {
-      return sourceCase_ == 1;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.TransientCryptoKey getTransient() {
-      if (transientBuilder_ == null) {
-        if (sourceCase_ == 1) {
-          return (com.google.privacy.dlp.v2beta1.TransientCryptoKey) source_;
-        }
-        return com.google.privacy.dlp.v2beta1.TransientCryptoKey.getDefaultInstance();
-      } else {
-        if (sourceCase_ == 1) {
-          return transientBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.TransientCryptoKey.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-     */
-    public Builder setTransient(com.google.privacy.dlp.v2beta1.TransientCryptoKey value) {
-      if (transientBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        source_ = value;
-        onChanged();
-      } else {
-        transientBuilder_.setMessage(value);
-      }
-      sourceCase_ = 1;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-     */
-    public Builder setTransient(
-        com.google.privacy.dlp.v2beta1.TransientCryptoKey.Builder builderForValue) {
-      if (transientBuilder_ == null) {
-        source_ = builderForValue.build();
-        onChanged();
-      } else {
-        transientBuilder_.setMessage(builderForValue.build());
-      }
-      sourceCase_ = 1;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-     */
-    public Builder mergeTransient(com.google.privacy.dlp.v2beta1.TransientCryptoKey value) {
-      if (transientBuilder_ == null) {
-        if (sourceCase_ == 1 &&
-            source_ != com.google.privacy.dlp.v2beta1.TransientCryptoKey.getDefaultInstance()) {
-          source_ = com.google.privacy.dlp.v2beta1.TransientCryptoKey.newBuilder((com.google.privacy.dlp.v2beta1.TransientCryptoKey) source_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          source_ = value;
-        }
-        onChanged();
-      } else {
-        if (sourceCase_ == 1) {
-          transientBuilder_.mergeFrom(value);
-        }
-        transientBuilder_.setMessage(value);
-      }
-      sourceCase_ = 1;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-     */
-    public Builder clearTransient() {
-      if (transientBuilder_ == null) {
-        if (sourceCase_ == 1) {
-          sourceCase_ = 0;
-          source_ = null;
-          onChanged();
-        }
-      } else {
-        if (sourceCase_ == 1) {
-          sourceCase_ = 0;
-          source_ = null;
-        }
-        transientBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.TransientCryptoKey.Builder getTransientBuilder() {
-      return getTransientFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.TransientCryptoKeyOrBuilder getTransientOrBuilder() {
-      if ((sourceCase_ == 1) && (transientBuilder_ != null)) {
-        return transientBuilder_.getMessageOrBuilder();
-      } else {
-        if (sourceCase_ == 1) {
-          return (com.google.privacy.dlp.v2beta1.TransientCryptoKey) source_;
-        }
-        return com.google.privacy.dlp.v2beta1.TransientCryptoKey.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.TransientCryptoKey, com.google.privacy.dlp.v2beta1.TransientCryptoKey.Builder, com.google.privacy.dlp.v2beta1.TransientCryptoKeyOrBuilder> 
-        getTransientFieldBuilder() {
-      if (transientBuilder_ == null) {
-        if (!(sourceCase_ == 1)) {
-          source_ = com.google.privacy.dlp.v2beta1.TransientCryptoKey.getDefaultInstance();
-        }
-        transientBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.TransientCryptoKey, com.google.privacy.dlp.v2beta1.TransientCryptoKey.Builder, com.google.privacy.dlp.v2beta1.TransientCryptoKeyOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.TransientCryptoKey) source_,
-                getParentForChildren(),
-                isClean());
-        source_ = null;
-      }
-      sourceCase_ = 1;
-      onChanged();;
-      return transientBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey, com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.Builder, com.google.privacy.dlp.v2beta1.UnwrappedCryptoKeyOrBuilder> unwrappedBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-     */
-    public boolean hasUnwrapped() {
-      return sourceCase_ == 2;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey getUnwrapped() {
-      if (unwrappedBuilder_ == null) {
-        if (sourceCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) source_;
-        }
-        return com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.getDefaultInstance();
-      } else {
-        if (sourceCase_ == 2) {
-          return unwrappedBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-     */
-    public Builder setUnwrapped(com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey value) {
-      if (unwrappedBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        source_ = value;
-        onChanged();
-      } else {
-        unwrappedBuilder_.setMessage(value);
-      }
-      sourceCase_ = 2;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-     */
-    public Builder setUnwrapped(
-        com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.Builder builderForValue) {
-      if (unwrappedBuilder_ == null) {
-        source_ = builderForValue.build();
-        onChanged();
-      } else {
-        unwrappedBuilder_.setMessage(builderForValue.build());
-      }
-      sourceCase_ = 2;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-     */
-    public Builder mergeUnwrapped(com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey value) {
-      if (unwrappedBuilder_ == null) {
-        if (sourceCase_ == 2 &&
-            source_ != com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.getDefaultInstance()) {
-          source_ = com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.newBuilder((com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) source_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          source_ = value;
-        }
-        onChanged();
-      } else {
-        if (sourceCase_ == 2) {
-          unwrappedBuilder_.mergeFrom(value);
-        }
-        unwrappedBuilder_.setMessage(value);
-      }
-      sourceCase_ = 2;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-     */
-    public Builder clearUnwrapped() {
-      if (unwrappedBuilder_ == null) {
-        if (sourceCase_ == 2) {
-          sourceCase_ = 0;
-          source_ = null;
-          onChanged();
-        }
-      } else {
-        if (sourceCase_ == 2) {
-          sourceCase_ = 0;
-          source_ = null;
-        }
-        unwrappedBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.Builder getUnwrappedBuilder() {
-      return getUnwrappedFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.UnwrappedCryptoKeyOrBuilder getUnwrappedOrBuilder() {
-      if ((sourceCase_ == 2) && (unwrappedBuilder_ != null)) {
-        return unwrappedBuilder_.getMessageOrBuilder();
-      } else {
-        if (sourceCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) source_;
-        }
-        return com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey, com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.Builder, com.google.privacy.dlp.v2beta1.UnwrappedCryptoKeyOrBuilder> 
-        getUnwrappedFieldBuilder() {
-      if (unwrappedBuilder_ == null) {
-        if (!(sourceCase_ == 2)) {
-          source_ = com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.getDefaultInstance();
-        }
-        unwrappedBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey, com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.Builder, com.google.privacy.dlp.v2beta1.UnwrappedCryptoKeyOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) source_,
-                getParentForChildren(),
-                isClean());
-        source_ = null;
-      }
-      sourceCase_ = 2;
-      onChanged();;
-      return unwrappedBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey, com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.Builder, com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKeyOrBuilder> kmsWrappedBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-     */
-    public boolean hasKmsWrapped() {
-      return sourceCase_ == 3;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey getKmsWrapped() {
-      if (kmsWrappedBuilder_ == null) {
-        if (sourceCase_ == 3) {
-          return (com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) source_;
-        }
-        return com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.getDefaultInstance();
-      } else {
-        if (sourceCase_ == 3) {
-          return kmsWrappedBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-     */
-    public Builder setKmsWrapped(com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey value) {
-      if (kmsWrappedBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        source_ = value;
-        onChanged();
-      } else {
-        kmsWrappedBuilder_.setMessage(value);
-      }
-      sourceCase_ = 3;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-     */
-    public Builder setKmsWrapped(
-        com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.Builder builderForValue) {
-      if (kmsWrappedBuilder_ == null) {
-        source_ = builderForValue.build();
-        onChanged();
-      } else {
-        kmsWrappedBuilder_.setMessage(builderForValue.build());
-      }
-      sourceCase_ = 3;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-     */
-    public Builder mergeKmsWrapped(com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey value) {
-      if (kmsWrappedBuilder_ == null) {
-        if (sourceCase_ == 3 &&
-            source_ != com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.getDefaultInstance()) {
-          source_ = com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.newBuilder((com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) source_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          source_ = value;
-        }
-        onChanged();
-      } else {
-        if (sourceCase_ == 3) {
-          kmsWrappedBuilder_.mergeFrom(value);
-        }
-        kmsWrappedBuilder_.setMessage(value);
-      }
-      sourceCase_ = 3;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-     */
-    public Builder clearKmsWrapped() {
-      if (kmsWrappedBuilder_ == null) {
-        if (sourceCase_ == 3) {
-          sourceCase_ = 0;
-          source_ = null;
-          onChanged();
-        }
-      } else {
-        if (sourceCase_ == 3) {
-          sourceCase_ = 0;
-          source_ = null;
-        }
-        kmsWrappedBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.Builder getKmsWrappedBuilder() {
-      return getKmsWrappedFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKeyOrBuilder getKmsWrappedOrBuilder() {
-      if ((sourceCase_ == 3) && (kmsWrappedBuilder_ != null)) {
-        return kmsWrappedBuilder_.getMessageOrBuilder();
-      } else {
-        if (sourceCase_ == 3) {
-          return (com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) source_;
-        }
-        return com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey, com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.Builder, com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKeyOrBuilder> 
-        getKmsWrappedFieldBuilder() {
-      if (kmsWrappedBuilder_ == null) {
-        if (!(sourceCase_ == 3)) {
-          source_ = com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.getDefaultInstance();
-        }
-        kmsWrappedBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey, com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.Builder, com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKeyOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) source_,
-                getParentForChildren(),
-                isClean());
-        source_ = null;
-      }
-      sourceCase_ = 3;
-      onChanged();;
-      return kmsWrappedBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CryptoKey)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CryptoKey)
-  private static final com.google.privacy.dlp.v2beta1.CryptoKey DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CryptoKey();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CryptoKey getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public CryptoKey parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CryptoKey(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.CryptoKey getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoKeyOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoKeyOrBuilder.java
deleted file mode 100644
index 174dbed9cea7..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoKeyOrBuilder.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface CryptoKeyOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CryptoKey)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-   */
-  boolean hasTransient();
-  /**
-   * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-   */
-  com.google.privacy.dlp.v2beta1.TransientCryptoKey getTransient();
-  /**
-   * .google.privacy.dlp.v2beta1.TransientCryptoKey transient = 1;
-   */
-  com.google.privacy.dlp.v2beta1.TransientCryptoKeyOrBuilder getTransientOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-   */
-  boolean hasUnwrapped();
-  /**
-   * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-   */
-  com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey getUnwrapped();
-  /**
-   * .google.privacy.dlp.v2beta1.UnwrappedCryptoKey unwrapped = 2;
-   */
-  com.google.privacy.dlp.v2beta1.UnwrappedCryptoKeyOrBuilder getUnwrappedOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-   */
-  boolean hasKmsWrapped();
-  /**
-   * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-   */
-  com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey getKmsWrapped();
-  /**
-   * .google.privacy.dlp.v2beta1.KmsWrappedCryptoKey kms_wrapped = 3;
-   */
-  com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKeyOrBuilder getKmsWrappedOrBuilder();
-
-  public com.google.privacy.dlp.v2beta1.CryptoKey.SourceCase getSourceCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoReplaceFfxFpeConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoReplaceFfxFpeConfig.java
deleted file mode 100644
index f788c39a27d1..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoReplaceFfxFpeConfig.java
+++ /dev/null
@@ -1,1731 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Replaces an identifier with a surrogate using FPE with the FFX
- * mode of operation.
- * The identifier must be representable by the US-ASCII character set.
- * For a given crypto key and context, the same identifier will be
- * replaced with the same surrogate.
- * Identifiers must be at least two characters long.
- * In the case that the identifier is the empty string, it will be skipped.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig}
- */
-public  final class CryptoReplaceFfxFpeConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig)
-    CryptoReplaceFfxFpeConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use CryptoReplaceFfxFpeConfig.newBuilder() to construct.
-  private CryptoReplaceFfxFpeConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private CryptoReplaceFfxFpeConfig() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private CryptoReplaceFfxFpeConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.CryptoKey.Builder subBuilder = null;
-            if (cryptoKey_ != null) {
-              subBuilder = cryptoKey_.toBuilder();
-            }
-            cryptoKey_ = input.readMessage(com.google.privacy.dlp.v2beta1.CryptoKey.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(cryptoKey_);
-              cryptoKey_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.FieldId.Builder subBuilder = null;
-            if (context_ != null) {
-              subBuilder = context_.toBuilder();
-            }
-            context_ = input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(context_);
-              context_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 32: {
-            int rawValue = input.readEnum();
-            alphabetCase_ = 4;
-            alphabet_ = rawValue;
-            break;
-          }
-          case 42: {
-            java.lang.String s = input.readStringRequireUtf8();
-            alphabetCase_ = 5;
-            alphabet_ = s;
-            break;
-          }
-          case 48: {
-            alphabetCase_ = 6;
-            alphabet_ = input.readInt32();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoReplaceFfxFpeConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoReplaceFfxFpeConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.class, com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.Builder.class);
-  }
-
-  /**
-   * 
-   * These are commonly used subsets of the alphabet that the FFX mode
-   * natively supports. In the algorithm, the alphabet is selected using
-   * the "radix". Therefore each corresponds to particular radix.
-   * 

-   *
-   * Protobuf enum {@code google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet}
-   */
-  public enum FfxCommonNativeAlphabet
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED = 0;
-     */
-    FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED(0),
-    /**
-     * 
-     * [0-9] (radix of 10)
-     * 

-     *
-     * NUMERIC = 1;
-     */
-    NUMERIC(1),
-    /**
-     * 
-     * [0-9A-F] (radix of 16)
-     * 

-     *
-     * HEXADECIMAL = 2;
-     */
-    HEXADECIMAL(2),
-    /**
-     * 
-     * [0-9A-Z] (radix of 36)
-     * 

-     *
-     * UPPER_CASE_ALPHA_NUMERIC = 3;
-     */
-    UPPER_CASE_ALPHA_NUMERIC(3),
-    /**
-     * 
-     * [0-9A-Za-z] (radix of 62)
-     * 

-     *
-     * ALPHA_NUMERIC = 4;
-     */
-    ALPHA_NUMERIC(4),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED = 0;
-     */
-    public static final int FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED_VALUE = 0;
-    /**
-     * 
-     * [0-9] (radix of 10)
-     * 

-     *
-     * NUMERIC = 1;
-     */
-    public static final int NUMERIC_VALUE = 1;
-    /**
-     * 
-     * [0-9A-F] (radix of 16)
-     * 

-     *
-     * HEXADECIMAL = 2;
-     */
-    public static final int HEXADECIMAL_VALUE = 2;
-    /**
-     * 
-     * [0-9A-Z] (radix of 36)
-     * 

-     *
-     * UPPER_CASE_ALPHA_NUMERIC = 3;
-     */
-    public static final int UPPER_CASE_ALPHA_NUMERIC_VALUE = 3;
-    /**
-     * 
-     * [0-9A-Za-z] (radix of 62)
-     * 

-     *
-     * ALPHA_NUMERIC = 4;
-     */
-    public static final int ALPHA_NUMERIC_VALUE = 4;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static FfxCommonNativeAlphabet valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static FfxCommonNativeAlphabet forNumber(int value) {
-      switch (value) {
-        case 0: return FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED;
-        case 1: return NUMERIC;
-        case 2: return HEXADECIMAL;
-        case 3: return UPPER_CASE_ALPHA_NUMERIC;
-        case 4: return ALPHA_NUMERIC;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        FfxCommonNativeAlphabet> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap() {
-            public FfxCommonNativeAlphabet findValueByNumber(int number) {
-              return FfxCommonNativeAlphabet.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final FfxCommonNativeAlphabet[] VALUES = values();
-
-    public static FfxCommonNativeAlphabet valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private FfxCommonNativeAlphabet(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet)
-  }
-
-  private int alphabetCase_ = 0;
-  private java.lang.Object alphabet_;
-  public enum AlphabetCase
-      implements com.google.protobuf.Internal.EnumLite {
-    COMMON_ALPHABET(4),
-    CUSTOM_ALPHABET(5),
-    RADIX(6),
-    ALPHABET_NOT_SET(0);
-    private final int value;
-    private AlphabetCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static AlphabetCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static AlphabetCase forNumber(int value) {
-      switch (value) {
-        case 4: return COMMON_ALPHABET;
-        case 5: return CUSTOM_ALPHABET;
-        case 6: return RADIX;
-        case 0: return ALPHABET_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public AlphabetCase
-  getAlphabetCase() {
-    return AlphabetCase.forNumber(
-        alphabetCase_);
-  }
-
-  public static final int CRYPTO_KEY_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.CryptoKey cryptoKey_;
-  /**
-   * 
-   * The key used by the encryption algorithm. [required]
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-   */
-  public boolean hasCryptoKey() {
-    return cryptoKey_ != null;
-  }
-  /**
-   * 
-   * The key used by the encryption algorithm. [required]
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.CryptoKey getCryptoKey() {
-    return cryptoKey_ == null ? com.google.privacy.dlp.v2beta1.CryptoKey.getDefaultInstance() : cryptoKey_;
-  }
-  /**
-   * 
-   * The key used by the encryption algorithm. [required]
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder getCryptoKeyOrBuilder() {
-    return getCryptoKey();
-  }
-
-  public static final int CONTEXT_FIELD_NUMBER = 2;
-  private com.google.privacy.dlp.v2beta1.FieldId context_;
-  /**
-   * 
-   * A context may be used for higher security since the same
-   * identifier in two different contexts likely will be given a distinct
-   * surrogate. The principle is that the likeliness is inversely related
-   * to the ratio of the number of distinct identifiers per context over the
-   * number of possible surrogates: As long as this ratio is small, the
-   * likehood is large.
-   * If the context is not set, a default tweak will be used.
-   * If the context is set but:
-   * 1. there is no record present when transforming a given value or
-   * 1. the field is not present when transforming a given value,
-   * a default tweak will be used.
-   * Note that case (1) is expected when an `InfoTypeTransformation` is
-   * applied to both structured and non-structured `ContentItem`s.
-   * Currently, the referenced field may be of value type integer or string.
-   * The tweak is constructed as a sequence of bytes in big endian byte order
-   * such that:
-   * - a 64 bit integer is encoded followed by a single byte of value 1
-   * - a string is encoded in UTF-8 format followed by a single byte of value 2
-   * This is also known as the 'tweak', as in tweakable encryption.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId context = 2;
-   */
-  public boolean hasContext() {
-    return context_ != null;
-  }
-  /**
-   * 
-   * A context may be used for higher security since the same
-   * identifier in two different contexts likely will be given a distinct
-   * surrogate. The principle is that the likeliness is inversely related
-   * to the ratio of the number of distinct identifiers per context over the
-   * number of possible surrogates: As long as this ratio is small, the
-   * likehood is large.
-   * If the context is not set, a default tweak will be used.
-   * If the context is set but:
-   * 1. there is no record present when transforming a given value or
-   * 1. the field is not present when transforming a given value,
-   * a default tweak will be used.
-   * Note that case (1) is expected when an `InfoTypeTransformation` is
-   * applied to both structured and non-structured `ContentItem`s.
-   * Currently, the referenced field may be of value type integer or string.
-   * The tweak is constructed as a sequence of bytes in big endian byte order
-   * such that:
-   * - a 64 bit integer is encoded followed by a single byte of value 1
-   * - a string is encoded in UTF-8 format followed by a single byte of value 2
-   * This is also known as the 'tweak', as in tweakable encryption.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId context = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldId getContext() {
-    return context_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : context_;
-  }
-  /**
-   * 
-   * A context may be used for higher security since the same
-   * identifier in two different contexts likely will be given a distinct
-   * surrogate. The principle is that the likeliness is inversely related
-   * to the ratio of the number of distinct identifiers per context over the
-   * number of possible surrogates: As long as this ratio is small, the
-   * likehood is large.
-   * If the context is not set, a default tweak will be used.
-   * If the context is set but:
-   * 1. there is no record present when transforming a given value or
-   * 1. the field is not present when transforming a given value,
-   * a default tweak will be used.
-   * Note that case (1) is expected when an `InfoTypeTransformation` is
-   * applied to both structured and non-structured `ContentItem`s.
-   * Currently, the referenced field may be of value type integer or string.
-   * The tweak is constructed as a sequence of bytes in big endian byte order
-   * such that:
-   * - a 64 bit integer is encoded followed by a single byte of value 1
-   * - a string is encoded in UTF-8 format followed by a single byte of value 2
-   * This is also known as the 'tweak', as in tweakable encryption.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId context = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getContextOrBuilder() {
-    return getContext();
-  }
-
-  public static final int COMMON_ALPHABET_FIELD_NUMBER = 4;
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet common_alphabet = 4;
-   */
-  public int getCommonAlphabetValue() {
-    if (alphabetCase_ == 4) {
-      return (java.lang.Integer) alphabet_;
-    }
-    return 0;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet common_alphabet = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet getCommonAlphabet() {
-    if (alphabetCase_ == 4) {
-      com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet result = com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet.valueOf(
-          (java.lang.Integer) alphabet_);
-      return result == null ? com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet.UNRECOGNIZED : result;
-    }
-    return com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet.FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED;
-  }
-
-  public static final int CUSTOM_ALPHABET_FIELD_NUMBER = 5;
-  /**
-   * 
-   * This is supported by mapping these to the alphanumeric characters
-   * that the FFX mode natively supports. This happens before/after
-   * encryption/decryption.
-   * Each character listed must appear only once.
-   * Number of characters must be in the range [2, 62].
-   * This must be encoded as ASCII.
-   * The order of characters does not matter.
-   * 

-   *
-   * string custom_alphabet = 5;
-   */
-  public java.lang.String getCustomAlphabet() {
-    java.lang.Object ref = "";
-    if (alphabetCase_ == 5) {
-      ref = alphabet_;
-    }
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      if (alphabetCase_ == 5) {
-        alphabet_ = s;
-      }
-      return s;
-    }
-  }
-  /**
-   * 
-   * This is supported by mapping these to the alphanumeric characters
-   * that the FFX mode natively supports. This happens before/after
-   * encryption/decryption.
-   * Each character listed must appear only once.
-   * Number of characters must be in the range [2, 62].
-   * This must be encoded as ASCII.
-   * The order of characters does not matter.
-   * 

-   *
-   * string custom_alphabet = 5;
-   */
-  public com.google.protobuf.ByteString
-      getCustomAlphabetBytes() {
-    java.lang.Object ref = "";
-    if (alphabetCase_ == 5) {
-      ref = alphabet_;
-    }
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      if (alphabetCase_ == 5) {
-        alphabet_ = b;
-      }
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int RADIX_FIELD_NUMBER = 6;
-  /**
-   * 
-   * The native way to select the alphabet. Must be in the range [2, 62].
-   * 

-   *
-   * int32 radix = 6;
-   */
-  public int getRadix() {
-    if (alphabetCase_ == 6) {
-      return (java.lang.Integer) alphabet_;
-    }
-    return 0;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (cryptoKey_ != null) {
-      output.writeMessage(1, getCryptoKey());
-    }
-    if (context_ != null) {
-      output.writeMessage(2, getContext());
-    }
-    if (alphabetCase_ == 4) {
-      output.writeEnum(4, ((java.lang.Integer) alphabet_));
-    }
-    if (alphabetCase_ == 5) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 5, alphabet_);
-    }
-    if (alphabetCase_ == 6) {
-      output.writeInt32(
-          6, (int)((java.lang.Integer) alphabet_));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (cryptoKey_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getCryptoKey());
-    }
-    if (context_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getContext());
-    }
-    if (alphabetCase_ == 4) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(4, ((java.lang.Integer) alphabet_));
-    }
-    if (alphabetCase_ == 5) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, alphabet_);
-    }
-    if (alphabetCase_ == 6) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(
-            6, (int)((java.lang.Integer) alphabet_));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig other = (com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) obj;
-
-    boolean result = true;
-    result = result && (hasCryptoKey() == other.hasCryptoKey());
-    if (hasCryptoKey()) {
-      result = result && getCryptoKey()
-          .equals(other.getCryptoKey());
-    }
-    result = result && (hasContext() == other.hasContext());
-    if (hasContext()) {
-      result = result && getContext()
-          .equals(other.getContext());
-    }
-    result = result && getAlphabetCase().equals(
-        other.getAlphabetCase());
-    if (!result) return false;
-    switch (alphabetCase_) {
-      case 4:
-        result = result && getCommonAlphabetValue()
-            == other.getCommonAlphabetValue();
-        break;
-      case 5:
-        result = result && getCustomAlphabet()
-            .equals(other.getCustomAlphabet());
-        break;
-      case 6:
-        result = result && (getRadix()
-            == other.getRadix());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasCryptoKey()) {
-      hash = (37 * hash) + CRYPTO_KEY_FIELD_NUMBER;
-      hash = (53 * hash) + getCryptoKey().hashCode();
-    }
-    if (hasContext()) {
-      hash = (37 * hash) + CONTEXT_FIELD_NUMBER;
-      hash = (53 * hash) + getContext().hashCode();
-    }
-    switch (alphabetCase_) {
-      case 4:
-        hash = (37 * hash) + COMMON_ALPHABET_FIELD_NUMBER;
-        hash = (53 * hash) + getCommonAlphabetValue();
-        break;
-      case 5:
-        hash = (37 * hash) + CUSTOM_ALPHABET_FIELD_NUMBER;
-        hash = (53 * hash) + getCustomAlphabet().hashCode();
-        break;
-      case 6:
-        hash = (37 * hash) + RADIX_FIELD_NUMBER;
-        hash = (53 * hash) + getRadix();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Replaces an identifier with a surrogate using FPE with the FFX
-   * mode of operation.
-   * The identifier must be representable by the US-ASCII character set.
-   * For a given crypto key and context, the same identifier will be
-   * replaced with the same surrogate.
-   * Identifiers must be at least two characters long.
-   * In the case that the identifier is the empty string, it will be skipped.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig)
-      com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoReplaceFfxFpeConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoReplaceFfxFpeConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.class, com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (cryptoKeyBuilder_ == null) {
-        cryptoKey_ = null;
-      } else {
-        cryptoKey_ = null;
-        cryptoKeyBuilder_ = null;
-      }
-      if (contextBuilder_ == null) {
-        context_ = null;
-      } else {
-        context_ = null;
-        contextBuilder_ = null;
-      }
-      alphabetCase_ = 0;
-      alphabet_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_CryptoReplaceFfxFpeConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig build() {
-      com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig result = new com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig(this);
-      if (cryptoKeyBuilder_ == null) {
-        result.cryptoKey_ = cryptoKey_;
-      } else {
-        result.cryptoKey_ = cryptoKeyBuilder_.build();
-      }
-      if (contextBuilder_ == null) {
-        result.context_ = context_;
-      } else {
-        result.context_ = contextBuilder_.build();
-      }
-      if (alphabetCase_ == 4) {
-        result.alphabet_ = alphabet_;
-      }
-      if (alphabetCase_ == 5) {
-        result.alphabet_ = alphabet_;
-      }
-      if (alphabetCase_ == 6) {
-        result.alphabet_ = alphabet_;
-      }
-      result.alphabetCase_ = alphabetCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.getDefaultInstance()) return this;
-      if (other.hasCryptoKey()) {
-        mergeCryptoKey(other.getCryptoKey());
-      }
-      if (other.hasContext()) {
-        mergeContext(other.getContext());
-      }
-      switch (other.getAlphabetCase()) {
-        case COMMON_ALPHABET: {
-          setCommonAlphabetValue(other.getCommonAlphabetValue());
-          break;
-        }
-        case CUSTOM_ALPHABET: {
-          alphabetCase_ = 5;
-          alphabet_ = other.alphabet_;
-          onChanged();
-          break;
-        }
-        case RADIX: {
-          setRadix(other.getRadix());
-          break;
-        }
-        case ALPHABET_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int alphabetCase_ = 0;
-    private java.lang.Object alphabet_;
-    public AlphabetCase
-        getAlphabetCase() {
-      return AlphabetCase.forNumber(
-          alphabetCase_);
-    }
-
-    public Builder clearAlphabet() {
-      alphabetCase_ = 0;
-      alphabet_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    private com.google.privacy.dlp.v2beta1.CryptoKey cryptoKey_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CryptoKey, com.google.privacy.dlp.v2beta1.CryptoKey.Builder, com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder> cryptoKeyBuilder_;
-    /**
-     * 
-     * The key used by the encryption algorithm. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public boolean hasCryptoKey() {
-      return cryptoKeyBuilder_ != null || cryptoKey_ != null;
-    }
-    /**
-     * 
-     * The key used by the encryption algorithm. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoKey getCryptoKey() {
-      if (cryptoKeyBuilder_ == null) {
-        return cryptoKey_ == null ? com.google.privacy.dlp.v2beta1.CryptoKey.getDefaultInstance() : cryptoKey_;
-      } else {
-        return cryptoKeyBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The key used by the encryption algorithm. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public Builder setCryptoKey(com.google.privacy.dlp.v2beta1.CryptoKey value) {
-      if (cryptoKeyBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        cryptoKey_ = value;
-        onChanged();
-      } else {
-        cryptoKeyBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The key used by the encryption algorithm. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public Builder setCryptoKey(
-        com.google.privacy.dlp.v2beta1.CryptoKey.Builder builderForValue) {
-      if (cryptoKeyBuilder_ == null) {
-        cryptoKey_ = builderForValue.build();
-        onChanged();
-      } else {
-        cryptoKeyBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The key used by the encryption algorithm. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public Builder mergeCryptoKey(com.google.privacy.dlp.v2beta1.CryptoKey value) {
-      if (cryptoKeyBuilder_ == null) {
-        if (cryptoKey_ != null) {
-          cryptoKey_ =
-            com.google.privacy.dlp.v2beta1.CryptoKey.newBuilder(cryptoKey_).mergeFrom(value).buildPartial();
-        } else {
-          cryptoKey_ = value;
-        }
-        onChanged();
-      } else {
-        cryptoKeyBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The key used by the encryption algorithm. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public Builder clearCryptoKey() {
-      if (cryptoKeyBuilder_ == null) {
-        cryptoKey_ = null;
-        onChanged();
-      } else {
-        cryptoKey_ = null;
-        cryptoKeyBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The key used by the encryption algorithm. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoKey.Builder getCryptoKeyBuilder() {
-      
-      onChanged();
-      return getCryptoKeyFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The key used by the encryption algorithm. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder getCryptoKeyOrBuilder() {
-      if (cryptoKeyBuilder_ != null) {
-        return cryptoKeyBuilder_.getMessageOrBuilder();
-      } else {
-        return cryptoKey_ == null ?
-            com.google.privacy.dlp.v2beta1.CryptoKey.getDefaultInstance() : cryptoKey_;
-      }
-    }
-    /**
-     * 
-     * The key used by the encryption algorithm. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CryptoKey, com.google.privacy.dlp.v2beta1.CryptoKey.Builder, com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder> 
-        getCryptoKeyFieldBuilder() {
-      if (cryptoKeyBuilder_ == null) {
-        cryptoKeyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CryptoKey, com.google.privacy.dlp.v2beta1.CryptoKey.Builder, com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder>(
-                getCryptoKey(),
-                getParentForChildren(),
-                isClean());
-        cryptoKey_ = null;
-      }
-      return cryptoKeyBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.FieldId context_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> contextBuilder_;
-    /**
-     * 
-     * A context may be used for higher security since the same
-     * identifier in two different contexts likely will be given a distinct
-     * surrogate. The principle is that the likeliness is inversely related
-     * to the ratio of the number of distinct identifiers per context over the
-     * number of possible surrogates: As long as this ratio is small, the
-     * likehood is large.
-     * If the context is not set, a default tweak will be used.
-     * If the context is set but:
-     * 1. there is no record present when transforming a given value or
-     * 1. the field is not present when transforming a given value,
-     * a default tweak will be used.
-     * Note that case (1) is expected when an `InfoTypeTransformation` is
-     * applied to both structured and non-structured `ContentItem`s.
-     * Currently, the referenced field may be of value type integer or string.
-     * The tweak is constructed as a sequence of bytes in big endian byte order
-     * such that:
-     * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value 2
-     * This is also known as the 'tweak', as in tweakable encryption.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId context = 2;
-     */
-    public boolean hasContext() {
-      return contextBuilder_ != null || context_ != null;
-    }
-    /**
-     * 
-     * A context may be used for higher security since the same
-     * identifier in two different contexts likely will be given a distinct
-     * surrogate. The principle is that the likeliness is inversely related
-     * to the ratio of the number of distinct identifiers per context over the
-     * number of possible surrogates: As long as this ratio is small, the
-     * likehood is large.
-     * If the context is not set, a default tweak will be used.
-     * If the context is set but:
-     * 1. there is no record present when transforming a given value or
-     * 1. the field is not present when transforming a given value,
-     * a default tweak will be used.
-     * Note that case (1) is expected when an `InfoTypeTransformation` is
-     * applied to both structured and non-structured `ContentItem`s.
-     * Currently, the referenced field may be of value type integer or string.
-     * The tweak is constructed as a sequence of bytes in big endian byte order
-     * such that:
-     * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value 2
-     * This is also known as the 'tweak', as in tweakable encryption.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId context = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getContext() {
-      if (contextBuilder_ == null) {
-        return context_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : context_;
-      } else {
-        return contextBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * A context may be used for higher security since the same
-     * identifier in two different contexts likely will be given a distinct
-     * surrogate. The principle is that the likeliness is inversely related
-     * to the ratio of the number of distinct identifiers per context over the
-     * number of possible surrogates: As long as this ratio is small, the
-     * likehood is large.
-     * If the context is not set, a default tweak will be used.
-     * If the context is set but:
-     * 1. there is no record present when transforming a given value or
-     * 1. the field is not present when transforming a given value,
-     * a default tweak will be used.
-     * Note that case (1) is expected when an `InfoTypeTransformation` is
-     * applied to both structured and non-structured `ContentItem`s.
-     * Currently, the referenced field may be of value type integer or string.
-     * The tweak is constructed as a sequence of bytes in big endian byte order
-     * such that:
-     * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value 2
-     * This is also known as the 'tweak', as in tweakable encryption.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId context = 2;
-     */
-    public Builder setContext(com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (contextBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        context_ = value;
-        onChanged();
-      } else {
-        contextBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * A context may be used for higher security since the same
-     * identifier in two different contexts likely will be given a distinct
-     * surrogate. The principle is that the likeliness is inversely related
-     * to the ratio of the number of distinct identifiers per context over the
-     * number of possible surrogates: As long as this ratio is small, the
-     * likehood is large.
-     * If the context is not set, a default tweak will be used.
-     * If the context is set but:
-     * 1. there is no record present when transforming a given value or
-     * 1. the field is not present when transforming a given value,
-     * a default tweak will be used.
-     * Note that case (1) is expected when an `InfoTypeTransformation` is
-     * applied to both structured and non-structured `ContentItem`s.
-     * Currently, the referenced field may be of value type integer or string.
-     * The tweak is constructed as a sequence of bytes in big endian byte order
-     * such that:
-     * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value 2
-     * This is also known as the 'tweak', as in tweakable encryption.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId context = 2;
-     */
-    public Builder setContext(
-        com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (contextBuilder_ == null) {
-        context_ = builderForValue.build();
-        onChanged();
-      } else {
-        contextBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * A context may be used for higher security since the same
-     * identifier in two different contexts likely will be given a distinct
-     * surrogate. The principle is that the likeliness is inversely related
-     * to the ratio of the number of distinct identifiers per context over the
-     * number of possible surrogates: As long as this ratio is small, the
-     * likehood is large.
-     * If the context is not set, a default tweak will be used.
-     * If the context is set but:
-     * 1. there is no record present when transforming a given value or
-     * 1. the field is not present when transforming a given value,
-     * a default tweak will be used.
-     * Note that case (1) is expected when an `InfoTypeTransformation` is
-     * applied to both structured and non-structured `ContentItem`s.
-     * Currently, the referenced field may be of value type integer or string.
-     * The tweak is constructed as a sequence of bytes in big endian byte order
-     * such that:
-     * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value 2
-     * This is also known as the 'tweak', as in tweakable encryption.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId context = 2;
-     */
-    public Builder mergeContext(com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (contextBuilder_ == null) {
-        if (context_ != null) {
-          context_ =
-            com.google.privacy.dlp.v2beta1.FieldId.newBuilder(context_).mergeFrom(value).buildPartial();
-        } else {
-          context_ = value;
-        }
-        onChanged();
-      } else {
-        contextBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * A context may be used for higher security since the same
-     * identifier in two different contexts likely will be given a distinct
-     * surrogate. The principle is that the likeliness is inversely related
-     * to the ratio of the number of distinct identifiers per context over the
-     * number of possible surrogates: As long as this ratio is small, the
-     * likehood is large.
-     * If the context is not set, a default tweak will be used.
-     * If the context is set but:
-     * 1. there is no record present when transforming a given value or
-     * 1. the field is not present when transforming a given value,
-     * a default tweak will be used.
-     * Note that case (1) is expected when an `InfoTypeTransformation` is
-     * applied to both structured and non-structured `ContentItem`s.
-     * Currently, the referenced field may be of value type integer or string.
-     * The tweak is constructed as a sequence of bytes in big endian byte order
-     * such that:
-     * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value 2
-     * This is also known as the 'tweak', as in tweakable encryption.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId context = 2;
-     */
-    public Builder clearContext() {
-      if (contextBuilder_ == null) {
-        context_ = null;
-        onChanged();
-      } else {
-        context_ = null;
-        contextBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * A context may be used for higher security since the same
-     * identifier in two different contexts likely will be given a distinct
-     * surrogate. The principle is that the likeliness is inversely related
-     * to the ratio of the number of distinct identifiers per context over the
-     * number of possible surrogates: As long as this ratio is small, the
-     * likehood is large.
-     * If the context is not set, a default tweak will be used.
-     * If the context is set but:
-     * 1. there is no record present when transforming a given value or
-     * 1. the field is not present when transforming a given value,
-     * a default tweak will be used.
-     * Note that case (1) is expected when an `InfoTypeTransformation` is
-     * applied to both structured and non-structured `ContentItem`s.
-     * Currently, the referenced field may be of value type integer or string.
-     * The tweak is constructed as a sequence of bytes in big endian byte order
-     * such that:
-     * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value 2
-     * This is also known as the 'tweak', as in tweakable encryption.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId context = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder getContextBuilder() {
-      
-      onChanged();
-      return getContextFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * A context may be used for higher security since the same
-     * identifier in two different contexts likely will be given a distinct
-     * surrogate. The principle is that the likeliness is inversely related
-     * to the ratio of the number of distinct identifiers per context over the
-     * number of possible surrogates: As long as this ratio is small, the
-     * likehood is large.
-     * If the context is not set, a default tweak will be used.
-     * If the context is set but:
-     * 1. there is no record present when transforming a given value or
-     * 1. the field is not present when transforming a given value,
-     * a default tweak will be used.
-     * Note that case (1) is expected when an `InfoTypeTransformation` is
-     * applied to both structured and non-structured `ContentItem`s.
-     * Currently, the referenced field may be of value type integer or string.
-     * The tweak is constructed as a sequence of bytes in big endian byte order
-     * such that:
-     * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value 2
-     * This is also known as the 'tweak', as in tweakable encryption.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId context = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getContextOrBuilder() {
-      if (contextBuilder_ != null) {
-        return contextBuilder_.getMessageOrBuilder();
-      } else {
-        return context_ == null ?
-            com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : context_;
-      }
-    }
-    /**
-     * 
-     * A context may be used for higher security since the same
-     * identifier in two different contexts likely will be given a distinct
-     * surrogate. The principle is that the likeliness is inversely related
-     * to the ratio of the number of distinct identifiers per context over the
-     * number of possible surrogates: As long as this ratio is small, the
-     * likehood is large.
-     * If the context is not set, a default tweak will be used.
-     * If the context is set but:
-     * 1. there is no record present when transforming a given value or
-     * 1. the field is not present when transforming a given value,
-     * a default tweak will be used.
-     * Note that case (1) is expected when an `InfoTypeTransformation` is
-     * applied to both structured and non-structured `ContentItem`s.
-     * Currently, the referenced field may be of value type integer or string.
-     * The tweak is constructed as a sequence of bytes in big endian byte order
-     * such that:
-     * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value 2
-     * This is also known as the 'tweak', as in tweakable encryption.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId context = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-        getContextFieldBuilder() {
-      if (contextBuilder_ == null) {
-        contextBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                getContext(),
-                getParentForChildren(),
-                isClean());
-        context_ = null;
-      }
-      return contextBuilder_;
-    }
-
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet common_alphabet = 4;
-     */
-    public int getCommonAlphabetValue() {
-      if (alphabetCase_ == 4) {
-        return ((java.lang.Integer) alphabet_).intValue();
-      }
-      return 0;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet common_alphabet = 4;
-     */
-    public Builder setCommonAlphabetValue(int value) {
-      alphabetCase_ = 4;
-      alphabet_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet common_alphabet = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet getCommonAlphabet() {
-      if (alphabetCase_ == 4) {
-        com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet result = com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet.valueOf(
-            (java.lang.Integer) alphabet_);
-        return result == null ? com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet.UNRECOGNIZED : result;
-      }
-      return com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet.FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet common_alphabet = 4;
-     */
-    public Builder setCommonAlphabet(com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      alphabetCase_ = 4;
-      alphabet_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet common_alphabet = 4;
-     */
-    public Builder clearCommonAlphabet() {
-      if (alphabetCase_ == 4) {
-        alphabetCase_ = 0;
-        alphabet_ = null;
-        onChanged();
-      }
-      return this;
-    }
-
-    /**
-     * 
-     * This is supported by mapping these to the alphanumeric characters
-     * that the FFX mode natively supports. This happens before/after
-     * encryption/decryption.
-     * Each character listed must appear only once.
-     * Number of characters must be in the range [2, 62].
-     * This must be encoded as ASCII.
-     * The order of characters does not matter.
-     * 

-     *
-     * string custom_alphabet = 5;
-     */
-    public java.lang.String getCustomAlphabet() {
-      java.lang.Object ref = "";
-      if (alphabetCase_ == 5) {
-        ref = alphabet_;
-      }
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (alphabetCase_ == 5) {
-          alphabet_ = s;
-        }
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * This is supported by mapping these to the alphanumeric characters
-     * that the FFX mode natively supports. This happens before/after
-     * encryption/decryption.
-     * Each character listed must appear only once.
-     * Number of characters must be in the range [2, 62].
-     * This must be encoded as ASCII.
-     * The order of characters does not matter.
-     * 

-     *
-     * string custom_alphabet = 5;
-     */
-    public com.google.protobuf.ByteString
-        getCustomAlphabetBytes() {
-      java.lang.Object ref = "";
-      if (alphabetCase_ == 5) {
-        ref = alphabet_;
-      }
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        if (alphabetCase_ == 5) {
-          alphabet_ = b;
-        }
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * This is supported by mapping these to the alphanumeric characters
-     * that the FFX mode natively supports. This happens before/after
-     * encryption/decryption.
-     * Each character listed must appear only once.
-     * Number of characters must be in the range [2, 62].
-     * This must be encoded as ASCII.
-     * The order of characters does not matter.
-     * 

-     *
-     * string custom_alphabet = 5;
-     */
-    public Builder setCustomAlphabet(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  alphabetCase_ = 5;
-      alphabet_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * This is supported by mapping these to the alphanumeric characters
-     * that the FFX mode natively supports. This happens before/after
-     * encryption/decryption.
-     * Each character listed must appear only once.
-     * Number of characters must be in the range [2, 62].
-     * This must be encoded as ASCII.
-     * The order of characters does not matter.
-     * 

-     *
-     * string custom_alphabet = 5;
-     */
-    public Builder clearCustomAlphabet() {
-      if (alphabetCase_ == 5) {
-        alphabetCase_ = 0;
-        alphabet_ = null;
-        onChanged();
-      }
-      return this;
-    }
-    /**
-     * 
-     * This is supported by mapping these to the alphanumeric characters
-     * that the FFX mode natively supports. This happens before/after
-     * encryption/decryption.
-     * Each character listed must appear only once.
-     * Number of characters must be in the range [2, 62].
-     * This must be encoded as ASCII.
-     * The order of characters does not matter.
-     * 

-     *
-     * string custom_alphabet = 5;
-     */
-    public Builder setCustomAlphabetBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      alphabetCase_ = 5;
-      alphabet_ = value;
-      onChanged();
-      return this;
-    }
-
-    /**
-     * 
-     * The native way to select the alphabet. Must be in the range [2, 62].
-     * 

-     *
-     * int32 radix = 6;
-     */
-    public int getRadix() {
-      if (alphabetCase_ == 6) {
-        return (java.lang.Integer) alphabet_;
-      }
-      return 0;
-    }
-    /**
-     * 
-     * The native way to select the alphabet. Must be in the range [2, 62].
-     * 

-     *
-     * int32 radix = 6;
-     */
-    public Builder setRadix(int value) {
-      alphabetCase_ = 6;
-      alphabet_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The native way to select the alphabet. Must be in the range [2, 62].
-     * 

-     *
-     * int32 radix = 6;
-     */
-    public Builder clearRadix() {
-      if (alphabetCase_ == 6) {
-        alphabetCase_ = 0;
-        alphabet_ = null;
-        onChanged();
-      }
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig)
-  private static final com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public CryptoReplaceFfxFpeConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CryptoReplaceFfxFpeConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoReplaceFfxFpeConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoReplaceFfxFpeConfigOrBuilder.java
deleted file mode 100644
index 50b3c41d4be9..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CryptoReplaceFfxFpeConfigOrBuilder.java
+++ /dev/null
@@ -1,163 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface CryptoReplaceFfxFpeConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The key used by the encryption algorithm. [required]
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-   */
-  boolean hasCryptoKey();
-  /**
-   * 
-   * The key used by the encryption algorithm. [required]
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-   */
-  com.google.privacy.dlp.v2beta1.CryptoKey getCryptoKey();
-  /**
-   * 
-   * The key used by the encryption algorithm. [required]
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CryptoKey crypto_key = 1;
-   */
-  com.google.privacy.dlp.v2beta1.CryptoKeyOrBuilder getCryptoKeyOrBuilder();
-
-  /**
-   * 
-   * A context may be used for higher security since the same
-   * identifier in two different contexts likely will be given a distinct
-   * surrogate. The principle is that the likeliness is inversely related
-   * to the ratio of the number of distinct identifiers per context over the
-   * number of possible surrogates: As long as this ratio is small, the
-   * likehood is large.
-   * If the context is not set, a default tweak will be used.
-   * If the context is set but:
-   * 1. there is no record present when transforming a given value or
-   * 1. the field is not present when transforming a given value,
-   * a default tweak will be used.
-   * Note that case (1) is expected when an `InfoTypeTransformation` is
-   * applied to both structured and non-structured `ContentItem`s.
-   * Currently, the referenced field may be of value type integer or string.
-   * The tweak is constructed as a sequence of bytes in big endian byte order
-   * such that:
-   * - a 64 bit integer is encoded followed by a single byte of value 1
-   * - a string is encoded in UTF-8 format followed by a single byte of value 2
-   * This is also known as the 'tweak', as in tweakable encryption.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId context = 2;
-   */
-  boolean hasContext();
-  /**
-   * 
-   * A context may be used for higher security since the same
-   * identifier in two different contexts likely will be given a distinct
-   * surrogate. The principle is that the likeliness is inversely related
-   * to the ratio of the number of distinct identifiers per context over the
-   * number of possible surrogates: As long as this ratio is small, the
-   * likehood is large.
-   * If the context is not set, a default tweak will be used.
-   * If the context is set but:
-   * 1. there is no record present when transforming a given value or
-   * 1. the field is not present when transforming a given value,
-   * a default tweak will be used.
-   * Note that case (1) is expected when an `InfoTypeTransformation` is
-   * applied to both structured and non-structured `ContentItem`s.
-   * Currently, the referenced field may be of value type integer or string.
-   * The tweak is constructed as a sequence of bytes in big endian byte order
-   * such that:
-   * - a 64 bit integer is encoded followed by a single byte of value 1
-   * - a string is encoded in UTF-8 format followed by a single byte of value 2
-   * This is also known as the 'tweak', as in tweakable encryption.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId context = 2;
-   */
-  com.google.privacy.dlp.v2beta1.FieldId getContext();
-  /**
-   * 
-   * A context may be used for higher security since the same
-   * identifier in two different contexts likely will be given a distinct
-   * surrogate. The principle is that the likeliness is inversely related
-   * to the ratio of the number of distinct identifiers per context over the
-   * number of possible surrogates: As long as this ratio is small, the
-   * likehood is large.
-   * If the context is not set, a default tweak will be used.
-   * If the context is set but:
-   * 1. there is no record present when transforming a given value or
-   * 1. the field is not present when transforming a given value,
-   * a default tweak will be used.
-   * Note that case (1) is expected when an `InfoTypeTransformation` is
-   * applied to both structured and non-structured `ContentItem`s.
-   * Currently, the referenced field may be of value type integer or string.
-   * The tweak is constructed as a sequence of bytes in big endian byte order
-   * such that:
-   * - a 64 bit integer is encoded followed by a single byte of value 1
-   * - a string is encoded in UTF-8 format followed by a single byte of value 2
-   * This is also known as the 'tweak', as in tweakable encryption.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId context = 2;
-   */
-  com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getContextOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet common_alphabet = 4;
-   */
-  int getCommonAlphabetValue();
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet common_alphabet = 4;
-   */
-  com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.FfxCommonNativeAlphabet getCommonAlphabet();
-
-  /**
-   * 
-   * This is supported by mapping these to the alphanumeric characters
-   * that the FFX mode natively supports. This happens before/after
-   * encryption/decryption.
-   * Each character listed must appear only once.
-   * Number of characters must be in the range [2, 62].
-   * This must be encoded as ASCII.
-   * The order of characters does not matter.
-   * 

-   *
-   * string custom_alphabet = 5;
-   */
-  java.lang.String getCustomAlphabet();
-  /**
-   * 
-   * This is supported by mapping these to the alphanumeric characters
-   * that the FFX mode natively supports. This happens before/after
-   * encryption/decryption.
-   * Each character listed must appear only once.
-   * Number of characters must be in the range [2, 62].
-   * This must be encoded as ASCII.
-   * The order of characters does not matter.
-   * 

-   *
-   * string custom_alphabet = 5;
-   */
-  com.google.protobuf.ByteString
-      getCustomAlphabetBytes();
-
-  /**
-   * 
-   * The native way to select the alphabet. Must be in the range [2, 62].
-   * 

-   *
-   * int32 radix = 6;
-   */
-  int getRadix();
-
-  public com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.AlphabetCase getAlphabetCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CustomInfoType.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CustomInfoType.java
deleted file mode 100644
index c59004d71404..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CustomInfoType.java
+++ /dev/null
@@ -1,2424 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Custom information type provided by the user. Used to find domain-specific
- * sensitive information configurable to the data in question.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.CustomInfoType}
- */
-public  final class CustomInfoType extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CustomInfoType)
-    CustomInfoTypeOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use CustomInfoType.newBuilder() to construct.
-  private CustomInfoType(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private CustomInfoType() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private CustomInfoType(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.InfoType.Builder subBuilder = null;
-            if (infoType_ != null) {
-              subBuilder = infoType_.toBuilder();
-            }
-            infoType_ = input.readMessage(com.google.privacy.dlp.v2beta1.InfoType.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(infoType_);
-              infoType_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.Builder subBuilder = null;
-            if (typeCase_ == 2) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 2;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.CustomInfoType.class, com.google.privacy.dlp.v2beta1.CustomInfoType.Builder.class);
-  }
-
-  public interface DictionaryOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CustomInfoType.Dictionary)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * List of words or phrases to search for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-     */
-    boolean hasWordList();
-    /**
-     * 
-     * List of words or phrases to search for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-     */
-    com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList getWordList();
-    /**
-     * 
-     * List of words or phrases to search for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-     */
-    com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordListOrBuilder getWordListOrBuilder();
-
-    public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.SourceCase getSourceCase();
-  }
-  /**
-   * 
-   * Custom information type based on a dictionary of words or phrases. This can
-   * be used to match sensitive information specific to the data, such as a list
-   * of employee IDs or job titles.
-   * Dictionary words are case-insensitive and all characters other than letters
-   * and digits in the unicode [Basic Multilingual
-   * Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
-   * will be replaced with whitespace when scanning for matches, so the
-   * dictionary phrase "Sam Johnson" will match all three phrases "sam johnson",
-   * "Sam, Johnson", and "Sam (Johnson)". Additionally, the characters
-   * surrounding any match must be of a different type than the adjacent
-   * characters within the word, so letters must be next to non-letters and
-   * digits next to non-digits. For example, the dictionary word "jen" will
-   * match the first three letters of the text "jen123" but will return no
-   * matches for "jennifer".
-   * Dictionary words containing a large number of characters that are not
-   * letters or digits may result in unexpected findings because such characters
-   * are treated as whitespace.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CustomInfoType.Dictionary}
-   */
-  public  static final class Dictionary extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CustomInfoType.Dictionary)
-      DictionaryOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use Dictionary.newBuilder() to construct.
-    private Dictionary(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private Dictionary() {
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Dictionary(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.Builder subBuilder = null;
-              if (sourceCase_ == 1) {
-                subBuilder = ((com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) source_).toBuilder();
-              }
-              source_ =
-                  input.readMessage(com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) source_);
-                source_ = subBuilder.buildPartial();
-              }
-              sourceCase_ = 1;
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.class, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.Builder.class);
-    }
-
-    public interface WordListOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList)
-        com.google.protobuf.MessageOrBuilder {
-
-      /**
-       * 
-       * Words or phrases defining the dictionary. The dictionary must contain
-       * at least one phrase and every phrase must contain at least 2 characters
-       * that are letters or digits. [required]
-       * 

-       *
-       * repeated string words = 1;
-       */
-      java.util.List
-          getWordsList();
-      /**
-       * 
-       * Words or phrases defining the dictionary. The dictionary must contain
-       * at least one phrase and every phrase must contain at least 2 characters
-       * that are letters or digits. [required]
-       * 

-       *
-       * repeated string words = 1;
-       */
-      int getWordsCount();
-      /**
-       * 
-       * Words or phrases defining the dictionary. The dictionary must contain
-       * at least one phrase and every phrase must contain at least 2 characters
-       * that are letters or digits. [required]
-       * 

-       *
-       * repeated string words = 1;
-       */
-      java.lang.String getWords(int index);
-      /**
-       * 
-       * Words or phrases defining the dictionary. The dictionary must contain
-       * at least one phrase and every phrase must contain at least 2 characters
-       * that are letters or digits. [required]
-       * 

-       *
-       * repeated string words = 1;
-       */
-      com.google.protobuf.ByteString
-          getWordsBytes(int index);
-    }
-    /**
-     * 
-     * Message defining a list of words or phrases to search for in the data.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList}
-     */
-    public  static final class WordList extends
-        com.google.protobuf.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList)
-        WordListOrBuilder {
-    private static final long serialVersionUID = 0L;
-      // Use WordList.newBuilder() to construct.
-      private WordList(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-        super(builder);
-      }
-      private WordList() {
-        words_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      }
-
-      @java.lang.Override
-      public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private WordList(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-            com.google.protobuf.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-              case 10: {
-                java.lang.String s = input.readStringRequireUtf8();
-                if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                  words_ = new com.google.protobuf.LazyStringArrayList();
-                  mutable_bitField0_ |= 0x00000001;
-                }
-                words_.add(s);
-                break;
-              }
-            }
-          }
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-            words_ = words_.getUnmodifiableView();
-          }
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_WordList_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_WordList_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.class, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.Builder.class);
-      }
-
-      public static final int WORDS_FIELD_NUMBER = 1;
-      private com.google.protobuf.LazyStringList words_;
-      /**
-       * 
-       * Words or phrases defining the dictionary. The dictionary must contain
-       * at least one phrase and every phrase must contain at least 2 characters
-       * that are letters or digits. [required]
-       * 

-       *
-       * repeated string words = 1;
-       */
-      public com.google.protobuf.ProtocolStringList
-          getWordsList() {
-        return words_;
-      }
-      /**
-       * 
-       * Words or phrases defining the dictionary. The dictionary must contain
-       * at least one phrase and every phrase must contain at least 2 characters
-       * that are letters or digits. [required]
-       * 

-       *
-       * repeated string words = 1;
-       */
-      public int getWordsCount() {
-        return words_.size();
-      }
-      /**
-       * 
-       * Words or phrases defining the dictionary. The dictionary must contain
-       * at least one phrase and every phrase must contain at least 2 characters
-       * that are letters or digits. [required]
-       * 

-       *
-       * repeated string words = 1;
-       */
-      public java.lang.String getWords(int index) {
-        return words_.get(index);
-      }
-      /**
-       * 
-       * Words or phrases defining the dictionary. The dictionary must contain
-       * at least one phrase and every phrase must contain at least 2 characters
-       * that are letters or digits. [required]
-       * 

-       *
-       * repeated string words = 1;
-       */
-      public com.google.protobuf.ByteString
-          getWordsBytes(int index) {
-        return words_.getByteString(index);
-      }
-
-      private byte memoizedIsInitialized = -1;
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized == 1) return true;
-        if (isInitialized == 0) return false;
-
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      public void writeTo(com.google.protobuf.CodedOutputStream output)
-                          throws java.io.IOException {
-        for (int i = 0; i < words_.size(); i++) {
-          com.google.protobuf.GeneratedMessageV3.writeString(output, 1, words_.getRaw(i));
-        }
-        unknownFields.writeTo(output);
-      }
-
-      public int getSerializedSize() {
-        int size = memoizedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        {
-          int dataSize = 0;
-          for (int i = 0; i < words_.size(); i++) {
-            dataSize += computeStringSizeNoTag(words_.getRaw(i));
-          }
-          size += dataSize;
-          size += 1 * getWordsList().size();
-        }
-        size += unknownFields.getSerializedSize();
-        memoizedSize = size;
-        return size;
-      }
-
-      @java.lang.Override
-      public boolean equals(final java.lang.Object obj) {
-        if (obj == this) {
-         return true;
-        }
-        if (!(obj instanceof com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList)) {
-          return super.equals(obj);
-        }
-        com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList other = (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) obj;
-
-        boolean result = true;
-        result = result && getWordsList()
-            .equals(other.getWordsList());
-        result = result && unknownFields.equals(other.unknownFields);
-        return result;
-      }
-
-      @java.lang.Override
-      public int hashCode() {
-        if (memoizedHashCode != 0) {
-          return memoizedHashCode;
-        }
-        int hash = 41;
-        hash = (19 * hash) + getDescriptor().hashCode();
-        if (getWordsCount() > 0) {
-          hash = (37 * hash) + WORDS_FIELD_NUMBER;
-          hash = (53 * hash) + getWordsList().hashCode();
-        }
-        hash = (29 * hash) + unknownFields.hashCode();
-        memoizedHashCode = hash;
-        return hash;
-      }
-
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parseFrom(
-          java.nio.ByteBuffer data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parseFrom(
-          java.nio.ByteBuffer data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parseFrom(
-          com.google.protobuf.ByteString data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parseFrom(
-          com.google.protobuf.ByteString data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parseFrom(byte[] data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parseFrom(
-          byte[] data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parseFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parseDelimitedFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parseFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parseFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder() {
-        return DEFAULT_INSTANCE.toBuilder();
-      }
-      public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList prototype) {
-        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-      }
-      public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE
-            ? new Builder() : new Builder().mergeFrom(this);
-      }
-
-      @java.lang.Override
-      protected Builder newBuilderForType(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        Builder builder = new Builder(parent);
-        return builder;
-      }
-      /**
-       * 
-       * Message defining a list of words or phrases to search for in the data.
-       * 

-       *
-       * Protobuf type {@code google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList}
-       */
-      public static final class Builder extends
-          com.google.protobuf.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList)
-          com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordListOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor
-            getDescriptor() {
-          return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_WordList_descriptor;
-        }
-
-        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-            internalGetFieldAccessorTable() {
-          return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_WordList_fieldAccessorTable
-              .ensureFieldAccessorsInitialized(
-                  com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.class, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.Builder.class);
-        }
-
-        // Construct using com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private Builder(
-            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-          super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-          }
-        }
-        public Builder clear() {
-          super.clear();
-          words_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-          bitField0_ = (bitField0_ & ~0x00000001);
-          return this;
-        }
-
-        public com.google.protobuf.Descriptors.Descriptor
-            getDescriptorForType() {
-          return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_WordList_descriptor;
-        }
-
-        public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList getDefaultInstanceForType() {
-          return com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.getDefaultInstance();
-        }
-
-        public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList build() {
-          com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList buildPartial() {
-          com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList result = new com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList(this);
-          int from_bitField0_ = bitField0_;
-          if (((bitField0_ & 0x00000001) == 0x00000001)) {
-            words_ = words_.getUnmodifiableView();
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.words_ = words_;
-          onBuilt();
-          return result;
-        }
-
-        public Builder clone() {
-          return (Builder) super.clone();
-        }
-        public Builder setField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return (Builder) super.setField(field, value);
-        }
-        public Builder clearField(
-            com.google.protobuf.Descriptors.FieldDescriptor field) {
-          return (Builder) super.clearField(field);
-        }
-        public Builder clearOneof(
-            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-          return (Builder) super.clearOneof(oneof);
-        }
-        public Builder setRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, java.lang.Object value) {
-          return (Builder) super.setRepeatedField(field, index, value);
-        }
-        public Builder addRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return (Builder) super.addRepeatedField(field, value);
-        }
-        public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) {
-            return mergeFrom((com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList)other);
-          } else {
-            super.mergeFrom(other);
-            return this;
-          }
-        }
-
-        public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList other) {
-          if (other == com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.getDefaultInstance()) return this;
-          if (!other.words_.isEmpty()) {
-            if (words_.isEmpty()) {
-              words_ = other.words_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureWordsIsMutable();
-              words_.addAll(other.words_);
-            }
-            onChanged();
-          }
-          this.mergeUnknownFields(other.unknownFields);
-          onChanged();
-          return this;
-        }
-
-        public final boolean isInitialized() {
-          return true;
-        }
-
-        public Builder mergeFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-          com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) e.getUnfinishedMessage();
-            throw e.unwrapIOException();
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-        private int bitField0_;
-
-        private com.google.protobuf.LazyStringList words_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        private void ensureWordsIsMutable() {
-          if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-            words_ = new com.google.protobuf.LazyStringArrayList(words_);
-            bitField0_ |= 0x00000001;
-           }
-        }
-        /**
-         * 
-         * Words or phrases defining the dictionary. The dictionary must contain
-         * at least one phrase and every phrase must contain at least 2 characters
-         * that are letters or digits. [required]
-         * 

-         *
-         * repeated string words = 1;
-         */
-        public com.google.protobuf.ProtocolStringList
-            getWordsList() {
-          return words_.getUnmodifiableView();
-        }
-        /**
-         * 
-         * Words or phrases defining the dictionary. The dictionary must contain
-         * at least one phrase and every phrase must contain at least 2 characters
-         * that are letters or digits. [required]
-         * 

-         *
-         * repeated string words = 1;
-         */
-        public int getWordsCount() {
-          return words_.size();
-        }
-        /**
-         * 
-         * Words or phrases defining the dictionary. The dictionary must contain
-         * at least one phrase and every phrase must contain at least 2 characters
-         * that are letters or digits. [required]
-         * 

-         *
-         * repeated string words = 1;
-         */
-        public java.lang.String getWords(int index) {
-          return words_.get(index);
-        }
-        /**
-         * 
-         * Words or phrases defining the dictionary. The dictionary must contain
-         * at least one phrase and every phrase must contain at least 2 characters
-         * that are letters or digits. [required]
-         * 

-         *
-         * repeated string words = 1;
-         */
-        public com.google.protobuf.ByteString
-            getWordsBytes(int index) {
-          return words_.getByteString(index);
-        }
-        /**
-         * 
-         * Words or phrases defining the dictionary. The dictionary must contain
-         * at least one phrase and every phrase must contain at least 2 characters
-         * that are letters or digits. [required]
-         * 

-         *
-         * repeated string words = 1;
-         */
-        public Builder setWords(
-            int index, java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureWordsIsMutable();
-          words_.set(index, value);
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Words or phrases defining the dictionary. The dictionary must contain
-         * at least one phrase and every phrase must contain at least 2 characters
-         * that are letters or digits. [required]
-         * 

-         *
-         * repeated string words = 1;
-         */
-        public Builder addWords(
-            java.lang.String value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureWordsIsMutable();
-          words_.add(value);
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Words or phrases defining the dictionary. The dictionary must contain
-         * at least one phrase and every phrase must contain at least 2 characters
-         * that are letters or digits. [required]
-         * 

-         *
-         * repeated string words = 1;
-         */
-        public Builder addAllWords(
-            java.lang.Iterable values) {
-          ensureWordsIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, words_);
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Words or phrases defining the dictionary. The dictionary must contain
-         * at least one phrase and every phrase must contain at least 2 characters
-         * that are letters or digits. [required]
-         * 

-         *
-         * repeated string words = 1;
-         */
-        public Builder clearWords() {
-          words_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Words or phrases defining the dictionary. The dictionary must contain
-         * at least one phrase and every phrase must contain at least 2 characters
-         * that are letters or digits. [required]
-         * 

-         *
-         * repeated string words = 1;
-         */
-        public Builder addWordsBytes(
-            com.google.protobuf.ByteString value) {
-          if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-          ensureWordsIsMutable();
-          words_.add(value);
-          onChanged();
-          return this;
-        }
-        public final Builder setUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.setUnknownFieldsProto3(unknownFields);
-        }
-
-        public final Builder mergeUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.mergeUnknownFields(unknownFields);
-        }
-
-
-        // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList)
-      }
-
-      // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList)
-      private static final com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList DEFAULT_INSTANCE;
-      static {
-        DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList();
-      }
-
-      public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList getDefaultInstance() {
-        return DEFAULT_INSTANCE;
-      }
-
-      private static final com.google.protobuf.Parser
-          PARSER = new com.google.protobuf.AbstractParser() {
-        public WordList parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new WordList(input, extensionRegistry);
-        }
-      };
-
-      public static com.google.protobuf.Parser parser() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Parser getParserForType() {
-        return PARSER;
-      }
-
-      public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList getDefaultInstanceForType() {
-        return DEFAULT_INSTANCE;
-      }
-
-    }
-
-    private int sourceCase_ = 0;
-    private java.lang.Object source_;
-    public enum SourceCase
-        implements com.google.protobuf.Internal.EnumLite {
-      WORD_LIST(1),
-      SOURCE_NOT_SET(0);
-      private final int value;
-      private SourceCase(int value) {
-        this.value = value;
-      }
-      /**
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static SourceCase valueOf(int value) {
-        return forNumber(value);
-      }
-
-      public static SourceCase forNumber(int value) {
-        switch (value) {
-          case 1: return WORD_LIST;
-          case 0: return SOURCE_NOT_SET;
-          default: return null;
-        }
-      }
-      public int getNumber() {
-        return this.value;
-      }
-    };
-
-    public SourceCase
-    getSourceCase() {
-      return SourceCase.forNumber(
-          sourceCase_);
-    }
-
-    public static final int WORD_LIST_FIELD_NUMBER = 1;
-    /**
-     * 
-     * List of words or phrases to search for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-     */
-    public boolean hasWordList() {
-      return sourceCase_ == 1;
-    }
-    /**
-     * 
-     * List of words or phrases to search for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList getWordList() {
-      if (sourceCase_ == 1) {
-         return (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) source_;
-      }
-      return com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.getDefaultInstance();
-    }
-    /**
-     * 
-     * List of words or phrases to search for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordListOrBuilder getWordListOrBuilder() {
-      if (sourceCase_ == 1) {
-         return (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) source_;
-      }
-      return com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.getDefaultInstance();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (sourceCase_ == 1) {
-        output.writeMessage(1, (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) source_);
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (sourceCase_ == 1) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) source_);
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary other = (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) obj;
-
-      boolean result = true;
-      result = result && getSourceCase().equals(
-          other.getSourceCase());
-      if (!result) return false;
-      switch (sourceCase_) {
-        case 1:
-          result = result && getWordList()
-              .equals(other.getWordList());
-          break;
-        case 0:
-        default:
-      }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      switch (sourceCase_) {
-        case 1:
-          hash = (37 * hash) + WORD_LIST_FIELD_NUMBER;
-          hash = (53 * hash) + getWordList().hashCode();
-          break;
-        case 0:
-        default:
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Custom information type based on a dictionary of words or phrases. This can
-     * be used to match sensitive information specific to the data, such as a list
-     * of employee IDs or job titles.
-     * Dictionary words are case-insensitive and all characters other than letters
-     * and digits in the unicode [Basic Multilingual
-     * Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
-     * will be replaced with whitespace when scanning for matches, so the
-     * dictionary phrase "Sam Johnson" will match all three phrases "sam johnson",
-     * "Sam, Johnson", and "Sam (Johnson)". Additionally, the characters
-     * surrounding any match must be of a different type than the adjacent
-     * characters within the word, so letters must be next to non-letters and
-     * digits next to non-digits. For example, the dictionary word "jen" will
-     * match the first three letters of the text "jen123" but will return no
-     * matches for "jennifer".
-     * Dictionary words containing a large number of characters that are not
-     * letters or digits may result in unexpected findings because such characters
-     * are treated as whitespace.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.CustomInfoType.Dictionary}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CustomInfoType.Dictionary)
-        com.google.privacy.dlp.v2beta1.CustomInfoType.DictionaryOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.class, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        sourceCase_ = 0;
-        source_ = null;
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary build() {
-        com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary buildPartial() {
-        com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary result = new com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary(this);
-        if (sourceCase_ == 1) {
-          if (wordListBuilder_ == null) {
-            result.source_ = source_;
-          } else {
-            result.source_ = wordListBuilder_.build();
-          }
-        }
-        result.sourceCase_ = sourceCase_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary other) {
-        if (other == com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.getDefaultInstance()) return this;
-        switch (other.getSourceCase()) {
-          case WORD_LIST: {
-            mergeWordList(other.getWordList());
-            break;
-          }
-          case SOURCE_NOT_SET: {
-            break;
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int sourceCase_ = 0;
-      private java.lang.Object source_;
-      public SourceCase
-          getSourceCase() {
-        return SourceCase.forNumber(
-            sourceCase_);
-      }
-
-      public Builder clearSource() {
-        sourceCase_ = 0;
-        source_ = null;
-        onChanged();
-        return this;
-      }
-
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.Builder, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordListOrBuilder> wordListBuilder_;
-      /**
-       * 
-       * List of words or phrases to search for.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-       */
-      public boolean hasWordList() {
-        return sourceCase_ == 1;
-      }
-      /**
-       * 
-       * List of words or phrases to search for.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList getWordList() {
-        if (wordListBuilder_ == null) {
-          if (sourceCase_ == 1) {
-            return (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) source_;
-          }
-          return com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.getDefaultInstance();
-        } else {
-          if (sourceCase_ == 1) {
-            return wordListBuilder_.getMessage();
-          }
-          return com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.getDefaultInstance();
-        }
-      }
-      /**
-       * 
-       * List of words or phrases to search for.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-       */
-      public Builder setWordList(com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList value) {
-        if (wordListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          source_ = value;
-          onChanged();
-        } else {
-          wordListBuilder_.setMessage(value);
-        }
-        sourceCase_ = 1;
-        return this;
-      }
-      /**
-       * 
-       * List of words or phrases to search for.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-       */
-      public Builder setWordList(
-          com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.Builder builderForValue) {
-        if (wordListBuilder_ == null) {
-          source_ = builderForValue.build();
-          onChanged();
-        } else {
-          wordListBuilder_.setMessage(builderForValue.build());
-        }
-        sourceCase_ = 1;
-        return this;
-      }
-      /**
-       * 
-       * List of words or phrases to search for.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-       */
-      public Builder mergeWordList(com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList value) {
-        if (wordListBuilder_ == null) {
-          if (sourceCase_ == 1 &&
-              source_ != com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.getDefaultInstance()) {
-            source_ = com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.newBuilder((com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) source_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            source_ = value;
-          }
-          onChanged();
-        } else {
-          if (sourceCase_ == 1) {
-            wordListBuilder_.mergeFrom(value);
-          }
-          wordListBuilder_.setMessage(value);
-        }
-        sourceCase_ = 1;
-        return this;
-      }
-      /**
-       * 
-       * List of words or phrases to search for.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-       */
-      public Builder clearWordList() {
-        if (wordListBuilder_ == null) {
-          if (sourceCase_ == 1) {
-            sourceCase_ = 0;
-            source_ = null;
-            onChanged();
-          }
-        } else {
-          if (sourceCase_ == 1) {
-            sourceCase_ = 0;
-            source_ = null;
-          }
-          wordListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of words or phrases to search for.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.Builder getWordListBuilder() {
-        return getWordListFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * List of words or phrases to search for.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordListOrBuilder getWordListOrBuilder() {
-        if ((sourceCase_ == 1) && (wordListBuilder_ != null)) {
-          return wordListBuilder_.getMessageOrBuilder();
-        } else {
-          if (sourceCase_ == 1) {
-            return (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) source_;
-          }
-          return com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.getDefaultInstance();
-        }
-      }
-      /**
-       * 
-       * List of words or phrases to search for.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList word_list = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.Builder, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordListOrBuilder> 
-          getWordListFieldBuilder() {
-        if (wordListBuilder_ == null) {
-          if (!(sourceCase_ == 1)) {
-            source_ = com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.getDefaultInstance();
-          }
-          wordListBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList.Builder, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordListOrBuilder>(
-                  (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.WordList) source_,
-                  getParentForChildren(),
-                  isClean());
-          source_ = null;
-        }
-        sourceCase_ = 1;
-        onChanged();;
-        return wordListBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CustomInfoType.Dictionary)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CustomInfoType.Dictionary)
-    private static final com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public Dictionary parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Dictionary(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private int typeCase_ = 0;
-  private java.lang.Object type_;
-  public enum TypeCase
-      implements com.google.protobuf.Internal.EnumLite {
-    DICTIONARY(2),
-    TYPE_NOT_SET(0);
-    private final int value;
-    private TypeCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static TypeCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static TypeCase forNumber(int value) {
-      switch (value) {
-        case 2: return DICTIONARY;
-        case 0: return TYPE_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public TypeCase
-  getTypeCase() {
-    return TypeCase.forNumber(
-        typeCase_);
-  }
-
-  public static final int INFO_TYPE_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.InfoType infoType_;
-  /**
-   * 
-   * Info type configuration. All custom info types must have configurations
-   * that do not conflict with built-in info types or other custom info types.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  public boolean hasInfoType() {
-    return infoType_ != null;
-  }
-  /**
-   * 
-   * Info type configuration. All custom info types must have configurations
-   * that do not conflict with built-in info types or other custom info types.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-    return infoType_ == null ? com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-  }
-  /**
-   * 
-   * Info type configuration. All custom info types must have configurations
-   * that do not conflict with built-in info types or other custom info types.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-    return getInfoType();
-  }
-
-  public static final int DICTIONARY_FIELD_NUMBER = 2;
-  /**
-   * 
-   * Dictionary-based custom info type.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-   */
-  public boolean hasDictionary() {
-    return typeCase_ == 2;
-  }
-  /**
-   * 
-   * Dictionary-based custom info type.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary getDictionary() {
-    if (typeCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.getDefaultInstance();
-  }
-  /**
-   * 
-   * Dictionary-based custom info type.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.CustomInfoType.DictionaryOrBuilder getDictionaryOrBuilder() {
-    if (typeCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.getDefaultInstance();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (infoType_ != null) {
-      output.writeMessage(1, getInfoType());
-    }
-    if (typeCase_ == 2) {
-      output.writeMessage(2, (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) type_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (infoType_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getInfoType());
-    }
-    if (typeCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) type_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.CustomInfoType)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.CustomInfoType other = (com.google.privacy.dlp.v2beta1.CustomInfoType) obj;
-
-    boolean result = true;
-    result = result && (hasInfoType() == other.hasInfoType());
-    if (hasInfoType()) {
-      result = result && getInfoType()
-          .equals(other.getInfoType());
-    }
-    result = result && getTypeCase().equals(
-        other.getTypeCase());
-    if (!result) return false;
-    switch (typeCase_) {
-      case 2:
-        result = result && getDictionary()
-            .equals(other.getDictionary());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasInfoType()) {
-      hash = (37 * hash) + INFO_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getInfoType().hashCode();
-    }
-    switch (typeCase_) {
-      case 2:
-        hash = (37 * hash) + DICTIONARY_FIELD_NUMBER;
-        hash = (53 * hash) + getDictionary().hashCode();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CustomInfoType prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Custom information type provided by the user. Used to find domain-specific
-   * sensitive information configurable to the data in question.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CustomInfoType}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CustomInfoType)
-      com.google.privacy.dlp.v2beta1.CustomInfoTypeOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CustomInfoType.class, com.google.privacy.dlp.v2beta1.CustomInfoType.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.CustomInfoType.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (infoTypeBuilder_ == null) {
-        infoType_ = null;
-      } else {
-        infoType_ = null;
-        infoTypeBuilder_ = null;
-      }
-      typeCase_ = 0;
-      type_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CustomInfoType_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CustomInfoType getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.CustomInfoType.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.CustomInfoType build() {
-      com.google.privacy.dlp.v2beta1.CustomInfoType result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.CustomInfoType buildPartial() {
-      com.google.privacy.dlp.v2beta1.CustomInfoType result = new com.google.privacy.dlp.v2beta1.CustomInfoType(this);
-      if (infoTypeBuilder_ == null) {
-        result.infoType_ = infoType_;
-      } else {
-        result.infoType_ = infoTypeBuilder_.build();
-      }
-      if (typeCase_ == 2) {
-        if (dictionaryBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = dictionaryBuilder_.build();
-        }
-      }
-      result.typeCase_ = typeCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.CustomInfoType) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.CustomInfoType)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CustomInfoType other) {
-      if (other == com.google.privacy.dlp.v2beta1.CustomInfoType.getDefaultInstance()) return this;
-      if (other.hasInfoType()) {
-        mergeInfoType(other.getInfoType());
-      }
-      switch (other.getTypeCase()) {
-        case DICTIONARY: {
-          mergeDictionary(other.getDictionary());
-          break;
-        }
-        case TYPE_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.CustomInfoType parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.CustomInfoType) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int typeCase_ = 0;
-    private java.lang.Object type_;
-    public TypeCase
-        getTypeCase() {
-      return TypeCase.forNumber(
-          typeCase_);
-    }
-
-    public Builder clearType() {
-      typeCase_ = 0;
-      type_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    private com.google.privacy.dlp.v2beta1.InfoType infoType_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> infoTypeBuilder_;
-    /**
-     * 
-     * Info type configuration. All custom info types must have configurations
-     * that do not conflict with built-in info types or other custom info types.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public boolean hasInfoType() {
-      return infoTypeBuilder_ != null || infoType_ != null;
-    }
-    /**
-     * 
-     * Info type configuration. All custom info types must have configurations
-     * that do not conflict with built-in info types or other custom info types.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-      if (infoTypeBuilder_ == null) {
-        return infoType_ == null ? com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-      } else {
-        return infoTypeBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Info type configuration. All custom info types must have configurations
-     * that do not conflict with built-in info types or other custom info types.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public Builder setInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-      if (infoTypeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        infoType_ = value;
-        onChanged();
-      } else {
-        infoTypeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Info type configuration. All custom info types must have configurations
-     * that do not conflict with built-in info types or other custom info types.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public Builder setInfoType(
-        com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-      if (infoTypeBuilder_ == null) {
-        infoType_ = builderForValue.build();
-        onChanged();
-      } else {
-        infoTypeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Info type configuration. All custom info types must have configurations
-     * that do not conflict with built-in info types or other custom info types.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public Builder mergeInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-      if (infoTypeBuilder_ == null) {
-        if (infoType_ != null) {
-          infoType_ =
-            com.google.privacy.dlp.v2beta1.InfoType.newBuilder(infoType_).mergeFrom(value).buildPartial();
-        } else {
-          infoType_ = value;
-        }
-        onChanged();
-      } else {
-        infoTypeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Info type configuration. All custom info types must have configurations
-     * that do not conflict with built-in info types or other custom info types.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public Builder clearInfoType() {
-      if (infoTypeBuilder_ == null) {
-        infoType_ = null;
-        onChanged();
-      } else {
-        infoType_ = null;
-        infoTypeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Info type configuration. All custom info types must have configurations
-     * that do not conflict with built-in info types or other custom info types.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType.Builder getInfoTypeBuilder() {
-      
-      onChanged();
-      return getInfoTypeFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Info type configuration. All custom info types must have configurations
-     * that do not conflict with built-in info types or other custom info types.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-      if (infoTypeBuilder_ != null) {
-        return infoTypeBuilder_.getMessageOrBuilder();
-      } else {
-        return infoType_ == null ?
-            com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-      }
-    }
-    /**
-     * 
-     * Info type configuration. All custom info types must have configurations
-     * that do not conflict with built-in info types or other custom info types.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> 
-        getInfoTypeFieldBuilder() {
-      if (infoTypeBuilder_ == null) {
-        infoTypeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder>(
-                getInfoType(),
-                getParentForChildren(),
-                isClean());
-        infoType_ = null;
-      }
-      return infoTypeBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.Builder, com.google.privacy.dlp.v2beta1.CustomInfoType.DictionaryOrBuilder> dictionaryBuilder_;
-    /**
-     * 
-     * Dictionary-based custom info type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-     */
-    public boolean hasDictionary() {
-      return typeCase_ == 2;
-    }
-    /**
-     * 
-     * Dictionary-based custom info type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary getDictionary() {
-      if (dictionaryBuilder_ == null) {
-        if (typeCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.getDefaultInstance();
-      } else {
-        if (typeCase_ == 2) {
-          return dictionaryBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Dictionary-based custom info type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-     */
-    public Builder setDictionary(com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary value) {
-      if (dictionaryBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        dictionaryBuilder_.setMessage(value);
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * 
-     * Dictionary-based custom info type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-     */
-    public Builder setDictionary(
-        com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.Builder builderForValue) {
-      if (dictionaryBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        dictionaryBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * 
-     * Dictionary-based custom info type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-     */
-    public Builder mergeDictionary(com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary value) {
-      if (dictionaryBuilder_ == null) {
-        if (typeCase_ == 2 &&
-            type_ != com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.getDefaultInstance()) {
-          type_ = com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.newBuilder((com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 2) {
-          dictionaryBuilder_.mergeFrom(value);
-        }
-        dictionaryBuilder_.setMessage(value);
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * 
-     * Dictionary-based custom info type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-     */
-    public Builder clearDictionary() {
-      if (dictionaryBuilder_ == null) {
-        if (typeCase_ == 2) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 2) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        dictionaryBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Dictionary-based custom info type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.Builder getDictionaryBuilder() {
-      return getDictionaryFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Dictionary-based custom info type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.CustomInfoType.DictionaryOrBuilder getDictionaryOrBuilder() {
-      if ((typeCase_ == 2) && (dictionaryBuilder_ != null)) {
-        return dictionaryBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Dictionary-based custom info type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.Builder, com.google.privacy.dlp.v2beta1.CustomInfoType.DictionaryOrBuilder> 
-        getDictionaryFieldBuilder() {
-      if (dictionaryBuilder_ == null) {
-        if (!(typeCase_ == 2)) {
-          type_ = com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.getDefaultInstance();
-        }
-        dictionaryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary, com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary.Builder, com.google.privacy.dlp.v2beta1.CustomInfoType.DictionaryOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 2;
-      onChanged();;
-      return dictionaryBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CustomInfoType)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CustomInfoType)
-  private static final com.google.privacy.dlp.v2beta1.CustomInfoType DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CustomInfoType();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.CustomInfoType getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public CustomInfoType parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CustomInfoType(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.CustomInfoType getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CustomInfoTypeOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CustomInfoTypeOrBuilder.java
deleted file mode 100644
index a87910151ee3..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/CustomInfoTypeOrBuilder.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface CustomInfoTypeOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.CustomInfoType)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Info type configuration. All custom info types must have configurations
-   * that do not conflict with built-in info types or other custom info types.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  boolean hasInfoType();
-  /**
-   * 
-   * Info type configuration. All custom info types must have configurations
-   * that do not conflict with built-in info types or other custom info types.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoType getInfoType();
-  /**
-   * 
-   * Info type configuration. All custom info types must have configurations
-   * that do not conflict with built-in info types or other custom info types.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder();
-
-  /**
-   * 
-   * Dictionary-based custom info type.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-   */
-  boolean hasDictionary();
-  /**
-   * 
-   * Dictionary-based custom info type.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-   */
-  com.google.privacy.dlp.v2beta1.CustomInfoType.Dictionary getDictionary();
-  /**
-   * 
-   * Dictionary-based custom info type.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CustomInfoType.Dictionary dictionary = 2;
-   */
-  com.google.privacy.dlp.v2beta1.CustomInfoType.DictionaryOrBuilder getDictionaryOrBuilder();
-
-  public com.google.privacy.dlp.v2beta1.CustomInfoType.TypeCase getTypeCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreKey.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreKey.java
deleted file mode 100644
index 759a04c54e6f..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreKey.java
+++ /dev/null
@@ -1,626 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Record key for a finding in Cloud Datastore.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.DatastoreKey}
- */
-public  final class DatastoreKey extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.DatastoreKey)
-    DatastoreKeyOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use DatastoreKey.newBuilder() to construct.
-  private DatastoreKey(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private DatastoreKey() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private DatastoreKey(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.Key.Builder subBuilder = null;
-            if (entityKey_ != null) {
-              subBuilder = entityKey_.toBuilder();
-            }
-            entityKey_ = input.readMessage(com.google.privacy.dlp.v2beta1.Key.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(entityKey_);
-              entityKey_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_DatastoreKey_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_DatastoreKey_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.DatastoreKey.class, com.google.privacy.dlp.v2beta1.DatastoreKey.Builder.class);
-  }
-
-  public static final int ENTITY_KEY_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.Key entityKey_;
-  /**
-   * 
-   * Datastore entity key.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-   */
-  public boolean hasEntityKey() {
-    return entityKey_ != null;
-  }
-  /**
-   * 
-   * Datastore entity key.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.Key getEntityKey() {
-    return entityKey_ == null ? com.google.privacy.dlp.v2beta1.Key.getDefaultInstance() : entityKey_;
-  }
-  /**
-   * 
-   * Datastore entity key.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.KeyOrBuilder getEntityKeyOrBuilder() {
-    return getEntityKey();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (entityKey_ != null) {
-      output.writeMessage(1, getEntityKey());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (entityKey_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getEntityKey());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.DatastoreKey)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.DatastoreKey other = (com.google.privacy.dlp.v2beta1.DatastoreKey) obj;
-
-    boolean result = true;
-    result = result && (hasEntityKey() == other.hasEntityKey());
-    if (hasEntityKey()) {
-      result = result && getEntityKey()
-          .equals(other.getEntityKey());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasEntityKey()) {
-      hash = (37 * hash) + ENTITY_KEY_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityKey().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.DatastoreKey prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Record key for a finding in Cloud Datastore.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.DatastoreKey}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.DatastoreKey)
-      com.google.privacy.dlp.v2beta1.DatastoreKeyOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_DatastoreKey_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_DatastoreKey_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.DatastoreKey.class, com.google.privacy.dlp.v2beta1.DatastoreKey.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.DatastoreKey.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (entityKeyBuilder_ == null) {
-        entityKey_ = null;
-      } else {
-        entityKey_ = null;
-        entityKeyBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_DatastoreKey_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.DatastoreKey getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.DatastoreKey.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.DatastoreKey build() {
-      com.google.privacy.dlp.v2beta1.DatastoreKey result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.DatastoreKey buildPartial() {
-      com.google.privacy.dlp.v2beta1.DatastoreKey result = new com.google.privacy.dlp.v2beta1.DatastoreKey(this);
-      if (entityKeyBuilder_ == null) {
-        result.entityKey_ = entityKey_;
-      } else {
-        result.entityKey_ = entityKeyBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.DatastoreKey) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.DatastoreKey)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.DatastoreKey other) {
-      if (other == com.google.privacy.dlp.v2beta1.DatastoreKey.getDefaultInstance()) return this;
-      if (other.hasEntityKey()) {
-        mergeEntityKey(other.getEntityKey());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.DatastoreKey parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.DatastoreKey) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.Key entityKey_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Key, com.google.privacy.dlp.v2beta1.Key.Builder, com.google.privacy.dlp.v2beta1.KeyOrBuilder> entityKeyBuilder_;
-    /**
-     * 
-     * Datastore entity key.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-     */
-    public boolean hasEntityKey() {
-      return entityKeyBuilder_ != null || entityKey_ != null;
-    }
-    /**
-     * 
-     * Datastore entity key.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Key getEntityKey() {
-      if (entityKeyBuilder_ == null) {
-        return entityKey_ == null ? com.google.privacy.dlp.v2beta1.Key.getDefaultInstance() : entityKey_;
-      } else {
-        return entityKeyBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Datastore entity key.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-     */
-    public Builder setEntityKey(com.google.privacy.dlp.v2beta1.Key value) {
-      if (entityKeyBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        entityKey_ = value;
-        onChanged();
-      } else {
-        entityKeyBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Datastore entity key.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-     */
-    public Builder setEntityKey(
-        com.google.privacy.dlp.v2beta1.Key.Builder builderForValue) {
-      if (entityKeyBuilder_ == null) {
-        entityKey_ = builderForValue.build();
-        onChanged();
-      } else {
-        entityKeyBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Datastore entity key.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-     */
-    public Builder mergeEntityKey(com.google.privacy.dlp.v2beta1.Key value) {
-      if (entityKeyBuilder_ == null) {
-        if (entityKey_ != null) {
-          entityKey_ =
-            com.google.privacy.dlp.v2beta1.Key.newBuilder(entityKey_).mergeFrom(value).buildPartial();
-        } else {
-          entityKey_ = value;
-        }
-        onChanged();
-      } else {
-        entityKeyBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Datastore entity key.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-     */
-    public Builder clearEntityKey() {
-      if (entityKeyBuilder_ == null) {
-        entityKey_ = null;
-        onChanged();
-      } else {
-        entityKey_ = null;
-        entityKeyBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Datastore entity key.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Key.Builder getEntityKeyBuilder() {
-      
-      onChanged();
-      return getEntityKeyFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Datastore entity key.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.KeyOrBuilder getEntityKeyOrBuilder() {
-      if (entityKeyBuilder_ != null) {
-        return entityKeyBuilder_.getMessageOrBuilder();
-      } else {
-        return entityKey_ == null ?
-            com.google.privacy.dlp.v2beta1.Key.getDefaultInstance() : entityKey_;
-      }
-    }
-    /**
-     * 
-     * Datastore entity key.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Key, com.google.privacy.dlp.v2beta1.Key.Builder, com.google.privacy.dlp.v2beta1.KeyOrBuilder> 
-        getEntityKeyFieldBuilder() {
-      if (entityKeyBuilder_ == null) {
-        entityKeyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Key, com.google.privacy.dlp.v2beta1.Key.Builder, com.google.privacy.dlp.v2beta1.KeyOrBuilder>(
-                getEntityKey(),
-                getParentForChildren(),
-                isClean());
-        entityKey_ = null;
-      }
-      return entityKeyBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.DatastoreKey)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.DatastoreKey)
-  private static final com.google.privacy.dlp.v2beta1.DatastoreKey DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.DatastoreKey();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.DatastoreKey getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public DatastoreKey parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DatastoreKey(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.DatastoreKey getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreKeyOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreKeyOrBuilder.java
deleted file mode 100644
index e0b995455e57..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreKeyOrBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface DatastoreKeyOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.DatastoreKey)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Datastore entity key.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-   */
-  boolean hasEntityKey();
-  /**
-   * 
-   * Datastore entity key.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-   */
-  com.google.privacy.dlp.v2beta1.Key getEntityKey();
-  /**
-   * 
-   * Datastore entity key.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Key entity_key = 1;
-   */
-  com.google.privacy.dlp.v2beta1.KeyOrBuilder getEntityKeyOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreOptions.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreOptions.java
deleted file mode 100644
index 3a0abb0148cc..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreOptions.java
+++ /dev/null
@@ -1,1330 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Options defining a data set within Google Cloud Datastore.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.DatastoreOptions}
- */
-public  final class DatastoreOptions extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.DatastoreOptions)
-    DatastoreOptionsOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use DatastoreOptions.newBuilder() to construct.
-  private DatastoreOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private DatastoreOptions() {
-    projection_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private DatastoreOptions(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.PartitionId.Builder subBuilder = null;
-            if (partitionId_ != null) {
-              subBuilder = partitionId_.toBuilder();
-            }
-            partitionId_ = input.readMessage(com.google.privacy.dlp.v2beta1.PartitionId.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(partitionId_);
-              partitionId_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.KindExpression.Builder subBuilder = null;
-            if (kind_ != null) {
-              subBuilder = kind_.toBuilder();
-            }
-            kind_ = input.readMessage(com.google.privacy.dlp.v2beta1.KindExpression.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(kind_);
-              kind_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 26: {
-            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-              projection_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000004;
-            }
-            projection_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.Projection.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-        projection_ = java.util.Collections.unmodifiableList(projection_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_DatastoreOptions_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_DatastoreOptions_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.DatastoreOptions.class, com.google.privacy.dlp.v2beta1.DatastoreOptions.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int PARTITION_ID_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.PartitionId partitionId_;
-  /**
-   * 
-   * A partition ID identifies a grouping of entities. The grouping is always
-   * by project and namespace, however the namespace ID may be empty.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-   */
-  public boolean hasPartitionId() {
-    return partitionId_ != null;
-  }
-  /**
-   * 
-   * A partition ID identifies a grouping of entities. The grouping is always
-   * by project and namespace, however the namespace ID may be empty.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.PartitionId getPartitionId() {
-    return partitionId_ == null ? com.google.privacy.dlp.v2beta1.PartitionId.getDefaultInstance() : partitionId_;
-  }
-  /**
-   * 
-   * A partition ID identifies a grouping of entities. The grouping is always
-   * by project and namespace, however the namespace ID may be empty.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
-    return getPartitionId();
-  }
-
-  public static final int KIND_FIELD_NUMBER = 2;
-  private com.google.privacy.dlp.v2beta1.KindExpression kind_;
-  /**
-   * 
-   * The kind to process.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-   */
-  public boolean hasKind() {
-    return kind_ != null;
-  }
-  /**
-   * 
-   * The kind to process.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.KindExpression getKind() {
-    return kind_ == null ? com.google.privacy.dlp.v2beta1.KindExpression.getDefaultInstance() : kind_;
-  }
-  /**
-   * 
-   * The kind to process.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.KindExpressionOrBuilder getKindOrBuilder() {
-    return getKind();
-  }
-
-  public static final int PROJECTION_FIELD_NUMBER = 3;
-  private java.util.List projection_;
-  /**
-   * 
-   * Properties to scan. If none are specified, all properties will be scanned
-   * by default.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-   */
-  public java.util.List getProjectionList() {
-    return projection_;
-  }
-  /**
-   * 
-   * Properties to scan. If none are specified, all properties will be scanned
-   * by default.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-   */
-  public java.util.List 
-      getProjectionOrBuilderList() {
-    return projection_;
-  }
-  /**
-   * 
-   * Properties to scan. If none are specified, all properties will be scanned
-   * by default.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-   */
-  public int getProjectionCount() {
-    return projection_.size();
-  }
-  /**
-   * 
-   * Properties to scan. If none are specified, all properties will be scanned
-   * by default.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.Projection getProjection(int index) {
-    return projection_.get(index);
-  }
-  /**
-   * 
-   * Properties to scan. If none are specified, all properties will be scanned
-   * by default.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.ProjectionOrBuilder getProjectionOrBuilder(
-      int index) {
-    return projection_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (partitionId_ != null) {
-      output.writeMessage(1, getPartitionId());
-    }
-    if (kind_ != null) {
-      output.writeMessage(2, getKind());
-    }
-    for (int i = 0; i < projection_.size(); i++) {
-      output.writeMessage(3, projection_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (partitionId_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getPartitionId());
-    }
-    if (kind_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getKind());
-    }
-    for (int i = 0; i < projection_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, projection_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.DatastoreOptions)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.DatastoreOptions other = (com.google.privacy.dlp.v2beta1.DatastoreOptions) obj;
-
-    boolean result = true;
-    result = result && (hasPartitionId() == other.hasPartitionId());
-    if (hasPartitionId()) {
-      result = result && getPartitionId()
-          .equals(other.getPartitionId());
-    }
-    result = result && (hasKind() == other.hasKind());
-    if (hasKind()) {
-      result = result && getKind()
-          .equals(other.getKind());
-    }
-    result = result && getProjectionList()
-        .equals(other.getProjectionList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasPartitionId()) {
-      hash = (37 * hash) + PARTITION_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPartitionId().hashCode();
-    }
-    if (hasKind()) {
-      hash = (37 * hash) + KIND_FIELD_NUMBER;
-      hash = (53 * hash) + getKind().hashCode();
-    }
-    if (getProjectionCount() > 0) {
-      hash = (37 * hash) + PROJECTION_FIELD_NUMBER;
-      hash = (53 * hash) + getProjectionList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.DatastoreOptions prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Options defining a data set within Google Cloud Datastore.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.DatastoreOptions}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.DatastoreOptions)
-      com.google.privacy.dlp.v2beta1.DatastoreOptionsOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_DatastoreOptions_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_DatastoreOptions_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.DatastoreOptions.class, com.google.privacy.dlp.v2beta1.DatastoreOptions.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.DatastoreOptions.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getProjectionFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (partitionIdBuilder_ == null) {
-        partitionId_ = null;
-      } else {
-        partitionId_ = null;
-        partitionIdBuilder_ = null;
-      }
-      if (kindBuilder_ == null) {
-        kind_ = null;
-      } else {
-        kind_ = null;
-        kindBuilder_ = null;
-      }
-      if (projectionBuilder_ == null) {
-        projection_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-      } else {
-        projectionBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_DatastoreOptions_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.DatastoreOptions getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.DatastoreOptions.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.DatastoreOptions build() {
-      com.google.privacy.dlp.v2beta1.DatastoreOptions result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.DatastoreOptions buildPartial() {
-      com.google.privacy.dlp.v2beta1.DatastoreOptions result = new com.google.privacy.dlp.v2beta1.DatastoreOptions(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (partitionIdBuilder_ == null) {
-        result.partitionId_ = partitionId_;
-      } else {
-        result.partitionId_ = partitionIdBuilder_.build();
-      }
-      if (kindBuilder_ == null) {
-        result.kind_ = kind_;
-      } else {
-        result.kind_ = kindBuilder_.build();
-      }
-      if (projectionBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          projection_ = java.util.Collections.unmodifiableList(projection_);
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.projection_ = projection_;
-      } else {
-        result.projection_ = projectionBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.DatastoreOptions) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.DatastoreOptions)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.DatastoreOptions other) {
-      if (other == com.google.privacy.dlp.v2beta1.DatastoreOptions.getDefaultInstance()) return this;
-      if (other.hasPartitionId()) {
-        mergePartitionId(other.getPartitionId());
-      }
-      if (other.hasKind()) {
-        mergeKind(other.getKind());
-      }
-      if (projectionBuilder_ == null) {
-        if (!other.projection_.isEmpty()) {
-          if (projection_.isEmpty()) {
-            projection_ = other.projection_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureProjectionIsMutable();
-            projection_.addAll(other.projection_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.projection_.isEmpty()) {
-          if (projectionBuilder_.isEmpty()) {
-            projectionBuilder_.dispose();
-            projectionBuilder_ = null;
-            projection_ = other.projection_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-            projectionBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getProjectionFieldBuilder() : null;
-          } else {
-            projectionBuilder_.addAllMessages(other.projection_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.DatastoreOptions parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.DatastoreOptions) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private com.google.privacy.dlp.v2beta1.PartitionId partitionId_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PartitionId, com.google.privacy.dlp.v2beta1.PartitionId.Builder, com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder> partitionIdBuilder_;
-    /**
-     * 
-     * A partition ID identifies a grouping of entities. The grouping is always
-     * by project and namespace, however the namespace ID may be empty.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public boolean hasPartitionId() {
-      return partitionIdBuilder_ != null || partitionId_ != null;
-    }
-    /**
-     * 
-     * A partition ID identifies a grouping of entities. The grouping is always
-     * by project and namespace, however the namespace ID may be empty.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PartitionId getPartitionId() {
-      if (partitionIdBuilder_ == null) {
-        return partitionId_ == null ? com.google.privacy.dlp.v2beta1.PartitionId.getDefaultInstance() : partitionId_;
-      } else {
-        return partitionIdBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * A partition ID identifies a grouping of entities. The grouping is always
-     * by project and namespace, however the namespace ID may be empty.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public Builder setPartitionId(com.google.privacy.dlp.v2beta1.PartitionId value) {
-      if (partitionIdBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        partitionId_ = value;
-        onChanged();
-      } else {
-        partitionIdBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * A partition ID identifies a grouping of entities. The grouping is always
-     * by project and namespace, however the namespace ID may be empty.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public Builder setPartitionId(
-        com.google.privacy.dlp.v2beta1.PartitionId.Builder builderForValue) {
-      if (partitionIdBuilder_ == null) {
-        partitionId_ = builderForValue.build();
-        onChanged();
-      } else {
-        partitionIdBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * A partition ID identifies a grouping of entities. The grouping is always
-     * by project and namespace, however the namespace ID may be empty.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public Builder mergePartitionId(com.google.privacy.dlp.v2beta1.PartitionId value) {
-      if (partitionIdBuilder_ == null) {
-        if (partitionId_ != null) {
-          partitionId_ =
-            com.google.privacy.dlp.v2beta1.PartitionId.newBuilder(partitionId_).mergeFrom(value).buildPartial();
-        } else {
-          partitionId_ = value;
-        }
-        onChanged();
-      } else {
-        partitionIdBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * A partition ID identifies a grouping of entities. The grouping is always
-     * by project and namespace, however the namespace ID may be empty.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public Builder clearPartitionId() {
-      if (partitionIdBuilder_ == null) {
-        partitionId_ = null;
-        onChanged();
-      } else {
-        partitionId_ = null;
-        partitionIdBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * A partition ID identifies a grouping of entities. The grouping is always
-     * by project and namespace, however the namespace ID may be empty.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PartitionId.Builder getPartitionIdBuilder() {
-      
-      onChanged();
-      return getPartitionIdFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * A partition ID identifies a grouping of entities. The grouping is always
-     * by project and namespace, however the namespace ID may be empty.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
-      if (partitionIdBuilder_ != null) {
-        return partitionIdBuilder_.getMessageOrBuilder();
-      } else {
-        return partitionId_ == null ?
-            com.google.privacy.dlp.v2beta1.PartitionId.getDefaultInstance() : partitionId_;
-      }
-    }
-    /**
-     * 
-     * A partition ID identifies a grouping of entities. The grouping is always
-     * by project and namespace, however the namespace ID may be empty.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PartitionId, com.google.privacy.dlp.v2beta1.PartitionId.Builder, com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder> 
-        getPartitionIdFieldBuilder() {
-      if (partitionIdBuilder_ == null) {
-        partitionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.PartitionId, com.google.privacy.dlp.v2beta1.PartitionId.Builder, com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder>(
-                getPartitionId(),
-                getParentForChildren(),
-                isClean());
-        partitionId_ = null;
-      }
-      return partitionIdBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.KindExpression kind_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.KindExpression, com.google.privacy.dlp.v2beta1.KindExpression.Builder, com.google.privacy.dlp.v2beta1.KindExpressionOrBuilder> kindBuilder_;
-    /**
-     * 
-     * The kind to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-     */
-    public boolean hasKind() {
-      return kindBuilder_ != null || kind_ != null;
-    }
-    /**
-     * 
-     * The kind to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.KindExpression getKind() {
-      if (kindBuilder_ == null) {
-        return kind_ == null ? com.google.privacy.dlp.v2beta1.KindExpression.getDefaultInstance() : kind_;
-      } else {
-        return kindBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The kind to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-     */
-    public Builder setKind(com.google.privacy.dlp.v2beta1.KindExpression value) {
-      if (kindBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        kind_ = value;
-        onChanged();
-      } else {
-        kindBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The kind to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-     */
-    public Builder setKind(
-        com.google.privacy.dlp.v2beta1.KindExpression.Builder builderForValue) {
-      if (kindBuilder_ == null) {
-        kind_ = builderForValue.build();
-        onChanged();
-      } else {
-        kindBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The kind to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-     */
-    public Builder mergeKind(com.google.privacy.dlp.v2beta1.KindExpression value) {
-      if (kindBuilder_ == null) {
-        if (kind_ != null) {
-          kind_ =
-            com.google.privacy.dlp.v2beta1.KindExpression.newBuilder(kind_).mergeFrom(value).buildPartial();
-        } else {
-          kind_ = value;
-        }
-        onChanged();
-      } else {
-        kindBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The kind to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-     */
-    public Builder clearKind() {
-      if (kindBuilder_ == null) {
-        kind_ = null;
-        onChanged();
-      } else {
-        kind_ = null;
-        kindBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The kind to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.KindExpression.Builder getKindBuilder() {
-      
-      onChanged();
-      return getKindFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The kind to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.KindExpressionOrBuilder getKindOrBuilder() {
-      if (kindBuilder_ != null) {
-        return kindBuilder_.getMessageOrBuilder();
-      } else {
-        return kind_ == null ?
-            com.google.privacy.dlp.v2beta1.KindExpression.getDefaultInstance() : kind_;
-      }
-    }
-    /**
-     * 
-     * The kind to process.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.KindExpression, com.google.privacy.dlp.v2beta1.KindExpression.Builder, com.google.privacy.dlp.v2beta1.KindExpressionOrBuilder> 
-        getKindFieldBuilder() {
-      if (kindBuilder_ == null) {
-        kindBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.KindExpression, com.google.privacy.dlp.v2beta1.KindExpression.Builder, com.google.privacy.dlp.v2beta1.KindExpressionOrBuilder>(
-                getKind(),
-                getParentForChildren(),
-                isClean());
-        kind_ = null;
-      }
-      return kindBuilder_;
-    }
-
-    private java.util.List projection_ =
-      java.util.Collections.emptyList();
-    private void ensureProjectionIsMutable() {
-      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-        projection_ = new java.util.ArrayList(projection_);
-        bitField0_ |= 0x00000004;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Projection, com.google.privacy.dlp.v2beta1.Projection.Builder, com.google.privacy.dlp.v2beta1.ProjectionOrBuilder> projectionBuilder_;
-
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public java.util.List getProjectionList() {
-      if (projectionBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(projection_);
-      } else {
-        return projectionBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public int getProjectionCount() {
-      if (projectionBuilder_ == null) {
-        return projection_.size();
-      } else {
-        return projectionBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.Projection getProjection(int index) {
-      if (projectionBuilder_ == null) {
-        return projection_.get(index);
-      } else {
-        return projectionBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public Builder setProjection(
-        int index, com.google.privacy.dlp.v2beta1.Projection value) {
-      if (projectionBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureProjectionIsMutable();
-        projection_.set(index, value);
-        onChanged();
-      } else {
-        projectionBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public Builder setProjection(
-        int index, com.google.privacy.dlp.v2beta1.Projection.Builder builderForValue) {
-      if (projectionBuilder_ == null) {
-        ensureProjectionIsMutable();
-        projection_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        projectionBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public Builder addProjection(com.google.privacy.dlp.v2beta1.Projection value) {
-      if (projectionBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureProjectionIsMutable();
-        projection_.add(value);
-        onChanged();
-      } else {
-        projectionBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public Builder addProjection(
-        int index, com.google.privacy.dlp.v2beta1.Projection value) {
-      if (projectionBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureProjectionIsMutable();
-        projection_.add(index, value);
-        onChanged();
-      } else {
-        projectionBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public Builder addProjection(
-        com.google.privacy.dlp.v2beta1.Projection.Builder builderForValue) {
-      if (projectionBuilder_ == null) {
-        ensureProjectionIsMutable();
-        projection_.add(builderForValue.build());
-        onChanged();
-      } else {
-        projectionBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public Builder addProjection(
-        int index, com.google.privacy.dlp.v2beta1.Projection.Builder builderForValue) {
-      if (projectionBuilder_ == null) {
-        ensureProjectionIsMutable();
-        projection_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        projectionBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public Builder addAllProjection(
-        java.lang.Iterable values) {
-      if (projectionBuilder_ == null) {
-        ensureProjectionIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, projection_);
-        onChanged();
-      } else {
-        projectionBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public Builder clearProjection() {
-      if (projectionBuilder_ == null) {
-        projection_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-      } else {
-        projectionBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public Builder removeProjection(int index) {
-      if (projectionBuilder_ == null) {
-        ensureProjectionIsMutable();
-        projection_.remove(index);
-        onChanged();
-      } else {
-        projectionBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.Projection.Builder getProjectionBuilder(
-        int index) {
-      return getProjectionFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ProjectionOrBuilder getProjectionOrBuilder(
-        int index) {
-      if (projectionBuilder_ == null) {
-        return projection_.get(index);  } else {
-        return projectionBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public java.util.List 
-         getProjectionOrBuilderList() {
-      if (projectionBuilder_ != null) {
-        return projectionBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(projection_);
-      }
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.Projection.Builder addProjectionBuilder() {
-      return getProjectionFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.Projection.getDefaultInstance());
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.Projection.Builder addProjectionBuilder(
-        int index) {
-      return getProjectionFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.Projection.getDefaultInstance());
-    }
-    /**
-     * 
-     * Properties to scan. If none are specified, all properties will be scanned
-     * by default.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-     */
-    public java.util.List 
-         getProjectionBuilderList() {
-      return getProjectionFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Projection, com.google.privacy.dlp.v2beta1.Projection.Builder, com.google.privacy.dlp.v2beta1.ProjectionOrBuilder> 
-        getProjectionFieldBuilder() {
-      if (projectionBuilder_ == null) {
-        projectionBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Projection, com.google.privacy.dlp.v2beta1.Projection.Builder, com.google.privacy.dlp.v2beta1.ProjectionOrBuilder>(
-                projection_,
-                ((bitField0_ & 0x00000004) == 0x00000004),
-                getParentForChildren(),
-                isClean());
-        projection_ = null;
-      }
-      return projectionBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.DatastoreOptions)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.DatastoreOptions)
-  private static final com.google.privacy.dlp.v2beta1.DatastoreOptions DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.DatastoreOptions();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.DatastoreOptions getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public DatastoreOptions parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DatastoreOptions(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.DatastoreOptions getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreOptionsOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreOptionsOrBuilder.java
deleted file mode 100644
index 399cc66fb7ee..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DatastoreOptionsOrBuilder.java
+++ /dev/null
@@ -1,111 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface DatastoreOptionsOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.DatastoreOptions)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * A partition ID identifies a grouping of entities. The grouping is always
-   * by project and namespace, however the namespace ID may be empty.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-   */
-  boolean hasPartitionId();
-  /**
-   * 
-   * A partition ID identifies a grouping of entities. The grouping is always
-   * by project and namespace, however the namespace ID may be empty.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-   */
-  com.google.privacy.dlp.v2beta1.PartitionId getPartitionId();
-  /**
-   * 
-   * A partition ID identifies a grouping of entities. The grouping is always
-   * by project and namespace, however the namespace ID may be empty.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-   */
-  com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder getPartitionIdOrBuilder();
-
-  /**
-   * 
-   * The kind to process.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-   */
-  boolean hasKind();
-  /**
-   * 
-   * The kind to process.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-   */
-  com.google.privacy.dlp.v2beta1.KindExpression getKind();
-  /**
-   * 
-   * The kind to process.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.KindExpression kind = 2;
-   */
-  com.google.privacy.dlp.v2beta1.KindExpressionOrBuilder getKindOrBuilder();
-
-  /**
-   * 
-   * Properties to scan. If none are specified, all properties will be scanned
-   * by default.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-   */
-  java.util.List 
-      getProjectionList();
-  /**
-   * 
-   * Properties to scan. If none are specified, all properties will be scanned
-   * by default.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-   */
-  com.google.privacy.dlp.v2beta1.Projection getProjection(int index);
-  /**
-   * 
-   * Properties to scan. If none are specified, all properties will be scanned
-   * by default.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-   */
-  int getProjectionCount();
-  /**
-   * 
-   * Properties to scan. If none are specified, all properties will be scanned
-   * by default.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-   */
-  java.util.List 
-      getProjectionOrBuilderList();
-  /**
-   * 
-   * Properties to scan. If none are specified, all properties will be scanned
-   * by default.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Projection projection = 3;
-   */
-  com.google.privacy.dlp.v2beta1.ProjectionOrBuilder getProjectionOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentificationSummary.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentificationSummary.java
deleted file mode 100644
index d0c91a61fb52..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentificationSummary.java
+++ /dev/null
@@ -1,912 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * High level summary of deidentification.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.DeidentificationSummary}
- */
-public  final class DeidentificationSummary extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.DeidentificationSummary)
-    DeidentificationSummaryOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use DeidentificationSummary.newBuilder() to construct.
-  private DeidentificationSummary(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private DeidentificationSummary() {
-    transformedBytes_ = 0L;
-    transformationSummaries_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private DeidentificationSummary(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 16: {
-
-            transformedBytes_ = input.readInt64();
-            break;
-          }
-          case 26: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              transformationSummaries_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
-            }
-            transformationSummaries_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.TransformationSummary.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-        transformationSummaries_ = java.util.Collections.unmodifiableList(transformationSummaries_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentificationSummary_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentificationSummary_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.DeidentificationSummary.class, com.google.privacy.dlp.v2beta1.DeidentificationSummary.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int TRANSFORMED_BYTES_FIELD_NUMBER = 2;
-  private long transformedBytes_;
-  /**
-   * 
-   * Total size in bytes that were transformed in some way.
-   * 

-   *
-   * int64 transformed_bytes = 2;
-   */
-  public long getTransformedBytes() {
-    return transformedBytes_;
-  }
-
-  public static final int TRANSFORMATION_SUMMARIES_FIELD_NUMBER = 3;
-  private java.util.List transformationSummaries_;
-  /**
-   * 
-   * Transformations applied to the dataset.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-   */
-  public java.util.List getTransformationSummariesList() {
-    return transformationSummaries_;
-  }
-  /**
-   * 
-   * Transformations applied to the dataset.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-   */
-  public java.util.List 
-      getTransformationSummariesOrBuilderList() {
-    return transformationSummaries_;
-  }
-  /**
-   * 
-   * Transformations applied to the dataset.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-   */
-  public int getTransformationSummariesCount() {
-    return transformationSummaries_.size();
-  }
-  /**
-   * 
-   * Transformations applied to the dataset.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.TransformationSummary getTransformationSummaries(int index) {
-    return transformationSummaries_.get(index);
-  }
-  /**
-   * 
-   * Transformations applied to the dataset.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.TransformationSummaryOrBuilder getTransformationSummariesOrBuilder(
-      int index) {
-    return transformationSummaries_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (transformedBytes_ != 0L) {
-      output.writeInt64(2, transformedBytes_);
-    }
-    for (int i = 0; i < transformationSummaries_.size(); i++) {
-      output.writeMessage(3, transformationSummaries_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (transformedBytes_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(2, transformedBytes_);
-    }
-    for (int i = 0; i < transformationSummaries_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, transformationSummaries_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.DeidentificationSummary)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.DeidentificationSummary other = (com.google.privacy.dlp.v2beta1.DeidentificationSummary) obj;
-
-    boolean result = true;
-    result = result && (getTransformedBytes()
-        == other.getTransformedBytes());
-    result = result && getTransformationSummariesList()
-        .equals(other.getTransformationSummariesList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + TRANSFORMED_BYTES_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getTransformedBytes());
-    if (getTransformationSummariesCount() > 0) {
-      hash = (37 * hash) + TRANSFORMATION_SUMMARIES_FIELD_NUMBER;
-      hash = (53 * hash) + getTransformationSummariesList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.DeidentificationSummary prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * High level summary of deidentification.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.DeidentificationSummary}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.DeidentificationSummary)
-      com.google.privacy.dlp.v2beta1.DeidentificationSummaryOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentificationSummary_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentificationSummary_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.DeidentificationSummary.class, com.google.privacy.dlp.v2beta1.DeidentificationSummary.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.DeidentificationSummary.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getTransformationSummariesFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      transformedBytes_ = 0L;
-
-      if (transformationSummariesBuilder_ == null) {
-        transformationSummaries_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-      } else {
-        transformationSummariesBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentificationSummary_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.DeidentificationSummary getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.DeidentificationSummary.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.DeidentificationSummary build() {
-      com.google.privacy.dlp.v2beta1.DeidentificationSummary result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.DeidentificationSummary buildPartial() {
-      com.google.privacy.dlp.v2beta1.DeidentificationSummary result = new com.google.privacy.dlp.v2beta1.DeidentificationSummary(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      result.transformedBytes_ = transformedBytes_;
-      if (transformationSummariesBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          transformationSummaries_ = java.util.Collections.unmodifiableList(transformationSummaries_);
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.transformationSummaries_ = transformationSummaries_;
-      } else {
-        result.transformationSummaries_ = transformationSummariesBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.DeidentificationSummary) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.DeidentificationSummary)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.DeidentificationSummary other) {
-      if (other == com.google.privacy.dlp.v2beta1.DeidentificationSummary.getDefaultInstance()) return this;
-      if (other.getTransformedBytes() != 0L) {
-        setTransformedBytes(other.getTransformedBytes());
-      }
-      if (transformationSummariesBuilder_ == null) {
-        if (!other.transformationSummaries_.isEmpty()) {
-          if (transformationSummaries_.isEmpty()) {
-            transformationSummaries_ = other.transformationSummaries_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureTransformationSummariesIsMutable();
-            transformationSummaries_.addAll(other.transformationSummaries_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.transformationSummaries_.isEmpty()) {
-          if (transformationSummariesBuilder_.isEmpty()) {
-            transformationSummariesBuilder_.dispose();
-            transformationSummariesBuilder_ = null;
-            transformationSummaries_ = other.transformationSummaries_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-            transformationSummariesBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getTransformationSummariesFieldBuilder() : null;
-          } else {
-            transformationSummariesBuilder_.addAllMessages(other.transformationSummaries_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.DeidentificationSummary parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.DeidentificationSummary) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private long transformedBytes_ ;
-    /**
-     * 
-     * Total size in bytes that were transformed in some way.
-     * 

-     *
-     * int64 transformed_bytes = 2;
-     */
-    public long getTransformedBytes() {
-      return transformedBytes_;
-    }
-    /**
-     * 
-     * Total size in bytes that were transformed in some way.
-     * 

-     *
-     * int64 transformed_bytes = 2;
-     */
-    public Builder setTransformedBytes(long value) {
-      
-      transformedBytes_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Total size in bytes that were transformed in some way.
-     * 

-     *
-     * int64 transformed_bytes = 2;
-     */
-    public Builder clearTransformedBytes() {
-      
-      transformedBytes_ = 0L;
-      onChanged();
-      return this;
-    }
-
-    private java.util.List transformationSummaries_ =
-      java.util.Collections.emptyList();
-    private void ensureTransformationSummariesIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-        transformationSummaries_ = new java.util.ArrayList(transformationSummaries_);
-        bitField0_ |= 0x00000002;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.TransformationSummary, com.google.privacy.dlp.v2beta1.TransformationSummary.Builder, com.google.privacy.dlp.v2beta1.TransformationSummaryOrBuilder> transformationSummariesBuilder_;
-
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public java.util.List getTransformationSummariesList() {
-      if (transformationSummariesBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(transformationSummaries_);
-      } else {
-        return transformationSummariesBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public int getTransformationSummariesCount() {
-      if (transformationSummariesBuilder_ == null) {
-        return transformationSummaries_.size();
-      } else {
-        return transformationSummariesBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.TransformationSummary getTransformationSummaries(int index) {
-      if (transformationSummariesBuilder_ == null) {
-        return transformationSummaries_.get(index);
-      } else {
-        return transformationSummariesBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public Builder setTransformationSummaries(
-        int index, com.google.privacy.dlp.v2beta1.TransformationSummary value) {
-      if (transformationSummariesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureTransformationSummariesIsMutable();
-        transformationSummaries_.set(index, value);
-        onChanged();
-      } else {
-        transformationSummariesBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public Builder setTransformationSummaries(
-        int index, com.google.privacy.dlp.v2beta1.TransformationSummary.Builder builderForValue) {
-      if (transformationSummariesBuilder_ == null) {
-        ensureTransformationSummariesIsMutable();
-        transformationSummaries_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        transformationSummariesBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public Builder addTransformationSummaries(com.google.privacy.dlp.v2beta1.TransformationSummary value) {
-      if (transformationSummariesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureTransformationSummariesIsMutable();
-        transformationSummaries_.add(value);
-        onChanged();
-      } else {
-        transformationSummariesBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public Builder addTransformationSummaries(
-        int index, com.google.privacy.dlp.v2beta1.TransformationSummary value) {
-      if (transformationSummariesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureTransformationSummariesIsMutable();
-        transformationSummaries_.add(index, value);
-        onChanged();
-      } else {
-        transformationSummariesBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public Builder addTransformationSummaries(
-        com.google.privacy.dlp.v2beta1.TransformationSummary.Builder builderForValue) {
-      if (transformationSummariesBuilder_ == null) {
-        ensureTransformationSummariesIsMutable();
-        transformationSummaries_.add(builderForValue.build());
-        onChanged();
-      } else {
-        transformationSummariesBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public Builder addTransformationSummaries(
-        int index, com.google.privacy.dlp.v2beta1.TransformationSummary.Builder builderForValue) {
-      if (transformationSummariesBuilder_ == null) {
-        ensureTransformationSummariesIsMutable();
-        transformationSummaries_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        transformationSummariesBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public Builder addAllTransformationSummaries(
-        java.lang.Iterable values) {
-      if (transformationSummariesBuilder_ == null) {
-        ensureTransformationSummariesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, transformationSummaries_);
-        onChanged();
-      } else {
-        transformationSummariesBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public Builder clearTransformationSummaries() {
-      if (transformationSummariesBuilder_ == null) {
-        transformationSummaries_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-      } else {
-        transformationSummariesBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public Builder removeTransformationSummaries(int index) {
-      if (transformationSummariesBuilder_ == null) {
-        ensureTransformationSummariesIsMutable();
-        transformationSummaries_.remove(index);
-        onChanged();
-      } else {
-        transformationSummariesBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.TransformationSummary.Builder getTransformationSummariesBuilder(
-        int index) {
-      return getTransformationSummariesFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.TransformationSummaryOrBuilder getTransformationSummariesOrBuilder(
-        int index) {
-      if (transformationSummariesBuilder_ == null) {
-        return transformationSummaries_.get(index);  } else {
-        return transformationSummariesBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public java.util.List 
-         getTransformationSummariesOrBuilderList() {
-      if (transformationSummariesBuilder_ != null) {
-        return transformationSummariesBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(transformationSummaries_);
-      }
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.TransformationSummary.Builder addTransformationSummariesBuilder() {
-      return getTransformationSummariesFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.TransformationSummary.getDefaultInstance());
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.TransformationSummary.Builder addTransformationSummariesBuilder(
-        int index) {
-      return getTransformationSummariesFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.TransformationSummary.getDefaultInstance());
-    }
-    /**
-     * 
-     * Transformations applied to the dataset.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-     */
-    public java.util.List 
-         getTransformationSummariesBuilderList() {
-      return getTransformationSummariesFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.TransformationSummary, com.google.privacy.dlp.v2beta1.TransformationSummary.Builder, com.google.privacy.dlp.v2beta1.TransformationSummaryOrBuilder> 
-        getTransformationSummariesFieldBuilder() {
-      if (transformationSummariesBuilder_ == null) {
-        transformationSummariesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.TransformationSummary, com.google.privacy.dlp.v2beta1.TransformationSummary.Builder, com.google.privacy.dlp.v2beta1.TransformationSummaryOrBuilder>(
-                transformationSummaries_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
-        transformationSummaries_ = null;
-      }
-      return transformationSummariesBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.DeidentificationSummary)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.DeidentificationSummary)
-  private static final com.google.privacy.dlp.v2beta1.DeidentificationSummary DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.DeidentificationSummary();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.DeidentificationSummary getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public DeidentificationSummary parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeidentificationSummary(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.DeidentificationSummary getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentificationSummaryOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentificationSummaryOrBuilder.java
deleted file mode 100644
index b05605e9fa68..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentificationSummaryOrBuilder.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface DeidentificationSummaryOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.DeidentificationSummary)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Total size in bytes that were transformed in some way.
-   * 

-   *
-   * int64 transformed_bytes = 2;
-   */
-  long getTransformedBytes();
-
-  /**
-   * 
-   * Transformations applied to the dataset.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-   */
-  java.util.List 
-      getTransformationSummariesList();
-  /**
-   * 
-   * Transformations applied to the dataset.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-   */
-  com.google.privacy.dlp.v2beta1.TransformationSummary getTransformationSummaries(int index);
-  /**
-   * 
-   * Transformations applied to the dataset.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-   */
-  int getTransformationSummariesCount();
-  /**
-   * 
-   * Transformations applied to the dataset.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-   */
-  java.util.List 
-      getTransformationSummariesOrBuilderList();
-  /**
-   * 
-   * Transformations applied to the dataset.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary transformation_summaries = 3;
-   */
-  com.google.privacy.dlp.v2beta1.TransformationSummaryOrBuilder getTransformationSummariesOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyConfig.java
deleted file mode 100644
index 1f8d451cb975..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyConfig.java
+++ /dev/null
@@ -1,1005 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * The configuration that controls how the data will change.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.DeidentifyConfig}
- */
-public  final class DeidentifyConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.DeidentifyConfig)
-    DeidentifyConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use DeidentifyConfig.newBuilder() to construct.
-  private DeidentifyConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private DeidentifyConfig() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private DeidentifyConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder subBuilder = null;
-            if (transformationCase_ == 1) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.InfoTypeTransformations.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 1;
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.RecordTransformations.Builder subBuilder = null;
-            if (transformationCase_ == 2) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.RecordTransformations) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.RecordTransformations.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.RecordTransformations) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 2;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.DeidentifyConfig.class, com.google.privacy.dlp.v2beta1.DeidentifyConfig.Builder.class);
-  }
-
-  private int transformationCase_ = 0;
-  private java.lang.Object transformation_;
-  public enum TransformationCase
-      implements com.google.protobuf.Internal.EnumLite {
-    INFO_TYPE_TRANSFORMATIONS(1),
-    RECORD_TRANSFORMATIONS(2),
-    TRANSFORMATION_NOT_SET(0);
-    private final int value;
-    private TransformationCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static TransformationCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static TransformationCase forNumber(int value) {
-      switch (value) {
-        case 1: return INFO_TYPE_TRANSFORMATIONS;
-        case 2: return RECORD_TRANSFORMATIONS;
-        case 0: return TRANSFORMATION_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public TransformationCase
-  getTransformationCase() {
-    return TransformationCase.forNumber(
-        transformationCase_);
-  }
-
-  public static final int INFO_TYPE_TRANSFORMATIONS_FIELD_NUMBER = 1;
-  /**
-   * 
-   * Treat the dataset as free-form text and apply the same free text
-   * transformation everywhere.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-   */
-  public boolean hasInfoTypeTransformations() {
-    return transformationCase_ == 1;
-  }
-  /**
-   * 
-   * Treat the dataset as free-form text and apply the same free text
-   * transformation everywhere.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeTransformations getInfoTypeTransformations() {
-    if (transformationCase_ == 1) {
-       return (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-  }
-  /**
-   * 
-   * Treat the dataset as free-form text and apply the same free text
-   * transformation everywhere.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder getInfoTypeTransformationsOrBuilder() {
-    if (transformationCase_ == 1) {
-       return (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-  }
-
-  public static final int RECORD_TRANSFORMATIONS_FIELD_NUMBER = 2;
-  /**
-   * 
-   * Treat the dataset as structured. Transformations can be applied to
-   * specific locations within structured datasets, such as transforming
-   * a column within a table.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-   */
-  public boolean hasRecordTransformations() {
-    return transformationCase_ == 2;
-  }
-  /**
-   * 
-   * Treat the dataset as structured. Transformations can be applied to
-   * specific locations within structured datasets, such as transforming
-   * a column within a table.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordTransformations getRecordTransformations() {
-    if (transformationCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.RecordTransformations) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.RecordTransformations.getDefaultInstance();
-  }
-  /**
-   * 
-   * Treat the dataset as structured. Transformations can be applied to
-   * specific locations within structured datasets, such as transforming
-   * a column within a table.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordTransformationsOrBuilder getRecordTransformationsOrBuilder() {
-    if (transformationCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.RecordTransformations) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.RecordTransformations.getDefaultInstance();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (transformationCase_ == 1) {
-      output.writeMessage(1, (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_);
-    }
-    if (transformationCase_ == 2) {
-      output.writeMessage(2, (com.google.privacy.dlp.v2beta1.RecordTransformations) transformation_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (transformationCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_);
-    }
-    if (transformationCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, (com.google.privacy.dlp.v2beta1.RecordTransformations) transformation_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.DeidentifyConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.DeidentifyConfig other = (com.google.privacy.dlp.v2beta1.DeidentifyConfig) obj;
-
-    boolean result = true;
-    result = result && getTransformationCase().equals(
-        other.getTransformationCase());
-    if (!result) return false;
-    switch (transformationCase_) {
-      case 1:
-        result = result && getInfoTypeTransformations()
-            .equals(other.getInfoTypeTransformations());
-        break;
-      case 2:
-        result = result && getRecordTransformations()
-            .equals(other.getRecordTransformations());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    switch (transformationCase_) {
-      case 1:
-        hash = (37 * hash) + INFO_TYPE_TRANSFORMATIONS_FIELD_NUMBER;
-        hash = (53 * hash) + getInfoTypeTransformations().hashCode();
-        break;
-      case 2:
-        hash = (37 * hash) + RECORD_TRANSFORMATIONS_FIELD_NUMBER;
-        hash = (53 * hash) + getRecordTransformations().hashCode();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.DeidentifyConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * The configuration that controls how the data will change.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.DeidentifyConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.DeidentifyConfig)
-      com.google.privacy.dlp.v2beta1.DeidentifyConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.DeidentifyConfig.class, com.google.privacy.dlp.v2beta1.DeidentifyConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.DeidentifyConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      transformationCase_ = 0;
-      transformation_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.DeidentifyConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.DeidentifyConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.DeidentifyConfig build() {
-      com.google.privacy.dlp.v2beta1.DeidentifyConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.DeidentifyConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.DeidentifyConfig result = new com.google.privacy.dlp.v2beta1.DeidentifyConfig(this);
-      if (transformationCase_ == 1) {
-        if (infoTypeTransformationsBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = infoTypeTransformationsBuilder_.build();
-        }
-      }
-      if (transformationCase_ == 2) {
-        if (recordTransformationsBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = recordTransformationsBuilder_.build();
-        }
-      }
-      result.transformationCase_ = transformationCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.DeidentifyConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.DeidentifyConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.DeidentifyConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.DeidentifyConfig.getDefaultInstance()) return this;
-      switch (other.getTransformationCase()) {
-        case INFO_TYPE_TRANSFORMATIONS: {
-          mergeInfoTypeTransformations(other.getInfoTypeTransformations());
-          break;
-        }
-        case RECORD_TRANSFORMATIONS: {
-          mergeRecordTransformations(other.getRecordTransformations());
-          break;
-        }
-        case TRANSFORMATION_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.DeidentifyConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.DeidentifyConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int transformationCase_ = 0;
-    private java.lang.Object transformation_;
-    public TransformationCase
-        getTransformationCase() {
-      return TransformationCase.forNumber(
-          transformationCase_);
-    }
-
-    public Builder clearTransformation() {
-      transformationCase_ = 0;
-      transformation_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder, com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder> infoTypeTransformationsBuilder_;
-    /**
-     * 
-     * Treat the dataset as free-form text and apply the same free text
-     * transformation everywhere.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-     */
-    public boolean hasInfoTypeTransformations() {
-      return transformationCase_ == 1;
-    }
-    /**
-     * 
-     * Treat the dataset as free-form text and apply the same free text
-     * transformation everywhere.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations getInfoTypeTransformations() {
-      if (infoTypeTransformationsBuilder_ == null) {
-        if (transformationCase_ == 1) {
-          return (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 1) {
-          return infoTypeTransformationsBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Treat the dataset as free-form text and apply the same free text
-     * transformation everywhere.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-     */
-    public Builder setInfoTypeTransformations(com.google.privacy.dlp.v2beta1.InfoTypeTransformations value) {
-      if (infoTypeTransformationsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        infoTypeTransformationsBuilder_.setMessage(value);
-      }
-      transformationCase_ = 1;
-      return this;
-    }
-    /**
-     * 
-     * Treat the dataset as free-form text and apply the same free text
-     * transformation everywhere.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-     */
-    public Builder setInfoTypeTransformations(
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder builderForValue) {
-      if (infoTypeTransformationsBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        infoTypeTransformationsBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 1;
-      return this;
-    }
-    /**
-     * 
-     * Treat the dataset as free-form text and apply the same free text
-     * transformation everywhere.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-     */
-    public Builder mergeInfoTypeTransformations(com.google.privacy.dlp.v2beta1.InfoTypeTransformations value) {
-      if (infoTypeTransformationsBuilder_ == null) {
-        if (transformationCase_ == 1 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.InfoTypeTransformations.newBuilder((com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 1) {
-          infoTypeTransformationsBuilder_.mergeFrom(value);
-        }
-        infoTypeTransformationsBuilder_.setMessage(value);
-      }
-      transformationCase_ = 1;
-      return this;
-    }
-    /**
-     * 
-     * Treat the dataset as free-form text and apply the same free text
-     * transformation everywhere.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-     */
-    public Builder clearInfoTypeTransformations() {
-      if (infoTypeTransformationsBuilder_ == null) {
-        if (transformationCase_ == 1) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 1) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        infoTypeTransformationsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Treat the dataset as free-form text and apply the same free text
-     * transformation everywhere.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder getInfoTypeTransformationsBuilder() {
-      return getInfoTypeTransformationsFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Treat the dataset as free-form text and apply the same free text
-     * transformation everywhere.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder getInfoTypeTransformationsOrBuilder() {
-      if ((transformationCase_ == 1) && (infoTypeTransformationsBuilder_ != null)) {
-        return infoTypeTransformationsBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 1) {
-          return (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Treat the dataset as free-form text and apply the same free text
-     * transformation everywhere.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder, com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder> 
-        getInfoTypeTransformationsFieldBuilder() {
-      if (infoTypeTransformationsBuilder_ == null) {
-        if (!(transformationCase_ == 1)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-        }
-        infoTypeTransformationsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InfoTypeTransformations, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder, com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 1;
-      onChanged();;
-      return infoTypeTransformationsBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordTransformations, com.google.privacy.dlp.v2beta1.RecordTransformations.Builder, com.google.privacy.dlp.v2beta1.RecordTransformationsOrBuilder> recordTransformationsBuilder_;
-    /**
-     * 
-     * Treat the dataset as structured. Transformations can be applied to
-     * specific locations within structured datasets, such as transforming
-     * a column within a table.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-     */
-    public boolean hasRecordTransformations() {
-      return transformationCase_ == 2;
-    }
-    /**
-     * 
-     * Treat the dataset as structured. Transformations can be applied to
-     * specific locations within structured datasets, such as transforming
-     * a column within a table.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordTransformations getRecordTransformations() {
-      if (recordTransformationsBuilder_ == null) {
-        if (transformationCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.RecordTransformations) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.RecordTransformations.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 2) {
-          return recordTransformationsBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.RecordTransformations.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Treat the dataset as structured. Transformations can be applied to
-     * specific locations within structured datasets, such as transforming
-     * a column within a table.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-     */
-    public Builder setRecordTransformations(com.google.privacy.dlp.v2beta1.RecordTransformations value) {
-      if (recordTransformationsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        recordTransformationsBuilder_.setMessage(value);
-      }
-      transformationCase_ = 2;
-      return this;
-    }
-    /**
-     * 
-     * Treat the dataset as structured. Transformations can be applied to
-     * specific locations within structured datasets, such as transforming
-     * a column within a table.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-     */
-    public Builder setRecordTransformations(
-        com.google.privacy.dlp.v2beta1.RecordTransformations.Builder builderForValue) {
-      if (recordTransformationsBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        recordTransformationsBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 2;
-      return this;
-    }
-    /**
-     * 
-     * Treat the dataset as structured. Transformations can be applied to
-     * specific locations within structured datasets, such as transforming
-     * a column within a table.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-     */
-    public Builder mergeRecordTransformations(com.google.privacy.dlp.v2beta1.RecordTransformations value) {
-      if (recordTransformationsBuilder_ == null) {
-        if (transformationCase_ == 2 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.RecordTransformations.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.RecordTransformations.newBuilder((com.google.privacy.dlp.v2beta1.RecordTransformations) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 2) {
-          recordTransformationsBuilder_.mergeFrom(value);
-        }
-        recordTransformationsBuilder_.setMessage(value);
-      }
-      transformationCase_ = 2;
-      return this;
-    }
-    /**
-     * 
-     * Treat the dataset as structured. Transformations can be applied to
-     * specific locations within structured datasets, such as transforming
-     * a column within a table.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-     */
-    public Builder clearRecordTransformations() {
-      if (recordTransformationsBuilder_ == null) {
-        if (transformationCase_ == 2) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 2) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        recordTransformationsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Treat the dataset as structured. Transformations can be applied to
-     * specific locations within structured datasets, such as transforming
-     * a column within a table.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordTransformations.Builder getRecordTransformationsBuilder() {
-      return getRecordTransformationsFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Treat the dataset as structured. Transformations can be applied to
-     * specific locations within structured datasets, such as transforming
-     * a column within a table.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordTransformationsOrBuilder getRecordTransformationsOrBuilder() {
-      if ((transformationCase_ == 2) && (recordTransformationsBuilder_ != null)) {
-        return recordTransformationsBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.RecordTransformations) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.RecordTransformations.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Treat the dataset as structured. Transformations can be applied to
-     * specific locations within structured datasets, such as transforming
-     * a column within a table.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordTransformations, com.google.privacy.dlp.v2beta1.RecordTransformations.Builder, com.google.privacy.dlp.v2beta1.RecordTransformationsOrBuilder> 
-        getRecordTransformationsFieldBuilder() {
-      if (recordTransformationsBuilder_ == null) {
-        if (!(transformationCase_ == 2)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.RecordTransformations.getDefaultInstance();
-        }
-        recordTransformationsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RecordTransformations, com.google.privacy.dlp.v2beta1.RecordTransformations.Builder, com.google.privacy.dlp.v2beta1.RecordTransformationsOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.RecordTransformations) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 2;
-      onChanged();;
-      return recordTransformationsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.DeidentifyConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.DeidentifyConfig)
-  private static final com.google.privacy.dlp.v2beta1.DeidentifyConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.DeidentifyConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.DeidentifyConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public DeidentifyConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeidentifyConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.DeidentifyConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyConfigOrBuilder.java
deleted file mode 100644
index a7161f374a07..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyConfigOrBuilder.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface DeidentifyConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.DeidentifyConfig)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Treat the dataset as free-form text and apply the same free text
-   * transformation everywhere.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-   */
-  boolean hasInfoTypeTransformations();
-  /**
-   * 
-   * Treat the dataset as free-form text and apply the same free text
-   * transformation everywhere.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeTransformations getInfoTypeTransformations();
-  /**
-   * 
-   * Treat the dataset as free-form text and apply the same free text
-   * transformation everywhere.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder getInfoTypeTransformationsOrBuilder();
-
-  /**
-   * 
-   * Treat the dataset as structured. Transformations can be applied to
-   * specific locations within structured datasets, such as transforming
-   * a column within a table.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-   */
-  boolean hasRecordTransformations();
-  /**
-   * 
-   * Treat the dataset as structured. Transformations can be applied to
-   * specific locations within structured datasets, such as transforming
-   * a column within a table.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-   */
-  com.google.privacy.dlp.v2beta1.RecordTransformations getRecordTransformations();
-  /**
-   * 
-   * Treat the dataset as structured. Transformations can be applied to
-   * specific locations within structured datasets, such as transforming
-   * a column within a table.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordTransformations record_transformations = 2;
-   */
-  com.google.privacy.dlp.v2beta1.RecordTransformationsOrBuilder getRecordTransformationsOrBuilder();
-
-  public com.google.privacy.dlp.v2beta1.DeidentifyConfig.TransformationCase getTransformationCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentRequest.java
deleted file mode 100644
index facf35c6cf44..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentRequest.java
+++ /dev/null
@@ -1,1318 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Request to de-identify a list of items.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.DeidentifyContentRequest}
- */
-public  final class DeidentifyContentRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.DeidentifyContentRequest)
-    DeidentifyContentRequestOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use DeidentifyContentRequest.newBuilder() to construct.
-  private DeidentifyContentRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private DeidentifyContentRequest() {
-    items_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private DeidentifyContentRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.DeidentifyConfig.Builder subBuilder = null;
-            if (deidentifyConfig_ != null) {
-              subBuilder = deidentifyConfig_.toBuilder();
-            }
-            deidentifyConfig_ = input.readMessage(com.google.privacy.dlp.v2beta1.DeidentifyConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(deidentifyConfig_);
-              deidentifyConfig_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.InspectConfig.Builder subBuilder = null;
-            if (inspectConfig_ != null) {
-              subBuilder = inspectConfig_.toBuilder();
-            }
-            inspectConfig_ = input.readMessage(com.google.privacy.dlp.v2beta1.InspectConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(inspectConfig_);
-              inspectConfig_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 26: {
-            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-              items_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000004;
-            }
-            items_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.ContentItem.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-        items_ = java.util.Collections.unmodifiableList(items_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyContentRequest_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyContentRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.DeidentifyContentRequest.class, com.google.privacy.dlp.v2beta1.DeidentifyContentRequest.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int DEIDENTIFY_CONFIG_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.DeidentifyConfig deidentifyConfig_;
-  /**
-   * 
-   * Configuration for the de-identification of the list of content items.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-   */
-  public boolean hasDeidentifyConfig() {
-    return deidentifyConfig_ != null;
-  }
-  /**
-   * 
-   * Configuration for the de-identification of the list of content items.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.DeidentifyConfig getDeidentifyConfig() {
-    return deidentifyConfig_ == null ? com.google.privacy.dlp.v2beta1.DeidentifyConfig.getDefaultInstance() : deidentifyConfig_;
-  }
-  /**
-   * 
-   * Configuration for the de-identification of the list of content items.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.DeidentifyConfigOrBuilder getDeidentifyConfigOrBuilder() {
-    return getDeidentifyConfig();
-  }
-
-  public static final int INSPECT_CONFIG_FIELD_NUMBER = 2;
-  private com.google.privacy.dlp.v2beta1.InspectConfig inspectConfig_;
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-   */
-  public boolean hasInspectConfig() {
-    return inspectConfig_ != null;
-  }
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectConfig getInspectConfig() {
-    return inspectConfig_ == null ? com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : inspectConfig_;
-  }
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getInspectConfigOrBuilder() {
-    return getInspectConfig();
-  }
-
-  public static final int ITEMS_FIELD_NUMBER = 3;
-  private java.util.List items_;
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * All items will be treated as text/*.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-   */
-  public java.util.List getItemsList() {
-    return items_;
-  }
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * All items will be treated as text/*.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-   */
-  public java.util.List 
-      getItemsOrBuilderList() {
-    return items_;
-  }
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * All items will be treated as text/*.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-   */
-  public int getItemsCount() {
-    return items_.size();
-  }
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * All items will be treated as text/*.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.ContentItem getItems(int index) {
-    return items_.get(index);
-  }
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * All items will be treated as text/*.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-      int index) {
-    return items_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (deidentifyConfig_ != null) {
-      output.writeMessage(1, getDeidentifyConfig());
-    }
-    if (inspectConfig_ != null) {
-      output.writeMessage(2, getInspectConfig());
-    }
-    for (int i = 0; i < items_.size(); i++) {
-      output.writeMessage(3, items_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (deidentifyConfig_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getDeidentifyConfig());
-    }
-    if (inspectConfig_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getInspectConfig());
-    }
-    for (int i = 0; i < items_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, items_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.DeidentifyContentRequest)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.DeidentifyContentRequest other = (com.google.privacy.dlp.v2beta1.DeidentifyContentRequest) obj;
-
-    boolean result = true;
-    result = result && (hasDeidentifyConfig() == other.hasDeidentifyConfig());
-    if (hasDeidentifyConfig()) {
-      result = result && getDeidentifyConfig()
-          .equals(other.getDeidentifyConfig());
-    }
-    result = result && (hasInspectConfig() == other.hasInspectConfig());
-    if (hasInspectConfig()) {
-      result = result && getInspectConfig()
-          .equals(other.getInspectConfig());
-    }
-    result = result && getItemsList()
-        .equals(other.getItemsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasDeidentifyConfig()) {
-      hash = (37 * hash) + DEIDENTIFY_CONFIG_FIELD_NUMBER;
-      hash = (53 * hash) + getDeidentifyConfig().hashCode();
-    }
-    if (hasInspectConfig()) {
-      hash = (37 * hash) + INSPECT_CONFIG_FIELD_NUMBER;
-      hash = (53 * hash) + getInspectConfig().hashCode();
-    }
-    if (getItemsCount() > 0) {
-      hash = (37 * hash) + ITEMS_FIELD_NUMBER;
-      hash = (53 * hash) + getItemsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.DeidentifyContentRequest prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Request to de-identify a list of items.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.DeidentifyContentRequest}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.DeidentifyContentRequest)
-      com.google.privacy.dlp.v2beta1.DeidentifyContentRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyContentRequest_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyContentRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.DeidentifyContentRequest.class, com.google.privacy.dlp.v2beta1.DeidentifyContentRequest.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.DeidentifyContentRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getItemsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (deidentifyConfigBuilder_ == null) {
-        deidentifyConfig_ = null;
-      } else {
-        deidentifyConfig_ = null;
-        deidentifyConfigBuilder_ = null;
-      }
-      if (inspectConfigBuilder_ == null) {
-        inspectConfig_ = null;
-      } else {
-        inspectConfig_ = null;
-        inspectConfigBuilder_ = null;
-      }
-      if (itemsBuilder_ == null) {
-        items_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-      } else {
-        itemsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyContentRequest_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.DeidentifyContentRequest getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.DeidentifyContentRequest.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.DeidentifyContentRequest build() {
-      com.google.privacy.dlp.v2beta1.DeidentifyContentRequest result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.DeidentifyContentRequest buildPartial() {
-      com.google.privacy.dlp.v2beta1.DeidentifyContentRequest result = new com.google.privacy.dlp.v2beta1.DeidentifyContentRequest(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (deidentifyConfigBuilder_ == null) {
-        result.deidentifyConfig_ = deidentifyConfig_;
-      } else {
-        result.deidentifyConfig_ = deidentifyConfigBuilder_.build();
-      }
-      if (inspectConfigBuilder_ == null) {
-        result.inspectConfig_ = inspectConfig_;
-      } else {
-        result.inspectConfig_ = inspectConfigBuilder_.build();
-      }
-      if (itemsBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          items_ = java.util.Collections.unmodifiableList(items_);
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.items_ = items_;
-      } else {
-        result.items_ = itemsBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.DeidentifyContentRequest) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.DeidentifyContentRequest)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.DeidentifyContentRequest other) {
-      if (other == com.google.privacy.dlp.v2beta1.DeidentifyContentRequest.getDefaultInstance()) return this;
-      if (other.hasDeidentifyConfig()) {
-        mergeDeidentifyConfig(other.getDeidentifyConfig());
-      }
-      if (other.hasInspectConfig()) {
-        mergeInspectConfig(other.getInspectConfig());
-      }
-      if (itemsBuilder_ == null) {
-        if (!other.items_.isEmpty()) {
-          if (items_.isEmpty()) {
-            items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureItemsIsMutable();
-            items_.addAll(other.items_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.items_.isEmpty()) {
-          if (itemsBuilder_.isEmpty()) {
-            itemsBuilder_.dispose();
-            itemsBuilder_ = null;
-            items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-            itemsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getItemsFieldBuilder() : null;
-          } else {
-            itemsBuilder_.addAllMessages(other.items_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.DeidentifyContentRequest parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.DeidentifyContentRequest) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private com.google.privacy.dlp.v2beta1.DeidentifyConfig deidentifyConfig_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.DeidentifyConfig, com.google.privacy.dlp.v2beta1.DeidentifyConfig.Builder, com.google.privacy.dlp.v2beta1.DeidentifyConfigOrBuilder> deidentifyConfigBuilder_;
-    /**
-     * 
-     * Configuration for the de-identification of the list of content items.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-     */
-    public boolean hasDeidentifyConfig() {
-      return deidentifyConfigBuilder_ != null || deidentifyConfig_ != null;
-    }
-    /**
-     * 
-     * Configuration for the de-identification of the list of content items.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.DeidentifyConfig getDeidentifyConfig() {
-      if (deidentifyConfigBuilder_ == null) {
-        return deidentifyConfig_ == null ? com.google.privacy.dlp.v2beta1.DeidentifyConfig.getDefaultInstance() : deidentifyConfig_;
-      } else {
-        return deidentifyConfigBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Configuration for the de-identification of the list of content items.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-     */
-    public Builder setDeidentifyConfig(com.google.privacy.dlp.v2beta1.DeidentifyConfig value) {
-      if (deidentifyConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        deidentifyConfig_ = value;
-        onChanged();
-      } else {
-        deidentifyConfigBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the de-identification of the list of content items.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-     */
-    public Builder setDeidentifyConfig(
-        com.google.privacy.dlp.v2beta1.DeidentifyConfig.Builder builderForValue) {
-      if (deidentifyConfigBuilder_ == null) {
-        deidentifyConfig_ = builderForValue.build();
-        onChanged();
-      } else {
-        deidentifyConfigBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the de-identification of the list of content items.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-     */
-    public Builder mergeDeidentifyConfig(com.google.privacy.dlp.v2beta1.DeidentifyConfig value) {
-      if (deidentifyConfigBuilder_ == null) {
-        if (deidentifyConfig_ != null) {
-          deidentifyConfig_ =
-            com.google.privacy.dlp.v2beta1.DeidentifyConfig.newBuilder(deidentifyConfig_).mergeFrom(value).buildPartial();
-        } else {
-          deidentifyConfig_ = value;
-        }
-        onChanged();
-      } else {
-        deidentifyConfigBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the de-identification of the list of content items.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-     */
-    public Builder clearDeidentifyConfig() {
-      if (deidentifyConfigBuilder_ == null) {
-        deidentifyConfig_ = null;
-        onChanged();
-      } else {
-        deidentifyConfig_ = null;
-        deidentifyConfigBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the de-identification of the list of content items.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.DeidentifyConfig.Builder getDeidentifyConfigBuilder() {
-      
-      onChanged();
-      return getDeidentifyConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Configuration for the de-identification of the list of content items.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.DeidentifyConfigOrBuilder getDeidentifyConfigOrBuilder() {
-      if (deidentifyConfigBuilder_ != null) {
-        return deidentifyConfigBuilder_.getMessageOrBuilder();
-      } else {
-        return deidentifyConfig_ == null ?
-            com.google.privacy.dlp.v2beta1.DeidentifyConfig.getDefaultInstance() : deidentifyConfig_;
-      }
-    }
-    /**
-     * 
-     * Configuration for the de-identification of the list of content items.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.DeidentifyConfig, com.google.privacy.dlp.v2beta1.DeidentifyConfig.Builder, com.google.privacy.dlp.v2beta1.DeidentifyConfigOrBuilder> 
-        getDeidentifyConfigFieldBuilder() {
-      if (deidentifyConfigBuilder_ == null) {
-        deidentifyConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.DeidentifyConfig, com.google.privacy.dlp.v2beta1.DeidentifyConfig.Builder, com.google.privacy.dlp.v2beta1.DeidentifyConfigOrBuilder>(
-                getDeidentifyConfig(),
-                getParentForChildren(),
-                isClean());
-        deidentifyConfig_ = null;
-      }
-      return deidentifyConfigBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.InspectConfig inspectConfig_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder> inspectConfigBuilder_;
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-     */
-    public boolean hasInspectConfig() {
-      return inspectConfigBuilder_ != null || inspectConfig_ != null;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig getInspectConfig() {
-      if (inspectConfigBuilder_ == null) {
-        return inspectConfig_ == null ? com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : inspectConfig_;
-      } else {
-        return inspectConfigBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-     */
-    public Builder setInspectConfig(com.google.privacy.dlp.v2beta1.InspectConfig value) {
-      if (inspectConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        inspectConfig_ = value;
-        onChanged();
-      } else {
-        inspectConfigBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-     */
-    public Builder setInspectConfig(
-        com.google.privacy.dlp.v2beta1.InspectConfig.Builder builderForValue) {
-      if (inspectConfigBuilder_ == null) {
-        inspectConfig_ = builderForValue.build();
-        onChanged();
-      } else {
-        inspectConfigBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-     */
-    public Builder mergeInspectConfig(com.google.privacy.dlp.v2beta1.InspectConfig value) {
-      if (inspectConfigBuilder_ == null) {
-        if (inspectConfig_ != null) {
-          inspectConfig_ =
-            com.google.privacy.dlp.v2beta1.InspectConfig.newBuilder(inspectConfig_).mergeFrom(value).buildPartial();
-        } else {
-          inspectConfig_ = value;
-        }
-        onChanged();
-      } else {
-        inspectConfigBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-     */
-    public Builder clearInspectConfig() {
-      if (inspectConfigBuilder_ == null) {
-        inspectConfig_ = null;
-        onChanged();
-      } else {
-        inspectConfig_ = null;
-        inspectConfigBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig.Builder getInspectConfigBuilder() {
-      
-      onChanged();
-      return getInspectConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getInspectConfigOrBuilder() {
-      if (inspectConfigBuilder_ != null) {
-        return inspectConfigBuilder_.getMessageOrBuilder();
-      } else {
-        return inspectConfig_ == null ?
-            com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : inspectConfig_;
-      }
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder> 
-        getInspectConfigFieldBuilder() {
-      if (inspectConfigBuilder_ == null) {
-        inspectConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder>(
-                getInspectConfig(),
-                getParentForChildren(),
-                isClean());
-        inspectConfig_ = null;
-      }
-      return inspectConfigBuilder_;
-    }
-
-    private java.util.List items_ =
-      java.util.Collections.emptyList();
-    private void ensureItemsIsMutable() {
-      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-        items_ = new java.util.ArrayList(items_);
-        bitField0_ |= 0x00000004;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder> itemsBuilder_;
-
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public java.util.List getItemsList() {
-      if (itemsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(items_);
-      } else {
-        return itemsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public int getItemsCount() {
-      if (itemsBuilder_ == null) {
-        return items_.size();
-      } else {
-        return itemsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem getItems(int index) {
-      if (itemsBuilder_ == null) {
-        return items_.get(index);
-      } else {
-        return itemsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public Builder setItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.set(index, value);
-        onChanged();
-      } else {
-        itemsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public Builder setItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public Builder addItems(com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.add(value);
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public Builder addItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.add(index, value);
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public Builder addItems(
-        com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.add(builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public Builder addItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public Builder addAllItems(
-        java.lang.Iterable values) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, items_);
-        onChanged();
-      } else {
-        itemsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public Builder clearItems() {
-      if (itemsBuilder_ == null) {
-        items_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-      } else {
-        itemsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public Builder removeItems(int index) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.remove(index);
-        onChanged();
-      } else {
-        itemsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder getItemsBuilder(
-        int index) {
-      return getItemsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-        int index) {
-      if (itemsBuilder_ == null) {
-        return items_.get(index);  } else {
-        return itemsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public java.util.List 
-         getItemsOrBuilderList() {
-      if (itemsBuilder_ != null) {
-        return itemsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(items_);
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder addItemsBuilder() {
-      return getItemsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.ContentItem.getDefaultInstance());
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder addItemsBuilder(
-        int index) {
-      return getItemsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.ContentItem.getDefaultInstance());
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * All items will be treated as text/*.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-     */
-    public java.util.List 
-         getItemsBuilderList() {
-      return getItemsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder> 
-        getItemsFieldBuilder() {
-      if (itemsBuilder_ == null) {
-        itemsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder>(
-                items_,
-                ((bitField0_ & 0x00000004) == 0x00000004),
-                getParentForChildren(),
-                isClean());
-        items_ = null;
-      }
-      return itemsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.DeidentifyContentRequest)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.DeidentifyContentRequest)
-  private static final com.google.privacy.dlp.v2beta1.DeidentifyContentRequest DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.DeidentifyContentRequest();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentRequest getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public DeidentifyContentRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeidentifyContentRequest(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.DeidentifyContentRequest getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentRequestOrBuilder.java
deleted file mode 100644
index 55975f91e079..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentRequestOrBuilder.java
+++ /dev/null
@@ -1,108 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface DeidentifyContentRequestOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.DeidentifyContentRequest)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Configuration for the de-identification of the list of content items.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-   */
-  boolean hasDeidentifyConfig();
-  /**
-   * 
-   * Configuration for the de-identification of the list of content items.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-   */
-  com.google.privacy.dlp.v2beta1.DeidentifyConfig getDeidentifyConfig();
-  /**
-   * 
-   * Configuration for the de-identification of the list of content items.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.DeidentifyConfig deidentify_config = 1;
-   */
-  com.google.privacy.dlp.v2beta1.DeidentifyConfigOrBuilder getDeidentifyConfigOrBuilder();
-
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-   */
-  boolean hasInspectConfig();
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-   */
-  com.google.privacy.dlp.v2beta1.InspectConfig getInspectConfig();
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 2;
-   */
-  com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getInspectConfigOrBuilder();
-
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * All items will be treated as text/*.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-   */
-  java.util.List 
-      getItemsList();
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * All items will be treated as text/*.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-   */
-  com.google.privacy.dlp.v2beta1.ContentItem getItems(int index);
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * All items will be treated as text/*.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-   */
-  int getItemsCount();
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * All items will be treated as text/*.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-   */
-  java.util.List 
-      getItemsOrBuilderList();
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * All items will be treated as text/*.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 3;
-   */
-  com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentResponse.java
deleted file mode 100644
index dc7333862a27..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentResponse.java
+++ /dev/null
@@ -1,1177 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Results of de-identifying a list of items.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.DeidentifyContentResponse}
- */
-public  final class DeidentifyContentResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.DeidentifyContentResponse)
-    DeidentifyContentResponseOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use DeidentifyContentResponse.newBuilder() to construct.
-  private DeidentifyContentResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private DeidentifyContentResponse() {
-    items_ = java.util.Collections.emptyList();
-    summaries_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private DeidentifyContentResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              items_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            items_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.ContentItem.parser(), extensionRegistry));
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              summaries_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
-            }
-            summaries_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.DeidentificationSummary.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        items_ = java.util.Collections.unmodifiableList(items_);
-      }
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-        summaries_ = java.util.Collections.unmodifiableList(summaries_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyContentResponse_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyContentResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.DeidentifyContentResponse.class, com.google.privacy.dlp.v2beta1.DeidentifyContentResponse.Builder.class);
-  }
-
-  public static final int ITEMS_FIELD_NUMBER = 1;
-  private java.util.List items_;
-  /**
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  public java.util.List getItemsList() {
-    return items_;
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  public java.util.List 
-      getItemsOrBuilderList() {
-    return items_;
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  public int getItemsCount() {
-    return items_.size();
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.ContentItem getItems(int index) {
-    return items_.get(index);
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-      int index) {
-    return items_.get(index);
-  }
-
-  public static final int SUMMARIES_FIELD_NUMBER = 2;
-  private java.util.List summaries_;
-  /**
-   * 
-   * A review of the transformations that took place for each item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-   */
-  public java.util.List getSummariesList() {
-    return summaries_;
-  }
-  /**
-   * 
-   * A review of the transformations that took place for each item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-   */
-  public java.util.List 
-      getSummariesOrBuilderList() {
-    return summaries_;
-  }
-  /**
-   * 
-   * A review of the transformations that took place for each item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-   */
-  public int getSummariesCount() {
-    return summaries_.size();
-  }
-  /**
-   * 
-   * A review of the transformations that took place for each item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.DeidentificationSummary getSummaries(int index) {
-    return summaries_.get(index);
-  }
-  /**
-   * 
-   * A review of the transformations that took place for each item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.DeidentificationSummaryOrBuilder getSummariesOrBuilder(
-      int index) {
-    return summaries_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < items_.size(); i++) {
-      output.writeMessage(1, items_.get(i));
-    }
-    for (int i = 0; i < summaries_.size(); i++) {
-      output.writeMessage(2, summaries_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < items_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, items_.get(i));
-    }
-    for (int i = 0; i < summaries_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, summaries_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.DeidentifyContentResponse)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.DeidentifyContentResponse other = (com.google.privacy.dlp.v2beta1.DeidentifyContentResponse) obj;
-
-    boolean result = true;
-    result = result && getItemsList()
-        .equals(other.getItemsList());
-    result = result && getSummariesList()
-        .equals(other.getSummariesList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getItemsCount() > 0) {
-      hash = (37 * hash) + ITEMS_FIELD_NUMBER;
-      hash = (53 * hash) + getItemsList().hashCode();
-    }
-    if (getSummariesCount() > 0) {
-      hash = (37 * hash) + SUMMARIES_FIELD_NUMBER;
-      hash = (53 * hash) + getSummariesList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.DeidentifyContentResponse prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Results of de-identifying a list of items.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.DeidentifyContentResponse}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.DeidentifyContentResponse)
-      com.google.privacy.dlp.v2beta1.DeidentifyContentResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyContentResponse_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyContentResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.DeidentifyContentResponse.class, com.google.privacy.dlp.v2beta1.DeidentifyContentResponse.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.DeidentifyContentResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getItemsFieldBuilder();
-        getSummariesFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (itemsBuilder_ == null) {
-        items_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        itemsBuilder_.clear();
-      }
-      if (summariesBuilder_ == null) {
-        summaries_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-      } else {
-        summariesBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_DeidentifyContentResponse_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.DeidentifyContentResponse getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.DeidentifyContentResponse.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.DeidentifyContentResponse build() {
-      com.google.privacy.dlp.v2beta1.DeidentifyContentResponse result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.DeidentifyContentResponse buildPartial() {
-      com.google.privacy.dlp.v2beta1.DeidentifyContentResponse result = new com.google.privacy.dlp.v2beta1.DeidentifyContentResponse(this);
-      int from_bitField0_ = bitField0_;
-      if (itemsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          items_ = java.util.Collections.unmodifiableList(items_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.items_ = items_;
-      } else {
-        result.items_ = itemsBuilder_.build();
-      }
-      if (summariesBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          summaries_ = java.util.Collections.unmodifiableList(summaries_);
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.summaries_ = summaries_;
-      } else {
-        result.summaries_ = summariesBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.DeidentifyContentResponse) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.DeidentifyContentResponse)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.DeidentifyContentResponse other) {
-      if (other == com.google.privacy.dlp.v2beta1.DeidentifyContentResponse.getDefaultInstance()) return this;
-      if (itemsBuilder_ == null) {
-        if (!other.items_.isEmpty()) {
-          if (items_.isEmpty()) {
-            items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureItemsIsMutable();
-            items_.addAll(other.items_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.items_.isEmpty()) {
-          if (itemsBuilder_.isEmpty()) {
-            itemsBuilder_.dispose();
-            itemsBuilder_ = null;
-            items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            itemsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getItemsFieldBuilder() : null;
-          } else {
-            itemsBuilder_.addAllMessages(other.items_);
-          }
-        }
-      }
-      if (summariesBuilder_ == null) {
-        if (!other.summaries_.isEmpty()) {
-          if (summaries_.isEmpty()) {
-            summaries_ = other.summaries_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureSummariesIsMutable();
-            summaries_.addAll(other.summaries_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.summaries_.isEmpty()) {
-          if (summariesBuilder_.isEmpty()) {
-            summariesBuilder_.dispose();
-            summariesBuilder_ = null;
-            summaries_ = other.summaries_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-            summariesBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getSummariesFieldBuilder() : null;
-          } else {
-            summariesBuilder_.addAllMessages(other.summaries_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.DeidentifyContentResponse parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.DeidentifyContentResponse) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List items_ =
-      java.util.Collections.emptyList();
-    private void ensureItemsIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        items_ = new java.util.ArrayList(items_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder> itemsBuilder_;
-
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public java.util.List getItemsList() {
-      if (itemsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(items_);
-      } else {
-        return itemsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public int getItemsCount() {
-      if (itemsBuilder_ == null) {
-        return items_.size();
-      } else {
-        return itemsBuilder_.getCount();
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem getItems(int index) {
-      if (itemsBuilder_ == null) {
-        return items_.get(index);
-      } else {
-        return itemsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder setItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.set(index, value);
-        onChanged();
-      } else {
-        itemsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder setItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder addItems(com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.add(value);
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder addItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.add(index, value);
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder addItems(
-        com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.add(builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder addItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder addAllItems(
-        java.lang.Iterable values) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, items_);
-        onChanged();
-      } else {
-        itemsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder clearItems() {
-      if (itemsBuilder_ == null) {
-        items_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        itemsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder removeItems(int index) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.remove(index);
-        onChanged();
-      } else {
-        itemsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder getItemsBuilder(
-        int index) {
-      return getItemsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-        int index) {
-      if (itemsBuilder_ == null) {
-        return items_.get(index);  } else {
-        return itemsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public java.util.List 
-         getItemsOrBuilderList() {
-      if (itemsBuilder_ != null) {
-        return itemsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(items_);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder addItemsBuilder() {
-      return getItemsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.ContentItem.getDefaultInstance());
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder addItemsBuilder(
-        int index) {
-      return getItemsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.ContentItem.getDefaultInstance());
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public java.util.List 
-         getItemsBuilderList() {
-      return getItemsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder> 
-        getItemsFieldBuilder() {
-      if (itemsBuilder_ == null) {
-        itemsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder>(
-                items_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        items_ = null;
-      }
-      return itemsBuilder_;
-    }
-
-    private java.util.List summaries_ =
-      java.util.Collections.emptyList();
-    private void ensureSummariesIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-        summaries_ = new java.util.ArrayList(summaries_);
-        bitField0_ |= 0x00000002;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.DeidentificationSummary, com.google.privacy.dlp.v2beta1.DeidentificationSummary.Builder, com.google.privacy.dlp.v2beta1.DeidentificationSummaryOrBuilder> summariesBuilder_;
-
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public java.util.List getSummariesList() {
-      if (summariesBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(summaries_);
-      } else {
-        return summariesBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public int getSummariesCount() {
-      if (summariesBuilder_ == null) {
-        return summaries_.size();
-      } else {
-        return summariesBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.DeidentificationSummary getSummaries(int index) {
-      if (summariesBuilder_ == null) {
-        return summaries_.get(index);
-      } else {
-        return summariesBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public Builder setSummaries(
-        int index, com.google.privacy.dlp.v2beta1.DeidentificationSummary value) {
-      if (summariesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureSummariesIsMutable();
-        summaries_.set(index, value);
-        onChanged();
-      } else {
-        summariesBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public Builder setSummaries(
-        int index, com.google.privacy.dlp.v2beta1.DeidentificationSummary.Builder builderForValue) {
-      if (summariesBuilder_ == null) {
-        ensureSummariesIsMutable();
-        summaries_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        summariesBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public Builder addSummaries(com.google.privacy.dlp.v2beta1.DeidentificationSummary value) {
-      if (summariesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureSummariesIsMutable();
-        summaries_.add(value);
-        onChanged();
-      } else {
-        summariesBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public Builder addSummaries(
-        int index, com.google.privacy.dlp.v2beta1.DeidentificationSummary value) {
-      if (summariesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureSummariesIsMutable();
-        summaries_.add(index, value);
-        onChanged();
-      } else {
-        summariesBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public Builder addSummaries(
-        com.google.privacy.dlp.v2beta1.DeidentificationSummary.Builder builderForValue) {
-      if (summariesBuilder_ == null) {
-        ensureSummariesIsMutable();
-        summaries_.add(builderForValue.build());
-        onChanged();
-      } else {
-        summariesBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public Builder addSummaries(
-        int index, com.google.privacy.dlp.v2beta1.DeidentificationSummary.Builder builderForValue) {
-      if (summariesBuilder_ == null) {
-        ensureSummariesIsMutable();
-        summaries_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        summariesBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public Builder addAllSummaries(
-        java.lang.Iterable values) {
-      if (summariesBuilder_ == null) {
-        ensureSummariesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, summaries_);
-        onChanged();
-      } else {
-        summariesBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public Builder clearSummaries() {
-      if (summariesBuilder_ == null) {
-        summaries_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-      } else {
-        summariesBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public Builder removeSummaries(int index) {
-      if (summariesBuilder_ == null) {
-        ensureSummariesIsMutable();
-        summaries_.remove(index);
-        onChanged();
-      } else {
-        summariesBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.DeidentificationSummary.Builder getSummariesBuilder(
-        int index) {
-      return getSummariesFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.DeidentificationSummaryOrBuilder getSummariesOrBuilder(
-        int index) {
-      if (summariesBuilder_ == null) {
-        return summaries_.get(index);  } else {
-        return summariesBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public java.util.List 
-         getSummariesOrBuilderList() {
-      if (summariesBuilder_ != null) {
-        return summariesBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(summaries_);
-      }
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.DeidentificationSummary.Builder addSummariesBuilder() {
-      return getSummariesFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.DeidentificationSummary.getDefaultInstance());
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.DeidentificationSummary.Builder addSummariesBuilder(
-        int index) {
-      return getSummariesFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.DeidentificationSummary.getDefaultInstance());
-    }
-    /**
-     * 
-     * A review of the transformations that took place for each item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-     */
-    public java.util.List 
-         getSummariesBuilderList() {
-      return getSummariesFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.DeidentificationSummary, com.google.privacy.dlp.v2beta1.DeidentificationSummary.Builder, com.google.privacy.dlp.v2beta1.DeidentificationSummaryOrBuilder> 
-        getSummariesFieldBuilder() {
-      if (summariesBuilder_ == null) {
-        summariesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.DeidentificationSummary, com.google.privacy.dlp.v2beta1.DeidentificationSummary.Builder, com.google.privacy.dlp.v2beta1.DeidentificationSummaryOrBuilder>(
-                summaries_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
-        summaries_ = null;
-      }
-      return summariesBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.DeidentifyContentResponse)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.DeidentifyContentResponse)
-  private static final com.google.privacy.dlp.v2beta1.DeidentifyContentResponse DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.DeidentifyContentResponse();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.DeidentifyContentResponse getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public DeidentifyContentResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeidentifyContentResponse(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.DeidentifyContentResponse getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentResponseOrBuilder.java
deleted file mode 100644
index a73d8565f0d0..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DeidentifyContentResponseOrBuilder.java
+++ /dev/null
@@ -1,77 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface DeidentifyContentResponseOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.DeidentifyContentResponse)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  java.util.List 
-      getItemsList();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  com.google.privacy.dlp.v2beta1.ContentItem getItems(int index);
-  /**
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  int getItemsCount();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  java.util.List 
-      getItemsOrBuilderList();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-      int index);
-
-  /**
-   * 
-   * A review of the transformations that took place for each item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-   */
-  java.util.List 
-      getSummariesList();
-  /**
-   * 
-   * A review of the transformations that took place for each item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-   */
-  com.google.privacy.dlp.v2beta1.DeidentificationSummary getSummaries(int index);
-  /**
-   * 
-   * A review of the transformations that took place for each item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-   */
-  int getSummariesCount();
-  /**
-   * 
-   * A review of the transformations that took place for each item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-   */
-  java.util.List 
-      getSummariesOrBuilderList();
-  /**
-   * 
-   * A review of the transformations that took place for each item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.DeidentificationSummary summaries = 2;
-   */
-  com.google.privacy.dlp.v2beta1.DeidentificationSummaryOrBuilder getSummariesOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpProto.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpProto.java
deleted file mode 100644
index e8fc2226353b..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpProto.java
+++ /dev/null
@@ -1,1370 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public final class DlpProto {
-  private DlpProto() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_InspectConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_InspectConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_InspectConfig_InfoTypeLimit_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_InspectConfig_InfoTypeLimit_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_OperationConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_OperationConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_ContentItem_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_ContentItem_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_Table_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_Table_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_Table_Row_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_Table_Row_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_InspectResult_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_InspectResult_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_Finding_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_Finding_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_Location_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_Location_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_TableLocation_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_TableLocation_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_Range_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_Range_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_ImageLocation_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_ImageLocation_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ReplaceConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ReplaceConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ImageRedactionConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ImageRedactionConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_Color_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_Color_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RedactContentResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RedactContentResponse_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_DeidentifyContentRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_DeidentifyContentRequest_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_DeidentifyContentResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_DeidentifyContentResponse_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_InspectContentRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_InspectContentRequest_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_InspectContentResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_InspectContentResponse_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CreateInspectOperationRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CreateInspectOperationRequest_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_OutputStorageConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_OutputStorageConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_InfoTypeStatistics_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_InfoTypeStatistics_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_InspectOperationMetadata_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_InspectOperationMetadata_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_InspectOperationResult_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_InspectOperationResult_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsRequest_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsResponse_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_InfoTypeDescription_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_InfoTypeDescription_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_ListInfoTypesRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_ListInfoTypesRequest_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_ListInfoTypesResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_ListInfoTypesResponse_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CategoryDescription_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CategoryDescription_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesRequest_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesResponse_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesResponse_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_AnalyzeDataSourceRiskRequest_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_AnalyzeDataSourceRiskRequest_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_NumericalStatsConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_NumericalStatsConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_CategoricalStatsConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_CategoricalStatsConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_KAnonymityConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_KAnonymityConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_LDiversityConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_LDiversityConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationMetadata_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationMetadata_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_NumericalStatsResult_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_NumericalStatsResult_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_ValueFrequency_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_ValueFrequency_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_Value_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_Value_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_DeidentifyConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_DeidentifyConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_PrimitiveTransformation_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_PrimitiveTransformation_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_TimePartConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_TimePartConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CryptoHashConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CryptoHashConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_ReplaceValueConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_ReplaceValueConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_ReplaceWithInfoTypeConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_ReplaceWithInfoTypeConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RedactConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RedactConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CharsToIgnore_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CharsToIgnore_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CharacterMaskConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CharacterMaskConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_FixedSizeBucketingConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_FixedSizeBucketingConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_BucketingConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_BucketingConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_BucketingConfig_Bucket_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_BucketingConfig_Bucket_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CryptoReplaceFfxFpeConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CryptoReplaceFfxFpeConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CryptoKey_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CryptoKey_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_TransientCryptoKey_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_TransientCryptoKey_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_UnwrappedCryptoKey_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_UnwrappedCryptoKey_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_KmsWrappedCryptoKey_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_KmsWrappedCryptoKey_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_InfoTypeTransformation_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_InfoTypeTransformation_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_FieldTransformation_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_FieldTransformation_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RecordTransformations_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RecordTransformations_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RecordSuppression_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RecordSuppression_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RecordCondition_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RecordCondition_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RecordCondition_Condition_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RecordCondition_Condition_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RecordCondition_Conditions_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RecordCondition_Conditions_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RecordCondition_Expressions_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RecordCondition_Expressions_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_DeidentificationSummary_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_DeidentificationSummary_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_TransformationSummary_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_TransformationSummary_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_TransformationSummary_SummaryResult_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_TransformationSummary_SummaryResult_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n$google/privacy/dlp/v2beta1/dlp.proto\022\032" +
-      "google.privacy.dlp.v2beta1\032\034google/api/a" +
-      "nnotations.proto\032#google/longrunning/ope" +
-      "rations.proto\032(google/privacy/dlp/v2beta" +
-      "1/storage.proto\032\033google/protobuf/empty.p" +
-      "roto\032\037google/protobuf/timestamp.proto\032\026g" +
-      "oogle/type/date.proto\032\033google/type/timeo" +
-      "fday.proto\"\307\003\n\rInspectConfig\0228\n\ninfo_typ" +
-      "es\030\001 \003(\0132$.google.privacy.dlp.v2beta1.In" +
-      "foType\022>\n\016min_likelihood\030\002 \001(\0162&.google." +
-      "privacy.dlp.v2beta1.Likelihood\022\024\n\014max_fi" +
-      "ndings\030\003 \001(\005\022\025\n\rinclude_quote\030\004 \001(\010\022\025\n\re" +
-      "xclude_types\030\006 \001(\010\022Q\n\020info_type_limits\030\007" +
-      " \003(\01327.google.privacy.dlp.v2beta1.Inspec" +
-      "tConfig.InfoTypeLimit\022E\n\021custom_info_typ" +
-      "es\030\010 \003(\0132*.google.privacy.dlp.v2beta1.Cu" +
-      "stomInfoType\032^\n\rInfoTypeLimit\0227\n\tinfo_ty" +
-      "pe\030\001 \001(\0132$.google.privacy.dlp.v2beta1.In" +
-      "foType\022\024\n\014max_findings\030\002 \001(\005\",\n\017Operatio" +
-      "nConfig\022\031\n\021max_item_findings\030\001 \001(\003\"}\n\013Co" +
-      "ntentItem\022\014\n\004type\030\001 \001(\t\022\016\n\004data\030\002 \001(\014H\000\022" +
-      "\017\n\005value\030\003 \001(\tH\000\0222\n\005table\030\004 \001(\0132!.google" +
-      ".privacy.dlp.v2beta1.TableH\000B\013\n\tdata_ite" +
-      "m\"\254\001\n\005Table\0224\n\007headers\030\001 \003(\0132#.google.pr" +
-      "ivacy.dlp.v2beta1.FieldId\0223\n\004rows\030\002 \003(\0132" +
-      "%.google.privacy.dlp.v2beta1.Table.Row\0328" +
-      "\n\003Row\0221\n\006values\030\001 \003(\0132!.google.privacy.d" +
-      "lp.v2beta1.Value\"b\n\rInspectResult\0225\n\010fin" +
-      "dings\030\001 \003(\0132#.google.privacy.dlp.v2beta1" +
-      ".Finding\022\032\n\022findings_truncated\030\002 \001(\010\"\366\001\n" +
-      "\007Finding\022\r\n\005quote\030\001 \001(\t\0227\n\tinfo_type\030\002 \001" +
-      "(\0132$.google.privacy.dlp.v2beta1.InfoType" +
-      "\022:\n\nlikelihood\030\003 \001(\0162&.google.privacy.dl" +
-      "p.v2beta1.Likelihood\0226\n\010location\030\004 \001(\0132$" +
-      ".google.privacy.dlp.v2beta1.Location\022/\n\013" +
-      "create_time\030\006 \001(\0132\032.google.protobuf.Time" +
-      "stamp\"\362\002\n\010Location\0225\n\nbyte_range\030\001 \001(\0132!" +
-      ".google.privacy.dlp.v2beta1.Range\022:\n\017cod" +
-      "epoint_range\030\002 \001(\0132!.google.privacy.dlp." +
-      "v2beta1.Range\022>\n\013image_boxes\030\003 \003(\0132).goo" +
-      "gle.privacy.dlp.v2beta1.ImageLocation\0229\n" +
-      "\nrecord_key\030\004 \001(\0132%.google.privacy.dlp.v" +
-      "2beta1.RecordKey\0225\n\010field_id\030\005 \001(\0132#.goo" +
-      "gle.privacy.dlp.v2beta1.FieldId\022A\n\016table" +
-      "_location\030\006 \001(\0132).google.privacy.dlp.v2b" +
-      "eta1.TableLocation\"\"\n\rTableLocation\022\021\n\tr" +
-      "ow_index\030\001 \001(\003\"#\n\005Range\022\r\n\005start\030\001 \001(\003\022\013" +
-      "\n\003end\030\002 \001(\003\"I\n\rImageLocation\022\013\n\003top\030\001 \001(" +
-      "\005\022\014\n\004left\030\002 \001(\005\022\r\n\005width\030\003 \001(\005\022\016\n\006height" +
-      "\030\004 \001(\005\"\347\004\n\024RedactContentRequest\022A\n\016inspe" +
-      "ct_config\030\001 \001(\0132).google.privacy.dlp.v2b" +
-      "eta1.InspectConfig\0226\n\005items\030\002 \003(\0132\'.goog" +
-      "le.privacy.dlp.v2beta1.ContentItem\022W\n\017re" +
-      "place_configs\030\003 \003(\0132>.google.privacy.dlp" +
-      ".v2beta1.RedactContentRequest.ReplaceCon" +
-      "fig\022f\n\027image_redaction_configs\030\004 \003(\0132E.g" +
-      "oogle.privacy.dlp.v2beta1.RedactContentR" +
-      "equest.ImageRedactionConfig\032^\n\rReplaceCo" +
-      "nfig\0227\n\tinfo_type\030\001 \001(\0132$.google.privacy" +
-      ".dlp.v2beta1.InfoType\022\024\n\014replace_with\030\002 " +
-      "\001(\t\032\262\001\n\024ImageRedactionConfig\0229\n\tinfo_typ" +
-      "e\030\001 \001(\0132$.google.privacy.dlp.v2beta1.Inf" +
-      "oTypeH\000\022\031\n\017redact_all_text\030\002 \001(\010H\000\022:\n\017re" +
-      "daction_color\030\003 \001(\0132!.google.privacy.dlp" +
-      ".v2beta1.ColorB\010\n\006target\"1\n\005Color\022\013\n\003red" +
-      "\030\001 \001(\002\022\r\n\005green\030\002 \001(\002\022\014\n\004blue\030\003 \001(\002\"O\n\025R" +
-      "edactContentResponse\0226\n\005items\030\001 \003(\0132\'.go" +
-      "ogle.privacy.dlp.v2beta1.ContentItem\"\336\001\n" +
-      "\030DeidentifyContentRequest\022G\n\021deidentify_" +
-      "config\030\001 \001(\0132,.google.privacy.dlp.v2beta" +
-      "1.DeidentifyConfig\022A\n\016inspect_config\030\002 \001" +
-      "(\0132).google.privacy.dlp.v2beta1.InspectC" +
-      "onfig\0226\n\005items\030\003 \003(\0132\'.google.privacy.dl" +
-      "p.v2beta1.ContentItem\"\233\001\n\031DeidentifyCont" +
-      "entResponse\0226\n\005items\030\001 \003(\0132\'.google.priv" +
-      "acy.dlp.v2beta1.ContentItem\022F\n\tsummaries" +
-      "\030\002 \003(\01323.google.privacy.dlp.v2beta1.Deid" +
-      "entificationSummary\"\222\001\n\025InspectContentRe" +
-      "quest\022A\n\016inspect_config\030\001 \001(\0132).google.p" +
-      "rivacy.dlp.v2beta1.InspectConfig\0226\n\005item" +
-      "s\030\002 \003(\0132\'.google.privacy.dlp.v2beta1.Con" +
-      "tentItem\"T\n\026InspectContentResponse\022:\n\007re" +
-      "sults\030\001 \003(\0132).google.privacy.dlp.v2beta1" +
-      ".InspectResult\"\264\002\n\035CreateInspectOperatio" +
-      "nRequest\022A\n\016inspect_config\030\001 \001(\0132).googl" +
-      "e.privacy.dlp.v2beta1.InspectConfig\022A\n\016s" +
-      "torage_config\030\002 \001(\0132).google.privacy.dlp" +
-      ".v2beta1.StorageConfig\022F\n\routput_config\030" +
-      "\003 \001(\0132/.google.privacy.dlp.v2beta1.Outpu" +
-      "tStorageConfig\022E\n\020operation_config\030\005 \001(\013" +
-      "2+.google.privacy.dlp.v2beta1.OperationC" +
-      "onfig\"\237\001\n\023OutputStorageConfig\022:\n\005table\030\001" +
-      " \001(\0132).google.privacy.dlp.v2beta1.BigQue" +
-      "ryTableH\000\022D\n\014storage_path\030\002 \001(\0132,.google" +
-      ".privacy.dlp.v2beta1.CloudStoragePathH\000B" +
-      "\006\n\004type\"\\\n\022InfoTypeStatistics\0227\n\tinfo_ty" +
-      "pe\030\001 \001(\0132$.google.privacy.dlp.v2beta1.In" +
-      "foType\022\r\n\005count\030\002 \001(\003\"\262\003\n\030InspectOperati" +
-      "onMetadata\022\027\n\017processed_bytes\030\001 \001(\003\022\035\n\025t" +
-      "otal_estimated_bytes\030\004 \001(\003\022G\n\017info_type_" +
-      "stats\030\002 \003(\0132..google.privacy.dlp.v2beta1" +
-      ".InfoTypeStatistics\022/\n\013create_time\030\003 \001(\013" +
-      "2\032.google.protobuf.Timestamp\022I\n\026request_" +
-      "inspect_config\030\005 \001(\0132).google.privacy.dl" +
-      "p.v2beta1.InspectConfig\022I\n\026request_stora" +
-      "ge_config\030\006 \001(\0132).google.privacy.dlp.v2b" +
-      "eta1.StorageConfig\022N\n\025request_output_con" +
-      "fig\030\007 \001(\0132/.google.privacy.dlp.v2beta1.O" +
-      "utputStorageConfig\"&\n\026InspectOperationRe" +
-      "sult\022\014\n\004name\030\001 \001(\t\"a\n\032ListInspectFinding" +
-      "sRequest\022\014\n\004name\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(" +
-      "\005\022\022\n\npage_token\030\003 \001(\t\022\016\n\006filter\030\004 \001(\t\"q\n" +
-      "\033ListInspectFindingsResponse\0229\n\006result\030\001" +
-      " \001(\0132).google.privacy.dlp.v2beta1.Inspec" +
-      "tResult\022\027\n\017next_page_token\030\002 \001(\t\"~\n\023Info" +
-      "TypeDescription\022\014\n\004name\030\001 \001(\t\022\024\n\014display" +
-      "_name\030\002 \001(\t\022C\n\ncategories\030\003 \003(\0132/.google" +
-      ".privacy.dlp.v2beta1.CategoryDescription" +
-      "\"?\n\024ListInfoTypesRequest\022\020\n\010category\030\001 \001" +
-      "(\t\022\025\n\rlanguage_code\030\002 \001(\t\"\\\n\025ListInfoTyp" +
-      "esResponse\022C\n\ninfo_types\030\001 \003(\0132/.google." +
-      "privacy.dlp.v2beta1.InfoTypeDescription\"" +
-      "9\n\023CategoryDescription\022\014\n\004name\030\001 \001(\t\022\024\n\014" +
-      "display_name\030\002 \001(\t\"2\n\031ListRootCategories" +
-      "Request\022\025\n\rlanguage_code\030\001 \001(\t\"a\n\032ListRo" +
-      "otCategoriesResponse\022C\n\ncategories\030\001 \003(\013" +
-      "2/.google.privacy.dlp.v2beta1.CategoryDe" +
-      "scription\"\242\001\n\034AnalyzeDataSourceRiskReque" +
-      "st\022A\n\016privacy_metric\030\001 \001(\0132).google.priv" +
-      "acy.dlp.v2beta1.PrivacyMetric\022?\n\014source_" +
-      "table\030\003 \001(\0132).google.privacy.dlp.v2beta1" +
-      ".BigQueryTable\"\302\006\n\rPrivacyMetric\022`\n\026nume" +
-      "rical_stats_config\030\001 \001(\0132>.google.privac" +
-      "y.dlp.v2beta1.PrivacyMetric.NumericalSta" +
-      "tsConfigH\000\022d\n\030categorical_stats_config\030\002" +
-      " \001(\0132@.google.privacy.dlp.v2beta1.Privac" +
-      "yMetric.CategoricalStatsConfigH\000\022X\n\022k_an" +
-      "onymity_config\030\003 \001(\0132:.google.privacy.dl" +
-      "p.v2beta1.PrivacyMetric.KAnonymityConfig" +
-      "H\000\022X\n\022l_diversity_config\030\004 \001(\0132:.google." +
-      "privacy.dlp.v2beta1.PrivacyMetric.LDiver" +
-      "sityConfigH\000\032J\n\024NumericalStatsConfig\0222\n\005" +
-      "field\030\001 \001(\0132#.google.privacy.dlp.v2beta1" +
-      ".FieldId\032L\n\026CategoricalStatsConfig\0222\n\005fi" +
-      "eld\030\001 \001(\0132#.google.privacy.dlp.v2beta1.F" +
-      "ieldId\032\203\001\n\020KAnonymityConfig\0226\n\tquasi_ids" +
-      "\030\001 \003(\0132#.google.privacy.dlp.v2beta1.Fiel" +
-      "dId\0227\n\tentity_id\030\002 \001(\0132$.google.privacy." +
-      "dlp.v2beta1.EntityId\032\214\001\n\020LDiversityConfi" +
-      "g\0226\n\tquasi_ids\030\001 \003(\0132#.google.privacy.dl" +
-      "p.v2beta1.FieldId\022@\n\023sensitive_attribute" +
-      "\030\002 \001(\0132#.google.privacy.dlp.v2beta1.Fiel" +
-      "dIdB\006\n\004type\"\350\001\n\035RiskAnalysisOperationMet" +
-      "adata\022/\n\013create_time\030\001 \001(\0132\032.google.prot" +
-      "obuf.Timestamp\022K\n\030requested_privacy_metr" +
-      "ic\030\002 \001(\0132).google.privacy.dlp.v2beta1.Pr" +
-      "ivacyMetric\022I\n\026requested_source_table\030\003 " +
-      "\001(\0132).google.privacy.dlp.v2beta1.BigQuer" +
-      "yTable\"\353\021\n\033RiskAnalysisOperationResult\022n" +
-      "\n\026numerical_stats_result\030\003 \001(\0132L.google." +
-      "privacy.dlp.v2beta1.RiskAnalysisOperatio" +
-      "nResult.NumericalStatsResultH\000\022r\n\030catego" +
-      "rical_stats_result\030\004 \001(\0132N.google.privac" +
-      "y.dlp.v2beta1.RiskAnalysisOperationResul" +
-      "t.CategoricalStatsResultH\000\022f\n\022k_anonymit" +
-      "y_result\030\005 \001(\0132H.google.privacy.dlp.v2be" +
-      "ta1.RiskAnalysisOperationResult.KAnonymi" +
-      "tyResultH\000\022f\n\022l_diversity_result\030\006 \001(\0132H" +
-      ".google.privacy.dlp.v2beta1.RiskAnalysis" +
-      "OperationResult.LDiversityResultH\000\032\276\001\n\024N" +
-      "umericalStatsResult\0224\n\tmin_value\030\001 \001(\0132!" +
-      ".google.privacy.dlp.v2beta1.Value\0224\n\tmax" +
-      "_value\030\002 \001(\0132!.google.privacy.dlp.v2beta" +
-      "1.Value\022:\n\017quantile_values\030\004 \003(\0132!.googl" +
-      "e.privacy.dlp.v2beta1.Value\032\372\002\n\026Categori" +
-      "calStatsResult\022\231\001\n!value_frequency_histo" +
-      "gram_buckets\030\005 \003(\0132n.google.privacy.dlp." +
-      "v2beta1.RiskAnalysisOperationResult.Cate" +
-      "goricalStatsResult.CategoricalStatsHisto" +
-      "gramBucket\032\303\001\n\037CategoricalStatsHistogram" +
-      "Bucket\022#\n\033value_frequency_lower_bound\030\001 " +
-      "\001(\003\022#\n\033value_frequency_upper_bound\030\002 \001(\003" +
-      "\022\023\n\013bucket_size\030\003 \001(\003\022A\n\rbucket_values\030\004" +
-      " \003(\0132*.google.privacy.dlp.v2beta1.ValueF" +
-      "requency\032\246\004\n\020KAnonymityResult\022\217\001\n#equiva" +
-      "lence_class_histogram_buckets\030\005 \003(\0132b.go" +
-      "ogle.privacy.dlp.v2beta1.RiskAnalysisOpe" +
-      "rationResult.KAnonymityResult.KAnonymity" +
-      "HistogramBucket\032y\n\032KAnonymityEquivalence" +
-      "Class\022;\n\020quasi_ids_values\030\001 \003(\0132!.google" +
-      ".privacy.dlp.v2beta1.Value\022\036\n\026equivalenc" +
-      "e_class_size\030\002 \001(\003\032\204\002\n\031KAnonymityHistogr" +
-      "amBucket\022*\n\"equivalence_class_size_lower" +
-      "_bound\030\001 \001(\003\022*\n\"equivalence_class_size_u" +
-      "pper_bound\030\002 \001(\003\022\023\n\013bucket_size\030\003 \001(\003\022z\n" +
-      "\rbucket_values\030\004 \003(\0132c.google.privacy.dl" +
-      "p.v2beta1.RiskAnalysisOperationResult.KA" +
-      "nonymityResult.KAnonymityEquivalenceClas" +
-      "s\032\246\005\n\020LDiversityResult\022\227\001\n+sensitive_val" +
-      "ue_frequency_histogram_buckets\030\005 \003(\0132b.g" +
-      "oogle.privacy.dlp.v2beta1.RiskAnalysisOp" +
-      "erationResult.LDiversityResult.LDiversit" +
-      "yHistogramBucket\032\352\001\n\032LDiversityEquivalen" +
-      "ceClass\022;\n\020quasi_ids_values\030\001 \003(\0132!.goog" +
-      "le.privacy.dlp.v2beta1.Value\022\036\n\026equivale" +
-      "nce_class_size\030\002 \001(\003\022%\n\035num_distinct_sen" +
-      "sitive_values\030\003 \001(\003\022H\n\024top_sensitive_val" +
-      "ues\030\004 \003(\0132*.google.privacy.dlp.v2beta1.V" +
-      "alueFrequency\032\212\002\n\031LDiversityHistogramBuc" +
-      "ket\022-\n%sensitive_value_frequency_lower_b" +
-      "ound\030\001 \001(\003\022-\n%sensitive_value_frequency_" +
-      "upper_bound\030\002 \001(\003\022\023\n\013bucket_size\030\003 \001(\003\022z" +
-      "\n\rbucket_values\030\004 \003(\0132c.google.privacy.d" +
-      "lp.v2beta1.RiskAnalysisOperationResult.L" +
-      "DiversityResult.LDiversityEquivalenceCla" +
-      "ssB\010\n\006result\"Q\n\016ValueFrequency\0220\n\005value\030" +
-      "\001 \001(\0132!.google.privacy.dlp.v2beta1.Value" +
-      "\022\r\n\005count\030\002 \001(\003\"\376\001\n\005Value\022\027\n\rinteger_val" +
-      "ue\030\001 \001(\003H\000\022\025\n\013float_value\030\002 \001(\001H\000\022\026\n\014str" +
-      "ing_value\030\003 \001(\tH\000\022\027\n\rboolean_value\030\004 \001(\010" +
-      "H\000\0225\n\017timestamp_value\030\005 \001(\0132\032.google.pro" +
-      "tobuf.TimestampH\000\022,\n\ntime_value\030\006 \001(\0132\026." +
-      "google.type.TimeOfDayH\000\022\'\n\ndate_value\030\007 " +
-      "\001(\0132\021.google.type.DateH\000B\006\n\004type\"\323\001\n\020Dei" +
-      "dentifyConfig\022X\n\031info_type_transformatio" +
-      "ns\030\001 \001(\01323.google.privacy.dlp.v2beta1.In" +
-      "foTypeTransformationsH\000\022S\n\026record_transf" +
-      "ormations\030\002 \001(\01321.google.privacy.dlp.v2b" +
-      "eta1.RecordTransformationsH\000B\020\n\016transfor" +
-      "mation\"\204\006\n\027PrimitiveTransformation\022H\n\016re" +
-      "place_config\030\001 \001(\0132..google.privacy.dlp." +
-      "v2beta1.ReplaceValueConfigH\000\022A\n\rredact_c" +
-      "onfig\030\002 \001(\0132(.google.privacy.dlp.v2beta1" +
-      ".RedactConfigH\000\022P\n\025character_mask_config" +
-      "\030\003 \001(\0132/.google.privacy.dlp.v2beta1.Char" +
-      "acterMaskConfigH\000\022^\n\035crypto_replace_ffx_" +
-      "fpe_config\030\004 \001(\01325.google.privacy.dlp.v2" +
-      "beta1.CryptoReplaceFfxFpeConfigH\000\022[\n\033fix" +
-      "ed_size_bucketing_config\030\005 \001(\01324.google." +
-      "privacy.dlp.v2beta1.FixedSizeBucketingCo" +
-      "nfigH\000\022G\n\020bucketing_config\030\006 \001(\0132+.googl" +
-      "e.privacy.dlp.v2beta1.BucketingConfigH\000\022" +
-      "^\n\035replace_with_info_type_config\030\007 \001(\01325" +
-      ".google.privacy.dlp.v2beta1.ReplaceWithI" +
-      "nfoTypeConfigH\000\022F\n\020time_part_config\030\010 \001(" +
-      "\0132*.google.privacy.dlp.v2beta1.TimePartC" +
-      "onfigH\000\022J\n\022crypto_hash_config\030\t \001(\0132,.go" +
-      "ogle.privacy.dlp.v2beta1.CryptoHashConfi" +
-      "gH\000B\020\n\016transformation\"\341\001\n\016TimePartConfig" +
-      "\022L\n\017part_to_extract\030\001 \001(\01623.google.priva" +
-      "cy.dlp.v2beta1.TimePartConfig.TimePart\"\200" +
-      "\001\n\010TimePart\022\031\n\025TIME_PART_UNSPECIFIED\020\000\022\010" +
-      "\n\004YEAR\020\001\022\t\n\005MONTH\020\002\022\020\n\014DAY_OF_MONTH\020\003\022\017\n" +
-      "\013DAY_OF_WEEK\020\004\022\020\n\014WEEK_OF_YEAR\020\005\022\017\n\013HOUR" +
-      "_OF_DAY\020\006\"M\n\020CryptoHashConfig\0229\n\ncrypto_" +
-      "key\030\001 \001(\0132%.google.privacy.dlp.v2beta1.C" +
-      "ryptoKey\"J\n\022ReplaceValueConfig\0224\n\tnew_va" +
-      "lue\030\001 \001(\0132!.google.privacy.dlp.v2beta1.V" +
-      "alue\"\033\n\031ReplaceWithInfoTypeConfig\"\016\n\014Red" +
-      "actConfig\"\252\002\n\rCharsToIgnore\022\034\n\022character" +
-      "s_to_skip\030\001 \001(\tH\000\022_\n\033common_characters_t" +
-      "o_ignore\030\002 \001(\01628.google.privacy.dlp.v2be" +
-      "ta1.CharsToIgnore.CharacterGroupH\000\"\213\001\n\016C" +
-      "haracterGroup\022\037\n\033CHARACTER_GROUP_UNSPECI" +
-      "FIED\020\000\022\013\n\007NUMERIC\020\001\022\024\n\020ALPHA_UPPER_CASE\020" +
-      "\002\022\024\n\020ALPHA_LOWER_CASE\020\003\022\017\n\013PUNCTUATION\020\004" +
-      "\022\016\n\nWHITESPACE\020\005B\014\n\ncharacters\"\250\001\n\023Chara" +
-      "cterMaskConfig\022\031\n\021masking_character\030\001 \001(" +
-      "\t\022\026\n\016number_to_mask\030\002 \001(\005\022\025\n\rreverse_ord" +
-      "er\030\003 \001(\010\022G\n\024characters_to_ignore\030\004 \003(\0132)" +
-      ".google.privacy.dlp.v2beta1.CharsToIgnor" +
-      "e\"\237\001\n\030FixedSizeBucketingConfig\0226\n\013lower_" +
-      "bound\030\001 \001(\0132!.google.privacy.dlp.v2beta1" +
-      ".Value\0226\n\013upper_bound\030\002 \001(\0132!.google.pri" +
-      "vacy.dlp.v2beta1.Value\022\023\n\013bucket_size\030\003 " +
-      "\001(\001\"\377\001\n\017BucketingConfig\022C\n\007buckets\030\001 \003(\013" +
-      "22.google.privacy.dlp.v2beta1.BucketingC" +
-      "onfig.Bucket\032\246\001\n\006Bucket\022.\n\003min\030\001 \001(\0132!.g" +
-      "oogle.privacy.dlp.v2beta1.Value\022.\n\003max\030\002" +
-      " \001(\0132!.google.privacy.dlp.v2beta1.Value\022" +
-      "<\n\021replacement_value\030\003 \001(\0132!.google.priv" +
-      "acy.dlp.v2beta1.Value\"\305\003\n\031CryptoReplaceF" +
-      "fxFpeConfig\0229\n\ncrypto_key\030\001 \001(\0132%.google" +
-      ".privacy.dlp.v2beta1.CryptoKey\0224\n\007contex" +
-      "t\030\002 \001(\0132#.google.privacy.dlp.v2beta1.Fie" +
-      "ldId\022h\n\017common_alphabet\030\004 \001(\0162M.google.p" +
-      "rivacy.dlp.v2beta1.CryptoReplaceFfxFpeCo" +
-      "nfig.FfxCommonNativeAlphabetH\000\022\031\n\017custom" +
-      "_alphabet\030\005 \001(\tH\000\022\017\n\005radix\030\006 \001(\005H\000\"\224\001\n\027F" +
-      "fxCommonNativeAlphabet\022*\n&FFX_COMMON_NAT" +
-      "IVE_ALPHABET_UNSPECIFIED\020\000\022\013\n\007NUMERIC\020\001\022" +
-      "\017\n\013HEXADECIMAL\020\002\022\034\n\030UPPER_CASE_ALPHA_NUM" +
-      "ERIC\020\003\022\021\n\rALPHA_NUMERIC\020\004B\n\n\010alphabet\"\347\001" +
-      "\n\tCryptoKey\022C\n\ttransient\030\001 \001(\0132..google." +
-      "privacy.dlp.v2beta1.TransientCryptoKeyH\000" +
-      "\022C\n\tunwrapped\030\002 \001(\0132..google.privacy.dlp" +
-      ".v2beta1.UnwrappedCryptoKeyH\000\022F\n\013kms_wra" +
-      "pped\030\003 \001(\0132/.google.privacy.dlp.v2beta1." +
-      "KmsWrappedCryptoKeyH\000B\010\n\006source\"\"\n\022Trans" +
-      "ientCryptoKey\022\014\n\004name\030\001 \001(\t\"!\n\022Unwrapped" +
-      "CryptoKey\022\013\n\003key\030\001 \001(\014\"C\n\023KmsWrappedCryp" +
-      "toKey\022\023\n\013wrapped_key\030\001 \001(\014\022\027\n\017crypto_key" +
-      "_name\030\002 \001(\t\"\252\002\n\027InfoTypeTransformations\022" +
-      "c\n\017transformations\030\001 \003(\0132J.google.privac" +
-      "y.dlp.v2beta1.InfoTypeTransformations.In" +
-      "foTypeTransformation\032\251\001\n\026InfoTypeTransfo" +
-      "rmation\0228\n\ninfo_types\030\001 \003(\0132$.google.pri" +
-      "vacy.dlp.v2beta1.InfoType\022U\n\030primitive_t" +
-      "ransformation\030\002 \001(\01323.google.privacy.dlp" +
-      ".v2beta1.PrimitiveTransformation\"\317\002\n\023Fie" +
-      "ldTransformation\0223\n\006fields\030\001 \003(\0132#.googl" +
-      "e.privacy.dlp.v2beta1.FieldId\022>\n\tconditi" +
-      "on\030\003 \001(\0132+.google.privacy.dlp.v2beta1.Re" +
-      "cordCondition\022W\n\030primitive_transformatio" +
-      "n\030\004 \001(\01323.google.privacy.dlp.v2beta1.Pri" +
-      "mitiveTransformationH\000\022X\n\031info_type_tran" +
-      "sformations\030\005 \001(\01323.google.privacy.dlp.v" +
-      "2beta1.InfoTypeTransformationsH\000B\020\n\016tran" +
-      "sformation\"\263\001\n\025RecordTransformations\022N\n\025" +
-      "field_transformations\030\001 \003(\0132/.google.pri" +
-      "vacy.dlp.v2beta1.FieldTransformation\022J\n\023" +
-      "record_suppressions\030\002 \003(\0132-.google.priva" +
-      "cy.dlp.v2beta1.RecordSuppression\"S\n\021Reco" +
-      "rdSuppression\022>\n\tcondition\030\001 \001(\0132+.googl" +
-      "e.privacy.dlp.v2beta1.RecordCondition\"\365\004" +
-      "\n\017RecordCondition\022L\n\013expressions\030\003 \001(\01327" +
-      ".google.privacy.dlp.v2beta1.RecordCondit" +
-      "ion.Expressions\032\263\001\n\tCondition\0222\n\005field\030\001" +
-      " \001(\0132#.google.privacy.dlp.v2beta1.FieldI" +
-      "d\022@\n\010operator\030\003 \001(\0162..google.privacy.dlp" +
-      ".v2beta1.RelationalOperator\0220\n\005value\030\004 \001" +
-      "(\0132!.google.privacy.dlp.v2beta1.Value\032W\n" +
-      "\nConditions\022I\n\nconditions\030\001 \003(\01325.google" +
-      ".privacy.dlp.v2beta1.RecordCondition.Con" +
-      "dition\032\204\002\n\013Expressions\022a\n\020logical_operat" +
-      "or\030\001 \001(\0162G.google.privacy.dlp.v2beta1.Re" +
-      "cordCondition.Expressions.LogicalOperato" +
-      "r\022L\n\nconditions\030\003 \001(\01326.google.privacy.d" +
-      "lp.v2beta1.RecordCondition.ConditionsH\000\"" +
-      "<\n\017LogicalOperator\022 \n\034LOGICAL_OPERATOR_U" +
-      "NSPECIFIED\020\000\022\007\n\003AND\020\001B\006\n\004type\"\211\001\n\027Deiden" +
-      "tificationSummary\022\031\n\021transformed_bytes\030\002" +
-      " \001(\003\022S\n\030transformation_summaries\030\003 \003(\01321" +
-      ".google.privacy.dlp.v2beta1.Transformati" +
-      "onSummary\"\247\005\n\025TransformationSummary\0227\n\ti" +
-      "nfo_type\030\001 \001(\0132$.google.privacy.dlp.v2be" +
-      "ta1.InfoType\0222\n\005field\030\002 \001(\0132#.google.pri" +
-      "vacy.dlp.v2beta1.FieldId\022K\n\016transformati" +
-      "on\030\003 \001(\01323.google.privacy.dlp.v2beta1.Pr" +
-      "imitiveTransformation\022N\n\025field_transform" +
-      "ations\030\005 \003(\0132/.google.privacy.dlp.v2beta" +
-      "1.FieldTransformation\022F\n\017record_suppress" +
-      "\030\006 \001(\0132-.google.privacy.dlp.v2beta1.Reco" +
-      "rdSuppression\022P\n\007results\030\004 \003(\0132?.google." +
-      "privacy.dlp.v2beta1.TransformationSummar" +
-      "y.SummaryResult\032\211\001\n\rSummaryResult\022\r\n\005cou" +
-      "nt\030\001 \001(\003\022X\n\004code\030\002 \001(\0162J.google.privacy." +
-      "dlp.v2beta1.TransformationSummary.Transf" +
-      "ormationResultCode\022\017\n\007details\030\003 \001(\t\"^\n\030T" +
-      "ransformationResultCode\022*\n&TRANSFORMATIO" +
-      "N_RESULT_CODE_UNSPECIFIED\020\000\022\013\n\007SUCCESS\020\001" +
-      "\022\t\n\005ERROR\020\002*t\n\nLikelihood\022\032\n\026LIKELIHOOD_" +
-      "UNSPECIFIED\020\000\022\021\n\rVERY_UNLIKELY\020\001\022\014\n\010UNLI" +
-      "KELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIKELY\020\004\022\017\n\013VERY" +
-      "_LIKELY\020\005*\273\001\n\022RelationalOperator\022#\n\037RELA" +
-      "TIONAL_OPERATOR_UNSPECIFIED\020\000\022\014\n\010EQUAL_T" +
-      "O\020\001\022\020\n\014NOT_EQUAL_TO\020\002\022\020\n\014GREATER_THAN\020\003\022" +
-      "\r\n\tLESS_THAN\020\004\022\032\n\026GREATER_THAN_OR_EQUALS" +
-      "\020\005\022\027\n\023LESS_THAN_OR_EQUALS\020\006\022\n\n\006EXISTS\020\0072" +
-      "\274\n\n\nDlpService\022\234\001\n\016InspectContent\0221.goog" +
-      "le.privacy.dlp.v2beta1.InspectContentReq" +
-      "uest\0322.google.privacy.dlp.v2beta1.Inspec" +
-      "tContentResponse\"#\202\323\344\223\002\035\"\030/v2beta1/conte" +
-      "nt:inspect:\001*\022\230\001\n\rRedactContent\0220.google" +
-      ".privacy.dlp.v2beta1.RedactContentReques" +
-      "t\0321.google.privacy.dlp.v2beta1.RedactCon" +
-      "tentResponse\"\"\202\323\344\223\002\034\"\027/v2beta1/content:r" +
-      "edact:\001*\022\250\001\n\021DeidentifyContent\0224.google." +
-      "privacy.dlp.v2beta1.DeidentifyContentReq" +
-      "uest\0325.google.privacy.dlp.v2beta1.Deiden" +
-      "tifyContentResponse\"&\202\323\344\223\002 \"\033/v2beta1/co" +
-      "ntent:deidentify:\001*\022\232\001\n\026CreateInspectOpe" +
-      "ration\0229.google.privacy.dlp.v2beta1.Crea" +
-      "teInspectOperationRequest\032\035.google.longr" +
-      "unning.Operation\"&\202\323\344\223\002 \"\033/v2beta1/inspe" +
-      "ct/operations:\001*\022\230\001\n\025AnalyzeDataSourceRi" +
-      "sk\0228.google.privacy.dlp.v2beta1.AnalyzeD" +
-      "ataSourceRiskRequest\032\035.google.longrunnin" +
-      "g.Operation\"&\202\323\344\223\002 \"\033/v2beta1/dataSource" +
-      ":analyze:\001*\022\272\001\n\023ListInspectFindings\0226.go" +
-      "ogle.privacy.dlp.v2beta1.ListInspectFind" +
-      "ingsRequest\0327.google.privacy.dlp.v2beta1" +
-      ".ListInspectFindingsResponse\"2\202\323\344\223\002,\022*/v" +
-      "2beta1/{name=inspect/results/*}/findings" +
-      "\022\254\001\n\rListInfoTypes\0220.google.privacy.dlp." +
-      "v2beta1.ListInfoTypesRequest\0321.google.pr" +
-      "ivacy.dlp.v2beta1.ListInfoTypesResponse\"" +
-      "6\202\323\344\223\0020\022./v2beta1/rootCategories/{catego" +
-      "ry=*}/infoTypes\022\244\001\n\022ListRootCategories\0225" +
-      ".google.privacy.dlp.v2beta1.ListRootCate",
-      "goriesRequest\0326.google.privacy.dlp.v2bet" +
-      "a1.ListRootCategoriesResponse\"\037\202\323\344\223\002\031\022\027/" +
-      "v2beta1/rootCategoriesB\241\001\n\036com.google.pr" +
-      "ivacy.dlp.v2beta1B\010DlpProtoP\001Z=google.go" +
-      "lang.org/genproto/googleapis/privacy/dlp" +
-      "/v2beta1;dlp\252\002\030Google.Cloud.Dlp.V2Beta1\312" +
-      "\002\030Google\\Cloud\\Dlp\\V2beta1b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          com.google.api.AnnotationsProto.getDescriptor(),
-          com.google.longrunning.OperationsProto.getDescriptor(),
-          com.google.privacy.dlp.v2beta1.DlpStorage.getDescriptor(),
-          com.google.protobuf.EmptyProto.getDescriptor(),
-          com.google.protobuf.TimestampProto.getDescriptor(),
-          com.google.type.DateProto.getDescriptor(),
-          com.google.type.TimeOfDayProto.getDescriptor(),
-        }, assigner);
-    internal_static_google_privacy_dlp_v2beta1_InspectConfig_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_InspectConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_InspectConfig_descriptor,
-        new java.lang.String[] { "InfoTypes", "MinLikelihood", "MaxFindings", "IncludeQuote", "ExcludeTypes", "InfoTypeLimits", "CustomInfoTypes", });
-    internal_static_google_privacy_dlp_v2beta1_InspectConfig_InfoTypeLimit_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_InspectConfig_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_InspectConfig_InfoTypeLimit_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_InspectConfig_InfoTypeLimit_descriptor,
-        new java.lang.String[] { "InfoType", "MaxFindings", });
-    internal_static_google_privacy_dlp_v2beta1_OperationConfig_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_google_privacy_dlp_v2beta1_OperationConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_OperationConfig_descriptor,
-        new java.lang.String[] { "MaxItemFindings", });
-    internal_static_google_privacy_dlp_v2beta1_ContentItem_descriptor =
-      getDescriptor().getMessageTypes().get(2);
-    internal_static_google_privacy_dlp_v2beta1_ContentItem_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_ContentItem_descriptor,
-        new java.lang.String[] { "Type", "Data", "Value", "Table", "DataItem", });
-    internal_static_google_privacy_dlp_v2beta1_Table_descriptor =
-      getDescriptor().getMessageTypes().get(3);
-    internal_static_google_privacy_dlp_v2beta1_Table_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_Table_descriptor,
-        new java.lang.String[] { "Headers", "Rows", });
-    internal_static_google_privacy_dlp_v2beta1_Table_Row_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_Table_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_Table_Row_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_Table_Row_descriptor,
-        new java.lang.String[] { "Values", });
-    internal_static_google_privacy_dlp_v2beta1_InspectResult_descriptor =
-      getDescriptor().getMessageTypes().get(4);
-    internal_static_google_privacy_dlp_v2beta1_InspectResult_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_InspectResult_descriptor,
-        new java.lang.String[] { "Findings", "FindingsTruncated", });
-    internal_static_google_privacy_dlp_v2beta1_Finding_descriptor =
-      getDescriptor().getMessageTypes().get(5);
-    internal_static_google_privacy_dlp_v2beta1_Finding_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_Finding_descriptor,
-        new java.lang.String[] { "Quote", "InfoType", "Likelihood", "Location", "CreateTime", });
-    internal_static_google_privacy_dlp_v2beta1_Location_descriptor =
-      getDescriptor().getMessageTypes().get(6);
-    internal_static_google_privacy_dlp_v2beta1_Location_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_Location_descriptor,
-        new java.lang.String[] { "ByteRange", "CodepointRange", "ImageBoxes", "RecordKey", "FieldId", "TableLocation", });
-    internal_static_google_privacy_dlp_v2beta1_TableLocation_descriptor =
-      getDescriptor().getMessageTypes().get(7);
-    internal_static_google_privacy_dlp_v2beta1_TableLocation_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_TableLocation_descriptor,
-        new java.lang.String[] { "RowIndex", });
-    internal_static_google_privacy_dlp_v2beta1_Range_descriptor =
-      getDescriptor().getMessageTypes().get(8);
-    internal_static_google_privacy_dlp_v2beta1_Range_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_Range_descriptor,
-        new java.lang.String[] { "Start", "End", });
-    internal_static_google_privacy_dlp_v2beta1_ImageLocation_descriptor =
-      getDescriptor().getMessageTypes().get(9);
-    internal_static_google_privacy_dlp_v2beta1_ImageLocation_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_ImageLocation_descriptor,
-        new java.lang.String[] { "Top", "Left", "Width", "Height", });
-    internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_descriptor =
-      getDescriptor().getMessageTypes().get(10);
-    internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_descriptor,
-        new java.lang.String[] { "InspectConfig", "Items", "ReplaceConfigs", "ImageRedactionConfigs", });
-    internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ReplaceConfig_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ReplaceConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ReplaceConfig_descriptor,
-        new java.lang.String[] { "InfoType", "ReplaceWith", });
-    internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ImageRedactionConfig_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_descriptor.getNestedTypes().get(1);
-    internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ImageRedactionConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ImageRedactionConfig_descriptor,
-        new java.lang.String[] { "InfoType", "RedactAllText", "RedactionColor", "Target", });
-    internal_static_google_privacy_dlp_v2beta1_Color_descriptor =
-      getDescriptor().getMessageTypes().get(11);
-    internal_static_google_privacy_dlp_v2beta1_Color_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_Color_descriptor,
-        new java.lang.String[] { "Red", "Green", "Blue", });
-    internal_static_google_privacy_dlp_v2beta1_RedactContentResponse_descriptor =
-      getDescriptor().getMessageTypes().get(12);
-    internal_static_google_privacy_dlp_v2beta1_RedactContentResponse_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RedactContentResponse_descriptor,
-        new java.lang.String[] { "Items", });
-    internal_static_google_privacy_dlp_v2beta1_DeidentifyContentRequest_descriptor =
-      getDescriptor().getMessageTypes().get(13);
-    internal_static_google_privacy_dlp_v2beta1_DeidentifyContentRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_DeidentifyContentRequest_descriptor,
-        new java.lang.String[] { "DeidentifyConfig", "InspectConfig", "Items", });
-    internal_static_google_privacy_dlp_v2beta1_DeidentifyContentResponse_descriptor =
-      getDescriptor().getMessageTypes().get(14);
-    internal_static_google_privacy_dlp_v2beta1_DeidentifyContentResponse_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_DeidentifyContentResponse_descriptor,
-        new java.lang.String[] { "Items", "Summaries", });
-    internal_static_google_privacy_dlp_v2beta1_InspectContentRequest_descriptor =
-      getDescriptor().getMessageTypes().get(15);
-    internal_static_google_privacy_dlp_v2beta1_InspectContentRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_InspectContentRequest_descriptor,
-        new java.lang.String[] { "InspectConfig", "Items", });
-    internal_static_google_privacy_dlp_v2beta1_InspectContentResponse_descriptor =
-      getDescriptor().getMessageTypes().get(16);
-    internal_static_google_privacy_dlp_v2beta1_InspectContentResponse_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_InspectContentResponse_descriptor,
-        new java.lang.String[] { "Results", });
-    internal_static_google_privacy_dlp_v2beta1_CreateInspectOperationRequest_descriptor =
-      getDescriptor().getMessageTypes().get(17);
-    internal_static_google_privacy_dlp_v2beta1_CreateInspectOperationRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CreateInspectOperationRequest_descriptor,
-        new java.lang.String[] { "InspectConfig", "StorageConfig", "OutputConfig", "OperationConfig", });
-    internal_static_google_privacy_dlp_v2beta1_OutputStorageConfig_descriptor =
-      getDescriptor().getMessageTypes().get(18);
-    internal_static_google_privacy_dlp_v2beta1_OutputStorageConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_OutputStorageConfig_descriptor,
-        new java.lang.String[] { "Table", "StoragePath", "Type", });
-    internal_static_google_privacy_dlp_v2beta1_InfoTypeStatistics_descriptor =
-      getDescriptor().getMessageTypes().get(19);
-    internal_static_google_privacy_dlp_v2beta1_InfoTypeStatistics_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_InfoTypeStatistics_descriptor,
-        new java.lang.String[] { "InfoType", "Count", });
-    internal_static_google_privacy_dlp_v2beta1_InspectOperationMetadata_descriptor =
-      getDescriptor().getMessageTypes().get(20);
-    internal_static_google_privacy_dlp_v2beta1_InspectOperationMetadata_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_InspectOperationMetadata_descriptor,
-        new java.lang.String[] { "ProcessedBytes", "TotalEstimatedBytes", "InfoTypeStats", "CreateTime", "RequestInspectConfig", "RequestStorageConfig", "RequestOutputConfig", });
-    internal_static_google_privacy_dlp_v2beta1_InspectOperationResult_descriptor =
-      getDescriptor().getMessageTypes().get(21);
-    internal_static_google_privacy_dlp_v2beta1_InspectOperationResult_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_InspectOperationResult_descriptor,
-        new java.lang.String[] { "Name", });
-    internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsRequest_descriptor =
-      getDescriptor().getMessageTypes().get(22);
-    internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsRequest_descriptor,
-        new java.lang.String[] { "Name", "PageSize", "PageToken", "Filter", });
-    internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsResponse_descriptor =
-      getDescriptor().getMessageTypes().get(23);
-    internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsResponse_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsResponse_descriptor,
-        new java.lang.String[] { "Result", "NextPageToken", });
-    internal_static_google_privacy_dlp_v2beta1_InfoTypeDescription_descriptor =
-      getDescriptor().getMessageTypes().get(24);
-    internal_static_google_privacy_dlp_v2beta1_InfoTypeDescription_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_InfoTypeDescription_descriptor,
-        new java.lang.String[] { "Name", "DisplayName", "Categories", });
-    internal_static_google_privacy_dlp_v2beta1_ListInfoTypesRequest_descriptor =
-      getDescriptor().getMessageTypes().get(25);
-    internal_static_google_privacy_dlp_v2beta1_ListInfoTypesRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_ListInfoTypesRequest_descriptor,
-        new java.lang.String[] { "Category", "LanguageCode", });
-    internal_static_google_privacy_dlp_v2beta1_ListInfoTypesResponse_descriptor =
-      getDescriptor().getMessageTypes().get(26);
-    internal_static_google_privacy_dlp_v2beta1_ListInfoTypesResponse_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_ListInfoTypesResponse_descriptor,
-        new java.lang.String[] { "InfoTypes", });
-    internal_static_google_privacy_dlp_v2beta1_CategoryDescription_descriptor =
-      getDescriptor().getMessageTypes().get(27);
-    internal_static_google_privacy_dlp_v2beta1_CategoryDescription_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CategoryDescription_descriptor,
-        new java.lang.String[] { "Name", "DisplayName", });
-    internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesRequest_descriptor =
-      getDescriptor().getMessageTypes().get(28);
-    internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesRequest_descriptor,
-        new java.lang.String[] { "LanguageCode", });
-    internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesResponse_descriptor =
-      getDescriptor().getMessageTypes().get(29);
-    internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesResponse_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesResponse_descriptor,
-        new java.lang.String[] { "Categories", });
-    internal_static_google_privacy_dlp_v2beta1_AnalyzeDataSourceRiskRequest_descriptor =
-      getDescriptor().getMessageTypes().get(30);
-    internal_static_google_privacy_dlp_v2beta1_AnalyzeDataSourceRiskRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_AnalyzeDataSourceRiskRequest_descriptor,
-        new java.lang.String[] { "PrivacyMetric", "SourceTable", });
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_descriptor =
-      getDescriptor().getMessageTypes().get(31);
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_descriptor,
-        new java.lang.String[] { "NumericalStatsConfig", "CategoricalStatsConfig", "KAnonymityConfig", "LDiversityConfig", "Type", });
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_NumericalStatsConfig_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_NumericalStatsConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_NumericalStatsConfig_descriptor,
-        new java.lang.String[] { "Field", });
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_CategoricalStatsConfig_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_descriptor.getNestedTypes().get(1);
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_CategoricalStatsConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_CategoricalStatsConfig_descriptor,
-        new java.lang.String[] { "Field", });
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_KAnonymityConfig_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_descriptor.getNestedTypes().get(2);
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_KAnonymityConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_KAnonymityConfig_descriptor,
-        new java.lang.String[] { "QuasiIds", "EntityId", });
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_LDiversityConfig_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_descriptor.getNestedTypes().get(3);
-    internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_LDiversityConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_LDiversityConfig_descriptor,
-        new java.lang.String[] { "QuasiIds", "SensitiveAttribute", });
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationMetadata_descriptor =
-      getDescriptor().getMessageTypes().get(32);
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationMetadata_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationMetadata_descriptor,
-        new java.lang.String[] { "CreateTime", "RequestedPrivacyMetric", "RequestedSourceTable", });
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_descriptor =
-      getDescriptor().getMessageTypes().get(33);
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_descriptor,
-        new java.lang.String[] { "NumericalStatsResult", "CategoricalStatsResult", "KAnonymityResult", "LDiversityResult", "Result", });
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_NumericalStatsResult_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_NumericalStatsResult_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_NumericalStatsResult_descriptor,
-        new java.lang.String[] { "MinValue", "MaxValue", "QuantileValues", });
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_descriptor.getNestedTypes().get(1);
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_descriptor,
-        new java.lang.String[] { "ValueFrequencyHistogramBuckets", });
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket_descriptor,
-        new java.lang.String[] { "ValueFrequencyLowerBound", "ValueFrequencyUpperBound", "BucketSize", "BucketValues", });
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_descriptor.getNestedTypes().get(2);
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_descriptor,
-        new java.lang.String[] { "EquivalenceClassHistogramBuckets", });
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass_descriptor,
-        new java.lang.String[] { "QuasiIdsValues", "EquivalenceClassSize", });
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_descriptor.getNestedTypes().get(1);
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket_descriptor,
-        new java.lang.String[] { "EquivalenceClassSizeLowerBound", "EquivalenceClassSizeUpperBound", "BucketSize", "BucketValues", });
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_descriptor.getNestedTypes().get(3);
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_descriptor,
-        new java.lang.String[] { "SensitiveValueFrequencyHistogramBuckets", });
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass_descriptor,
-        new java.lang.String[] { "QuasiIdsValues", "EquivalenceClassSize", "NumDistinctSensitiveValues", "TopSensitiveValues", });
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_descriptor.getNestedTypes().get(1);
-    internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket_descriptor,
-        new java.lang.String[] { "SensitiveValueFrequencyLowerBound", "SensitiveValueFrequencyUpperBound", "BucketSize", "BucketValues", });
-    internal_static_google_privacy_dlp_v2beta1_ValueFrequency_descriptor =
-      getDescriptor().getMessageTypes().get(34);
-    internal_static_google_privacy_dlp_v2beta1_ValueFrequency_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_ValueFrequency_descriptor,
-        new java.lang.String[] { "Value", "Count", });
-    internal_static_google_privacy_dlp_v2beta1_Value_descriptor =
-      getDescriptor().getMessageTypes().get(35);
-    internal_static_google_privacy_dlp_v2beta1_Value_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_Value_descriptor,
-        new java.lang.String[] { "IntegerValue", "FloatValue", "StringValue", "BooleanValue", "TimestampValue", "TimeValue", "DateValue", "Type", });
-    internal_static_google_privacy_dlp_v2beta1_DeidentifyConfig_descriptor =
-      getDescriptor().getMessageTypes().get(36);
-    internal_static_google_privacy_dlp_v2beta1_DeidentifyConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_DeidentifyConfig_descriptor,
-        new java.lang.String[] { "InfoTypeTransformations", "RecordTransformations", "Transformation", });
-    internal_static_google_privacy_dlp_v2beta1_PrimitiveTransformation_descriptor =
-      getDescriptor().getMessageTypes().get(37);
-    internal_static_google_privacy_dlp_v2beta1_PrimitiveTransformation_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_PrimitiveTransformation_descriptor,
-        new java.lang.String[] { "ReplaceConfig", "RedactConfig", "CharacterMaskConfig", "CryptoReplaceFfxFpeConfig", "FixedSizeBucketingConfig", "BucketingConfig", "ReplaceWithInfoTypeConfig", "TimePartConfig", "CryptoHashConfig", "Transformation", });
-    internal_static_google_privacy_dlp_v2beta1_TimePartConfig_descriptor =
-      getDescriptor().getMessageTypes().get(38);
-    internal_static_google_privacy_dlp_v2beta1_TimePartConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_TimePartConfig_descriptor,
-        new java.lang.String[] { "PartToExtract", });
-    internal_static_google_privacy_dlp_v2beta1_CryptoHashConfig_descriptor =
-      getDescriptor().getMessageTypes().get(39);
-    internal_static_google_privacy_dlp_v2beta1_CryptoHashConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CryptoHashConfig_descriptor,
-        new java.lang.String[] { "CryptoKey", });
-    internal_static_google_privacy_dlp_v2beta1_ReplaceValueConfig_descriptor =
-      getDescriptor().getMessageTypes().get(40);
-    internal_static_google_privacy_dlp_v2beta1_ReplaceValueConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_ReplaceValueConfig_descriptor,
-        new java.lang.String[] { "NewValue", });
-    internal_static_google_privacy_dlp_v2beta1_ReplaceWithInfoTypeConfig_descriptor =
-      getDescriptor().getMessageTypes().get(41);
-    internal_static_google_privacy_dlp_v2beta1_ReplaceWithInfoTypeConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_ReplaceWithInfoTypeConfig_descriptor,
-        new java.lang.String[] { });
-    internal_static_google_privacy_dlp_v2beta1_RedactConfig_descriptor =
-      getDescriptor().getMessageTypes().get(42);
-    internal_static_google_privacy_dlp_v2beta1_RedactConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RedactConfig_descriptor,
-        new java.lang.String[] { });
-    internal_static_google_privacy_dlp_v2beta1_CharsToIgnore_descriptor =
-      getDescriptor().getMessageTypes().get(43);
-    internal_static_google_privacy_dlp_v2beta1_CharsToIgnore_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CharsToIgnore_descriptor,
-        new java.lang.String[] { "CharactersToSkip", "CommonCharactersToIgnore", "Characters", });
-    internal_static_google_privacy_dlp_v2beta1_CharacterMaskConfig_descriptor =
-      getDescriptor().getMessageTypes().get(44);
-    internal_static_google_privacy_dlp_v2beta1_CharacterMaskConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CharacterMaskConfig_descriptor,
-        new java.lang.String[] { "MaskingCharacter", "NumberToMask", "ReverseOrder", "CharactersToIgnore", });
-    internal_static_google_privacy_dlp_v2beta1_FixedSizeBucketingConfig_descriptor =
-      getDescriptor().getMessageTypes().get(45);
-    internal_static_google_privacy_dlp_v2beta1_FixedSizeBucketingConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_FixedSizeBucketingConfig_descriptor,
-        new java.lang.String[] { "LowerBound", "UpperBound", "BucketSize", });
-    internal_static_google_privacy_dlp_v2beta1_BucketingConfig_descriptor =
-      getDescriptor().getMessageTypes().get(46);
-    internal_static_google_privacy_dlp_v2beta1_BucketingConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_BucketingConfig_descriptor,
-        new java.lang.String[] { "Buckets", });
-    internal_static_google_privacy_dlp_v2beta1_BucketingConfig_Bucket_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_BucketingConfig_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_BucketingConfig_Bucket_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_BucketingConfig_Bucket_descriptor,
-        new java.lang.String[] { "Min", "Max", "ReplacementValue", });
-    internal_static_google_privacy_dlp_v2beta1_CryptoReplaceFfxFpeConfig_descriptor =
-      getDescriptor().getMessageTypes().get(47);
-    internal_static_google_privacy_dlp_v2beta1_CryptoReplaceFfxFpeConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CryptoReplaceFfxFpeConfig_descriptor,
-        new java.lang.String[] { "CryptoKey", "Context", "CommonAlphabet", "CustomAlphabet", "Radix", "Alphabet", });
-    internal_static_google_privacy_dlp_v2beta1_CryptoKey_descriptor =
-      getDescriptor().getMessageTypes().get(48);
-    internal_static_google_privacy_dlp_v2beta1_CryptoKey_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CryptoKey_descriptor,
-        new java.lang.String[] { "Transient", "Unwrapped", "KmsWrapped", "Source", });
-    internal_static_google_privacy_dlp_v2beta1_TransientCryptoKey_descriptor =
-      getDescriptor().getMessageTypes().get(49);
-    internal_static_google_privacy_dlp_v2beta1_TransientCryptoKey_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_TransientCryptoKey_descriptor,
-        new java.lang.String[] { "Name", });
-    internal_static_google_privacy_dlp_v2beta1_UnwrappedCryptoKey_descriptor =
-      getDescriptor().getMessageTypes().get(50);
-    internal_static_google_privacy_dlp_v2beta1_UnwrappedCryptoKey_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_UnwrappedCryptoKey_descriptor,
-        new java.lang.String[] { "Key", });
-    internal_static_google_privacy_dlp_v2beta1_KmsWrappedCryptoKey_descriptor =
-      getDescriptor().getMessageTypes().get(51);
-    internal_static_google_privacy_dlp_v2beta1_KmsWrappedCryptoKey_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_KmsWrappedCryptoKey_descriptor,
-        new java.lang.String[] { "WrappedKey", "CryptoKeyName", });
-    internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_descriptor =
-      getDescriptor().getMessageTypes().get(52);
-    internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_descriptor,
-        new java.lang.String[] { "Transformations", });
-    internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_InfoTypeTransformation_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_InfoTypeTransformation_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_InfoTypeTransformation_descriptor,
-        new java.lang.String[] { "InfoTypes", "PrimitiveTransformation", });
-    internal_static_google_privacy_dlp_v2beta1_FieldTransformation_descriptor =
-      getDescriptor().getMessageTypes().get(53);
-    internal_static_google_privacy_dlp_v2beta1_FieldTransformation_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_FieldTransformation_descriptor,
-        new java.lang.String[] { "Fields", "Condition", "PrimitiveTransformation", "InfoTypeTransformations", "Transformation", });
-    internal_static_google_privacy_dlp_v2beta1_RecordTransformations_descriptor =
-      getDescriptor().getMessageTypes().get(54);
-    internal_static_google_privacy_dlp_v2beta1_RecordTransformations_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RecordTransformations_descriptor,
-        new java.lang.String[] { "FieldTransformations", "RecordSuppressions", });
-    internal_static_google_privacy_dlp_v2beta1_RecordSuppression_descriptor =
-      getDescriptor().getMessageTypes().get(55);
-    internal_static_google_privacy_dlp_v2beta1_RecordSuppression_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RecordSuppression_descriptor,
-        new java.lang.String[] { "Condition", });
-    internal_static_google_privacy_dlp_v2beta1_RecordCondition_descriptor =
-      getDescriptor().getMessageTypes().get(56);
-    internal_static_google_privacy_dlp_v2beta1_RecordCondition_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RecordCondition_descriptor,
-        new java.lang.String[] { "Expressions", });
-    internal_static_google_privacy_dlp_v2beta1_RecordCondition_Condition_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RecordCondition_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_RecordCondition_Condition_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RecordCondition_Condition_descriptor,
-        new java.lang.String[] { "Field", "Operator", "Value", });
-    internal_static_google_privacy_dlp_v2beta1_RecordCondition_Conditions_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RecordCondition_descriptor.getNestedTypes().get(1);
-    internal_static_google_privacy_dlp_v2beta1_RecordCondition_Conditions_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RecordCondition_Conditions_descriptor,
-        new java.lang.String[] { "Conditions", });
-    internal_static_google_privacy_dlp_v2beta1_RecordCondition_Expressions_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_RecordCondition_descriptor.getNestedTypes().get(2);
-    internal_static_google_privacy_dlp_v2beta1_RecordCondition_Expressions_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RecordCondition_Expressions_descriptor,
-        new java.lang.String[] { "LogicalOperator", "Conditions", "Type", });
-    internal_static_google_privacy_dlp_v2beta1_DeidentificationSummary_descriptor =
-      getDescriptor().getMessageTypes().get(57);
-    internal_static_google_privacy_dlp_v2beta1_DeidentificationSummary_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_DeidentificationSummary_descriptor,
-        new java.lang.String[] { "TransformedBytes", "TransformationSummaries", });
-    internal_static_google_privacy_dlp_v2beta1_TransformationSummary_descriptor =
-      getDescriptor().getMessageTypes().get(58);
-    internal_static_google_privacy_dlp_v2beta1_TransformationSummary_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_TransformationSummary_descriptor,
-        new java.lang.String[] { "InfoType", "Field", "Transformation", "FieldTransformations", "RecordSuppress", "Results", });
-    internal_static_google_privacy_dlp_v2beta1_TransformationSummary_SummaryResult_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_TransformationSummary_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_TransformationSummary_SummaryResult_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_TransformationSummary_SummaryResult_descriptor,
-        new java.lang.String[] { "Count", "Code", "Details", });
-    com.google.protobuf.ExtensionRegistry registry =
-        com.google.protobuf.ExtensionRegistry.newInstance();
-    registry.add(com.google.api.AnnotationsProto.http);
-    com.google.protobuf.Descriptors.FileDescriptor
-        .internalUpdateFileDescriptor(descriptor, registry);
-    com.google.api.AnnotationsProto.getDescriptor();
-    com.google.longrunning.OperationsProto.getDescriptor();
-    com.google.privacy.dlp.v2beta1.DlpStorage.getDescriptor();
-    com.google.protobuf.EmptyProto.getDescriptor();
-    com.google.protobuf.TimestampProto.getDescriptor();
-    com.google.type.DateProto.getDescriptor();
-    com.google.type.TimeOfDayProto.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpStorage.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpStorage.java
deleted file mode 100644
index 2e9eb41e7e8b..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/DlpStorage.java
+++ /dev/null
@@ -1,345 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public final class DlpStorage {
-  private DlpStorage() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-  }
-
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions(
-        (com.google.protobuf.ExtensionRegistryLite) registry);
-  }
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_InfoType_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_InfoType_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CustomInfoType_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CustomInfoType_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_WordList_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_WordList_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_FieldId_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_FieldId_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_PartitionId_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_PartitionId_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_KindExpression_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_KindExpression_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_PropertyReference_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_PropertyReference_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_Projection_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_Projection_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_DatastoreOptions_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_DatastoreOptions_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_FileSet_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_FileSet_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CloudStoragePath_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CloudStoragePath_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_BigQueryOptions_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_BigQueryOptions_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_StorageConfig_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_StorageConfig_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_CloudStorageKey_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_CloudStorageKey_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_DatastoreKey_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_DatastoreKey_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_Key_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_Key_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_Key_PathElement_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_Key_PathElement_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_RecordKey_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_RecordKey_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_BigQueryTable_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_BigQueryTable_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_google_privacy_dlp_v2beta1_EntityId_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_privacy_dlp_v2beta1_EntityId_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n(google/privacy/dlp/v2beta1/storage.pro" +
-      "to\022\032google.privacy.dlp.v2beta1\032\034google/a" +
-      "pi/annotations.proto\032\037google/protobuf/ti" +
-      "mestamp.proto\"\030\n\010InfoType\022\014\n\004name\030\001 \001(\t\"" +
-      "\247\002\n\016CustomInfoType\0227\n\tinfo_type\030\001 \001(\0132$." +
-      "google.privacy.dlp.v2beta1.InfoType\022K\n\nd" +
-      "ictionary\030\002 \001(\01325.google.privacy.dlp.v2b" +
-      "eta1.CustomInfoType.DictionaryH\000\032\206\001\n\nDic" +
-      "tionary\022S\n\tword_list\030\001 \001(\0132>.google.priv" +
-      "acy.dlp.v2beta1.CustomInfoType.Dictionar" +
-      "y.WordListH\000\032\031\n\010WordList\022\r\n\005words\030\001 \003(\tB" +
-      "\010\n\006sourceB\006\n\004type\"\036\n\007FieldId\022\023\n\013column_n" +
-      "ame\030\001 \001(\t\"7\n\013PartitionId\022\022\n\nproject_id\030\002" +
-      " \001(\t\022\024\n\014namespace_id\030\004 \001(\t\"\036\n\016KindExpres" +
-      "sion\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyReference\022" +
-      "\014\n\004name\030\002 \001(\t\"M\n\nProjection\022?\n\010property\030" +
-      "\001 \001(\0132-.google.privacy.dlp.v2beta1.Prope" +
-      "rtyReference\"\307\001\n\020DatastoreOptions\022=\n\014par" +
-      "tition_id\030\001 \001(\0132\'.google.privacy.dlp.v2b" +
-      "eta1.PartitionId\0228\n\004kind\030\002 \001(\0132*.google." +
-      "privacy.dlp.v2beta1.KindExpression\022:\n\npr" +
-      "ojection\030\003 \003(\0132&.google.privacy.dlp.v2be" +
-      "ta1.Projection\"x\n\023CloudStorageOptions\022I\n" +
-      "\010file_set\030\001 \001(\01327.google.privacy.dlp.v2b" +
-      "eta1.CloudStorageOptions.FileSet\032\026\n\007File" +
-      "Set\022\013\n\003url\030\001 \001(\t\" \n\020CloudStoragePath\022\014\n\004" +
-      "path\030\001 \001(\t\"\226\001\n\017BigQueryOptions\022B\n\017table_" +
-      "reference\030\001 \001(\0132).google.privacy.dlp.v2b" +
-      "eta1.BigQueryTable\022?\n\022identifying_fields" +
-      "\030\002 \003(\0132#.google.privacy.dlp.v2beta1.Fiel" +
-      "dId\"\376\001\n\rStorageConfig\022I\n\021datastore_optio" +
-      "ns\030\002 \001(\0132,.google.privacy.dlp.v2beta1.Da" +
-      "tastoreOptionsH\000\022P\n\025cloud_storage_option" +
-      "s\030\003 \001(\0132/.google.privacy.dlp.v2beta1.Clo" +
-      "udStorageOptionsH\000\022H\n\021big_query_options\030" +
-      "\004 \001(\0132+.google.privacy.dlp.v2beta1.BigQu" +
-      "eryOptionsH\000B\006\n\004type\":\n\017CloudStorageKey\022" +
-      "\021\n\tfile_path\030\001 \001(\t\022\024\n\014start_offset\030\002 \001(\003" +
-      "\"C\n\014DatastoreKey\0223\n\nentity_key\030\001 \001(\0132\037.g" +
-      "oogle.privacy.dlp.v2beta1.Key\"\305\001\n\003Key\022=\n" +
-      "\014partition_id\030\001 \001(\0132\'.google.privacy.dlp" +
-      ".v2beta1.PartitionId\0229\n\004path\030\002 \003(\0132+.goo" +
-      "gle.privacy.dlp.v2beta1.Key.PathElement\032" +
-      "D\n\013PathElement\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003" +
-      "H\000\022\016\n\004name\030\003 \001(\tH\000B\t\n\007id_type\"\240\001\n\tRecord" +
-      "Key\022H\n\021cloud_storage_key\030\001 \001(\0132+.google." +
-      "privacy.dlp.v2beta1.CloudStorageKeyH\000\022A\n" +
-      "\rdatastore_key\030\002 \001(\0132(.google.privacy.dl" +
-      "p.v2beta1.DatastoreKeyH\000B\006\n\004type\"I\n\rBigQ" +
-      "ueryTable\022\022\n\nproject_id\030\001 \001(\t\022\022\n\ndataset" +
-      "_id\030\002 \001(\t\022\020\n\010table_id\030\003 \001(\t\">\n\010EntityId\022" +
-      "2\n\005field\030\001 \001(\0132#.google.privacy.dlp.v2be" +
-      "ta1.FieldIdB\243\001\n\036com.google.privacy.dlp.v" +
-      "2beta1B\nDlpStorageP\001Z=google.golang.org/" +
-      "genproto/googleapis/privacy/dlp/v2beta1;" +
-      "dlp\252\002\030Google.Cloud.Dlp.V2Beta1\312\002\030Google\\" +
-      "Cloud\\Dlp\\V2beta1b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          com.google.api.AnnotationsProto.getDescriptor(),
-          com.google.protobuf.TimestampProto.getDescriptor(),
-        }, assigner);
-    internal_static_google_privacy_dlp_v2beta1_InfoType_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_InfoType_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_InfoType_descriptor,
-        new java.lang.String[] { "Name", });
-    internal_static_google_privacy_dlp_v2beta1_CustomInfoType_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_google_privacy_dlp_v2beta1_CustomInfoType_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CustomInfoType_descriptor,
-        new java.lang.String[] { "InfoType", "Dictionary", "Type", });
-    internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_CustomInfoType_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_descriptor,
-        new java.lang.String[] { "WordList", "Source", });
-    internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_WordList_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_WordList_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CustomInfoType_Dictionary_WordList_descriptor,
-        new java.lang.String[] { "Words", });
-    internal_static_google_privacy_dlp_v2beta1_FieldId_descriptor =
-      getDescriptor().getMessageTypes().get(2);
-    internal_static_google_privacy_dlp_v2beta1_FieldId_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_FieldId_descriptor,
-        new java.lang.String[] { "ColumnName", });
-    internal_static_google_privacy_dlp_v2beta1_PartitionId_descriptor =
-      getDescriptor().getMessageTypes().get(3);
-    internal_static_google_privacy_dlp_v2beta1_PartitionId_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_PartitionId_descriptor,
-        new java.lang.String[] { "ProjectId", "NamespaceId", });
-    internal_static_google_privacy_dlp_v2beta1_KindExpression_descriptor =
-      getDescriptor().getMessageTypes().get(4);
-    internal_static_google_privacy_dlp_v2beta1_KindExpression_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_KindExpression_descriptor,
-        new java.lang.String[] { "Name", });
-    internal_static_google_privacy_dlp_v2beta1_PropertyReference_descriptor =
-      getDescriptor().getMessageTypes().get(5);
-    internal_static_google_privacy_dlp_v2beta1_PropertyReference_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_PropertyReference_descriptor,
-        new java.lang.String[] { "Name", });
-    internal_static_google_privacy_dlp_v2beta1_Projection_descriptor =
-      getDescriptor().getMessageTypes().get(6);
-    internal_static_google_privacy_dlp_v2beta1_Projection_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_Projection_descriptor,
-        new java.lang.String[] { "Property", });
-    internal_static_google_privacy_dlp_v2beta1_DatastoreOptions_descriptor =
-      getDescriptor().getMessageTypes().get(7);
-    internal_static_google_privacy_dlp_v2beta1_DatastoreOptions_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_DatastoreOptions_descriptor,
-        new java.lang.String[] { "PartitionId", "Kind", "Projection", });
-    internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_descriptor =
-      getDescriptor().getMessageTypes().get(8);
-    internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_descriptor,
-        new java.lang.String[] { "FileSet", });
-    internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_FileSet_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_FileSet_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CloudStorageOptions_FileSet_descriptor,
-        new java.lang.String[] { "Url", });
-    internal_static_google_privacy_dlp_v2beta1_CloudStoragePath_descriptor =
-      getDescriptor().getMessageTypes().get(9);
-    internal_static_google_privacy_dlp_v2beta1_CloudStoragePath_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CloudStoragePath_descriptor,
-        new java.lang.String[] { "Path", });
-    internal_static_google_privacy_dlp_v2beta1_BigQueryOptions_descriptor =
-      getDescriptor().getMessageTypes().get(10);
-    internal_static_google_privacy_dlp_v2beta1_BigQueryOptions_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_BigQueryOptions_descriptor,
-        new java.lang.String[] { "TableReference", "IdentifyingFields", });
-    internal_static_google_privacy_dlp_v2beta1_StorageConfig_descriptor =
-      getDescriptor().getMessageTypes().get(11);
-    internal_static_google_privacy_dlp_v2beta1_StorageConfig_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_StorageConfig_descriptor,
-        new java.lang.String[] { "DatastoreOptions", "CloudStorageOptions", "BigQueryOptions", "Type", });
-    internal_static_google_privacy_dlp_v2beta1_CloudStorageKey_descriptor =
-      getDescriptor().getMessageTypes().get(12);
-    internal_static_google_privacy_dlp_v2beta1_CloudStorageKey_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_CloudStorageKey_descriptor,
-        new java.lang.String[] { "FilePath", "StartOffset", });
-    internal_static_google_privacy_dlp_v2beta1_DatastoreKey_descriptor =
-      getDescriptor().getMessageTypes().get(13);
-    internal_static_google_privacy_dlp_v2beta1_DatastoreKey_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_DatastoreKey_descriptor,
-        new java.lang.String[] { "EntityKey", });
-    internal_static_google_privacy_dlp_v2beta1_Key_descriptor =
-      getDescriptor().getMessageTypes().get(14);
-    internal_static_google_privacy_dlp_v2beta1_Key_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_Key_descriptor,
-        new java.lang.String[] { "PartitionId", "Path", });
-    internal_static_google_privacy_dlp_v2beta1_Key_PathElement_descriptor =
-      internal_static_google_privacy_dlp_v2beta1_Key_descriptor.getNestedTypes().get(0);
-    internal_static_google_privacy_dlp_v2beta1_Key_PathElement_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_Key_PathElement_descriptor,
-        new java.lang.String[] { "Kind", "Id", "Name", "IdType", });
-    internal_static_google_privacy_dlp_v2beta1_RecordKey_descriptor =
-      getDescriptor().getMessageTypes().get(15);
-    internal_static_google_privacy_dlp_v2beta1_RecordKey_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_RecordKey_descriptor,
-        new java.lang.String[] { "CloudStorageKey", "DatastoreKey", "Type", });
-    internal_static_google_privacy_dlp_v2beta1_BigQueryTable_descriptor =
-      getDescriptor().getMessageTypes().get(16);
-    internal_static_google_privacy_dlp_v2beta1_BigQueryTable_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_BigQueryTable_descriptor,
-        new java.lang.String[] { "ProjectId", "DatasetId", "TableId", });
-    internal_static_google_privacy_dlp_v2beta1_EntityId_descriptor =
-      getDescriptor().getMessageTypes().get(17);
-    internal_static_google_privacy_dlp_v2beta1_EntityId_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_google_privacy_dlp_v2beta1_EntityId_descriptor,
-        new java.lang.String[] { "Field", });
-    com.google.api.AnnotationsProto.getDescriptor();
-    com.google.protobuf.TimestampProto.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/EntityId.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/EntityId.java
deleted file mode 100644
index d99d66083f12..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/EntityId.java
+++ /dev/null
@@ -1,634 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * An entity in a dataset is a field or set of fields that correspond to a
- * single person. For example, in medical records the `EntityId` might be
- * a patient identifier, or for financial records it might be an account
- * identifier. This message is used when generalizations or analysis must be
- * consistent across multiple rows pertaining to the same entity.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.EntityId}
- */
-public  final class EntityId extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.EntityId)
-    EntityIdOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use EntityId.newBuilder() to construct.
-  private EntityId(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private EntityId() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private EntityId(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.FieldId.Builder subBuilder = null;
-            if (field_ != null) {
-              subBuilder = field_.toBuilder();
-            }
-            field_ = input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(field_);
-              field_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_EntityId_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_EntityId_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.EntityId.class, com.google.privacy.dlp.v2beta1.EntityId.Builder.class);
-  }
-
-  public static final int FIELD_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.FieldId field_;
-  /**
-   * 
-   * Composite key indicating which field contains the entity identifier.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field = 1;
-   */
-  public boolean hasField() {
-    return field_ != null;
-  }
-  /**
-   * 
-   * Composite key indicating which field contains the entity identifier.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldId getField() {
-    return field_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-  }
-  /**
-   * 
-   * Composite key indicating which field contains the entity identifier.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder() {
-    return getField();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (field_ != null) {
-      output.writeMessage(1, getField());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (field_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getField());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.EntityId)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.EntityId other = (com.google.privacy.dlp.v2beta1.EntityId) obj;
-
-    boolean result = true;
-    result = result && (hasField() == other.hasField());
-    if (hasField()) {
-      result = result && getField()
-          .equals(other.getField());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasField()) {
-      hash = (37 * hash) + FIELD_FIELD_NUMBER;
-      hash = (53 * hash) + getField().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.EntityId parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.EntityId parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.EntityId parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.EntityId parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.EntityId parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.EntityId parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.EntityId parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.EntityId parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.EntityId parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.EntityId parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.EntityId parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.EntityId parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.EntityId prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * An entity in a dataset is a field or set of fields that correspond to a
-   * single person. For example, in medical records the `EntityId` might be
-   * a patient identifier, or for financial records it might be an account
-   * identifier. This message is used when generalizations or analysis must be
-   * consistent across multiple rows pertaining to the same entity.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.EntityId}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.EntityId)
-      com.google.privacy.dlp.v2beta1.EntityIdOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_EntityId_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_EntityId_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.EntityId.class, com.google.privacy.dlp.v2beta1.EntityId.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.EntityId.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (fieldBuilder_ == null) {
-        field_ = null;
-      } else {
-        field_ = null;
-        fieldBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_EntityId_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.EntityId getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.EntityId.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.EntityId build() {
-      com.google.privacy.dlp.v2beta1.EntityId result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.EntityId buildPartial() {
-      com.google.privacy.dlp.v2beta1.EntityId result = new com.google.privacy.dlp.v2beta1.EntityId(this);
-      if (fieldBuilder_ == null) {
-        result.field_ = field_;
-      } else {
-        result.field_ = fieldBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.EntityId) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.EntityId)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.EntityId other) {
-      if (other == com.google.privacy.dlp.v2beta1.EntityId.getDefaultInstance()) return this;
-      if (other.hasField()) {
-        mergeField(other.getField());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.EntityId parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.EntityId) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.FieldId field_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> fieldBuilder_;
-    /**
-     * 
-     * Composite key indicating which field contains the entity identifier.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public boolean hasField() {
-      return fieldBuilder_ != null || field_ != null;
-    }
-    /**
-     * 
-     * Composite key indicating which field contains the entity identifier.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getField() {
-      if (fieldBuilder_ == null) {
-        return field_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-      } else {
-        return fieldBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Composite key indicating which field contains the entity identifier.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public Builder setField(com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (fieldBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        field_ = value;
-        onChanged();
-      } else {
-        fieldBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Composite key indicating which field contains the entity identifier.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public Builder setField(
-        com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (fieldBuilder_ == null) {
-        field_ = builderForValue.build();
-        onChanged();
-      } else {
-        fieldBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Composite key indicating which field contains the entity identifier.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public Builder mergeField(com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (fieldBuilder_ == null) {
-        if (field_ != null) {
-          field_ =
-            com.google.privacy.dlp.v2beta1.FieldId.newBuilder(field_).mergeFrom(value).buildPartial();
-        } else {
-          field_ = value;
-        }
-        onChanged();
-      } else {
-        fieldBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Composite key indicating which field contains the entity identifier.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public Builder clearField() {
-      if (fieldBuilder_ == null) {
-        field_ = null;
-        onChanged();
-      } else {
-        field_ = null;
-        fieldBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Composite key indicating which field contains the entity identifier.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder getFieldBuilder() {
-      
-      onChanged();
-      return getFieldFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Composite key indicating which field contains the entity identifier.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder() {
-      if (fieldBuilder_ != null) {
-        return fieldBuilder_.getMessageOrBuilder();
-      } else {
-        return field_ == null ?
-            com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-      }
-    }
-    /**
-     * 
-     * Composite key indicating which field contains the entity identifier.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-        getFieldFieldBuilder() {
-      if (fieldBuilder_ == null) {
-        fieldBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                getField(),
-                getParentForChildren(),
-                isClean());
-        field_ = null;
-      }
-      return fieldBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.EntityId)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.EntityId)
-  private static final com.google.privacy.dlp.v2beta1.EntityId DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.EntityId();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.EntityId getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public EntityId parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityId(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.EntityId getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/EntityIdOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/EntityIdOrBuilder.java
deleted file mode 100644
index 79fe99392cde..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/EntityIdOrBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface EntityIdOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.EntityId)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Composite key indicating which field contains the entity identifier.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field = 1;
-   */
-  boolean hasField();
-  /**
-   * 
-   * Composite key indicating which field contains the entity identifier.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field = 1;
-   */
-  com.google.privacy.dlp.v2beta1.FieldId getField();
-  /**
-   * 
-   * Composite key indicating which field contains the entity identifier.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field = 1;
-   */
-  com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldIdOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldIdOrBuilder.java
deleted file mode 100644
index 261cfc1d6cc1..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldIdOrBuilder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface FieldIdOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.FieldId)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Name describing the field.
-   * 

-   *
-   * string column_name = 1;
-   */
-  java.lang.String getColumnName();
-  /**
-   * 
-   * Name describing the field.
-   * 

-   *
-   * string column_name = 1;
-   */
-  com.google.protobuf.ByteString
-      getColumnNameBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldTransformation.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldTransformation.java
deleted file mode 100644
index 07629b5ad800..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldTransformation.java
+++ /dev/null
@@ -1,1722 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * The transformation to apply to the field.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.FieldTransformation}
- */
-public  final class FieldTransformation extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.FieldTransformation)
-    FieldTransformationOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use FieldTransformation.newBuilder() to construct.
-  private FieldTransformation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private FieldTransformation() {
-    fields_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private FieldTransformation(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              fields_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            fields_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry));
-            break;
-          }
-          case 26: {
-            com.google.privacy.dlp.v2beta1.RecordCondition.Builder subBuilder = null;
-            if (condition_ != null) {
-              subBuilder = condition_.toBuilder();
-            }
-            condition_ = input.readMessage(com.google.privacy.dlp.v2beta1.RecordCondition.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(condition_);
-              condition_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 34: {
-            com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder subBuilder = null;
-            if (transformationCase_ == 4) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.PrimitiveTransformation) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.PrimitiveTransformation.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.PrimitiveTransformation) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 4;
-            break;
-          }
-          case 42: {
-            com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder subBuilder = null;
-            if (transformationCase_ == 5) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.InfoTypeTransformations.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 5;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        fields_ = java.util.Collections.unmodifiableList(fields_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_FieldTransformation_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_FieldTransformation_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.FieldTransformation.class, com.google.privacy.dlp.v2beta1.FieldTransformation.Builder.class);
-  }
-
-  private int bitField0_;
-  private int transformationCase_ = 0;
-  private java.lang.Object transformation_;
-  public enum TransformationCase
-      implements com.google.protobuf.Internal.EnumLite {
-    PRIMITIVE_TRANSFORMATION(4),
-    INFO_TYPE_TRANSFORMATIONS(5),
-    TRANSFORMATION_NOT_SET(0);
-    private final int value;
-    private TransformationCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static TransformationCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static TransformationCase forNumber(int value) {
-      switch (value) {
-        case 4: return PRIMITIVE_TRANSFORMATION;
-        case 5: return INFO_TYPE_TRANSFORMATIONS;
-        case 0: return TRANSFORMATION_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public TransformationCase
-  getTransformationCase() {
-    return TransformationCase.forNumber(
-        transformationCase_);
-  }
-
-  public static final int FIELDS_FIELD_NUMBER = 1;
-  private java.util.List fields_;
-  /**
-   * 
-   * Input field(s) to apply the transformation to. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-   */
-  public java.util.List getFieldsList() {
-    return fields_;
-  }
-  /**
-   * 
-   * Input field(s) to apply the transformation to. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-   */
-  public java.util.List 
-      getFieldsOrBuilderList() {
-    return fields_;
-  }
-  /**
-   * 
-   * Input field(s) to apply the transformation to. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-   */
-  public int getFieldsCount() {
-    return fields_.size();
-  }
-  /**
-   * 
-   * Input field(s) to apply the transformation to. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldId getFields(int index) {
-    return fields_.get(index);
-  }
-  /**
-   * 
-   * Input field(s) to apply the transformation to. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldsOrBuilder(
-      int index) {
-    return fields_.get(index);
-  }
-
-  public static final int CONDITION_FIELD_NUMBER = 3;
-  private com.google.privacy.dlp.v2beta1.RecordCondition condition_;
-  /**
-   * 
-   * Only apply the transformation if the condition evaluates to true for the
-   * given `RecordCondition`. The conditions are allowed to reference fields
-   * that are not used in the actual transformation. [optional]
-   * Example Use Cases:
-   * - Apply a different bucket transformation to an age column if the zip code
-   * column for the same record is within a specific range.
-   * - Redact a field if the date of birth field is greater than 85.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-   */
-  public boolean hasCondition() {
-    return condition_ != null;
-  }
-  /**
-   * 
-   * Only apply the transformation if the condition evaluates to true for the
-   * given `RecordCondition`. The conditions are allowed to reference fields
-   * that are not used in the actual transformation. [optional]
-   * Example Use Cases:
-   * - Apply a different bucket transformation to an age column if the zip code
-   * column for the same record is within a specific range.
-   * - Redact a field if the date of birth field is greater than 85.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordCondition getCondition() {
-    return condition_ == null ? com.google.privacy.dlp.v2beta1.RecordCondition.getDefaultInstance() : condition_;
-  }
-  /**
-   * 
-   * Only apply the transformation if the condition evaluates to true for the
-   * given `RecordCondition`. The conditions are allowed to reference fields
-   * that are not used in the actual transformation. [optional]
-   * Example Use Cases:
-   * - Apply a different bucket transformation to an age column if the zip code
-   * column for the same record is within a specific range.
-   * - Redact a field if the date of birth field is greater than 85.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder getConditionOrBuilder() {
-    return getCondition();
-  }
-
-  public static final int PRIMITIVE_TRANSFORMATION_FIELD_NUMBER = 4;
-  /**
-   * 
-   * Apply the transformation to the entire field.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-   */
-  public boolean hasPrimitiveTransformation() {
-    return transformationCase_ == 4;
-  }
-  /**
-   * 
-   * Apply the transformation to the entire field.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.PrimitiveTransformation getPrimitiveTransformation() {
-    if (transformationCase_ == 4) {
-       return (com.google.privacy.dlp.v2beta1.PrimitiveTransformation) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance();
-  }
-  /**
-   * 
-   * Apply the transformation to the entire field.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder getPrimitiveTransformationOrBuilder() {
-    if (transformationCase_ == 4) {
-       return (com.google.privacy.dlp.v2beta1.PrimitiveTransformation) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance();
-  }
-
-  public static final int INFO_TYPE_TRANSFORMATIONS_FIELD_NUMBER = 5;
-  /**
-   * 
-   * Treat the contents of the field as free text, and selectively
-   * transform content that matches an `InfoType`.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-   */
-  public boolean hasInfoTypeTransformations() {
-    return transformationCase_ == 5;
-  }
-  /**
-   * 
-   * Treat the contents of the field as free text, and selectively
-   * transform content that matches an `InfoType`.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeTransformations getInfoTypeTransformations() {
-    if (transformationCase_ == 5) {
-       return (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-  }
-  /**
-   * 
-   * Treat the contents of the field as free text, and selectively
-   * transform content that matches an `InfoType`.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder getInfoTypeTransformationsOrBuilder() {
-    if (transformationCase_ == 5) {
-       return (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < fields_.size(); i++) {
-      output.writeMessage(1, fields_.get(i));
-    }
-    if (condition_ != null) {
-      output.writeMessage(3, getCondition());
-    }
-    if (transformationCase_ == 4) {
-      output.writeMessage(4, (com.google.privacy.dlp.v2beta1.PrimitiveTransformation) transformation_);
-    }
-    if (transformationCase_ == 5) {
-      output.writeMessage(5, (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < fields_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, fields_.get(i));
-    }
-    if (condition_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, getCondition());
-    }
-    if (transformationCase_ == 4) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, (com.google.privacy.dlp.v2beta1.PrimitiveTransformation) transformation_);
-    }
-    if (transformationCase_ == 5) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.FieldTransformation)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.FieldTransformation other = (com.google.privacy.dlp.v2beta1.FieldTransformation) obj;
-
-    boolean result = true;
-    result = result && getFieldsList()
-        .equals(other.getFieldsList());
-    result = result && (hasCondition() == other.hasCondition());
-    if (hasCondition()) {
-      result = result && getCondition()
-          .equals(other.getCondition());
-    }
-    result = result && getTransformationCase().equals(
-        other.getTransformationCase());
-    if (!result) return false;
-    switch (transformationCase_) {
-      case 4:
-        result = result && getPrimitiveTransformation()
-            .equals(other.getPrimitiveTransformation());
-        break;
-      case 5:
-        result = result && getInfoTypeTransformations()
-            .equals(other.getInfoTypeTransformations());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getFieldsCount() > 0) {
-      hash = (37 * hash) + FIELDS_FIELD_NUMBER;
-      hash = (53 * hash) + getFieldsList().hashCode();
-    }
-    if (hasCondition()) {
-      hash = (37 * hash) + CONDITION_FIELD_NUMBER;
-      hash = (53 * hash) + getCondition().hashCode();
-    }
-    switch (transformationCase_) {
-      case 4:
-        hash = (37 * hash) + PRIMITIVE_TRANSFORMATION_FIELD_NUMBER;
-        hash = (53 * hash) + getPrimitiveTransformation().hashCode();
-        break;
-      case 5:
-        hash = (37 * hash) + INFO_TYPE_TRANSFORMATIONS_FIELD_NUMBER;
-        hash = (53 * hash) + getInfoTypeTransformations().hashCode();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.FieldTransformation prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * The transformation to apply to the field.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.FieldTransformation}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.FieldTransformation)
-      com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_FieldTransformation_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_FieldTransformation_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.FieldTransformation.class, com.google.privacy.dlp.v2beta1.FieldTransformation.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.FieldTransformation.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getFieldsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (fieldsBuilder_ == null) {
-        fields_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        fieldsBuilder_.clear();
-      }
-      if (conditionBuilder_ == null) {
-        condition_ = null;
-      } else {
-        condition_ = null;
-        conditionBuilder_ = null;
-      }
-      transformationCase_ = 0;
-      transformation_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_FieldTransformation_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.FieldTransformation getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.FieldTransformation.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.FieldTransformation build() {
-      com.google.privacy.dlp.v2beta1.FieldTransformation result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.FieldTransformation buildPartial() {
-      com.google.privacy.dlp.v2beta1.FieldTransformation result = new com.google.privacy.dlp.v2beta1.FieldTransformation(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (fieldsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          fields_ = java.util.Collections.unmodifiableList(fields_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.fields_ = fields_;
-      } else {
-        result.fields_ = fieldsBuilder_.build();
-      }
-      if (conditionBuilder_ == null) {
-        result.condition_ = condition_;
-      } else {
-        result.condition_ = conditionBuilder_.build();
-      }
-      if (transformationCase_ == 4) {
-        if (primitiveTransformationBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = primitiveTransformationBuilder_.build();
-        }
-      }
-      if (transformationCase_ == 5) {
-        if (infoTypeTransformationsBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = infoTypeTransformationsBuilder_.build();
-        }
-      }
-      result.bitField0_ = to_bitField0_;
-      result.transformationCase_ = transformationCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.FieldTransformation) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.FieldTransformation)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.FieldTransformation other) {
-      if (other == com.google.privacy.dlp.v2beta1.FieldTransformation.getDefaultInstance()) return this;
-      if (fieldsBuilder_ == null) {
-        if (!other.fields_.isEmpty()) {
-          if (fields_.isEmpty()) {
-            fields_ = other.fields_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureFieldsIsMutable();
-            fields_.addAll(other.fields_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.fields_.isEmpty()) {
-          if (fieldsBuilder_.isEmpty()) {
-            fieldsBuilder_.dispose();
-            fieldsBuilder_ = null;
-            fields_ = other.fields_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            fieldsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getFieldsFieldBuilder() : null;
-          } else {
-            fieldsBuilder_.addAllMessages(other.fields_);
-          }
-        }
-      }
-      if (other.hasCondition()) {
-        mergeCondition(other.getCondition());
-      }
-      switch (other.getTransformationCase()) {
-        case PRIMITIVE_TRANSFORMATION: {
-          mergePrimitiveTransformation(other.getPrimitiveTransformation());
-          break;
-        }
-        case INFO_TYPE_TRANSFORMATIONS: {
-          mergeInfoTypeTransformations(other.getInfoTypeTransformations());
-          break;
-        }
-        case TRANSFORMATION_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.FieldTransformation parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.FieldTransformation) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int transformationCase_ = 0;
-    private java.lang.Object transformation_;
-    public TransformationCase
-        getTransformationCase() {
-      return TransformationCase.forNumber(
-          transformationCase_);
-    }
-
-    public Builder clearTransformation() {
-      transformationCase_ = 0;
-      transformation_ = null;
-      onChanged();
-      return this;
-    }
-
-    private int bitField0_;
-
-    private java.util.List fields_ =
-      java.util.Collections.emptyList();
-    private void ensureFieldsIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        fields_ = new java.util.ArrayList(fields_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> fieldsBuilder_;
-
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public java.util.List getFieldsList() {
-      if (fieldsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(fields_);
-      } else {
-        return fieldsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public int getFieldsCount() {
-      if (fieldsBuilder_ == null) {
-        return fields_.size();
-      } else {
-        return fieldsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getFields(int index) {
-      if (fieldsBuilder_ == null) {
-        return fields_.get(index);
-      } else {
-        return fieldsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public Builder setFields(
-        int index, com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (fieldsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFieldsIsMutable();
-        fields_.set(index, value);
-        onChanged();
-      } else {
-        fieldsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public Builder setFields(
-        int index, com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (fieldsBuilder_ == null) {
-        ensureFieldsIsMutable();
-        fields_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        fieldsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public Builder addFields(com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (fieldsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFieldsIsMutable();
-        fields_.add(value);
-        onChanged();
-      } else {
-        fieldsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public Builder addFields(
-        int index, com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (fieldsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFieldsIsMutable();
-        fields_.add(index, value);
-        onChanged();
-      } else {
-        fieldsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public Builder addFields(
-        com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (fieldsBuilder_ == null) {
-        ensureFieldsIsMutable();
-        fields_.add(builderForValue.build());
-        onChanged();
-      } else {
-        fieldsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public Builder addFields(
-        int index, com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (fieldsBuilder_ == null) {
-        ensureFieldsIsMutable();
-        fields_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        fieldsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public Builder addAllFields(
-        java.lang.Iterable values) {
-      if (fieldsBuilder_ == null) {
-        ensureFieldsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, fields_);
-        onChanged();
-      } else {
-        fieldsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public Builder clearFields() {
-      if (fieldsBuilder_ == null) {
-        fields_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        fieldsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public Builder removeFields(int index) {
-      if (fieldsBuilder_ == null) {
-        ensureFieldsIsMutable();
-        fields_.remove(index);
-        onChanged();
-      } else {
-        fieldsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder getFieldsBuilder(
-        int index) {
-      return getFieldsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldsOrBuilder(
-        int index) {
-      if (fieldsBuilder_ == null) {
-        return fields_.get(index);  } else {
-        return fieldsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public java.util.List 
-         getFieldsOrBuilderList() {
-      if (fieldsBuilder_ != null) {
-        return fieldsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(fields_);
-      }
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder addFieldsBuilder() {
-      return getFieldsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance());
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder addFieldsBuilder(
-        int index) {
-      return getFieldsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance());
-    }
-    /**
-     * 
-     * Input field(s) to apply the transformation to. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-     */
-    public java.util.List 
-         getFieldsBuilderList() {
-      return getFieldsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-        getFieldsFieldBuilder() {
-      if (fieldsBuilder_ == null) {
-        fieldsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                fields_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        fields_ = null;
-      }
-      return fieldsBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.RecordCondition condition_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordCondition, com.google.privacy.dlp.v2beta1.RecordCondition.Builder, com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder> conditionBuilder_;
-    /**
-     * 
-     * Only apply the transformation if the condition evaluates to true for the
-     * given `RecordCondition`. The conditions are allowed to reference fields
-     * that are not used in the actual transformation. [optional]
-     * Example Use Cases:
-     * - Apply a different bucket transformation to an age column if the zip code
-     * column for the same record is within a specific range.
-     * - Redact a field if the date of birth field is greater than 85.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-     */
-    public boolean hasCondition() {
-      return conditionBuilder_ != null || condition_ != null;
-    }
-    /**
-     * 
-     * Only apply the transformation if the condition evaluates to true for the
-     * given `RecordCondition`. The conditions are allowed to reference fields
-     * that are not used in the actual transformation. [optional]
-     * Example Use Cases:
-     * - Apply a different bucket transformation to an age column if the zip code
-     * column for the same record is within a specific range.
-     * - Redact a field if the date of birth field is greater than 85.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordCondition getCondition() {
-      if (conditionBuilder_ == null) {
-        return condition_ == null ? com.google.privacy.dlp.v2beta1.RecordCondition.getDefaultInstance() : condition_;
-      } else {
-        return conditionBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Only apply the transformation if the condition evaluates to true for the
-     * given `RecordCondition`. The conditions are allowed to reference fields
-     * that are not used in the actual transformation. [optional]
-     * Example Use Cases:
-     * - Apply a different bucket transformation to an age column if the zip code
-     * column for the same record is within a specific range.
-     * - Redact a field if the date of birth field is greater than 85.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-     */
-    public Builder setCondition(com.google.privacy.dlp.v2beta1.RecordCondition value) {
-      if (conditionBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        condition_ = value;
-        onChanged();
-      } else {
-        conditionBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Only apply the transformation if the condition evaluates to true for the
-     * given `RecordCondition`. The conditions are allowed to reference fields
-     * that are not used in the actual transformation. [optional]
-     * Example Use Cases:
-     * - Apply a different bucket transformation to an age column if the zip code
-     * column for the same record is within a specific range.
-     * - Redact a field if the date of birth field is greater than 85.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-     */
-    public Builder setCondition(
-        com.google.privacy.dlp.v2beta1.RecordCondition.Builder builderForValue) {
-      if (conditionBuilder_ == null) {
-        condition_ = builderForValue.build();
-        onChanged();
-      } else {
-        conditionBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Only apply the transformation if the condition evaluates to true for the
-     * given `RecordCondition`. The conditions are allowed to reference fields
-     * that are not used in the actual transformation. [optional]
-     * Example Use Cases:
-     * - Apply a different bucket transformation to an age column if the zip code
-     * column for the same record is within a specific range.
-     * - Redact a field if the date of birth field is greater than 85.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-     */
-    public Builder mergeCondition(com.google.privacy.dlp.v2beta1.RecordCondition value) {
-      if (conditionBuilder_ == null) {
-        if (condition_ != null) {
-          condition_ =
-            com.google.privacy.dlp.v2beta1.RecordCondition.newBuilder(condition_).mergeFrom(value).buildPartial();
-        } else {
-          condition_ = value;
-        }
-        onChanged();
-      } else {
-        conditionBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Only apply the transformation if the condition evaluates to true for the
-     * given `RecordCondition`. The conditions are allowed to reference fields
-     * that are not used in the actual transformation. [optional]
-     * Example Use Cases:
-     * - Apply a different bucket transformation to an age column if the zip code
-     * column for the same record is within a specific range.
-     * - Redact a field if the date of birth field is greater than 85.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-     */
-    public Builder clearCondition() {
-      if (conditionBuilder_ == null) {
-        condition_ = null;
-        onChanged();
-      } else {
-        condition_ = null;
-        conditionBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Only apply the transformation if the condition evaluates to true for the
-     * given `RecordCondition`. The conditions are allowed to reference fields
-     * that are not used in the actual transformation. [optional]
-     * Example Use Cases:
-     * - Apply a different bucket transformation to an age column if the zip code
-     * column for the same record is within a specific range.
-     * - Redact a field if the date of birth field is greater than 85.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordCondition.Builder getConditionBuilder() {
-      
-      onChanged();
-      return getConditionFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Only apply the transformation if the condition evaluates to true for the
-     * given `RecordCondition`. The conditions are allowed to reference fields
-     * that are not used in the actual transformation. [optional]
-     * Example Use Cases:
-     * - Apply a different bucket transformation to an age column if the zip code
-     * column for the same record is within a specific range.
-     * - Redact a field if the date of birth field is greater than 85.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder getConditionOrBuilder() {
-      if (conditionBuilder_ != null) {
-        return conditionBuilder_.getMessageOrBuilder();
-      } else {
-        return condition_ == null ?
-            com.google.privacy.dlp.v2beta1.RecordCondition.getDefaultInstance() : condition_;
-      }
-    }
-    /**
-     * 
-     * Only apply the transformation if the condition evaluates to true for the
-     * given `RecordCondition`. The conditions are allowed to reference fields
-     * that are not used in the actual transformation. [optional]
-     * Example Use Cases:
-     * - Apply a different bucket transformation to an age column if the zip code
-     * column for the same record is within a specific range.
-     * - Redact a field if the date of birth field is greater than 85.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordCondition, com.google.privacy.dlp.v2beta1.RecordCondition.Builder, com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder> 
-        getConditionFieldBuilder() {
-      if (conditionBuilder_ == null) {
-        conditionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RecordCondition, com.google.privacy.dlp.v2beta1.RecordCondition.Builder, com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder>(
-                getCondition(),
-                getParentForChildren(),
-                isClean());
-        condition_ = null;
-      }
-      return conditionBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrimitiveTransformation, com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder, com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder> primitiveTransformationBuilder_;
-    /**
-     * 
-     * Apply the transformation to the entire field.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-     */
-    public boolean hasPrimitiveTransformation() {
-      return transformationCase_ == 4;
-    }
-    /**
-     * 
-     * Apply the transformation to the entire field.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.PrimitiveTransformation getPrimitiveTransformation() {
-      if (primitiveTransformationBuilder_ == null) {
-        if (transformationCase_ == 4) {
-          return (com.google.privacy.dlp.v2beta1.PrimitiveTransformation) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 4) {
-          return primitiveTransformationBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Apply the transformation to the entire field.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-     */
-    public Builder setPrimitiveTransformation(com.google.privacy.dlp.v2beta1.PrimitiveTransformation value) {
-      if (primitiveTransformationBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        primitiveTransformationBuilder_.setMessage(value);
-      }
-      transformationCase_ = 4;
-      return this;
-    }
-    /**
-     * 
-     * Apply the transformation to the entire field.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-     */
-    public Builder setPrimitiveTransformation(
-        com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder builderForValue) {
-      if (primitiveTransformationBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        primitiveTransformationBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 4;
-      return this;
-    }
-    /**
-     * 
-     * Apply the transformation to the entire field.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-     */
-    public Builder mergePrimitiveTransformation(com.google.privacy.dlp.v2beta1.PrimitiveTransformation value) {
-      if (primitiveTransformationBuilder_ == null) {
-        if (transformationCase_ == 4 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.PrimitiveTransformation.newBuilder((com.google.privacy.dlp.v2beta1.PrimitiveTransformation) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 4) {
-          primitiveTransformationBuilder_.mergeFrom(value);
-        }
-        primitiveTransformationBuilder_.setMessage(value);
-      }
-      transformationCase_ = 4;
-      return this;
-    }
-    /**
-     * 
-     * Apply the transformation to the entire field.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-     */
-    public Builder clearPrimitiveTransformation() {
-      if (primitiveTransformationBuilder_ == null) {
-        if (transformationCase_ == 4) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 4) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        primitiveTransformationBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Apply the transformation to the entire field.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder getPrimitiveTransformationBuilder() {
-      return getPrimitiveTransformationFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Apply the transformation to the entire field.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder getPrimitiveTransformationOrBuilder() {
-      if ((transformationCase_ == 4) && (primitiveTransformationBuilder_ != null)) {
-        return primitiveTransformationBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 4) {
-          return (com.google.privacy.dlp.v2beta1.PrimitiveTransformation) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Apply the transformation to the entire field.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrimitiveTransformation, com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder, com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder> 
-        getPrimitiveTransformationFieldBuilder() {
-      if (primitiveTransformationBuilder_ == null) {
-        if (!(transformationCase_ == 4)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance();
-        }
-        primitiveTransformationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.PrimitiveTransformation, com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder, com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.PrimitiveTransformation) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 4;
-      onChanged();;
-      return primitiveTransformationBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder, com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder> infoTypeTransformationsBuilder_;
-    /**
-     * 
-     * Treat the contents of the field as free text, and selectively
-     * transform content that matches an `InfoType`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-     */
-    public boolean hasInfoTypeTransformations() {
-      return transformationCase_ == 5;
-    }
-    /**
-     * 
-     * Treat the contents of the field as free text, and selectively
-     * transform content that matches an `InfoType`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations getInfoTypeTransformations() {
-      if (infoTypeTransformationsBuilder_ == null) {
-        if (transformationCase_ == 5) {
-          return (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 5) {
-          return infoTypeTransformationsBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Treat the contents of the field as free text, and selectively
-     * transform content that matches an `InfoType`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-     */
-    public Builder setInfoTypeTransformations(com.google.privacy.dlp.v2beta1.InfoTypeTransformations value) {
-      if (infoTypeTransformationsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        infoTypeTransformationsBuilder_.setMessage(value);
-      }
-      transformationCase_ = 5;
-      return this;
-    }
-    /**
-     * 
-     * Treat the contents of the field as free text, and selectively
-     * transform content that matches an `InfoType`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-     */
-    public Builder setInfoTypeTransformations(
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder builderForValue) {
-      if (infoTypeTransformationsBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        infoTypeTransformationsBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 5;
-      return this;
-    }
-    /**
-     * 
-     * Treat the contents of the field as free text, and selectively
-     * transform content that matches an `InfoType`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-     */
-    public Builder mergeInfoTypeTransformations(com.google.privacy.dlp.v2beta1.InfoTypeTransformations value) {
-      if (infoTypeTransformationsBuilder_ == null) {
-        if (transformationCase_ == 5 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.InfoTypeTransformations.newBuilder((com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 5) {
-          infoTypeTransformationsBuilder_.mergeFrom(value);
-        }
-        infoTypeTransformationsBuilder_.setMessage(value);
-      }
-      transformationCase_ = 5;
-      return this;
-    }
-    /**
-     * 
-     * Treat the contents of the field as free text, and selectively
-     * transform content that matches an `InfoType`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-     */
-    public Builder clearInfoTypeTransformations() {
-      if (infoTypeTransformationsBuilder_ == null) {
-        if (transformationCase_ == 5) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 5) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        infoTypeTransformationsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Treat the contents of the field as free text, and selectively
-     * transform content that matches an `InfoType`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder getInfoTypeTransformationsBuilder() {
-      return getInfoTypeTransformationsFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Treat the contents of the field as free text, and selectively
-     * transform content that matches an `InfoType`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder getInfoTypeTransformationsOrBuilder() {
-      if ((transformationCase_ == 5) && (infoTypeTransformationsBuilder_ != null)) {
-        return infoTypeTransformationsBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 5) {
-          return (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Treat the contents of the field as free text, and selectively
-     * transform content that matches an `InfoType`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder, com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder> 
-        getInfoTypeTransformationsFieldBuilder() {
-      if (infoTypeTransformationsBuilder_ == null) {
-        if (!(transformationCase_ == 5)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-        }
-        infoTypeTransformationsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InfoTypeTransformations, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder, com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 5;
-      onChanged();;
-      return infoTypeTransformationsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.FieldTransformation)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.FieldTransformation)
-  private static final com.google.privacy.dlp.v2beta1.FieldTransformation DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.FieldTransformation();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.FieldTransformation getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public FieldTransformation parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FieldTransformation(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.FieldTransformation getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldTransformationOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldTransformationOrBuilder.java
deleted file mode 100644
index f1cdd232c69f..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldTransformationOrBuilder.java
+++ /dev/null
@@ -1,151 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface FieldTransformationOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.FieldTransformation)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Input field(s) to apply the transformation to. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-   */
-  java.util.List 
-      getFieldsList();
-  /**
-   * 
-   * Input field(s) to apply the transformation to. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-   */
-  com.google.privacy.dlp.v2beta1.FieldId getFields(int index);
-  /**
-   * 
-   * Input field(s) to apply the transformation to. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-   */
-  int getFieldsCount();
-  /**
-   * 
-   * Input field(s) to apply the transformation to. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-   */
-  java.util.List 
-      getFieldsOrBuilderList();
-  /**
-   * 
-   * Input field(s) to apply the transformation to. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldId fields = 1;
-   */
-  com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldsOrBuilder(
-      int index);
-
-  /**
-   * 
-   * Only apply the transformation if the condition evaluates to true for the
-   * given `RecordCondition`. The conditions are allowed to reference fields
-   * that are not used in the actual transformation. [optional]
-   * Example Use Cases:
-   * - Apply a different bucket transformation to an age column if the zip code
-   * column for the same record is within a specific range.
-   * - Redact a field if the date of birth field is greater than 85.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-   */
-  boolean hasCondition();
-  /**
-   * 
-   * Only apply the transformation if the condition evaluates to true for the
-   * given `RecordCondition`. The conditions are allowed to reference fields
-   * that are not used in the actual transformation. [optional]
-   * Example Use Cases:
-   * - Apply a different bucket transformation to an age column if the zip code
-   * column for the same record is within a specific range.
-   * - Redact a field if the date of birth field is greater than 85.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-   */
-  com.google.privacy.dlp.v2beta1.RecordCondition getCondition();
-  /**
-   * 
-   * Only apply the transformation if the condition evaluates to true for the
-   * given `RecordCondition`. The conditions are allowed to reference fields
-   * that are not used in the actual transformation. [optional]
-   * Example Use Cases:
-   * - Apply a different bucket transformation to an age column if the zip code
-   * column for the same record is within a specific range.
-   * - Redact a field if the date of birth field is greater than 85.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordCondition condition = 3;
-   */
-  com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder getConditionOrBuilder();
-
-  /**
-   * 
-   * Apply the transformation to the entire field.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-   */
-  boolean hasPrimitiveTransformation();
-  /**
-   * 
-   * Apply the transformation to the entire field.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-   */
-  com.google.privacy.dlp.v2beta1.PrimitiveTransformation getPrimitiveTransformation();
-  /**
-   * 
-   * Apply the transformation to the entire field.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 4;
-   */
-  com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder getPrimitiveTransformationOrBuilder();
-
-  /**
-   * 
-   * Treat the contents of the field as free text, and selectively
-   * transform content that matches an `InfoType`.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-   */
-  boolean hasInfoTypeTransformations();
-  /**
-   * 
-   * Treat the contents of the field as free text, and selectively
-   * transform content that matches an `InfoType`.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeTransformations getInfoTypeTransformations();
-  /**
-   * 
-   * Treat the contents of the field as free text, and selectively
-   * transform content that matches an `InfoType`.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoTypeTransformations info_type_transformations = 5;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder getInfoTypeTransformationsOrBuilder();
-
-  public com.google.privacy.dlp.v2beta1.FieldTransformation.TransformationCase getTransformationCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Finding.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Finding.java
deleted file mode 100644
index 0990cc73563e..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Finding.java
+++ /dev/null
@@ -1,1350 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Container structure describing a single finding within a string or image.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.Finding}
- */
-public  final class Finding extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.Finding)
-    FindingOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Finding.newBuilder() to construct.
-  private Finding(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private Finding() {
-    quote_ = "";
-    likelihood_ = 0;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Finding(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            quote_ = s;
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.InfoType.Builder subBuilder = null;
-            if (infoType_ != null) {
-              subBuilder = infoType_.toBuilder();
-            }
-            infoType_ = input.readMessage(com.google.privacy.dlp.v2beta1.InfoType.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(infoType_);
-              infoType_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 24: {
-            int rawValue = input.readEnum();
-
-            likelihood_ = rawValue;
-            break;
-          }
-          case 34: {
-            com.google.privacy.dlp.v2beta1.Location.Builder subBuilder = null;
-            if (location_ != null) {
-              subBuilder = location_.toBuilder();
-            }
-            location_ = input.readMessage(com.google.privacy.dlp.v2beta1.Location.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(location_);
-              location_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 50: {
-            com.google.protobuf.Timestamp.Builder subBuilder = null;
-            if (createTime_ != null) {
-              subBuilder = createTime_.toBuilder();
-            }
-            createTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(createTime_);
-              createTime_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Finding_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Finding_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.Finding.class, com.google.privacy.dlp.v2beta1.Finding.Builder.class);
-  }
-
-  public static final int QUOTE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object quote_;
-  /**
-   * 
-   * The specific string that may be potentially sensitive info.
-   * 

-   *
-   * string quote = 1;
-   */
-  public java.lang.String getQuote() {
-    java.lang.Object ref = quote_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      quote_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * The specific string that may be potentially sensitive info.
-   * 

-   *
-   * string quote = 1;
-   */
-  public com.google.protobuf.ByteString
-      getQuoteBytes() {
-    java.lang.Object ref = quote_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      quote_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int INFO_TYPE_FIELD_NUMBER = 2;
-  private com.google.privacy.dlp.v2beta1.InfoType infoType_;
-  /**
-   * 
-   * The specific type of info the string might be.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-   */
-  public boolean hasInfoType() {
-    return infoType_ != null;
-  }
-  /**
-   * 
-   * The specific type of info the string might be.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-    return infoType_ == null ? com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-  }
-  /**
-   * 
-   * The specific type of info the string might be.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-    return getInfoType();
-  }
-
-  public static final int LIKELIHOOD_FIELD_NUMBER = 3;
-  private int likelihood_;
-  /**
-   * 
-   * Estimate of how likely it is that the info_type is correct.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Likelihood likelihood = 3;
-   */
-  public int getLikelihoodValue() {
-    return likelihood_;
-  }
-  /**
-   * 
-   * Estimate of how likely it is that the info_type is correct.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Likelihood likelihood = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.Likelihood getLikelihood() {
-    com.google.privacy.dlp.v2beta1.Likelihood result = com.google.privacy.dlp.v2beta1.Likelihood.valueOf(likelihood_);
-    return result == null ? com.google.privacy.dlp.v2beta1.Likelihood.UNRECOGNIZED : result;
-  }
-
-  public static final int LOCATION_FIELD_NUMBER = 4;
-  private com.google.privacy.dlp.v2beta1.Location location_;
-  /**
-   * 
-   * Location of the info found.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Location location = 4;
-   */
-  public boolean hasLocation() {
-    return location_ != null;
-  }
-  /**
-   * 
-   * Location of the info found.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Location location = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.Location getLocation() {
-    return location_ == null ? com.google.privacy.dlp.v2beta1.Location.getDefaultInstance() : location_;
-  }
-  /**
-   * 
-   * Location of the info found.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Location location = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.LocationOrBuilder getLocationOrBuilder() {
-    return getLocation();
-  }
-
-  public static final int CREATE_TIME_FIELD_NUMBER = 6;
-  private com.google.protobuf.Timestamp createTime_;
-  /**
-   * 
-   * Timestamp when finding was detected.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 6;
-   */
-  public boolean hasCreateTime() {
-    return createTime_ != null;
-  }
-  /**
-   * 
-   * Timestamp when finding was detected.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 6;
-   */
-  public com.google.protobuf.Timestamp getCreateTime() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
-  }
-  /**
-   * 
-   * Timestamp when finding was detected.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 6;
-   */
-  public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getQuoteBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, quote_);
-    }
-    if (infoType_ != null) {
-      output.writeMessage(2, getInfoType());
-    }
-    if (likelihood_ != com.google.privacy.dlp.v2beta1.Likelihood.LIKELIHOOD_UNSPECIFIED.getNumber()) {
-      output.writeEnum(3, likelihood_);
-    }
-    if (location_ != null) {
-      output.writeMessage(4, getLocation());
-    }
-    if (createTime_ != null) {
-      output.writeMessage(6, getCreateTime());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getQuoteBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, quote_);
-    }
-    if (infoType_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getInfoType());
-    }
-    if (likelihood_ != com.google.privacy.dlp.v2beta1.Likelihood.LIKELIHOOD_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(3, likelihood_);
-    }
-    if (location_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, getLocation());
-    }
-    if (createTime_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(6, getCreateTime());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.Finding)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.Finding other = (com.google.privacy.dlp.v2beta1.Finding) obj;
-
-    boolean result = true;
-    result = result && getQuote()
-        .equals(other.getQuote());
-    result = result && (hasInfoType() == other.hasInfoType());
-    if (hasInfoType()) {
-      result = result && getInfoType()
-          .equals(other.getInfoType());
-    }
-    result = result && likelihood_ == other.likelihood_;
-    result = result && (hasLocation() == other.hasLocation());
-    if (hasLocation()) {
-      result = result && getLocation()
-          .equals(other.getLocation());
-    }
-    result = result && (hasCreateTime() == other.hasCreateTime());
-    if (hasCreateTime()) {
-      result = result && getCreateTime()
-          .equals(other.getCreateTime());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + QUOTE_FIELD_NUMBER;
-    hash = (53 * hash) + getQuote().hashCode();
-    if (hasInfoType()) {
-      hash = (37 * hash) + INFO_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getInfoType().hashCode();
-    }
-    hash = (37 * hash) + LIKELIHOOD_FIELD_NUMBER;
-    hash = (53 * hash) + likelihood_;
-    if (hasLocation()) {
-      hash = (37 * hash) + LOCATION_FIELD_NUMBER;
-      hash = (53 * hash) + getLocation().hashCode();
-    }
-    if (hasCreateTime()) {
-      hash = (37 * hash) + CREATE_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getCreateTime().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Finding parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Finding parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Finding parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Finding parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Finding parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Finding parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Finding parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Finding parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Finding parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Finding parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Finding parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Finding parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.Finding prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Container structure describing a single finding within a string or image.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.Finding}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.Finding)
-      com.google.privacy.dlp.v2beta1.FindingOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Finding_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Finding_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.Finding.class, com.google.privacy.dlp.v2beta1.Finding.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.Finding.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      quote_ = "";
-
-      if (infoTypeBuilder_ == null) {
-        infoType_ = null;
-      } else {
-        infoType_ = null;
-        infoTypeBuilder_ = null;
-      }
-      likelihood_ = 0;
-
-      if (locationBuilder_ == null) {
-        location_ = null;
-      } else {
-        location_ = null;
-        locationBuilder_ = null;
-      }
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
-        createTimeBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Finding_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Finding getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.Finding.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.Finding build() {
-      com.google.privacy.dlp.v2beta1.Finding result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Finding buildPartial() {
-      com.google.privacy.dlp.v2beta1.Finding result = new com.google.privacy.dlp.v2beta1.Finding(this);
-      result.quote_ = quote_;
-      if (infoTypeBuilder_ == null) {
-        result.infoType_ = infoType_;
-      } else {
-        result.infoType_ = infoTypeBuilder_.build();
-      }
-      result.likelihood_ = likelihood_;
-      if (locationBuilder_ == null) {
-        result.location_ = location_;
-      } else {
-        result.location_ = locationBuilder_.build();
-      }
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.Finding) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.Finding)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.Finding other) {
-      if (other == com.google.privacy.dlp.v2beta1.Finding.getDefaultInstance()) return this;
-      if (!other.getQuote().isEmpty()) {
-        quote_ = other.quote_;
-        onChanged();
-      }
-      if (other.hasInfoType()) {
-        mergeInfoType(other.getInfoType());
-      }
-      if (other.likelihood_ != 0) {
-        setLikelihoodValue(other.getLikelihoodValue());
-      }
-      if (other.hasLocation()) {
-        mergeLocation(other.getLocation());
-      }
-      if (other.hasCreateTime()) {
-        mergeCreateTime(other.getCreateTime());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.Finding parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.Finding) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object quote_ = "";
-    /**
-     * 
-     * The specific string that may be potentially sensitive info.
-     * 

-     *
-     * string quote = 1;
-     */
-    public java.lang.String getQuote() {
-      java.lang.Object ref = quote_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        quote_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * The specific string that may be potentially sensitive info.
-     * 

-     *
-     * string quote = 1;
-     */
-    public com.google.protobuf.ByteString
-        getQuoteBytes() {
-      java.lang.Object ref = quote_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        quote_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * The specific string that may be potentially sensitive info.
-     * 

-     *
-     * string quote = 1;
-     */
-    public Builder setQuote(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      quote_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The specific string that may be potentially sensitive info.
-     * 

-     *
-     * string quote = 1;
-     */
-    public Builder clearQuote() {
-      
-      quote_ = getDefaultInstance().getQuote();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The specific string that may be potentially sensitive info.
-     * 

-     *
-     * string quote = 1;
-     */
-    public Builder setQuoteBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      quote_ = value;
-      onChanged();
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.InfoType infoType_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> infoTypeBuilder_;
-    /**
-     * 
-     * The specific type of info the string might be.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-     */
-    public boolean hasInfoType() {
-      return infoTypeBuilder_ != null || infoType_ != null;
-    }
-    /**
-     * 
-     * The specific type of info the string might be.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-      if (infoTypeBuilder_ == null) {
-        return infoType_ == null ? com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-      } else {
-        return infoTypeBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The specific type of info the string might be.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-     */
-    public Builder setInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-      if (infoTypeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        infoType_ = value;
-        onChanged();
-      } else {
-        infoTypeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The specific type of info the string might be.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-     */
-    public Builder setInfoType(
-        com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-      if (infoTypeBuilder_ == null) {
-        infoType_ = builderForValue.build();
-        onChanged();
-      } else {
-        infoTypeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The specific type of info the string might be.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-     */
-    public Builder mergeInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-      if (infoTypeBuilder_ == null) {
-        if (infoType_ != null) {
-          infoType_ =
-            com.google.privacy.dlp.v2beta1.InfoType.newBuilder(infoType_).mergeFrom(value).buildPartial();
-        } else {
-          infoType_ = value;
-        }
-        onChanged();
-      } else {
-        infoTypeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The specific type of info the string might be.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-     */
-    public Builder clearInfoType() {
-      if (infoTypeBuilder_ == null) {
-        infoType_ = null;
-        onChanged();
-      } else {
-        infoType_ = null;
-        infoTypeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The specific type of info the string might be.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType.Builder getInfoTypeBuilder() {
-      
-      onChanged();
-      return getInfoTypeFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The specific type of info the string might be.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-      if (infoTypeBuilder_ != null) {
-        return infoTypeBuilder_.getMessageOrBuilder();
-      } else {
-        return infoType_ == null ?
-            com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-      }
-    }
-    /**
-     * 
-     * The specific type of info the string might be.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> 
-        getInfoTypeFieldBuilder() {
-      if (infoTypeBuilder_ == null) {
-        infoTypeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder>(
-                getInfoType(),
-                getParentForChildren(),
-                isClean());
-        infoType_ = null;
-      }
-      return infoTypeBuilder_;
-    }
-
-    private int likelihood_ = 0;
-    /**
-     * 
-     * Estimate of how likely it is that the info_type is correct.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Likelihood likelihood = 3;
-     */
-    public int getLikelihoodValue() {
-      return likelihood_;
-    }
-    /**
-     * 
-     * Estimate of how likely it is that the info_type is correct.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Likelihood likelihood = 3;
-     */
-    public Builder setLikelihoodValue(int value) {
-      likelihood_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Estimate of how likely it is that the info_type is correct.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Likelihood likelihood = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.Likelihood getLikelihood() {
-      com.google.privacy.dlp.v2beta1.Likelihood result = com.google.privacy.dlp.v2beta1.Likelihood.valueOf(likelihood_);
-      return result == null ? com.google.privacy.dlp.v2beta1.Likelihood.UNRECOGNIZED : result;
-    }
-    /**
-     * 
-     * Estimate of how likely it is that the info_type is correct.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Likelihood likelihood = 3;
-     */
-    public Builder setLikelihood(com.google.privacy.dlp.v2beta1.Likelihood value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      likelihood_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Estimate of how likely it is that the info_type is correct.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Likelihood likelihood = 3;
-     */
-    public Builder clearLikelihood() {
-      
-      likelihood_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.Location location_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Location, com.google.privacy.dlp.v2beta1.Location.Builder, com.google.privacy.dlp.v2beta1.LocationOrBuilder> locationBuilder_;
-    /**
-     * 
-     * Location of the info found.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Location location = 4;
-     */
-    public boolean hasLocation() {
-      return locationBuilder_ != null || location_ != null;
-    }
-    /**
-     * 
-     * Location of the info found.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Location location = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.Location getLocation() {
-      if (locationBuilder_ == null) {
-        return location_ == null ? com.google.privacy.dlp.v2beta1.Location.getDefaultInstance() : location_;
-      } else {
-        return locationBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Location of the info found.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Location location = 4;
-     */
-    public Builder setLocation(com.google.privacy.dlp.v2beta1.Location value) {
-      if (locationBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        location_ = value;
-        onChanged();
-      } else {
-        locationBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Location of the info found.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Location location = 4;
-     */
-    public Builder setLocation(
-        com.google.privacy.dlp.v2beta1.Location.Builder builderForValue) {
-      if (locationBuilder_ == null) {
-        location_ = builderForValue.build();
-        onChanged();
-      } else {
-        locationBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Location of the info found.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Location location = 4;
-     */
-    public Builder mergeLocation(com.google.privacy.dlp.v2beta1.Location value) {
-      if (locationBuilder_ == null) {
-        if (location_ != null) {
-          location_ =
-            com.google.privacy.dlp.v2beta1.Location.newBuilder(location_).mergeFrom(value).buildPartial();
-        } else {
-          location_ = value;
-        }
-        onChanged();
-      } else {
-        locationBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Location of the info found.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Location location = 4;
-     */
-    public Builder clearLocation() {
-      if (locationBuilder_ == null) {
-        location_ = null;
-        onChanged();
-      } else {
-        location_ = null;
-        locationBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Location of the info found.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Location location = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.Location.Builder getLocationBuilder() {
-      
-      onChanged();
-      return getLocationFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Location of the info found.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Location location = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.LocationOrBuilder getLocationOrBuilder() {
-      if (locationBuilder_ != null) {
-        return locationBuilder_.getMessageOrBuilder();
-      } else {
-        return location_ == null ?
-            com.google.privacy.dlp.v2beta1.Location.getDefaultInstance() : location_;
-      }
-    }
-    /**
-     * 
-     * Location of the info found.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Location location = 4;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Location, com.google.privacy.dlp.v2beta1.Location.Builder, com.google.privacy.dlp.v2beta1.LocationOrBuilder> 
-        getLocationFieldBuilder() {
-      if (locationBuilder_ == null) {
-        locationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Location, com.google.privacy.dlp.v2beta1.Location.Builder, com.google.privacy.dlp.v2beta1.LocationOrBuilder>(
-                getLocation(),
-                getParentForChildren(),
-                isClean());
-        location_ = null;
-      }
-      return locationBuilder_;
-    }
-
-    private com.google.protobuf.Timestamp createTime_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> createTimeBuilder_;
-    /**
-     * 
-     * Timestamp when finding was detected.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 6;
-     */
-    public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
-    }
-    /**
-     * 
-     * Timestamp when finding was detected.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 6;
-     */
-    public com.google.protobuf.Timestamp getCreateTime() {
-      if (createTimeBuilder_ == null) {
-        return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
-      } else {
-        return createTimeBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Timestamp when finding was detected.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 6;
-     */
-    public Builder setCreateTime(com.google.protobuf.Timestamp value) {
-      if (createTimeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        createTime_ = value;
-        onChanged();
-      } else {
-        createTimeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Timestamp when finding was detected.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 6;
-     */
-    public Builder setCreateTime(
-        com.google.protobuf.Timestamp.Builder builderForValue) {
-      if (createTimeBuilder_ == null) {
-        createTime_ = builderForValue.build();
-        onChanged();
-      } else {
-        createTimeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Timestamp when finding was detected.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 6;
-     */
-    public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
-      if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-            com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
-        } else {
-          createTime_ = value;
-        }
-        onChanged();
-      } else {
-        createTimeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Timestamp when finding was detected.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 6;
-     */
-    public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
-        createTimeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Timestamp when finding was detected.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 6;
-     */
-    public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      
-      onChanged();
-      return getCreateTimeFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Timestamp when finding was detected.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 6;
-     */
-    public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-      if (createTimeBuilder_ != null) {
-        return createTimeBuilder_.getMessageOrBuilder();
-      } else {
-        return createTime_ == null ?
-            com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
-      }
-    }
-    /**
-     * 
-     * Timestamp when finding was detected.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 6;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
-        getCreateTimeFieldBuilder() {
-      if (createTimeBuilder_ == null) {
-        createTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
-                getCreateTime(),
-                getParentForChildren(),
-                isClean());
-        createTime_ = null;
-      }
-      return createTimeBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.Finding)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.Finding)
-  private static final com.google.privacy.dlp.v2beta1.Finding DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.Finding();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Finding getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public Finding parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Finding(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.Finding getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FindingOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FindingOrBuilder.java
deleted file mode 100644
index 12ea64f5dd10..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FindingOrBuilder.java
+++ /dev/null
@@ -1,119 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface FindingOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.Finding)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The specific string that may be potentially sensitive info.
-   * 

-   *
-   * string quote = 1;
-   */
-  java.lang.String getQuote();
-  /**
-   * 
-   * The specific string that may be potentially sensitive info.
-   * 

-   *
-   * string quote = 1;
-   */
-  com.google.protobuf.ByteString
-      getQuoteBytes();
-
-  /**
-   * 
-   * The specific type of info the string might be.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-   */
-  boolean hasInfoType();
-  /**
-   * 
-   * The specific type of info the string might be.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-   */
-  com.google.privacy.dlp.v2beta1.InfoType getInfoType();
-  /**
-   * 
-   * The specific type of info the string might be.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 2;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder();
-
-  /**
-   * 
-   * Estimate of how likely it is that the info_type is correct.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Likelihood likelihood = 3;
-   */
-  int getLikelihoodValue();
-  /**
-   * 
-   * Estimate of how likely it is that the info_type is correct.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Likelihood likelihood = 3;
-   */
-  com.google.privacy.dlp.v2beta1.Likelihood getLikelihood();
-
-  /**
-   * 
-   * Location of the info found.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Location location = 4;
-   */
-  boolean hasLocation();
-  /**
-   * 
-   * Location of the info found.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Location location = 4;
-   */
-  com.google.privacy.dlp.v2beta1.Location getLocation();
-  /**
-   * 
-   * Location of the info found.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Location location = 4;
-   */
-  com.google.privacy.dlp.v2beta1.LocationOrBuilder getLocationOrBuilder();
-
-  /**
-   * 
-   * Timestamp when finding was detected.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 6;
-   */
-  boolean hasCreateTime();
-  /**
-   * 
-   * Timestamp when finding was detected.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 6;
-   */
-  com.google.protobuf.Timestamp getCreateTime();
-  /**
-   * 
-   * Timestamp when finding was detected.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 6;
-   */
-  com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FixedSizeBucketingConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FixedSizeBucketingConfig.java
deleted file mode 100644
index b6a5bee8bd3b..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FixedSizeBucketingConfig.java
+++ /dev/null
@@ -1,1022 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Buckets values based on fixed size ranges. The
- * Bucketing transformation can provide all of this functionality,
- * but requires more configuration. This message is provided as a convenience to
- * the user for simple bucketing strategies.
- * The resulting value will be a hyphenated string of
- * lower_bound-upper_bound.
- * This can be used on data of type: double, long.
- * If the bound Value type differs from the type of data
- * being transformed, we will first attempt converting the type of the data to
- * be transformed to match the type of the bound before comparing.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.FixedSizeBucketingConfig}
- */
-public  final class FixedSizeBucketingConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.FixedSizeBucketingConfig)
-    FixedSizeBucketingConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use FixedSizeBucketingConfig.newBuilder() to construct.
-  private FixedSizeBucketingConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private FixedSizeBucketingConfig() {
-    bucketSize_ = 0D;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private FixedSizeBucketingConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.Value.Builder subBuilder = null;
-            if (lowerBound_ != null) {
-              subBuilder = lowerBound_.toBuilder();
-            }
-            lowerBound_ = input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(lowerBound_);
-              lowerBound_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.Value.Builder subBuilder = null;
-            if (upperBound_ != null) {
-              subBuilder = upperBound_.toBuilder();
-            }
-            upperBound_ = input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(upperBound_);
-              upperBound_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 25: {
-
-            bucketSize_ = input.readDouble();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_FixedSizeBucketingConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_FixedSizeBucketingConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.class, com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.Builder.class);
-  }
-
-  public static final int LOWER_BOUND_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.Value lowerBound_;
-  /**
-   * 
-   * Lower bound value of buckets. All values less than `lower_bound` are
-   * grouped together into a single bucket; for example if `lower_bound` = 10,
-   * then all values less than 10 are replaced with the value “-10”. [Required].
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-   */
-  public boolean hasLowerBound() {
-    return lowerBound_ != null;
-  }
-  /**
-   * 
-   * Lower bound value of buckets. All values less than `lower_bound` are
-   * grouped together into a single bucket; for example if `lower_bound` = 10,
-   * then all values less than 10 are replaced with the value “-10”. [Required].
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.Value getLowerBound() {
-    return lowerBound_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : lowerBound_;
-  }
-  /**
-   * 
-   * Lower bound value of buckets. All values less than `lower_bound` are
-   * grouped together into a single bucket; for example if `lower_bound` = 10,
-   * then all values less than 10 are replaced with the value “-10”. [Required].
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.ValueOrBuilder getLowerBoundOrBuilder() {
-    return getLowerBound();
-  }
-
-  public static final int UPPER_BOUND_FIELD_NUMBER = 2;
-  private com.google.privacy.dlp.v2beta1.Value upperBound_;
-  /**
-   * 
-   * Upper bound value of buckets. All values greater than upper_bound are
-   * grouped together into a single bucket; for example if `upper_bound` = 89,
-   * then all values greater than 89 are replaced with the value “89+”.
-   * [Required].
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-   */
-  public boolean hasUpperBound() {
-    return upperBound_ != null;
-  }
-  /**
-   * 
-   * Upper bound value of buckets. All values greater than upper_bound are
-   * grouped together into a single bucket; for example if `upper_bound` = 89,
-   * then all values greater than 89 are replaced with the value “89+”.
-   * [Required].
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.Value getUpperBound() {
-    return upperBound_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : upperBound_;
-  }
-  /**
-   * 
-   * Upper bound value of buckets. All values greater than upper_bound are
-   * grouped together into a single bucket; for example if `upper_bound` = 89,
-   * then all values greater than 89 are replaced with the value “89+”.
-   * [Required].
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.ValueOrBuilder getUpperBoundOrBuilder() {
-    return getUpperBound();
-  }
-
-  public static final int BUCKET_SIZE_FIELD_NUMBER = 3;
-  private double bucketSize_;
-  /**
-   * 
-   * Size of each bucket (except for minimum and maximum buckets). So if
-   * `lower_bound` = 10, `upper_bound` = 89, and `bucket_size` = 10, then the
-   * following buckets would be used: -10, 10-20, 20-30, 30-40, 40-50, 50-60,
-   * 60-70, 70-80, 80-89, 89+. Precision up to 2 decimals works. [Required].
-   * 

-   *
-   * double bucket_size = 3;
-   */
-  public double getBucketSize() {
-    return bucketSize_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (lowerBound_ != null) {
-      output.writeMessage(1, getLowerBound());
-    }
-    if (upperBound_ != null) {
-      output.writeMessage(2, getUpperBound());
-    }
-    if (bucketSize_ != 0D) {
-      output.writeDouble(3, bucketSize_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (lowerBound_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getLowerBound());
-    }
-    if (upperBound_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getUpperBound());
-    }
-    if (bucketSize_ != 0D) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeDoubleSize(3, bucketSize_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig other = (com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) obj;
-
-    boolean result = true;
-    result = result && (hasLowerBound() == other.hasLowerBound());
-    if (hasLowerBound()) {
-      result = result && getLowerBound()
-          .equals(other.getLowerBound());
-    }
-    result = result && (hasUpperBound() == other.hasUpperBound());
-    if (hasUpperBound()) {
-      result = result && getUpperBound()
-          .equals(other.getUpperBound());
-    }
-    result = result && (
-        java.lang.Double.doubleToLongBits(getBucketSize())
-        == java.lang.Double.doubleToLongBits(
-            other.getBucketSize()));
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasLowerBound()) {
-      hash = (37 * hash) + LOWER_BOUND_FIELD_NUMBER;
-      hash = (53 * hash) + getLowerBound().hashCode();
-    }
-    if (hasUpperBound()) {
-      hash = (37 * hash) + UPPER_BOUND_FIELD_NUMBER;
-      hash = (53 * hash) + getUpperBound().hashCode();
-    }
-    hash = (37 * hash) + BUCKET_SIZE_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        java.lang.Double.doubleToLongBits(getBucketSize()));
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Buckets values based on fixed size ranges. The
-   * Bucketing transformation can provide all of this functionality,
-   * but requires more configuration. This message is provided as a convenience to
-   * the user for simple bucketing strategies.
-   * The resulting value will be a hyphenated string of
-   * lower_bound-upper_bound.
-   * This can be used on data of type: double, long.
-   * If the bound Value type differs from the type of data
-   * being transformed, we will first attempt converting the type of the data to
-   * be transformed to match the type of the bound before comparing.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.FixedSizeBucketingConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.FixedSizeBucketingConfig)
-      com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_FixedSizeBucketingConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_FixedSizeBucketingConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.class, com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (lowerBoundBuilder_ == null) {
-        lowerBound_ = null;
-      } else {
-        lowerBound_ = null;
-        lowerBoundBuilder_ = null;
-      }
-      if (upperBoundBuilder_ == null) {
-        upperBound_ = null;
-      } else {
-        upperBound_ = null;
-        upperBoundBuilder_ = null;
-      }
-      bucketSize_ = 0D;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_FixedSizeBucketingConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig build() {
-      com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig result = new com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig(this);
-      if (lowerBoundBuilder_ == null) {
-        result.lowerBound_ = lowerBound_;
-      } else {
-        result.lowerBound_ = lowerBoundBuilder_.build();
-      }
-      if (upperBoundBuilder_ == null) {
-        result.upperBound_ = upperBound_;
-      } else {
-        result.upperBound_ = upperBoundBuilder_.build();
-      }
-      result.bucketSize_ = bucketSize_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.getDefaultInstance()) return this;
-      if (other.hasLowerBound()) {
-        mergeLowerBound(other.getLowerBound());
-      }
-      if (other.hasUpperBound()) {
-        mergeUpperBound(other.getUpperBound());
-      }
-      if (other.getBucketSize() != 0D) {
-        setBucketSize(other.getBucketSize());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.Value lowerBound_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> lowerBoundBuilder_;
-    /**
-     * 
-     * Lower bound value of buckets. All values less than `lower_bound` are
-     * grouped together into a single bucket; for example if `lower_bound` = 10,
-     * then all values less than 10 are replaced with the value “-10”. [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-     */
-    public boolean hasLowerBound() {
-      return lowerBoundBuilder_ != null || lowerBound_ != null;
-    }
-    /**
-     * 
-     * Lower bound value of buckets. All values less than `lower_bound` are
-     * grouped together into a single bucket; for example if `lower_bound` = 10,
-     * then all values less than 10 are replaced with the value “-10”. [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Value getLowerBound() {
-      if (lowerBoundBuilder_ == null) {
-        return lowerBound_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : lowerBound_;
-      } else {
-        return lowerBoundBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Lower bound value of buckets. All values less than `lower_bound` are
-     * grouped together into a single bucket; for example if `lower_bound` = 10,
-     * then all values less than 10 are replaced with the value “-10”. [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-     */
-    public Builder setLowerBound(com.google.privacy.dlp.v2beta1.Value value) {
-      if (lowerBoundBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        lowerBound_ = value;
-        onChanged();
-      } else {
-        lowerBoundBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Lower bound value of buckets. All values less than `lower_bound` are
-     * grouped together into a single bucket; for example if `lower_bound` = 10,
-     * then all values less than 10 are replaced with the value “-10”. [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-     */
-    public Builder setLowerBound(
-        com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-      if (lowerBoundBuilder_ == null) {
-        lowerBound_ = builderForValue.build();
-        onChanged();
-      } else {
-        lowerBoundBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Lower bound value of buckets. All values less than `lower_bound` are
-     * grouped together into a single bucket; for example if `lower_bound` = 10,
-     * then all values less than 10 are replaced with the value “-10”. [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-     */
-    public Builder mergeLowerBound(com.google.privacy.dlp.v2beta1.Value value) {
-      if (lowerBoundBuilder_ == null) {
-        if (lowerBound_ != null) {
-          lowerBound_ =
-            com.google.privacy.dlp.v2beta1.Value.newBuilder(lowerBound_).mergeFrom(value).buildPartial();
-        } else {
-          lowerBound_ = value;
-        }
-        onChanged();
-      } else {
-        lowerBoundBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Lower bound value of buckets. All values less than `lower_bound` are
-     * grouped together into a single bucket; for example if `lower_bound` = 10,
-     * then all values less than 10 are replaced with the value “-10”. [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-     */
-    public Builder clearLowerBound() {
-      if (lowerBoundBuilder_ == null) {
-        lowerBound_ = null;
-        onChanged();
-      } else {
-        lowerBound_ = null;
-        lowerBoundBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Lower bound value of buckets. All values less than `lower_bound` are
-     * grouped together into a single bucket; for example if `lower_bound` = 10,
-     * then all values less than 10 are replaced with the value “-10”. [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Value.Builder getLowerBoundBuilder() {
-      
-      onChanged();
-      return getLowerBoundFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Lower bound value of buckets. All values less than `lower_bound` are
-     * grouped together into a single bucket; for example if `lower_bound` = 10,
-     * then all values less than 10 are replaced with the value “-10”. [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ValueOrBuilder getLowerBoundOrBuilder() {
-      if (lowerBoundBuilder_ != null) {
-        return lowerBoundBuilder_.getMessageOrBuilder();
-      } else {
-        return lowerBound_ == null ?
-            com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : lowerBound_;
-      }
-    }
-    /**
-     * 
-     * Lower bound value of buckets. All values less than `lower_bound` are
-     * grouped together into a single bucket; for example if `lower_bound` = 10,
-     * then all values less than 10 are replaced with the value “-10”. [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-        getLowerBoundFieldBuilder() {
-      if (lowerBoundBuilder_ == null) {
-        lowerBoundBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                getLowerBound(),
-                getParentForChildren(),
-                isClean());
-        lowerBound_ = null;
-      }
-      return lowerBoundBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.Value upperBound_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> upperBoundBuilder_;
-    /**
-     * 
-     * Upper bound value of buckets. All values greater than upper_bound are
-     * grouped together into a single bucket; for example if `upper_bound` = 89,
-     * then all values greater than 89 are replaced with the value “89+”.
-     * [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-     */
-    public boolean hasUpperBound() {
-      return upperBoundBuilder_ != null || upperBound_ != null;
-    }
-    /**
-     * 
-     * Upper bound value of buckets. All values greater than upper_bound are
-     * grouped together into a single bucket; for example if `upper_bound` = 89,
-     * then all values greater than 89 are replaced with the value “89+”.
-     * [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Value getUpperBound() {
-      if (upperBoundBuilder_ == null) {
-        return upperBound_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : upperBound_;
-      } else {
-        return upperBoundBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Upper bound value of buckets. All values greater than upper_bound are
-     * grouped together into a single bucket; for example if `upper_bound` = 89,
-     * then all values greater than 89 are replaced with the value “89+”.
-     * [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-     */
-    public Builder setUpperBound(com.google.privacy.dlp.v2beta1.Value value) {
-      if (upperBoundBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        upperBound_ = value;
-        onChanged();
-      } else {
-        upperBoundBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Upper bound value of buckets. All values greater than upper_bound are
-     * grouped together into a single bucket; for example if `upper_bound` = 89,
-     * then all values greater than 89 are replaced with the value “89+”.
-     * [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-     */
-    public Builder setUpperBound(
-        com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-      if (upperBoundBuilder_ == null) {
-        upperBound_ = builderForValue.build();
-        onChanged();
-      } else {
-        upperBoundBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Upper bound value of buckets. All values greater than upper_bound are
-     * grouped together into a single bucket; for example if `upper_bound` = 89,
-     * then all values greater than 89 are replaced with the value “89+”.
-     * [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-     */
-    public Builder mergeUpperBound(com.google.privacy.dlp.v2beta1.Value value) {
-      if (upperBoundBuilder_ == null) {
-        if (upperBound_ != null) {
-          upperBound_ =
-            com.google.privacy.dlp.v2beta1.Value.newBuilder(upperBound_).mergeFrom(value).buildPartial();
-        } else {
-          upperBound_ = value;
-        }
-        onChanged();
-      } else {
-        upperBoundBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Upper bound value of buckets. All values greater than upper_bound are
-     * grouped together into a single bucket; for example if `upper_bound` = 89,
-     * then all values greater than 89 are replaced with the value “89+”.
-     * [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-     */
-    public Builder clearUpperBound() {
-      if (upperBoundBuilder_ == null) {
-        upperBound_ = null;
-        onChanged();
-      } else {
-        upperBound_ = null;
-        upperBoundBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Upper bound value of buckets. All values greater than upper_bound are
-     * grouped together into a single bucket; for example if `upper_bound` = 89,
-     * then all values greater than 89 are replaced with the value “89+”.
-     * [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Value.Builder getUpperBoundBuilder() {
-      
-      onChanged();
-      return getUpperBoundFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Upper bound value of buckets. All values greater than upper_bound are
-     * grouped together into a single bucket; for example if `upper_bound` = 89,
-     * then all values greater than 89 are replaced with the value “89+”.
-     * [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ValueOrBuilder getUpperBoundOrBuilder() {
-      if (upperBoundBuilder_ != null) {
-        return upperBoundBuilder_.getMessageOrBuilder();
-      } else {
-        return upperBound_ == null ?
-            com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : upperBound_;
-      }
-    }
-    /**
-     * 
-     * Upper bound value of buckets. All values greater than upper_bound are
-     * grouped together into a single bucket; for example if `upper_bound` = 89,
-     * then all values greater than 89 are replaced with the value “89+”.
-     * [Required].
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-        getUpperBoundFieldBuilder() {
-      if (upperBoundBuilder_ == null) {
-        upperBoundBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                getUpperBound(),
-                getParentForChildren(),
-                isClean());
-        upperBound_ = null;
-      }
-      return upperBoundBuilder_;
-    }
-
-    private double bucketSize_ ;
-    /**
-     * 
-     * Size of each bucket (except for minimum and maximum buckets). So if
-     * `lower_bound` = 10, `upper_bound` = 89, and `bucket_size` = 10, then the
-     * following buckets would be used: -10, 10-20, 20-30, 30-40, 40-50, 50-60,
-     * 60-70, 70-80, 80-89, 89+. Precision up to 2 decimals works. [Required].
-     * 

-     *
-     * double bucket_size = 3;
-     */
-    public double getBucketSize() {
-      return bucketSize_;
-    }
-    /**
-     * 
-     * Size of each bucket (except for minimum and maximum buckets). So if
-     * `lower_bound` = 10, `upper_bound` = 89, and `bucket_size` = 10, then the
-     * following buckets would be used: -10, 10-20, 20-30, 30-40, 40-50, 50-60,
-     * 60-70, 70-80, 80-89, 89+. Precision up to 2 decimals works. [Required].
-     * 

-     *
-     * double bucket_size = 3;
-     */
-    public Builder setBucketSize(double value) {
-      
-      bucketSize_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Size of each bucket (except for minimum and maximum buckets). So if
-     * `lower_bound` = 10, `upper_bound` = 89, and `bucket_size` = 10, then the
-     * following buckets would be used: -10, 10-20, 20-30, 30-40, 40-50, 50-60,
-     * 60-70, 70-80, 80-89, 89+. Precision up to 2 decimals works. [Required].
-     * 

-     *
-     * double bucket_size = 3;
-     */
-    public Builder clearBucketSize() {
-      
-      bucketSize_ = 0D;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.FixedSizeBucketingConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.FixedSizeBucketingConfig)
-  private static final com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public FixedSizeBucketingConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FixedSizeBucketingConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FixedSizeBucketingConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FixedSizeBucketingConfigOrBuilder.java
deleted file mode 100644
index 3dbc5e7bbf21..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FixedSizeBucketingConfigOrBuilder.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface FixedSizeBucketingConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.FixedSizeBucketingConfig)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Lower bound value of buckets. All values less than `lower_bound` are
-   * grouped together into a single bucket; for example if `lower_bound` = 10,
-   * then all values less than 10 are replaced with the value “-10”. [Required].
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-   */
-  boolean hasLowerBound();
-  /**
-   * 
-   * Lower bound value of buckets. All values less than `lower_bound` are
-   * grouped together into a single bucket; for example if `lower_bound` = 10,
-   * then all values less than 10 are replaced with the value “-10”. [Required].
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-   */
-  com.google.privacy.dlp.v2beta1.Value getLowerBound();
-  /**
-   * 
-   * Lower bound value of buckets. All values less than `lower_bound` are
-   * grouped together into a single bucket; for example if `lower_bound` = 10,
-   * then all values less than 10 are replaced with the value “-10”. [Required].
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value lower_bound = 1;
-   */
-  com.google.privacy.dlp.v2beta1.ValueOrBuilder getLowerBoundOrBuilder();
-
-  /**
-   * 
-   * Upper bound value of buckets. All values greater than upper_bound are
-   * grouped together into a single bucket; for example if `upper_bound` = 89,
-   * then all values greater than 89 are replaced with the value “89+”.
-   * [Required].
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-   */
-  boolean hasUpperBound();
-  /**
-   * 
-   * Upper bound value of buckets. All values greater than upper_bound are
-   * grouped together into a single bucket; for example if `upper_bound` = 89,
-   * then all values greater than 89 are replaced with the value “89+”.
-   * [Required].
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-   */
-  com.google.privacy.dlp.v2beta1.Value getUpperBound();
-  /**
-   * 
-   * Upper bound value of buckets. All values greater than upper_bound are
-   * grouped together into a single bucket; for example if `upper_bound` = 89,
-   * then all values greater than 89 are replaced with the value “89+”.
-   * [Required].
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value upper_bound = 2;
-   */
-  com.google.privacy.dlp.v2beta1.ValueOrBuilder getUpperBoundOrBuilder();
-
-  /**
-   * 
-   * Size of each bucket (except for minimum and maximum buckets). So if
-   * `lower_bound` = 10, `upper_bound` = 89, and `bucket_size` = 10, then the
-   * following buckets would be used: -10, 10-20, 20-30, 30-40, 40-50, 50-60,
-   * 60-70, 70-80, 80-89, 89+. Precision up to 2 decimals works. [Required].
-   * 

-   *
-   * double bucket_size = 3;
-   */
-  double getBucketSize();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ImageLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ImageLocation.java
deleted file mode 100644
index fa3602ee64f0..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ImageLocation.java
+++ /dev/null
@@ -1,693 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Bounding box encompassing detected text within an image.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.ImageLocation}
- */
-public  final class ImageLocation extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.ImageLocation)
-    ImageLocationOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ImageLocation.newBuilder() to construct.
-  private ImageLocation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private ImageLocation() {
-    top_ = 0;
-    left_ = 0;
-    width_ = 0;
-    height_ = 0;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ImageLocation(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-
-            top_ = input.readInt32();
-            break;
-          }
-          case 16: {
-
-            left_ = input.readInt32();
-            break;
-          }
-          case 24: {
-
-            width_ = input.readInt32();
-            break;
-          }
-          case 32: {
-
-            height_ = input.readInt32();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ImageLocation_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ImageLocation_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.ImageLocation.class, com.google.privacy.dlp.v2beta1.ImageLocation.Builder.class);
-  }
-
-  public static final int TOP_FIELD_NUMBER = 1;
-  private int top_;
-  /**
-   * 
-   * Top coordinate of the bounding box. (0,0) is upper left.
-   * 

-   *
-   * int32 top = 1;
-   */
-  public int getTop() {
-    return top_;
-  }
-
-  public static final int LEFT_FIELD_NUMBER = 2;
-  private int left_;
-  /**
-   * 
-   * Left coordinate of the bounding box. (0,0) is upper left.
-   * 

-   *
-   * int32 left = 2;
-   */
-  public int getLeft() {
-    return left_;
-  }
-
-  public static final int WIDTH_FIELD_NUMBER = 3;
-  private int width_;
-  /**
-   * 
-   * Width of the bounding box in pixels.
-   * 

-   *
-   * int32 width = 3;
-   */
-  public int getWidth() {
-    return width_;
-  }
-
-  public static final int HEIGHT_FIELD_NUMBER = 4;
-  private int height_;
-  /**
-   * 
-   * Height of the bounding box in pixels.
-   * 

-   *
-   * int32 height = 4;
-   */
-  public int getHeight() {
-    return height_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (top_ != 0) {
-      output.writeInt32(1, top_);
-    }
-    if (left_ != 0) {
-      output.writeInt32(2, left_);
-    }
-    if (width_ != 0) {
-      output.writeInt32(3, width_);
-    }
-    if (height_ != 0) {
-      output.writeInt32(4, height_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (top_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(1, top_);
-    }
-    if (left_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(2, left_);
-    }
-    if (width_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(3, width_);
-    }
-    if (height_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(4, height_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.ImageLocation)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.ImageLocation other = (com.google.privacy.dlp.v2beta1.ImageLocation) obj;
-
-    boolean result = true;
-    result = result && (getTop()
-        == other.getTop());
-    result = result && (getLeft()
-        == other.getLeft());
-    result = result && (getWidth()
-        == other.getWidth());
-    result = result && (getHeight()
-        == other.getHeight());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + TOP_FIELD_NUMBER;
-    hash = (53 * hash) + getTop();
-    hash = (37 * hash) + LEFT_FIELD_NUMBER;
-    hash = (53 * hash) + getLeft();
-    hash = (37 * hash) + WIDTH_FIELD_NUMBER;
-    hash = (53 * hash) + getWidth();
-    hash = (37 * hash) + HEIGHT_FIELD_NUMBER;
-    hash = (53 * hash) + getHeight();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ImageLocation parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ImageLocation parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ImageLocation parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ImageLocation parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ImageLocation parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ImageLocation parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ImageLocation parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ImageLocation parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ImageLocation parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ImageLocation parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ImageLocation parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ImageLocation parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.ImageLocation prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Bounding box encompassing detected text within an image.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.ImageLocation}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.ImageLocation)
-      com.google.privacy.dlp.v2beta1.ImageLocationOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ImageLocation_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ImageLocation_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.ImageLocation.class, com.google.privacy.dlp.v2beta1.ImageLocation.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.ImageLocation.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      top_ = 0;
-
-      left_ = 0;
-
-      width_ = 0;
-
-      height_ = 0;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ImageLocation_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ImageLocation getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.ImageLocation.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.ImageLocation build() {
-      com.google.privacy.dlp.v2beta1.ImageLocation result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ImageLocation buildPartial() {
-      com.google.privacy.dlp.v2beta1.ImageLocation result = new com.google.privacy.dlp.v2beta1.ImageLocation(this);
-      result.top_ = top_;
-      result.left_ = left_;
-      result.width_ = width_;
-      result.height_ = height_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.ImageLocation) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.ImageLocation)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.ImageLocation other) {
-      if (other == com.google.privacy.dlp.v2beta1.ImageLocation.getDefaultInstance()) return this;
-      if (other.getTop() != 0) {
-        setTop(other.getTop());
-      }
-      if (other.getLeft() != 0) {
-        setLeft(other.getLeft());
-      }
-      if (other.getWidth() != 0) {
-        setWidth(other.getWidth());
-      }
-      if (other.getHeight() != 0) {
-        setHeight(other.getHeight());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.ImageLocation parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.ImageLocation) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private int top_ ;
-    /**
-     * 
-     * Top coordinate of the bounding box. (0,0) is upper left.
-     * 

-     *
-     * int32 top = 1;
-     */
-    public int getTop() {
-      return top_;
-    }
-    /**
-     * 
-     * Top coordinate of the bounding box. (0,0) is upper left.
-     * 

-     *
-     * int32 top = 1;
-     */
-    public Builder setTop(int value) {
-      
-      top_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Top coordinate of the bounding box. (0,0) is upper left.
-     * 

-     *
-     * int32 top = 1;
-     */
-    public Builder clearTop() {
-      
-      top_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private int left_ ;
-    /**
-     * 
-     * Left coordinate of the bounding box. (0,0) is upper left.
-     * 

-     *
-     * int32 left = 2;
-     */
-    public int getLeft() {
-      return left_;
-    }
-    /**
-     * 
-     * Left coordinate of the bounding box. (0,0) is upper left.
-     * 

-     *
-     * int32 left = 2;
-     */
-    public Builder setLeft(int value) {
-      
-      left_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Left coordinate of the bounding box. (0,0) is upper left.
-     * 

-     *
-     * int32 left = 2;
-     */
-    public Builder clearLeft() {
-      
-      left_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private int width_ ;
-    /**
-     * 
-     * Width of the bounding box in pixels.
-     * 

-     *
-     * int32 width = 3;
-     */
-    public int getWidth() {
-      return width_;
-    }
-    /**
-     * 
-     * Width of the bounding box in pixels.
-     * 

-     *
-     * int32 width = 3;
-     */
-    public Builder setWidth(int value) {
-      
-      width_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Width of the bounding box in pixels.
-     * 

-     *
-     * int32 width = 3;
-     */
-    public Builder clearWidth() {
-      
-      width_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private int height_ ;
-    /**
-     * 
-     * Height of the bounding box in pixels.
-     * 

-     *
-     * int32 height = 4;
-     */
-    public int getHeight() {
-      return height_;
-    }
-    /**
-     * 
-     * Height of the bounding box in pixels.
-     * 

-     *
-     * int32 height = 4;
-     */
-    public Builder setHeight(int value) {
-      
-      height_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Height of the bounding box in pixels.
-     * 

-     *
-     * int32 height = 4;
-     */
-    public Builder clearHeight() {
-      
-      height_ = 0;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.ImageLocation)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.ImageLocation)
-  private static final com.google.privacy.dlp.v2beta1.ImageLocation DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.ImageLocation();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ImageLocation getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public ImageLocation parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageLocation(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.ImageLocation getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ImageLocationOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ImageLocationOrBuilder.java
deleted file mode 100644
index 8e5ecbdb599b..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ImageLocationOrBuilder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ImageLocationOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.ImageLocation)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Top coordinate of the bounding box. (0,0) is upper left.
-   * 

-   *
-   * int32 top = 1;
-   */
-  int getTop();
-
-  /**
-   * 
-   * Left coordinate of the bounding box. (0,0) is upper left.
-   * 

-   *
-   * int32 left = 2;
-   */
-  int getLeft();
-
-  /**
-   * 
-   * Width of the bounding box in pixels.
-   * 

-   *
-   * int32 width = 3;
-   */
-  int getWidth();
-
-  /**
-   * 
-   * Height of the bounding box in pixels.
-   * 

-   *
-   * int32 height = 4;
-   */
-  int getHeight();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoType.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoType.java
deleted file mode 100644
index f34148657a6a..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoType.java
+++ /dev/null
@@ -1,552 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Type of information detected by the API.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.InfoType}
- */
-public  final class InfoType extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.InfoType)
-    InfoTypeOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use InfoType.newBuilder() to construct.
-  private InfoType(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private InfoType() {
-    name_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private InfoType(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_InfoType_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_InfoType_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.InfoType.class, com.google.privacy.dlp.v2beta1.InfoType.Builder.class);
-  }
-
-  public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
-  /**
-   * 
-   * Name of the information type.
-   * 

-   *
-   * string name = 1;
-   */
-  public java.lang.String getName() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      name_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Name of the information type.
-   * 

-   *
-   * string name = 1;
-   */
-  public com.google.protobuf.ByteString
-      getNameBytes() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      name_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.InfoType)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.InfoType other = (com.google.privacy.dlp.v2beta1.InfoType) obj;
-
-    boolean result = true;
-    result = result && getName()
-        .equals(other.getName());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InfoType parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoType parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoType parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoType parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoType parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoType parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoType parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoType parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoType parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoType parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoType parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoType parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.InfoType prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Type of information detected by the API.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.InfoType}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.InfoType)
-      com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_InfoType_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_InfoType_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.InfoType.class, com.google.privacy.dlp.v2beta1.InfoType.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.InfoType.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      name_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_InfoType_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoType getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoType build() {
-      com.google.privacy.dlp.v2beta1.InfoType result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoType buildPartial() {
-      com.google.privacy.dlp.v2beta1.InfoType result = new com.google.privacy.dlp.v2beta1.InfoType(this);
-      result.name_ = name_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.InfoType) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.InfoType)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.InfoType other) {
-      if (other == com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance()) return this;
-      if (!other.getName().isEmpty()) {
-        name_ = other.name_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.InfoType parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.InfoType) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object name_ = "";
-    /**
-     * 
-     * Name of the information type.
-     * 

-     *
-     * string name = 1;
-     */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        name_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Name of the information type.
-     * 

-     *
-     * string name = 1;
-     */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
-      java.lang.Object ref = name_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        name_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Name of the information type.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder setName(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Name of the information type.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder clearName() {
-      
-      name_ = getDefaultInstance().getName();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Name of the information type.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder setNameBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.InfoType)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.InfoType)
-  private static final com.google.privacy.dlp.v2beta1.InfoType DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.InfoType();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InfoType getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public InfoType parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InfoType(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.InfoType getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeDescription.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeDescription.java
deleted file mode 100644
index 4c71a812c2cf..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeDescription.java
+++ /dev/null
@@ -1,1147 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Description of the information type (infoType).
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.InfoTypeDescription}
- */
-public  final class InfoTypeDescription extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.InfoTypeDescription)
-    InfoTypeDescriptionOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use InfoTypeDescription.newBuilder() to construct.
-  private InfoTypeDescription(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private InfoTypeDescription() {
-    name_ = "";
-    displayName_ = "";
-    categories_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private InfoTypeDescription(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            displayName_ = s;
-            break;
-          }
-          case 26: {
-            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-              categories_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000004;
-            }
-            categories_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.CategoryDescription.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-        categories_ = java.util.Collections.unmodifiableList(categories_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeDescription_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeDescription_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.InfoTypeDescription.class, com.google.privacy.dlp.v2beta1.InfoTypeDescription.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
-  /**
-   * 
-   * Internal name of the infoType.
-   * 

-   *
-   * string name = 1;
-   */
-  public java.lang.String getName() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      name_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Internal name of the infoType.
-   * 

-   *
-   * string name = 1;
-   */
-  public com.google.protobuf.ByteString
-      getNameBytes() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      name_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int DISPLAY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object displayName_;
-  /**
-   * 
-   * Human readable form of the infoType name.
-   * 

-   *
-   * string display_name = 2;
-   */
-  public java.lang.String getDisplayName() {
-    java.lang.Object ref = displayName_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      displayName_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Human readable form of the infoType name.
-   * 

-   *
-   * string display_name = 2;
-   */
-  public com.google.protobuf.ByteString
-      getDisplayNameBytes() {
-    java.lang.Object ref = displayName_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      displayName_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int CATEGORIES_FIELD_NUMBER = 3;
-  private java.util.List categories_;
-  /**
-   * 
-   * List of categories this infoType belongs to.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-   */
-  public java.util.List getCategoriesList() {
-    return categories_;
-  }
-  /**
-   * 
-   * List of categories this infoType belongs to.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-   */
-  public java.util.List 
-      getCategoriesOrBuilderList() {
-    return categories_;
-  }
-  /**
-   * 
-   * List of categories this infoType belongs to.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-   */
-  public int getCategoriesCount() {
-    return categories_.size();
-  }
-  /**
-   * 
-   * List of categories this infoType belongs to.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.CategoryDescription getCategories(int index) {
-    return categories_.get(index);
-  }
-  /**
-   * 
-   * List of categories this infoType belongs to.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder getCategoriesOrBuilder(
-      int index) {
-    return categories_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
-    }
-    if (!getDisplayNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, displayName_);
-    }
-    for (int i = 0; i < categories_.size(); i++) {
-      output.writeMessage(3, categories_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
-    }
-    if (!getDisplayNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, displayName_);
-    }
-    for (int i = 0; i < categories_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, categories_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.InfoTypeDescription)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.InfoTypeDescription other = (com.google.privacy.dlp.v2beta1.InfoTypeDescription) obj;
-
-    boolean result = true;
-    result = result && getName()
-        .equals(other.getName());
-    result = result && getDisplayName()
-        .equals(other.getDisplayName());
-    result = result && getCategoriesList()
-        .equals(other.getCategoriesList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getName().hashCode();
-    hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getDisplayName().hashCode();
-    if (getCategoriesCount() > 0) {
-      hash = (37 * hash) + CATEGORIES_FIELD_NUMBER;
-      hash = (53 * hash) + getCategoriesList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.InfoTypeDescription prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Description of the information type (infoType).
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.InfoTypeDescription}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.InfoTypeDescription)
-      com.google.privacy.dlp.v2beta1.InfoTypeDescriptionOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeDescription_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeDescription_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.InfoTypeDescription.class, com.google.privacy.dlp.v2beta1.InfoTypeDescription.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.InfoTypeDescription.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getCategoriesFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      name_ = "";
-
-      displayName_ = "";
-
-      if (categoriesBuilder_ == null) {
-        categories_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-      } else {
-        categoriesBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeDescription_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoTypeDescription getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.InfoTypeDescription.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoTypeDescription build() {
-      com.google.privacy.dlp.v2beta1.InfoTypeDescription result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoTypeDescription buildPartial() {
-      com.google.privacy.dlp.v2beta1.InfoTypeDescription result = new com.google.privacy.dlp.v2beta1.InfoTypeDescription(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      result.name_ = name_;
-      result.displayName_ = displayName_;
-      if (categoriesBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          categories_ = java.util.Collections.unmodifiableList(categories_);
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.categories_ = categories_;
-      } else {
-        result.categories_ = categoriesBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.InfoTypeDescription) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.InfoTypeDescription)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.InfoTypeDescription other) {
-      if (other == com.google.privacy.dlp.v2beta1.InfoTypeDescription.getDefaultInstance()) return this;
-      if (!other.getName().isEmpty()) {
-        name_ = other.name_;
-        onChanged();
-      }
-      if (!other.getDisplayName().isEmpty()) {
-        displayName_ = other.displayName_;
-        onChanged();
-      }
-      if (categoriesBuilder_ == null) {
-        if (!other.categories_.isEmpty()) {
-          if (categories_.isEmpty()) {
-            categories_ = other.categories_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureCategoriesIsMutable();
-            categories_.addAll(other.categories_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.categories_.isEmpty()) {
-          if (categoriesBuilder_.isEmpty()) {
-            categoriesBuilder_.dispose();
-            categoriesBuilder_ = null;
-            categories_ = other.categories_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-            categoriesBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getCategoriesFieldBuilder() : null;
-          } else {
-            categoriesBuilder_.addAllMessages(other.categories_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.InfoTypeDescription parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.InfoTypeDescription) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.lang.Object name_ = "";
-    /**
-     * 
-     * Internal name of the infoType.
-     * 

-     *
-     * string name = 1;
-     */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        name_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Internal name of the infoType.
-     * 

-     *
-     * string name = 1;
-     */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
-      java.lang.Object ref = name_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        name_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Internal name of the infoType.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder setName(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Internal name of the infoType.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder clearName() {
-      
-      name_ = getDefaultInstance().getName();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Internal name of the infoType.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder setNameBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      name_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object displayName_ = "";
-    /**
-     * 
-     * Human readable form of the infoType name.
-     * 

-     *
-     * string display_name = 2;
-     */
-    public java.lang.String getDisplayName() {
-      java.lang.Object ref = displayName_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        displayName_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Human readable form of the infoType name.
-     * 

-     *
-     * string display_name = 2;
-     */
-    public com.google.protobuf.ByteString
-        getDisplayNameBytes() {
-      java.lang.Object ref = displayName_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        displayName_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Human readable form of the infoType name.
-     * 

-     *
-     * string display_name = 2;
-     */
-    public Builder setDisplayName(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      displayName_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Human readable form of the infoType name.
-     * 

-     *
-     * string display_name = 2;
-     */
-    public Builder clearDisplayName() {
-      
-      displayName_ = getDefaultInstance().getDisplayName();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Human readable form of the infoType name.
-     * 

-     *
-     * string display_name = 2;
-     */
-    public Builder setDisplayNameBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      displayName_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.util.List categories_ =
-      java.util.Collections.emptyList();
-    private void ensureCategoriesIsMutable() {
-      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-        categories_ = new java.util.ArrayList(categories_);
-        bitField0_ |= 0x00000004;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CategoryDescription, com.google.privacy.dlp.v2beta1.CategoryDescription.Builder, com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder> categoriesBuilder_;
-
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public java.util.List getCategoriesList() {
-      if (categoriesBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(categories_);
-      } else {
-        return categoriesBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public int getCategoriesCount() {
-      if (categoriesBuilder_ == null) {
-        return categories_.size();
-      } else {
-        return categoriesBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.CategoryDescription getCategories(int index) {
-      if (categoriesBuilder_ == null) {
-        return categories_.get(index);
-      } else {
-        return categoriesBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public Builder setCategories(
-        int index, com.google.privacy.dlp.v2beta1.CategoryDescription value) {
-      if (categoriesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureCategoriesIsMutable();
-        categories_.set(index, value);
-        onChanged();
-      } else {
-        categoriesBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public Builder setCategories(
-        int index, com.google.privacy.dlp.v2beta1.CategoryDescription.Builder builderForValue) {
-      if (categoriesBuilder_ == null) {
-        ensureCategoriesIsMutable();
-        categories_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        categoriesBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public Builder addCategories(com.google.privacy.dlp.v2beta1.CategoryDescription value) {
-      if (categoriesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureCategoriesIsMutable();
-        categories_.add(value);
-        onChanged();
-      } else {
-        categoriesBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public Builder addCategories(
-        int index, com.google.privacy.dlp.v2beta1.CategoryDescription value) {
-      if (categoriesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureCategoriesIsMutable();
-        categories_.add(index, value);
-        onChanged();
-      } else {
-        categoriesBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public Builder addCategories(
-        com.google.privacy.dlp.v2beta1.CategoryDescription.Builder builderForValue) {
-      if (categoriesBuilder_ == null) {
-        ensureCategoriesIsMutable();
-        categories_.add(builderForValue.build());
-        onChanged();
-      } else {
-        categoriesBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public Builder addCategories(
-        int index, com.google.privacy.dlp.v2beta1.CategoryDescription.Builder builderForValue) {
-      if (categoriesBuilder_ == null) {
-        ensureCategoriesIsMutable();
-        categories_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        categoriesBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public Builder addAllCategories(
-        java.lang.Iterable values) {
-      if (categoriesBuilder_ == null) {
-        ensureCategoriesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, categories_);
-        onChanged();
-      } else {
-        categoriesBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public Builder clearCategories() {
-      if (categoriesBuilder_ == null) {
-        categories_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-      } else {
-        categoriesBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public Builder removeCategories(int index) {
-      if (categoriesBuilder_ == null) {
-        ensureCategoriesIsMutable();
-        categories_.remove(index);
-        onChanged();
-      } else {
-        categoriesBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.CategoryDescription.Builder getCategoriesBuilder(
-        int index) {
-      return getCategoriesFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder getCategoriesOrBuilder(
-        int index) {
-      if (categoriesBuilder_ == null) {
-        return categories_.get(index);  } else {
-        return categoriesBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public java.util.List 
-         getCategoriesOrBuilderList() {
-      if (categoriesBuilder_ != null) {
-        return categoriesBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(categories_);
-      }
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.CategoryDescription.Builder addCategoriesBuilder() {
-      return getCategoriesFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.CategoryDescription.getDefaultInstance());
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.CategoryDescription.Builder addCategoriesBuilder(
-        int index) {
-      return getCategoriesFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.CategoryDescription.getDefaultInstance());
-    }
-    /**
-     * 
-     * List of categories this infoType belongs to.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-     */
-    public java.util.List 
-         getCategoriesBuilderList() {
-      return getCategoriesFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CategoryDescription, com.google.privacy.dlp.v2beta1.CategoryDescription.Builder, com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder> 
-        getCategoriesFieldBuilder() {
-      if (categoriesBuilder_ == null) {
-        categoriesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CategoryDescription, com.google.privacy.dlp.v2beta1.CategoryDescription.Builder, com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder>(
-                categories_,
-                ((bitField0_ & 0x00000004) == 0x00000004),
-                getParentForChildren(),
-                isClean());
-        categories_ = null;
-      }
-      return categoriesBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.InfoTypeDescription)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.InfoTypeDescription)
-  private static final com.google.privacy.dlp.v2beta1.InfoTypeDescription DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.InfoTypeDescription();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InfoTypeDescription getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public InfoTypeDescription parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InfoTypeDescription(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.InfoTypeDescription getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeDescriptionOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeDescriptionOrBuilder.java
deleted file mode 100644
index c99e38789aae..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeDescriptionOrBuilder.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface InfoTypeDescriptionOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.InfoTypeDescription)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Internal name of the infoType.
-   * 

-   *
-   * string name = 1;
-   */
-  java.lang.String getName();
-  /**
-   * 
-   * Internal name of the infoType.
-   * 

-   *
-   * string name = 1;
-   */
-  com.google.protobuf.ByteString
-      getNameBytes();
-
-  /**
-   * 
-   * Human readable form of the infoType name.
-   * 

-   *
-   * string display_name = 2;
-   */
-  java.lang.String getDisplayName();
-  /**
-   * 
-   * Human readable form of the infoType name.
-   * 

-   *
-   * string display_name = 2;
-   */
-  com.google.protobuf.ByteString
-      getDisplayNameBytes();
-
-  /**
-   * 
-   * List of categories this infoType belongs to.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-   */
-  java.util.List 
-      getCategoriesList();
-  /**
-   * 
-   * List of categories this infoType belongs to.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-   */
-  com.google.privacy.dlp.v2beta1.CategoryDescription getCategories(int index);
-  /**
-   * 
-   * List of categories this infoType belongs to.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-   */
-  int getCategoriesCount();
-  /**
-   * 
-   * List of categories this infoType belongs to.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-   */
-  java.util.List 
-      getCategoriesOrBuilderList();
-  /**
-   * 
-   * List of categories this infoType belongs to.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 3;
-   */
-  com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder getCategoriesOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeOrBuilder.java
deleted file mode 100644
index 808bf1867717..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeOrBuilder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface InfoTypeOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.InfoType)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Name of the information type.
-   * 

-   *
-   * string name = 1;
-   */
-  java.lang.String getName();
-  /**
-   * 
-   * Name of the information type.
-   * 

-   *
-   * string name = 1;
-   */
-  com.google.protobuf.ByteString
-      getNameBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeStatistics.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeStatistics.java
deleted file mode 100644
index f43df3e35124..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeStatistics.java
+++ /dev/null
@@ -1,701 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Statistics regarding a specific InfoType.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.InfoTypeStatistics}
- */
-public  final class InfoTypeStatistics extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.InfoTypeStatistics)
-    InfoTypeStatisticsOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use InfoTypeStatistics.newBuilder() to construct.
-  private InfoTypeStatistics(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private InfoTypeStatistics() {
-    count_ = 0L;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private InfoTypeStatistics(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.InfoType.Builder subBuilder = null;
-            if (infoType_ != null) {
-              subBuilder = infoType_.toBuilder();
-            }
-            infoType_ = input.readMessage(com.google.privacy.dlp.v2beta1.InfoType.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(infoType_);
-              infoType_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 16: {
-
-            count_ = input.readInt64();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeStatistics_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeStatistics_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.InfoTypeStatistics.class, com.google.privacy.dlp.v2beta1.InfoTypeStatistics.Builder.class);
-  }
-
-  public static final int INFO_TYPE_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.InfoType infoType_;
-  /**
-   * 
-   * The type of finding this stat is for.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  public boolean hasInfoType() {
-    return infoType_ != null;
-  }
-  /**
-   * 
-   * The type of finding this stat is for.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-    return infoType_ == null ? com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-  }
-  /**
-   * 
-   * The type of finding this stat is for.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-    return getInfoType();
-  }
-
-  public static final int COUNT_FIELD_NUMBER = 2;
-  private long count_;
-  /**
-   * 
-   * Number of findings for this info type.
-   * 

-   *
-   * int64 count = 2;
-   */
-  public long getCount() {
-    return count_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (infoType_ != null) {
-      output.writeMessage(1, getInfoType());
-    }
-    if (count_ != 0L) {
-      output.writeInt64(2, count_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (infoType_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getInfoType());
-    }
-    if (count_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(2, count_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.InfoTypeStatistics)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.InfoTypeStatistics other = (com.google.privacy.dlp.v2beta1.InfoTypeStatistics) obj;
-
-    boolean result = true;
-    result = result && (hasInfoType() == other.hasInfoType());
-    if (hasInfoType()) {
-      result = result && getInfoType()
-          .equals(other.getInfoType());
-    }
-    result = result && (getCount()
-        == other.getCount());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasInfoType()) {
-      hash = (37 * hash) + INFO_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getInfoType().hashCode();
-    }
-    hash = (37 * hash) + COUNT_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getCount());
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.InfoTypeStatistics prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Statistics regarding a specific InfoType.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.InfoTypeStatistics}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.InfoTypeStatistics)
-      com.google.privacy.dlp.v2beta1.InfoTypeStatisticsOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeStatistics_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeStatistics_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.InfoTypeStatistics.class, com.google.privacy.dlp.v2beta1.InfoTypeStatistics.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.InfoTypeStatistics.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (infoTypeBuilder_ == null) {
-        infoType_ = null;
-      } else {
-        infoType_ = null;
-        infoTypeBuilder_ = null;
-      }
-      count_ = 0L;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeStatistics_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoTypeStatistics getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.InfoTypeStatistics.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoTypeStatistics build() {
-      com.google.privacy.dlp.v2beta1.InfoTypeStatistics result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoTypeStatistics buildPartial() {
-      com.google.privacy.dlp.v2beta1.InfoTypeStatistics result = new com.google.privacy.dlp.v2beta1.InfoTypeStatistics(this);
-      if (infoTypeBuilder_ == null) {
-        result.infoType_ = infoType_;
-      } else {
-        result.infoType_ = infoTypeBuilder_.build();
-      }
-      result.count_ = count_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.InfoTypeStatistics) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.InfoTypeStatistics)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.InfoTypeStatistics other) {
-      if (other == com.google.privacy.dlp.v2beta1.InfoTypeStatistics.getDefaultInstance()) return this;
-      if (other.hasInfoType()) {
-        mergeInfoType(other.getInfoType());
-      }
-      if (other.getCount() != 0L) {
-        setCount(other.getCount());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.InfoTypeStatistics parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.InfoTypeStatistics) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.InfoType infoType_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> infoTypeBuilder_;
-    /**
-     * 
-     * The type of finding this stat is for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public boolean hasInfoType() {
-      return infoTypeBuilder_ != null || infoType_ != null;
-    }
-    /**
-     * 
-     * The type of finding this stat is for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-      if (infoTypeBuilder_ == null) {
-        return infoType_ == null ? com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-      } else {
-        return infoTypeBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The type of finding this stat is for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public Builder setInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-      if (infoTypeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        infoType_ = value;
-        onChanged();
-      } else {
-        infoTypeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The type of finding this stat is for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public Builder setInfoType(
-        com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-      if (infoTypeBuilder_ == null) {
-        infoType_ = builderForValue.build();
-        onChanged();
-      } else {
-        infoTypeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The type of finding this stat is for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public Builder mergeInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-      if (infoTypeBuilder_ == null) {
-        if (infoType_ != null) {
-          infoType_ =
-            com.google.privacy.dlp.v2beta1.InfoType.newBuilder(infoType_).mergeFrom(value).buildPartial();
-        } else {
-          infoType_ = value;
-        }
-        onChanged();
-      } else {
-        infoTypeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The type of finding this stat is for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public Builder clearInfoType() {
-      if (infoTypeBuilder_ == null) {
-        infoType_ = null;
-        onChanged();
-      } else {
-        infoType_ = null;
-        infoTypeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The type of finding this stat is for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType.Builder getInfoTypeBuilder() {
-      
-      onChanged();
-      return getInfoTypeFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The type of finding this stat is for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-      if (infoTypeBuilder_ != null) {
-        return infoTypeBuilder_.getMessageOrBuilder();
-      } else {
-        return infoType_ == null ?
-            com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-      }
-    }
-    /**
-     * 
-     * The type of finding this stat is for.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> 
-        getInfoTypeFieldBuilder() {
-      if (infoTypeBuilder_ == null) {
-        infoTypeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder>(
-                getInfoType(),
-                getParentForChildren(),
-                isClean());
-        infoType_ = null;
-      }
-      return infoTypeBuilder_;
-    }
-
-    private long count_ ;
-    /**
-     * 
-     * Number of findings for this info type.
-     * 

-     *
-     * int64 count = 2;
-     */
-    public long getCount() {
-      return count_;
-    }
-    /**
-     * 
-     * Number of findings for this info type.
-     * 

-     *
-     * int64 count = 2;
-     */
-    public Builder setCount(long value) {
-      
-      count_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Number of findings for this info type.
-     * 

-     *
-     * int64 count = 2;
-     */
-    public Builder clearCount() {
-      
-      count_ = 0L;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.InfoTypeStatistics)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.InfoTypeStatistics)
-  private static final com.google.privacy.dlp.v2beta1.InfoTypeStatistics DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.InfoTypeStatistics();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InfoTypeStatistics getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public InfoTypeStatistics parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InfoTypeStatistics(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.InfoTypeStatistics getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeStatisticsOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeStatisticsOrBuilder.java
deleted file mode 100644
index 5d36b01cd30c..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeStatisticsOrBuilder.java
+++ /dev/null
@@ -1,43 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface InfoTypeStatisticsOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.InfoTypeStatistics)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The type of finding this stat is for.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  boolean hasInfoType();
-  /**
-   * 
-   * The type of finding this stat is for.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoType getInfoType();
-  /**
-   * 
-   * The type of finding this stat is for.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder();
-
-  /**
-   * 
-   * Number of findings for this info type.
-   * 

-   *
-   * int64 count = 2;
-   */
-  long getCount();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeTransformations.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeTransformations.java
deleted file mode 100644
index 33df8f7dac65..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeTransformations.java
+++ /dev/null
@@ -1,2027 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * A type of transformation that will scan unstructured text and
- * apply various `PrimitiveTransformation`s to each finding, where the
- * transformation is applied to only values that were identified as a specific
- * info_type.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.InfoTypeTransformations}
- */
-public  final class InfoTypeTransformations extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.InfoTypeTransformations)
-    InfoTypeTransformationsOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use InfoTypeTransformations.newBuilder() to construct.
-  private InfoTypeTransformations(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private InfoTypeTransformations() {
-    transformations_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private InfoTypeTransformations(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              transformations_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            transformations_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        transformations_ = java.util.Collections.unmodifiableList(transformations_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.InfoTypeTransformations.class, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder.class);
-  }
-
-  public interface InfoTypeTransformationOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Info types to apply the transformation to. Empty list will match all
-     * available info types for this transformation.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    java.util.List 
-        getInfoTypesList();
-    /**
-     * 
-     * Info types to apply the transformation to. Empty list will match all
-     * available info types for this transformation.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    com.google.privacy.dlp.v2beta1.InfoType getInfoTypes(int index);
-    /**
-     * 
-     * Info types to apply the transformation to. Empty list will match all
-     * available info types for this transformation.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    int getInfoTypesCount();
-    /**
-     * 
-     * Info types to apply the transformation to. Empty list will match all
-     * available info types for this transformation.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    java.util.List 
-        getInfoTypesOrBuilderList();
-    /**
-     * 
-     * Info types to apply the transformation to. Empty list will match all
-     * available info types for this transformation.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypesOrBuilder(
-        int index);
-
-    /**
-     * 
-     * Primitive transformation to apply to the info type. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-     */
-    boolean hasPrimitiveTransformation();
-    /**
-     * 
-     * Primitive transformation to apply to the info type. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-     */
-    com.google.privacy.dlp.v2beta1.PrimitiveTransformation getPrimitiveTransformation();
-    /**
-     * 
-     * Primitive transformation to apply to the info type. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-     */
-    com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder getPrimitiveTransformationOrBuilder();
-  }
-  /**
-   * 
-   * A transformation to apply to text that is identified as a specific
-   * info_type.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation}
-   */
-  public  static final class InfoTypeTransformation extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation)
-      InfoTypeTransformationOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use InfoTypeTransformation.newBuilder() to construct.
-    private InfoTypeTransformation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private InfoTypeTransformation() {
-      infoTypes_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private InfoTypeTransformation(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                infoTypes_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              infoTypes_.add(
-                  input.readMessage(com.google.privacy.dlp.v2beta1.InfoType.parser(), extensionRegistry));
-              break;
-            }
-            case 18: {
-              com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder subBuilder = null;
-              if (primitiveTransformation_ != null) {
-                subBuilder = primitiveTransformation_.toBuilder();
-              }
-              primitiveTransformation_ = input.readMessage(com.google.privacy.dlp.v2beta1.PrimitiveTransformation.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(primitiveTransformation_);
-                primitiveTransformation_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-          infoTypes_ = java.util.Collections.unmodifiableList(infoTypes_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_InfoTypeTransformation_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_InfoTypeTransformation_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.class, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.Builder.class);
-    }
-
-    private int bitField0_;
-    public static final int INFO_TYPES_FIELD_NUMBER = 1;
-    private java.util.List infoTypes_;
-    /**
-     * 
-     * Info types to apply the transformation to. Empty list will match all
-     * available info types for this transformation.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public java.util.List getInfoTypesList() {
-      return infoTypes_;
-    }
-    /**
-     * 
-     * Info types to apply the transformation to. Empty list will match all
-     * available info types for this transformation.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public java.util.List 
-        getInfoTypesOrBuilderList() {
-      return infoTypes_;
-    }
-    /**
-     * 
-     * Info types to apply the transformation to. Empty list will match all
-     * available info types for this transformation.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public int getInfoTypesCount() {
-      return infoTypes_.size();
-    }
-    /**
-     * 
-     * Info types to apply the transformation to. Empty list will match all
-     * available info types for this transformation.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType getInfoTypes(int index) {
-      return infoTypes_.get(index);
-    }
-    /**
-     * 
-     * Info types to apply the transformation to. Empty list will match all
-     * available info types for this transformation.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypesOrBuilder(
-        int index) {
-      return infoTypes_.get(index);
-    }
-
-    public static final int PRIMITIVE_TRANSFORMATION_FIELD_NUMBER = 2;
-    private com.google.privacy.dlp.v2beta1.PrimitiveTransformation primitiveTransformation_;
-    /**
-     * 
-     * Primitive transformation to apply to the info type. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-     */
-    public boolean hasPrimitiveTransformation() {
-      return primitiveTransformation_ != null;
-    }
-    /**
-     * 
-     * Primitive transformation to apply to the info type. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.PrimitiveTransformation getPrimitiveTransformation() {
-      return primitiveTransformation_ == null ? com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance() : primitiveTransformation_;
-    }
-    /**
-     * 
-     * Primitive transformation to apply to the info type. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder getPrimitiveTransformationOrBuilder() {
-      return getPrimitiveTransformation();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      for (int i = 0; i < infoTypes_.size(); i++) {
-        output.writeMessage(1, infoTypes_.get(i));
-      }
-      if (primitiveTransformation_ != null) {
-        output.writeMessage(2, getPrimitiveTransformation());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < infoTypes_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, infoTypes_.get(i));
-      }
-      if (primitiveTransformation_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getPrimitiveTransformation());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation other = (com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation) obj;
-
-      boolean result = true;
-      result = result && getInfoTypesList()
-          .equals(other.getInfoTypesList());
-      result = result && (hasPrimitiveTransformation() == other.hasPrimitiveTransformation());
-      if (hasPrimitiveTransformation()) {
-        result = result && getPrimitiveTransformation()
-            .equals(other.getPrimitiveTransformation());
-      }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getInfoTypesCount() > 0) {
-        hash = (37 * hash) + INFO_TYPES_FIELD_NUMBER;
-        hash = (53 * hash) + getInfoTypesList().hashCode();
-      }
-      if (hasPrimitiveTransformation()) {
-        hash = (37 * hash) + PRIMITIVE_TRANSFORMATION_FIELD_NUMBER;
-        hash = (53 * hash) + getPrimitiveTransformation().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * A transformation to apply to text that is identified as a specific
-     * info_type.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation)
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformationOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_InfoTypeTransformation_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_InfoTypeTransformation_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.class, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getInfoTypesFieldBuilder();
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (infoTypesBuilder_ == null) {
-          infoTypes_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          infoTypesBuilder_.clear();
-        }
-        if (primitiveTransformationBuilder_ == null) {
-          primitiveTransformation_ = null;
-        } else {
-          primitiveTransformation_ = null;
-          primitiveTransformationBuilder_ = null;
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_InfoTypeTransformation_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation build() {
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation buildPartial() {
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation result = new com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (infoTypesBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001)) {
-            infoTypes_ = java.util.Collections.unmodifiableList(infoTypes_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.infoTypes_ = infoTypes_;
-        } else {
-          result.infoTypes_ = infoTypesBuilder_.build();
-        }
-        if (primitiveTransformationBuilder_ == null) {
-          result.primitiveTransformation_ = primitiveTransformation_;
-        } else {
-          result.primitiveTransformation_ = primitiveTransformationBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation other) {
-        if (other == com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.getDefaultInstance()) return this;
-        if (infoTypesBuilder_ == null) {
-          if (!other.infoTypes_.isEmpty()) {
-            if (infoTypes_.isEmpty()) {
-              infoTypes_ = other.infoTypes_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureInfoTypesIsMutable();
-              infoTypes_.addAll(other.infoTypes_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.infoTypes_.isEmpty()) {
-            if (infoTypesBuilder_.isEmpty()) {
-              infoTypesBuilder_.dispose();
-              infoTypesBuilder_ = null;
-              infoTypes_ = other.infoTypes_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              infoTypesBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getInfoTypesFieldBuilder() : null;
-            } else {
-              infoTypesBuilder_.addAllMessages(other.infoTypes_);
-            }
-          }
-        }
-        if (other.hasPrimitiveTransformation()) {
-          mergePrimitiveTransformation(other.getPrimitiveTransformation());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List infoTypes_ =
-        java.util.Collections.emptyList();
-      private void ensureInfoTypesIsMutable() {
-        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          infoTypes_ = new java.util.ArrayList(infoTypes_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> infoTypesBuilder_;
-
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public java.util.List getInfoTypesList() {
-        if (infoTypesBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(infoTypes_);
-        } else {
-          return infoTypesBuilder_.getMessageList();
-        }
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public int getInfoTypesCount() {
-        if (infoTypesBuilder_ == null) {
-          return infoTypes_.size();
-        } else {
-          return infoTypesBuilder_.getCount();
-        }
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoType getInfoTypes(int index) {
-        if (infoTypesBuilder_ == null) {
-          return infoTypes_.get(index);
-        } else {
-          return infoTypesBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public Builder setInfoTypes(
-          int index, com.google.privacy.dlp.v2beta1.InfoType value) {
-        if (infoTypesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureInfoTypesIsMutable();
-          infoTypes_.set(index, value);
-          onChanged();
-        } else {
-          infoTypesBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public Builder setInfoTypes(
-          int index, com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-        if (infoTypesBuilder_ == null) {
-          ensureInfoTypesIsMutable();
-          infoTypes_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          infoTypesBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public Builder addInfoTypes(com.google.privacy.dlp.v2beta1.InfoType value) {
-        if (infoTypesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureInfoTypesIsMutable();
-          infoTypes_.add(value);
-          onChanged();
-        } else {
-          infoTypesBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public Builder addInfoTypes(
-          int index, com.google.privacy.dlp.v2beta1.InfoType value) {
-        if (infoTypesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureInfoTypesIsMutable();
-          infoTypes_.add(index, value);
-          onChanged();
-        } else {
-          infoTypesBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public Builder addInfoTypes(
-          com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-        if (infoTypesBuilder_ == null) {
-          ensureInfoTypesIsMutable();
-          infoTypes_.add(builderForValue.build());
-          onChanged();
-        } else {
-          infoTypesBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public Builder addInfoTypes(
-          int index, com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-        if (infoTypesBuilder_ == null) {
-          ensureInfoTypesIsMutable();
-          infoTypes_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          infoTypesBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public Builder addAllInfoTypes(
-          java.lang.Iterable values) {
-        if (infoTypesBuilder_ == null) {
-          ensureInfoTypesIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, infoTypes_);
-          onChanged();
-        } else {
-          infoTypesBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public Builder clearInfoTypes() {
-        if (infoTypesBuilder_ == null) {
-          infoTypes_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          infoTypesBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public Builder removeInfoTypes(int index) {
-        if (infoTypesBuilder_ == null) {
-          ensureInfoTypesIsMutable();
-          infoTypes_.remove(index);
-          onChanged();
-        } else {
-          infoTypesBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoType.Builder getInfoTypesBuilder(
-          int index) {
-        return getInfoTypesFieldBuilder().getBuilder(index);
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypesOrBuilder(
-          int index) {
-        if (infoTypesBuilder_ == null) {
-          return infoTypes_.get(index);  } else {
-          return infoTypesBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public java.util.List 
-           getInfoTypesOrBuilderList() {
-        if (infoTypesBuilder_ != null) {
-          return infoTypesBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(infoTypes_);
-        }
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoType.Builder addInfoTypesBuilder() {
-        return getInfoTypesFieldBuilder().addBuilder(
-            com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance());
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoType.Builder addInfoTypesBuilder(
-          int index) {
-        return getInfoTypesFieldBuilder().addBuilder(
-            index, com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance());
-      }
-      /**
-       * 
-       * Info types to apply the transformation to. Empty list will match all
-       * available info types for this transformation.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-       */
-      public java.util.List 
-           getInfoTypesBuilderList() {
-        return getInfoTypesFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> 
-          getInfoTypesFieldBuilder() {
-        if (infoTypesBuilder_ == null) {
-          infoTypesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder>(
-                  infoTypes_,
-                  ((bitField0_ & 0x00000001) == 0x00000001),
-                  getParentForChildren(),
-                  isClean());
-          infoTypes_ = null;
-        }
-        return infoTypesBuilder_;
-      }
-
-      private com.google.privacy.dlp.v2beta1.PrimitiveTransformation primitiveTransformation_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.PrimitiveTransformation, com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder, com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder> primitiveTransformationBuilder_;
-      /**
-       * 
-       * Primitive transformation to apply to the info type. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-       */
-      public boolean hasPrimitiveTransformation() {
-        return primitiveTransformationBuilder_ != null || primitiveTransformation_ != null;
-      }
-      /**
-       * 
-       * Primitive transformation to apply to the info type. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.PrimitiveTransformation getPrimitiveTransformation() {
-        if (primitiveTransformationBuilder_ == null) {
-          return primitiveTransformation_ == null ? com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance() : primitiveTransformation_;
-        } else {
-          return primitiveTransformationBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Primitive transformation to apply to the info type. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-       */
-      public Builder setPrimitiveTransformation(com.google.privacy.dlp.v2beta1.PrimitiveTransformation value) {
-        if (primitiveTransformationBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          primitiveTransformation_ = value;
-          onChanged();
-        } else {
-          primitiveTransformationBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Primitive transformation to apply to the info type. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-       */
-      public Builder setPrimitiveTransformation(
-          com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder builderForValue) {
-        if (primitiveTransformationBuilder_ == null) {
-          primitiveTransformation_ = builderForValue.build();
-          onChanged();
-        } else {
-          primitiveTransformationBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Primitive transformation to apply to the info type. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-       */
-      public Builder mergePrimitiveTransformation(com.google.privacy.dlp.v2beta1.PrimitiveTransformation value) {
-        if (primitiveTransformationBuilder_ == null) {
-          if (primitiveTransformation_ != null) {
-            primitiveTransformation_ =
-              com.google.privacy.dlp.v2beta1.PrimitiveTransformation.newBuilder(primitiveTransformation_).mergeFrom(value).buildPartial();
-          } else {
-            primitiveTransformation_ = value;
-          }
-          onChanged();
-        } else {
-          primitiveTransformationBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Primitive transformation to apply to the info type. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-       */
-      public Builder clearPrimitiveTransformation() {
-        if (primitiveTransformationBuilder_ == null) {
-          primitiveTransformation_ = null;
-          onChanged();
-        } else {
-          primitiveTransformation_ = null;
-          primitiveTransformationBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Primitive transformation to apply to the info type. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder getPrimitiveTransformationBuilder() {
-        
-        onChanged();
-        return getPrimitiveTransformationFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Primitive transformation to apply to the info type. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder getPrimitiveTransformationOrBuilder() {
-        if (primitiveTransformationBuilder_ != null) {
-          return primitiveTransformationBuilder_.getMessageOrBuilder();
-        } else {
-          return primitiveTransformation_ == null ?
-              com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance() : primitiveTransformation_;
-        }
-      }
-      /**
-       * 
-       * Primitive transformation to apply to the info type. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.PrimitiveTransformation primitive_transformation = 2;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.PrimitiveTransformation, com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder, com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder> 
-          getPrimitiveTransformationFieldBuilder() {
-        if (primitiveTransformationBuilder_ == null) {
-          primitiveTransformationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.PrimitiveTransformation, com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder, com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder>(
-                  getPrimitiveTransformation(),
-                  getParentForChildren(),
-                  isClean());
-          primitiveTransformation_ = null;
-        }
-        return primitiveTransformationBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation)
-    private static final com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public InfoTypeTransformation parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new InfoTypeTransformation(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public static final int TRANSFORMATIONS_FIELD_NUMBER = 1;
-  private java.util.List transformations_;
-  /**
-   * 
-   * Transformation for each info type. Cannot specify more than one
-   * for a given info type. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-   */
-  public java.util.List getTransformationsList() {
-    return transformations_;
-  }
-  /**
-   * 
-   * Transformation for each info type. Cannot specify more than one
-   * for a given info type. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-   */
-  public java.util.List 
-      getTransformationsOrBuilderList() {
-    return transformations_;
-  }
-  /**
-   * 
-   * Transformation for each info type. Cannot specify more than one
-   * for a given info type. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-   */
-  public int getTransformationsCount() {
-    return transformations_.size();
-  }
-  /**
-   * 
-   * Transformation for each info type. Cannot specify more than one
-   * for a given info type. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation getTransformations(int index) {
-    return transformations_.get(index);
-  }
-  /**
-   * 
-   * Transformation for each info type. Cannot specify more than one
-   * for a given info type. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformationOrBuilder getTransformationsOrBuilder(
-      int index) {
-    return transformations_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < transformations_.size(); i++) {
-      output.writeMessage(1, transformations_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < transformations_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, transformations_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.InfoTypeTransformations)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.InfoTypeTransformations other = (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) obj;
-
-    boolean result = true;
-    result = result && getTransformationsList()
-        .equals(other.getTransformationsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getTransformationsCount() > 0) {
-      hash = (37 * hash) + TRANSFORMATIONS_FIELD_NUMBER;
-      hash = (53 * hash) + getTransformationsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.InfoTypeTransformations prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * A type of transformation that will scan unstructured text and
-   * apply various `PrimitiveTransformation`s to each finding, where the
-   * transformation is applied to only values that were identified as a specific
-   * info_type.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.InfoTypeTransformations}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.InfoTypeTransformations)
-      com.google.privacy.dlp.v2beta1.InfoTypeTransformationsOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.InfoTypeTransformations.class, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.InfoTypeTransformations.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getTransformationsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (transformationsBuilder_ == null) {
-        transformations_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        transformationsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InfoTypeTransformations_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations build() {
-      com.google.privacy.dlp.v2beta1.InfoTypeTransformations result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations buildPartial() {
-      com.google.privacy.dlp.v2beta1.InfoTypeTransformations result = new com.google.privacy.dlp.v2beta1.InfoTypeTransformations(this);
-      int from_bitField0_ = bitField0_;
-      if (transformationsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          transformations_ = java.util.Collections.unmodifiableList(transformations_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.transformations_ = transformations_;
-      } else {
-        result.transformations_ = transformationsBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.InfoTypeTransformations) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.InfoTypeTransformations)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.InfoTypeTransformations other) {
-      if (other == com.google.privacy.dlp.v2beta1.InfoTypeTransformations.getDefaultInstance()) return this;
-      if (transformationsBuilder_ == null) {
-        if (!other.transformations_.isEmpty()) {
-          if (transformations_.isEmpty()) {
-            transformations_ = other.transformations_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureTransformationsIsMutable();
-            transformations_.addAll(other.transformations_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.transformations_.isEmpty()) {
-          if (transformationsBuilder_.isEmpty()) {
-            transformationsBuilder_.dispose();
-            transformationsBuilder_ = null;
-            transformations_ = other.transformations_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            transformationsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getTransformationsFieldBuilder() : null;
-          } else {
-            transformationsBuilder_.addAllMessages(other.transformations_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.InfoTypeTransformations parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.InfoTypeTransformations) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List transformations_ =
-      java.util.Collections.emptyList();
-    private void ensureTransformationsIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        transformations_ = new java.util.ArrayList(transformations_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.Builder, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformationOrBuilder> transformationsBuilder_;
-
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public java.util.List getTransformationsList() {
-      if (transformationsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(transformations_);
-      } else {
-        return transformationsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public int getTransformationsCount() {
-      if (transformationsBuilder_ == null) {
-        return transformations_.size();
-      } else {
-        return transformationsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation getTransformations(int index) {
-      if (transformationsBuilder_ == null) {
-        return transformations_.get(index);
-      } else {
-        return transformationsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public Builder setTransformations(
-        int index, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation value) {
-      if (transformationsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureTransformationsIsMutable();
-        transformations_.set(index, value);
-        onChanged();
-      } else {
-        transformationsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public Builder setTransformations(
-        int index, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.Builder builderForValue) {
-      if (transformationsBuilder_ == null) {
-        ensureTransformationsIsMutable();
-        transformations_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        transformationsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public Builder addTransformations(com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation value) {
-      if (transformationsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureTransformationsIsMutable();
-        transformations_.add(value);
-        onChanged();
-      } else {
-        transformationsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public Builder addTransformations(
-        int index, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation value) {
-      if (transformationsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureTransformationsIsMutable();
-        transformations_.add(index, value);
-        onChanged();
-      } else {
-        transformationsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public Builder addTransformations(
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.Builder builderForValue) {
-      if (transformationsBuilder_ == null) {
-        ensureTransformationsIsMutable();
-        transformations_.add(builderForValue.build());
-        onChanged();
-      } else {
-        transformationsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public Builder addTransformations(
-        int index, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.Builder builderForValue) {
-      if (transformationsBuilder_ == null) {
-        ensureTransformationsIsMutable();
-        transformations_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        transformationsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public Builder addAllTransformations(
-        java.lang.Iterable values) {
-      if (transformationsBuilder_ == null) {
-        ensureTransformationsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, transformations_);
-        onChanged();
-      } else {
-        transformationsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public Builder clearTransformations() {
-      if (transformationsBuilder_ == null) {
-        transformations_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        transformationsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public Builder removeTransformations(int index) {
-      if (transformationsBuilder_ == null) {
-        ensureTransformationsIsMutable();
-        transformations_.remove(index);
-        onChanged();
-      } else {
-        transformationsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.Builder getTransformationsBuilder(
-        int index) {
-      return getTransformationsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformationOrBuilder getTransformationsOrBuilder(
-        int index) {
-      if (transformationsBuilder_ == null) {
-        return transformations_.get(index);  } else {
-        return transformationsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public java.util.List 
-         getTransformationsOrBuilderList() {
-      if (transformationsBuilder_ != null) {
-        return transformationsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(transformations_);
-      }
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.Builder addTransformationsBuilder() {
-      return getTransformationsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.getDefaultInstance());
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.Builder addTransformationsBuilder(
-        int index) {
-      return getTransformationsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.getDefaultInstance());
-    }
-    /**
-     * 
-     * Transformation for each info type. Cannot specify more than one
-     * for a given info type. [required]
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-     */
-    public java.util.List 
-         getTransformationsBuilderList() {
-      return getTransformationsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.Builder, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformationOrBuilder> 
-        getTransformationsFieldBuilder() {
-      if (transformationsBuilder_ == null) {
-        transformationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation.Builder, com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformationOrBuilder>(
-                transformations_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        transformations_ = null;
-      }
-      return transformationsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.InfoTypeTransformations)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.InfoTypeTransformations)
-  private static final com.google.privacy.dlp.v2beta1.InfoTypeTransformations DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.InfoTypeTransformations();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InfoTypeTransformations getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public InfoTypeTransformations parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InfoTypeTransformations(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.InfoTypeTransformations getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeTransformationsOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeTransformationsOrBuilder.java
deleted file mode 100644
index 1873de436605..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InfoTypeTransformationsOrBuilder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface InfoTypeTransformationsOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.InfoTypeTransformations)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Transformation for each info type. Cannot specify more than one
-   * for a given info type. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-   */
-  java.util.List 
-      getTransformationsList();
-  /**
-   * 
-   * Transformation for each info type. Cannot specify more than one
-   * for a given info type. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation getTransformations(int index);
-  /**
-   * 
-   * Transformation for each info type. Cannot specify more than one
-   * for a given info type. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-   */
-  int getTransformationsCount();
-  /**
-   * 
-   * Transformation for each info type. Cannot specify more than one
-   * for a given info type. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-   */
-  java.util.List 
-      getTransformationsOrBuilderList();
-  /**
-   * 
-   * Transformation for each info type. Cannot specify more than one
-   * for a given info type. [required]
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformation transformations = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeTransformations.InfoTypeTransformationOrBuilder getTransformationsOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectConfig.java
deleted file mode 100644
index b4d362aeec4b..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectConfig.java
+++ /dev/null
@@ -1,2876 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Configuration description of the scanning process.
- * When used with redactContent only info_types and min_likelihood are currently
- * used.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.InspectConfig}
- */
-public  final class InspectConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.InspectConfig)
-    InspectConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use InspectConfig.newBuilder() to construct.
-  private InspectConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private InspectConfig() {
-    infoTypes_ = java.util.Collections.emptyList();
-    minLikelihood_ = 0;
-    maxFindings_ = 0;
-    includeQuote_ = false;
-    excludeTypes_ = false;
-    infoTypeLimits_ = java.util.Collections.emptyList();
-    customInfoTypes_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private InspectConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              infoTypes_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            infoTypes_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.InfoType.parser(), extensionRegistry));
-            break;
-          }
-          case 16: {
-            int rawValue = input.readEnum();
-
-            minLikelihood_ = rawValue;
-            break;
-          }
-          case 24: {
-
-            maxFindings_ = input.readInt32();
-            break;
-          }
-          case 32: {
-
-            includeQuote_ = input.readBool();
-            break;
-          }
-          case 48: {
-
-            excludeTypes_ = input.readBool();
-            break;
-          }
-          case 58: {
-            if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-              infoTypeLimits_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000020;
-            }
-            infoTypeLimits_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.parser(), extensionRegistry));
-            break;
-          }
-          case 66: {
-            if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
-              customInfoTypes_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000040;
-            }
-            customInfoTypes_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.CustomInfoType.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        infoTypes_ = java.util.Collections.unmodifiableList(infoTypes_);
-      }
-      if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-        infoTypeLimits_ = java.util.Collections.unmodifiableList(infoTypeLimits_);
-      }
-      if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
-        customInfoTypes_ = java.util.Collections.unmodifiableList(customInfoTypes_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.InspectConfig.class, com.google.privacy.dlp.v2beta1.InspectConfig.Builder.class);
-  }
-
-  public interface InfoTypeLimitOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Type of information the findings limit applies to. Only one limit per
-     * info_type should be provided. If InfoTypeLimit does not have an
-     * info_type, the DLP API applies the limit against all info_types that are
-     * found but not specified in another InfoTypeLimit.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    boolean hasInfoType();
-    /**
-     * 
-     * Type of information the findings limit applies to. Only one limit per
-     * info_type should be provided. If InfoTypeLimit does not have an
-     * info_type, the DLP API applies the limit against all info_types that are
-     * found but not specified in another InfoTypeLimit.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    com.google.privacy.dlp.v2beta1.InfoType getInfoType();
-    /**
-     * 
-     * Type of information the findings limit applies to. Only one limit per
-     * info_type should be provided. If InfoTypeLimit does not have an
-     * info_type, the DLP API applies the limit against all info_types that are
-     * found but not specified in another InfoTypeLimit.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder();
-
-    /**
-     * 
-     * Max findings limit for the given infoType.
-     * 

-     *
-     * int32 max_findings = 2;
-     */
-    int getMaxFindings();
-  }
-  /**
-   * 
-   * Max findings configuration per info type, per content item or long running
-   * operation.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit}
-   */
-  public  static final class InfoTypeLimit extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit)
-      InfoTypeLimitOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use InfoTypeLimit.newBuilder() to construct.
-    private InfoTypeLimit(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private InfoTypeLimit() {
-      maxFindings_ = 0;
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private InfoTypeLimit(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              com.google.privacy.dlp.v2beta1.InfoType.Builder subBuilder = null;
-              if (infoType_ != null) {
-                subBuilder = infoType_.toBuilder();
-              }
-              infoType_ = input.readMessage(com.google.privacy.dlp.v2beta1.InfoType.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(infoType_);
-                infoType_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 16: {
-
-              maxFindings_ = input.readInt32();
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectConfig_InfoTypeLimit_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectConfig_InfoTypeLimit_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.class, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.Builder.class);
-    }
-
-    public static final int INFO_TYPE_FIELD_NUMBER = 1;
-    private com.google.privacy.dlp.v2beta1.InfoType infoType_;
-    /**
-     * 
-     * Type of information the findings limit applies to. Only one limit per
-     * info_type should be provided. If InfoTypeLimit does not have an
-     * info_type, the DLP API applies the limit against all info_types that are
-     * found but not specified in another InfoTypeLimit.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public boolean hasInfoType() {
-      return infoType_ != null;
-    }
-    /**
-     * 
-     * Type of information the findings limit applies to. Only one limit per
-     * info_type should be provided. If InfoTypeLimit does not have an
-     * info_type, the DLP API applies the limit against all info_types that are
-     * found but not specified in another InfoTypeLimit.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-      return infoType_ == null ? com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-    }
-    /**
-     * 
-     * Type of information the findings limit applies to. Only one limit per
-     * info_type should be provided. If InfoTypeLimit does not have an
-     * info_type, the DLP API applies the limit against all info_types that are
-     * found but not specified in another InfoTypeLimit.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-      return getInfoType();
-    }
-
-    public static final int MAX_FINDINGS_FIELD_NUMBER = 2;
-    private int maxFindings_;
-    /**
-     * 
-     * Max findings limit for the given infoType.
-     * 

-     *
-     * int32 max_findings = 2;
-     */
-    public int getMaxFindings() {
-      return maxFindings_;
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (infoType_ != null) {
-        output.writeMessage(1, getInfoType());
-      }
-      if (maxFindings_ != 0) {
-        output.writeInt32(2, maxFindings_);
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (infoType_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getInfoType());
-      }
-      if (maxFindings_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, maxFindings_);
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit other = (com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit) obj;
-
-      boolean result = true;
-      result = result && (hasInfoType() == other.hasInfoType());
-      if (hasInfoType()) {
-        result = result && getInfoType()
-            .equals(other.getInfoType());
-      }
-      result = result && (getMaxFindings()
-          == other.getMaxFindings());
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasInfoType()) {
-        hash = (37 * hash) + INFO_TYPE_FIELD_NUMBER;
-        hash = (53 * hash) + getInfoType().hashCode();
-      }
-      hash = (37 * hash) + MAX_FINDINGS_FIELD_NUMBER;
-      hash = (53 * hash) + getMaxFindings();
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Max findings configuration per info type, per content item or long running
-     * operation.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit)
-        com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimitOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectConfig_InfoTypeLimit_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectConfig_InfoTypeLimit_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.class, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (infoTypeBuilder_ == null) {
-          infoType_ = null;
-        } else {
-          infoType_ = null;
-          infoTypeBuilder_ = null;
-        }
-        maxFindings_ = 0;
-
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectConfig_InfoTypeLimit_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit build() {
-        com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit buildPartial() {
-        com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit result = new com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit(this);
-        if (infoTypeBuilder_ == null) {
-          result.infoType_ = infoType_;
-        } else {
-          result.infoType_ = infoTypeBuilder_.build();
-        }
-        result.maxFindings_ = maxFindings_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit other) {
-        if (other == com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.getDefaultInstance()) return this;
-        if (other.hasInfoType()) {
-          mergeInfoType(other.getInfoType());
-        }
-        if (other.getMaxFindings() != 0) {
-          setMaxFindings(other.getMaxFindings());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private com.google.privacy.dlp.v2beta1.InfoType infoType_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> infoTypeBuilder_;
-      /**
-       * 
-       * Type of information the findings limit applies to. Only one limit per
-       * info_type should be provided. If InfoTypeLimit does not have an
-       * info_type, the DLP API applies the limit against all info_types that are
-       * found but not specified in another InfoTypeLimit.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public boolean hasInfoType() {
-        return infoTypeBuilder_ != null || infoType_ != null;
-      }
-      /**
-       * 
-       * Type of information the findings limit applies to. Only one limit per
-       * info_type should be provided. If InfoTypeLimit does not have an
-       * info_type, the DLP API applies the limit against all info_types that are
-       * found but not specified in another InfoTypeLimit.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-        if (infoTypeBuilder_ == null) {
-          return infoType_ == null ? com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-        } else {
-          return infoTypeBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Type of information the findings limit applies to. Only one limit per
-       * info_type should be provided. If InfoTypeLimit does not have an
-       * info_type, the DLP API applies the limit against all info_types that are
-       * found but not specified in another InfoTypeLimit.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public Builder setInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-        if (infoTypeBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          infoType_ = value;
-          onChanged();
-        } else {
-          infoTypeBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Type of information the findings limit applies to. Only one limit per
-       * info_type should be provided. If InfoTypeLimit does not have an
-       * info_type, the DLP API applies the limit against all info_types that are
-       * found but not specified in another InfoTypeLimit.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public Builder setInfoType(
-          com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-        if (infoTypeBuilder_ == null) {
-          infoType_ = builderForValue.build();
-          onChanged();
-        } else {
-          infoTypeBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Type of information the findings limit applies to. Only one limit per
-       * info_type should be provided. If InfoTypeLimit does not have an
-       * info_type, the DLP API applies the limit against all info_types that are
-       * found but not specified in another InfoTypeLimit.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public Builder mergeInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-        if (infoTypeBuilder_ == null) {
-          if (infoType_ != null) {
-            infoType_ =
-              com.google.privacy.dlp.v2beta1.InfoType.newBuilder(infoType_).mergeFrom(value).buildPartial();
-          } else {
-            infoType_ = value;
-          }
-          onChanged();
-        } else {
-          infoTypeBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Type of information the findings limit applies to. Only one limit per
-       * info_type should be provided. If InfoTypeLimit does not have an
-       * info_type, the DLP API applies the limit against all info_types that are
-       * found but not specified in another InfoTypeLimit.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public Builder clearInfoType() {
-        if (infoTypeBuilder_ == null) {
-          infoType_ = null;
-          onChanged();
-        } else {
-          infoType_ = null;
-          infoTypeBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Type of information the findings limit applies to. Only one limit per
-       * info_type should be provided. If InfoTypeLimit does not have an
-       * info_type, the DLP API applies the limit against all info_types that are
-       * found but not specified in another InfoTypeLimit.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoType.Builder getInfoTypeBuilder() {
-        
-        onChanged();
-        return getInfoTypeFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Type of information the findings limit applies to. Only one limit per
-       * info_type should be provided. If InfoTypeLimit does not have an
-       * info_type, the DLP API applies the limit against all info_types that are
-       * found but not specified in another InfoTypeLimit.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-        if (infoTypeBuilder_ != null) {
-          return infoTypeBuilder_.getMessageOrBuilder();
-        } else {
-          return infoType_ == null ?
-              com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-        }
-      }
-      /**
-       * 
-       * Type of information the findings limit applies to. Only one limit per
-       * info_type should be provided. If InfoTypeLimit does not have an
-       * info_type, the DLP API applies the limit against all info_types that are
-       * found but not specified in another InfoTypeLimit.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> 
-          getInfoTypeFieldBuilder() {
-        if (infoTypeBuilder_ == null) {
-          infoTypeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder>(
-                  getInfoType(),
-                  getParentForChildren(),
-                  isClean());
-          infoType_ = null;
-        }
-        return infoTypeBuilder_;
-      }
-
-      private int maxFindings_ ;
-      /**
-       * 
-       * Max findings limit for the given infoType.
-       * 

-       *
-       * int32 max_findings = 2;
-       */
-      public int getMaxFindings() {
-        return maxFindings_;
-      }
-      /**
-       * 
-       * Max findings limit for the given infoType.
-       * 

-       *
-       * int32 max_findings = 2;
-       */
-      public Builder setMaxFindings(int value) {
-        
-        maxFindings_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * Max findings limit for the given infoType.
-       * 

-       *
-       * int32 max_findings = 2;
-       */
-      public Builder clearMaxFindings() {
-        
-        maxFindings_ = 0;
-        onChanged();
-        return this;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit)
-    private static final com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public InfoTypeLimit parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new InfoTypeLimit(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private int bitField0_;
-  public static final int INFO_TYPES_FIELD_NUMBER = 1;
-  private java.util.List infoTypes_;
-  /**
-   * 
-   * Restricts what info_types to look for. The values must correspond to
-   * InfoType values returned by ListInfoTypes or found in documentation.
-   * Empty info_types runs all enabled detectors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-   */
-  public java.util.List getInfoTypesList() {
-    return infoTypes_;
-  }
-  /**
-   * 
-   * Restricts what info_types to look for. The values must correspond to
-   * InfoType values returned by ListInfoTypes or found in documentation.
-   * Empty info_types runs all enabled detectors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-   */
-  public java.util.List 
-      getInfoTypesOrBuilderList() {
-    return infoTypes_;
-  }
-  /**
-   * 
-   * Restricts what info_types to look for. The values must correspond to
-   * InfoType values returned by ListInfoTypes or found in documentation.
-   * Empty info_types runs all enabled detectors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-   */
-  public int getInfoTypesCount() {
-    return infoTypes_.size();
-  }
-  /**
-   * 
-   * Restricts what info_types to look for. The values must correspond to
-   * InfoType values returned by ListInfoTypes or found in documentation.
-   * Empty info_types runs all enabled detectors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoType getInfoTypes(int index) {
-    return infoTypes_.get(index);
-  }
-  /**
-   * 
-   * Restricts what info_types to look for. The values must correspond to
-   * InfoType values returned by ListInfoTypes or found in documentation.
-   * Empty info_types runs all enabled detectors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypesOrBuilder(
-      int index) {
-    return infoTypes_.get(index);
-  }
-
-  public static final int MIN_LIKELIHOOD_FIELD_NUMBER = 2;
-  private int minLikelihood_;
-  /**
-   * 
-   * Only returns findings equal or above this threshold.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Likelihood min_likelihood = 2;
-   */
-  public int getMinLikelihoodValue() {
-    return minLikelihood_;
-  }
-  /**
-   * 
-   * Only returns findings equal or above this threshold.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Likelihood min_likelihood = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.Likelihood getMinLikelihood() {
-    com.google.privacy.dlp.v2beta1.Likelihood result = com.google.privacy.dlp.v2beta1.Likelihood.valueOf(minLikelihood_);
-    return result == null ? com.google.privacy.dlp.v2beta1.Likelihood.UNRECOGNIZED : result;
-  }
-
-  public static final int MAX_FINDINGS_FIELD_NUMBER = 3;
-  private int maxFindings_;
-  /**
-   * 
-   * Limits the number of findings per content item or long running operation.
-   * 

-   *
-   * int32 max_findings = 3;
-   */
-  public int getMaxFindings() {
-    return maxFindings_;
-  }
-
-  public static final int INCLUDE_QUOTE_FIELD_NUMBER = 4;
-  private boolean includeQuote_;
-  /**
-   * 
-   * When true, a contextual quote from the data that triggered a finding is
-   * included in the response; see Finding.quote.
-   * 

-   *
-   * bool include_quote = 4;
-   */
-  public boolean getIncludeQuote() {
-    return includeQuote_;
-  }
-
-  public static final int EXCLUDE_TYPES_FIELD_NUMBER = 6;
-  private boolean excludeTypes_;
-  /**
-   * 
-   * When true, excludes type information of the findings.
-   * 

-   *
-   * bool exclude_types = 6;
-   */
-  public boolean getExcludeTypes() {
-    return excludeTypes_;
-  }
-
-  public static final int INFO_TYPE_LIMITS_FIELD_NUMBER = 7;
-  private java.util.List infoTypeLimits_;
-  /**
-   * 
-   * Configuration of findings limit given for specified info types.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-   */
-  public java.util.List getInfoTypeLimitsList() {
-    return infoTypeLimits_;
-  }
-  /**
-   * 
-   * Configuration of findings limit given for specified info types.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-   */
-  public java.util.List 
-      getInfoTypeLimitsOrBuilderList() {
-    return infoTypeLimits_;
-  }
-  /**
-   * 
-   * Configuration of findings limit given for specified info types.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-   */
-  public int getInfoTypeLimitsCount() {
-    return infoTypeLimits_.size();
-  }
-  /**
-   * 
-   * Configuration of findings limit given for specified info types.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit getInfoTypeLimits(int index) {
-    return infoTypeLimits_.get(index);
-  }
-  /**
-   * 
-   * Configuration of findings limit given for specified info types.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimitOrBuilder getInfoTypeLimitsOrBuilder(
-      int index) {
-    return infoTypeLimits_.get(index);
-  }
-
-  public static final int CUSTOM_INFO_TYPES_FIELD_NUMBER = 8;
-  private java.util.List customInfoTypes_;
-  /**
-   * 
-   * Custom info types provided by the user.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-   */
-  public java.util.List getCustomInfoTypesList() {
-    return customInfoTypes_;
-  }
-  /**
-   * 
-   * Custom info types provided by the user.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-   */
-  public java.util.List 
-      getCustomInfoTypesOrBuilderList() {
-    return customInfoTypes_;
-  }
-  /**
-   * 
-   * Custom info types provided by the user.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-   */
-  public int getCustomInfoTypesCount() {
-    return customInfoTypes_.size();
-  }
-  /**
-   * 
-   * Custom info types provided by the user.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-   */
-  public com.google.privacy.dlp.v2beta1.CustomInfoType getCustomInfoTypes(int index) {
-    return customInfoTypes_.get(index);
-  }
-  /**
-   * 
-   * Custom info types provided by the user.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-   */
-  public com.google.privacy.dlp.v2beta1.CustomInfoTypeOrBuilder getCustomInfoTypesOrBuilder(
-      int index) {
-    return customInfoTypes_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < infoTypes_.size(); i++) {
-      output.writeMessage(1, infoTypes_.get(i));
-    }
-    if (minLikelihood_ != com.google.privacy.dlp.v2beta1.Likelihood.LIKELIHOOD_UNSPECIFIED.getNumber()) {
-      output.writeEnum(2, minLikelihood_);
-    }
-    if (maxFindings_ != 0) {
-      output.writeInt32(3, maxFindings_);
-    }
-    if (includeQuote_ != false) {
-      output.writeBool(4, includeQuote_);
-    }
-    if (excludeTypes_ != false) {
-      output.writeBool(6, excludeTypes_);
-    }
-    for (int i = 0; i < infoTypeLimits_.size(); i++) {
-      output.writeMessage(7, infoTypeLimits_.get(i));
-    }
-    for (int i = 0; i < customInfoTypes_.size(); i++) {
-      output.writeMessage(8, customInfoTypes_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < infoTypes_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, infoTypes_.get(i));
-    }
-    if (minLikelihood_ != com.google.privacy.dlp.v2beta1.Likelihood.LIKELIHOOD_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(2, minLikelihood_);
-    }
-    if (maxFindings_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(3, maxFindings_);
-    }
-    if (includeQuote_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(4, includeQuote_);
-    }
-    if (excludeTypes_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(6, excludeTypes_);
-    }
-    for (int i = 0; i < infoTypeLimits_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(7, infoTypeLimits_.get(i));
-    }
-    for (int i = 0; i < customInfoTypes_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(8, customInfoTypes_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.InspectConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.InspectConfig other = (com.google.privacy.dlp.v2beta1.InspectConfig) obj;
-
-    boolean result = true;
-    result = result && getInfoTypesList()
-        .equals(other.getInfoTypesList());
-    result = result && minLikelihood_ == other.minLikelihood_;
-    result = result && (getMaxFindings()
-        == other.getMaxFindings());
-    result = result && (getIncludeQuote()
-        == other.getIncludeQuote());
-    result = result && (getExcludeTypes()
-        == other.getExcludeTypes());
-    result = result && getInfoTypeLimitsList()
-        .equals(other.getInfoTypeLimitsList());
-    result = result && getCustomInfoTypesList()
-        .equals(other.getCustomInfoTypesList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getInfoTypesCount() > 0) {
-      hash = (37 * hash) + INFO_TYPES_FIELD_NUMBER;
-      hash = (53 * hash) + getInfoTypesList().hashCode();
-    }
-    hash = (37 * hash) + MIN_LIKELIHOOD_FIELD_NUMBER;
-    hash = (53 * hash) + minLikelihood_;
-    hash = (37 * hash) + MAX_FINDINGS_FIELD_NUMBER;
-    hash = (53 * hash) + getMaxFindings();
-    hash = (37 * hash) + INCLUDE_QUOTE_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getIncludeQuote());
-    hash = (37 * hash) + EXCLUDE_TYPES_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getExcludeTypes());
-    if (getInfoTypeLimitsCount() > 0) {
-      hash = (37 * hash) + INFO_TYPE_LIMITS_FIELD_NUMBER;
-      hash = (53 * hash) + getInfoTypeLimitsList().hashCode();
-    }
-    if (getCustomInfoTypesCount() > 0) {
-      hash = (37 * hash) + CUSTOM_INFO_TYPES_FIELD_NUMBER;
-      hash = (53 * hash) + getCustomInfoTypesList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InspectConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.InspectConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Configuration description of the scanning process.
-   * When used with redactContent only info_types and min_likelihood are currently
-   * used.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.InspectConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.InspectConfig)
-      com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.InspectConfig.class, com.google.privacy.dlp.v2beta1.InspectConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.InspectConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getInfoTypesFieldBuilder();
-        getInfoTypeLimitsFieldBuilder();
-        getCustomInfoTypesFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (infoTypesBuilder_ == null) {
-        infoTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        infoTypesBuilder_.clear();
-      }
-      minLikelihood_ = 0;
-
-      maxFindings_ = 0;
-
-      includeQuote_ = false;
-
-      excludeTypes_ = false;
-
-      if (infoTypeLimitsBuilder_ == null) {
-        infoTypeLimits_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
-      } else {
-        infoTypeLimitsBuilder_.clear();
-      }
-      if (customInfoTypesBuilder_ == null) {
-        customInfoTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000040);
-      } else {
-        customInfoTypesBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectConfig build() {
-      com.google.privacy.dlp.v2beta1.InspectConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.InspectConfig result = new com.google.privacy.dlp.v2beta1.InspectConfig(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (infoTypesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          infoTypes_ = java.util.Collections.unmodifiableList(infoTypes_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.infoTypes_ = infoTypes_;
-      } else {
-        result.infoTypes_ = infoTypesBuilder_.build();
-      }
-      result.minLikelihood_ = minLikelihood_;
-      result.maxFindings_ = maxFindings_;
-      result.includeQuote_ = includeQuote_;
-      result.excludeTypes_ = excludeTypes_;
-      if (infoTypeLimitsBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) == 0x00000020)) {
-          infoTypeLimits_ = java.util.Collections.unmodifiableList(infoTypeLimits_);
-          bitField0_ = (bitField0_ & ~0x00000020);
-        }
-        result.infoTypeLimits_ = infoTypeLimits_;
-      } else {
-        result.infoTypeLimits_ = infoTypeLimitsBuilder_.build();
-      }
-      if (customInfoTypesBuilder_ == null) {
-        if (((bitField0_ & 0x00000040) == 0x00000040)) {
-          customInfoTypes_ = java.util.Collections.unmodifiableList(customInfoTypes_);
-          bitField0_ = (bitField0_ & ~0x00000040);
-        }
-        result.customInfoTypes_ = customInfoTypes_;
-      } else {
-        result.customInfoTypes_ = customInfoTypesBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.InspectConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.InspectConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.InspectConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance()) return this;
-      if (infoTypesBuilder_ == null) {
-        if (!other.infoTypes_.isEmpty()) {
-          if (infoTypes_.isEmpty()) {
-            infoTypes_ = other.infoTypes_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureInfoTypesIsMutable();
-            infoTypes_.addAll(other.infoTypes_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.infoTypes_.isEmpty()) {
-          if (infoTypesBuilder_.isEmpty()) {
-            infoTypesBuilder_.dispose();
-            infoTypesBuilder_ = null;
-            infoTypes_ = other.infoTypes_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            infoTypesBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getInfoTypesFieldBuilder() : null;
-          } else {
-            infoTypesBuilder_.addAllMessages(other.infoTypes_);
-          }
-        }
-      }
-      if (other.minLikelihood_ != 0) {
-        setMinLikelihoodValue(other.getMinLikelihoodValue());
-      }
-      if (other.getMaxFindings() != 0) {
-        setMaxFindings(other.getMaxFindings());
-      }
-      if (other.getIncludeQuote() != false) {
-        setIncludeQuote(other.getIncludeQuote());
-      }
-      if (other.getExcludeTypes() != false) {
-        setExcludeTypes(other.getExcludeTypes());
-      }
-      if (infoTypeLimitsBuilder_ == null) {
-        if (!other.infoTypeLimits_.isEmpty()) {
-          if (infoTypeLimits_.isEmpty()) {
-            infoTypeLimits_ = other.infoTypeLimits_;
-            bitField0_ = (bitField0_ & ~0x00000020);
-          } else {
-            ensureInfoTypeLimitsIsMutable();
-            infoTypeLimits_.addAll(other.infoTypeLimits_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.infoTypeLimits_.isEmpty()) {
-          if (infoTypeLimitsBuilder_.isEmpty()) {
-            infoTypeLimitsBuilder_.dispose();
-            infoTypeLimitsBuilder_ = null;
-            infoTypeLimits_ = other.infoTypeLimits_;
-            bitField0_ = (bitField0_ & ~0x00000020);
-            infoTypeLimitsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getInfoTypeLimitsFieldBuilder() : null;
-          } else {
-            infoTypeLimitsBuilder_.addAllMessages(other.infoTypeLimits_);
-          }
-        }
-      }
-      if (customInfoTypesBuilder_ == null) {
-        if (!other.customInfoTypes_.isEmpty()) {
-          if (customInfoTypes_.isEmpty()) {
-            customInfoTypes_ = other.customInfoTypes_;
-            bitField0_ = (bitField0_ & ~0x00000040);
-          } else {
-            ensureCustomInfoTypesIsMutable();
-            customInfoTypes_.addAll(other.customInfoTypes_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.customInfoTypes_.isEmpty()) {
-          if (customInfoTypesBuilder_.isEmpty()) {
-            customInfoTypesBuilder_.dispose();
-            customInfoTypesBuilder_ = null;
-            customInfoTypes_ = other.customInfoTypes_;
-            bitField0_ = (bitField0_ & ~0x00000040);
-            customInfoTypesBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getCustomInfoTypesFieldBuilder() : null;
-          } else {
-            customInfoTypesBuilder_.addAllMessages(other.customInfoTypes_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.InspectConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.InspectConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List infoTypes_ =
-      java.util.Collections.emptyList();
-    private void ensureInfoTypesIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        infoTypes_ = new java.util.ArrayList(infoTypes_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> infoTypesBuilder_;
-
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public java.util.List getInfoTypesList() {
-      if (infoTypesBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(infoTypes_);
-      } else {
-        return infoTypesBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public int getInfoTypesCount() {
-      if (infoTypesBuilder_ == null) {
-        return infoTypes_.size();
-      } else {
-        return infoTypesBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType getInfoTypes(int index) {
-      if (infoTypesBuilder_ == null) {
-        return infoTypes_.get(index);
-      } else {
-        return infoTypesBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public Builder setInfoTypes(
-        int index, com.google.privacy.dlp.v2beta1.InfoType value) {
-      if (infoTypesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureInfoTypesIsMutable();
-        infoTypes_.set(index, value);
-        onChanged();
-      } else {
-        infoTypesBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public Builder setInfoTypes(
-        int index, com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-      if (infoTypesBuilder_ == null) {
-        ensureInfoTypesIsMutable();
-        infoTypes_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        infoTypesBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public Builder addInfoTypes(com.google.privacy.dlp.v2beta1.InfoType value) {
-      if (infoTypesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureInfoTypesIsMutable();
-        infoTypes_.add(value);
-        onChanged();
-      } else {
-        infoTypesBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public Builder addInfoTypes(
-        int index, com.google.privacy.dlp.v2beta1.InfoType value) {
-      if (infoTypesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureInfoTypesIsMutable();
-        infoTypes_.add(index, value);
-        onChanged();
-      } else {
-        infoTypesBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public Builder addInfoTypes(
-        com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-      if (infoTypesBuilder_ == null) {
-        ensureInfoTypesIsMutable();
-        infoTypes_.add(builderForValue.build());
-        onChanged();
-      } else {
-        infoTypesBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public Builder addInfoTypes(
-        int index, com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-      if (infoTypesBuilder_ == null) {
-        ensureInfoTypesIsMutable();
-        infoTypes_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        infoTypesBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public Builder addAllInfoTypes(
-        java.lang.Iterable values) {
-      if (infoTypesBuilder_ == null) {
-        ensureInfoTypesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, infoTypes_);
-        onChanged();
-      } else {
-        infoTypesBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public Builder clearInfoTypes() {
-      if (infoTypesBuilder_ == null) {
-        infoTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        infoTypesBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public Builder removeInfoTypes(int index) {
-      if (infoTypesBuilder_ == null) {
-        ensureInfoTypesIsMutable();
-        infoTypes_.remove(index);
-        onChanged();
-      } else {
-        infoTypesBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType.Builder getInfoTypesBuilder(
-        int index) {
-      return getInfoTypesFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypesOrBuilder(
-        int index) {
-      if (infoTypesBuilder_ == null) {
-        return infoTypes_.get(index);  } else {
-        return infoTypesBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public java.util.List 
-         getInfoTypesOrBuilderList() {
-      if (infoTypesBuilder_ != null) {
-        return infoTypesBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(infoTypes_);
-      }
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType.Builder addInfoTypesBuilder() {
-      return getInfoTypesFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance());
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType.Builder addInfoTypesBuilder(
-        int index) {
-      return getInfoTypesFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance());
-    }
-    /**
-     * 
-     * Restricts what info_types to look for. The values must correspond to
-     * InfoType values returned by ListInfoTypes or found in documentation.
-     * Empty info_types runs all enabled detectors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-     */
-    public java.util.List 
-         getInfoTypesBuilderList() {
-      return getInfoTypesFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> 
-        getInfoTypesFieldBuilder() {
-      if (infoTypesBuilder_ == null) {
-        infoTypesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder>(
-                infoTypes_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        infoTypes_ = null;
-      }
-      return infoTypesBuilder_;
-    }
-
-    private int minLikelihood_ = 0;
-    /**
-     * 
-     * Only returns findings equal or above this threshold.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Likelihood min_likelihood = 2;
-     */
-    public int getMinLikelihoodValue() {
-      return minLikelihood_;
-    }
-    /**
-     * 
-     * Only returns findings equal or above this threshold.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Likelihood min_likelihood = 2;
-     */
-    public Builder setMinLikelihoodValue(int value) {
-      minLikelihood_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Only returns findings equal or above this threshold.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Likelihood min_likelihood = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Likelihood getMinLikelihood() {
-      com.google.privacy.dlp.v2beta1.Likelihood result = com.google.privacy.dlp.v2beta1.Likelihood.valueOf(minLikelihood_);
-      return result == null ? com.google.privacy.dlp.v2beta1.Likelihood.UNRECOGNIZED : result;
-    }
-    /**
-     * 
-     * Only returns findings equal or above this threshold.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Likelihood min_likelihood = 2;
-     */
-    public Builder setMinLikelihood(com.google.privacy.dlp.v2beta1.Likelihood value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      minLikelihood_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Only returns findings equal or above this threshold.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Likelihood min_likelihood = 2;
-     */
-    public Builder clearMinLikelihood() {
-      
-      minLikelihood_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private int maxFindings_ ;
-    /**
-     * 
-     * Limits the number of findings per content item or long running operation.
-     * 

-     *
-     * int32 max_findings = 3;
-     */
-    public int getMaxFindings() {
-      return maxFindings_;
-    }
-    /**
-     * 
-     * Limits the number of findings per content item or long running operation.
-     * 

-     *
-     * int32 max_findings = 3;
-     */
-    public Builder setMaxFindings(int value) {
-      
-      maxFindings_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Limits the number of findings per content item or long running operation.
-     * 

-     *
-     * int32 max_findings = 3;
-     */
-    public Builder clearMaxFindings() {
-      
-      maxFindings_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private boolean includeQuote_ ;
-    /**
-     * 
-     * When true, a contextual quote from the data that triggered a finding is
-     * included in the response; see Finding.quote.
-     * 

-     *
-     * bool include_quote = 4;
-     */
-    public boolean getIncludeQuote() {
-      return includeQuote_;
-    }
-    /**
-     * 
-     * When true, a contextual quote from the data that triggered a finding is
-     * included in the response; see Finding.quote.
-     * 

-     *
-     * bool include_quote = 4;
-     */
-    public Builder setIncludeQuote(boolean value) {
-      
-      includeQuote_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * When true, a contextual quote from the data that triggered a finding is
-     * included in the response; see Finding.quote.
-     * 

-     *
-     * bool include_quote = 4;
-     */
-    public Builder clearIncludeQuote() {
-      
-      includeQuote_ = false;
-      onChanged();
-      return this;
-    }
-
-    private boolean excludeTypes_ ;
-    /**
-     * 
-     * When true, excludes type information of the findings.
-     * 

-     *
-     * bool exclude_types = 6;
-     */
-    public boolean getExcludeTypes() {
-      return excludeTypes_;
-    }
-    /**
-     * 
-     * When true, excludes type information of the findings.
-     * 

-     *
-     * bool exclude_types = 6;
-     */
-    public Builder setExcludeTypes(boolean value) {
-      
-      excludeTypes_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * When true, excludes type information of the findings.
-     * 

-     *
-     * bool exclude_types = 6;
-     */
-    public Builder clearExcludeTypes() {
-      
-      excludeTypes_ = false;
-      onChanged();
-      return this;
-    }
-
-    private java.util.List infoTypeLimits_ =
-      java.util.Collections.emptyList();
-    private void ensureInfoTypeLimitsIsMutable() {
-      if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-        infoTypeLimits_ = new java.util.ArrayList(infoTypeLimits_);
-        bitField0_ |= 0x00000020;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.Builder, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimitOrBuilder> infoTypeLimitsBuilder_;
-
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public java.util.List getInfoTypeLimitsList() {
-      if (infoTypeLimitsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(infoTypeLimits_);
-      } else {
-        return infoTypeLimitsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public int getInfoTypeLimitsCount() {
-      if (infoTypeLimitsBuilder_ == null) {
-        return infoTypeLimits_.size();
-      } else {
-        return infoTypeLimitsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit getInfoTypeLimits(int index) {
-      if (infoTypeLimitsBuilder_ == null) {
-        return infoTypeLimits_.get(index);
-      } else {
-        return infoTypeLimitsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public Builder setInfoTypeLimits(
-        int index, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit value) {
-      if (infoTypeLimitsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureInfoTypeLimitsIsMutable();
-        infoTypeLimits_.set(index, value);
-        onChanged();
-      } else {
-        infoTypeLimitsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public Builder setInfoTypeLimits(
-        int index, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.Builder builderForValue) {
-      if (infoTypeLimitsBuilder_ == null) {
-        ensureInfoTypeLimitsIsMutable();
-        infoTypeLimits_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        infoTypeLimitsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public Builder addInfoTypeLimits(com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit value) {
-      if (infoTypeLimitsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureInfoTypeLimitsIsMutable();
-        infoTypeLimits_.add(value);
-        onChanged();
-      } else {
-        infoTypeLimitsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public Builder addInfoTypeLimits(
-        int index, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit value) {
-      if (infoTypeLimitsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureInfoTypeLimitsIsMutable();
-        infoTypeLimits_.add(index, value);
-        onChanged();
-      } else {
-        infoTypeLimitsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public Builder addInfoTypeLimits(
-        com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.Builder builderForValue) {
-      if (infoTypeLimitsBuilder_ == null) {
-        ensureInfoTypeLimitsIsMutable();
-        infoTypeLimits_.add(builderForValue.build());
-        onChanged();
-      } else {
-        infoTypeLimitsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public Builder addInfoTypeLimits(
-        int index, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.Builder builderForValue) {
-      if (infoTypeLimitsBuilder_ == null) {
-        ensureInfoTypeLimitsIsMutable();
-        infoTypeLimits_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        infoTypeLimitsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public Builder addAllInfoTypeLimits(
-        java.lang.Iterable values) {
-      if (infoTypeLimitsBuilder_ == null) {
-        ensureInfoTypeLimitsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, infoTypeLimits_);
-        onChanged();
-      } else {
-        infoTypeLimitsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public Builder clearInfoTypeLimits() {
-      if (infoTypeLimitsBuilder_ == null) {
-        infoTypeLimits_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
-        onChanged();
-      } else {
-        infoTypeLimitsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public Builder removeInfoTypeLimits(int index) {
-      if (infoTypeLimitsBuilder_ == null) {
-        ensureInfoTypeLimitsIsMutable();
-        infoTypeLimits_.remove(index);
-        onChanged();
-      } else {
-        infoTypeLimitsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.Builder getInfoTypeLimitsBuilder(
-        int index) {
-      return getInfoTypeLimitsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimitOrBuilder getInfoTypeLimitsOrBuilder(
-        int index) {
-      if (infoTypeLimitsBuilder_ == null) {
-        return infoTypeLimits_.get(index);  } else {
-        return infoTypeLimitsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public java.util.List 
-         getInfoTypeLimitsOrBuilderList() {
-      if (infoTypeLimitsBuilder_ != null) {
-        return infoTypeLimitsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(infoTypeLimits_);
-      }
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.Builder addInfoTypeLimitsBuilder() {
-      return getInfoTypeLimitsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.getDefaultInstance());
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.Builder addInfoTypeLimitsBuilder(
-        int index) {
-      return getInfoTypeLimitsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.getDefaultInstance());
-    }
-    /**
-     * 
-     * Configuration of findings limit given for specified info types.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-     */
-    public java.util.List 
-         getInfoTypeLimitsBuilderList() {
-      return getInfoTypeLimitsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.Builder, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimitOrBuilder> 
-        getInfoTypeLimitsFieldBuilder() {
-      if (infoTypeLimitsBuilder_ == null) {
-        infoTypeLimitsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit.Builder, com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimitOrBuilder>(
-                infoTypeLimits_,
-                ((bitField0_ & 0x00000020) == 0x00000020),
-                getParentForChildren(),
-                isClean());
-        infoTypeLimits_ = null;
-      }
-      return infoTypeLimitsBuilder_;
-    }
-
-    private java.util.List customInfoTypes_ =
-      java.util.Collections.emptyList();
-    private void ensureCustomInfoTypesIsMutable() {
-      if (!((bitField0_ & 0x00000040) == 0x00000040)) {
-        customInfoTypes_ = new java.util.ArrayList(customInfoTypes_);
-        bitField0_ |= 0x00000040;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CustomInfoType, com.google.privacy.dlp.v2beta1.CustomInfoType.Builder, com.google.privacy.dlp.v2beta1.CustomInfoTypeOrBuilder> customInfoTypesBuilder_;
-
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public java.util.List getCustomInfoTypesList() {
-      if (customInfoTypesBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(customInfoTypes_);
-      } else {
-        return customInfoTypesBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public int getCustomInfoTypesCount() {
-      if (customInfoTypesBuilder_ == null) {
-        return customInfoTypes_.size();
-      } else {
-        return customInfoTypesBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public com.google.privacy.dlp.v2beta1.CustomInfoType getCustomInfoTypes(int index) {
-      if (customInfoTypesBuilder_ == null) {
-        return customInfoTypes_.get(index);
-      } else {
-        return customInfoTypesBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public Builder setCustomInfoTypes(
-        int index, com.google.privacy.dlp.v2beta1.CustomInfoType value) {
-      if (customInfoTypesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureCustomInfoTypesIsMutable();
-        customInfoTypes_.set(index, value);
-        onChanged();
-      } else {
-        customInfoTypesBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public Builder setCustomInfoTypes(
-        int index, com.google.privacy.dlp.v2beta1.CustomInfoType.Builder builderForValue) {
-      if (customInfoTypesBuilder_ == null) {
-        ensureCustomInfoTypesIsMutable();
-        customInfoTypes_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        customInfoTypesBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public Builder addCustomInfoTypes(com.google.privacy.dlp.v2beta1.CustomInfoType value) {
-      if (customInfoTypesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureCustomInfoTypesIsMutable();
-        customInfoTypes_.add(value);
-        onChanged();
-      } else {
-        customInfoTypesBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public Builder addCustomInfoTypes(
-        int index, com.google.privacy.dlp.v2beta1.CustomInfoType value) {
-      if (customInfoTypesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureCustomInfoTypesIsMutable();
-        customInfoTypes_.add(index, value);
-        onChanged();
-      } else {
-        customInfoTypesBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public Builder addCustomInfoTypes(
-        com.google.privacy.dlp.v2beta1.CustomInfoType.Builder builderForValue) {
-      if (customInfoTypesBuilder_ == null) {
-        ensureCustomInfoTypesIsMutable();
-        customInfoTypes_.add(builderForValue.build());
-        onChanged();
-      } else {
-        customInfoTypesBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public Builder addCustomInfoTypes(
-        int index, com.google.privacy.dlp.v2beta1.CustomInfoType.Builder builderForValue) {
-      if (customInfoTypesBuilder_ == null) {
-        ensureCustomInfoTypesIsMutable();
-        customInfoTypes_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        customInfoTypesBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public Builder addAllCustomInfoTypes(
-        java.lang.Iterable values) {
-      if (customInfoTypesBuilder_ == null) {
-        ensureCustomInfoTypesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, customInfoTypes_);
-        onChanged();
-      } else {
-        customInfoTypesBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public Builder clearCustomInfoTypes() {
-      if (customInfoTypesBuilder_ == null) {
-        customInfoTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000040);
-        onChanged();
-      } else {
-        customInfoTypesBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public Builder removeCustomInfoTypes(int index) {
-      if (customInfoTypesBuilder_ == null) {
-        ensureCustomInfoTypesIsMutable();
-        customInfoTypes_.remove(index);
-        onChanged();
-      } else {
-        customInfoTypesBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public com.google.privacy.dlp.v2beta1.CustomInfoType.Builder getCustomInfoTypesBuilder(
-        int index) {
-      return getCustomInfoTypesFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public com.google.privacy.dlp.v2beta1.CustomInfoTypeOrBuilder getCustomInfoTypesOrBuilder(
-        int index) {
-      if (customInfoTypesBuilder_ == null) {
-        return customInfoTypes_.get(index);  } else {
-        return customInfoTypesBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public java.util.List 
-         getCustomInfoTypesOrBuilderList() {
-      if (customInfoTypesBuilder_ != null) {
-        return customInfoTypesBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(customInfoTypes_);
-      }
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public com.google.privacy.dlp.v2beta1.CustomInfoType.Builder addCustomInfoTypesBuilder() {
-      return getCustomInfoTypesFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.CustomInfoType.getDefaultInstance());
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public com.google.privacy.dlp.v2beta1.CustomInfoType.Builder addCustomInfoTypesBuilder(
-        int index) {
-      return getCustomInfoTypesFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.CustomInfoType.getDefaultInstance());
-    }
-    /**
-     * 
-     * Custom info types provided by the user.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-     */
-    public java.util.List 
-         getCustomInfoTypesBuilderList() {
-      return getCustomInfoTypesFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CustomInfoType, com.google.privacy.dlp.v2beta1.CustomInfoType.Builder, com.google.privacy.dlp.v2beta1.CustomInfoTypeOrBuilder> 
-        getCustomInfoTypesFieldBuilder() {
-      if (customInfoTypesBuilder_ == null) {
-        customInfoTypesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CustomInfoType, com.google.privacy.dlp.v2beta1.CustomInfoType.Builder, com.google.privacy.dlp.v2beta1.CustomInfoTypeOrBuilder>(
-                customInfoTypes_,
-                ((bitField0_ & 0x00000040) == 0x00000040),
-                getParentForChildren(),
-                isClean());
-        customInfoTypes_ = null;
-      }
-      return customInfoTypesBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.InspectConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.InspectConfig)
-  private static final com.google.privacy.dlp.v2beta1.InspectConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.InspectConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InspectConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public InspectConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.InspectConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectConfigOrBuilder.java
deleted file mode 100644
index 36d3adc06626..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectConfigOrBuilder.java
+++ /dev/null
@@ -1,196 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface InspectConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.InspectConfig)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Restricts what info_types to look for. The values must correspond to
-   * InfoType values returned by ListInfoTypes or found in documentation.
-   * Empty info_types runs all enabled detectors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-   */
-  java.util.List 
-      getInfoTypesList();
-  /**
-   * 
-   * Restricts what info_types to look for. The values must correspond to
-   * InfoType values returned by ListInfoTypes or found in documentation.
-   * Empty info_types runs all enabled detectors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoType getInfoTypes(int index);
-  /**
-   * 
-   * Restricts what info_types to look for. The values must correspond to
-   * InfoType values returned by ListInfoTypes or found in documentation.
-   * Empty info_types runs all enabled detectors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-   */
-  int getInfoTypesCount();
-  /**
-   * 
-   * Restricts what info_types to look for. The values must correspond to
-   * InfoType values returned by ListInfoTypes or found in documentation.
-   * Empty info_types runs all enabled detectors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-   */
-  java.util.List 
-      getInfoTypesOrBuilderList();
-  /**
-   * 
-   * Restricts what info_types to look for. The values must correspond to
-   * InfoType values returned by ListInfoTypes or found in documentation.
-   * Empty info_types runs all enabled detectors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoType info_types = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypesOrBuilder(
-      int index);
-
-  /**
-   * 
-   * Only returns findings equal or above this threshold.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Likelihood min_likelihood = 2;
-   */
-  int getMinLikelihoodValue();
-  /**
-   * 
-   * Only returns findings equal or above this threshold.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Likelihood min_likelihood = 2;
-   */
-  com.google.privacy.dlp.v2beta1.Likelihood getMinLikelihood();
-
-  /**
-   * 
-   * Limits the number of findings per content item or long running operation.
-   * 

-   *
-   * int32 max_findings = 3;
-   */
-  int getMaxFindings();
-
-  /**
-   * 
-   * When true, a contextual quote from the data that triggered a finding is
-   * included in the response; see Finding.quote.
-   * 

-   *
-   * bool include_quote = 4;
-   */
-  boolean getIncludeQuote();
-
-  /**
-   * 
-   * When true, excludes type information of the findings.
-   * 

-   *
-   * bool exclude_types = 6;
-   */
-  boolean getExcludeTypes();
-
-  /**
-   * 
-   * Configuration of findings limit given for specified info types.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-   */
-  java.util.List 
-      getInfoTypeLimitsList();
-  /**
-   * 
-   * Configuration of findings limit given for specified info types.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-   */
-  com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit getInfoTypeLimits(int index);
-  /**
-   * 
-   * Configuration of findings limit given for specified info types.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-   */
-  int getInfoTypeLimitsCount();
-  /**
-   * 
-   * Configuration of findings limit given for specified info types.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-   */
-  java.util.List 
-      getInfoTypeLimitsOrBuilderList();
-  /**
-   * 
-   * Configuration of findings limit given for specified info types.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimit info_type_limits = 7;
-   */
-  com.google.privacy.dlp.v2beta1.InspectConfig.InfoTypeLimitOrBuilder getInfoTypeLimitsOrBuilder(
-      int index);
-
-  /**
-   * 
-   * Custom info types provided by the user.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-   */
-  java.util.List 
-      getCustomInfoTypesList();
-  /**
-   * 
-   * Custom info types provided by the user.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-   */
-  com.google.privacy.dlp.v2beta1.CustomInfoType getCustomInfoTypes(int index);
-  /**
-   * 
-   * Custom info types provided by the user.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-   */
-  int getCustomInfoTypesCount();
-  /**
-   * 
-   * Custom info types provided by the user.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-   */
-  java.util.List 
-      getCustomInfoTypesOrBuilderList();
-  /**
-   * 
-   * Custom info types provided by the user.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CustomInfoType custom_info_types = 8;
-   */
-  com.google.privacy.dlp.v2beta1.CustomInfoTypeOrBuilder getCustomInfoTypesOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentRequest.java
deleted file mode 100644
index 08a0796d9f55..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentRequest.java
+++ /dev/null
@@ -1,1112 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Request to search for potentially sensitive info in a list of items.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.InspectContentRequest}
- */
-public  final class InspectContentRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.InspectContentRequest)
-    InspectContentRequestOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use InspectContentRequest.newBuilder() to construct.
-  private InspectContentRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private InspectContentRequest() {
-    items_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private InspectContentRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.InspectConfig.Builder subBuilder = null;
-            if (inspectConfig_ != null) {
-              subBuilder = inspectConfig_.toBuilder();
-            }
-            inspectConfig_ = input.readMessage(com.google.privacy.dlp.v2beta1.InspectConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(inspectConfig_);
-              inspectConfig_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              items_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
-            }
-            items_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.ContentItem.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-        items_ = java.util.Collections.unmodifiableList(items_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectContentRequest_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectContentRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.InspectContentRequest.class, com.google.privacy.dlp.v2beta1.InspectContentRequest.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int INSPECT_CONFIG_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.InspectConfig inspectConfig_;
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  public boolean hasInspectConfig() {
-    return inspectConfig_ != null;
-  }
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectConfig getInspectConfig() {
-    return inspectConfig_ == null ? com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : inspectConfig_;
-  }
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getInspectConfigOrBuilder() {
-    return getInspectConfig();
-  }
-
-  public static final int ITEMS_FIELD_NUMBER = 2;
-  private java.util.List items_;
-  /**
-   * 
-   * The list of items to inspect. Items in a single request are
-   * considered "related" unless inspect_config.independent_inputs is true.
-   * Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  public java.util.List getItemsList() {
-    return items_;
-  }
-  /**
-   * 
-   * The list of items to inspect. Items in a single request are
-   * considered "related" unless inspect_config.independent_inputs is true.
-   * Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  public java.util.List 
-      getItemsOrBuilderList() {
-    return items_;
-  }
-  /**
-   * 
-   * The list of items to inspect. Items in a single request are
-   * considered "related" unless inspect_config.independent_inputs is true.
-   * Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  public int getItemsCount() {
-    return items_.size();
-  }
-  /**
-   * 
-   * The list of items to inspect. Items in a single request are
-   * considered "related" unless inspect_config.independent_inputs is true.
-   * Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.ContentItem getItems(int index) {
-    return items_.get(index);
-  }
-  /**
-   * 
-   * The list of items to inspect. Items in a single request are
-   * considered "related" unless inspect_config.independent_inputs is true.
-   * Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-      int index) {
-    return items_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (inspectConfig_ != null) {
-      output.writeMessage(1, getInspectConfig());
-    }
-    for (int i = 0; i < items_.size(); i++) {
-      output.writeMessage(2, items_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (inspectConfig_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getInspectConfig());
-    }
-    for (int i = 0; i < items_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, items_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.InspectContentRequest)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.InspectContentRequest other = (com.google.privacy.dlp.v2beta1.InspectContentRequest) obj;
-
-    boolean result = true;
-    result = result && (hasInspectConfig() == other.hasInspectConfig());
-    if (hasInspectConfig()) {
-      result = result && getInspectConfig()
-          .equals(other.getInspectConfig());
-    }
-    result = result && getItemsList()
-        .equals(other.getItemsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasInspectConfig()) {
-      hash = (37 * hash) + INSPECT_CONFIG_FIELD_NUMBER;
-      hash = (53 * hash) + getInspectConfig().hashCode();
-    }
-    if (getItemsCount() > 0) {
-      hash = (37 * hash) + ITEMS_FIELD_NUMBER;
-      hash = (53 * hash) + getItemsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.InspectContentRequest prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Request to search for potentially sensitive info in a list of items.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.InspectContentRequest}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.InspectContentRequest)
-      com.google.privacy.dlp.v2beta1.InspectContentRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectContentRequest_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectContentRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.InspectContentRequest.class, com.google.privacy.dlp.v2beta1.InspectContentRequest.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.InspectContentRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getItemsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (inspectConfigBuilder_ == null) {
-        inspectConfig_ = null;
-      } else {
-        inspectConfig_ = null;
-        inspectConfigBuilder_ = null;
-      }
-      if (itemsBuilder_ == null) {
-        items_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-      } else {
-        itemsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectContentRequest_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectContentRequest getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.InspectContentRequest.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectContentRequest build() {
-      com.google.privacy.dlp.v2beta1.InspectContentRequest result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectContentRequest buildPartial() {
-      com.google.privacy.dlp.v2beta1.InspectContentRequest result = new com.google.privacy.dlp.v2beta1.InspectContentRequest(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (inspectConfigBuilder_ == null) {
-        result.inspectConfig_ = inspectConfig_;
-      } else {
-        result.inspectConfig_ = inspectConfigBuilder_.build();
-      }
-      if (itemsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          items_ = java.util.Collections.unmodifiableList(items_);
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.items_ = items_;
-      } else {
-        result.items_ = itemsBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.InspectContentRequest) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.InspectContentRequest)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.InspectContentRequest other) {
-      if (other == com.google.privacy.dlp.v2beta1.InspectContentRequest.getDefaultInstance()) return this;
-      if (other.hasInspectConfig()) {
-        mergeInspectConfig(other.getInspectConfig());
-      }
-      if (itemsBuilder_ == null) {
-        if (!other.items_.isEmpty()) {
-          if (items_.isEmpty()) {
-            items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureItemsIsMutable();
-            items_.addAll(other.items_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.items_.isEmpty()) {
-          if (itemsBuilder_.isEmpty()) {
-            itemsBuilder_.dispose();
-            itemsBuilder_ = null;
-            items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-            itemsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getItemsFieldBuilder() : null;
-          } else {
-            itemsBuilder_.addAllMessages(other.items_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.InspectContentRequest parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.InspectContentRequest) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private com.google.privacy.dlp.v2beta1.InspectConfig inspectConfig_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder> inspectConfigBuilder_;
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public boolean hasInspectConfig() {
-      return inspectConfigBuilder_ != null || inspectConfig_ != null;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig getInspectConfig() {
-      if (inspectConfigBuilder_ == null) {
-        return inspectConfig_ == null ? com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : inspectConfig_;
-      } else {
-        return inspectConfigBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public Builder setInspectConfig(com.google.privacy.dlp.v2beta1.InspectConfig value) {
-      if (inspectConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        inspectConfig_ = value;
-        onChanged();
-      } else {
-        inspectConfigBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public Builder setInspectConfig(
-        com.google.privacy.dlp.v2beta1.InspectConfig.Builder builderForValue) {
-      if (inspectConfigBuilder_ == null) {
-        inspectConfig_ = builderForValue.build();
-        onChanged();
-      } else {
-        inspectConfigBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public Builder mergeInspectConfig(com.google.privacy.dlp.v2beta1.InspectConfig value) {
-      if (inspectConfigBuilder_ == null) {
-        if (inspectConfig_ != null) {
-          inspectConfig_ =
-            com.google.privacy.dlp.v2beta1.InspectConfig.newBuilder(inspectConfig_).mergeFrom(value).buildPartial();
-        } else {
-          inspectConfig_ = value;
-        }
-        onChanged();
-      } else {
-        inspectConfigBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public Builder clearInspectConfig() {
-      if (inspectConfigBuilder_ == null) {
-        inspectConfig_ = null;
-        onChanged();
-      } else {
-        inspectConfig_ = null;
-        inspectConfigBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig.Builder getInspectConfigBuilder() {
-      
-      onChanged();
-      return getInspectConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getInspectConfigOrBuilder() {
-      if (inspectConfigBuilder_ != null) {
-        return inspectConfigBuilder_.getMessageOrBuilder();
-      } else {
-        return inspectConfig_ == null ?
-            com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : inspectConfig_;
-      }
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder> 
-        getInspectConfigFieldBuilder() {
-      if (inspectConfigBuilder_ == null) {
-        inspectConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder>(
-                getInspectConfig(),
-                getParentForChildren(),
-                isClean());
-        inspectConfig_ = null;
-      }
-      return inspectConfigBuilder_;
-    }
-
-    private java.util.List items_ =
-      java.util.Collections.emptyList();
-    private void ensureItemsIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-        items_ = new java.util.ArrayList(items_);
-        bitField0_ |= 0x00000002;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder> itemsBuilder_;
-
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public java.util.List getItemsList() {
-      if (itemsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(items_);
-      } else {
-        return itemsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public int getItemsCount() {
-      if (itemsBuilder_ == null) {
-        return items_.size();
-      } else {
-        return itemsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem getItems(int index) {
-      if (itemsBuilder_ == null) {
-        return items_.get(index);
-      } else {
-        return itemsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder setItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.set(index, value);
-        onChanged();
-      } else {
-        itemsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder setItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder addItems(com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.add(value);
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder addItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.add(index, value);
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder addItems(
-        com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.add(builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder addItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder addAllItems(
-        java.lang.Iterable values) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, items_);
-        onChanged();
-      } else {
-        itemsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder clearItems() {
-      if (itemsBuilder_ == null) {
-        items_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-      } else {
-        itemsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder removeItems(int index) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.remove(index);
-        onChanged();
-      } else {
-        itemsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder getItemsBuilder(
-        int index) {
-      return getItemsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-        int index) {
-      if (itemsBuilder_ == null) {
-        return items_.get(index);  } else {
-        return itemsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public java.util.List 
-         getItemsOrBuilderList() {
-      if (itemsBuilder_ != null) {
-        return itemsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(items_);
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder addItemsBuilder() {
-      return getItemsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.ContentItem.getDefaultInstance());
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder addItemsBuilder(
-        int index) {
-      return getItemsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.ContentItem.getDefaultInstance());
-    }
-    /**
-     * 
-     * The list of items to inspect. Items in a single request are
-     * considered "related" unless inspect_config.independent_inputs is true.
-     * Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public java.util.List 
-         getItemsBuilderList() {
-      return getItemsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder> 
-        getItemsFieldBuilder() {
-      if (itemsBuilder_ == null) {
-        itemsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder>(
-                items_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
-        items_ = null;
-      }
-      return itemsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.InspectContentRequest)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.InspectContentRequest)
-  private static final com.google.privacy.dlp.v2beta1.InspectContentRequest DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.InspectContentRequest();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InspectContentRequest getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public InspectContentRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectContentRequest(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.InspectContentRequest getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentRequestOrBuilder.java
deleted file mode 100644
index f5af0636f851..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentRequestOrBuilder.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface InspectContentRequestOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.InspectContentRequest)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  boolean hasInspectConfig();
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InspectConfig getInspectConfig();
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getInspectConfigOrBuilder();
-
-  /**
-   * 
-   * The list of items to inspect. Items in a single request are
-   * considered "related" unless inspect_config.independent_inputs is true.
-   * Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  java.util.List 
-      getItemsList();
-  /**
-   * 
-   * The list of items to inspect. Items in a single request are
-   * considered "related" unless inspect_config.independent_inputs is true.
-   * Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  com.google.privacy.dlp.v2beta1.ContentItem getItems(int index);
-  /**
-   * 
-   * The list of items to inspect. Items in a single request are
-   * considered "related" unless inspect_config.independent_inputs is true.
-   * Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  int getItemsCount();
-  /**
-   * 
-   * The list of items to inspect. Items in a single request are
-   * considered "related" unless inspect_config.independent_inputs is true.
-   * Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  java.util.List 
-      getItemsOrBuilderList();
-  /**
-   * 
-   * The list of items to inspect. Items in a single request are
-   * considered "related" unless inspect_config.independent_inputs is true.
-   * Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentResponse.java
deleted file mode 100644
index 0c8b20d41575..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentResponse.java
+++ /dev/null
@@ -1,857 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Results of inspecting a list of items.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.InspectContentResponse}
- */
-public  final class InspectContentResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.InspectContentResponse)
-    InspectContentResponseOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use InspectContentResponse.newBuilder() to construct.
-  private InspectContentResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private InspectContentResponse() {
-    results_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private InspectContentResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              results_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            results_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.InspectResult.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        results_ = java.util.Collections.unmodifiableList(results_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectContentResponse_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectContentResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.InspectContentResponse.class, com.google.privacy.dlp.v2beta1.InspectContentResponse.Builder.class);
-  }
-
-  public static final int RESULTS_FIELD_NUMBER = 1;
-  private java.util.List results_;
-  /**
-   * 
-   * Each content_item from the request has a result in this list, in the
-   * same order as the request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-   */
-  public java.util.List getResultsList() {
-    return results_;
-  }
-  /**
-   * 
-   * Each content_item from the request has a result in this list, in the
-   * same order as the request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-   */
-  public java.util.List 
-      getResultsOrBuilderList() {
-    return results_;
-  }
-  /**
-   * 
-   * Each content_item from the request has a result in this list, in the
-   * same order as the request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-   */
-  public int getResultsCount() {
-    return results_.size();
-  }
-  /**
-   * 
-   * Each content_item from the request has a result in this list, in the
-   * same order as the request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectResult getResults(int index) {
-    return results_.get(index);
-  }
-  /**
-   * 
-   * Each content_item from the request has a result in this list, in the
-   * same order as the request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectResultOrBuilder getResultsOrBuilder(
-      int index) {
-    return results_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < results_.size(); i++) {
-      output.writeMessage(1, results_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < results_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, results_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.InspectContentResponse)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.InspectContentResponse other = (com.google.privacy.dlp.v2beta1.InspectContentResponse) obj;
-
-    boolean result = true;
-    result = result && getResultsList()
-        .equals(other.getResultsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getResultsCount() > 0) {
-      hash = (37 * hash) + RESULTS_FIELD_NUMBER;
-      hash = (53 * hash) + getResultsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.InspectContentResponse prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Results of inspecting a list of items.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.InspectContentResponse}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.InspectContentResponse)
-      com.google.privacy.dlp.v2beta1.InspectContentResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectContentResponse_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectContentResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.InspectContentResponse.class, com.google.privacy.dlp.v2beta1.InspectContentResponse.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.InspectContentResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getResultsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (resultsBuilder_ == null) {
-        results_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        resultsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectContentResponse_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectContentResponse getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.InspectContentResponse.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectContentResponse build() {
-      com.google.privacy.dlp.v2beta1.InspectContentResponse result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectContentResponse buildPartial() {
-      com.google.privacy.dlp.v2beta1.InspectContentResponse result = new com.google.privacy.dlp.v2beta1.InspectContentResponse(this);
-      int from_bitField0_ = bitField0_;
-      if (resultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          results_ = java.util.Collections.unmodifiableList(results_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.results_ = results_;
-      } else {
-        result.results_ = resultsBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.InspectContentResponse) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.InspectContentResponse)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.InspectContentResponse other) {
-      if (other == com.google.privacy.dlp.v2beta1.InspectContentResponse.getDefaultInstance()) return this;
-      if (resultsBuilder_ == null) {
-        if (!other.results_.isEmpty()) {
-          if (results_.isEmpty()) {
-            results_ = other.results_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureResultsIsMutable();
-            results_.addAll(other.results_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.results_.isEmpty()) {
-          if (resultsBuilder_.isEmpty()) {
-            resultsBuilder_.dispose();
-            resultsBuilder_ = null;
-            results_ = other.results_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            resultsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getResultsFieldBuilder() : null;
-          } else {
-            resultsBuilder_.addAllMessages(other.results_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.InspectContentResponse parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.InspectContentResponse) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List results_ =
-      java.util.Collections.emptyList();
-    private void ensureResultsIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        results_ = new java.util.ArrayList(results_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectResult, com.google.privacy.dlp.v2beta1.InspectResult.Builder, com.google.privacy.dlp.v2beta1.InspectResultOrBuilder> resultsBuilder_;
-
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public java.util.List getResultsList() {
-      if (resultsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(results_);
-      } else {
-        return resultsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public int getResultsCount() {
-      if (resultsBuilder_ == null) {
-        return results_.size();
-      } else {
-        return resultsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectResult getResults(int index) {
-      if (resultsBuilder_ == null) {
-        return results_.get(index);
-      } else {
-        return resultsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public Builder setResults(
-        int index, com.google.privacy.dlp.v2beta1.InspectResult value) {
-      if (resultsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureResultsIsMutable();
-        results_.set(index, value);
-        onChanged();
-      } else {
-        resultsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public Builder setResults(
-        int index, com.google.privacy.dlp.v2beta1.InspectResult.Builder builderForValue) {
-      if (resultsBuilder_ == null) {
-        ensureResultsIsMutable();
-        results_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        resultsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public Builder addResults(com.google.privacy.dlp.v2beta1.InspectResult value) {
-      if (resultsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureResultsIsMutable();
-        results_.add(value);
-        onChanged();
-      } else {
-        resultsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public Builder addResults(
-        int index, com.google.privacy.dlp.v2beta1.InspectResult value) {
-      if (resultsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureResultsIsMutable();
-        results_.add(index, value);
-        onChanged();
-      } else {
-        resultsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public Builder addResults(
-        com.google.privacy.dlp.v2beta1.InspectResult.Builder builderForValue) {
-      if (resultsBuilder_ == null) {
-        ensureResultsIsMutable();
-        results_.add(builderForValue.build());
-        onChanged();
-      } else {
-        resultsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public Builder addResults(
-        int index, com.google.privacy.dlp.v2beta1.InspectResult.Builder builderForValue) {
-      if (resultsBuilder_ == null) {
-        ensureResultsIsMutable();
-        results_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        resultsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public Builder addAllResults(
-        java.lang.Iterable values) {
-      if (resultsBuilder_ == null) {
-        ensureResultsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, results_);
-        onChanged();
-      } else {
-        resultsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public Builder clearResults() {
-      if (resultsBuilder_ == null) {
-        results_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        resultsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public Builder removeResults(int index) {
-      if (resultsBuilder_ == null) {
-        ensureResultsIsMutable();
-        results_.remove(index);
-        onChanged();
-      } else {
-        resultsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectResult.Builder getResultsBuilder(
-        int index) {
-      return getResultsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectResultOrBuilder getResultsOrBuilder(
-        int index) {
-      if (resultsBuilder_ == null) {
-        return results_.get(index);  } else {
-        return resultsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public java.util.List 
-         getResultsOrBuilderList() {
-      if (resultsBuilder_ != null) {
-        return resultsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(results_);
-      }
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectResult.Builder addResultsBuilder() {
-      return getResultsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.InspectResult.getDefaultInstance());
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectResult.Builder addResultsBuilder(
-        int index) {
-      return getResultsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.InspectResult.getDefaultInstance());
-    }
-    /**
-     * 
-     * Each content_item from the request has a result in this list, in the
-     * same order as the request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-     */
-    public java.util.List 
-         getResultsBuilderList() {
-      return getResultsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectResult, com.google.privacy.dlp.v2beta1.InspectResult.Builder, com.google.privacy.dlp.v2beta1.InspectResultOrBuilder> 
-        getResultsFieldBuilder() {
-      if (resultsBuilder_ == null) {
-        resultsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InspectResult, com.google.privacy.dlp.v2beta1.InspectResult.Builder, com.google.privacy.dlp.v2beta1.InspectResultOrBuilder>(
-                results_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        results_ = null;
-      }
-      return resultsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.InspectContentResponse)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.InspectContentResponse)
-  private static final com.google.privacy.dlp.v2beta1.InspectContentResponse DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.InspectContentResponse();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InspectContentResponse getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public InspectContentResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectContentResponse(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.InspectContentResponse getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentResponseOrBuilder.java
deleted file mode 100644
index 63b47c7d747d..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectContentResponseOrBuilder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface InspectContentResponseOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.InspectContentResponse)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Each content_item from the request has a result in this list, in the
-   * same order as the request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-   */
-  java.util.List 
-      getResultsList();
-  /**
-   * 
-   * Each content_item from the request has a result in this list, in the
-   * same order as the request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InspectResult getResults(int index);
-  /**
-   * 
-   * Each content_item from the request has a result in this list, in the
-   * same order as the request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-   */
-  int getResultsCount();
-  /**
-   * 
-   * Each content_item from the request has a result in this list, in the
-   * same order as the request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-   */
-  java.util.List 
-      getResultsOrBuilderList();
-  /**
-   * 
-   * Each content_item from the request has a result in this list, in the
-   * same order as the request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InspectResult results = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InspectResultOrBuilder getResultsOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationMetadata.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationMetadata.java
deleted file mode 100644
index 200f4675f487..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationMetadata.java
+++ /dev/null
@@ -1,1811 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Metadata returned within GetOperation for an inspect request.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.InspectOperationMetadata}
- */
-public  final class InspectOperationMetadata extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.InspectOperationMetadata)
-    InspectOperationMetadataOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use InspectOperationMetadata.newBuilder() to construct.
-  private InspectOperationMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private InspectOperationMetadata() {
-    processedBytes_ = 0L;
-    totalEstimatedBytes_ = 0L;
-    infoTypeStats_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private InspectOperationMetadata(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-
-            processedBytes_ = input.readInt64();
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-              infoTypeStats_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000004;
-            }
-            infoTypeStats_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.InfoTypeStatistics.parser(), extensionRegistry));
-            break;
-          }
-          case 26: {
-            com.google.protobuf.Timestamp.Builder subBuilder = null;
-            if (createTime_ != null) {
-              subBuilder = createTime_.toBuilder();
-            }
-            createTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(createTime_);
-              createTime_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 32: {
-
-            totalEstimatedBytes_ = input.readInt64();
-            break;
-          }
-          case 42: {
-            com.google.privacy.dlp.v2beta1.InspectConfig.Builder subBuilder = null;
-            if (requestInspectConfig_ != null) {
-              subBuilder = requestInspectConfig_.toBuilder();
-            }
-            requestInspectConfig_ = input.readMessage(com.google.privacy.dlp.v2beta1.InspectConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(requestInspectConfig_);
-              requestInspectConfig_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 50: {
-            com.google.privacy.dlp.v2beta1.StorageConfig.Builder subBuilder = null;
-            if (requestStorageConfig_ != null) {
-              subBuilder = requestStorageConfig_.toBuilder();
-            }
-            requestStorageConfig_ = input.readMessage(com.google.privacy.dlp.v2beta1.StorageConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(requestStorageConfig_);
-              requestStorageConfig_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 58: {
-            com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder subBuilder = null;
-            if (requestOutputConfig_ != null) {
-              subBuilder = requestOutputConfig_.toBuilder();
-            }
-            requestOutputConfig_ = input.readMessage(com.google.privacy.dlp.v2beta1.OutputStorageConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(requestOutputConfig_);
-              requestOutputConfig_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-        infoTypeStats_ = java.util.Collections.unmodifiableList(infoTypeStats_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectOperationMetadata_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectOperationMetadata_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.InspectOperationMetadata.class, com.google.privacy.dlp.v2beta1.InspectOperationMetadata.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int PROCESSED_BYTES_FIELD_NUMBER = 1;
-  private long processedBytes_;
-  /**
-   * 
-   * Total size in bytes that were processed.
-   * 

-   *
-   * int64 processed_bytes = 1;
-   */
-  public long getProcessedBytes() {
-    return processedBytes_;
-  }
-
-  public static final int TOTAL_ESTIMATED_BYTES_FIELD_NUMBER = 4;
-  private long totalEstimatedBytes_;
-  /**
-   * 
-   * Estimate of the number of bytes to process.
-   * 

-   *
-   * int64 total_estimated_bytes = 4;
-   */
-  public long getTotalEstimatedBytes() {
-    return totalEstimatedBytes_;
-  }
-
-  public static final int INFO_TYPE_STATS_FIELD_NUMBER = 2;
-  private java.util.List infoTypeStats_;
-  /**
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-   */
-  public java.util.List getInfoTypeStatsList() {
-    return infoTypeStats_;
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-   */
-  public java.util.List 
-      getInfoTypeStatsOrBuilderList() {
-    return infoTypeStats_;
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-   */
-  public int getInfoTypeStatsCount() {
-    return infoTypeStats_.size();
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeStatistics getInfoTypeStats(int index) {
-    return infoTypeStats_.get(index);
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeStatisticsOrBuilder getInfoTypeStatsOrBuilder(
-      int index) {
-    return infoTypeStats_.get(index);
-  }
-
-  public static final int CREATE_TIME_FIELD_NUMBER = 3;
-  private com.google.protobuf.Timestamp createTime_;
-  /**
-   * 
-   * The time which this request was started.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 3;
-   */
-  public boolean hasCreateTime() {
-    return createTime_ != null;
-  }
-  /**
-   * 
-   * The time which this request was started.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 3;
-   */
-  public com.google.protobuf.Timestamp getCreateTime() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
-  }
-  /**
-   * 
-   * The time which this request was started.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 3;
-   */
-  public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
-  }
-
-  public static final int REQUEST_INSPECT_CONFIG_FIELD_NUMBER = 5;
-  private com.google.privacy.dlp.v2beta1.InspectConfig requestInspectConfig_;
-  /**
-   * 
-   * The inspect config used to create the Operation.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-   */
-  public boolean hasRequestInspectConfig() {
-    return requestInspectConfig_ != null;
-  }
-  /**
-   * 
-   * The inspect config used to create the Operation.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectConfig getRequestInspectConfig() {
-    return requestInspectConfig_ == null ? com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : requestInspectConfig_;
-  }
-  /**
-   * 
-   * The inspect config used to create the Operation.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getRequestInspectConfigOrBuilder() {
-    return getRequestInspectConfig();
-  }
-
-  public static final int REQUEST_STORAGE_CONFIG_FIELD_NUMBER = 6;
-  private com.google.privacy.dlp.v2beta1.StorageConfig requestStorageConfig_;
-  /**
-   * 
-   * The storage config used to create the Operation.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-   */
-  public boolean hasRequestStorageConfig() {
-    return requestStorageConfig_ != null;
-  }
-  /**
-   * 
-   * The storage config used to create the Operation.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-   */
-  public com.google.privacy.dlp.v2beta1.StorageConfig getRequestStorageConfig() {
-    return requestStorageConfig_ == null ? com.google.privacy.dlp.v2beta1.StorageConfig.getDefaultInstance() : requestStorageConfig_;
-  }
-  /**
-   * 
-   * The storage config used to create the Operation.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-   */
-  public com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder getRequestStorageConfigOrBuilder() {
-    return getRequestStorageConfig();
-  }
-
-  public static final int REQUEST_OUTPUT_CONFIG_FIELD_NUMBER = 7;
-  private com.google.privacy.dlp.v2beta1.OutputStorageConfig requestOutputConfig_;
-  /**
-   * 
-   * Optional location to store findings.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-   */
-  public boolean hasRequestOutputConfig() {
-    return requestOutputConfig_ != null;
-  }
-  /**
-   * 
-   * Optional location to store findings.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-   */
-  public com.google.privacy.dlp.v2beta1.OutputStorageConfig getRequestOutputConfig() {
-    return requestOutputConfig_ == null ? com.google.privacy.dlp.v2beta1.OutputStorageConfig.getDefaultInstance() : requestOutputConfig_;
-  }
-  /**
-   * 
-   * Optional location to store findings.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-   */
-  public com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder getRequestOutputConfigOrBuilder() {
-    return getRequestOutputConfig();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (processedBytes_ != 0L) {
-      output.writeInt64(1, processedBytes_);
-    }
-    for (int i = 0; i < infoTypeStats_.size(); i++) {
-      output.writeMessage(2, infoTypeStats_.get(i));
-    }
-    if (createTime_ != null) {
-      output.writeMessage(3, getCreateTime());
-    }
-    if (totalEstimatedBytes_ != 0L) {
-      output.writeInt64(4, totalEstimatedBytes_);
-    }
-    if (requestInspectConfig_ != null) {
-      output.writeMessage(5, getRequestInspectConfig());
-    }
-    if (requestStorageConfig_ != null) {
-      output.writeMessage(6, getRequestStorageConfig());
-    }
-    if (requestOutputConfig_ != null) {
-      output.writeMessage(7, getRequestOutputConfig());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (processedBytes_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(1, processedBytes_);
-    }
-    for (int i = 0; i < infoTypeStats_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, infoTypeStats_.get(i));
-    }
-    if (createTime_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, getCreateTime());
-    }
-    if (totalEstimatedBytes_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(4, totalEstimatedBytes_);
-    }
-    if (requestInspectConfig_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, getRequestInspectConfig());
-    }
-    if (requestStorageConfig_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(6, getRequestStorageConfig());
-    }
-    if (requestOutputConfig_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(7, getRequestOutputConfig());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.InspectOperationMetadata)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.InspectOperationMetadata other = (com.google.privacy.dlp.v2beta1.InspectOperationMetadata) obj;
-
-    boolean result = true;
-    result = result && (getProcessedBytes()
-        == other.getProcessedBytes());
-    result = result && (getTotalEstimatedBytes()
-        == other.getTotalEstimatedBytes());
-    result = result && getInfoTypeStatsList()
-        .equals(other.getInfoTypeStatsList());
-    result = result && (hasCreateTime() == other.hasCreateTime());
-    if (hasCreateTime()) {
-      result = result && getCreateTime()
-          .equals(other.getCreateTime());
-    }
-    result = result && (hasRequestInspectConfig() == other.hasRequestInspectConfig());
-    if (hasRequestInspectConfig()) {
-      result = result && getRequestInspectConfig()
-          .equals(other.getRequestInspectConfig());
-    }
-    result = result && (hasRequestStorageConfig() == other.hasRequestStorageConfig());
-    if (hasRequestStorageConfig()) {
-      result = result && getRequestStorageConfig()
-          .equals(other.getRequestStorageConfig());
-    }
-    result = result && (hasRequestOutputConfig() == other.hasRequestOutputConfig());
-    if (hasRequestOutputConfig()) {
-      result = result && getRequestOutputConfig()
-          .equals(other.getRequestOutputConfig());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + PROCESSED_BYTES_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getProcessedBytes());
-    hash = (37 * hash) + TOTAL_ESTIMATED_BYTES_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getTotalEstimatedBytes());
-    if (getInfoTypeStatsCount() > 0) {
-      hash = (37 * hash) + INFO_TYPE_STATS_FIELD_NUMBER;
-      hash = (53 * hash) + getInfoTypeStatsList().hashCode();
-    }
-    if (hasCreateTime()) {
-      hash = (37 * hash) + CREATE_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getCreateTime().hashCode();
-    }
-    if (hasRequestInspectConfig()) {
-      hash = (37 * hash) + REQUEST_INSPECT_CONFIG_FIELD_NUMBER;
-      hash = (53 * hash) + getRequestInspectConfig().hashCode();
-    }
-    if (hasRequestStorageConfig()) {
-      hash = (37 * hash) + REQUEST_STORAGE_CONFIG_FIELD_NUMBER;
-      hash = (53 * hash) + getRequestStorageConfig().hashCode();
-    }
-    if (hasRequestOutputConfig()) {
-      hash = (37 * hash) + REQUEST_OUTPUT_CONFIG_FIELD_NUMBER;
-      hash = (53 * hash) + getRequestOutputConfig().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.InspectOperationMetadata prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Metadata returned within GetOperation for an inspect request.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.InspectOperationMetadata}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.InspectOperationMetadata)
-      com.google.privacy.dlp.v2beta1.InspectOperationMetadataOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectOperationMetadata_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectOperationMetadata_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.InspectOperationMetadata.class, com.google.privacy.dlp.v2beta1.InspectOperationMetadata.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.InspectOperationMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getInfoTypeStatsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      processedBytes_ = 0L;
-
-      totalEstimatedBytes_ = 0L;
-
-      if (infoTypeStatsBuilder_ == null) {
-        infoTypeStats_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-      } else {
-        infoTypeStatsBuilder_.clear();
-      }
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
-        createTimeBuilder_ = null;
-      }
-      if (requestInspectConfigBuilder_ == null) {
-        requestInspectConfig_ = null;
-      } else {
-        requestInspectConfig_ = null;
-        requestInspectConfigBuilder_ = null;
-      }
-      if (requestStorageConfigBuilder_ == null) {
-        requestStorageConfig_ = null;
-      } else {
-        requestStorageConfig_ = null;
-        requestStorageConfigBuilder_ = null;
-      }
-      if (requestOutputConfigBuilder_ == null) {
-        requestOutputConfig_ = null;
-      } else {
-        requestOutputConfig_ = null;
-        requestOutputConfigBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectOperationMetadata_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectOperationMetadata getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.InspectOperationMetadata.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectOperationMetadata build() {
-      com.google.privacy.dlp.v2beta1.InspectOperationMetadata result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectOperationMetadata buildPartial() {
-      com.google.privacy.dlp.v2beta1.InspectOperationMetadata result = new com.google.privacy.dlp.v2beta1.InspectOperationMetadata(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      result.processedBytes_ = processedBytes_;
-      result.totalEstimatedBytes_ = totalEstimatedBytes_;
-      if (infoTypeStatsBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          infoTypeStats_ = java.util.Collections.unmodifiableList(infoTypeStats_);
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.infoTypeStats_ = infoTypeStats_;
-      } else {
-        result.infoTypeStats_ = infoTypeStatsBuilder_.build();
-      }
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
-      }
-      if (requestInspectConfigBuilder_ == null) {
-        result.requestInspectConfig_ = requestInspectConfig_;
-      } else {
-        result.requestInspectConfig_ = requestInspectConfigBuilder_.build();
-      }
-      if (requestStorageConfigBuilder_ == null) {
-        result.requestStorageConfig_ = requestStorageConfig_;
-      } else {
-        result.requestStorageConfig_ = requestStorageConfigBuilder_.build();
-      }
-      if (requestOutputConfigBuilder_ == null) {
-        result.requestOutputConfig_ = requestOutputConfig_;
-      } else {
-        result.requestOutputConfig_ = requestOutputConfigBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.InspectOperationMetadata) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.InspectOperationMetadata)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.InspectOperationMetadata other) {
-      if (other == com.google.privacy.dlp.v2beta1.InspectOperationMetadata.getDefaultInstance()) return this;
-      if (other.getProcessedBytes() != 0L) {
-        setProcessedBytes(other.getProcessedBytes());
-      }
-      if (other.getTotalEstimatedBytes() != 0L) {
-        setTotalEstimatedBytes(other.getTotalEstimatedBytes());
-      }
-      if (infoTypeStatsBuilder_ == null) {
-        if (!other.infoTypeStats_.isEmpty()) {
-          if (infoTypeStats_.isEmpty()) {
-            infoTypeStats_ = other.infoTypeStats_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureInfoTypeStatsIsMutable();
-            infoTypeStats_.addAll(other.infoTypeStats_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.infoTypeStats_.isEmpty()) {
-          if (infoTypeStatsBuilder_.isEmpty()) {
-            infoTypeStatsBuilder_.dispose();
-            infoTypeStatsBuilder_ = null;
-            infoTypeStats_ = other.infoTypeStats_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-            infoTypeStatsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getInfoTypeStatsFieldBuilder() : null;
-          } else {
-            infoTypeStatsBuilder_.addAllMessages(other.infoTypeStats_);
-          }
-        }
-      }
-      if (other.hasCreateTime()) {
-        mergeCreateTime(other.getCreateTime());
-      }
-      if (other.hasRequestInspectConfig()) {
-        mergeRequestInspectConfig(other.getRequestInspectConfig());
-      }
-      if (other.hasRequestStorageConfig()) {
-        mergeRequestStorageConfig(other.getRequestStorageConfig());
-      }
-      if (other.hasRequestOutputConfig()) {
-        mergeRequestOutputConfig(other.getRequestOutputConfig());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.InspectOperationMetadata parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.InspectOperationMetadata) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private long processedBytes_ ;
-    /**
-     * 
-     * Total size in bytes that were processed.
-     * 

-     *
-     * int64 processed_bytes = 1;
-     */
-    public long getProcessedBytes() {
-      return processedBytes_;
-    }
-    /**
-     * 
-     * Total size in bytes that were processed.
-     * 

-     *
-     * int64 processed_bytes = 1;
-     */
-    public Builder setProcessedBytes(long value) {
-      
-      processedBytes_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Total size in bytes that were processed.
-     * 

-     *
-     * int64 processed_bytes = 1;
-     */
-    public Builder clearProcessedBytes() {
-      
-      processedBytes_ = 0L;
-      onChanged();
-      return this;
-    }
-
-    private long totalEstimatedBytes_ ;
-    /**
-     * 
-     * Estimate of the number of bytes to process.
-     * 

-     *
-     * int64 total_estimated_bytes = 4;
-     */
-    public long getTotalEstimatedBytes() {
-      return totalEstimatedBytes_;
-    }
-    /**
-     * 
-     * Estimate of the number of bytes to process.
-     * 

-     *
-     * int64 total_estimated_bytes = 4;
-     */
-    public Builder setTotalEstimatedBytes(long value) {
-      
-      totalEstimatedBytes_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Estimate of the number of bytes to process.
-     * 

-     *
-     * int64 total_estimated_bytes = 4;
-     */
-    public Builder clearTotalEstimatedBytes() {
-      
-      totalEstimatedBytes_ = 0L;
-      onChanged();
-      return this;
-    }
-
-    private java.util.List infoTypeStats_ =
-      java.util.Collections.emptyList();
-    private void ensureInfoTypeStatsIsMutable() {
-      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-        infoTypeStats_ = new java.util.ArrayList(infoTypeStats_);
-        bitField0_ |= 0x00000004;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoTypeStatistics, com.google.privacy.dlp.v2beta1.InfoTypeStatistics.Builder, com.google.privacy.dlp.v2beta1.InfoTypeStatisticsOrBuilder> infoTypeStatsBuilder_;
-
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public java.util.List getInfoTypeStatsList() {
-      if (infoTypeStatsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(infoTypeStats_);
-      } else {
-        return infoTypeStatsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public int getInfoTypeStatsCount() {
-      if (infoTypeStatsBuilder_ == null) {
-        return infoTypeStats_.size();
-      } else {
-        return infoTypeStatsBuilder_.getCount();
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeStatistics getInfoTypeStats(int index) {
-      if (infoTypeStatsBuilder_ == null) {
-        return infoTypeStats_.get(index);
-      } else {
-        return infoTypeStatsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public Builder setInfoTypeStats(
-        int index, com.google.privacy.dlp.v2beta1.InfoTypeStatistics value) {
-      if (infoTypeStatsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureInfoTypeStatsIsMutable();
-        infoTypeStats_.set(index, value);
-        onChanged();
-      } else {
-        infoTypeStatsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public Builder setInfoTypeStats(
-        int index, com.google.privacy.dlp.v2beta1.InfoTypeStatistics.Builder builderForValue) {
-      if (infoTypeStatsBuilder_ == null) {
-        ensureInfoTypeStatsIsMutable();
-        infoTypeStats_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        infoTypeStatsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public Builder addInfoTypeStats(com.google.privacy.dlp.v2beta1.InfoTypeStatistics value) {
-      if (infoTypeStatsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureInfoTypeStatsIsMutable();
-        infoTypeStats_.add(value);
-        onChanged();
-      } else {
-        infoTypeStatsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public Builder addInfoTypeStats(
-        int index, com.google.privacy.dlp.v2beta1.InfoTypeStatistics value) {
-      if (infoTypeStatsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureInfoTypeStatsIsMutable();
-        infoTypeStats_.add(index, value);
-        onChanged();
-      } else {
-        infoTypeStatsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public Builder addInfoTypeStats(
-        com.google.privacy.dlp.v2beta1.InfoTypeStatistics.Builder builderForValue) {
-      if (infoTypeStatsBuilder_ == null) {
-        ensureInfoTypeStatsIsMutable();
-        infoTypeStats_.add(builderForValue.build());
-        onChanged();
-      } else {
-        infoTypeStatsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public Builder addInfoTypeStats(
-        int index, com.google.privacy.dlp.v2beta1.InfoTypeStatistics.Builder builderForValue) {
-      if (infoTypeStatsBuilder_ == null) {
-        ensureInfoTypeStatsIsMutable();
-        infoTypeStats_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        infoTypeStatsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public Builder addAllInfoTypeStats(
-        java.lang.Iterable values) {
-      if (infoTypeStatsBuilder_ == null) {
-        ensureInfoTypeStatsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, infoTypeStats_);
-        onChanged();
-      } else {
-        infoTypeStatsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public Builder clearInfoTypeStats() {
-      if (infoTypeStatsBuilder_ == null) {
-        infoTypeStats_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-      } else {
-        infoTypeStatsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public Builder removeInfoTypeStats(int index) {
-      if (infoTypeStatsBuilder_ == null) {
-        ensureInfoTypeStatsIsMutable();
-        infoTypeStats_.remove(index);
-        onChanged();
-      } else {
-        infoTypeStatsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeStatistics.Builder getInfoTypeStatsBuilder(
-        int index) {
-      return getInfoTypeStatsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeStatisticsOrBuilder getInfoTypeStatsOrBuilder(
-        int index) {
-      if (infoTypeStatsBuilder_ == null) {
-        return infoTypeStats_.get(index);  } else {
-        return infoTypeStatsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public java.util.List 
-         getInfoTypeStatsOrBuilderList() {
-      if (infoTypeStatsBuilder_ != null) {
-        return infoTypeStatsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(infoTypeStats_);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeStatistics.Builder addInfoTypeStatsBuilder() {
-      return getInfoTypeStatsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.InfoTypeStatistics.getDefaultInstance());
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeStatistics.Builder addInfoTypeStatsBuilder(
-        int index) {
-      return getInfoTypeStatsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.InfoTypeStatistics.getDefaultInstance());
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-     */
-    public java.util.List 
-         getInfoTypeStatsBuilderList() {
-      return getInfoTypeStatsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoTypeStatistics, com.google.privacy.dlp.v2beta1.InfoTypeStatistics.Builder, com.google.privacy.dlp.v2beta1.InfoTypeStatisticsOrBuilder> 
-        getInfoTypeStatsFieldBuilder() {
-      if (infoTypeStatsBuilder_ == null) {
-        infoTypeStatsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InfoTypeStatistics, com.google.privacy.dlp.v2beta1.InfoTypeStatistics.Builder, com.google.privacy.dlp.v2beta1.InfoTypeStatisticsOrBuilder>(
-                infoTypeStats_,
-                ((bitField0_ & 0x00000004) == 0x00000004),
-                getParentForChildren(),
-                isClean());
-        infoTypeStats_ = null;
-      }
-      return infoTypeStatsBuilder_;
-    }
-
-    private com.google.protobuf.Timestamp createTime_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> createTimeBuilder_;
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 3;
-     */
-    public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 3;
-     */
-    public com.google.protobuf.Timestamp getCreateTime() {
-      if (createTimeBuilder_ == null) {
-        return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
-      } else {
-        return createTimeBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 3;
-     */
-    public Builder setCreateTime(com.google.protobuf.Timestamp value) {
-      if (createTimeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        createTime_ = value;
-        onChanged();
-      } else {
-        createTimeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 3;
-     */
-    public Builder setCreateTime(
-        com.google.protobuf.Timestamp.Builder builderForValue) {
-      if (createTimeBuilder_ == null) {
-        createTime_ = builderForValue.build();
-        onChanged();
-      } else {
-        createTimeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 3;
-     */
-    public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
-      if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-            com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
-        } else {
-          createTime_ = value;
-        }
-        onChanged();
-      } else {
-        createTimeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 3;
-     */
-    public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
-        createTimeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 3;
-     */
-    public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      
-      onChanged();
-      return getCreateTimeFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 3;
-     */
-    public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-      if (createTimeBuilder_ != null) {
-        return createTimeBuilder_.getMessageOrBuilder();
-      } else {
-        return createTime_ == null ?
-            com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
-      }
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 3;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
-        getCreateTimeFieldBuilder() {
-      if (createTimeBuilder_ == null) {
-        createTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
-                getCreateTime(),
-                getParentForChildren(),
-                isClean());
-        createTime_ = null;
-      }
-      return createTimeBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.InspectConfig requestInspectConfig_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder> requestInspectConfigBuilder_;
-    /**
-     * 
-     * The inspect config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-     */
-    public boolean hasRequestInspectConfig() {
-      return requestInspectConfigBuilder_ != null || requestInspectConfig_ != null;
-    }
-    /**
-     * 
-     * The inspect config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig getRequestInspectConfig() {
-      if (requestInspectConfigBuilder_ == null) {
-        return requestInspectConfig_ == null ? com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : requestInspectConfig_;
-      } else {
-        return requestInspectConfigBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The inspect config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-     */
-    public Builder setRequestInspectConfig(com.google.privacy.dlp.v2beta1.InspectConfig value) {
-      if (requestInspectConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        requestInspectConfig_ = value;
-        onChanged();
-      } else {
-        requestInspectConfigBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The inspect config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-     */
-    public Builder setRequestInspectConfig(
-        com.google.privacy.dlp.v2beta1.InspectConfig.Builder builderForValue) {
-      if (requestInspectConfigBuilder_ == null) {
-        requestInspectConfig_ = builderForValue.build();
-        onChanged();
-      } else {
-        requestInspectConfigBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The inspect config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-     */
-    public Builder mergeRequestInspectConfig(com.google.privacy.dlp.v2beta1.InspectConfig value) {
-      if (requestInspectConfigBuilder_ == null) {
-        if (requestInspectConfig_ != null) {
-          requestInspectConfig_ =
-            com.google.privacy.dlp.v2beta1.InspectConfig.newBuilder(requestInspectConfig_).mergeFrom(value).buildPartial();
-        } else {
-          requestInspectConfig_ = value;
-        }
-        onChanged();
-      } else {
-        requestInspectConfigBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The inspect config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-     */
-    public Builder clearRequestInspectConfig() {
-      if (requestInspectConfigBuilder_ == null) {
-        requestInspectConfig_ = null;
-        onChanged();
-      } else {
-        requestInspectConfig_ = null;
-        requestInspectConfigBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The inspect config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig.Builder getRequestInspectConfigBuilder() {
-      
-      onChanged();
-      return getRequestInspectConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The inspect config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getRequestInspectConfigOrBuilder() {
-      if (requestInspectConfigBuilder_ != null) {
-        return requestInspectConfigBuilder_.getMessageOrBuilder();
-      } else {
-        return requestInspectConfig_ == null ?
-            com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : requestInspectConfig_;
-      }
-    }
-    /**
-     * 
-     * The inspect config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder> 
-        getRequestInspectConfigFieldBuilder() {
-      if (requestInspectConfigBuilder_ == null) {
-        requestInspectConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder>(
-                getRequestInspectConfig(),
-                getParentForChildren(),
-                isClean());
-        requestInspectConfig_ = null;
-      }
-      return requestInspectConfigBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.StorageConfig requestStorageConfig_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.StorageConfig, com.google.privacy.dlp.v2beta1.StorageConfig.Builder, com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder> requestStorageConfigBuilder_;
-    /**
-     * 
-     * The storage config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-     */
-    public boolean hasRequestStorageConfig() {
-      return requestStorageConfigBuilder_ != null || requestStorageConfig_ != null;
-    }
-    /**
-     * 
-     * The storage config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.StorageConfig getRequestStorageConfig() {
-      if (requestStorageConfigBuilder_ == null) {
-        return requestStorageConfig_ == null ? com.google.privacy.dlp.v2beta1.StorageConfig.getDefaultInstance() : requestStorageConfig_;
-      } else {
-        return requestStorageConfigBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The storage config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-     */
-    public Builder setRequestStorageConfig(com.google.privacy.dlp.v2beta1.StorageConfig value) {
-      if (requestStorageConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        requestStorageConfig_ = value;
-        onChanged();
-      } else {
-        requestStorageConfigBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The storage config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-     */
-    public Builder setRequestStorageConfig(
-        com.google.privacy.dlp.v2beta1.StorageConfig.Builder builderForValue) {
-      if (requestStorageConfigBuilder_ == null) {
-        requestStorageConfig_ = builderForValue.build();
-        onChanged();
-      } else {
-        requestStorageConfigBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The storage config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-     */
-    public Builder mergeRequestStorageConfig(com.google.privacy.dlp.v2beta1.StorageConfig value) {
-      if (requestStorageConfigBuilder_ == null) {
-        if (requestStorageConfig_ != null) {
-          requestStorageConfig_ =
-            com.google.privacy.dlp.v2beta1.StorageConfig.newBuilder(requestStorageConfig_).mergeFrom(value).buildPartial();
-        } else {
-          requestStorageConfig_ = value;
-        }
-        onChanged();
-      } else {
-        requestStorageConfigBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The storage config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-     */
-    public Builder clearRequestStorageConfig() {
-      if (requestStorageConfigBuilder_ == null) {
-        requestStorageConfig_ = null;
-        onChanged();
-      } else {
-        requestStorageConfig_ = null;
-        requestStorageConfigBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The storage config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.StorageConfig.Builder getRequestStorageConfigBuilder() {
-      
-      onChanged();
-      return getRequestStorageConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The storage config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder getRequestStorageConfigOrBuilder() {
-      if (requestStorageConfigBuilder_ != null) {
-        return requestStorageConfigBuilder_.getMessageOrBuilder();
-      } else {
-        return requestStorageConfig_ == null ?
-            com.google.privacy.dlp.v2beta1.StorageConfig.getDefaultInstance() : requestStorageConfig_;
-      }
-    }
-    /**
-     * 
-     * The storage config used to create the Operation.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.StorageConfig, com.google.privacy.dlp.v2beta1.StorageConfig.Builder, com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder> 
-        getRequestStorageConfigFieldBuilder() {
-      if (requestStorageConfigBuilder_ == null) {
-        requestStorageConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.StorageConfig, com.google.privacy.dlp.v2beta1.StorageConfig.Builder, com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder>(
-                getRequestStorageConfig(),
-                getParentForChildren(),
-                isClean());
-        requestStorageConfig_ = null;
-      }
-      return requestStorageConfigBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.OutputStorageConfig requestOutputConfig_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.OutputStorageConfig, com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder, com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder> requestOutputConfigBuilder_;
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-     */
-    public boolean hasRequestOutputConfig() {
-      return requestOutputConfigBuilder_ != null || requestOutputConfig_ != null;
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-     */
-    public com.google.privacy.dlp.v2beta1.OutputStorageConfig getRequestOutputConfig() {
-      if (requestOutputConfigBuilder_ == null) {
-        return requestOutputConfig_ == null ? com.google.privacy.dlp.v2beta1.OutputStorageConfig.getDefaultInstance() : requestOutputConfig_;
-      } else {
-        return requestOutputConfigBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-     */
-    public Builder setRequestOutputConfig(com.google.privacy.dlp.v2beta1.OutputStorageConfig value) {
-      if (requestOutputConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        requestOutputConfig_ = value;
-        onChanged();
-      } else {
-        requestOutputConfigBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-     */
-    public Builder setRequestOutputConfig(
-        com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder builderForValue) {
-      if (requestOutputConfigBuilder_ == null) {
-        requestOutputConfig_ = builderForValue.build();
-        onChanged();
-      } else {
-        requestOutputConfigBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-     */
-    public Builder mergeRequestOutputConfig(com.google.privacy.dlp.v2beta1.OutputStorageConfig value) {
-      if (requestOutputConfigBuilder_ == null) {
-        if (requestOutputConfig_ != null) {
-          requestOutputConfig_ =
-            com.google.privacy.dlp.v2beta1.OutputStorageConfig.newBuilder(requestOutputConfig_).mergeFrom(value).buildPartial();
-        } else {
-          requestOutputConfig_ = value;
-        }
-        onChanged();
-      } else {
-        requestOutputConfigBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-     */
-    public Builder clearRequestOutputConfig() {
-      if (requestOutputConfigBuilder_ == null) {
-        requestOutputConfig_ = null;
-        onChanged();
-      } else {
-        requestOutputConfig_ = null;
-        requestOutputConfigBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-     */
-    public com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder getRequestOutputConfigBuilder() {
-      
-      onChanged();
-      return getRequestOutputConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-     */
-    public com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder getRequestOutputConfigOrBuilder() {
-      if (requestOutputConfigBuilder_ != null) {
-        return requestOutputConfigBuilder_.getMessageOrBuilder();
-      } else {
-        return requestOutputConfig_ == null ?
-            com.google.privacy.dlp.v2beta1.OutputStorageConfig.getDefaultInstance() : requestOutputConfig_;
-      }
-    }
-    /**
-     * 
-     * Optional location to store findings.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.OutputStorageConfig, com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder, com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder> 
-        getRequestOutputConfigFieldBuilder() {
-      if (requestOutputConfigBuilder_ == null) {
-        requestOutputConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.OutputStorageConfig, com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder, com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder>(
-                getRequestOutputConfig(),
-                getParentForChildren(),
-                isClean());
-        requestOutputConfig_ = null;
-      }
-      return requestOutputConfigBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.InspectOperationMetadata)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.InspectOperationMetadata)
-  private static final com.google.privacy.dlp.v2beta1.InspectOperationMetadata DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.InspectOperationMetadata();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InspectOperationMetadata getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public InspectOperationMetadata parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectOperationMetadata(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.InspectOperationMetadata getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationMetadataOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationMetadataOrBuilder.java
deleted file mode 100644
index 32ae7d60924e..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationMetadataOrBuilder.java
+++ /dev/null
@@ -1,151 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface InspectOperationMetadataOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.InspectOperationMetadata)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Total size in bytes that were processed.
-   * 

-   *
-   * int64 processed_bytes = 1;
-   */
-  long getProcessedBytes();
-
-  /**
-   * 
-   * Estimate of the number of bytes to process.
-   * 

-   *
-   * int64 total_estimated_bytes = 4;
-   */
-  long getTotalEstimatedBytes();
-
-  /**
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-   */
-  java.util.List 
-      getInfoTypeStatsList();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeStatistics getInfoTypeStats(int index);
-  /**
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-   */
-  int getInfoTypeStatsCount();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-   */
-  java.util.List 
-      getInfoTypeStatsOrBuilderList();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeStatistics info_type_stats = 2;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeStatisticsOrBuilder getInfoTypeStatsOrBuilder(
-      int index);
-
-  /**
-   * 
-   * The time which this request was started.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 3;
-   */
-  boolean hasCreateTime();
-  /**
-   * 
-   * The time which this request was started.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 3;
-   */
-  com.google.protobuf.Timestamp getCreateTime();
-  /**
-   * 
-   * The time which this request was started.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 3;
-   */
-  com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder();
-
-  /**
-   * 
-   * The inspect config used to create the Operation.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-   */
-  boolean hasRequestInspectConfig();
-  /**
-   * 
-   * The inspect config used to create the Operation.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-   */
-  com.google.privacy.dlp.v2beta1.InspectConfig getRequestInspectConfig();
-  /**
-   * 
-   * The inspect config used to create the Operation.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig request_inspect_config = 5;
-   */
-  com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getRequestInspectConfigOrBuilder();
-
-  /**
-   * 
-   * The storage config used to create the Operation.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-   */
-  boolean hasRequestStorageConfig();
-  /**
-   * 
-   * The storage config used to create the Operation.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-   */
-  com.google.privacy.dlp.v2beta1.StorageConfig getRequestStorageConfig();
-  /**
-   * 
-   * The storage config used to create the Operation.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.StorageConfig request_storage_config = 6;
-   */
-  com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder getRequestStorageConfigOrBuilder();
-
-  /**
-   * 
-   * Optional location to store findings.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-   */
-  boolean hasRequestOutputConfig();
-  /**
-   * 
-   * Optional location to store findings.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-   */
-  com.google.privacy.dlp.v2beta1.OutputStorageConfig getRequestOutputConfig();
-  /**
-   * 
-   * Optional location to store findings.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.OutputStorageConfig request_output_config = 7;
-   */
-  com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder getRequestOutputConfigOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationResult.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationResult.java
deleted file mode 100644
index 26456ec96aca..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationResult.java
+++ /dev/null
@@ -1,566 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * The operational data.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.InspectOperationResult}
- */
-public  final class InspectOperationResult extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.InspectOperationResult)
-    InspectOperationResultOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use InspectOperationResult.newBuilder() to construct.
-  private InspectOperationResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private InspectOperationResult() {
-    name_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private InspectOperationResult(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectOperationResult_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectOperationResult_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.InspectOperationResult.class, com.google.privacy.dlp.v2beta1.InspectOperationResult.Builder.class);
-  }
-
-  public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
-  /**
-   * 
-   * The server-assigned name, which is only unique within the same service that
-   * originally returns it. If you use the default HTTP mapping, the
-   * `name` should have the format of `inspect/results/{id}`.
-   * 

-   *
-   * string name = 1;
-   */
-  public java.lang.String getName() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      name_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * The server-assigned name, which is only unique within the same service that
-   * originally returns it. If you use the default HTTP mapping, the
-   * `name` should have the format of `inspect/results/{id}`.
-   * 

-   *
-   * string name = 1;
-   */
-  public com.google.protobuf.ByteString
-      getNameBytes() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      name_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.InspectOperationResult)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.InspectOperationResult other = (com.google.privacy.dlp.v2beta1.InspectOperationResult) obj;
-
-    boolean result = true;
-    result = result && getName()
-        .equals(other.getName());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.InspectOperationResult prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * The operational data.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.InspectOperationResult}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.InspectOperationResult)
-      com.google.privacy.dlp.v2beta1.InspectOperationResultOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectOperationResult_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectOperationResult_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.InspectOperationResult.class, com.google.privacy.dlp.v2beta1.InspectOperationResult.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.InspectOperationResult.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      name_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectOperationResult_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectOperationResult getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.InspectOperationResult.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectOperationResult build() {
-      com.google.privacy.dlp.v2beta1.InspectOperationResult result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectOperationResult buildPartial() {
-      com.google.privacy.dlp.v2beta1.InspectOperationResult result = new com.google.privacy.dlp.v2beta1.InspectOperationResult(this);
-      result.name_ = name_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.InspectOperationResult) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.InspectOperationResult)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.InspectOperationResult other) {
-      if (other == com.google.privacy.dlp.v2beta1.InspectOperationResult.getDefaultInstance()) return this;
-      if (!other.getName().isEmpty()) {
-        name_ = other.name_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.InspectOperationResult parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.InspectOperationResult) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object name_ = "";
-    /**
-     * 
-     * The server-assigned name, which is only unique within the same service that
-     * originally returns it. If you use the default HTTP mapping, the
-     * `name` should have the format of `inspect/results/{id}`.
-     * 

-     *
-     * string name = 1;
-     */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        name_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * The server-assigned name, which is only unique within the same service that
-     * originally returns it. If you use the default HTTP mapping, the
-     * `name` should have the format of `inspect/results/{id}`.
-     * 

-     *
-     * string name = 1;
-     */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
-      java.lang.Object ref = name_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        name_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * The server-assigned name, which is only unique within the same service that
-     * originally returns it. If you use the default HTTP mapping, the
-     * `name` should have the format of `inspect/results/{id}`.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder setName(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The server-assigned name, which is only unique within the same service that
-     * originally returns it. If you use the default HTTP mapping, the
-     * `name` should have the format of `inspect/results/{id}`.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder clearName() {
-      
-      name_ = getDefaultInstance().getName();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The server-assigned name, which is only unique within the same service that
-     * originally returns it. If you use the default HTTP mapping, the
-     * `name` should have the format of `inspect/results/{id}`.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder setNameBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.InspectOperationResult)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.InspectOperationResult)
-  private static final com.google.privacy.dlp.v2beta1.InspectOperationResult DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.InspectOperationResult();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InspectOperationResult getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public InspectOperationResult parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectOperationResult(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.InspectOperationResult getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationResultOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationResultOrBuilder.java
deleted file mode 100644
index 37e2942e96ad..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectOperationResultOrBuilder.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface InspectOperationResultOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.InspectOperationResult)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The server-assigned name, which is only unique within the same service that
-   * originally returns it. If you use the default HTTP mapping, the
-   * `name` should have the format of `inspect/results/{id}`.
-   * 

-   *
-   * string name = 1;
-   */
-  java.lang.String getName();
-  /**
-   * 
-   * The server-assigned name, which is only unique within the same service that
-   * originally returns it. If you use the default HTTP mapping, the
-   * `name` should have the format of `inspect/results/{id}`.
-   * 

-   *
-   * string name = 1;
-   */
-  com.google.protobuf.ByteString
-      getNameBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectResult.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectResult.java
deleted file mode 100644
index 29ccd1c0d8b6..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectResult.java
+++ /dev/null
@@ -1,932 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * All the findings for a single scanned item.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.InspectResult}
- */
-public  final class InspectResult extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.InspectResult)
-    InspectResultOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use InspectResult.newBuilder() to construct.
-  private InspectResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private InspectResult() {
-    findings_ = java.util.Collections.emptyList();
-    findingsTruncated_ = false;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private InspectResult(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              findings_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            findings_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.Finding.parser(), extensionRegistry));
-            break;
-          }
-          case 16: {
-
-            findingsTruncated_ = input.readBool();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        findings_ = java.util.Collections.unmodifiableList(findings_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectResult_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectResult_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.InspectResult.class, com.google.privacy.dlp.v2beta1.InspectResult.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int FINDINGS_FIELD_NUMBER = 1;
-  private java.util.List findings_;
-  /**
-   * 
-   * List of findings for an item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-   */
-  public java.util.List getFindingsList() {
-    return findings_;
-  }
-  /**
-   * 
-   * List of findings for an item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-   */
-  public java.util.List 
-      getFindingsOrBuilderList() {
-    return findings_;
-  }
-  /**
-   * 
-   * List of findings for an item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-   */
-  public int getFindingsCount() {
-    return findings_.size();
-  }
-  /**
-   * 
-   * List of findings for an item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.Finding getFindings(int index) {
-    return findings_.get(index);
-  }
-  /**
-   * 
-   * List of findings for an item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.FindingOrBuilder getFindingsOrBuilder(
-      int index) {
-    return findings_.get(index);
-  }
-
-  public static final int FINDINGS_TRUNCATED_FIELD_NUMBER = 2;
-  private boolean findingsTruncated_;
-  /**
-   * 
-   * If true, then this item might have more findings than were returned,
-   * and the findings returned are an arbitrary subset of all findings.
-   * The findings list might be truncated because the input items were too
-   * large, or because the server reached the maximum amount of resources
-   * allowed for a single API call. For best results, divide the input into
-   * smaller batches.
-   * 

-   *
-   * bool findings_truncated = 2;
-   */
-  public boolean getFindingsTruncated() {
-    return findingsTruncated_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < findings_.size(); i++) {
-      output.writeMessage(1, findings_.get(i));
-    }
-    if (findingsTruncated_ != false) {
-      output.writeBool(2, findingsTruncated_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < findings_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, findings_.get(i));
-    }
-    if (findingsTruncated_ != false) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(2, findingsTruncated_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.InspectResult)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.InspectResult other = (com.google.privacy.dlp.v2beta1.InspectResult) obj;
-
-    boolean result = true;
-    result = result && getFindingsList()
-        .equals(other.getFindingsList());
-    result = result && (getFindingsTruncated()
-        == other.getFindingsTruncated());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getFindingsCount() > 0) {
-      hash = (37 * hash) + FINDINGS_FIELD_NUMBER;
-      hash = (53 * hash) + getFindingsList().hashCode();
-    }
-    hash = (37 * hash) + FINDINGS_TRUNCATED_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-        getFindingsTruncated());
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InspectResult parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectResult parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectResult parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectResult parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectResult parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectResult parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectResult parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectResult parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectResult parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectResult parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectResult parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.InspectResult parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.InspectResult prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * All the findings for a single scanned item.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.InspectResult}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.InspectResult)
-      com.google.privacy.dlp.v2beta1.InspectResultOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectResult_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectResult_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.InspectResult.class, com.google.privacy.dlp.v2beta1.InspectResult.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.InspectResult.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getFindingsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (findingsBuilder_ == null) {
-        findings_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        findingsBuilder_.clear();
-      }
-      findingsTruncated_ = false;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_InspectResult_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectResult getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.InspectResult.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectResult build() {
-      com.google.privacy.dlp.v2beta1.InspectResult result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.InspectResult buildPartial() {
-      com.google.privacy.dlp.v2beta1.InspectResult result = new com.google.privacy.dlp.v2beta1.InspectResult(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (findingsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          findings_ = java.util.Collections.unmodifiableList(findings_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.findings_ = findings_;
-      } else {
-        result.findings_ = findingsBuilder_.build();
-      }
-      result.findingsTruncated_ = findingsTruncated_;
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.InspectResult) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.InspectResult)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.InspectResult other) {
-      if (other == com.google.privacy.dlp.v2beta1.InspectResult.getDefaultInstance()) return this;
-      if (findingsBuilder_ == null) {
-        if (!other.findings_.isEmpty()) {
-          if (findings_.isEmpty()) {
-            findings_ = other.findings_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureFindingsIsMutable();
-            findings_.addAll(other.findings_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.findings_.isEmpty()) {
-          if (findingsBuilder_.isEmpty()) {
-            findingsBuilder_.dispose();
-            findingsBuilder_ = null;
-            findings_ = other.findings_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            findingsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getFindingsFieldBuilder() : null;
-          } else {
-            findingsBuilder_.addAllMessages(other.findings_);
-          }
-        }
-      }
-      if (other.getFindingsTruncated() != false) {
-        setFindingsTruncated(other.getFindingsTruncated());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.InspectResult parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.InspectResult) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List findings_ =
-      java.util.Collections.emptyList();
-    private void ensureFindingsIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        findings_ = new java.util.ArrayList(findings_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Finding, com.google.privacy.dlp.v2beta1.Finding.Builder, com.google.privacy.dlp.v2beta1.FindingOrBuilder> findingsBuilder_;
-
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public java.util.List getFindingsList() {
-      if (findingsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(findings_);
-      } else {
-        return findingsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public int getFindingsCount() {
-      if (findingsBuilder_ == null) {
-        return findings_.size();
-      } else {
-        return findingsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Finding getFindings(int index) {
-      if (findingsBuilder_ == null) {
-        return findings_.get(index);
-      } else {
-        return findingsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public Builder setFindings(
-        int index, com.google.privacy.dlp.v2beta1.Finding value) {
-      if (findingsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFindingsIsMutable();
-        findings_.set(index, value);
-        onChanged();
-      } else {
-        findingsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public Builder setFindings(
-        int index, com.google.privacy.dlp.v2beta1.Finding.Builder builderForValue) {
-      if (findingsBuilder_ == null) {
-        ensureFindingsIsMutable();
-        findings_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        findingsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public Builder addFindings(com.google.privacy.dlp.v2beta1.Finding value) {
-      if (findingsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFindingsIsMutable();
-        findings_.add(value);
-        onChanged();
-      } else {
-        findingsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public Builder addFindings(
-        int index, com.google.privacy.dlp.v2beta1.Finding value) {
-      if (findingsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFindingsIsMutable();
-        findings_.add(index, value);
-        onChanged();
-      } else {
-        findingsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public Builder addFindings(
-        com.google.privacy.dlp.v2beta1.Finding.Builder builderForValue) {
-      if (findingsBuilder_ == null) {
-        ensureFindingsIsMutable();
-        findings_.add(builderForValue.build());
-        onChanged();
-      } else {
-        findingsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public Builder addFindings(
-        int index, com.google.privacy.dlp.v2beta1.Finding.Builder builderForValue) {
-      if (findingsBuilder_ == null) {
-        ensureFindingsIsMutable();
-        findings_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        findingsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public Builder addAllFindings(
-        java.lang.Iterable values) {
-      if (findingsBuilder_ == null) {
-        ensureFindingsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, findings_);
-        onChanged();
-      } else {
-        findingsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public Builder clearFindings() {
-      if (findingsBuilder_ == null) {
-        findings_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        findingsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public Builder removeFindings(int index) {
-      if (findingsBuilder_ == null) {
-        ensureFindingsIsMutable();
-        findings_.remove(index);
-        onChanged();
-      } else {
-        findingsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Finding.Builder getFindingsBuilder(
-        int index) {
-      return getFindingsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FindingOrBuilder getFindingsOrBuilder(
-        int index) {
-      if (findingsBuilder_ == null) {
-        return findings_.get(index);  } else {
-        return findingsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public java.util.List 
-         getFindingsOrBuilderList() {
-      if (findingsBuilder_ != null) {
-        return findingsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(findings_);
-      }
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Finding.Builder addFindingsBuilder() {
-      return getFindingsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.Finding.getDefaultInstance());
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Finding.Builder addFindingsBuilder(
-        int index) {
-      return getFindingsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.Finding.getDefaultInstance());
-    }
-    /**
-     * 
-     * List of findings for an item.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-     */
-    public java.util.List 
-         getFindingsBuilderList() {
-      return getFindingsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Finding, com.google.privacy.dlp.v2beta1.Finding.Builder, com.google.privacy.dlp.v2beta1.FindingOrBuilder> 
-        getFindingsFieldBuilder() {
-      if (findingsBuilder_ == null) {
-        findingsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Finding, com.google.privacy.dlp.v2beta1.Finding.Builder, com.google.privacy.dlp.v2beta1.FindingOrBuilder>(
-                findings_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        findings_ = null;
-      }
-      return findingsBuilder_;
-    }
-
-    private boolean findingsTruncated_ ;
-    /**
-     * 
-     * If true, then this item might have more findings than were returned,
-     * and the findings returned are an arbitrary subset of all findings.
-     * The findings list might be truncated because the input items were too
-     * large, or because the server reached the maximum amount of resources
-     * allowed for a single API call. For best results, divide the input into
-     * smaller batches.
-     * 

-     *
-     * bool findings_truncated = 2;
-     */
-    public boolean getFindingsTruncated() {
-      return findingsTruncated_;
-    }
-    /**
-     * 
-     * If true, then this item might have more findings than were returned,
-     * and the findings returned are an arbitrary subset of all findings.
-     * The findings list might be truncated because the input items were too
-     * large, or because the server reached the maximum amount of resources
-     * allowed for a single API call. For best results, divide the input into
-     * smaller batches.
-     * 

-     *
-     * bool findings_truncated = 2;
-     */
-    public Builder setFindingsTruncated(boolean value) {
-      
-      findingsTruncated_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * If true, then this item might have more findings than were returned,
-     * and the findings returned are an arbitrary subset of all findings.
-     * The findings list might be truncated because the input items were too
-     * large, or because the server reached the maximum amount of resources
-     * allowed for a single API call. For best results, divide the input into
-     * smaller batches.
-     * 

-     *
-     * bool findings_truncated = 2;
-     */
-    public Builder clearFindingsTruncated() {
-      
-      findingsTruncated_ = false;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.InspectResult)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.InspectResult)
-  private static final com.google.privacy.dlp.v2beta1.InspectResult DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.InspectResult();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.InspectResult getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public InspectResult parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectResult(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.InspectResult getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectResultOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectResultOrBuilder.java
deleted file mode 100644
index 10553fe97191..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/InspectResultOrBuilder.java
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface InspectResultOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.InspectResult)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * List of findings for an item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-   */
-  java.util.List 
-      getFindingsList();
-  /**
-   * 
-   * List of findings for an item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-   */
-  com.google.privacy.dlp.v2beta1.Finding getFindings(int index);
-  /**
-   * 
-   * List of findings for an item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-   */
-  int getFindingsCount();
-  /**
-   * 
-   * List of findings for an item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-   */
-  java.util.List 
-      getFindingsOrBuilderList();
-  /**
-   * 
-   * List of findings for an item.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Finding findings = 1;
-   */
-  com.google.privacy.dlp.v2beta1.FindingOrBuilder getFindingsOrBuilder(
-      int index);
-
-  /**
-   * 
-   * If true, then this item might have more findings than were returned,
-   * and the findings returned are an arbitrary subset of all findings.
-   * The findings list might be truncated because the input items were too
-   * large, or because the server reached the maximum amount of resources
-   * allowed for a single API call. For best results, divide the input into
-   * smaller batches.
-   * 

-   *
-   * bool findings_truncated = 2;
-   */
-  boolean getFindingsTruncated();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Key.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Key.java
deleted file mode 100644
index 7e66f013f40f..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Key.java
+++ /dev/null
@@ -1,2262 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * A unique identifier for a Datastore entity.
- * If a key's partition ID or any of its path kinds or names are
- * reserved/read-only, the key is reserved/read-only.
- * A reserved/read-only key is forbidden in certain documented contexts.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.Key}
- */
-public  final class Key extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.Key)
-    KeyOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Key.newBuilder() to construct.
-  private Key(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private Key() {
-    path_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Key(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.PartitionId.Builder subBuilder = null;
-            if (partitionId_ != null) {
-              subBuilder = partitionId_.toBuilder();
-            }
-            partitionId_ = input.readMessage(com.google.privacy.dlp.v2beta1.PartitionId.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(partitionId_);
-              partitionId_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              path_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
-            }
-            path_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.Key.PathElement.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-        path_ = java.util.Collections.unmodifiableList(path_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Key_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Key_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.Key.class, com.google.privacy.dlp.v2beta1.Key.Builder.class);
-  }
-
-  public interface PathElementOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.Key.PathElement)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * The kind of the entity.
-     * A kind matching regex `__.*__` is reserved/read-only.
-     * A kind must not contain more than 1500 bytes when UTF-8 encoded.
-     * Cannot be `""`.
-     * 

-     *
-     * string kind = 1;
-     */
-    java.lang.String getKind();
-    /**
-     * 
-     * The kind of the entity.
-     * A kind matching regex `__.*__` is reserved/read-only.
-     * A kind must not contain more than 1500 bytes when UTF-8 encoded.
-     * Cannot be `""`.
-     * 

-     *
-     * string kind = 1;
-     */
-    com.google.protobuf.ByteString
-        getKindBytes();
-
-    /**
-     * 
-     * The auto-allocated ID of the entity.
-     * Never equal to zero. Values less than zero are discouraged and may not
-     * be supported in the future.
-     * 

-     *
-     * int64 id = 2;
-     */
-    long getId();
-
-    /**
-     * 
-     * The name of the entity.
-     * A name matching regex `__.*__` is reserved/read-only.
-     * A name must not be more than 1500 bytes when UTF-8 encoded.
-     * Cannot be `""`.
-     * 

-     *
-     * string name = 3;
-     */
-    java.lang.String getName();
-    /**
-     * 
-     * The name of the entity.
-     * A name matching regex `__.*__` is reserved/read-only.
-     * A name must not be more than 1500 bytes when UTF-8 encoded.
-     * Cannot be `""`.
-     * 

-     *
-     * string name = 3;
-     */
-    com.google.protobuf.ByteString
-        getNameBytes();
-
-    public com.google.privacy.dlp.v2beta1.Key.PathElement.IdTypeCase getIdTypeCase();
-  }
-  /**
-   * 
-   * A (kind, ID/name) pair used to construct a key path.
-   * If either name or ID is set, the element is complete.
-   * If neither is set, the element is incomplete.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.Key.PathElement}
-   */
-  public  static final class PathElement extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.Key.PathElement)
-      PathElementOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use PathElement.newBuilder() to construct.
-    private PathElement(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private PathElement() {
-      kind_ = "";
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PathElement(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              kind_ = s;
-              break;
-            }
-            case 16: {
-              idTypeCase_ = 2;
-              idType_ = input.readInt64();
-              break;
-            }
-            case 26: {
-              java.lang.String s = input.readStringRequireUtf8();
-              idTypeCase_ = 3;
-              idType_ = s;
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Key_PathElement_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Key_PathElement_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.Key.PathElement.class, com.google.privacy.dlp.v2beta1.Key.PathElement.Builder.class);
-    }
-
-    private int idTypeCase_ = 0;
-    private java.lang.Object idType_;
-    public enum IdTypeCase
-        implements com.google.protobuf.Internal.EnumLite {
-      ID(2),
-      NAME(3),
-      IDTYPE_NOT_SET(0);
-      private final int value;
-      private IdTypeCase(int value) {
-        this.value = value;
-      }
-      /**
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static IdTypeCase valueOf(int value) {
-        return forNumber(value);
-      }
-
-      public static IdTypeCase forNumber(int value) {
-        switch (value) {
-          case 2: return ID;
-          case 3: return NAME;
-          case 0: return IDTYPE_NOT_SET;
-          default: return null;
-        }
-      }
-      public int getNumber() {
-        return this.value;
-      }
-    };
-
-    public IdTypeCase
-    getIdTypeCase() {
-      return IdTypeCase.forNumber(
-          idTypeCase_);
-    }
-
-    public static final int KIND_FIELD_NUMBER = 1;
-    private volatile java.lang.Object kind_;
-    /**
-     * 
-     * The kind of the entity.
-     * A kind matching regex `__.*__` is reserved/read-only.
-     * A kind must not contain more than 1500 bytes when UTF-8 encoded.
-     * Cannot be `""`.
-     * 

-     *
-     * string kind = 1;
-     */
-    public java.lang.String getKind() {
-      java.lang.Object ref = kind_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        kind_ = s;
-        return s;
-      }
-    }
-    /**
-     * 
-     * The kind of the entity.
-     * A kind matching regex `__.*__` is reserved/read-only.
-     * A kind must not contain more than 1500 bytes when UTF-8 encoded.
-     * Cannot be `""`.
-     * 

-     *
-     * string kind = 1;
-     */
-    public com.google.protobuf.ByteString
-        getKindBytes() {
-      java.lang.Object ref = kind_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        kind_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int ID_FIELD_NUMBER = 2;
-    /**
-     * 
-     * The auto-allocated ID of the entity.
-     * Never equal to zero. Values less than zero are discouraged and may not
-     * be supported in the future.
-     * 

-     *
-     * int64 id = 2;
-     */
-    public long getId() {
-      if (idTypeCase_ == 2) {
-        return (java.lang.Long) idType_;
-      }
-      return 0L;
-    }
-
-    public static final int NAME_FIELD_NUMBER = 3;
-    /**
-     * 
-     * The name of the entity.
-     * A name matching regex `__.*__` is reserved/read-only.
-     * A name must not be more than 1500 bytes when UTF-8 encoded.
-     * Cannot be `""`.
-     * 

-     *
-     * string name = 3;
-     */
-    public java.lang.String getName() {
-      java.lang.Object ref = "";
-      if (idTypeCase_ == 3) {
-        ref = idType_;
-      }
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (idTypeCase_ == 3) {
-          idType_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * 
-     * The name of the entity.
-     * A name matching regex `__.*__` is reserved/read-only.
-     * A name must not be more than 1500 bytes when UTF-8 encoded.
-     * Cannot be `""`.
-     * 

-     *
-     * string name = 3;
-     */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
-      java.lang.Object ref = "";
-      if (idTypeCase_ == 3) {
-        ref = idType_;
-      }
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        if (idTypeCase_ == 3) {
-          idType_ = b;
-        }
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (!getKindBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, kind_);
-      }
-      if (idTypeCase_ == 2) {
-        output.writeInt64(
-            2, (long)((java.lang.Long) idType_));
-      }
-      if (idTypeCase_ == 3) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, idType_);
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (!getKindBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, kind_);
-      }
-      if (idTypeCase_ == 2) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt64Size(
-              2, (long)((java.lang.Long) idType_));
-      }
-      if (idTypeCase_ == 3) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, idType_);
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.Key.PathElement)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.Key.PathElement other = (com.google.privacy.dlp.v2beta1.Key.PathElement) obj;
-
-      boolean result = true;
-      result = result && getKind()
-          .equals(other.getKind());
-      result = result && getIdTypeCase().equals(
-          other.getIdTypeCase());
-      if (!result) return false;
-      switch (idTypeCase_) {
-        case 2:
-          result = result && (getId()
-              == other.getId());
-          break;
-        case 3:
-          result = result && getName()
-              .equals(other.getName());
-          break;
-        case 0:
-        default:
-      }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + KIND_FIELD_NUMBER;
-      hash = (53 * hash) + getKind().hashCode();
-      switch (idTypeCase_) {
-        case 2:
-          hash = (37 * hash) + ID_FIELD_NUMBER;
-          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-              getId());
-          break;
-        case 3:
-          hash = (37 * hash) + NAME_FIELD_NUMBER;
-          hash = (53 * hash) + getName().hashCode();
-          break;
-        case 0:
-        default:
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.Key.PathElement prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * A (kind, ID/name) pair used to construct a key path.
-     * If either name or ID is set, the element is complete.
-     * If neither is set, the element is incomplete.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.Key.PathElement}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.Key.PathElement)
-        com.google.privacy.dlp.v2beta1.Key.PathElementOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Key_PathElement_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Key_PathElement_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.Key.PathElement.class, com.google.privacy.dlp.v2beta1.Key.PathElement.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.Key.PathElement.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        kind_ = "";
-
-        idTypeCase_ = 0;
-        idType_ = null;
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Key_PathElement_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.Key.PathElement getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.Key.PathElement.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.Key.PathElement build() {
-        com.google.privacy.dlp.v2beta1.Key.PathElement result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.Key.PathElement buildPartial() {
-        com.google.privacy.dlp.v2beta1.Key.PathElement result = new com.google.privacy.dlp.v2beta1.Key.PathElement(this);
-        result.kind_ = kind_;
-        if (idTypeCase_ == 2) {
-          result.idType_ = idType_;
-        }
-        if (idTypeCase_ == 3) {
-          result.idType_ = idType_;
-        }
-        result.idTypeCase_ = idTypeCase_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.Key.PathElement) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.Key.PathElement)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.Key.PathElement other) {
-        if (other == com.google.privacy.dlp.v2beta1.Key.PathElement.getDefaultInstance()) return this;
-        if (!other.getKind().isEmpty()) {
-          kind_ = other.kind_;
-          onChanged();
-        }
-        switch (other.getIdTypeCase()) {
-          case ID: {
-            setId(other.getId());
-            break;
-          }
-          case NAME: {
-            idTypeCase_ = 3;
-            idType_ = other.idType_;
-            onChanged();
-            break;
-          }
-          case IDTYPE_NOT_SET: {
-            break;
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.Key.PathElement parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.Key.PathElement) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int idTypeCase_ = 0;
-      private java.lang.Object idType_;
-      public IdTypeCase
-          getIdTypeCase() {
-        return IdTypeCase.forNumber(
-            idTypeCase_);
-      }
-
-      public Builder clearIdType() {
-        idTypeCase_ = 0;
-        idType_ = null;
-        onChanged();
-        return this;
-      }
-
-
-      private java.lang.Object kind_ = "";
-      /**
-       * 
-       * The kind of the entity.
-       * A kind matching regex `__.*__` is reserved/read-only.
-       * A kind must not contain more than 1500 bytes when UTF-8 encoded.
-       * Cannot be `""`.
-       * 

-       *
-       * string kind = 1;
-       */
-      public java.lang.String getKind() {
-        java.lang.Object ref = kind_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          kind_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * 
-       * The kind of the entity.
-       * A kind matching regex `__.*__` is reserved/read-only.
-       * A kind must not contain more than 1500 bytes when UTF-8 encoded.
-       * Cannot be `""`.
-       * 

-       *
-       * string kind = 1;
-       */
-      public com.google.protobuf.ByteString
-          getKindBytes() {
-        java.lang.Object ref = kind_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          kind_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * 
-       * The kind of the entity.
-       * A kind matching regex `__.*__` is reserved/read-only.
-       * A kind must not contain more than 1500 bytes when UTF-8 encoded.
-       * Cannot be `""`.
-       * 

-       *
-       * string kind = 1;
-       */
-      public Builder setKind(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        kind_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The kind of the entity.
-       * A kind matching regex `__.*__` is reserved/read-only.
-       * A kind must not contain more than 1500 bytes when UTF-8 encoded.
-       * Cannot be `""`.
-       * 

-       *
-       * string kind = 1;
-       */
-      public Builder clearKind() {
-        
-        kind_ = getDefaultInstance().getKind();
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The kind of the entity.
-       * A kind matching regex `__.*__` is reserved/read-only.
-       * A kind must not contain more than 1500 bytes when UTF-8 encoded.
-       * Cannot be `""`.
-       * 

-       *
-       * string kind = 1;
-       */
-      public Builder setKindBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        kind_ = value;
-        onChanged();
-        return this;
-      }
-
-      /**
-       * 
-       * The auto-allocated ID of the entity.
-       * Never equal to zero. Values less than zero are discouraged and may not
-       * be supported in the future.
-       * 

-       *
-       * int64 id = 2;
-       */
-      public long getId() {
-        if (idTypeCase_ == 2) {
-          return (java.lang.Long) idType_;
-        }
-        return 0L;
-      }
-      /**
-       * 
-       * The auto-allocated ID of the entity.
-       * Never equal to zero. Values less than zero are discouraged and may not
-       * be supported in the future.
-       * 

-       *
-       * int64 id = 2;
-       */
-      public Builder setId(long value) {
-        idTypeCase_ = 2;
-        idType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The auto-allocated ID of the entity.
-       * Never equal to zero. Values less than zero are discouraged and may not
-       * be supported in the future.
-       * 

-       *
-       * int64 id = 2;
-       */
-      public Builder clearId() {
-        if (idTypeCase_ == 2) {
-          idTypeCase_ = 0;
-          idType_ = null;
-          onChanged();
-        }
-        return this;
-      }
-
-      /**
-       * 
-       * The name of the entity.
-       * A name matching regex `__.*__` is reserved/read-only.
-       * A name must not be more than 1500 bytes when UTF-8 encoded.
-       * Cannot be `""`.
-       * 

-       *
-       * string name = 3;
-       */
-      public java.lang.String getName() {
-        java.lang.Object ref = "";
-        if (idTypeCase_ == 3) {
-          ref = idType_;
-        }
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (idTypeCase_ == 3) {
-            idType_ = s;
-          }
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * 
-       * The name of the entity.
-       * A name matching regex `__.*__` is reserved/read-only.
-       * A name must not be more than 1500 bytes when UTF-8 encoded.
-       * Cannot be `""`.
-       * 

-       *
-       * string name = 3;
-       */
-      public com.google.protobuf.ByteString
-          getNameBytes() {
-        java.lang.Object ref = "";
-        if (idTypeCase_ == 3) {
-          ref = idType_;
-        }
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          if (idTypeCase_ == 3) {
-            idType_ = b;
-          }
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * 
-       * The name of the entity.
-       * A name matching regex `__.*__` is reserved/read-only.
-       * A name must not be more than 1500 bytes when UTF-8 encoded.
-       * Cannot be `""`.
-       * 

-       *
-       * string name = 3;
-       */
-      public Builder setName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  idTypeCase_ = 3;
-        idType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The name of the entity.
-       * A name matching regex `__.*__` is reserved/read-only.
-       * A name must not be more than 1500 bytes when UTF-8 encoded.
-       * Cannot be `""`.
-       * 

-       *
-       * string name = 3;
-       */
-      public Builder clearName() {
-        if (idTypeCase_ == 3) {
-          idTypeCase_ = 0;
-          idType_ = null;
-          onChanged();
-        }
-        return this;
-      }
-      /**
-       * 
-       * The name of the entity.
-       * A name matching regex `__.*__` is reserved/read-only.
-       * A name must not be more than 1500 bytes when UTF-8 encoded.
-       * Cannot be `""`.
-       * 

-       *
-       * string name = 3;
-       */
-      public Builder setNameBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        idTypeCase_ = 3;
-        idType_ = value;
-        onChanged();
-        return this;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.Key.PathElement)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.Key.PathElement)
-    private static final com.google.privacy.dlp.v2beta1.Key.PathElement DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.Key.PathElement();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.Key.PathElement getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public PathElement parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PathElement(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Key.PathElement getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private int bitField0_;
-  public static final int PARTITION_ID_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.PartitionId partitionId_;
-  /**
-   * 
-   * Entities are partitioned into subsets, currently identified by a project
-   * ID and namespace ID.
-   * Queries are scoped to a single partition.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-   */
-  public boolean hasPartitionId() {
-    return partitionId_ != null;
-  }
-  /**
-   * 
-   * Entities are partitioned into subsets, currently identified by a project
-   * ID and namespace ID.
-   * Queries are scoped to a single partition.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.PartitionId getPartitionId() {
-    return partitionId_ == null ? com.google.privacy.dlp.v2beta1.PartitionId.getDefaultInstance() : partitionId_;
-  }
-  /**
-   * 
-   * Entities are partitioned into subsets, currently identified by a project
-   * ID and namespace ID.
-   * Queries are scoped to a single partition.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
-    return getPartitionId();
-  }
-
-  public static final int PATH_FIELD_NUMBER = 2;
-  private java.util.List path_;
-  /**
-   * 
-   * The entity path.
-   * An entity path consists of one or more elements composed of a kind and a
-   * string or numerical identifier, which identify entities. The first
-   * element identifies a _root entity_, the second element identifies
-   * a _child_ of the root entity, the third element identifies a child of the
-   * second entity, and so forth. The entities identified by all prefixes of
-   * the path are called the element's _ancestors_.
-   * A path can never be empty, and a path can have at most 100 elements.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-   */
-  public java.util.List getPathList() {
-    return path_;
-  }
-  /**
-   * 
-   * The entity path.
-   * An entity path consists of one or more elements composed of a kind and a
-   * string or numerical identifier, which identify entities. The first
-   * element identifies a _root entity_, the second element identifies
-   * a _child_ of the root entity, the third element identifies a child of the
-   * second entity, and so forth. The entities identified by all prefixes of
-   * the path are called the element's _ancestors_.
-   * A path can never be empty, and a path can have at most 100 elements.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-   */
-  public java.util.List 
-      getPathOrBuilderList() {
-    return path_;
-  }
-  /**
-   * 
-   * The entity path.
-   * An entity path consists of one or more elements composed of a kind and a
-   * string or numerical identifier, which identify entities. The first
-   * element identifies a _root entity_, the second element identifies
-   * a _child_ of the root entity, the third element identifies a child of the
-   * second entity, and so forth. The entities identified by all prefixes of
-   * the path are called the element's _ancestors_.
-   * A path can never be empty, and a path can have at most 100 elements.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-   */
-  public int getPathCount() {
-    return path_.size();
-  }
-  /**
-   * 
-   * The entity path.
-   * An entity path consists of one or more elements composed of a kind and a
-   * string or numerical identifier, which identify entities. The first
-   * element identifies a _root entity_, the second element identifies
-   * a _child_ of the root entity, the third element identifies a child of the
-   * second entity, and so forth. The entities identified by all prefixes of
-   * the path are called the element's _ancestors_.
-   * A path can never be empty, and a path can have at most 100 elements.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.Key.PathElement getPath(int index) {
-    return path_.get(index);
-  }
-  /**
-   * 
-   * The entity path.
-   * An entity path consists of one or more elements composed of a kind and a
-   * string or numerical identifier, which identify entities. The first
-   * element identifies a _root entity_, the second element identifies
-   * a _child_ of the root entity, the third element identifies a child of the
-   * second entity, and so forth. The entities identified by all prefixes of
-   * the path are called the element's _ancestors_.
-   * A path can never be empty, and a path can have at most 100 elements.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.Key.PathElementOrBuilder getPathOrBuilder(
-      int index) {
-    return path_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (partitionId_ != null) {
-      output.writeMessage(1, getPartitionId());
-    }
-    for (int i = 0; i < path_.size(); i++) {
-      output.writeMessage(2, path_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (partitionId_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getPartitionId());
-    }
-    for (int i = 0; i < path_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, path_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.Key)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.Key other = (com.google.privacy.dlp.v2beta1.Key) obj;
-
-    boolean result = true;
-    result = result && (hasPartitionId() == other.hasPartitionId());
-    if (hasPartitionId()) {
-      result = result && getPartitionId()
-          .equals(other.getPartitionId());
-    }
-    result = result && getPathList()
-        .equals(other.getPathList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasPartitionId()) {
-      hash = (37 * hash) + PARTITION_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPartitionId().hashCode();
-    }
-    if (getPathCount() > 0) {
-      hash = (37 * hash) + PATH_FIELD_NUMBER;
-      hash = (53 * hash) + getPathList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Key parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Key parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Key parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Key parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Key parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Key parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Key parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Key parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Key parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Key parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Key parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Key parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.Key prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * A unique identifier for a Datastore entity.
-   * If a key's partition ID or any of its path kinds or names are
-   * reserved/read-only, the key is reserved/read-only.
-   * A reserved/read-only key is forbidden in certain documented contexts.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.Key}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.Key)
-      com.google.privacy.dlp.v2beta1.KeyOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Key_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Key_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.Key.class, com.google.privacy.dlp.v2beta1.Key.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.Key.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getPathFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (partitionIdBuilder_ == null) {
-        partitionId_ = null;
-      } else {
-        partitionId_ = null;
-        partitionIdBuilder_ = null;
-      }
-      if (pathBuilder_ == null) {
-        path_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-      } else {
-        pathBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Key_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Key getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.Key.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.Key build() {
-      com.google.privacy.dlp.v2beta1.Key result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Key buildPartial() {
-      com.google.privacy.dlp.v2beta1.Key result = new com.google.privacy.dlp.v2beta1.Key(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (partitionIdBuilder_ == null) {
-        result.partitionId_ = partitionId_;
-      } else {
-        result.partitionId_ = partitionIdBuilder_.build();
-      }
-      if (pathBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          path_ = java.util.Collections.unmodifiableList(path_);
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.path_ = path_;
-      } else {
-        result.path_ = pathBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.Key) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.Key)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.Key other) {
-      if (other == com.google.privacy.dlp.v2beta1.Key.getDefaultInstance()) return this;
-      if (other.hasPartitionId()) {
-        mergePartitionId(other.getPartitionId());
-      }
-      if (pathBuilder_ == null) {
-        if (!other.path_.isEmpty()) {
-          if (path_.isEmpty()) {
-            path_ = other.path_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensurePathIsMutable();
-            path_.addAll(other.path_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.path_.isEmpty()) {
-          if (pathBuilder_.isEmpty()) {
-            pathBuilder_.dispose();
-            pathBuilder_ = null;
-            path_ = other.path_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-            pathBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getPathFieldBuilder() : null;
-          } else {
-            pathBuilder_.addAllMessages(other.path_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.Key parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.Key) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private com.google.privacy.dlp.v2beta1.PartitionId partitionId_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PartitionId, com.google.privacy.dlp.v2beta1.PartitionId.Builder, com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder> partitionIdBuilder_;
-    /**
-     * 
-     * Entities are partitioned into subsets, currently identified by a project
-     * ID and namespace ID.
-     * Queries are scoped to a single partition.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public boolean hasPartitionId() {
-      return partitionIdBuilder_ != null || partitionId_ != null;
-    }
-    /**
-     * 
-     * Entities are partitioned into subsets, currently identified by a project
-     * ID and namespace ID.
-     * Queries are scoped to a single partition.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PartitionId getPartitionId() {
-      if (partitionIdBuilder_ == null) {
-        return partitionId_ == null ? com.google.privacy.dlp.v2beta1.PartitionId.getDefaultInstance() : partitionId_;
-      } else {
-        return partitionIdBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Entities are partitioned into subsets, currently identified by a project
-     * ID and namespace ID.
-     * Queries are scoped to a single partition.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public Builder setPartitionId(com.google.privacy.dlp.v2beta1.PartitionId value) {
-      if (partitionIdBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        partitionId_ = value;
-        onChanged();
-      } else {
-        partitionIdBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Entities are partitioned into subsets, currently identified by a project
-     * ID and namespace ID.
-     * Queries are scoped to a single partition.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public Builder setPartitionId(
-        com.google.privacy.dlp.v2beta1.PartitionId.Builder builderForValue) {
-      if (partitionIdBuilder_ == null) {
-        partitionId_ = builderForValue.build();
-        onChanged();
-      } else {
-        partitionIdBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Entities are partitioned into subsets, currently identified by a project
-     * ID and namespace ID.
-     * Queries are scoped to a single partition.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public Builder mergePartitionId(com.google.privacy.dlp.v2beta1.PartitionId value) {
-      if (partitionIdBuilder_ == null) {
-        if (partitionId_ != null) {
-          partitionId_ =
-            com.google.privacy.dlp.v2beta1.PartitionId.newBuilder(partitionId_).mergeFrom(value).buildPartial();
-        } else {
-          partitionId_ = value;
-        }
-        onChanged();
-      } else {
-        partitionIdBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Entities are partitioned into subsets, currently identified by a project
-     * ID and namespace ID.
-     * Queries are scoped to a single partition.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public Builder clearPartitionId() {
-      if (partitionIdBuilder_ == null) {
-        partitionId_ = null;
-        onChanged();
-      } else {
-        partitionId_ = null;
-        partitionIdBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Entities are partitioned into subsets, currently identified by a project
-     * ID and namespace ID.
-     * Queries are scoped to a single partition.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PartitionId.Builder getPartitionIdBuilder() {
-      
-      onChanged();
-      return getPartitionIdFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Entities are partitioned into subsets, currently identified by a project
-     * ID and namespace ID.
-     * Queries are scoped to a single partition.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
-      if (partitionIdBuilder_ != null) {
-        return partitionIdBuilder_.getMessageOrBuilder();
-      } else {
-        return partitionId_ == null ?
-            com.google.privacy.dlp.v2beta1.PartitionId.getDefaultInstance() : partitionId_;
-      }
-    }
-    /**
-     * 
-     * Entities are partitioned into subsets, currently identified by a project
-     * ID and namespace ID.
-     * Queries are scoped to a single partition.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PartitionId, com.google.privacy.dlp.v2beta1.PartitionId.Builder, com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder> 
-        getPartitionIdFieldBuilder() {
-      if (partitionIdBuilder_ == null) {
-        partitionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.PartitionId, com.google.privacy.dlp.v2beta1.PartitionId.Builder, com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder>(
-                getPartitionId(),
-                getParentForChildren(),
-                isClean());
-        partitionId_ = null;
-      }
-      return partitionIdBuilder_;
-    }
-
-    private java.util.List path_ =
-      java.util.Collections.emptyList();
-    private void ensurePathIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-        path_ = new java.util.ArrayList(path_);
-        bitField0_ |= 0x00000002;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Key.PathElement, com.google.privacy.dlp.v2beta1.Key.PathElement.Builder, com.google.privacy.dlp.v2beta1.Key.PathElementOrBuilder> pathBuilder_;
-
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public java.util.List getPathList() {
-      if (pathBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(path_);
-      } else {
-        return pathBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public int getPathCount() {
-      if (pathBuilder_ == null) {
-        return path_.size();
-      } else {
-        return pathBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Key.PathElement getPath(int index) {
-      if (pathBuilder_ == null) {
-        return path_.get(index);
-      } else {
-        return pathBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public Builder setPath(
-        int index, com.google.privacy.dlp.v2beta1.Key.PathElement value) {
-      if (pathBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensurePathIsMutable();
-        path_.set(index, value);
-        onChanged();
-      } else {
-        pathBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public Builder setPath(
-        int index, com.google.privacy.dlp.v2beta1.Key.PathElement.Builder builderForValue) {
-      if (pathBuilder_ == null) {
-        ensurePathIsMutable();
-        path_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        pathBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public Builder addPath(com.google.privacy.dlp.v2beta1.Key.PathElement value) {
-      if (pathBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensurePathIsMutable();
-        path_.add(value);
-        onChanged();
-      } else {
-        pathBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public Builder addPath(
-        int index, com.google.privacy.dlp.v2beta1.Key.PathElement value) {
-      if (pathBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensurePathIsMutable();
-        path_.add(index, value);
-        onChanged();
-      } else {
-        pathBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public Builder addPath(
-        com.google.privacy.dlp.v2beta1.Key.PathElement.Builder builderForValue) {
-      if (pathBuilder_ == null) {
-        ensurePathIsMutable();
-        path_.add(builderForValue.build());
-        onChanged();
-      } else {
-        pathBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public Builder addPath(
-        int index, com.google.privacy.dlp.v2beta1.Key.PathElement.Builder builderForValue) {
-      if (pathBuilder_ == null) {
-        ensurePathIsMutable();
-        path_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        pathBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public Builder addAllPath(
-        java.lang.Iterable values) {
-      if (pathBuilder_ == null) {
-        ensurePathIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, path_);
-        onChanged();
-      } else {
-        pathBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public Builder clearPath() {
-      if (pathBuilder_ == null) {
-        path_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-      } else {
-        pathBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public Builder removePath(int index) {
-      if (pathBuilder_ == null) {
-        ensurePathIsMutable();
-        path_.remove(index);
-        onChanged();
-      } else {
-        pathBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Key.PathElement.Builder getPathBuilder(
-        int index) {
-      return getPathFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Key.PathElementOrBuilder getPathOrBuilder(
-        int index) {
-      if (pathBuilder_ == null) {
-        return path_.get(index);  } else {
-        return pathBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public java.util.List 
-         getPathOrBuilderList() {
-      if (pathBuilder_ != null) {
-        return pathBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(path_);
-      }
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Key.PathElement.Builder addPathBuilder() {
-      return getPathFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.Key.PathElement.getDefaultInstance());
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Key.PathElement.Builder addPathBuilder(
-        int index) {
-      return getPathFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.Key.PathElement.getDefaultInstance());
-    }
-    /**
-     * 
-     * The entity path.
-     * An entity path consists of one or more elements composed of a kind and a
-     * string or numerical identifier, which identify entities. The first
-     * element identifies a _root entity_, the second element identifies
-     * a _child_ of the root entity, the third element identifies a child of the
-     * second entity, and so forth. The entities identified by all prefixes of
-     * the path are called the element's _ancestors_.
-     * A path can never be empty, and a path can have at most 100 elements.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-     */
-    public java.util.List 
-         getPathBuilderList() {
-      return getPathFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Key.PathElement, com.google.privacy.dlp.v2beta1.Key.PathElement.Builder, com.google.privacy.dlp.v2beta1.Key.PathElementOrBuilder> 
-        getPathFieldBuilder() {
-      if (pathBuilder_ == null) {
-        pathBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Key.PathElement, com.google.privacy.dlp.v2beta1.Key.PathElement.Builder, com.google.privacy.dlp.v2beta1.Key.PathElementOrBuilder>(
-                path_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
-        path_ = null;
-      }
-      return pathBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.Key)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.Key)
-  private static final com.google.privacy.dlp.v2beta1.Key DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.Key();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Key getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public Key parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Key(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.Key getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KeyOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KeyOrBuilder.java
deleted file mode 100644
index b95496286d15..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KeyOrBuilder.java
+++ /dev/null
@@ -1,119 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface KeyOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.Key)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Entities are partitioned into subsets, currently identified by a project
-   * ID and namespace ID.
-   * Queries are scoped to a single partition.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-   */
-  boolean hasPartitionId();
-  /**
-   * 
-   * Entities are partitioned into subsets, currently identified by a project
-   * ID and namespace ID.
-   * Queries are scoped to a single partition.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-   */
-  com.google.privacy.dlp.v2beta1.PartitionId getPartitionId();
-  /**
-   * 
-   * Entities are partitioned into subsets, currently identified by a project
-   * ID and namespace ID.
-   * Queries are scoped to a single partition.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PartitionId partition_id = 1;
-   */
-  com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder getPartitionIdOrBuilder();
-
-  /**
-   * 
-   * The entity path.
-   * An entity path consists of one or more elements composed of a kind and a
-   * string or numerical identifier, which identify entities. The first
-   * element identifies a _root entity_, the second element identifies
-   * a _child_ of the root entity, the third element identifies a child of the
-   * second entity, and so forth. The entities identified by all prefixes of
-   * the path are called the element's _ancestors_.
-   * A path can never be empty, and a path can have at most 100 elements.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-   */
-  java.util.List 
-      getPathList();
-  /**
-   * 
-   * The entity path.
-   * An entity path consists of one or more elements composed of a kind and a
-   * string or numerical identifier, which identify entities. The first
-   * element identifies a _root entity_, the second element identifies
-   * a _child_ of the root entity, the third element identifies a child of the
-   * second entity, and so forth. The entities identified by all prefixes of
-   * the path are called the element's _ancestors_.
-   * A path can never be empty, and a path can have at most 100 elements.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-   */
-  com.google.privacy.dlp.v2beta1.Key.PathElement getPath(int index);
-  /**
-   * 
-   * The entity path.
-   * An entity path consists of one or more elements composed of a kind and a
-   * string or numerical identifier, which identify entities. The first
-   * element identifies a _root entity_, the second element identifies
-   * a _child_ of the root entity, the third element identifies a child of the
-   * second entity, and so forth. The entities identified by all prefixes of
-   * the path are called the element's _ancestors_.
-   * A path can never be empty, and a path can have at most 100 elements.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-   */
-  int getPathCount();
-  /**
-   * 
-   * The entity path.
-   * An entity path consists of one or more elements composed of a kind and a
-   * string or numerical identifier, which identify entities. The first
-   * element identifies a _root entity_, the second element identifies
-   * a _child_ of the root entity, the third element identifies a child of the
-   * second entity, and so forth. The entities identified by all prefixes of
-   * the path are called the element's _ancestors_.
-   * A path can never be empty, and a path can have at most 100 elements.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-   */
-  java.util.List 
-      getPathOrBuilderList();
-  /**
-   * 
-   * The entity path.
-   * An entity path consists of one or more elements composed of a kind and a
-   * string or numerical identifier, which identify entities. The first
-   * element identifies a _root entity_, the second element identifies
-   * a _child_ of the root entity, the third element identifies a child of the
-   * second entity, and so forth. The entities identified by all prefixes of
-   * the path are called the element's _ancestors_.
-   * A path can never be empty, and a path can have at most 100 elements.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.Key.PathElement path = 2;
-   */
-  com.google.privacy.dlp.v2beta1.Key.PathElementOrBuilder getPathOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KindExpressionOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KindExpressionOrBuilder.java
deleted file mode 100644
index 5203faab113f..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KindExpressionOrBuilder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface KindExpressionOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.KindExpression)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The name of the kind.
-   * 

-   *
-   * string name = 1;
-   */
-  java.lang.String getName();
-  /**
-   * 
-   * The name of the kind.
-   * 

-   *
-   * string name = 1;
-   */
-  com.google.protobuf.ByteString
-      getNameBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KmsWrappedCryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KmsWrappedCryptoKey.java
deleted file mode 100644
index ec2597109a06..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KmsWrappedCryptoKey.java
+++ /dev/null
@@ -1,635 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Include to use an existing data crypto key wrapped by KMS.
- * Authorization requires the following IAM permissions when sending a request
- * to perform a crypto transformation using a kms-wrapped crypto key:
- * dlp.kms.encrypt
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.KmsWrappedCryptoKey}
- */
-public  final class KmsWrappedCryptoKey extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.KmsWrappedCryptoKey)
-    KmsWrappedCryptoKeyOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use KmsWrappedCryptoKey.newBuilder() to construct.
-  private KmsWrappedCryptoKey(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private KmsWrappedCryptoKey() {
-    wrappedKey_ = com.google.protobuf.ByteString.EMPTY;
-    cryptoKeyName_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private KmsWrappedCryptoKey(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-
-            wrappedKey_ = input.readBytes();
-            break;
-          }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            cryptoKeyName_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_KmsWrappedCryptoKey_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_KmsWrappedCryptoKey_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.class, com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.Builder.class);
-  }
-
-  public static final int WRAPPED_KEY_FIELD_NUMBER = 1;
-  private com.google.protobuf.ByteString wrappedKey_;
-  /**
-   * 
-   * The wrapped data crypto key. [required]
-   * 

-   *
-   * bytes wrapped_key = 1;
-   */
-  public com.google.protobuf.ByteString getWrappedKey() {
-    return wrappedKey_;
-  }
-
-  public static final int CRYPTO_KEY_NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object cryptoKeyName_;
-  /**
-   * 
-   * The resource name of the KMS CryptoKey to use for unwrapping. [required]
-   * 

-   *
-   * string crypto_key_name = 2;
-   */
-  public java.lang.String getCryptoKeyName() {
-    java.lang.Object ref = cryptoKeyName_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      cryptoKeyName_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * The resource name of the KMS CryptoKey to use for unwrapping. [required]
-   * 

-   *
-   * string crypto_key_name = 2;
-   */
-  public com.google.protobuf.ByteString
-      getCryptoKeyNameBytes() {
-    java.lang.Object ref = cryptoKeyName_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      cryptoKeyName_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!wrappedKey_.isEmpty()) {
-      output.writeBytes(1, wrappedKey_);
-    }
-    if (!getCryptoKeyNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, cryptoKeyName_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!wrappedKey_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(1, wrappedKey_);
-    }
-    if (!getCryptoKeyNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, cryptoKeyName_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey other = (com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) obj;
-
-    boolean result = true;
-    result = result && getWrappedKey()
-        .equals(other.getWrappedKey());
-    result = result && getCryptoKeyName()
-        .equals(other.getCryptoKeyName());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + WRAPPED_KEY_FIELD_NUMBER;
-    hash = (53 * hash) + getWrappedKey().hashCode();
-    hash = (37 * hash) + CRYPTO_KEY_NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getCryptoKeyName().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Include to use an existing data crypto key wrapped by KMS.
-   * Authorization requires the following IAM permissions when sending a request
-   * to perform a crypto transformation using a kms-wrapped crypto key:
-   * dlp.kms.encrypt
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.KmsWrappedCryptoKey}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.KmsWrappedCryptoKey)
-      com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKeyOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_KmsWrappedCryptoKey_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_KmsWrappedCryptoKey_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.class, com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      wrappedKey_ = com.google.protobuf.ByteString.EMPTY;
-
-      cryptoKeyName_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_KmsWrappedCryptoKey_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey build() {
-      com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey buildPartial() {
-      com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey result = new com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey(this);
-      result.wrappedKey_ = wrappedKey_;
-      result.cryptoKeyName_ = cryptoKeyName_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey other) {
-      if (other == com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey.getDefaultInstance()) return this;
-      if (other.getWrappedKey() != com.google.protobuf.ByteString.EMPTY) {
-        setWrappedKey(other.getWrappedKey());
-      }
-      if (!other.getCryptoKeyName().isEmpty()) {
-        cryptoKeyName_ = other.cryptoKeyName_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.protobuf.ByteString wrappedKey_ = com.google.protobuf.ByteString.EMPTY;
-    /**
-     * 
-     * The wrapped data crypto key. [required]
-     * 

-     *
-     * bytes wrapped_key = 1;
-     */
-    public com.google.protobuf.ByteString getWrappedKey() {
-      return wrappedKey_;
-    }
-    /**
-     * 
-     * The wrapped data crypto key. [required]
-     * 

-     *
-     * bytes wrapped_key = 1;
-     */
-    public Builder setWrappedKey(com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      wrappedKey_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The wrapped data crypto key. [required]
-     * 

-     *
-     * bytes wrapped_key = 1;
-     */
-    public Builder clearWrappedKey() {
-      
-      wrappedKey_ = getDefaultInstance().getWrappedKey();
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object cryptoKeyName_ = "";
-    /**
-     * 
-     * The resource name of the KMS CryptoKey to use for unwrapping. [required]
-     * 

-     *
-     * string crypto_key_name = 2;
-     */
-    public java.lang.String getCryptoKeyName() {
-      java.lang.Object ref = cryptoKeyName_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        cryptoKeyName_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * The resource name of the KMS CryptoKey to use for unwrapping. [required]
-     * 

-     *
-     * string crypto_key_name = 2;
-     */
-    public com.google.protobuf.ByteString
-        getCryptoKeyNameBytes() {
-      java.lang.Object ref = cryptoKeyName_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        cryptoKeyName_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * The resource name of the KMS CryptoKey to use for unwrapping. [required]
-     * 

-     *
-     * string crypto_key_name = 2;
-     */
-    public Builder setCryptoKeyName(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      cryptoKeyName_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The resource name of the KMS CryptoKey to use for unwrapping. [required]
-     * 

-     *
-     * string crypto_key_name = 2;
-     */
-    public Builder clearCryptoKeyName() {
-      
-      cryptoKeyName_ = getDefaultInstance().getCryptoKeyName();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The resource name of the KMS CryptoKey to use for unwrapping. [required]
-     * 

-     *
-     * string crypto_key_name = 2;
-     */
-    public Builder setCryptoKeyNameBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      cryptoKeyName_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.KmsWrappedCryptoKey)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.KmsWrappedCryptoKey)
-  private static final com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public KmsWrappedCryptoKey parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new KmsWrappedCryptoKey(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.KmsWrappedCryptoKey getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KmsWrappedCryptoKeyOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KmsWrappedCryptoKeyOrBuilder.java
deleted file mode 100644
index aeae3e711e2e..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KmsWrappedCryptoKeyOrBuilder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface KmsWrappedCryptoKeyOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.KmsWrappedCryptoKey)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The wrapped data crypto key. [required]
-   * 

-   *
-   * bytes wrapped_key = 1;
-   */
-  com.google.protobuf.ByteString getWrappedKey();
-
-  /**
-   * 
-   * The resource name of the KMS CryptoKey to use for unwrapping. [required]
-   * 

-   *
-   * string crypto_key_name = 2;
-   */
-  java.lang.String getCryptoKeyName();
-  /**
-   * 
-   * The resource name of the KMS CryptoKey to use for unwrapping. [required]
-   * 

-   *
-   * string crypto_key_name = 2;
-   */
-  com.google.protobuf.ByteString
-      getCryptoKeyNameBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Likelihood.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Likelihood.java
deleted file mode 100644
index 6288de1af92d..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Likelihood.java
+++ /dev/null
@@ -1,176 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Categorization of results based on how likely they are to represent a match,
- * based on the number of elements they contain which imply a match.
- * 

- *
- * Protobuf enum {@code google.privacy.dlp.v2beta1.Likelihood}
- */
-public enum Likelihood
-    implements com.google.protobuf.ProtocolMessageEnum {
-  /**
-   * 
-   * Default value; information with all likelihoods is included.
-   * 

-   *
-   * LIKELIHOOD_UNSPECIFIED = 0;
-   */
-  LIKELIHOOD_UNSPECIFIED(0),
-  /**
-   * 
-   * Few matching elements.
-   * 

-   *
-   * VERY_UNLIKELY = 1;
-   */
-  VERY_UNLIKELY(1),
-  /**
-   * UNLIKELY = 2;
-   */
-  UNLIKELY(2),
-  /**
-   * 
-   * Some matching elements.
-   * 

-   *
-   * POSSIBLE = 3;
-   */
-  POSSIBLE(3),
-  /**
-   * LIKELY = 4;
-   */
-  LIKELY(4),
-  /**
-   * 
-   * Many matching elements.
-   * 

-   *
-   * VERY_LIKELY = 5;
-   */
-  VERY_LIKELY(5),
-  UNRECOGNIZED(-1),
-  ;
-
-  /**
-   * 
-   * Default value; information with all likelihoods is included.
-   * 

-   *
-   * LIKELIHOOD_UNSPECIFIED = 0;
-   */
-  public static final int LIKELIHOOD_UNSPECIFIED_VALUE = 0;
-  /**
-   * 
-   * Few matching elements.
-   * 

-   *
-   * VERY_UNLIKELY = 1;
-   */
-  public static final int VERY_UNLIKELY_VALUE = 1;
-  /**
-   * UNLIKELY = 2;
-   */
-  public static final int UNLIKELY_VALUE = 2;
-  /**
-   * 
-   * Some matching elements.
-   * 

-   *
-   * POSSIBLE = 3;
-   */
-  public static final int POSSIBLE_VALUE = 3;
-  /**
-   * LIKELY = 4;
-   */
-  public static final int LIKELY_VALUE = 4;
-  /**
-   * 
-   * Many matching elements.
-   * 

-   *
-   * VERY_LIKELY = 5;
-   */
-  public static final int VERY_LIKELY_VALUE = 5;
-
-
-  public final int getNumber() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
-    }
-    return value;
-  }
-
-  /**
-   * @deprecated Use {@link #forNumber(int)} instead.
-   */
-  @java.lang.Deprecated
-  public static Likelihood valueOf(int value) {
-    return forNumber(value);
-  }
-
-  public static Likelihood forNumber(int value) {
-    switch (value) {
-      case 0: return LIKELIHOOD_UNSPECIFIED;
-      case 1: return VERY_UNLIKELY;
-      case 2: return UNLIKELY;
-      case 3: return POSSIBLE;
-      case 4: return LIKELY;
-      case 5: return VERY_LIKELY;
-      default: return null;
-    }
-  }
-
-  public static com.google.protobuf.Internal.EnumLiteMap
-      internalGetValueMap() {
-    return internalValueMap;
-  }
-  private static final com.google.protobuf.Internal.EnumLiteMap<
-      Likelihood> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap() {
-          public Likelihood findValueByNumber(int number) {
-            return Likelihood.forNumber(number);
-          }
-        };
-
-  public final com.google.protobuf.Descriptors.EnumValueDescriptor
-      getValueDescriptor() {
-    return getDescriptor().getValues().get(ordinal());
-  }
-  public final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.getDescriptor().getEnumTypes().get(0);
-  }
-
-  private static final Likelihood[] VALUES = values();
-
-  public static Likelihood valueOf(
-      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-    if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "EnumValueDescriptor is not for this type.");
-    }
-    if (desc.getIndex() == -1) {
-      return UNRECOGNIZED;
-    }
-    return VALUES[desc.getIndex()];
-  }
-
-  private final int value;
-
-  private Likelihood(int value) {
-    this.value = value;
-  }
-
-  // @@protoc_insertion_point(enum_scope:google.privacy.dlp.v2beta1.Likelihood)
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesRequest.java
deleted file mode 100644
index 70cd97f593d0..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesRequest.java
+++ /dev/null
@@ -1,723 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Request for the list of info types belonging to a given category,
- * or all supported info types if no category is specified.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.ListInfoTypesRequest}
- */
-public  final class ListInfoTypesRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.ListInfoTypesRequest)
-    ListInfoTypesRequestOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ListInfoTypesRequest.newBuilder() to construct.
-  private ListInfoTypesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private ListInfoTypesRequest() {
-    category_ = "";
-    languageCode_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ListInfoTypesRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            category_ = s;
-            break;
-          }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            languageCode_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInfoTypesRequest_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInfoTypesRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.ListInfoTypesRequest.class, com.google.privacy.dlp.v2beta1.ListInfoTypesRequest.Builder.class);
-  }
-
-  public static final int CATEGORY_FIELD_NUMBER = 1;
-  private volatile java.lang.Object category_;
-  /**
-   * 
-   * Category name as returned by ListRootCategories.
-   * 

-   *
-   * string category = 1;
-   */
-  public java.lang.String getCategory() {
-    java.lang.Object ref = category_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      category_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Category name as returned by ListRootCategories.
-   * 

-   *
-   * string category = 1;
-   */
-  public com.google.protobuf.ByteString
-      getCategoryBytes() {
-    java.lang.Object ref = category_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      category_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int LANGUAGE_CODE_FIELD_NUMBER = 2;
-  private volatile java.lang.Object languageCode_;
-  /**
-   * 
-   * Optional BCP-47 language code for localized info type friendly
-   * names. If omitted, or if localized strings are not available,
-   * en-US strings will be returned.
-   * 

-   *
-   * string language_code = 2;
-   */
-  public java.lang.String getLanguageCode() {
-    java.lang.Object ref = languageCode_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      languageCode_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Optional BCP-47 language code for localized info type friendly
-   * names. If omitted, or if localized strings are not available,
-   * en-US strings will be returned.
-   * 

-   *
-   * string language_code = 2;
-   */
-  public com.google.protobuf.ByteString
-      getLanguageCodeBytes() {
-    java.lang.Object ref = languageCode_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      languageCode_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getCategoryBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, category_);
-    }
-    if (!getLanguageCodeBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, languageCode_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getCategoryBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, category_);
-    }
-    if (!getLanguageCodeBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, languageCode_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.ListInfoTypesRequest)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.ListInfoTypesRequest other = (com.google.privacy.dlp.v2beta1.ListInfoTypesRequest) obj;
-
-    boolean result = true;
-    result = result && getCategory()
-        .equals(other.getCategory());
-    result = result && getLanguageCode()
-        .equals(other.getLanguageCode());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + CATEGORY_FIELD_NUMBER;
-    hash = (53 * hash) + getCategory().hashCode();
-    hash = (37 * hash) + LANGUAGE_CODE_FIELD_NUMBER;
-    hash = (53 * hash) + getLanguageCode().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.ListInfoTypesRequest prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Request for the list of info types belonging to a given category,
-   * or all supported info types if no category is specified.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.ListInfoTypesRequest}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.ListInfoTypesRequest)
-      com.google.privacy.dlp.v2beta1.ListInfoTypesRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInfoTypesRequest_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInfoTypesRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.ListInfoTypesRequest.class, com.google.privacy.dlp.v2beta1.ListInfoTypesRequest.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.ListInfoTypesRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      category_ = "";
-
-      languageCode_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInfoTypesRequest_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListInfoTypesRequest getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.ListInfoTypesRequest.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListInfoTypesRequest build() {
-      com.google.privacy.dlp.v2beta1.ListInfoTypesRequest result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListInfoTypesRequest buildPartial() {
-      com.google.privacy.dlp.v2beta1.ListInfoTypesRequest result = new com.google.privacy.dlp.v2beta1.ListInfoTypesRequest(this);
-      result.category_ = category_;
-      result.languageCode_ = languageCode_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.ListInfoTypesRequest) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.ListInfoTypesRequest)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.ListInfoTypesRequest other) {
-      if (other == com.google.privacy.dlp.v2beta1.ListInfoTypesRequest.getDefaultInstance()) return this;
-      if (!other.getCategory().isEmpty()) {
-        category_ = other.category_;
-        onChanged();
-      }
-      if (!other.getLanguageCode().isEmpty()) {
-        languageCode_ = other.languageCode_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.ListInfoTypesRequest parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.ListInfoTypesRequest) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object category_ = "";
-    /**
-     * 
-     * Category name as returned by ListRootCategories.
-     * 

-     *
-     * string category = 1;
-     */
-    public java.lang.String getCategory() {
-      java.lang.Object ref = category_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        category_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Category name as returned by ListRootCategories.
-     * 

-     *
-     * string category = 1;
-     */
-    public com.google.protobuf.ByteString
-        getCategoryBytes() {
-      java.lang.Object ref = category_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        category_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Category name as returned by ListRootCategories.
-     * 

-     *
-     * string category = 1;
-     */
-    public Builder setCategory(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      category_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Category name as returned by ListRootCategories.
-     * 

-     *
-     * string category = 1;
-     */
-    public Builder clearCategory() {
-      
-      category_ = getDefaultInstance().getCategory();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Category name as returned by ListRootCategories.
-     * 

-     *
-     * string category = 1;
-     */
-    public Builder setCategoryBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      category_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object languageCode_ = "";
-    /**
-     * 
-     * Optional BCP-47 language code for localized info type friendly
-     * names. If omitted, or if localized strings are not available,
-     * en-US strings will be returned.
-     * 

-     *
-     * string language_code = 2;
-     */
-    public java.lang.String getLanguageCode() {
-      java.lang.Object ref = languageCode_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        languageCode_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Optional BCP-47 language code for localized info type friendly
-     * names. If omitted, or if localized strings are not available,
-     * en-US strings will be returned.
-     * 

-     *
-     * string language_code = 2;
-     */
-    public com.google.protobuf.ByteString
-        getLanguageCodeBytes() {
-      java.lang.Object ref = languageCode_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        languageCode_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Optional BCP-47 language code for localized info type friendly
-     * names. If omitted, or if localized strings are not available,
-     * en-US strings will be returned.
-     * 

-     *
-     * string language_code = 2;
-     */
-    public Builder setLanguageCode(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      languageCode_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Optional BCP-47 language code for localized info type friendly
-     * names. If omitted, or if localized strings are not available,
-     * en-US strings will be returned.
-     * 

-     *
-     * string language_code = 2;
-     */
-    public Builder clearLanguageCode() {
-      
-      languageCode_ = getDefaultInstance().getLanguageCode();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Optional BCP-47 language code for localized info type friendly
-     * names. If omitted, or if localized strings are not available,
-     * en-US strings will be returned.
-     * 

-     *
-     * string language_code = 2;
-     */
-    public Builder setLanguageCodeBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      languageCode_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.ListInfoTypesRequest)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.ListInfoTypesRequest)
-  private static final com.google.privacy.dlp.v2beta1.ListInfoTypesRequest DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.ListInfoTypesRequest();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesRequest getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public ListInfoTypesRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInfoTypesRequest(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.ListInfoTypesRequest getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesRequestOrBuilder.java
deleted file mode 100644
index 0c8a56007c52..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesRequestOrBuilder.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ListInfoTypesRequestOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.ListInfoTypesRequest)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Category name as returned by ListRootCategories.
-   * 

-   *
-   * string category = 1;
-   */
-  java.lang.String getCategory();
-  /**
-   * 
-   * Category name as returned by ListRootCategories.
-   * 

-   *
-   * string category = 1;
-   */
-  com.google.protobuf.ByteString
-      getCategoryBytes();
-
-  /**
-   * 
-   * Optional BCP-47 language code for localized info type friendly
-   * names. If omitted, or if localized strings are not available,
-   * en-US strings will be returned.
-   * 

-   *
-   * string language_code = 2;
-   */
-  java.lang.String getLanguageCode();
-  /**
-   * 
-   * Optional BCP-47 language code for localized info type friendly
-   * names. If omitted, or if localized strings are not available,
-   * en-US strings will be returned.
-   * 

-   *
-   * string language_code = 2;
-   */
-  com.google.protobuf.ByteString
-      getLanguageCodeBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesResponse.java
deleted file mode 100644
index 4cf2952a25b6..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesResponse.java
+++ /dev/null
@@ -1,834 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Response to the ListInfoTypes request.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.ListInfoTypesResponse}
- */
-public  final class ListInfoTypesResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.ListInfoTypesResponse)
-    ListInfoTypesResponseOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ListInfoTypesResponse.newBuilder() to construct.
-  private ListInfoTypesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private ListInfoTypesResponse() {
-    infoTypes_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ListInfoTypesResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              infoTypes_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            infoTypes_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.InfoTypeDescription.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        infoTypes_ = java.util.Collections.unmodifiableList(infoTypes_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInfoTypesResponse_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInfoTypesResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.ListInfoTypesResponse.class, com.google.privacy.dlp.v2beta1.ListInfoTypesResponse.Builder.class);
-  }
-
-  public static final int INFO_TYPES_FIELD_NUMBER = 1;
-  private java.util.List infoTypes_;
-  /**
-   * 
-   * Set of sensitive info types belonging to a category.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-   */
-  public java.util.List getInfoTypesList() {
-    return infoTypes_;
-  }
-  /**
-   * 
-   * Set of sensitive info types belonging to a category.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-   */
-  public java.util.List 
-      getInfoTypesOrBuilderList() {
-    return infoTypes_;
-  }
-  /**
-   * 
-   * Set of sensitive info types belonging to a category.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-   */
-  public int getInfoTypesCount() {
-    return infoTypes_.size();
-  }
-  /**
-   * 
-   * Set of sensitive info types belonging to a category.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeDescription getInfoTypes(int index) {
-    return infoTypes_.get(index);
-  }
-  /**
-   * 
-   * Set of sensitive info types belonging to a category.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeDescriptionOrBuilder getInfoTypesOrBuilder(
-      int index) {
-    return infoTypes_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < infoTypes_.size(); i++) {
-      output.writeMessage(1, infoTypes_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < infoTypes_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, infoTypes_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.ListInfoTypesResponse)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.ListInfoTypesResponse other = (com.google.privacy.dlp.v2beta1.ListInfoTypesResponse) obj;
-
-    boolean result = true;
-    result = result && getInfoTypesList()
-        .equals(other.getInfoTypesList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getInfoTypesCount() > 0) {
-      hash = (37 * hash) + INFO_TYPES_FIELD_NUMBER;
-      hash = (53 * hash) + getInfoTypesList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.ListInfoTypesResponse prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Response to the ListInfoTypes request.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.ListInfoTypesResponse}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.ListInfoTypesResponse)
-      com.google.privacy.dlp.v2beta1.ListInfoTypesResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInfoTypesResponse_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInfoTypesResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.ListInfoTypesResponse.class, com.google.privacy.dlp.v2beta1.ListInfoTypesResponse.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.ListInfoTypesResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getInfoTypesFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (infoTypesBuilder_ == null) {
-        infoTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        infoTypesBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInfoTypesResponse_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListInfoTypesResponse getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.ListInfoTypesResponse.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListInfoTypesResponse build() {
-      com.google.privacy.dlp.v2beta1.ListInfoTypesResponse result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListInfoTypesResponse buildPartial() {
-      com.google.privacy.dlp.v2beta1.ListInfoTypesResponse result = new com.google.privacy.dlp.v2beta1.ListInfoTypesResponse(this);
-      int from_bitField0_ = bitField0_;
-      if (infoTypesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          infoTypes_ = java.util.Collections.unmodifiableList(infoTypes_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.infoTypes_ = infoTypes_;
-      } else {
-        result.infoTypes_ = infoTypesBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.ListInfoTypesResponse) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.ListInfoTypesResponse)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.ListInfoTypesResponse other) {
-      if (other == com.google.privacy.dlp.v2beta1.ListInfoTypesResponse.getDefaultInstance()) return this;
-      if (infoTypesBuilder_ == null) {
-        if (!other.infoTypes_.isEmpty()) {
-          if (infoTypes_.isEmpty()) {
-            infoTypes_ = other.infoTypes_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureInfoTypesIsMutable();
-            infoTypes_.addAll(other.infoTypes_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.infoTypes_.isEmpty()) {
-          if (infoTypesBuilder_.isEmpty()) {
-            infoTypesBuilder_.dispose();
-            infoTypesBuilder_ = null;
-            infoTypes_ = other.infoTypes_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            infoTypesBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getInfoTypesFieldBuilder() : null;
-          } else {
-            infoTypesBuilder_.addAllMessages(other.infoTypes_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.ListInfoTypesResponse parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.ListInfoTypesResponse) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List infoTypes_ =
-      java.util.Collections.emptyList();
-    private void ensureInfoTypesIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        infoTypes_ = new java.util.ArrayList(infoTypes_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoTypeDescription, com.google.privacy.dlp.v2beta1.InfoTypeDescription.Builder, com.google.privacy.dlp.v2beta1.InfoTypeDescriptionOrBuilder> infoTypesBuilder_;
-
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public java.util.List getInfoTypesList() {
-      if (infoTypesBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(infoTypes_);
-      } else {
-        return infoTypesBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public int getInfoTypesCount() {
-      if (infoTypesBuilder_ == null) {
-        return infoTypes_.size();
-      } else {
-        return infoTypesBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeDescription getInfoTypes(int index) {
-      if (infoTypesBuilder_ == null) {
-        return infoTypes_.get(index);
-      } else {
-        return infoTypesBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public Builder setInfoTypes(
-        int index, com.google.privacy.dlp.v2beta1.InfoTypeDescription value) {
-      if (infoTypesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureInfoTypesIsMutable();
-        infoTypes_.set(index, value);
-        onChanged();
-      } else {
-        infoTypesBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public Builder setInfoTypes(
-        int index, com.google.privacy.dlp.v2beta1.InfoTypeDescription.Builder builderForValue) {
-      if (infoTypesBuilder_ == null) {
-        ensureInfoTypesIsMutable();
-        infoTypes_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        infoTypesBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public Builder addInfoTypes(com.google.privacy.dlp.v2beta1.InfoTypeDescription value) {
-      if (infoTypesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureInfoTypesIsMutable();
-        infoTypes_.add(value);
-        onChanged();
-      } else {
-        infoTypesBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public Builder addInfoTypes(
-        int index, com.google.privacy.dlp.v2beta1.InfoTypeDescription value) {
-      if (infoTypesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureInfoTypesIsMutable();
-        infoTypes_.add(index, value);
-        onChanged();
-      } else {
-        infoTypesBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public Builder addInfoTypes(
-        com.google.privacy.dlp.v2beta1.InfoTypeDescription.Builder builderForValue) {
-      if (infoTypesBuilder_ == null) {
-        ensureInfoTypesIsMutable();
-        infoTypes_.add(builderForValue.build());
-        onChanged();
-      } else {
-        infoTypesBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public Builder addInfoTypes(
-        int index, com.google.privacy.dlp.v2beta1.InfoTypeDescription.Builder builderForValue) {
-      if (infoTypesBuilder_ == null) {
-        ensureInfoTypesIsMutable();
-        infoTypes_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        infoTypesBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public Builder addAllInfoTypes(
-        java.lang.Iterable values) {
-      if (infoTypesBuilder_ == null) {
-        ensureInfoTypesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, infoTypes_);
-        onChanged();
-      } else {
-        infoTypesBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public Builder clearInfoTypes() {
-      if (infoTypesBuilder_ == null) {
-        infoTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        infoTypesBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public Builder removeInfoTypes(int index) {
-      if (infoTypesBuilder_ == null) {
-        ensureInfoTypesIsMutable();
-        infoTypes_.remove(index);
-        onChanged();
-      } else {
-        infoTypesBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeDescription.Builder getInfoTypesBuilder(
-        int index) {
-      return getInfoTypesFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeDescriptionOrBuilder getInfoTypesOrBuilder(
-        int index) {
-      if (infoTypesBuilder_ == null) {
-        return infoTypes_.get(index);  } else {
-        return infoTypesBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public java.util.List 
-         getInfoTypesOrBuilderList() {
-      if (infoTypesBuilder_ != null) {
-        return infoTypesBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(infoTypes_);
-      }
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeDescription.Builder addInfoTypesBuilder() {
-      return getInfoTypesFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.InfoTypeDescription.getDefaultInstance());
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeDescription.Builder addInfoTypesBuilder(
-        int index) {
-      return getInfoTypesFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.InfoTypeDescription.getDefaultInstance());
-    }
-    /**
-     * 
-     * Set of sensitive info types belonging to a category.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-     */
-    public java.util.List 
-         getInfoTypesBuilderList() {
-      return getInfoTypesFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoTypeDescription, com.google.privacy.dlp.v2beta1.InfoTypeDescription.Builder, com.google.privacy.dlp.v2beta1.InfoTypeDescriptionOrBuilder> 
-        getInfoTypesFieldBuilder() {
-      if (infoTypesBuilder_ == null) {
-        infoTypesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InfoTypeDescription, com.google.privacy.dlp.v2beta1.InfoTypeDescription.Builder, com.google.privacy.dlp.v2beta1.InfoTypeDescriptionOrBuilder>(
-                infoTypes_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        infoTypes_ = null;
-      }
-      return infoTypesBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.ListInfoTypesResponse)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.ListInfoTypesResponse)
-  private static final com.google.privacy.dlp.v2beta1.ListInfoTypesResponse DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.ListInfoTypesResponse();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ListInfoTypesResponse getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public ListInfoTypesResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInfoTypesResponse(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.ListInfoTypesResponse getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesResponseOrBuilder.java
deleted file mode 100644
index 7fcd64103926..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInfoTypesResponseOrBuilder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ListInfoTypesResponseOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.ListInfoTypesResponse)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Set of sensitive info types belonging to a category.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-   */
-  java.util.List 
-      getInfoTypesList();
-  /**
-   * 
-   * Set of sensitive info types belonging to a category.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeDescription getInfoTypes(int index);
-  /**
-   * 
-   * Set of sensitive info types belonging to a category.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-   */
-  int getInfoTypesCount();
-  /**
-   * 
-   * Set of sensitive info types belonging to a category.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-   */
-  java.util.List 
-      getInfoTypesOrBuilderList();
-  /**
-   * 
-   * Set of sensitive info types belonging to a category.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.InfoTypeDescription info_types = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeDescriptionOrBuilder getInfoTypesOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsRequest.java
deleted file mode 100644
index 517e79d55e63..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsRequest.java
+++ /dev/null
@@ -1,1010 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Request for the list of results in a given inspect operation.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.ListInspectFindingsRequest}
- */
-public  final class ListInspectFindingsRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.ListInspectFindingsRequest)
-    ListInspectFindingsRequestOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ListInspectFindingsRequest.newBuilder() to construct.
-  private ListInspectFindingsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private ListInspectFindingsRequest() {
-    name_ = "";
-    pageSize_ = 0;
-    pageToken_ = "";
-    filter_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ListInspectFindingsRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
-          case 16: {
-
-            pageSize_ = input.readInt32();
-            break;
-          }
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            pageToken_ = s;
-            break;
-          }
-          case 34: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            filter_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsRequest_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest.class, com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest.Builder.class);
-  }
-
-  public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
-  /**
-   * 
-   * Identifier of the results set returned as metadata of
-   * the longrunning operation created by a call to InspectDataSource.
-   * Should be in the format of `inspect/results/{id}`.
-   * 

-   *
-   * string name = 1;
-   */
-  public java.lang.String getName() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      name_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Identifier of the results set returned as metadata of
-   * the longrunning operation created by a call to InspectDataSource.
-   * Should be in the format of `inspect/results/{id}`.
-   * 

-   *
-   * string name = 1;
-   */
-  public com.google.protobuf.ByteString
-      getNameBytes() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      name_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int PAGE_SIZE_FIELD_NUMBER = 2;
-  private int pageSize_;
-  /**
-   * 
-   * Maximum number of results to return.
-   * If 0, the implementation selects a reasonable value.
-   * 

-   *
-   * int32 page_size = 2;
-   */
-  public int getPageSize() {
-    return pageSize_;
-  }
-
-  public static final int PAGE_TOKEN_FIELD_NUMBER = 3;
-  private volatile java.lang.Object pageToken_;
-  /**
-   * 
-   * The value returned by the last `ListInspectFindingsResponse`; indicates
-   * that this is a continuation of a prior `ListInspectFindings` call, and that
-   * the system should return the next page of data.
-   * 

-   *
-   * string page_token = 3;
-   */
-  public java.lang.String getPageToken() {
-    java.lang.Object ref = pageToken_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      pageToken_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * The value returned by the last `ListInspectFindingsResponse`; indicates
-   * that this is a continuation of a prior `ListInspectFindings` call, and that
-   * the system should return the next page of data.
-   * 

-   *
-   * string page_token = 3;
-   */
-  public com.google.protobuf.ByteString
-      getPageTokenBytes() {
-    java.lang.Object ref = pageToken_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      pageToken_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int FILTER_FIELD_NUMBER = 4;
-  private volatile java.lang.Object filter_;
-  /**
-   * 
-   * Restricts findings to items that match. Supports info_type and likelihood.
-   * Examples:
-   * - info_type=EMAIL_ADDRESS
-   * - info_type=PHONE_NUMBER,EMAIL_ADDRESS
-   * - likelihood=VERY_LIKELY
-   * - likelihood=VERY_LIKELY,LIKELY
-   * - info_type=EMAIL_ADDRESS,likelihood=VERY_LIKELY,LIKELY
-   * 

-   *
-   * string filter = 4;
-   */
-  public java.lang.String getFilter() {
-    java.lang.Object ref = filter_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      filter_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Restricts findings to items that match. Supports info_type and likelihood.
-   * Examples:
-   * - info_type=EMAIL_ADDRESS
-   * - info_type=PHONE_NUMBER,EMAIL_ADDRESS
-   * - likelihood=VERY_LIKELY
-   * - likelihood=VERY_LIKELY,LIKELY
-   * - info_type=EMAIL_ADDRESS,likelihood=VERY_LIKELY,LIKELY
-   * 

-   *
-   * string filter = 4;
-   */
-  public com.google.protobuf.ByteString
-      getFilterBytes() {
-    java.lang.Object ref = filter_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      filter_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
-    }
-    if (pageSize_ != 0) {
-      output.writeInt32(2, pageSize_);
-    }
-    if (!getPageTokenBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
-    }
-    if (!getFilterBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 4, filter_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
-    }
-    if (pageSize_ != 0) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt32Size(2, pageSize_);
-    }
-    if (!getPageTokenBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
-    }
-    if (!getFilterBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, filter_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest other = (com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest) obj;
-
-    boolean result = true;
-    result = result && getName()
-        .equals(other.getName());
-    result = result && (getPageSize()
-        == other.getPageSize());
-    result = result && getPageToken()
-        .equals(other.getPageToken());
-    result = result && getFilter()
-        .equals(other.getFilter());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getName().hashCode();
-    hash = (37 * hash) + PAGE_SIZE_FIELD_NUMBER;
-    hash = (53 * hash) + getPageSize();
-    hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
-    hash = (53 * hash) + getPageToken().hashCode();
-    hash = (37 * hash) + FILTER_FIELD_NUMBER;
-    hash = (53 * hash) + getFilter().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Request for the list of results in a given inspect operation.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.ListInspectFindingsRequest}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.ListInspectFindingsRequest)
-      com.google.privacy.dlp.v2beta1.ListInspectFindingsRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsRequest_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest.class, com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      name_ = "";
-
-      pageSize_ = 0;
-
-      pageToken_ = "";
-
-      filter_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsRequest_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest build() {
-      com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest buildPartial() {
-      com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest result = new com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest(this);
-      result.name_ = name_;
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
-      result.filter_ = filter_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest other) {
-      if (other == com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest.getDefaultInstance()) return this;
-      if (!other.getName().isEmpty()) {
-        name_ = other.name_;
-        onChanged();
-      }
-      if (other.getPageSize() != 0) {
-        setPageSize(other.getPageSize());
-      }
-      if (!other.getPageToken().isEmpty()) {
-        pageToken_ = other.pageToken_;
-        onChanged();
-      }
-      if (!other.getFilter().isEmpty()) {
-        filter_ = other.filter_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object name_ = "";
-    /**
-     * 
-     * Identifier of the results set returned as metadata of
-     * the longrunning operation created by a call to InspectDataSource.
-     * Should be in the format of `inspect/results/{id}`.
-     * 

-     *
-     * string name = 1;
-     */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        name_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Identifier of the results set returned as metadata of
-     * the longrunning operation created by a call to InspectDataSource.
-     * Should be in the format of `inspect/results/{id}`.
-     * 

-     *
-     * string name = 1;
-     */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
-      java.lang.Object ref = name_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        name_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Identifier of the results set returned as metadata of
-     * the longrunning operation created by a call to InspectDataSource.
-     * Should be in the format of `inspect/results/{id}`.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder setName(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Identifier of the results set returned as metadata of
-     * the longrunning operation created by a call to InspectDataSource.
-     * Should be in the format of `inspect/results/{id}`.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder clearName() {
-      
-      name_ = getDefaultInstance().getName();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Identifier of the results set returned as metadata of
-     * the longrunning operation created by a call to InspectDataSource.
-     * Should be in the format of `inspect/results/{id}`.
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder setNameBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      name_ = value;
-      onChanged();
-      return this;
-    }
-
-    private int pageSize_ ;
-    /**
-     * 
-     * Maximum number of results to return.
-     * If 0, the implementation selects a reasonable value.
-     * 

-     *
-     * int32 page_size = 2;
-     */
-    public int getPageSize() {
-      return pageSize_;
-    }
-    /**
-     * 
-     * Maximum number of results to return.
-     * If 0, the implementation selects a reasonable value.
-     * 

-     *
-     * int32 page_size = 2;
-     */
-    public Builder setPageSize(int value) {
-      
-      pageSize_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Maximum number of results to return.
-     * If 0, the implementation selects a reasonable value.
-     * 

-     *
-     * int32 page_size = 2;
-     */
-    public Builder clearPageSize() {
-      
-      pageSize_ = 0;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object pageToken_ = "";
-    /**
-     * 
-     * The value returned by the last `ListInspectFindingsResponse`; indicates
-     * that this is a continuation of a prior `ListInspectFindings` call, and that
-     * the system should return the next page of data.
-     * 

-     *
-     * string page_token = 3;
-     */
-    public java.lang.String getPageToken() {
-      java.lang.Object ref = pageToken_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        pageToken_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * The value returned by the last `ListInspectFindingsResponse`; indicates
-     * that this is a continuation of a prior `ListInspectFindings` call, and that
-     * the system should return the next page of data.
-     * 

-     *
-     * string page_token = 3;
-     */
-    public com.google.protobuf.ByteString
-        getPageTokenBytes() {
-      java.lang.Object ref = pageToken_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        pageToken_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * The value returned by the last `ListInspectFindingsResponse`; indicates
-     * that this is a continuation of a prior `ListInspectFindings` call, and that
-     * the system should return the next page of data.
-     * 

-     *
-     * string page_token = 3;
-     */
-    public Builder setPageToken(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      pageToken_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The value returned by the last `ListInspectFindingsResponse`; indicates
-     * that this is a continuation of a prior `ListInspectFindings` call, and that
-     * the system should return the next page of data.
-     * 

-     *
-     * string page_token = 3;
-     */
-    public Builder clearPageToken() {
-      
-      pageToken_ = getDefaultInstance().getPageToken();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The value returned by the last `ListInspectFindingsResponse`; indicates
-     * that this is a continuation of a prior `ListInspectFindings` call, and that
-     * the system should return the next page of data.
-     * 

-     *
-     * string page_token = 3;
-     */
-    public Builder setPageTokenBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      pageToken_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object filter_ = "";
-    /**
-     * 
-     * Restricts findings to items that match. Supports info_type and likelihood.
-     * Examples:
-     * - info_type=EMAIL_ADDRESS
-     * - info_type=PHONE_NUMBER,EMAIL_ADDRESS
-     * - likelihood=VERY_LIKELY
-     * - likelihood=VERY_LIKELY,LIKELY
-     * - info_type=EMAIL_ADDRESS,likelihood=VERY_LIKELY,LIKELY
-     * 

-     *
-     * string filter = 4;
-     */
-    public java.lang.String getFilter() {
-      java.lang.Object ref = filter_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        filter_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Restricts findings to items that match. Supports info_type and likelihood.
-     * Examples:
-     * - info_type=EMAIL_ADDRESS
-     * - info_type=PHONE_NUMBER,EMAIL_ADDRESS
-     * - likelihood=VERY_LIKELY
-     * - likelihood=VERY_LIKELY,LIKELY
-     * - info_type=EMAIL_ADDRESS,likelihood=VERY_LIKELY,LIKELY
-     * 

-     *
-     * string filter = 4;
-     */
-    public com.google.protobuf.ByteString
-        getFilterBytes() {
-      java.lang.Object ref = filter_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        filter_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Restricts findings to items that match. Supports info_type and likelihood.
-     * Examples:
-     * - info_type=EMAIL_ADDRESS
-     * - info_type=PHONE_NUMBER,EMAIL_ADDRESS
-     * - likelihood=VERY_LIKELY
-     * - likelihood=VERY_LIKELY,LIKELY
-     * - info_type=EMAIL_ADDRESS,likelihood=VERY_LIKELY,LIKELY
-     * 

-     *
-     * string filter = 4;
-     */
-    public Builder setFilter(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      filter_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Restricts findings to items that match. Supports info_type and likelihood.
-     * Examples:
-     * - info_type=EMAIL_ADDRESS
-     * - info_type=PHONE_NUMBER,EMAIL_ADDRESS
-     * - likelihood=VERY_LIKELY
-     * - likelihood=VERY_LIKELY,LIKELY
-     * - info_type=EMAIL_ADDRESS,likelihood=VERY_LIKELY,LIKELY
-     * 

-     *
-     * string filter = 4;
-     */
-    public Builder clearFilter() {
-      
-      filter_ = getDefaultInstance().getFilter();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Restricts findings to items that match. Supports info_type and likelihood.
-     * Examples:
-     * - info_type=EMAIL_ADDRESS
-     * - info_type=PHONE_NUMBER,EMAIL_ADDRESS
-     * - likelihood=VERY_LIKELY
-     * - likelihood=VERY_LIKELY,LIKELY
-     * - info_type=EMAIL_ADDRESS,likelihood=VERY_LIKELY,LIKELY
-     * 

-     *
-     * string filter = 4;
-     */
-    public Builder setFilterBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      filter_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.ListInspectFindingsRequest)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.ListInspectFindingsRequest)
-  private static final com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public ListInspectFindingsRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInspectFindingsRequest(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsRequestOrBuilder.java
deleted file mode 100644
index 767c22e0217b..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsRequestOrBuilder.java
+++ /dev/null
@@ -1,93 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ListInspectFindingsRequestOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.ListInspectFindingsRequest)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Identifier of the results set returned as metadata of
-   * the longrunning operation created by a call to InspectDataSource.
-   * Should be in the format of `inspect/results/{id}`.
-   * 

-   *
-   * string name = 1;
-   */
-  java.lang.String getName();
-  /**
-   * 
-   * Identifier of the results set returned as metadata of
-   * the longrunning operation created by a call to InspectDataSource.
-   * Should be in the format of `inspect/results/{id}`.
-   * 

-   *
-   * string name = 1;
-   */
-  com.google.protobuf.ByteString
-      getNameBytes();
-
-  /**
-   * 
-   * Maximum number of results to return.
-   * If 0, the implementation selects a reasonable value.
-   * 

-   *
-   * int32 page_size = 2;
-   */
-  int getPageSize();
-
-  /**
-   * 
-   * The value returned by the last `ListInspectFindingsResponse`; indicates
-   * that this is a continuation of a prior `ListInspectFindings` call, and that
-   * the system should return the next page of data.
-   * 

-   *
-   * string page_token = 3;
-   */
-  java.lang.String getPageToken();
-  /**
-   * 
-   * The value returned by the last `ListInspectFindingsResponse`; indicates
-   * that this is a continuation of a prior `ListInspectFindings` call, and that
-   * the system should return the next page of data.
-   * 

-   *
-   * string page_token = 3;
-   */
-  com.google.protobuf.ByteString
-      getPageTokenBytes();
-
-  /**
-   * 
-   * Restricts findings to items that match. Supports info_type and likelihood.
-   * Examples:
-   * - info_type=EMAIL_ADDRESS
-   * - info_type=PHONE_NUMBER,EMAIL_ADDRESS
-   * - likelihood=VERY_LIKELY
-   * - likelihood=VERY_LIKELY,LIKELY
-   * - info_type=EMAIL_ADDRESS,likelihood=VERY_LIKELY,LIKELY
-   * 

-   *
-   * string filter = 4;
-   */
-  java.lang.String getFilter();
-  /**
-   * 
-   * Restricts findings to items that match. Supports info_type and likelihood.
-   * Examples:
-   * - info_type=EMAIL_ADDRESS
-   * - info_type=PHONE_NUMBER,EMAIL_ADDRESS
-   * - likelihood=VERY_LIKELY
-   * - likelihood=VERY_LIKELY,LIKELY
-   * - info_type=EMAIL_ADDRESS,likelihood=VERY_LIKELY,LIKELY
-   * 

-   *
-   * string filter = 4;
-   */
-  com.google.protobuf.ByteString
-      getFilterBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsResponse.java
deleted file mode 100644
index 32d8db523ebc..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsResponse.java
+++ /dev/null
@@ -1,788 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Response to the ListInspectFindings request.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.ListInspectFindingsResponse}
- */
-public  final class ListInspectFindingsResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.ListInspectFindingsResponse)
-    ListInspectFindingsResponseOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ListInspectFindingsResponse.newBuilder() to construct.
-  private ListInspectFindingsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private ListInspectFindingsResponse() {
-    nextPageToken_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ListInspectFindingsResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.InspectResult.Builder subBuilder = null;
-            if (result_ != null) {
-              subBuilder = result_.toBuilder();
-            }
-            result_ = input.readMessage(com.google.privacy.dlp.v2beta1.InspectResult.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(result_);
-              result_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            nextPageToken_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsResponse_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse.class, com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse.Builder.class);
-  }
-
-  public static final int RESULT_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.InspectResult result_;
-  /**
-   * 
-   * The results.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-   */
-  public boolean hasResult() {
-    return result_ != null;
-  }
-  /**
-   * 
-   * The results.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectResult getResult() {
-    return result_ == null ? com.google.privacy.dlp.v2beta1.InspectResult.getDefaultInstance() : result_;
-  }
-  /**
-   * 
-   * The results.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectResultOrBuilder getResultOrBuilder() {
-    return getResult();
-  }
-
-  public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2;
-  private volatile java.lang.Object nextPageToken_;
-  /**
-   * 
-   * If not empty, indicates that there may be more results that match the
-   * request; this value should be passed in a new `ListInspectFindingsRequest`.
-   * 

-   *
-   * string next_page_token = 2;
-   */
-  public java.lang.String getNextPageToken() {
-    java.lang.Object ref = nextPageToken_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      nextPageToken_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * If not empty, indicates that there may be more results that match the
-   * request; this value should be passed in a new `ListInspectFindingsRequest`.
-   * 

-   *
-   * string next_page_token = 2;
-   */
-  public com.google.protobuf.ByteString
-      getNextPageTokenBytes() {
-    java.lang.Object ref = nextPageToken_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      nextPageToken_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (result_ != null) {
-      output.writeMessage(1, getResult());
-    }
-    if (!getNextPageTokenBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (result_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getResult());
-    }
-    if (!getNextPageTokenBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse other = (com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse) obj;
-
-    boolean result = true;
-    result = result && (hasResult() == other.hasResult());
-    if (hasResult()) {
-      result = result && getResult()
-          .equals(other.getResult());
-    }
-    result = result && getNextPageToken()
-        .equals(other.getNextPageToken());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasResult()) {
-      hash = (37 * hash) + RESULT_FIELD_NUMBER;
-      hash = (53 * hash) + getResult().hashCode();
-    }
-    hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER;
-    hash = (53 * hash) + getNextPageToken().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Response to the ListInspectFindings request.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.ListInspectFindingsResponse}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.ListInspectFindingsResponse)
-      com.google.privacy.dlp.v2beta1.ListInspectFindingsResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsResponse_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse.class, com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (resultBuilder_ == null) {
-        result_ = null;
-      } else {
-        result_ = null;
-        resultBuilder_ = null;
-      }
-      nextPageToken_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListInspectFindingsResponse_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse build() {
-      com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse buildPartial() {
-      com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse result = new com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse(this);
-      if (resultBuilder_ == null) {
-        result.result_ = result_;
-      } else {
-        result.result_ = resultBuilder_.build();
-      }
-      result.nextPageToken_ = nextPageToken_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse other) {
-      if (other == com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse.getDefaultInstance()) return this;
-      if (other.hasResult()) {
-        mergeResult(other.getResult());
-      }
-      if (!other.getNextPageToken().isEmpty()) {
-        nextPageToken_ = other.nextPageToken_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.InspectResult result_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectResult, com.google.privacy.dlp.v2beta1.InspectResult.Builder, com.google.privacy.dlp.v2beta1.InspectResultOrBuilder> resultBuilder_;
-    /**
-     * 
-     * The results.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-     */
-    public boolean hasResult() {
-      return resultBuilder_ != null || result_ != null;
-    }
-    /**
-     * 
-     * The results.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectResult getResult() {
-      if (resultBuilder_ == null) {
-        return result_ == null ? com.google.privacy.dlp.v2beta1.InspectResult.getDefaultInstance() : result_;
-      } else {
-        return resultBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The results.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-     */
-    public Builder setResult(com.google.privacy.dlp.v2beta1.InspectResult value) {
-      if (resultBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        result_ = value;
-        onChanged();
-      } else {
-        resultBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The results.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-     */
-    public Builder setResult(
-        com.google.privacy.dlp.v2beta1.InspectResult.Builder builderForValue) {
-      if (resultBuilder_ == null) {
-        result_ = builderForValue.build();
-        onChanged();
-      } else {
-        resultBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The results.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-     */
-    public Builder mergeResult(com.google.privacy.dlp.v2beta1.InspectResult value) {
-      if (resultBuilder_ == null) {
-        if (result_ != null) {
-          result_ =
-            com.google.privacy.dlp.v2beta1.InspectResult.newBuilder(result_).mergeFrom(value).buildPartial();
-        } else {
-          result_ = value;
-        }
-        onChanged();
-      } else {
-        resultBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The results.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-     */
-    public Builder clearResult() {
-      if (resultBuilder_ == null) {
-        result_ = null;
-        onChanged();
-      } else {
-        result_ = null;
-        resultBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The results.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectResult.Builder getResultBuilder() {
-      
-      onChanged();
-      return getResultFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The results.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectResultOrBuilder getResultOrBuilder() {
-      if (resultBuilder_ != null) {
-        return resultBuilder_.getMessageOrBuilder();
-      } else {
-        return result_ == null ?
-            com.google.privacy.dlp.v2beta1.InspectResult.getDefaultInstance() : result_;
-      }
-    }
-    /**
-     * 
-     * The results.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectResult, com.google.privacy.dlp.v2beta1.InspectResult.Builder, com.google.privacy.dlp.v2beta1.InspectResultOrBuilder> 
-        getResultFieldBuilder() {
-      if (resultBuilder_ == null) {
-        resultBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InspectResult, com.google.privacy.dlp.v2beta1.InspectResult.Builder, com.google.privacy.dlp.v2beta1.InspectResultOrBuilder>(
-                getResult(),
-                getParentForChildren(),
-                isClean());
-        result_ = null;
-      }
-      return resultBuilder_;
-    }
-
-    private java.lang.Object nextPageToken_ = "";
-    /**
-     * 
-     * If not empty, indicates that there may be more results that match the
-     * request; this value should be passed in a new `ListInspectFindingsRequest`.
-     * 

-     *
-     * string next_page_token = 2;
-     */
-    public java.lang.String getNextPageToken() {
-      java.lang.Object ref = nextPageToken_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        nextPageToken_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * If not empty, indicates that there may be more results that match the
-     * request; this value should be passed in a new `ListInspectFindingsRequest`.
-     * 

-     *
-     * string next_page_token = 2;
-     */
-    public com.google.protobuf.ByteString
-        getNextPageTokenBytes() {
-      java.lang.Object ref = nextPageToken_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        nextPageToken_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * If not empty, indicates that there may be more results that match the
-     * request; this value should be passed in a new `ListInspectFindingsRequest`.
-     * 

-     *
-     * string next_page_token = 2;
-     */
-    public Builder setNextPageToken(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      nextPageToken_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * If not empty, indicates that there may be more results that match the
-     * request; this value should be passed in a new `ListInspectFindingsRequest`.
-     * 

-     *
-     * string next_page_token = 2;
-     */
-    public Builder clearNextPageToken() {
-      
-      nextPageToken_ = getDefaultInstance().getNextPageToken();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * If not empty, indicates that there may be more results that match the
-     * request; this value should be passed in a new `ListInspectFindingsRequest`.
-     * 

-     *
-     * string next_page_token = 2;
-     */
-    public Builder setNextPageTokenBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      nextPageToken_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.ListInspectFindingsResponse)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.ListInspectFindingsResponse)
-  private static final com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public ListInspectFindingsResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInspectFindingsResponse(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsResponseOrBuilder.java
deleted file mode 100644
index 08ceb72e0ab3..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListInspectFindingsResponseOrBuilder.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ListInspectFindingsResponseOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.ListInspectFindingsResponse)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The results.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-   */
-  boolean hasResult();
-  /**
-   * 
-   * The results.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InspectResult getResult();
-  /**
-   * 
-   * The results.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectResult result = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InspectResultOrBuilder getResultOrBuilder();
-
-  /**
-   * 
-   * If not empty, indicates that there may be more results that match the
-   * request; this value should be passed in a new `ListInspectFindingsRequest`.
-   * 

-   *
-   * string next_page_token = 2;
-   */
-  java.lang.String getNextPageToken();
-  /**
-   * 
-   * If not empty, indicates that there may be more results that match the
-   * request; this value should be passed in a new `ListInspectFindingsRequest`.
-   * 

-   *
-   * string next_page_token = 2;
-   */
-  com.google.protobuf.ByteString
-      getNextPageTokenBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesRequest.java
deleted file mode 100644
index 6c4312b5d050..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesRequest.java
+++ /dev/null
@@ -1,568 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Request for root categories of Info Types supported by the API.
- * Example values might include "FINANCE", "HEALTH", "FAST", "DEFAULT".
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.ListRootCategoriesRequest}
- */
-public  final class ListRootCategoriesRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.ListRootCategoriesRequest)
-    ListRootCategoriesRequestOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ListRootCategoriesRequest.newBuilder() to construct.
-  private ListRootCategoriesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private ListRootCategoriesRequest() {
-    languageCode_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ListRootCategoriesRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            languageCode_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesRequest_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest.class, com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest.Builder.class);
-  }
-
-  public static final int LANGUAGE_CODE_FIELD_NUMBER = 1;
-  private volatile java.lang.Object languageCode_;
-  /**
-   * 
-   * Optional language code for localized friendly category names.
-   * If omitted or if localized strings are not available,
-   * en-US strings will be returned.
-   * 

-   *
-   * string language_code = 1;
-   */
-  public java.lang.String getLanguageCode() {
-    java.lang.Object ref = languageCode_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      languageCode_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Optional language code for localized friendly category names.
-   * If omitted or if localized strings are not available,
-   * en-US strings will be returned.
-   * 

-   *
-   * string language_code = 1;
-   */
-  public com.google.protobuf.ByteString
-      getLanguageCodeBytes() {
-    java.lang.Object ref = languageCode_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      languageCode_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getLanguageCodeBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, languageCode_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getLanguageCodeBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, languageCode_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest other = (com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest) obj;
-
-    boolean result = true;
-    result = result && getLanguageCode()
-        .equals(other.getLanguageCode());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + LANGUAGE_CODE_FIELD_NUMBER;
-    hash = (53 * hash) + getLanguageCode().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Request for root categories of Info Types supported by the API.
-   * Example values might include "FINANCE", "HEALTH", "FAST", "DEFAULT".
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.ListRootCategoriesRequest}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.ListRootCategoriesRequest)
-      com.google.privacy.dlp.v2beta1.ListRootCategoriesRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesRequest_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest.class, com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      languageCode_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesRequest_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest build() {
-      com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest buildPartial() {
-      com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest result = new com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest(this);
-      result.languageCode_ = languageCode_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest other) {
-      if (other == com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest.getDefaultInstance()) return this;
-      if (!other.getLanguageCode().isEmpty()) {
-        languageCode_ = other.languageCode_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object languageCode_ = "";
-    /**
-     * 
-     * Optional language code for localized friendly category names.
-     * If omitted or if localized strings are not available,
-     * en-US strings will be returned.
-     * 

-     *
-     * string language_code = 1;
-     */
-    public java.lang.String getLanguageCode() {
-      java.lang.Object ref = languageCode_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        languageCode_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Optional language code for localized friendly category names.
-     * If omitted or if localized strings are not available,
-     * en-US strings will be returned.
-     * 

-     *
-     * string language_code = 1;
-     */
-    public com.google.protobuf.ByteString
-        getLanguageCodeBytes() {
-      java.lang.Object ref = languageCode_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        languageCode_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Optional language code for localized friendly category names.
-     * If omitted or if localized strings are not available,
-     * en-US strings will be returned.
-     * 

-     *
-     * string language_code = 1;
-     */
-    public Builder setLanguageCode(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      languageCode_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Optional language code for localized friendly category names.
-     * If omitted or if localized strings are not available,
-     * en-US strings will be returned.
-     * 

-     *
-     * string language_code = 1;
-     */
-    public Builder clearLanguageCode() {
-      
-      languageCode_ = getDefaultInstance().getLanguageCode();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Optional language code for localized friendly category names.
-     * If omitted or if localized strings are not available,
-     * en-US strings will be returned.
-     * 

-     *
-     * string language_code = 1;
-     */
-    public Builder setLanguageCodeBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      languageCode_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.ListRootCategoriesRequest)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.ListRootCategoriesRequest)
-  private static final com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public ListRootCategoriesRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListRootCategoriesRequest(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesRequestOrBuilder.java
deleted file mode 100644
index 48cc9a55d213..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesRequestOrBuilder.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ListRootCategoriesRequestOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.ListRootCategoriesRequest)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Optional language code for localized friendly category names.
-   * If omitted or if localized strings are not available,
-   * en-US strings will be returned.
-   * 

-   *
-   * string language_code = 1;
-   */
-  java.lang.String getLanguageCode();
-  /**
-   * 
-   * Optional language code for localized friendly category names.
-   * If omitted or if localized strings are not available,
-   * en-US strings will be returned.
-   * 

-   *
-   * string language_code = 1;
-   */
-  com.google.protobuf.ByteString
-      getLanguageCodeBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesResponse.java
deleted file mode 100644
index 427d6e466b9a..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesResponse.java
+++ /dev/null
@@ -1,834 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Response for ListRootCategories request.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.ListRootCategoriesResponse}
- */
-public  final class ListRootCategoriesResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.ListRootCategoriesResponse)
-    ListRootCategoriesResponseOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ListRootCategoriesResponse.newBuilder() to construct.
-  private ListRootCategoriesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private ListRootCategoriesResponse() {
-    categories_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ListRootCategoriesResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              categories_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            categories_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.CategoryDescription.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        categories_ = java.util.Collections.unmodifiableList(categories_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesResponse_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse.class, com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse.Builder.class);
-  }
-
-  public static final int CATEGORIES_FIELD_NUMBER = 1;
-  private java.util.List categories_;
-  /**
-   * 
-   * List of all into type categories supported by the API.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-   */
-  public java.util.List getCategoriesList() {
-    return categories_;
-  }
-  /**
-   * 
-   * List of all into type categories supported by the API.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-   */
-  public java.util.List 
-      getCategoriesOrBuilderList() {
-    return categories_;
-  }
-  /**
-   * 
-   * List of all into type categories supported by the API.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-   */
-  public int getCategoriesCount() {
-    return categories_.size();
-  }
-  /**
-   * 
-   * List of all into type categories supported by the API.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.CategoryDescription getCategories(int index) {
-    return categories_.get(index);
-  }
-  /**
-   * 
-   * List of all into type categories supported by the API.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder getCategoriesOrBuilder(
-      int index) {
-    return categories_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < categories_.size(); i++) {
-      output.writeMessage(1, categories_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < categories_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, categories_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse other = (com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse) obj;
-
-    boolean result = true;
-    result = result && getCategoriesList()
-        .equals(other.getCategoriesList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getCategoriesCount() > 0) {
-      hash = (37 * hash) + CATEGORIES_FIELD_NUMBER;
-      hash = (53 * hash) + getCategoriesList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Response for ListRootCategories request.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.ListRootCategoriesResponse}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.ListRootCategoriesResponse)
-      com.google.privacy.dlp.v2beta1.ListRootCategoriesResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesResponse_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse.class, com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getCategoriesFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (categoriesBuilder_ == null) {
-        categories_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        categoriesBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ListRootCategoriesResponse_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse build() {
-      com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse buildPartial() {
-      com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse result = new com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse(this);
-      int from_bitField0_ = bitField0_;
-      if (categoriesBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          categories_ = java.util.Collections.unmodifiableList(categories_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.categories_ = categories_;
-      } else {
-        result.categories_ = categoriesBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse other) {
-      if (other == com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse.getDefaultInstance()) return this;
-      if (categoriesBuilder_ == null) {
-        if (!other.categories_.isEmpty()) {
-          if (categories_.isEmpty()) {
-            categories_ = other.categories_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureCategoriesIsMutable();
-            categories_.addAll(other.categories_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.categories_.isEmpty()) {
-          if (categoriesBuilder_.isEmpty()) {
-            categoriesBuilder_.dispose();
-            categoriesBuilder_ = null;
-            categories_ = other.categories_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            categoriesBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getCategoriesFieldBuilder() : null;
-          } else {
-            categoriesBuilder_.addAllMessages(other.categories_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List categories_ =
-      java.util.Collections.emptyList();
-    private void ensureCategoriesIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        categories_ = new java.util.ArrayList(categories_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CategoryDescription, com.google.privacy.dlp.v2beta1.CategoryDescription.Builder, com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder> categoriesBuilder_;
-
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public java.util.List getCategoriesList() {
-      if (categoriesBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(categories_);
-      } else {
-        return categoriesBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public int getCategoriesCount() {
-      if (categoriesBuilder_ == null) {
-        return categories_.size();
-      } else {
-        return categoriesBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CategoryDescription getCategories(int index) {
-      if (categoriesBuilder_ == null) {
-        return categories_.get(index);
-      } else {
-        return categoriesBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public Builder setCategories(
-        int index, com.google.privacy.dlp.v2beta1.CategoryDescription value) {
-      if (categoriesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureCategoriesIsMutable();
-        categories_.set(index, value);
-        onChanged();
-      } else {
-        categoriesBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public Builder setCategories(
-        int index, com.google.privacy.dlp.v2beta1.CategoryDescription.Builder builderForValue) {
-      if (categoriesBuilder_ == null) {
-        ensureCategoriesIsMutable();
-        categories_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        categoriesBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public Builder addCategories(com.google.privacy.dlp.v2beta1.CategoryDescription value) {
-      if (categoriesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureCategoriesIsMutable();
-        categories_.add(value);
-        onChanged();
-      } else {
-        categoriesBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public Builder addCategories(
-        int index, com.google.privacy.dlp.v2beta1.CategoryDescription value) {
-      if (categoriesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureCategoriesIsMutable();
-        categories_.add(index, value);
-        onChanged();
-      } else {
-        categoriesBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public Builder addCategories(
-        com.google.privacy.dlp.v2beta1.CategoryDescription.Builder builderForValue) {
-      if (categoriesBuilder_ == null) {
-        ensureCategoriesIsMutable();
-        categories_.add(builderForValue.build());
-        onChanged();
-      } else {
-        categoriesBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public Builder addCategories(
-        int index, com.google.privacy.dlp.v2beta1.CategoryDescription.Builder builderForValue) {
-      if (categoriesBuilder_ == null) {
-        ensureCategoriesIsMutable();
-        categories_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        categoriesBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public Builder addAllCategories(
-        java.lang.Iterable values) {
-      if (categoriesBuilder_ == null) {
-        ensureCategoriesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, categories_);
-        onChanged();
-      } else {
-        categoriesBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public Builder clearCategories() {
-      if (categoriesBuilder_ == null) {
-        categories_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        categoriesBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public Builder removeCategories(int index) {
-      if (categoriesBuilder_ == null) {
-        ensureCategoriesIsMutable();
-        categories_.remove(index);
-        onChanged();
-      } else {
-        categoriesBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CategoryDescription.Builder getCategoriesBuilder(
-        int index) {
-      return getCategoriesFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder getCategoriesOrBuilder(
-        int index) {
-      if (categoriesBuilder_ == null) {
-        return categories_.get(index);  } else {
-        return categoriesBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public java.util.List 
-         getCategoriesOrBuilderList() {
-      if (categoriesBuilder_ != null) {
-        return categoriesBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(categories_);
-      }
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CategoryDescription.Builder addCategoriesBuilder() {
-      return getCategoriesFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.CategoryDescription.getDefaultInstance());
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CategoryDescription.Builder addCategoriesBuilder(
-        int index) {
-      return getCategoriesFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.CategoryDescription.getDefaultInstance());
-    }
-    /**
-     * 
-     * List of all into type categories supported by the API.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-     */
-    public java.util.List 
-         getCategoriesBuilderList() {
-      return getCategoriesFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CategoryDescription, com.google.privacy.dlp.v2beta1.CategoryDescription.Builder, com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder> 
-        getCategoriesFieldBuilder() {
-      if (categoriesBuilder_ == null) {
-        categoriesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CategoryDescription, com.google.privacy.dlp.v2beta1.CategoryDescription.Builder, com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder>(
-                categories_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        categories_ = null;
-      }
-      return categoriesBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.ListRootCategoriesResponse)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.ListRootCategoriesResponse)
-  private static final com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public ListRootCategoriesResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListRootCategoriesResponse(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesResponseOrBuilder.java
deleted file mode 100644
index cc999ecc76f5..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ListRootCategoriesResponseOrBuilder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ListRootCategoriesResponseOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.ListRootCategoriesResponse)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * List of all into type categories supported by the API.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-   */
-  java.util.List 
-      getCategoriesList();
-  /**
-   * 
-   * List of all into type categories supported by the API.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-   */
-  com.google.privacy.dlp.v2beta1.CategoryDescription getCategories(int index);
-  /**
-   * 
-   * List of all into type categories supported by the API.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-   */
-  int getCategoriesCount();
-  /**
-   * 
-   * List of all into type categories supported by the API.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-   */
-  java.util.List 
-      getCategoriesOrBuilderList();
-  /**
-   * 
-   * List of all into type categories supported by the API.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.CategoryDescription categories = 1;
-   */
-  com.google.privacy.dlp.v2beta1.CategoryDescriptionOrBuilder getCategoriesOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Location.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Location.java
deleted file mode 100644
index c8df71e34017..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Location.java
+++ /dev/null
@@ -1,1994 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Specifies the location of a finding within its source item.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.Location}
- */
-public  final class Location extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.Location)
-    LocationOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Location.newBuilder() to construct.
-  private Location(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private Location() {
-    imageBoxes_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Location(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.Range.Builder subBuilder = null;
-            if (byteRange_ != null) {
-              subBuilder = byteRange_.toBuilder();
-            }
-            byteRange_ = input.readMessage(com.google.privacy.dlp.v2beta1.Range.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(byteRange_);
-              byteRange_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.Range.Builder subBuilder = null;
-            if (codepointRange_ != null) {
-              subBuilder = codepointRange_.toBuilder();
-            }
-            codepointRange_ = input.readMessage(com.google.privacy.dlp.v2beta1.Range.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(codepointRange_);
-              codepointRange_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 26: {
-            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-              imageBoxes_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000004;
-            }
-            imageBoxes_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.ImageLocation.parser(), extensionRegistry));
-            break;
-          }
-          case 34: {
-            com.google.privacy.dlp.v2beta1.RecordKey.Builder subBuilder = null;
-            if (recordKey_ != null) {
-              subBuilder = recordKey_.toBuilder();
-            }
-            recordKey_ = input.readMessage(com.google.privacy.dlp.v2beta1.RecordKey.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(recordKey_);
-              recordKey_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 42: {
-            com.google.privacy.dlp.v2beta1.FieldId.Builder subBuilder = null;
-            if (fieldId_ != null) {
-              subBuilder = fieldId_.toBuilder();
-            }
-            fieldId_ = input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(fieldId_);
-              fieldId_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 50: {
-            com.google.privacy.dlp.v2beta1.TableLocation.Builder subBuilder = null;
-            if (tableLocation_ != null) {
-              subBuilder = tableLocation_.toBuilder();
-            }
-            tableLocation_ = input.readMessage(com.google.privacy.dlp.v2beta1.TableLocation.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(tableLocation_);
-              tableLocation_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-        imageBoxes_ = java.util.Collections.unmodifiableList(imageBoxes_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Location_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Location_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.Location.class, com.google.privacy.dlp.v2beta1.Location.Builder.class);
-  }
-
-  private int bitField0_;
-  public static final int BYTE_RANGE_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.Range byteRange_;
-  /**
-   * 
-   * Zero-based byte offsets within a content item.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-   */
-  public boolean hasByteRange() {
-    return byteRange_ != null;
-  }
-  /**
-   * 
-   * Zero-based byte offsets within a content item.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.Range getByteRange() {
-    return byteRange_ == null ? com.google.privacy.dlp.v2beta1.Range.getDefaultInstance() : byteRange_;
-  }
-  /**
-   * 
-   * Zero-based byte offsets within a content item.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.RangeOrBuilder getByteRangeOrBuilder() {
-    return getByteRange();
-  }
-
-  public static final int CODEPOINT_RANGE_FIELD_NUMBER = 2;
-  private com.google.privacy.dlp.v2beta1.Range codepointRange_;
-  /**
-   * 
-   * Character offsets within a content item, included when content type
-   * is a text. Default charset assumed to be UTF-8.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-   */
-  public boolean hasCodepointRange() {
-    return codepointRange_ != null;
-  }
-  /**
-   * 
-   * Character offsets within a content item, included when content type
-   * is a text. Default charset assumed to be UTF-8.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.Range getCodepointRange() {
-    return codepointRange_ == null ? com.google.privacy.dlp.v2beta1.Range.getDefaultInstance() : codepointRange_;
-  }
-  /**
-   * 
-   * Character offsets within a content item, included when content type
-   * is a text. Default charset assumed to be UTF-8.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.RangeOrBuilder getCodepointRangeOrBuilder() {
-    return getCodepointRange();
-  }
-
-  public static final int IMAGE_BOXES_FIELD_NUMBER = 3;
-  private java.util.List imageBoxes_;
-  /**
-   * 
-   * Location within an image's pixels.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-   */
-  public java.util.List getImageBoxesList() {
-    return imageBoxes_;
-  }
-  /**
-   * 
-   * Location within an image's pixels.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-   */
-  public java.util.List 
-      getImageBoxesOrBuilderList() {
-    return imageBoxes_;
-  }
-  /**
-   * 
-   * Location within an image's pixels.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-   */
-  public int getImageBoxesCount() {
-    return imageBoxes_.size();
-  }
-  /**
-   * 
-   * Location within an image's pixels.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.ImageLocation getImageBoxes(int index) {
-    return imageBoxes_.get(index);
-  }
-  /**
-   * 
-   * Location within an image's pixels.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.ImageLocationOrBuilder getImageBoxesOrBuilder(
-      int index) {
-    return imageBoxes_.get(index);
-  }
-
-  public static final int RECORD_KEY_FIELD_NUMBER = 4;
-  private com.google.privacy.dlp.v2beta1.RecordKey recordKey_;
-  /**
-   * 
-   * Key of the finding.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-   */
-  public boolean hasRecordKey() {
-    return recordKey_ != null;
-  }
-  /**
-   * 
-   * Key of the finding.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordKey getRecordKey() {
-    return recordKey_ == null ? com.google.privacy.dlp.v2beta1.RecordKey.getDefaultInstance() : recordKey_;
-  }
-  /**
-   * 
-   * Key of the finding.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordKeyOrBuilder getRecordKeyOrBuilder() {
-    return getRecordKey();
-  }
-
-  public static final int FIELD_ID_FIELD_NUMBER = 5;
-  private com.google.privacy.dlp.v2beta1.FieldId fieldId_;
-  /**
-   * 
-   * Field id of the field containing the finding.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-   */
-  public boolean hasFieldId() {
-    return fieldId_ != null;
-  }
-  /**
-   * 
-   * Field id of the field containing the finding.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldId getFieldId() {
-    return fieldId_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : fieldId_;
-  }
-  /**
-   * 
-   * Field id of the field containing the finding.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldIdOrBuilder() {
-    return getFieldId();
-  }
-
-  public static final int TABLE_LOCATION_FIELD_NUMBER = 6;
-  private com.google.privacy.dlp.v2beta1.TableLocation tableLocation_;
-  /**
-   * 
-   * Location within a `ContentItem.Table`.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-   */
-  public boolean hasTableLocation() {
-    return tableLocation_ != null;
-  }
-  /**
-   * 
-   * Location within a `ContentItem.Table`.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-   */
-  public com.google.privacy.dlp.v2beta1.TableLocation getTableLocation() {
-    return tableLocation_ == null ? com.google.privacy.dlp.v2beta1.TableLocation.getDefaultInstance() : tableLocation_;
-  }
-  /**
-   * 
-   * Location within a `ContentItem.Table`.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-   */
-  public com.google.privacy.dlp.v2beta1.TableLocationOrBuilder getTableLocationOrBuilder() {
-    return getTableLocation();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (byteRange_ != null) {
-      output.writeMessage(1, getByteRange());
-    }
-    if (codepointRange_ != null) {
-      output.writeMessage(2, getCodepointRange());
-    }
-    for (int i = 0; i < imageBoxes_.size(); i++) {
-      output.writeMessage(3, imageBoxes_.get(i));
-    }
-    if (recordKey_ != null) {
-      output.writeMessage(4, getRecordKey());
-    }
-    if (fieldId_ != null) {
-      output.writeMessage(5, getFieldId());
-    }
-    if (tableLocation_ != null) {
-      output.writeMessage(6, getTableLocation());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (byteRange_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getByteRange());
-    }
-    if (codepointRange_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getCodepointRange());
-    }
-    for (int i = 0; i < imageBoxes_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, imageBoxes_.get(i));
-    }
-    if (recordKey_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, getRecordKey());
-    }
-    if (fieldId_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, getFieldId());
-    }
-    if (tableLocation_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(6, getTableLocation());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.Location)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.Location other = (com.google.privacy.dlp.v2beta1.Location) obj;
-
-    boolean result = true;
-    result = result && (hasByteRange() == other.hasByteRange());
-    if (hasByteRange()) {
-      result = result && getByteRange()
-          .equals(other.getByteRange());
-    }
-    result = result && (hasCodepointRange() == other.hasCodepointRange());
-    if (hasCodepointRange()) {
-      result = result && getCodepointRange()
-          .equals(other.getCodepointRange());
-    }
-    result = result && getImageBoxesList()
-        .equals(other.getImageBoxesList());
-    result = result && (hasRecordKey() == other.hasRecordKey());
-    if (hasRecordKey()) {
-      result = result && getRecordKey()
-          .equals(other.getRecordKey());
-    }
-    result = result && (hasFieldId() == other.hasFieldId());
-    if (hasFieldId()) {
-      result = result && getFieldId()
-          .equals(other.getFieldId());
-    }
-    result = result && (hasTableLocation() == other.hasTableLocation());
-    if (hasTableLocation()) {
-      result = result && getTableLocation()
-          .equals(other.getTableLocation());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasByteRange()) {
-      hash = (37 * hash) + BYTE_RANGE_FIELD_NUMBER;
-      hash = (53 * hash) + getByteRange().hashCode();
-    }
-    if (hasCodepointRange()) {
-      hash = (37 * hash) + CODEPOINT_RANGE_FIELD_NUMBER;
-      hash = (53 * hash) + getCodepointRange().hashCode();
-    }
-    if (getImageBoxesCount() > 0) {
-      hash = (37 * hash) + IMAGE_BOXES_FIELD_NUMBER;
-      hash = (53 * hash) + getImageBoxesList().hashCode();
-    }
-    if (hasRecordKey()) {
-      hash = (37 * hash) + RECORD_KEY_FIELD_NUMBER;
-      hash = (53 * hash) + getRecordKey().hashCode();
-    }
-    if (hasFieldId()) {
-      hash = (37 * hash) + FIELD_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getFieldId().hashCode();
-    }
-    if (hasTableLocation()) {
-      hash = (37 * hash) + TABLE_LOCATION_FIELD_NUMBER;
-      hash = (53 * hash) + getTableLocation().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Location parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Location parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Location parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Location parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Location parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Location parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Location parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Location parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Location parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Location parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Location parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Location parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.Location prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Specifies the location of a finding within its source item.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.Location}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.Location)
-      com.google.privacy.dlp.v2beta1.LocationOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Location_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Location_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.Location.class, com.google.privacy.dlp.v2beta1.Location.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.Location.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getImageBoxesFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (byteRangeBuilder_ == null) {
-        byteRange_ = null;
-      } else {
-        byteRange_ = null;
-        byteRangeBuilder_ = null;
-      }
-      if (codepointRangeBuilder_ == null) {
-        codepointRange_ = null;
-      } else {
-        codepointRange_ = null;
-        codepointRangeBuilder_ = null;
-      }
-      if (imageBoxesBuilder_ == null) {
-        imageBoxes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-      } else {
-        imageBoxesBuilder_.clear();
-      }
-      if (recordKeyBuilder_ == null) {
-        recordKey_ = null;
-      } else {
-        recordKey_ = null;
-        recordKeyBuilder_ = null;
-      }
-      if (fieldIdBuilder_ == null) {
-        fieldId_ = null;
-      } else {
-        fieldId_ = null;
-        fieldIdBuilder_ = null;
-      }
-      if (tableLocationBuilder_ == null) {
-        tableLocation_ = null;
-      } else {
-        tableLocation_ = null;
-        tableLocationBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Location_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Location getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.Location.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.Location build() {
-      com.google.privacy.dlp.v2beta1.Location result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Location buildPartial() {
-      com.google.privacy.dlp.v2beta1.Location result = new com.google.privacy.dlp.v2beta1.Location(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (byteRangeBuilder_ == null) {
-        result.byteRange_ = byteRange_;
-      } else {
-        result.byteRange_ = byteRangeBuilder_.build();
-      }
-      if (codepointRangeBuilder_ == null) {
-        result.codepointRange_ = codepointRange_;
-      } else {
-        result.codepointRange_ = codepointRangeBuilder_.build();
-      }
-      if (imageBoxesBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          imageBoxes_ = java.util.Collections.unmodifiableList(imageBoxes_);
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.imageBoxes_ = imageBoxes_;
-      } else {
-        result.imageBoxes_ = imageBoxesBuilder_.build();
-      }
-      if (recordKeyBuilder_ == null) {
-        result.recordKey_ = recordKey_;
-      } else {
-        result.recordKey_ = recordKeyBuilder_.build();
-      }
-      if (fieldIdBuilder_ == null) {
-        result.fieldId_ = fieldId_;
-      } else {
-        result.fieldId_ = fieldIdBuilder_.build();
-      }
-      if (tableLocationBuilder_ == null) {
-        result.tableLocation_ = tableLocation_;
-      } else {
-        result.tableLocation_ = tableLocationBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.Location) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.Location)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.Location other) {
-      if (other == com.google.privacy.dlp.v2beta1.Location.getDefaultInstance()) return this;
-      if (other.hasByteRange()) {
-        mergeByteRange(other.getByteRange());
-      }
-      if (other.hasCodepointRange()) {
-        mergeCodepointRange(other.getCodepointRange());
-      }
-      if (imageBoxesBuilder_ == null) {
-        if (!other.imageBoxes_.isEmpty()) {
-          if (imageBoxes_.isEmpty()) {
-            imageBoxes_ = other.imageBoxes_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureImageBoxesIsMutable();
-            imageBoxes_.addAll(other.imageBoxes_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.imageBoxes_.isEmpty()) {
-          if (imageBoxesBuilder_.isEmpty()) {
-            imageBoxesBuilder_.dispose();
-            imageBoxesBuilder_ = null;
-            imageBoxes_ = other.imageBoxes_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-            imageBoxesBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getImageBoxesFieldBuilder() : null;
-          } else {
-            imageBoxesBuilder_.addAllMessages(other.imageBoxes_);
-          }
-        }
-      }
-      if (other.hasRecordKey()) {
-        mergeRecordKey(other.getRecordKey());
-      }
-      if (other.hasFieldId()) {
-        mergeFieldId(other.getFieldId());
-      }
-      if (other.hasTableLocation()) {
-        mergeTableLocation(other.getTableLocation());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.Location parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.Location) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private com.google.privacy.dlp.v2beta1.Range byteRange_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Range, com.google.privacy.dlp.v2beta1.Range.Builder, com.google.privacy.dlp.v2beta1.RangeOrBuilder> byteRangeBuilder_;
-    /**
-     * 
-     * Zero-based byte offsets within a content item.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-     */
-    public boolean hasByteRange() {
-      return byteRangeBuilder_ != null || byteRange_ != null;
-    }
-    /**
-     * 
-     * Zero-based byte offsets within a content item.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Range getByteRange() {
-      if (byteRangeBuilder_ == null) {
-        return byteRange_ == null ? com.google.privacy.dlp.v2beta1.Range.getDefaultInstance() : byteRange_;
-      } else {
-        return byteRangeBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Zero-based byte offsets within a content item.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-     */
-    public Builder setByteRange(com.google.privacy.dlp.v2beta1.Range value) {
-      if (byteRangeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        byteRange_ = value;
-        onChanged();
-      } else {
-        byteRangeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Zero-based byte offsets within a content item.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-     */
-    public Builder setByteRange(
-        com.google.privacy.dlp.v2beta1.Range.Builder builderForValue) {
-      if (byteRangeBuilder_ == null) {
-        byteRange_ = builderForValue.build();
-        onChanged();
-      } else {
-        byteRangeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Zero-based byte offsets within a content item.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-     */
-    public Builder mergeByteRange(com.google.privacy.dlp.v2beta1.Range value) {
-      if (byteRangeBuilder_ == null) {
-        if (byteRange_ != null) {
-          byteRange_ =
-            com.google.privacy.dlp.v2beta1.Range.newBuilder(byteRange_).mergeFrom(value).buildPartial();
-        } else {
-          byteRange_ = value;
-        }
-        onChanged();
-      } else {
-        byteRangeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Zero-based byte offsets within a content item.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-     */
-    public Builder clearByteRange() {
-      if (byteRangeBuilder_ == null) {
-        byteRange_ = null;
-        onChanged();
-      } else {
-        byteRange_ = null;
-        byteRangeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Zero-based byte offsets within a content item.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Range.Builder getByteRangeBuilder() {
-      
-      onChanged();
-      return getByteRangeFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Zero-based byte offsets within a content item.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.RangeOrBuilder getByteRangeOrBuilder() {
-      if (byteRangeBuilder_ != null) {
-        return byteRangeBuilder_.getMessageOrBuilder();
-      } else {
-        return byteRange_ == null ?
-            com.google.privacy.dlp.v2beta1.Range.getDefaultInstance() : byteRange_;
-      }
-    }
-    /**
-     * 
-     * Zero-based byte offsets within a content item.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Range, com.google.privacy.dlp.v2beta1.Range.Builder, com.google.privacy.dlp.v2beta1.RangeOrBuilder> 
-        getByteRangeFieldBuilder() {
-      if (byteRangeBuilder_ == null) {
-        byteRangeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Range, com.google.privacy.dlp.v2beta1.Range.Builder, com.google.privacy.dlp.v2beta1.RangeOrBuilder>(
-                getByteRange(),
-                getParentForChildren(),
-                isClean());
-        byteRange_ = null;
-      }
-      return byteRangeBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.Range codepointRange_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Range, com.google.privacy.dlp.v2beta1.Range.Builder, com.google.privacy.dlp.v2beta1.RangeOrBuilder> codepointRangeBuilder_;
-    /**
-     * 
-     * Character offsets within a content item, included when content type
-     * is a text. Default charset assumed to be UTF-8.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-     */
-    public boolean hasCodepointRange() {
-      return codepointRangeBuilder_ != null || codepointRange_ != null;
-    }
-    /**
-     * 
-     * Character offsets within a content item, included when content type
-     * is a text. Default charset assumed to be UTF-8.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Range getCodepointRange() {
-      if (codepointRangeBuilder_ == null) {
-        return codepointRange_ == null ? com.google.privacy.dlp.v2beta1.Range.getDefaultInstance() : codepointRange_;
-      } else {
-        return codepointRangeBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Character offsets within a content item, included when content type
-     * is a text. Default charset assumed to be UTF-8.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-     */
-    public Builder setCodepointRange(com.google.privacy.dlp.v2beta1.Range value) {
-      if (codepointRangeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        codepointRange_ = value;
-        onChanged();
-      } else {
-        codepointRangeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Character offsets within a content item, included when content type
-     * is a text. Default charset assumed to be UTF-8.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-     */
-    public Builder setCodepointRange(
-        com.google.privacy.dlp.v2beta1.Range.Builder builderForValue) {
-      if (codepointRangeBuilder_ == null) {
-        codepointRange_ = builderForValue.build();
-        onChanged();
-      } else {
-        codepointRangeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Character offsets within a content item, included when content type
-     * is a text. Default charset assumed to be UTF-8.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-     */
-    public Builder mergeCodepointRange(com.google.privacy.dlp.v2beta1.Range value) {
-      if (codepointRangeBuilder_ == null) {
-        if (codepointRange_ != null) {
-          codepointRange_ =
-            com.google.privacy.dlp.v2beta1.Range.newBuilder(codepointRange_).mergeFrom(value).buildPartial();
-        } else {
-          codepointRange_ = value;
-        }
-        onChanged();
-      } else {
-        codepointRangeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Character offsets within a content item, included when content type
-     * is a text. Default charset assumed to be UTF-8.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-     */
-    public Builder clearCodepointRange() {
-      if (codepointRangeBuilder_ == null) {
-        codepointRange_ = null;
-        onChanged();
-      } else {
-        codepointRange_ = null;
-        codepointRangeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Character offsets within a content item, included when content type
-     * is a text. Default charset assumed to be UTF-8.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Range.Builder getCodepointRangeBuilder() {
-      
-      onChanged();
-      return getCodepointRangeFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Character offsets within a content item, included when content type
-     * is a text. Default charset assumed to be UTF-8.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.RangeOrBuilder getCodepointRangeOrBuilder() {
-      if (codepointRangeBuilder_ != null) {
-        return codepointRangeBuilder_.getMessageOrBuilder();
-      } else {
-        return codepointRange_ == null ?
-            com.google.privacy.dlp.v2beta1.Range.getDefaultInstance() : codepointRange_;
-      }
-    }
-    /**
-     * 
-     * Character offsets within a content item, included when content type
-     * is a text. Default charset assumed to be UTF-8.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Range, com.google.privacy.dlp.v2beta1.Range.Builder, com.google.privacy.dlp.v2beta1.RangeOrBuilder> 
-        getCodepointRangeFieldBuilder() {
-      if (codepointRangeBuilder_ == null) {
-        codepointRangeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Range, com.google.privacy.dlp.v2beta1.Range.Builder, com.google.privacy.dlp.v2beta1.RangeOrBuilder>(
-                getCodepointRange(),
-                getParentForChildren(),
-                isClean());
-        codepointRange_ = null;
-      }
-      return codepointRangeBuilder_;
-    }
-
-    private java.util.List imageBoxes_ =
-      java.util.Collections.emptyList();
-    private void ensureImageBoxesIsMutable() {
-      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-        imageBoxes_ = new java.util.ArrayList(imageBoxes_);
-        bitField0_ |= 0x00000004;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ImageLocation, com.google.privacy.dlp.v2beta1.ImageLocation.Builder, com.google.privacy.dlp.v2beta1.ImageLocationOrBuilder> imageBoxesBuilder_;
-
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public java.util.List getImageBoxesList() {
-      if (imageBoxesBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(imageBoxes_);
-      } else {
-        return imageBoxesBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public int getImageBoxesCount() {
-      if (imageBoxesBuilder_ == null) {
-        return imageBoxes_.size();
-      } else {
-        return imageBoxesBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ImageLocation getImageBoxes(int index) {
-      if (imageBoxesBuilder_ == null) {
-        return imageBoxes_.get(index);
-      } else {
-        return imageBoxesBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public Builder setImageBoxes(
-        int index, com.google.privacy.dlp.v2beta1.ImageLocation value) {
-      if (imageBoxesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureImageBoxesIsMutable();
-        imageBoxes_.set(index, value);
-        onChanged();
-      } else {
-        imageBoxesBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public Builder setImageBoxes(
-        int index, com.google.privacy.dlp.v2beta1.ImageLocation.Builder builderForValue) {
-      if (imageBoxesBuilder_ == null) {
-        ensureImageBoxesIsMutable();
-        imageBoxes_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        imageBoxesBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public Builder addImageBoxes(com.google.privacy.dlp.v2beta1.ImageLocation value) {
-      if (imageBoxesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureImageBoxesIsMutable();
-        imageBoxes_.add(value);
-        onChanged();
-      } else {
-        imageBoxesBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public Builder addImageBoxes(
-        int index, com.google.privacy.dlp.v2beta1.ImageLocation value) {
-      if (imageBoxesBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureImageBoxesIsMutable();
-        imageBoxes_.add(index, value);
-        onChanged();
-      } else {
-        imageBoxesBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public Builder addImageBoxes(
-        com.google.privacy.dlp.v2beta1.ImageLocation.Builder builderForValue) {
-      if (imageBoxesBuilder_ == null) {
-        ensureImageBoxesIsMutable();
-        imageBoxes_.add(builderForValue.build());
-        onChanged();
-      } else {
-        imageBoxesBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public Builder addImageBoxes(
-        int index, com.google.privacy.dlp.v2beta1.ImageLocation.Builder builderForValue) {
-      if (imageBoxesBuilder_ == null) {
-        ensureImageBoxesIsMutable();
-        imageBoxes_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        imageBoxesBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public Builder addAllImageBoxes(
-        java.lang.Iterable values) {
-      if (imageBoxesBuilder_ == null) {
-        ensureImageBoxesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, imageBoxes_);
-        onChanged();
-      } else {
-        imageBoxesBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public Builder clearImageBoxes() {
-      if (imageBoxesBuilder_ == null) {
-        imageBoxes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-      } else {
-        imageBoxesBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public Builder removeImageBoxes(int index) {
-      if (imageBoxesBuilder_ == null) {
-        ensureImageBoxesIsMutable();
-        imageBoxes_.remove(index);
-        onChanged();
-      } else {
-        imageBoxesBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ImageLocation.Builder getImageBoxesBuilder(
-        int index) {
-      return getImageBoxesFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ImageLocationOrBuilder getImageBoxesOrBuilder(
-        int index) {
-      if (imageBoxesBuilder_ == null) {
-        return imageBoxes_.get(index);  } else {
-        return imageBoxesBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public java.util.List 
-         getImageBoxesOrBuilderList() {
-      if (imageBoxesBuilder_ != null) {
-        return imageBoxesBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(imageBoxes_);
-      }
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ImageLocation.Builder addImageBoxesBuilder() {
-      return getImageBoxesFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.ImageLocation.getDefaultInstance());
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ImageLocation.Builder addImageBoxesBuilder(
-        int index) {
-      return getImageBoxesFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.ImageLocation.getDefaultInstance());
-    }
-    /**
-     * 
-     * Location within an image's pixels.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-     */
-    public java.util.List 
-         getImageBoxesBuilderList() {
-      return getImageBoxesFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ImageLocation, com.google.privacy.dlp.v2beta1.ImageLocation.Builder, com.google.privacy.dlp.v2beta1.ImageLocationOrBuilder> 
-        getImageBoxesFieldBuilder() {
-      if (imageBoxesBuilder_ == null) {
-        imageBoxesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.ImageLocation, com.google.privacy.dlp.v2beta1.ImageLocation.Builder, com.google.privacy.dlp.v2beta1.ImageLocationOrBuilder>(
-                imageBoxes_,
-                ((bitField0_ & 0x00000004) == 0x00000004),
-                getParentForChildren(),
-                isClean());
-        imageBoxes_ = null;
-      }
-      return imageBoxesBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.RecordKey recordKey_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordKey, com.google.privacy.dlp.v2beta1.RecordKey.Builder, com.google.privacy.dlp.v2beta1.RecordKeyOrBuilder> recordKeyBuilder_;
-    /**
-     * 
-     * Key of the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-     */
-    public boolean hasRecordKey() {
-      return recordKeyBuilder_ != null || recordKey_ != null;
-    }
-    /**
-     * 
-     * Key of the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordKey getRecordKey() {
-      if (recordKeyBuilder_ == null) {
-        return recordKey_ == null ? com.google.privacy.dlp.v2beta1.RecordKey.getDefaultInstance() : recordKey_;
-      } else {
-        return recordKeyBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Key of the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-     */
-    public Builder setRecordKey(com.google.privacy.dlp.v2beta1.RecordKey value) {
-      if (recordKeyBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        recordKey_ = value;
-        onChanged();
-      } else {
-        recordKeyBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Key of the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-     */
-    public Builder setRecordKey(
-        com.google.privacy.dlp.v2beta1.RecordKey.Builder builderForValue) {
-      if (recordKeyBuilder_ == null) {
-        recordKey_ = builderForValue.build();
-        onChanged();
-      } else {
-        recordKeyBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Key of the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-     */
-    public Builder mergeRecordKey(com.google.privacy.dlp.v2beta1.RecordKey value) {
-      if (recordKeyBuilder_ == null) {
-        if (recordKey_ != null) {
-          recordKey_ =
-            com.google.privacy.dlp.v2beta1.RecordKey.newBuilder(recordKey_).mergeFrom(value).buildPartial();
-        } else {
-          recordKey_ = value;
-        }
-        onChanged();
-      } else {
-        recordKeyBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Key of the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-     */
-    public Builder clearRecordKey() {
-      if (recordKeyBuilder_ == null) {
-        recordKey_ = null;
-        onChanged();
-      } else {
-        recordKey_ = null;
-        recordKeyBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Key of the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordKey.Builder getRecordKeyBuilder() {
-      
-      onChanged();
-      return getRecordKeyFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Key of the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordKeyOrBuilder getRecordKeyOrBuilder() {
-      if (recordKeyBuilder_ != null) {
-        return recordKeyBuilder_.getMessageOrBuilder();
-      } else {
-        return recordKey_ == null ?
-            com.google.privacy.dlp.v2beta1.RecordKey.getDefaultInstance() : recordKey_;
-      }
-    }
-    /**
-     * 
-     * Key of the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordKey, com.google.privacy.dlp.v2beta1.RecordKey.Builder, com.google.privacy.dlp.v2beta1.RecordKeyOrBuilder> 
-        getRecordKeyFieldBuilder() {
-      if (recordKeyBuilder_ == null) {
-        recordKeyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RecordKey, com.google.privacy.dlp.v2beta1.RecordKey.Builder, com.google.privacy.dlp.v2beta1.RecordKeyOrBuilder>(
-                getRecordKey(),
-                getParentForChildren(),
-                isClean());
-        recordKey_ = null;
-      }
-      return recordKeyBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.FieldId fieldId_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> fieldIdBuilder_;
-    /**
-     * 
-     * Field id of the field containing the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-     */
-    public boolean hasFieldId() {
-      return fieldIdBuilder_ != null || fieldId_ != null;
-    }
-    /**
-     * 
-     * Field id of the field containing the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getFieldId() {
-      if (fieldIdBuilder_ == null) {
-        return fieldId_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : fieldId_;
-      } else {
-        return fieldIdBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Field id of the field containing the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-     */
-    public Builder setFieldId(com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (fieldIdBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        fieldId_ = value;
-        onChanged();
-      } else {
-        fieldIdBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Field id of the field containing the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-     */
-    public Builder setFieldId(
-        com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (fieldIdBuilder_ == null) {
-        fieldId_ = builderForValue.build();
-        onChanged();
-      } else {
-        fieldIdBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Field id of the field containing the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-     */
-    public Builder mergeFieldId(com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (fieldIdBuilder_ == null) {
-        if (fieldId_ != null) {
-          fieldId_ =
-            com.google.privacy.dlp.v2beta1.FieldId.newBuilder(fieldId_).mergeFrom(value).buildPartial();
-        } else {
-          fieldId_ = value;
-        }
-        onChanged();
-      } else {
-        fieldIdBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Field id of the field containing the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-     */
-    public Builder clearFieldId() {
-      if (fieldIdBuilder_ == null) {
-        fieldId_ = null;
-        onChanged();
-      } else {
-        fieldId_ = null;
-        fieldIdBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Field id of the field containing the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder getFieldIdBuilder() {
-      
-      onChanged();
-      return getFieldIdFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Field id of the field containing the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldIdOrBuilder() {
-      if (fieldIdBuilder_ != null) {
-        return fieldIdBuilder_.getMessageOrBuilder();
-      } else {
-        return fieldId_ == null ?
-            com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : fieldId_;
-      }
-    }
-    /**
-     * 
-     * Field id of the field containing the finding.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-        getFieldIdFieldBuilder() {
-      if (fieldIdBuilder_ == null) {
-        fieldIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                getFieldId(),
-                getParentForChildren(),
-                isClean());
-        fieldId_ = null;
-      }
-      return fieldIdBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.TableLocation tableLocation_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.TableLocation, com.google.privacy.dlp.v2beta1.TableLocation.Builder, com.google.privacy.dlp.v2beta1.TableLocationOrBuilder> tableLocationBuilder_;
-    /**
-     * 
-     * Location within a `ContentItem.Table`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-     */
-    public boolean hasTableLocation() {
-      return tableLocationBuilder_ != null || tableLocation_ != null;
-    }
-    /**
-     * 
-     * Location within a `ContentItem.Table`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.TableLocation getTableLocation() {
-      if (tableLocationBuilder_ == null) {
-        return tableLocation_ == null ? com.google.privacy.dlp.v2beta1.TableLocation.getDefaultInstance() : tableLocation_;
-      } else {
-        return tableLocationBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Location within a `ContentItem.Table`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-     */
-    public Builder setTableLocation(com.google.privacy.dlp.v2beta1.TableLocation value) {
-      if (tableLocationBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        tableLocation_ = value;
-        onChanged();
-      } else {
-        tableLocationBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Location within a `ContentItem.Table`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-     */
-    public Builder setTableLocation(
-        com.google.privacy.dlp.v2beta1.TableLocation.Builder builderForValue) {
-      if (tableLocationBuilder_ == null) {
-        tableLocation_ = builderForValue.build();
-        onChanged();
-      } else {
-        tableLocationBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Location within a `ContentItem.Table`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-     */
-    public Builder mergeTableLocation(com.google.privacy.dlp.v2beta1.TableLocation value) {
-      if (tableLocationBuilder_ == null) {
-        if (tableLocation_ != null) {
-          tableLocation_ =
-            com.google.privacy.dlp.v2beta1.TableLocation.newBuilder(tableLocation_).mergeFrom(value).buildPartial();
-        } else {
-          tableLocation_ = value;
-        }
-        onChanged();
-      } else {
-        tableLocationBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Location within a `ContentItem.Table`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-     */
-    public Builder clearTableLocation() {
-      if (tableLocationBuilder_ == null) {
-        tableLocation_ = null;
-        onChanged();
-      } else {
-        tableLocation_ = null;
-        tableLocationBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Location within a `ContentItem.Table`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.TableLocation.Builder getTableLocationBuilder() {
-      
-      onChanged();
-      return getTableLocationFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Location within a `ContentItem.Table`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.TableLocationOrBuilder getTableLocationOrBuilder() {
-      if (tableLocationBuilder_ != null) {
-        return tableLocationBuilder_.getMessageOrBuilder();
-      } else {
-        return tableLocation_ == null ?
-            com.google.privacy.dlp.v2beta1.TableLocation.getDefaultInstance() : tableLocation_;
-      }
-    }
-    /**
-     * 
-     * Location within a `ContentItem.Table`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.TableLocation, com.google.privacy.dlp.v2beta1.TableLocation.Builder, com.google.privacy.dlp.v2beta1.TableLocationOrBuilder> 
-        getTableLocationFieldBuilder() {
-      if (tableLocationBuilder_ == null) {
-        tableLocationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.TableLocation, com.google.privacy.dlp.v2beta1.TableLocation.Builder, com.google.privacy.dlp.v2beta1.TableLocationOrBuilder>(
-                getTableLocation(),
-                getParentForChildren(),
-                isClean());
-        tableLocation_ = null;
-      }
-      return tableLocationBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.Location)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.Location)
-  private static final com.google.privacy.dlp.v2beta1.Location DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.Location();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Location getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public Location parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Location(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.Location getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/LocationOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/LocationOrBuilder.java
deleted file mode 100644
index 10f3262256cb..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/LocationOrBuilder.java
+++ /dev/null
@@ -1,181 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface LocationOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.Location)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Zero-based byte offsets within a content item.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-   */
-  boolean hasByteRange();
-  /**
-   * 
-   * Zero-based byte offsets within a content item.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-   */
-  com.google.privacy.dlp.v2beta1.Range getByteRange();
-  /**
-   * 
-   * Zero-based byte offsets within a content item.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Range byte_range = 1;
-   */
-  com.google.privacy.dlp.v2beta1.RangeOrBuilder getByteRangeOrBuilder();
-
-  /**
-   * 
-   * Character offsets within a content item, included when content type
-   * is a text. Default charset assumed to be UTF-8.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-   */
-  boolean hasCodepointRange();
-  /**
-   * 
-   * Character offsets within a content item, included when content type
-   * is a text. Default charset assumed to be UTF-8.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-   */
-  com.google.privacy.dlp.v2beta1.Range getCodepointRange();
-  /**
-   * 
-   * Character offsets within a content item, included when content type
-   * is a text. Default charset assumed to be UTF-8.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Range codepoint_range = 2;
-   */
-  com.google.privacy.dlp.v2beta1.RangeOrBuilder getCodepointRangeOrBuilder();
-
-  /**
-   * 
-   * Location within an image's pixels.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-   */
-  java.util.List 
-      getImageBoxesList();
-  /**
-   * 
-   * Location within an image's pixels.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-   */
-  com.google.privacy.dlp.v2beta1.ImageLocation getImageBoxes(int index);
-  /**
-   * 
-   * Location within an image's pixels.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-   */
-  int getImageBoxesCount();
-  /**
-   * 
-   * Location within an image's pixels.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-   */
-  java.util.List 
-      getImageBoxesOrBuilderList();
-  /**
-   * 
-   * Location within an image's pixels.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ImageLocation image_boxes = 3;
-   */
-  com.google.privacy.dlp.v2beta1.ImageLocationOrBuilder getImageBoxesOrBuilder(
-      int index);
-
-  /**
-   * 
-   * Key of the finding.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-   */
-  boolean hasRecordKey();
-  /**
-   * 
-   * Key of the finding.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-   */
-  com.google.privacy.dlp.v2beta1.RecordKey getRecordKey();
-  /**
-   * 
-   * Key of the finding.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordKey record_key = 4;
-   */
-  com.google.privacy.dlp.v2beta1.RecordKeyOrBuilder getRecordKeyOrBuilder();
-
-  /**
-   * 
-   * Field id of the field containing the finding.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-   */
-  boolean hasFieldId();
-  /**
-   * 
-   * Field id of the field containing the finding.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-   */
-  com.google.privacy.dlp.v2beta1.FieldId getFieldId();
-  /**
-   * 
-   * Field id of the field containing the finding.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field_id = 5;
-   */
-  com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldIdOrBuilder();
-
-  /**
-   * 
-   * Location within a `ContentItem.Table`.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-   */
-  boolean hasTableLocation();
-  /**
-   * 
-   * Location within a `ContentItem.Table`.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-   */
-  com.google.privacy.dlp.v2beta1.TableLocation getTableLocation();
-  /**
-   * 
-   * Location within a `ContentItem.Table`.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.TableLocation table_location = 6;
-   */
-  com.google.privacy.dlp.v2beta1.TableLocationOrBuilder getTableLocationOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OperationConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OperationConfig.java
deleted file mode 100644
index 6c84f5c137c9..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OperationConfig.java
+++ /dev/null
@@ -1,472 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Additional configuration for inspect long running operations.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.OperationConfig}
- */
-public  final class OperationConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.OperationConfig)
-    OperationConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use OperationConfig.newBuilder() to construct.
-  private OperationConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private OperationConfig() {
-    maxItemFindings_ = 0L;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private OperationConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-
-            maxItemFindings_ = input.readInt64();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_OperationConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_OperationConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.OperationConfig.class, com.google.privacy.dlp.v2beta1.OperationConfig.Builder.class);
-  }
-
-  public static final int MAX_ITEM_FINDINGS_FIELD_NUMBER = 1;
-  private long maxItemFindings_;
-  /**
-   * 
-   * Max number of findings per file, Datastore entity, or database row.
-   * 

-   *
-   * int64 max_item_findings = 1;
-   */
-  public long getMaxItemFindings() {
-    return maxItemFindings_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (maxItemFindings_ != 0L) {
-      output.writeInt64(1, maxItemFindings_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (maxItemFindings_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(1, maxItemFindings_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.OperationConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.OperationConfig other = (com.google.privacy.dlp.v2beta1.OperationConfig) obj;
-
-    boolean result = true;
-    result = result && (getMaxItemFindings()
-        == other.getMaxItemFindings());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + MAX_ITEM_FINDINGS_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getMaxItemFindings());
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.OperationConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.OperationConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.OperationConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.OperationConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.OperationConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.OperationConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.OperationConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.OperationConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.OperationConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.OperationConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.OperationConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.OperationConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.OperationConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Additional configuration for inspect long running operations.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.OperationConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.OperationConfig)
-      com.google.privacy.dlp.v2beta1.OperationConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_OperationConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_OperationConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.OperationConfig.class, com.google.privacy.dlp.v2beta1.OperationConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.OperationConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      maxItemFindings_ = 0L;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_OperationConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.OperationConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.OperationConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.OperationConfig build() {
-      com.google.privacy.dlp.v2beta1.OperationConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.OperationConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.OperationConfig result = new com.google.privacy.dlp.v2beta1.OperationConfig(this);
-      result.maxItemFindings_ = maxItemFindings_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.OperationConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.OperationConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.OperationConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.OperationConfig.getDefaultInstance()) return this;
-      if (other.getMaxItemFindings() != 0L) {
-        setMaxItemFindings(other.getMaxItemFindings());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.OperationConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.OperationConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private long maxItemFindings_ ;
-    /**
-     * 
-     * Max number of findings per file, Datastore entity, or database row.
-     * 

-     *
-     * int64 max_item_findings = 1;
-     */
-    public long getMaxItemFindings() {
-      return maxItemFindings_;
-    }
-    /**
-     * 
-     * Max number of findings per file, Datastore entity, or database row.
-     * 

-     *
-     * int64 max_item_findings = 1;
-     */
-    public Builder setMaxItemFindings(long value) {
-      
-      maxItemFindings_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Max number of findings per file, Datastore entity, or database row.
-     * 

-     *
-     * int64 max_item_findings = 1;
-     */
-    public Builder clearMaxItemFindings() {
-      
-      maxItemFindings_ = 0L;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.OperationConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.OperationConfig)
-  private static final com.google.privacy.dlp.v2beta1.OperationConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.OperationConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.OperationConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public OperationConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OperationConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.OperationConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OperationConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OperationConfigOrBuilder.java
deleted file mode 100644
index 27da310aba0c..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OperationConfigOrBuilder.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface OperationConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.OperationConfig)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Max number of findings per file, Datastore entity, or database row.
-   * 

-   *
-   * int64 max_item_findings = 1;
-   */
-  long getMaxItemFindings();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OutputStorageConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OutputStorageConfig.java
deleted file mode 100644
index e4bf4aac0610..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OutputStorageConfig.java
+++ /dev/null
@@ -1,1329 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Cloud repository for storing output.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.OutputStorageConfig}
- */
-public  final class OutputStorageConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.OutputStorageConfig)
-    OutputStorageConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use OutputStorageConfig.newBuilder() to construct.
-  private OutputStorageConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private OutputStorageConfig() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private OutputStorageConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.BigQueryTable.Builder subBuilder = null;
-            if (typeCase_ == 1) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.BigQueryTable) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.BigQueryTable.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.BigQueryTable) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 1;
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.CloudStoragePath.Builder subBuilder = null;
-            if (typeCase_ == 2) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.CloudStoragePath) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.CloudStoragePath.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.CloudStoragePath) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 2;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_OutputStorageConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_OutputStorageConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.OutputStorageConfig.class, com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder.class);
-  }
-
-  private int typeCase_ = 0;
-  private java.lang.Object type_;
-  public enum TypeCase
-      implements com.google.protobuf.Internal.EnumLite {
-    TABLE(1),
-    STORAGE_PATH(2),
-    TYPE_NOT_SET(0);
-    private final int value;
-    private TypeCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static TypeCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static TypeCase forNumber(int value) {
-      switch (value) {
-        case 1: return TABLE;
-        case 2: return STORAGE_PATH;
-        case 0: return TYPE_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public TypeCase
-  getTypeCase() {
-    return TypeCase.forNumber(
-        typeCase_);
-  }
-
-  public static final int TABLE_FIELD_NUMBER = 1;
-  /**
-   * 
-   * Store findings in a new table in the dataset.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-   */
-  public boolean hasTable() {
-    return typeCase_ == 1;
-  }
-  /**
-   * 
-   * Store findings in a new table in the dataset.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.BigQueryTable getTable() {
-    if (typeCase_ == 1) {
-       return (com.google.privacy.dlp.v2beta1.BigQueryTable) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance();
-  }
-  /**
-   * 
-   * Store findings in a new table in the dataset.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder getTableOrBuilder() {
-    if (typeCase_ == 1) {
-       return (com.google.privacy.dlp.v2beta1.BigQueryTable) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance();
-  }
-
-  public static final int STORAGE_PATH_FIELD_NUMBER = 2;
-  /**
-   * 
-   * The path to a Google Cloud Storage location to store output.
-   * The bucket must already exist and
-   * the Google APIs service account for DLP must have write permission to
-   * write to the given bucket.
-   * Results are split over multiple csv files with each file name matching
-   * the pattern "[operation_id]_[count].csv", for example
-   * `3094877188788974909_1.csv`. The `operation_id` matches the
-   * identifier for the Operation, and the `count` is a counter used for
-   * tracking the number of files written.
-   * The CSV file(s) contain the following columns regardless of storage type
-   * scanned:
-   * - id
-   * - info_type
-   * - likelihood
-   * - byte size of finding
-   * - quote
-   * - timestamp
-   * For Cloud Storage the next columns are:
-   * - file_path
-   * - start_offset
-   * For Cloud Datastore the next columns are:
-   * - project_id
-   * - namespace_id
-   * - path
-   * - column_name
-   * - offset
-   * For BigQuery the next columns are:
-   * - row_number
-   * - project_id
-   * - dataset_id
-   * - table_id
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-   */
-  public boolean hasStoragePath() {
-    return typeCase_ == 2;
-  }
-  /**
-   * 
-   * The path to a Google Cloud Storage location to store output.
-   * The bucket must already exist and
-   * the Google APIs service account for DLP must have write permission to
-   * write to the given bucket.
-   * Results are split over multiple csv files with each file name matching
-   * the pattern "[operation_id]_[count].csv", for example
-   * `3094877188788974909_1.csv`. The `operation_id` matches the
-   * identifier for the Operation, and the `count` is a counter used for
-   * tracking the number of files written.
-   * The CSV file(s) contain the following columns regardless of storage type
-   * scanned:
-   * - id
-   * - info_type
-   * - likelihood
-   * - byte size of finding
-   * - quote
-   * - timestamp
-   * For Cloud Storage the next columns are:
-   * - file_path
-   * - start_offset
-   * For Cloud Datastore the next columns are:
-   * - project_id
-   * - namespace_id
-   * - path
-   * - column_name
-   * - offset
-   * For BigQuery the next columns are:
-   * - row_number
-   * - project_id
-   * - dataset_id
-   * - table_id
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.CloudStoragePath getStoragePath() {
-    if (typeCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.CloudStoragePath) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.CloudStoragePath.getDefaultInstance();
-  }
-  /**
-   * 
-   * The path to a Google Cloud Storage location to store output.
-   * The bucket must already exist and
-   * the Google APIs service account for DLP must have write permission to
-   * write to the given bucket.
-   * Results are split over multiple csv files with each file name matching
-   * the pattern "[operation_id]_[count].csv", for example
-   * `3094877188788974909_1.csv`. The `operation_id` matches the
-   * identifier for the Operation, and the `count` is a counter used for
-   * tracking the number of files written.
-   * The CSV file(s) contain the following columns regardless of storage type
-   * scanned:
-   * - id
-   * - info_type
-   * - likelihood
-   * - byte size of finding
-   * - quote
-   * - timestamp
-   * For Cloud Storage the next columns are:
-   * - file_path
-   * - start_offset
-   * For Cloud Datastore the next columns are:
-   * - project_id
-   * - namespace_id
-   * - path
-   * - column_name
-   * - offset
-   * For BigQuery the next columns are:
-   * - row_number
-   * - project_id
-   * - dataset_id
-   * - table_id
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.CloudStoragePathOrBuilder getStoragePathOrBuilder() {
-    if (typeCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.CloudStoragePath) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.CloudStoragePath.getDefaultInstance();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (typeCase_ == 1) {
-      output.writeMessage(1, (com.google.privacy.dlp.v2beta1.BigQueryTable) type_);
-    }
-    if (typeCase_ == 2) {
-      output.writeMessage(2, (com.google.privacy.dlp.v2beta1.CloudStoragePath) type_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (typeCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, (com.google.privacy.dlp.v2beta1.BigQueryTable) type_);
-    }
-    if (typeCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, (com.google.privacy.dlp.v2beta1.CloudStoragePath) type_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.OutputStorageConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.OutputStorageConfig other = (com.google.privacy.dlp.v2beta1.OutputStorageConfig) obj;
-
-    boolean result = true;
-    result = result && getTypeCase().equals(
-        other.getTypeCase());
-    if (!result) return false;
-    switch (typeCase_) {
-      case 1:
-        result = result && getTable()
-            .equals(other.getTable());
-        break;
-      case 2:
-        result = result && getStoragePath()
-            .equals(other.getStoragePath());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    switch (typeCase_) {
-      case 1:
-        hash = (37 * hash) + TABLE_FIELD_NUMBER;
-        hash = (53 * hash) + getTable().hashCode();
-        break;
-      case 2:
-        hash = (37 * hash) + STORAGE_PATH_FIELD_NUMBER;
-        hash = (53 * hash) + getStoragePath().hashCode();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.OutputStorageConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Cloud repository for storing output.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.OutputStorageConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.OutputStorageConfig)
-      com.google.privacy.dlp.v2beta1.OutputStorageConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_OutputStorageConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_OutputStorageConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.OutputStorageConfig.class, com.google.privacy.dlp.v2beta1.OutputStorageConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.OutputStorageConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      typeCase_ = 0;
-      type_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_OutputStorageConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.OutputStorageConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.OutputStorageConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.OutputStorageConfig build() {
-      com.google.privacy.dlp.v2beta1.OutputStorageConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.OutputStorageConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.OutputStorageConfig result = new com.google.privacy.dlp.v2beta1.OutputStorageConfig(this);
-      if (typeCase_ == 1) {
-        if (tableBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = tableBuilder_.build();
-        }
-      }
-      if (typeCase_ == 2) {
-        if (storagePathBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = storagePathBuilder_.build();
-        }
-      }
-      result.typeCase_ = typeCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.OutputStorageConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.OutputStorageConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.OutputStorageConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.OutputStorageConfig.getDefaultInstance()) return this;
-      switch (other.getTypeCase()) {
-        case TABLE: {
-          mergeTable(other.getTable());
-          break;
-        }
-        case STORAGE_PATH: {
-          mergeStoragePath(other.getStoragePath());
-          break;
-        }
-        case TYPE_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.OutputStorageConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.OutputStorageConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int typeCase_ = 0;
-    private java.lang.Object type_;
-    public TypeCase
-        getTypeCase() {
-      return TypeCase.forNumber(
-          typeCase_);
-    }
-
-    public Builder clearType() {
-      typeCase_ = 0;
-      type_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BigQueryTable, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder, com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder> tableBuilder_;
-    /**
-     * 
-     * Store findings in a new table in the dataset.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-     */
-    public boolean hasTable() {
-      return typeCase_ == 1;
-    }
-    /**
-     * 
-     * Store findings in a new table in the dataset.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryTable getTable() {
-      if (tableBuilder_ == null) {
-        if (typeCase_ == 1) {
-          return (com.google.privacy.dlp.v2beta1.BigQueryTable) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance();
-      } else {
-        if (typeCase_ == 1) {
-          return tableBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Store findings in a new table in the dataset.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-     */
-    public Builder setTable(com.google.privacy.dlp.v2beta1.BigQueryTable value) {
-      if (tableBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        tableBuilder_.setMessage(value);
-      }
-      typeCase_ = 1;
-      return this;
-    }
-    /**
-     * 
-     * Store findings in a new table in the dataset.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-     */
-    public Builder setTable(
-        com.google.privacy.dlp.v2beta1.BigQueryTable.Builder builderForValue) {
-      if (tableBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        tableBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 1;
-      return this;
-    }
-    /**
-     * 
-     * Store findings in a new table in the dataset.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-     */
-    public Builder mergeTable(com.google.privacy.dlp.v2beta1.BigQueryTable value) {
-      if (tableBuilder_ == null) {
-        if (typeCase_ == 1 &&
-            type_ != com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance()) {
-          type_ = com.google.privacy.dlp.v2beta1.BigQueryTable.newBuilder((com.google.privacy.dlp.v2beta1.BigQueryTable) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 1) {
-          tableBuilder_.mergeFrom(value);
-        }
-        tableBuilder_.setMessage(value);
-      }
-      typeCase_ = 1;
-      return this;
-    }
-    /**
-     * 
-     * Store findings in a new table in the dataset.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-     */
-    public Builder clearTable() {
-      if (tableBuilder_ == null) {
-        if (typeCase_ == 1) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 1) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        tableBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Store findings in a new table in the dataset.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryTable.Builder getTableBuilder() {
-      return getTableFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Store findings in a new table in the dataset.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder getTableOrBuilder() {
-      if ((typeCase_ == 1) && (tableBuilder_ != null)) {
-        return tableBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 1) {
-          return (com.google.privacy.dlp.v2beta1.BigQueryTable) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Store findings in a new table in the dataset.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BigQueryTable, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder, com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder> 
-        getTableFieldBuilder() {
-      if (tableBuilder_ == null) {
-        if (!(typeCase_ == 1)) {
-          type_ = com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance();
-        }
-        tableBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.BigQueryTable, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder, com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.BigQueryTable) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 1;
-      onChanged();;
-      return tableBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CloudStoragePath, com.google.privacy.dlp.v2beta1.CloudStoragePath.Builder, com.google.privacy.dlp.v2beta1.CloudStoragePathOrBuilder> storagePathBuilder_;
-    /**
-     * 
-     * The path to a Google Cloud Storage location to store output.
-     * The bucket must already exist and
-     * the Google APIs service account for DLP must have write permission to
-     * write to the given bucket.
-     * Results are split over multiple csv files with each file name matching
-     * the pattern "[operation_id]_[count].csv", for example
-     * `3094877188788974909_1.csv`. The `operation_id` matches the
-     * identifier for the Operation, and the `count` is a counter used for
-     * tracking the number of files written.
-     * The CSV file(s) contain the following columns regardless of storage type
-     * scanned:
-     * - id
-     * - info_type
-     * - likelihood
-     * - byte size of finding
-     * - quote
-     * - timestamp
-     * For Cloud Storage the next columns are:
-     * - file_path
-     * - start_offset
-     * For Cloud Datastore the next columns are:
-     * - project_id
-     * - namespace_id
-     * - path
-     * - column_name
-     * - offset
-     * For BigQuery the next columns are:
-     * - row_number
-     * - project_id
-     * - dataset_id
-     * - table_id
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-     */
-    public boolean hasStoragePath() {
-      return typeCase_ == 2;
-    }
-    /**
-     * 
-     * The path to a Google Cloud Storage location to store output.
-     * The bucket must already exist and
-     * the Google APIs service account for DLP must have write permission to
-     * write to the given bucket.
-     * Results are split over multiple csv files with each file name matching
-     * the pattern "[operation_id]_[count].csv", for example
-     * `3094877188788974909_1.csv`. The `operation_id` matches the
-     * identifier for the Operation, and the `count` is a counter used for
-     * tracking the number of files written.
-     * The CSV file(s) contain the following columns regardless of storage type
-     * scanned:
-     * - id
-     * - info_type
-     * - likelihood
-     * - byte size of finding
-     * - quote
-     * - timestamp
-     * For Cloud Storage the next columns are:
-     * - file_path
-     * - start_offset
-     * For Cloud Datastore the next columns are:
-     * - project_id
-     * - namespace_id
-     * - path
-     * - column_name
-     * - offset
-     * For BigQuery the next columns are:
-     * - row_number
-     * - project_id
-     * - dataset_id
-     * - table_id
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.CloudStoragePath getStoragePath() {
-      if (storagePathBuilder_ == null) {
-        if (typeCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.CloudStoragePath) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.CloudStoragePath.getDefaultInstance();
-      } else {
-        if (typeCase_ == 2) {
-          return storagePathBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.CloudStoragePath.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * The path to a Google Cloud Storage location to store output.
-     * The bucket must already exist and
-     * the Google APIs service account for DLP must have write permission to
-     * write to the given bucket.
-     * Results are split over multiple csv files with each file name matching
-     * the pattern "[operation_id]_[count].csv", for example
-     * `3094877188788974909_1.csv`. The `operation_id` matches the
-     * identifier for the Operation, and the `count` is a counter used for
-     * tracking the number of files written.
-     * The CSV file(s) contain the following columns regardless of storage type
-     * scanned:
-     * - id
-     * - info_type
-     * - likelihood
-     * - byte size of finding
-     * - quote
-     * - timestamp
-     * For Cloud Storage the next columns are:
-     * - file_path
-     * - start_offset
-     * For Cloud Datastore the next columns are:
-     * - project_id
-     * - namespace_id
-     * - path
-     * - column_name
-     * - offset
-     * For BigQuery the next columns are:
-     * - row_number
-     * - project_id
-     * - dataset_id
-     * - table_id
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-     */
-    public Builder setStoragePath(com.google.privacy.dlp.v2beta1.CloudStoragePath value) {
-      if (storagePathBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        storagePathBuilder_.setMessage(value);
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * 
-     * The path to a Google Cloud Storage location to store output.
-     * The bucket must already exist and
-     * the Google APIs service account for DLP must have write permission to
-     * write to the given bucket.
-     * Results are split over multiple csv files with each file name matching
-     * the pattern "[operation_id]_[count].csv", for example
-     * `3094877188788974909_1.csv`. The `operation_id` matches the
-     * identifier for the Operation, and the `count` is a counter used for
-     * tracking the number of files written.
-     * The CSV file(s) contain the following columns regardless of storage type
-     * scanned:
-     * - id
-     * - info_type
-     * - likelihood
-     * - byte size of finding
-     * - quote
-     * - timestamp
-     * For Cloud Storage the next columns are:
-     * - file_path
-     * - start_offset
-     * For Cloud Datastore the next columns are:
-     * - project_id
-     * - namespace_id
-     * - path
-     * - column_name
-     * - offset
-     * For BigQuery the next columns are:
-     * - row_number
-     * - project_id
-     * - dataset_id
-     * - table_id
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-     */
-    public Builder setStoragePath(
-        com.google.privacy.dlp.v2beta1.CloudStoragePath.Builder builderForValue) {
-      if (storagePathBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        storagePathBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * 
-     * The path to a Google Cloud Storage location to store output.
-     * The bucket must already exist and
-     * the Google APIs service account for DLP must have write permission to
-     * write to the given bucket.
-     * Results are split over multiple csv files with each file name matching
-     * the pattern "[operation_id]_[count].csv", for example
-     * `3094877188788974909_1.csv`. The `operation_id` matches the
-     * identifier for the Operation, and the `count` is a counter used for
-     * tracking the number of files written.
-     * The CSV file(s) contain the following columns regardless of storage type
-     * scanned:
-     * - id
-     * - info_type
-     * - likelihood
-     * - byte size of finding
-     * - quote
-     * - timestamp
-     * For Cloud Storage the next columns are:
-     * - file_path
-     * - start_offset
-     * For Cloud Datastore the next columns are:
-     * - project_id
-     * - namespace_id
-     * - path
-     * - column_name
-     * - offset
-     * For BigQuery the next columns are:
-     * - row_number
-     * - project_id
-     * - dataset_id
-     * - table_id
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-     */
-    public Builder mergeStoragePath(com.google.privacy.dlp.v2beta1.CloudStoragePath value) {
-      if (storagePathBuilder_ == null) {
-        if (typeCase_ == 2 &&
-            type_ != com.google.privacy.dlp.v2beta1.CloudStoragePath.getDefaultInstance()) {
-          type_ = com.google.privacy.dlp.v2beta1.CloudStoragePath.newBuilder((com.google.privacy.dlp.v2beta1.CloudStoragePath) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 2) {
-          storagePathBuilder_.mergeFrom(value);
-        }
-        storagePathBuilder_.setMessage(value);
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * 
-     * The path to a Google Cloud Storage location to store output.
-     * The bucket must already exist and
-     * the Google APIs service account for DLP must have write permission to
-     * write to the given bucket.
-     * Results are split over multiple csv files with each file name matching
-     * the pattern "[operation_id]_[count].csv", for example
-     * `3094877188788974909_1.csv`. The `operation_id` matches the
-     * identifier for the Operation, and the `count` is a counter used for
-     * tracking the number of files written.
-     * The CSV file(s) contain the following columns regardless of storage type
-     * scanned:
-     * - id
-     * - info_type
-     * - likelihood
-     * - byte size of finding
-     * - quote
-     * - timestamp
-     * For Cloud Storage the next columns are:
-     * - file_path
-     * - start_offset
-     * For Cloud Datastore the next columns are:
-     * - project_id
-     * - namespace_id
-     * - path
-     * - column_name
-     * - offset
-     * For BigQuery the next columns are:
-     * - row_number
-     * - project_id
-     * - dataset_id
-     * - table_id
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-     */
-    public Builder clearStoragePath() {
-      if (storagePathBuilder_ == null) {
-        if (typeCase_ == 2) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 2) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        storagePathBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * The path to a Google Cloud Storage location to store output.
-     * The bucket must already exist and
-     * the Google APIs service account for DLP must have write permission to
-     * write to the given bucket.
-     * Results are split over multiple csv files with each file name matching
-     * the pattern "[operation_id]_[count].csv", for example
-     * `3094877188788974909_1.csv`. The `operation_id` matches the
-     * identifier for the Operation, and the `count` is a counter used for
-     * tracking the number of files written.
-     * The CSV file(s) contain the following columns regardless of storage type
-     * scanned:
-     * - id
-     * - info_type
-     * - likelihood
-     * - byte size of finding
-     * - quote
-     * - timestamp
-     * For Cloud Storage the next columns are:
-     * - file_path
-     * - start_offset
-     * For Cloud Datastore the next columns are:
-     * - project_id
-     * - namespace_id
-     * - path
-     * - column_name
-     * - offset
-     * For BigQuery the next columns are:
-     * - row_number
-     * - project_id
-     * - dataset_id
-     * - table_id
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.CloudStoragePath.Builder getStoragePathBuilder() {
-      return getStoragePathFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The path to a Google Cloud Storage location to store output.
-     * The bucket must already exist and
-     * the Google APIs service account for DLP must have write permission to
-     * write to the given bucket.
-     * Results are split over multiple csv files with each file name matching
-     * the pattern "[operation_id]_[count].csv", for example
-     * `3094877188788974909_1.csv`. The `operation_id` matches the
-     * identifier for the Operation, and the `count` is a counter used for
-     * tracking the number of files written.
-     * The CSV file(s) contain the following columns regardless of storage type
-     * scanned:
-     * - id
-     * - info_type
-     * - likelihood
-     * - byte size of finding
-     * - quote
-     * - timestamp
-     * For Cloud Storage the next columns are:
-     * - file_path
-     * - start_offset
-     * For Cloud Datastore the next columns are:
-     * - project_id
-     * - namespace_id
-     * - path
-     * - column_name
-     * - offset
-     * For BigQuery the next columns are:
-     * - row_number
-     * - project_id
-     * - dataset_id
-     * - table_id
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.CloudStoragePathOrBuilder getStoragePathOrBuilder() {
-      if ((typeCase_ == 2) && (storagePathBuilder_ != null)) {
-        return storagePathBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.CloudStoragePath) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.CloudStoragePath.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * The path to a Google Cloud Storage location to store output.
-     * The bucket must already exist and
-     * the Google APIs service account for DLP must have write permission to
-     * write to the given bucket.
-     * Results are split over multiple csv files with each file name matching
-     * the pattern "[operation_id]_[count].csv", for example
-     * `3094877188788974909_1.csv`. The `operation_id` matches the
-     * identifier for the Operation, and the `count` is a counter used for
-     * tracking the number of files written.
-     * The CSV file(s) contain the following columns regardless of storage type
-     * scanned:
-     * - id
-     * - info_type
-     * - likelihood
-     * - byte size of finding
-     * - quote
-     * - timestamp
-     * For Cloud Storage the next columns are:
-     * - file_path
-     * - start_offset
-     * For Cloud Datastore the next columns are:
-     * - project_id
-     * - namespace_id
-     * - path
-     * - column_name
-     * - offset
-     * For BigQuery the next columns are:
-     * - row_number
-     * - project_id
-     * - dataset_id
-     * - table_id
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CloudStoragePath, com.google.privacy.dlp.v2beta1.CloudStoragePath.Builder, com.google.privacy.dlp.v2beta1.CloudStoragePathOrBuilder> 
-        getStoragePathFieldBuilder() {
-      if (storagePathBuilder_ == null) {
-        if (!(typeCase_ == 2)) {
-          type_ = com.google.privacy.dlp.v2beta1.CloudStoragePath.getDefaultInstance();
-        }
-        storagePathBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CloudStoragePath, com.google.privacy.dlp.v2beta1.CloudStoragePath.Builder, com.google.privacy.dlp.v2beta1.CloudStoragePathOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.CloudStoragePath) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 2;
-      onChanged();;
-      return storagePathBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.OutputStorageConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.OutputStorageConfig)
-  private static final com.google.privacy.dlp.v2beta1.OutputStorageConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.OutputStorageConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.OutputStorageConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public OutputStorageConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OutputStorageConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.OutputStorageConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OutputStorageConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OutputStorageConfigOrBuilder.java
deleted file mode 100644
index 514b362f0b26..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/OutputStorageConfigOrBuilder.java
+++ /dev/null
@@ -1,151 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface OutputStorageConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.OutputStorageConfig)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Store findings in a new table in the dataset.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-   */
-  boolean hasTable();
-  /**
-   * 
-   * Store findings in a new table in the dataset.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-   */
-  com.google.privacy.dlp.v2beta1.BigQueryTable getTable();
-  /**
-   * 
-   * Store findings in a new table in the dataset.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable table = 1;
-   */
-  com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder getTableOrBuilder();
-
-  /**
-   * 
-   * The path to a Google Cloud Storage location to store output.
-   * The bucket must already exist and
-   * the Google APIs service account for DLP must have write permission to
-   * write to the given bucket.
-   * Results are split over multiple csv files with each file name matching
-   * the pattern "[operation_id]_[count].csv", for example
-   * `3094877188788974909_1.csv`. The `operation_id` matches the
-   * identifier for the Operation, and the `count` is a counter used for
-   * tracking the number of files written.
-   * The CSV file(s) contain the following columns regardless of storage type
-   * scanned:
-   * - id
-   * - info_type
-   * - likelihood
-   * - byte size of finding
-   * - quote
-   * - timestamp
-   * For Cloud Storage the next columns are:
-   * - file_path
-   * - start_offset
-   * For Cloud Datastore the next columns are:
-   * - project_id
-   * - namespace_id
-   * - path
-   * - column_name
-   * - offset
-   * For BigQuery the next columns are:
-   * - row_number
-   * - project_id
-   * - dataset_id
-   * - table_id
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-   */
-  boolean hasStoragePath();
-  /**
-   * 
-   * The path to a Google Cloud Storage location to store output.
-   * The bucket must already exist and
-   * the Google APIs service account for DLP must have write permission to
-   * write to the given bucket.
-   * Results are split over multiple csv files with each file name matching
-   * the pattern "[operation_id]_[count].csv", for example
-   * `3094877188788974909_1.csv`. The `operation_id` matches the
-   * identifier for the Operation, and the `count` is a counter used for
-   * tracking the number of files written.
-   * The CSV file(s) contain the following columns regardless of storage type
-   * scanned:
-   * - id
-   * - info_type
-   * - likelihood
-   * - byte size of finding
-   * - quote
-   * - timestamp
-   * For Cloud Storage the next columns are:
-   * - file_path
-   * - start_offset
-   * For Cloud Datastore the next columns are:
-   * - project_id
-   * - namespace_id
-   * - path
-   * - column_name
-   * - offset
-   * For BigQuery the next columns are:
-   * - row_number
-   * - project_id
-   * - dataset_id
-   * - table_id
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-   */
-  com.google.privacy.dlp.v2beta1.CloudStoragePath getStoragePath();
-  /**
-   * 
-   * The path to a Google Cloud Storage location to store output.
-   * The bucket must already exist and
-   * the Google APIs service account for DLP must have write permission to
-   * write to the given bucket.
-   * Results are split over multiple csv files with each file name matching
-   * the pattern "[operation_id]_[count].csv", for example
-   * `3094877188788974909_1.csv`. The `operation_id` matches the
-   * identifier for the Operation, and the `count` is a counter used for
-   * tracking the number of files written.
-   * The CSV file(s) contain the following columns regardless of storage type
-   * scanned:
-   * - id
-   * - info_type
-   * - likelihood
-   * - byte size of finding
-   * - quote
-   * - timestamp
-   * For Cloud Storage the next columns are:
-   * - file_path
-   * - start_offset
-   * For Cloud Datastore the next columns are:
-   * - project_id
-   * - namespace_id
-   * - path
-   * - column_name
-   * - offset
-   * For BigQuery the next columns are:
-   * - row_number
-   * - project_id
-   * - dataset_id
-   * - table_id
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CloudStoragePath storage_path = 2;
-   */
-  com.google.privacy.dlp.v2beta1.CloudStoragePathOrBuilder getStoragePathOrBuilder();
-
-  public com.google.privacy.dlp.v2beta1.OutputStorageConfig.TypeCase getTypeCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PartitionId.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PartitionId.java
deleted file mode 100644
index 55853135ca21..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PartitionId.java
+++ /dev/null
@@ -1,715 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Datastore partition ID.
- * A partition ID identifies a grouping of entities. The grouping is always
- * by project and namespace, however the namespace ID may be empty.
- * A partition ID contains several dimensions:
- * project ID and namespace ID.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.PartitionId}
- */
-public  final class PartitionId extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.PartitionId)
-    PartitionIdOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use PartitionId.newBuilder() to construct.
-  private PartitionId(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private PartitionId() {
-    projectId_ = "";
-    namespaceId_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private PartitionId(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            projectId_ = s;
-            break;
-          }
-          case 34: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            namespaceId_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_PartitionId_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_PartitionId_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.PartitionId.class, com.google.privacy.dlp.v2beta1.PartitionId.Builder.class);
-  }
-
-  public static final int PROJECT_ID_FIELD_NUMBER = 2;
-  private volatile java.lang.Object projectId_;
-  /**
-   * 
-   * The ID of the project to which the entities belong.
-   * 

-   *
-   * string project_id = 2;
-   */
-  public java.lang.String getProjectId() {
-    java.lang.Object ref = projectId_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      projectId_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * The ID of the project to which the entities belong.
-   * 

-   *
-   * string project_id = 2;
-   */
-  public com.google.protobuf.ByteString
-      getProjectIdBytes() {
-    java.lang.Object ref = projectId_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      projectId_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int NAMESPACE_ID_FIELD_NUMBER = 4;
-  private volatile java.lang.Object namespaceId_;
-  /**
-   * 
-   * If not empty, the ID of the namespace to which the entities belong.
-   * 

-   *
-   * string namespace_id = 4;
-   */
-  public java.lang.String getNamespaceId() {
-    java.lang.Object ref = namespaceId_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      namespaceId_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * If not empty, the ID of the namespace to which the entities belong.
-   * 

-   *
-   * string namespace_id = 4;
-   */
-  public com.google.protobuf.ByteString
-      getNamespaceIdBytes() {
-    java.lang.Object ref = namespaceId_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      namespaceId_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getProjectIdBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, projectId_);
-    }
-    if (!getNamespaceIdBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 4, namespaceId_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getProjectIdBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, projectId_);
-    }
-    if (!getNamespaceIdBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, namespaceId_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.PartitionId)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.PartitionId other = (com.google.privacy.dlp.v2beta1.PartitionId) obj;
-
-    boolean result = true;
-    result = result && getProjectId()
-        .equals(other.getProjectId());
-    result = result && getNamespaceId()
-        .equals(other.getNamespaceId());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
-    hash = (53 * hash) + getProjectId().hashCode();
-    hash = (37 * hash) + NAMESPACE_ID_FIELD_NUMBER;
-    hash = (53 * hash) + getNamespaceId().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.PartitionId parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.PartitionId parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PartitionId parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.PartitionId parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PartitionId parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.PartitionId parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PartitionId parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.PartitionId parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PartitionId parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.PartitionId parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PartitionId parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.PartitionId parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.PartitionId prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Datastore partition ID.
-   * A partition ID identifies a grouping of entities. The grouping is always
-   * by project and namespace, however the namespace ID may be empty.
-   * A partition ID contains several dimensions:
-   * project ID and namespace ID.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.PartitionId}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.PartitionId)
-      com.google.privacy.dlp.v2beta1.PartitionIdOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_PartitionId_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_PartitionId_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.PartitionId.class, com.google.privacy.dlp.v2beta1.PartitionId.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.PartitionId.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      projectId_ = "";
-
-      namespaceId_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_PartitionId_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.PartitionId getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.PartitionId.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.PartitionId build() {
-      com.google.privacy.dlp.v2beta1.PartitionId result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.PartitionId buildPartial() {
-      com.google.privacy.dlp.v2beta1.PartitionId result = new com.google.privacy.dlp.v2beta1.PartitionId(this);
-      result.projectId_ = projectId_;
-      result.namespaceId_ = namespaceId_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.PartitionId) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.PartitionId)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.PartitionId other) {
-      if (other == com.google.privacy.dlp.v2beta1.PartitionId.getDefaultInstance()) return this;
-      if (!other.getProjectId().isEmpty()) {
-        projectId_ = other.projectId_;
-        onChanged();
-      }
-      if (!other.getNamespaceId().isEmpty()) {
-        namespaceId_ = other.namespaceId_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.PartitionId parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.PartitionId) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object projectId_ = "";
-    /**
-     * 
-     * The ID of the project to which the entities belong.
-     * 

-     *
-     * string project_id = 2;
-     */
-    public java.lang.String getProjectId() {
-      java.lang.Object ref = projectId_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        projectId_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * The ID of the project to which the entities belong.
-     * 

-     *
-     * string project_id = 2;
-     */
-    public com.google.protobuf.ByteString
-        getProjectIdBytes() {
-      java.lang.Object ref = projectId_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        projectId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * The ID of the project to which the entities belong.
-     * 

-     *
-     * string project_id = 2;
-     */
-    public Builder setProjectId(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      projectId_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The ID of the project to which the entities belong.
-     * 

-     *
-     * string project_id = 2;
-     */
-    public Builder clearProjectId() {
-      
-      projectId_ = getDefaultInstance().getProjectId();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The ID of the project to which the entities belong.
-     * 

-     *
-     * string project_id = 2;
-     */
-    public Builder setProjectIdBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      projectId_ = value;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object namespaceId_ = "";
-    /**
-     * 
-     * If not empty, the ID of the namespace to which the entities belong.
-     * 

-     *
-     * string namespace_id = 4;
-     */
-    public java.lang.String getNamespaceId() {
-      java.lang.Object ref = namespaceId_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        namespaceId_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * If not empty, the ID of the namespace to which the entities belong.
-     * 

-     *
-     * string namespace_id = 4;
-     */
-    public com.google.protobuf.ByteString
-        getNamespaceIdBytes() {
-      java.lang.Object ref = namespaceId_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        namespaceId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * If not empty, the ID of the namespace to which the entities belong.
-     * 

-     *
-     * string namespace_id = 4;
-     */
-    public Builder setNamespaceId(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      namespaceId_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * If not empty, the ID of the namespace to which the entities belong.
-     * 

-     *
-     * string namespace_id = 4;
-     */
-    public Builder clearNamespaceId() {
-      
-      namespaceId_ = getDefaultInstance().getNamespaceId();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * If not empty, the ID of the namespace to which the entities belong.
-     * 

-     *
-     * string namespace_id = 4;
-     */
-    public Builder setNamespaceIdBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      namespaceId_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.PartitionId)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.PartitionId)
-  private static final com.google.privacy.dlp.v2beta1.PartitionId DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.PartitionId();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.PartitionId getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public PartitionId parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartitionId(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.PartitionId getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PartitionIdOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PartitionIdOrBuilder.java
deleted file mode 100644
index ae76cc8d0f59..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PartitionIdOrBuilder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface PartitionIdOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.PartitionId)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The ID of the project to which the entities belong.
-   * 

-   *
-   * string project_id = 2;
-   */
-  java.lang.String getProjectId();
-  /**
-   * 
-   * The ID of the project to which the entities belong.
-   * 

-   *
-   * string project_id = 2;
-   */
-  com.google.protobuf.ByteString
-      getProjectIdBytes();
-
-  /**
-   * 
-   * If not empty, the ID of the namespace to which the entities belong.
-   * 

-   *
-   * string namespace_id = 4;
-   */
-  java.lang.String getNamespaceId();
-  /**
-   * 
-   * If not empty, the ID of the namespace to which the entities belong.
-   * 

-   *
-   * string namespace_id = 4;
-   */
-  com.google.protobuf.ByteString
-      getNamespaceIdBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrimitiveTransformation.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrimitiveTransformation.java
deleted file mode 100644
index 84d582ba587f..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrimitiveTransformation.java
+++ /dev/null
@@ -1,2301 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * A rule for transforming a value.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.PrimitiveTransformation}
- */
-public  final class PrimitiveTransformation extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.PrimitiveTransformation)
-    PrimitiveTransformationOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use PrimitiveTransformation.newBuilder() to construct.
-  private PrimitiveTransformation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private PrimitiveTransformation() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private PrimitiveTransformation(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.ReplaceValueConfig.Builder subBuilder = null;
-            if (transformationCase_ == 1) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.ReplaceValueConfig) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.ReplaceValueConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.ReplaceValueConfig) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 1;
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.RedactConfig.Builder subBuilder = null;
-            if (transformationCase_ == 2) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.RedactConfig) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.RedactConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.RedactConfig) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 2;
-            break;
-          }
-          case 26: {
-            com.google.privacy.dlp.v2beta1.CharacterMaskConfig.Builder subBuilder = null;
-            if (transformationCase_ == 3) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.CharacterMaskConfig) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.CharacterMaskConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.CharacterMaskConfig) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 3;
-            break;
-          }
-          case 34: {
-            com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.Builder subBuilder = null;
-            if (transformationCase_ == 4) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 4;
-            break;
-          }
-          case 42: {
-            com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.Builder subBuilder = null;
-            if (transformationCase_ == 5) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 5;
-            break;
-          }
-          case 50: {
-            com.google.privacy.dlp.v2beta1.BucketingConfig.Builder subBuilder = null;
-            if (transformationCase_ == 6) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.BucketingConfig) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.BucketingConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.BucketingConfig) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 6;
-            break;
-          }
-          case 58: {
-            com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.Builder subBuilder = null;
-            if (transformationCase_ == 7) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 7;
-            break;
-          }
-          case 66: {
-            com.google.privacy.dlp.v2beta1.TimePartConfig.Builder subBuilder = null;
-            if (transformationCase_ == 8) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.TimePartConfig) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.TimePartConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.TimePartConfig) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 8;
-            break;
-          }
-          case 74: {
-            com.google.privacy.dlp.v2beta1.CryptoHashConfig.Builder subBuilder = null;
-            if (transformationCase_ == 9) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.CryptoHashConfig) transformation_).toBuilder();
-            }
-            transformation_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.CryptoHashConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.CryptoHashConfig) transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-            transformationCase_ = 9;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrimitiveTransformation_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrimitiveTransformation_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.PrimitiveTransformation.class, com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder.class);
-  }
-
-  private int transformationCase_ = 0;
-  private java.lang.Object transformation_;
-  public enum TransformationCase
-      implements com.google.protobuf.Internal.EnumLite {
-    REPLACE_CONFIG(1),
-    REDACT_CONFIG(2),
-    CHARACTER_MASK_CONFIG(3),
-    CRYPTO_REPLACE_FFX_FPE_CONFIG(4),
-    FIXED_SIZE_BUCKETING_CONFIG(5),
-    BUCKETING_CONFIG(6),
-    REPLACE_WITH_INFO_TYPE_CONFIG(7),
-    TIME_PART_CONFIG(8),
-    CRYPTO_HASH_CONFIG(9),
-    TRANSFORMATION_NOT_SET(0);
-    private final int value;
-    private TransformationCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static TransformationCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static TransformationCase forNumber(int value) {
-      switch (value) {
-        case 1: return REPLACE_CONFIG;
-        case 2: return REDACT_CONFIG;
-        case 3: return CHARACTER_MASK_CONFIG;
-        case 4: return CRYPTO_REPLACE_FFX_FPE_CONFIG;
-        case 5: return FIXED_SIZE_BUCKETING_CONFIG;
-        case 6: return BUCKETING_CONFIG;
-        case 7: return REPLACE_WITH_INFO_TYPE_CONFIG;
-        case 8: return TIME_PART_CONFIG;
-        case 9: return CRYPTO_HASH_CONFIG;
-        case 0: return TRANSFORMATION_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public TransformationCase
-  getTransformationCase() {
-    return TransformationCase.forNumber(
-        transformationCase_);
-  }
-
-  public static final int REPLACE_CONFIG_FIELD_NUMBER = 1;
-  /**
-   * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-   */
-  public boolean hasReplaceConfig() {
-    return transformationCase_ == 1;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.ReplaceValueConfig getReplaceConfig() {
-    if (transformationCase_ == 1) {
-       return (com.google.privacy.dlp.v2beta1.ReplaceValueConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.ReplaceValueConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.ReplaceValueConfigOrBuilder getReplaceConfigOrBuilder() {
-    if (transformationCase_ == 1) {
-       return (com.google.privacy.dlp.v2beta1.ReplaceValueConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.ReplaceValueConfig.getDefaultInstance();
-  }
-
-  public static final int REDACT_CONFIG_FIELD_NUMBER = 2;
-  /**
-   * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-   */
-  public boolean hasRedactConfig() {
-    return transformationCase_ == 2;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.RedactConfig getRedactConfig() {
-    if (transformationCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.RedactConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.RedactConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.RedactConfigOrBuilder getRedactConfigOrBuilder() {
-    if (transformationCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.RedactConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.RedactConfig.getDefaultInstance();
-  }
-
-  public static final int CHARACTER_MASK_CONFIG_FIELD_NUMBER = 3;
-  /**
-   * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-   */
-  public boolean hasCharacterMaskConfig() {
-    return transformationCase_ == 3;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.CharacterMaskConfig getCharacterMaskConfig() {
-    if (transformationCase_ == 3) {
-       return (com.google.privacy.dlp.v2beta1.CharacterMaskConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.CharacterMaskConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.CharacterMaskConfigOrBuilder getCharacterMaskConfigOrBuilder() {
-    if (transformationCase_ == 3) {
-       return (com.google.privacy.dlp.v2beta1.CharacterMaskConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.CharacterMaskConfig.getDefaultInstance();
-  }
-
-  public static final int CRYPTO_REPLACE_FFX_FPE_CONFIG_FIELD_NUMBER = 4;
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-   */
-  public boolean hasCryptoReplaceFfxFpeConfig() {
-    return transformationCase_ == 4;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig getCryptoReplaceFfxFpeConfig() {
-    if (transformationCase_ == 4) {
-       return (com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfigOrBuilder getCryptoReplaceFfxFpeConfigOrBuilder() {
-    if (transformationCase_ == 4) {
-       return (com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.getDefaultInstance();
-  }
-
-  public static final int FIXED_SIZE_BUCKETING_CONFIG_FIELD_NUMBER = 5;
-  /**
-   * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-   */
-  public boolean hasFixedSizeBucketingConfig() {
-    return transformationCase_ == 5;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig getFixedSizeBucketingConfig() {
-    if (transformationCase_ == 5) {
-       return (com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfigOrBuilder getFixedSizeBucketingConfigOrBuilder() {
-    if (transformationCase_ == 5) {
-       return (com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.getDefaultInstance();
-  }
-
-  public static final int BUCKETING_CONFIG_FIELD_NUMBER = 6;
-  /**
-   * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-   */
-  public boolean hasBucketingConfig() {
-    return transformationCase_ == 6;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-   */
-  public com.google.privacy.dlp.v2beta1.BucketingConfig getBucketingConfig() {
-    if (transformationCase_ == 6) {
-       return (com.google.privacy.dlp.v2beta1.BucketingConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.BucketingConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-   */
-  public com.google.privacy.dlp.v2beta1.BucketingConfigOrBuilder getBucketingConfigOrBuilder() {
-    if (transformationCase_ == 6) {
-       return (com.google.privacy.dlp.v2beta1.BucketingConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.BucketingConfig.getDefaultInstance();
-  }
-
-  public static final int REPLACE_WITH_INFO_TYPE_CONFIG_FIELD_NUMBER = 7;
-  /**
-   * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-   */
-  public boolean hasReplaceWithInfoTypeConfig() {
-    return transformationCase_ == 7;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-   */
-  public com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig getReplaceWithInfoTypeConfig() {
-    if (transformationCase_ == 7) {
-       return (com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-   */
-  public com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfigOrBuilder getReplaceWithInfoTypeConfigOrBuilder() {
-    if (transformationCase_ == 7) {
-       return (com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.getDefaultInstance();
-  }
-
-  public static final int TIME_PART_CONFIG_FIELD_NUMBER = 8;
-  /**
-   * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-   */
-  public boolean hasTimePartConfig() {
-    return transformationCase_ == 8;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-   */
-  public com.google.privacy.dlp.v2beta1.TimePartConfig getTimePartConfig() {
-    if (transformationCase_ == 8) {
-       return (com.google.privacy.dlp.v2beta1.TimePartConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.TimePartConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-   */
-  public com.google.privacy.dlp.v2beta1.TimePartConfigOrBuilder getTimePartConfigOrBuilder() {
-    if (transformationCase_ == 8) {
-       return (com.google.privacy.dlp.v2beta1.TimePartConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.TimePartConfig.getDefaultInstance();
-  }
-
-  public static final int CRYPTO_HASH_CONFIG_FIELD_NUMBER = 9;
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-   */
-  public boolean hasCryptoHashConfig() {
-    return transformationCase_ == 9;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-   */
-  public com.google.privacy.dlp.v2beta1.CryptoHashConfig getCryptoHashConfig() {
-    if (transformationCase_ == 9) {
-       return (com.google.privacy.dlp.v2beta1.CryptoHashConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.CryptoHashConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-   */
-  public com.google.privacy.dlp.v2beta1.CryptoHashConfigOrBuilder getCryptoHashConfigOrBuilder() {
-    if (transformationCase_ == 9) {
-       return (com.google.privacy.dlp.v2beta1.CryptoHashConfig) transformation_;
-    }
-    return com.google.privacy.dlp.v2beta1.CryptoHashConfig.getDefaultInstance();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (transformationCase_ == 1) {
-      output.writeMessage(1, (com.google.privacy.dlp.v2beta1.ReplaceValueConfig) transformation_);
-    }
-    if (transformationCase_ == 2) {
-      output.writeMessage(2, (com.google.privacy.dlp.v2beta1.RedactConfig) transformation_);
-    }
-    if (transformationCase_ == 3) {
-      output.writeMessage(3, (com.google.privacy.dlp.v2beta1.CharacterMaskConfig) transformation_);
-    }
-    if (transformationCase_ == 4) {
-      output.writeMessage(4, (com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) transformation_);
-    }
-    if (transformationCase_ == 5) {
-      output.writeMessage(5, (com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) transformation_);
-    }
-    if (transformationCase_ == 6) {
-      output.writeMessage(6, (com.google.privacy.dlp.v2beta1.BucketingConfig) transformation_);
-    }
-    if (transformationCase_ == 7) {
-      output.writeMessage(7, (com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) transformation_);
-    }
-    if (transformationCase_ == 8) {
-      output.writeMessage(8, (com.google.privacy.dlp.v2beta1.TimePartConfig) transformation_);
-    }
-    if (transformationCase_ == 9) {
-      output.writeMessage(9, (com.google.privacy.dlp.v2beta1.CryptoHashConfig) transformation_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (transformationCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, (com.google.privacy.dlp.v2beta1.ReplaceValueConfig) transformation_);
-    }
-    if (transformationCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, (com.google.privacy.dlp.v2beta1.RedactConfig) transformation_);
-    }
-    if (transformationCase_ == 3) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, (com.google.privacy.dlp.v2beta1.CharacterMaskConfig) transformation_);
-    }
-    if (transformationCase_ == 4) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, (com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) transformation_);
-    }
-    if (transformationCase_ == 5) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, (com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) transformation_);
-    }
-    if (transformationCase_ == 6) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(6, (com.google.privacy.dlp.v2beta1.BucketingConfig) transformation_);
-    }
-    if (transformationCase_ == 7) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(7, (com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) transformation_);
-    }
-    if (transformationCase_ == 8) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(8, (com.google.privacy.dlp.v2beta1.TimePartConfig) transformation_);
-    }
-    if (transformationCase_ == 9) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(9, (com.google.privacy.dlp.v2beta1.CryptoHashConfig) transformation_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.PrimitiveTransformation)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.PrimitiveTransformation other = (com.google.privacy.dlp.v2beta1.PrimitiveTransformation) obj;
-
-    boolean result = true;
-    result = result && getTransformationCase().equals(
-        other.getTransformationCase());
-    if (!result) return false;
-    switch (transformationCase_) {
-      case 1:
-        result = result && getReplaceConfig()
-            .equals(other.getReplaceConfig());
-        break;
-      case 2:
-        result = result && getRedactConfig()
-            .equals(other.getRedactConfig());
-        break;
-      case 3:
-        result = result && getCharacterMaskConfig()
-            .equals(other.getCharacterMaskConfig());
-        break;
-      case 4:
-        result = result && getCryptoReplaceFfxFpeConfig()
-            .equals(other.getCryptoReplaceFfxFpeConfig());
-        break;
-      case 5:
-        result = result && getFixedSizeBucketingConfig()
-            .equals(other.getFixedSizeBucketingConfig());
-        break;
-      case 6:
-        result = result && getBucketingConfig()
-            .equals(other.getBucketingConfig());
-        break;
-      case 7:
-        result = result && getReplaceWithInfoTypeConfig()
-            .equals(other.getReplaceWithInfoTypeConfig());
-        break;
-      case 8:
-        result = result && getTimePartConfig()
-            .equals(other.getTimePartConfig());
-        break;
-      case 9:
-        result = result && getCryptoHashConfig()
-            .equals(other.getCryptoHashConfig());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    switch (transformationCase_) {
-      case 1:
-        hash = (37 * hash) + REPLACE_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getReplaceConfig().hashCode();
-        break;
-      case 2:
-        hash = (37 * hash) + REDACT_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getRedactConfig().hashCode();
-        break;
-      case 3:
-        hash = (37 * hash) + CHARACTER_MASK_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getCharacterMaskConfig().hashCode();
-        break;
-      case 4:
-        hash = (37 * hash) + CRYPTO_REPLACE_FFX_FPE_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getCryptoReplaceFfxFpeConfig().hashCode();
-        break;
-      case 5:
-        hash = (37 * hash) + FIXED_SIZE_BUCKETING_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getFixedSizeBucketingConfig().hashCode();
-        break;
-      case 6:
-        hash = (37 * hash) + BUCKETING_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getBucketingConfig().hashCode();
-        break;
-      case 7:
-        hash = (37 * hash) + REPLACE_WITH_INFO_TYPE_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getReplaceWithInfoTypeConfig().hashCode();
-        break;
-      case 8:
-        hash = (37 * hash) + TIME_PART_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getTimePartConfig().hashCode();
-        break;
-      case 9:
-        hash = (37 * hash) + CRYPTO_HASH_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getCryptoHashConfig().hashCode();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.PrimitiveTransformation prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * A rule for transforming a value.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.PrimitiveTransformation}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.PrimitiveTransformation)
-      com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrimitiveTransformation_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrimitiveTransformation_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.PrimitiveTransformation.class, com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.PrimitiveTransformation.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      transformationCase_ = 0;
-      transformation_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrimitiveTransformation_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.PrimitiveTransformation getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.PrimitiveTransformation build() {
-      com.google.privacy.dlp.v2beta1.PrimitiveTransformation result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.PrimitiveTransformation buildPartial() {
-      com.google.privacy.dlp.v2beta1.PrimitiveTransformation result = new com.google.privacy.dlp.v2beta1.PrimitiveTransformation(this);
-      if (transformationCase_ == 1) {
-        if (replaceConfigBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = replaceConfigBuilder_.build();
-        }
-      }
-      if (transformationCase_ == 2) {
-        if (redactConfigBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = redactConfigBuilder_.build();
-        }
-      }
-      if (transformationCase_ == 3) {
-        if (characterMaskConfigBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = characterMaskConfigBuilder_.build();
-        }
-      }
-      if (transformationCase_ == 4) {
-        if (cryptoReplaceFfxFpeConfigBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = cryptoReplaceFfxFpeConfigBuilder_.build();
-        }
-      }
-      if (transformationCase_ == 5) {
-        if (fixedSizeBucketingConfigBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = fixedSizeBucketingConfigBuilder_.build();
-        }
-      }
-      if (transformationCase_ == 6) {
-        if (bucketingConfigBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = bucketingConfigBuilder_.build();
-        }
-      }
-      if (transformationCase_ == 7) {
-        if (replaceWithInfoTypeConfigBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = replaceWithInfoTypeConfigBuilder_.build();
-        }
-      }
-      if (transformationCase_ == 8) {
-        if (timePartConfigBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = timePartConfigBuilder_.build();
-        }
-      }
-      if (transformationCase_ == 9) {
-        if (cryptoHashConfigBuilder_ == null) {
-          result.transformation_ = transformation_;
-        } else {
-          result.transformation_ = cryptoHashConfigBuilder_.build();
-        }
-      }
-      result.transformationCase_ = transformationCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.PrimitiveTransformation) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.PrimitiveTransformation)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.PrimitiveTransformation other) {
-      if (other == com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance()) return this;
-      switch (other.getTransformationCase()) {
-        case REPLACE_CONFIG: {
-          mergeReplaceConfig(other.getReplaceConfig());
-          break;
-        }
-        case REDACT_CONFIG: {
-          mergeRedactConfig(other.getRedactConfig());
-          break;
-        }
-        case CHARACTER_MASK_CONFIG: {
-          mergeCharacterMaskConfig(other.getCharacterMaskConfig());
-          break;
-        }
-        case CRYPTO_REPLACE_FFX_FPE_CONFIG: {
-          mergeCryptoReplaceFfxFpeConfig(other.getCryptoReplaceFfxFpeConfig());
-          break;
-        }
-        case FIXED_SIZE_BUCKETING_CONFIG: {
-          mergeFixedSizeBucketingConfig(other.getFixedSizeBucketingConfig());
-          break;
-        }
-        case BUCKETING_CONFIG: {
-          mergeBucketingConfig(other.getBucketingConfig());
-          break;
-        }
-        case REPLACE_WITH_INFO_TYPE_CONFIG: {
-          mergeReplaceWithInfoTypeConfig(other.getReplaceWithInfoTypeConfig());
-          break;
-        }
-        case TIME_PART_CONFIG: {
-          mergeTimePartConfig(other.getTimePartConfig());
-          break;
-        }
-        case CRYPTO_HASH_CONFIG: {
-          mergeCryptoHashConfig(other.getCryptoHashConfig());
-          break;
-        }
-        case TRANSFORMATION_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.PrimitiveTransformation parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.PrimitiveTransformation) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int transformationCase_ = 0;
-    private java.lang.Object transformation_;
-    public TransformationCase
-        getTransformationCase() {
-      return TransformationCase.forNumber(
-          transformationCase_);
-    }
-
-    public Builder clearTransformation() {
-      transformationCase_ = 0;
-      transformation_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ReplaceValueConfig, com.google.privacy.dlp.v2beta1.ReplaceValueConfig.Builder, com.google.privacy.dlp.v2beta1.ReplaceValueConfigOrBuilder> replaceConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-     */
-    public boolean hasReplaceConfig() {
-      return transformationCase_ == 1;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ReplaceValueConfig getReplaceConfig() {
-      if (replaceConfigBuilder_ == null) {
-        if (transformationCase_ == 1) {
-          return (com.google.privacy.dlp.v2beta1.ReplaceValueConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.ReplaceValueConfig.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 1) {
-          return replaceConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.ReplaceValueConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-     */
-    public Builder setReplaceConfig(com.google.privacy.dlp.v2beta1.ReplaceValueConfig value) {
-      if (replaceConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        replaceConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 1;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-     */
-    public Builder setReplaceConfig(
-        com.google.privacy.dlp.v2beta1.ReplaceValueConfig.Builder builderForValue) {
-      if (replaceConfigBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        replaceConfigBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 1;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-     */
-    public Builder mergeReplaceConfig(com.google.privacy.dlp.v2beta1.ReplaceValueConfig value) {
-      if (replaceConfigBuilder_ == null) {
-        if (transformationCase_ == 1 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.ReplaceValueConfig.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.ReplaceValueConfig.newBuilder((com.google.privacy.dlp.v2beta1.ReplaceValueConfig) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 1) {
-          replaceConfigBuilder_.mergeFrom(value);
-        }
-        replaceConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 1;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-     */
-    public Builder clearReplaceConfig() {
-      if (replaceConfigBuilder_ == null) {
-        if (transformationCase_ == 1) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 1) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        replaceConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ReplaceValueConfig.Builder getReplaceConfigBuilder() {
-      return getReplaceConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ReplaceValueConfigOrBuilder getReplaceConfigOrBuilder() {
-      if ((transformationCase_ == 1) && (replaceConfigBuilder_ != null)) {
-        return replaceConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 1) {
-          return (com.google.privacy.dlp.v2beta1.ReplaceValueConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.ReplaceValueConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ReplaceValueConfig, com.google.privacy.dlp.v2beta1.ReplaceValueConfig.Builder, com.google.privacy.dlp.v2beta1.ReplaceValueConfigOrBuilder> 
-        getReplaceConfigFieldBuilder() {
-      if (replaceConfigBuilder_ == null) {
-        if (!(transformationCase_ == 1)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.ReplaceValueConfig.getDefaultInstance();
-        }
-        replaceConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.ReplaceValueConfig, com.google.privacy.dlp.v2beta1.ReplaceValueConfig.Builder, com.google.privacy.dlp.v2beta1.ReplaceValueConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.ReplaceValueConfig) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 1;
-      onChanged();;
-      return replaceConfigBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RedactConfig, com.google.privacy.dlp.v2beta1.RedactConfig.Builder, com.google.privacy.dlp.v2beta1.RedactConfigOrBuilder> redactConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-     */
-    public boolean hasRedactConfig() {
-      return transformationCase_ == 2;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactConfig getRedactConfig() {
-      if (redactConfigBuilder_ == null) {
-        if (transformationCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.RedactConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.RedactConfig.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 2) {
-          return redactConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.RedactConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-     */
-    public Builder setRedactConfig(com.google.privacy.dlp.v2beta1.RedactConfig value) {
-      if (redactConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        redactConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 2;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-     */
-    public Builder setRedactConfig(
-        com.google.privacy.dlp.v2beta1.RedactConfig.Builder builderForValue) {
-      if (redactConfigBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        redactConfigBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 2;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-     */
-    public Builder mergeRedactConfig(com.google.privacy.dlp.v2beta1.RedactConfig value) {
-      if (redactConfigBuilder_ == null) {
-        if (transformationCase_ == 2 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.RedactConfig.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.RedactConfig.newBuilder((com.google.privacy.dlp.v2beta1.RedactConfig) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 2) {
-          redactConfigBuilder_.mergeFrom(value);
-        }
-        redactConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 2;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-     */
-    public Builder clearRedactConfig() {
-      if (redactConfigBuilder_ == null) {
-        if (transformationCase_ == 2) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 2) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        redactConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactConfig.Builder getRedactConfigBuilder() {
-      return getRedactConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactConfigOrBuilder getRedactConfigOrBuilder() {
-      if ((transformationCase_ == 2) && (redactConfigBuilder_ != null)) {
-        return redactConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.RedactConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.RedactConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RedactConfig, com.google.privacy.dlp.v2beta1.RedactConfig.Builder, com.google.privacy.dlp.v2beta1.RedactConfigOrBuilder> 
-        getRedactConfigFieldBuilder() {
-      if (redactConfigBuilder_ == null) {
-        if (!(transformationCase_ == 2)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.RedactConfig.getDefaultInstance();
-        }
-        redactConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RedactConfig, com.google.privacy.dlp.v2beta1.RedactConfig.Builder, com.google.privacy.dlp.v2beta1.RedactConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.RedactConfig) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 2;
-      onChanged();;
-      return redactConfigBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CharacterMaskConfig, com.google.privacy.dlp.v2beta1.CharacterMaskConfig.Builder, com.google.privacy.dlp.v2beta1.CharacterMaskConfigOrBuilder> characterMaskConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-     */
-    public boolean hasCharacterMaskConfig() {
-      return transformationCase_ == 3;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.CharacterMaskConfig getCharacterMaskConfig() {
-      if (characterMaskConfigBuilder_ == null) {
-        if (transformationCase_ == 3) {
-          return (com.google.privacy.dlp.v2beta1.CharacterMaskConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.CharacterMaskConfig.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 3) {
-          return characterMaskConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.CharacterMaskConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-     */
-    public Builder setCharacterMaskConfig(com.google.privacy.dlp.v2beta1.CharacterMaskConfig value) {
-      if (characterMaskConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        characterMaskConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 3;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-     */
-    public Builder setCharacterMaskConfig(
-        com.google.privacy.dlp.v2beta1.CharacterMaskConfig.Builder builderForValue) {
-      if (characterMaskConfigBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        characterMaskConfigBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 3;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-     */
-    public Builder mergeCharacterMaskConfig(com.google.privacy.dlp.v2beta1.CharacterMaskConfig value) {
-      if (characterMaskConfigBuilder_ == null) {
-        if (transformationCase_ == 3 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.CharacterMaskConfig.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.CharacterMaskConfig.newBuilder((com.google.privacy.dlp.v2beta1.CharacterMaskConfig) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 3) {
-          characterMaskConfigBuilder_.mergeFrom(value);
-        }
-        characterMaskConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 3;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-     */
-    public Builder clearCharacterMaskConfig() {
-      if (characterMaskConfigBuilder_ == null) {
-        if (transformationCase_ == 3) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 3) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        characterMaskConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.CharacterMaskConfig.Builder getCharacterMaskConfigBuilder() {
-      return getCharacterMaskConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.CharacterMaskConfigOrBuilder getCharacterMaskConfigOrBuilder() {
-      if ((transformationCase_ == 3) && (characterMaskConfigBuilder_ != null)) {
-        return characterMaskConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 3) {
-          return (com.google.privacy.dlp.v2beta1.CharacterMaskConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.CharacterMaskConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CharacterMaskConfig, com.google.privacy.dlp.v2beta1.CharacterMaskConfig.Builder, com.google.privacy.dlp.v2beta1.CharacterMaskConfigOrBuilder> 
-        getCharacterMaskConfigFieldBuilder() {
-      if (characterMaskConfigBuilder_ == null) {
-        if (!(transformationCase_ == 3)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.CharacterMaskConfig.getDefaultInstance();
-        }
-        characterMaskConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CharacterMaskConfig, com.google.privacy.dlp.v2beta1.CharacterMaskConfig.Builder, com.google.privacy.dlp.v2beta1.CharacterMaskConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.CharacterMaskConfig) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 3;
-      onChanged();;
-      return characterMaskConfigBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig, com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.Builder, com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfigOrBuilder> cryptoReplaceFfxFpeConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-     */
-    public boolean hasCryptoReplaceFfxFpeConfig() {
-      return transformationCase_ == 4;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig getCryptoReplaceFfxFpeConfig() {
-      if (cryptoReplaceFfxFpeConfigBuilder_ == null) {
-        if (transformationCase_ == 4) {
-          return (com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 4) {
-          return cryptoReplaceFfxFpeConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-     */
-    public Builder setCryptoReplaceFfxFpeConfig(com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig value) {
-      if (cryptoReplaceFfxFpeConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        cryptoReplaceFfxFpeConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 4;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-     */
-    public Builder setCryptoReplaceFfxFpeConfig(
-        com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.Builder builderForValue) {
-      if (cryptoReplaceFfxFpeConfigBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        cryptoReplaceFfxFpeConfigBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 4;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-     */
-    public Builder mergeCryptoReplaceFfxFpeConfig(com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig value) {
-      if (cryptoReplaceFfxFpeConfigBuilder_ == null) {
-        if (transformationCase_ == 4 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.newBuilder((com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 4) {
-          cryptoReplaceFfxFpeConfigBuilder_.mergeFrom(value);
-        }
-        cryptoReplaceFfxFpeConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 4;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-     */
-    public Builder clearCryptoReplaceFfxFpeConfig() {
-      if (cryptoReplaceFfxFpeConfigBuilder_ == null) {
-        if (transformationCase_ == 4) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 4) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        cryptoReplaceFfxFpeConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.Builder getCryptoReplaceFfxFpeConfigBuilder() {
-      return getCryptoReplaceFfxFpeConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfigOrBuilder getCryptoReplaceFfxFpeConfigOrBuilder() {
-      if ((transformationCase_ == 4) && (cryptoReplaceFfxFpeConfigBuilder_ != null)) {
-        return cryptoReplaceFfxFpeConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 4) {
-          return (com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig, com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.Builder, com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfigOrBuilder> 
-        getCryptoReplaceFfxFpeConfigFieldBuilder() {
-      if (cryptoReplaceFfxFpeConfigBuilder_ == null) {
-        if (!(transformationCase_ == 4)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.getDefaultInstance();
-        }
-        cryptoReplaceFfxFpeConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig, com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig.Builder, com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 4;
-      onChanged();;
-      return cryptoReplaceFfxFpeConfigBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig, com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.Builder, com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfigOrBuilder> fixedSizeBucketingConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-     */
-    public boolean hasFixedSizeBucketingConfig() {
-      return transformationCase_ == 5;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig getFixedSizeBucketingConfig() {
-      if (fixedSizeBucketingConfigBuilder_ == null) {
-        if (transformationCase_ == 5) {
-          return (com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 5) {
-          return fixedSizeBucketingConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-     */
-    public Builder setFixedSizeBucketingConfig(com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig value) {
-      if (fixedSizeBucketingConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        fixedSizeBucketingConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 5;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-     */
-    public Builder setFixedSizeBucketingConfig(
-        com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.Builder builderForValue) {
-      if (fixedSizeBucketingConfigBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        fixedSizeBucketingConfigBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 5;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-     */
-    public Builder mergeFixedSizeBucketingConfig(com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig value) {
-      if (fixedSizeBucketingConfigBuilder_ == null) {
-        if (transformationCase_ == 5 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.newBuilder((com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 5) {
-          fixedSizeBucketingConfigBuilder_.mergeFrom(value);
-        }
-        fixedSizeBucketingConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 5;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-     */
-    public Builder clearFixedSizeBucketingConfig() {
-      if (fixedSizeBucketingConfigBuilder_ == null) {
-        if (transformationCase_ == 5) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 5) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        fixedSizeBucketingConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.Builder getFixedSizeBucketingConfigBuilder() {
-      return getFixedSizeBucketingConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfigOrBuilder getFixedSizeBucketingConfigOrBuilder() {
-      if ((transformationCase_ == 5) && (fixedSizeBucketingConfigBuilder_ != null)) {
-        return fixedSizeBucketingConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 5) {
-          return (com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig, com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.Builder, com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfigOrBuilder> 
-        getFixedSizeBucketingConfigFieldBuilder() {
-      if (fixedSizeBucketingConfigBuilder_ == null) {
-        if (!(transformationCase_ == 5)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.getDefaultInstance();
-        }
-        fixedSizeBucketingConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig, com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig.Builder, com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 5;
-      onChanged();;
-      return fixedSizeBucketingConfigBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BucketingConfig, com.google.privacy.dlp.v2beta1.BucketingConfig.Builder, com.google.privacy.dlp.v2beta1.BucketingConfigOrBuilder> bucketingConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-     */
-    public boolean hasBucketingConfig() {
-      return transformationCase_ == 6;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.BucketingConfig getBucketingConfig() {
-      if (bucketingConfigBuilder_ == null) {
-        if (transformationCase_ == 6) {
-          return (com.google.privacy.dlp.v2beta1.BucketingConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.BucketingConfig.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 6) {
-          return bucketingConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.BucketingConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-     */
-    public Builder setBucketingConfig(com.google.privacy.dlp.v2beta1.BucketingConfig value) {
-      if (bucketingConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        bucketingConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 6;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-     */
-    public Builder setBucketingConfig(
-        com.google.privacy.dlp.v2beta1.BucketingConfig.Builder builderForValue) {
-      if (bucketingConfigBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        bucketingConfigBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 6;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-     */
-    public Builder mergeBucketingConfig(com.google.privacy.dlp.v2beta1.BucketingConfig value) {
-      if (bucketingConfigBuilder_ == null) {
-        if (transformationCase_ == 6 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.BucketingConfig.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.BucketingConfig.newBuilder((com.google.privacy.dlp.v2beta1.BucketingConfig) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 6) {
-          bucketingConfigBuilder_.mergeFrom(value);
-        }
-        bucketingConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 6;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-     */
-    public Builder clearBucketingConfig() {
-      if (bucketingConfigBuilder_ == null) {
-        if (transformationCase_ == 6) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 6) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        bucketingConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.BucketingConfig.Builder getBucketingConfigBuilder() {
-      return getBucketingConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.BucketingConfigOrBuilder getBucketingConfigOrBuilder() {
-      if ((transformationCase_ == 6) && (bucketingConfigBuilder_ != null)) {
-        return bucketingConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 6) {
-          return (com.google.privacy.dlp.v2beta1.BucketingConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.BucketingConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BucketingConfig, com.google.privacy.dlp.v2beta1.BucketingConfig.Builder, com.google.privacy.dlp.v2beta1.BucketingConfigOrBuilder> 
-        getBucketingConfigFieldBuilder() {
-      if (bucketingConfigBuilder_ == null) {
-        if (!(transformationCase_ == 6)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.BucketingConfig.getDefaultInstance();
-        }
-        bucketingConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.BucketingConfig, com.google.privacy.dlp.v2beta1.BucketingConfig.Builder, com.google.privacy.dlp.v2beta1.BucketingConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.BucketingConfig) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 6;
-      onChanged();;
-      return bucketingConfigBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig, com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.Builder, com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfigOrBuilder> replaceWithInfoTypeConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-     */
-    public boolean hasReplaceWithInfoTypeConfig() {
-      return transformationCase_ == 7;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-     */
-    public com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig getReplaceWithInfoTypeConfig() {
-      if (replaceWithInfoTypeConfigBuilder_ == null) {
-        if (transformationCase_ == 7) {
-          return (com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 7) {
-          return replaceWithInfoTypeConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-     */
-    public Builder setReplaceWithInfoTypeConfig(com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig value) {
-      if (replaceWithInfoTypeConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        replaceWithInfoTypeConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 7;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-     */
-    public Builder setReplaceWithInfoTypeConfig(
-        com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.Builder builderForValue) {
-      if (replaceWithInfoTypeConfigBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        replaceWithInfoTypeConfigBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 7;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-     */
-    public Builder mergeReplaceWithInfoTypeConfig(com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig value) {
-      if (replaceWithInfoTypeConfigBuilder_ == null) {
-        if (transformationCase_ == 7 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.newBuilder((com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 7) {
-          replaceWithInfoTypeConfigBuilder_.mergeFrom(value);
-        }
-        replaceWithInfoTypeConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 7;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-     */
-    public Builder clearReplaceWithInfoTypeConfig() {
-      if (replaceWithInfoTypeConfigBuilder_ == null) {
-        if (transformationCase_ == 7) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 7) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        replaceWithInfoTypeConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-     */
-    public com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.Builder getReplaceWithInfoTypeConfigBuilder() {
-      return getReplaceWithInfoTypeConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-     */
-    public com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfigOrBuilder getReplaceWithInfoTypeConfigOrBuilder() {
-      if ((transformationCase_ == 7) && (replaceWithInfoTypeConfigBuilder_ != null)) {
-        return replaceWithInfoTypeConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 7) {
-          return (com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig, com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.Builder, com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfigOrBuilder> 
-        getReplaceWithInfoTypeConfigFieldBuilder() {
-      if (replaceWithInfoTypeConfigBuilder_ == null) {
-        if (!(transformationCase_ == 7)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.getDefaultInstance();
-        }
-        replaceWithInfoTypeConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig, com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.Builder, com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 7;
-      onChanged();;
-      return replaceWithInfoTypeConfigBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.TimePartConfig, com.google.privacy.dlp.v2beta1.TimePartConfig.Builder, com.google.privacy.dlp.v2beta1.TimePartConfigOrBuilder> timePartConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-     */
-    public boolean hasTimePartConfig() {
-      return transformationCase_ == 8;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-     */
-    public com.google.privacy.dlp.v2beta1.TimePartConfig getTimePartConfig() {
-      if (timePartConfigBuilder_ == null) {
-        if (transformationCase_ == 8) {
-          return (com.google.privacy.dlp.v2beta1.TimePartConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.TimePartConfig.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 8) {
-          return timePartConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.TimePartConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-     */
-    public Builder setTimePartConfig(com.google.privacy.dlp.v2beta1.TimePartConfig value) {
-      if (timePartConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        timePartConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 8;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-     */
-    public Builder setTimePartConfig(
-        com.google.privacy.dlp.v2beta1.TimePartConfig.Builder builderForValue) {
-      if (timePartConfigBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        timePartConfigBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 8;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-     */
-    public Builder mergeTimePartConfig(com.google.privacy.dlp.v2beta1.TimePartConfig value) {
-      if (timePartConfigBuilder_ == null) {
-        if (transformationCase_ == 8 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.TimePartConfig.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.TimePartConfig.newBuilder((com.google.privacy.dlp.v2beta1.TimePartConfig) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 8) {
-          timePartConfigBuilder_.mergeFrom(value);
-        }
-        timePartConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 8;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-     */
-    public Builder clearTimePartConfig() {
-      if (timePartConfigBuilder_ == null) {
-        if (transformationCase_ == 8) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 8) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        timePartConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-     */
-    public com.google.privacy.dlp.v2beta1.TimePartConfig.Builder getTimePartConfigBuilder() {
-      return getTimePartConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-     */
-    public com.google.privacy.dlp.v2beta1.TimePartConfigOrBuilder getTimePartConfigOrBuilder() {
-      if ((transformationCase_ == 8) && (timePartConfigBuilder_ != null)) {
-        return timePartConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 8) {
-          return (com.google.privacy.dlp.v2beta1.TimePartConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.TimePartConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.TimePartConfig, com.google.privacy.dlp.v2beta1.TimePartConfig.Builder, com.google.privacy.dlp.v2beta1.TimePartConfigOrBuilder> 
-        getTimePartConfigFieldBuilder() {
-      if (timePartConfigBuilder_ == null) {
-        if (!(transformationCase_ == 8)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.TimePartConfig.getDefaultInstance();
-        }
-        timePartConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.TimePartConfig, com.google.privacy.dlp.v2beta1.TimePartConfig.Builder, com.google.privacy.dlp.v2beta1.TimePartConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.TimePartConfig) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 8;
-      onChanged();;
-      return timePartConfigBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CryptoHashConfig, com.google.privacy.dlp.v2beta1.CryptoHashConfig.Builder, com.google.privacy.dlp.v2beta1.CryptoHashConfigOrBuilder> cryptoHashConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-     */
-    public boolean hasCryptoHashConfig() {
-      return transformationCase_ == 9;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoHashConfig getCryptoHashConfig() {
-      if (cryptoHashConfigBuilder_ == null) {
-        if (transformationCase_ == 9) {
-          return (com.google.privacy.dlp.v2beta1.CryptoHashConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.CryptoHashConfig.getDefaultInstance();
-      } else {
-        if (transformationCase_ == 9) {
-          return cryptoHashConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.CryptoHashConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-     */
-    public Builder setCryptoHashConfig(com.google.privacy.dlp.v2beta1.CryptoHashConfig value) {
-      if (cryptoHashConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        cryptoHashConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 9;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-     */
-    public Builder setCryptoHashConfig(
-        com.google.privacy.dlp.v2beta1.CryptoHashConfig.Builder builderForValue) {
-      if (cryptoHashConfigBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        cryptoHashConfigBuilder_.setMessage(builderForValue.build());
-      }
-      transformationCase_ = 9;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-     */
-    public Builder mergeCryptoHashConfig(com.google.privacy.dlp.v2beta1.CryptoHashConfig value) {
-      if (cryptoHashConfigBuilder_ == null) {
-        if (transformationCase_ == 9 &&
-            transformation_ != com.google.privacy.dlp.v2beta1.CryptoHashConfig.getDefaultInstance()) {
-          transformation_ = com.google.privacy.dlp.v2beta1.CryptoHashConfig.newBuilder((com.google.privacy.dlp.v2beta1.CryptoHashConfig) transformation_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        if (transformationCase_ == 9) {
-          cryptoHashConfigBuilder_.mergeFrom(value);
-        }
-        cryptoHashConfigBuilder_.setMessage(value);
-      }
-      transformationCase_ = 9;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-     */
-    public Builder clearCryptoHashConfig() {
-      if (cryptoHashConfigBuilder_ == null) {
-        if (transformationCase_ == 9) {
-          transformationCase_ = 0;
-          transformation_ = null;
-          onChanged();
-        }
-      } else {
-        if (transformationCase_ == 9) {
-          transformationCase_ = 0;
-          transformation_ = null;
-        }
-        cryptoHashConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoHashConfig.Builder getCryptoHashConfigBuilder() {
-      return getCryptoHashConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-     */
-    public com.google.privacy.dlp.v2beta1.CryptoHashConfigOrBuilder getCryptoHashConfigOrBuilder() {
-      if ((transformationCase_ == 9) && (cryptoHashConfigBuilder_ != null)) {
-        return cryptoHashConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (transformationCase_ == 9) {
-          return (com.google.privacy.dlp.v2beta1.CryptoHashConfig) transformation_;
-        }
-        return com.google.privacy.dlp.v2beta1.CryptoHashConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CryptoHashConfig, com.google.privacy.dlp.v2beta1.CryptoHashConfig.Builder, com.google.privacy.dlp.v2beta1.CryptoHashConfigOrBuilder> 
-        getCryptoHashConfigFieldBuilder() {
-      if (cryptoHashConfigBuilder_ == null) {
-        if (!(transformationCase_ == 9)) {
-          transformation_ = com.google.privacy.dlp.v2beta1.CryptoHashConfig.getDefaultInstance();
-        }
-        cryptoHashConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CryptoHashConfig, com.google.privacy.dlp.v2beta1.CryptoHashConfig.Builder, com.google.privacy.dlp.v2beta1.CryptoHashConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.CryptoHashConfig) transformation_,
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      transformationCase_ = 9;
-      onChanged();;
-      return cryptoHashConfigBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.PrimitiveTransformation)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.PrimitiveTransformation)
-  private static final com.google.privacy.dlp.v2beta1.PrimitiveTransformation DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.PrimitiveTransformation();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.PrimitiveTransformation getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public PrimitiveTransformation parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PrimitiveTransformation(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.PrimitiveTransformation getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrimitiveTransformationOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrimitiveTransformationOrBuilder.java
deleted file mode 100644
index 9c114c8658cf..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrimitiveTransformationOrBuilder.java
+++ /dev/null
@@ -1,128 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface PrimitiveTransformationOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.PrimitiveTransformation)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-   */
-  boolean hasReplaceConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-   */
-  com.google.privacy.dlp.v2beta1.ReplaceValueConfig getReplaceConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.ReplaceValueConfig replace_config = 1;
-   */
-  com.google.privacy.dlp.v2beta1.ReplaceValueConfigOrBuilder getReplaceConfigOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-   */
-  boolean hasRedactConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-   */
-  com.google.privacy.dlp.v2beta1.RedactConfig getRedactConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.RedactConfig redact_config = 2;
-   */
-  com.google.privacy.dlp.v2beta1.RedactConfigOrBuilder getRedactConfigOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-   */
-  boolean hasCharacterMaskConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-   */
-  com.google.privacy.dlp.v2beta1.CharacterMaskConfig getCharacterMaskConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.CharacterMaskConfig character_mask_config = 3;
-   */
-  com.google.privacy.dlp.v2beta1.CharacterMaskConfigOrBuilder getCharacterMaskConfigOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-   */
-  boolean hasCryptoReplaceFfxFpeConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-   */
-  com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig getCryptoReplaceFfxFpeConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-   */
-  com.google.privacy.dlp.v2beta1.CryptoReplaceFfxFpeConfigOrBuilder getCryptoReplaceFfxFpeConfigOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-   */
-  boolean hasFixedSizeBucketingConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-   */
-  com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfig getFixedSizeBucketingConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-   */
-  com.google.privacy.dlp.v2beta1.FixedSizeBucketingConfigOrBuilder getFixedSizeBucketingConfigOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-   */
-  boolean hasBucketingConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-   */
-  com.google.privacy.dlp.v2beta1.BucketingConfig getBucketingConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.BucketingConfig bucketing_config = 6;
-   */
-  com.google.privacy.dlp.v2beta1.BucketingConfigOrBuilder getBucketingConfigOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-   */
-  boolean hasReplaceWithInfoTypeConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-   */
-  com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig getReplaceWithInfoTypeConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-   */
-  com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfigOrBuilder getReplaceWithInfoTypeConfigOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-   */
-  boolean hasTimePartConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-   */
-  com.google.privacy.dlp.v2beta1.TimePartConfig getTimePartConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.TimePartConfig time_part_config = 8;
-   */
-  com.google.privacy.dlp.v2beta1.TimePartConfigOrBuilder getTimePartConfigOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-   */
-  boolean hasCryptoHashConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-   */
-  com.google.privacy.dlp.v2beta1.CryptoHashConfig getCryptoHashConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.CryptoHashConfig crypto_hash_config = 9;
-   */
-  com.google.privacy.dlp.v2beta1.CryptoHashConfigOrBuilder getCryptoHashConfigOrBuilder();
-
-  public com.google.privacy.dlp.v2beta1.PrimitiveTransformation.TransformationCase getTransformationCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrivacyMetric.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrivacyMetric.java
deleted file mode 100644
index bed00a8b7010..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrivacyMetric.java
+++ /dev/null
@@ -1,5096 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Privacy metric to compute for reidentification risk analysis.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.PrivacyMetric}
- */
-public  final class PrivacyMetric extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.PrivacyMetric)
-    PrivacyMetricOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use PrivacyMetric.newBuilder() to construct.
-  private PrivacyMetric(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private PrivacyMetric() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private PrivacyMetric(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.Builder subBuilder = null;
-            if (typeCase_ == 1) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 1;
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.Builder subBuilder = null;
-            if (typeCase_ == 2) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 2;
-            break;
-          }
-          case 26: {
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.Builder subBuilder = null;
-            if (typeCase_ == 3) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 3;
-            break;
-          }
-          case 34: {
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.Builder subBuilder = null;
-            if (typeCase_ == 4) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 4;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.class, com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder.class);
-  }
-
-  public interface NumericalStatsConfigOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Field to compute numerical stats on. Supported types are
-     * integer, float, date, datetime, timestamp, time.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    boolean hasField();
-    /**
-     * 
-     * Field to compute numerical stats on. Supported types are
-     * integer, float, date, datetime, timestamp, time.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    com.google.privacy.dlp.v2beta1.FieldId getField();
-    /**
-     * 
-     * Field to compute numerical stats on. Supported types are
-     * integer, float, date, datetime, timestamp, time.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder();
-  }
-  /**
-   * 
-   * Compute numerical stats over an individual column, including
-   * min, max, and quantiles.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig}
-   */
-  public  static final class NumericalStatsConfig extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig)
-      NumericalStatsConfigOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use NumericalStatsConfig.newBuilder() to construct.
-    private NumericalStatsConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private NumericalStatsConfig() {
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private NumericalStatsConfig(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              com.google.privacy.dlp.v2beta1.FieldId.Builder subBuilder = null;
-              if (field_ != null) {
-                subBuilder = field_.toBuilder();
-              }
-              field_ = input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(field_);
-                field_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_NumericalStatsConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_NumericalStatsConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.class, com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.Builder.class);
-    }
-
-    public static final int FIELD_FIELD_NUMBER = 1;
-    private com.google.privacy.dlp.v2beta1.FieldId field_;
-    /**
-     * 
-     * Field to compute numerical stats on. Supported types are
-     * integer, float, date, datetime, timestamp, time.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public boolean hasField() {
-      return field_ != null;
-    }
-    /**
-     * 
-     * Field to compute numerical stats on. Supported types are
-     * integer, float, date, datetime, timestamp, time.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getField() {
-      return field_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-    }
-    /**
-     * 
-     * Field to compute numerical stats on. Supported types are
-     * integer, float, date, datetime, timestamp, time.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder() {
-      return getField();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (field_ != null) {
-        output.writeMessage(1, getField());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (field_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getField());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig other = (com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) obj;
-
-      boolean result = true;
-      result = result && (hasField() == other.hasField());
-      if (hasField()) {
-        result = result && getField()
-            .equals(other.getField());
-      }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasField()) {
-        hash = (37 * hash) + FIELD_FIELD_NUMBER;
-        hash = (53 * hash) + getField().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Compute numerical stats over an individual column, including
-     * min, max, and quantiles.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig)
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfigOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_NumericalStatsConfig_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_NumericalStatsConfig_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.class, com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (fieldBuilder_ == null) {
-          field_ = null;
-        } else {
-          field_ = null;
-          fieldBuilder_ = null;
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_NumericalStatsConfig_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig build() {
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig buildPartial() {
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig result = new com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig(this);
-        if (fieldBuilder_ == null) {
-          result.field_ = field_;
-        } else {
-          result.field_ = fieldBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig other) {
-        if (other == com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.getDefaultInstance()) return this;
-        if (other.hasField()) {
-          mergeField(other.getField());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private com.google.privacy.dlp.v2beta1.FieldId field_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> fieldBuilder_;
-      /**
-       * 
-       * Field to compute numerical stats on. Supported types are
-       * integer, float, date, datetime, timestamp, time.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public boolean hasField() {
-        return fieldBuilder_ != null || field_ != null;
-      }
-      /**
-       * 
-       * Field to compute numerical stats on. Supported types are
-       * integer, float, date, datetime, timestamp, time.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId getField() {
-        if (fieldBuilder_ == null) {
-          return field_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-        } else {
-          return fieldBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Field to compute numerical stats on. Supported types are
-       * integer, float, date, datetime, timestamp, time.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public Builder setField(com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (fieldBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          field_ = value;
-          onChanged();
-        } else {
-          fieldBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Field to compute numerical stats on. Supported types are
-       * integer, float, date, datetime, timestamp, time.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public Builder setField(
-          com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-        if (fieldBuilder_ == null) {
-          field_ = builderForValue.build();
-          onChanged();
-        } else {
-          fieldBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Field to compute numerical stats on. Supported types are
-       * integer, float, date, datetime, timestamp, time.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public Builder mergeField(com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (fieldBuilder_ == null) {
-          if (field_ != null) {
-            field_ =
-              com.google.privacy.dlp.v2beta1.FieldId.newBuilder(field_).mergeFrom(value).buildPartial();
-          } else {
-            field_ = value;
-          }
-          onChanged();
-        } else {
-          fieldBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Field to compute numerical stats on. Supported types are
-       * integer, float, date, datetime, timestamp, time.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public Builder clearField() {
-        if (fieldBuilder_ == null) {
-          field_ = null;
-          onChanged();
-        } else {
-          field_ = null;
-          fieldBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Field to compute numerical stats on. Supported types are
-       * integer, float, date, datetime, timestamp, time.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId.Builder getFieldBuilder() {
-        
-        onChanged();
-        return getFieldFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Field to compute numerical stats on. Supported types are
-       * integer, float, date, datetime, timestamp, time.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder() {
-        if (fieldBuilder_ != null) {
-          return fieldBuilder_.getMessageOrBuilder();
-        } else {
-          return field_ == null ?
-              com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-        }
-      }
-      /**
-       * 
-       * Field to compute numerical stats on. Supported types are
-       * integer, float, date, datetime, timestamp, time.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-          getFieldFieldBuilder() {
-        if (fieldBuilder_ == null) {
-          fieldBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                  getField(),
-                  getParentForChildren(),
-                  isClean());
-          field_ = null;
-        }
-        return fieldBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig)
-    private static final com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public NumericalStatsConfig parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new NumericalStatsConfig(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface CategoricalStatsConfigOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Field to compute categorical stats on. All column types are
-     * supported except for arrays and structs. However, it may be more
-     * informative to use NumericalStats when the field type is supported,
-     * depending on the data.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    boolean hasField();
-    /**
-     * 
-     * Field to compute categorical stats on. All column types are
-     * supported except for arrays and structs. However, it may be more
-     * informative to use NumericalStats when the field type is supported,
-     * depending on the data.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    com.google.privacy.dlp.v2beta1.FieldId getField();
-    /**
-     * 
-     * Field to compute categorical stats on. All column types are
-     * supported except for arrays and structs. However, it may be more
-     * informative to use NumericalStats when the field type is supported,
-     * depending on the data.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder();
-  }
-  /**
-   * 
-   * Compute numerical stats over an individual column, including
-   * number of distinct values and value count distribution.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig}
-   */
-  public  static final class CategoricalStatsConfig extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig)
-      CategoricalStatsConfigOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use CategoricalStatsConfig.newBuilder() to construct.
-    private CategoricalStatsConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private CategoricalStatsConfig() {
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private CategoricalStatsConfig(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              com.google.privacy.dlp.v2beta1.FieldId.Builder subBuilder = null;
-              if (field_ != null) {
-                subBuilder = field_.toBuilder();
-              }
-              field_ = input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(field_);
-                field_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_CategoricalStatsConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_CategoricalStatsConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.class, com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.Builder.class);
-    }
-
-    public static final int FIELD_FIELD_NUMBER = 1;
-    private com.google.privacy.dlp.v2beta1.FieldId field_;
-    /**
-     * 
-     * Field to compute categorical stats on. All column types are
-     * supported except for arrays and structs. However, it may be more
-     * informative to use NumericalStats when the field type is supported,
-     * depending on the data.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public boolean hasField() {
-      return field_ != null;
-    }
-    /**
-     * 
-     * Field to compute categorical stats on. All column types are
-     * supported except for arrays and structs. However, it may be more
-     * informative to use NumericalStats when the field type is supported,
-     * depending on the data.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getField() {
-      return field_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-    }
-    /**
-     * 
-     * Field to compute categorical stats on. All column types are
-     * supported except for arrays and structs. However, it may be more
-     * informative to use NumericalStats when the field type is supported,
-     * depending on the data.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder() {
-      return getField();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (field_ != null) {
-        output.writeMessage(1, getField());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (field_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getField());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig other = (com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) obj;
-
-      boolean result = true;
-      result = result && (hasField() == other.hasField());
-      if (hasField()) {
-        result = result && getField()
-            .equals(other.getField());
-      }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasField()) {
-        hash = (37 * hash) + FIELD_FIELD_NUMBER;
-        hash = (53 * hash) + getField().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Compute numerical stats over an individual column, including
-     * number of distinct values and value count distribution.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig)
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfigOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_CategoricalStatsConfig_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_CategoricalStatsConfig_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.class, com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (fieldBuilder_ == null) {
-          field_ = null;
-        } else {
-          field_ = null;
-          fieldBuilder_ = null;
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_CategoricalStatsConfig_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig build() {
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig buildPartial() {
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig result = new com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig(this);
-        if (fieldBuilder_ == null) {
-          result.field_ = field_;
-        } else {
-          result.field_ = fieldBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig other) {
-        if (other == com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.getDefaultInstance()) return this;
-        if (other.hasField()) {
-          mergeField(other.getField());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private com.google.privacy.dlp.v2beta1.FieldId field_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> fieldBuilder_;
-      /**
-       * 
-       * Field to compute categorical stats on. All column types are
-       * supported except for arrays and structs. However, it may be more
-       * informative to use NumericalStats when the field type is supported,
-       * depending on the data.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public boolean hasField() {
-        return fieldBuilder_ != null || field_ != null;
-      }
-      /**
-       * 
-       * Field to compute categorical stats on. All column types are
-       * supported except for arrays and structs. However, it may be more
-       * informative to use NumericalStats when the field type is supported,
-       * depending on the data.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId getField() {
-        if (fieldBuilder_ == null) {
-          return field_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-        } else {
-          return fieldBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Field to compute categorical stats on. All column types are
-       * supported except for arrays and structs. However, it may be more
-       * informative to use NumericalStats when the field type is supported,
-       * depending on the data.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public Builder setField(com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (fieldBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          field_ = value;
-          onChanged();
-        } else {
-          fieldBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Field to compute categorical stats on. All column types are
-       * supported except for arrays and structs. However, it may be more
-       * informative to use NumericalStats when the field type is supported,
-       * depending on the data.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public Builder setField(
-          com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-        if (fieldBuilder_ == null) {
-          field_ = builderForValue.build();
-          onChanged();
-        } else {
-          fieldBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Field to compute categorical stats on. All column types are
-       * supported except for arrays and structs. However, it may be more
-       * informative to use NumericalStats when the field type is supported,
-       * depending on the data.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public Builder mergeField(com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (fieldBuilder_ == null) {
-          if (field_ != null) {
-            field_ =
-              com.google.privacy.dlp.v2beta1.FieldId.newBuilder(field_).mergeFrom(value).buildPartial();
-          } else {
-            field_ = value;
-          }
-          onChanged();
-        } else {
-          fieldBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Field to compute categorical stats on. All column types are
-       * supported except for arrays and structs. However, it may be more
-       * informative to use NumericalStats when the field type is supported,
-       * depending on the data.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public Builder clearField() {
-        if (fieldBuilder_ == null) {
-          field_ = null;
-          onChanged();
-        } else {
-          field_ = null;
-          fieldBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Field to compute categorical stats on. All column types are
-       * supported except for arrays and structs. However, it may be more
-       * informative to use NumericalStats when the field type is supported,
-       * depending on the data.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId.Builder getFieldBuilder() {
-        
-        onChanged();
-        return getFieldFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Field to compute categorical stats on. All column types are
-       * supported except for arrays and structs. However, it may be more
-       * informative to use NumericalStats when the field type is supported,
-       * depending on the data.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder() {
-        if (fieldBuilder_ != null) {
-          return fieldBuilder_.getMessageOrBuilder();
-        } else {
-          return field_ == null ?
-              com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-        }
-      }
-      /**
-       * 
-       * Field to compute categorical stats on. All column types are
-       * supported except for arrays and structs. However, it may be more
-       * informative to use NumericalStats when the field type is supported,
-       * depending on the data.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-          getFieldFieldBuilder() {
-        if (fieldBuilder_ == null) {
-          fieldBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                  getField(),
-                  getParentForChildren(),
-                  isClean());
-          field_ = null;
-        }
-        return fieldBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig)
-    private static final com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public CategoricalStatsConfig parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CategoricalStatsConfig(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface KAnonymityConfigOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Set of fields to compute k-anonymity over. When multiple fields are
-     * specified, they are considered a single composite key. Structs and
-     * repeated data types are not supported; however, nested fields are
-     * supported so long as they are not structs themselves or nested within
-     * a repeated field.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    java.util.List 
-        getQuasiIdsList();
-    /**
-     * 
-     * Set of fields to compute k-anonymity over. When multiple fields are
-     * specified, they are considered a single composite key. Structs and
-     * repeated data types are not supported; however, nested fields are
-     * supported so long as they are not structs themselves or nested within
-     * a repeated field.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    com.google.privacy.dlp.v2beta1.FieldId getQuasiIds(int index);
-    /**
-     * 
-     * Set of fields to compute k-anonymity over. When multiple fields are
-     * specified, they are considered a single composite key. Structs and
-     * repeated data types are not supported; however, nested fields are
-     * supported so long as they are not structs themselves or nested within
-     * a repeated field.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    int getQuasiIdsCount();
-    /**
-     * 
-     * Set of fields to compute k-anonymity over. When multiple fields are
-     * specified, they are considered a single composite key. Structs and
-     * repeated data types are not supported; however, nested fields are
-     * supported so long as they are not structs themselves or nested within
-     * a repeated field.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    java.util.List 
-        getQuasiIdsOrBuilderList();
-    /**
-     * 
-     * Set of fields to compute k-anonymity over. When multiple fields are
-     * specified, they are considered a single composite key. Structs and
-     * repeated data types are not supported; however, nested fields are
-     * supported so long as they are not structs themselves or nested within
-     * a repeated field.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getQuasiIdsOrBuilder(
-        int index);
-
-    /**
-     * 
-     * Optional message indicating that each distinct `EntityId` should not
-     * contribute to the k-anonymity count more than once per equivalence class.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-     */
-    boolean hasEntityId();
-    /**
-     * 
-     * Optional message indicating that each distinct `EntityId` should not
-     * contribute to the k-anonymity count more than once per equivalence class.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-     */
-    com.google.privacy.dlp.v2beta1.EntityId getEntityId();
-    /**
-     * 
-     * Optional message indicating that each distinct `EntityId` should not
-     * contribute to the k-anonymity count more than once per equivalence class.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-     */
-    com.google.privacy.dlp.v2beta1.EntityIdOrBuilder getEntityIdOrBuilder();
-  }
-  /**
-   * 
-   * k-anonymity metric, used for analysis of reidentification risk.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig}
-   */
-  public  static final class KAnonymityConfig extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig)
-      KAnonymityConfigOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use KAnonymityConfig.newBuilder() to construct.
-    private KAnonymityConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private KAnonymityConfig() {
-      quasiIds_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private KAnonymityConfig(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                quasiIds_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              quasiIds_.add(
-                  input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry));
-              break;
-            }
-            case 18: {
-              com.google.privacy.dlp.v2beta1.EntityId.Builder subBuilder = null;
-              if (entityId_ != null) {
-                subBuilder = entityId_.toBuilder();
-              }
-              entityId_ = input.readMessage(com.google.privacy.dlp.v2beta1.EntityId.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(entityId_);
-                entityId_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-          quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_KAnonymityConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_KAnonymityConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.class, com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.Builder.class);
-    }
-
-    private int bitField0_;
-    public static final int QUASI_IDS_FIELD_NUMBER = 1;
-    private java.util.List quasiIds_;
-    /**
-     * 
-     * Set of fields to compute k-anonymity over. When multiple fields are
-     * specified, they are considered a single composite key. Structs and
-     * repeated data types are not supported; however, nested fields are
-     * supported so long as they are not structs themselves or nested within
-     * a repeated field.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    public java.util.List getQuasiIdsList() {
-      return quasiIds_;
-    }
-    /**
-     * 
-     * Set of fields to compute k-anonymity over. When multiple fields are
-     * specified, they are considered a single composite key. Structs and
-     * repeated data types are not supported; however, nested fields are
-     * supported so long as they are not structs themselves or nested within
-     * a repeated field.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    public java.util.List 
-        getQuasiIdsOrBuilderList() {
-      return quasiIds_;
-    }
-    /**
-     * 
-     * Set of fields to compute k-anonymity over. When multiple fields are
-     * specified, they are considered a single composite key. Structs and
-     * repeated data types are not supported; however, nested fields are
-     * supported so long as they are not structs themselves or nested within
-     * a repeated field.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    public int getQuasiIdsCount() {
-      return quasiIds_.size();
-    }
-    /**
-     * 
-     * Set of fields to compute k-anonymity over. When multiple fields are
-     * specified, they are considered a single composite key. Structs and
-     * repeated data types are not supported; however, nested fields are
-     * supported so long as they are not structs themselves or nested within
-     * a repeated field.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getQuasiIds(int index) {
-      return quasiIds_.get(index);
-    }
-    /**
-     * 
-     * Set of fields to compute k-anonymity over. When multiple fields are
-     * specified, they are considered a single composite key. Structs and
-     * repeated data types are not supported; however, nested fields are
-     * supported so long as they are not structs themselves or nested within
-     * a repeated field.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getQuasiIdsOrBuilder(
-        int index) {
-      return quasiIds_.get(index);
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 2;
-    private com.google.privacy.dlp.v2beta1.EntityId entityId_;
-    /**
-     * 
-     * Optional message indicating that each distinct `EntityId` should not
-     * contribute to the k-anonymity count more than once per equivalence class.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-     */
-    public boolean hasEntityId() {
-      return entityId_ != null;
-    }
-    /**
-     * 
-     * Optional message indicating that each distinct `EntityId` should not
-     * contribute to the k-anonymity count more than once per equivalence class.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.EntityId getEntityId() {
-      return entityId_ == null ? com.google.privacy.dlp.v2beta1.EntityId.getDefaultInstance() : entityId_;
-    }
-    /**
-     * 
-     * Optional message indicating that each distinct `EntityId` should not
-     * contribute to the k-anonymity count more than once per equivalence class.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.EntityIdOrBuilder getEntityIdOrBuilder() {
-      return getEntityId();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      for (int i = 0; i < quasiIds_.size(); i++) {
-        output.writeMessage(1, quasiIds_.get(i));
-      }
-      if (entityId_ != null) {
-        output.writeMessage(2, getEntityId());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < quasiIds_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, quasiIds_.get(i));
-      }
-      if (entityId_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getEntityId());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig other = (com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) obj;
-
-      boolean result = true;
-      result = result && getQuasiIdsList()
-          .equals(other.getQuasiIdsList());
-      result = result && (hasEntityId() == other.hasEntityId());
-      if (hasEntityId()) {
-        result = result && getEntityId()
-            .equals(other.getEntityId());
-      }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getQuasiIdsCount() > 0) {
-        hash = (37 * hash) + QUASI_IDS_FIELD_NUMBER;
-        hash = (53 * hash) + getQuasiIdsList().hashCode();
-      }
-      if (hasEntityId()) {
-        hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-        hash = (53 * hash) + getEntityId().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * k-anonymity metric, used for analysis of reidentification risk.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig)
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfigOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_KAnonymityConfig_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_KAnonymityConfig_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.class, com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getQuasiIdsFieldBuilder();
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (quasiIdsBuilder_ == null) {
-          quasiIds_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          quasiIdsBuilder_.clear();
-        }
-        if (entityIdBuilder_ == null) {
-          entityId_ = null;
-        } else {
-          entityId_ = null;
-          entityIdBuilder_ = null;
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_KAnonymityConfig_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig build() {
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig buildPartial() {
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig result = new com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (quasiIdsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001)) {
-            quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.quasiIds_ = quasiIds_;
-        } else {
-          result.quasiIds_ = quasiIdsBuilder_.build();
-        }
-        if (entityIdBuilder_ == null) {
-          result.entityId_ = entityId_;
-        } else {
-          result.entityId_ = entityIdBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig other) {
-        if (other == com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.getDefaultInstance()) return this;
-        if (quasiIdsBuilder_ == null) {
-          if (!other.quasiIds_.isEmpty()) {
-            if (quasiIds_.isEmpty()) {
-              quasiIds_ = other.quasiIds_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureQuasiIdsIsMutable();
-              quasiIds_.addAll(other.quasiIds_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.quasiIds_.isEmpty()) {
-            if (quasiIdsBuilder_.isEmpty()) {
-              quasiIdsBuilder_.dispose();
-              quasiIdsBuilder_ = null;
-              quasiIds_ = other.quasiIds_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              quasiIdsBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getQuasiIdsFieldBuilder() : null;
-            } else {
-              quasiIdsBuilder_.addAllMessages(other.quasiIds_);
-            }
-          }
-        }
-        if (other.hasEntityId()) {
-          mergeEntityId(other.getEntityId());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List quasiIds_ =
-        java.util.Collections.emptyList();
-      private void ensureQuasiIdsIsMutable() {
-        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          quasiIds_ = new java.util.ArrayList(quasiIds_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> quasiIdsBuilder_;
-
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public java.util.List getQuasiIdsList() {
-        if (quasiIdsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(quasiIds_);
-        } else {
-          return quasiIdsBuilder_.getMessageList();
-        }
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public int getQuasiIdsCount() {
-        if (quasiIdsBuilder_ == null) {
-          return quasiIds_.size();
-        } else {
-          return quasiIdsBuilder_.getCount();
-        }
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId getQuasiIds(int index) {
-        if (quasiIdsBuilder_ == null) {
-          return quasiIds_.get(index);
-        } else {
-          return quasiIdsBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder setQuasiIds(
-          int index, com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (quasiIdsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureQuasiIdsIsMutable();
-          quasiIds_.set(index, value);
-          onChanged();
-        } else {
-          quasiIdsBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder setQuasiIds(
-          int index, com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-        if (quasiIdsBuilder_ == null) {
-          ensureQuasiIdsIsMutable();
-          quasiIds_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          quasiIdsBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder addQuasiIds(com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (quasiIdsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureQuasiIdsIsMutable();
-          quasiIds_.add(value);
-          onChanged();
-        } else {
-          quasiIdsBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder addQuasiIds(
-          int index, com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (quasiIdsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureQuasiIdsIsMutable();
-          quasiIds_.add(index, value);
-          onChanged();
-        } else {
-          quasiIdsBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder addQuasiIds(
-          com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-        if (quasiIdsBuilder_ == null) {
-          ensureQuasiIdsIsMutable();
-          quasiIds_.add(builderForValue.build());
-          onChanged();
-        } else {
-          quasiIdsBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder addQuasiIds(
-          int index, com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-        if (quasiIdsBuilder_ == null) {
-          ensureQuasiIdsIsMutable();
-          quasiIds_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          quasiIdsBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder addAllQuasiIds(
-          java.lang.Iterable values) {
-        if (quasiIdsBuilder_ == null) {
-          ensureQuasiIdsIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, quasiIds_);
-          onChanged();
-        } else {
-          quasiIdsBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder clearQuasiIds() {
-        if (quasiIdsBuilder_ == null) {
-          quasiIds_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          quasiIdsBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder removeQuasiIds(int index) {
-        if (quasiIdsBuilder_ == null) {
-          ensureQuasiIdsIsMutable();
-          quasiIds_.remove(index);
-          onChanged();
-        } else {
-          quasiIdsBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId.Builder getQuasiIdsBuilder(
-          int index) {
-        return getQuasiIdsFieldBuilder().getBuilder(index);
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getQuasiIdsOrBuilder(
-          int index) {
-        if (quasiIdsBuilder_ == null) {
-          return quasiIds_.get(index);  } else {
-          return quasiIdsBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public java.util.List 
-           getQuasiIdsOrBuilderList() {
-        if (quasiIdsBuilder_ != null) {
-          return quasiIdsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(quasiIds_);
-        }
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId.Builder addQuasiIdsBuilder() {
-        return getQuasiIdsFieldBuilder().addBuilder(
-            com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance());
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId.Builder addQuasiIdsBuilder(
-          int index) {
-        return getQuasiIdsFieldBuilder().addBuilder(
-            index, com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance());
-      }
-      /**
-       * 
-       * Set of fields to compute k-anonymity over. When multiple fields are
-       * specified, they are considered a single composite key. Structs and
-       * repeated data types are not supported; however, nested fields are
-       * supported so long as they are not structs themselves or nested within
-       * a repeated field.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public java.util.List 
-           getQuasiIdsBuilderList() {
-        return getQuasiIdsFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-          getQuasiIdsFieldBuilder() {
-        if (quasiIdsBuilder_ == null) {
-          quasiIdsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                  quasiIds_,
-                  ((bitField0_ & 0x00000001) == 0x00000001),
-                  getParentForChildren(),
-                  isClean());
-          quasiIds_ = null;
-        }
-        return quasiIdsBuilder_;
-      }
-
-      private com.google.privacy.dlp.v2beta1.EntityId entityId_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.EntityId, com.google.privacy.dlp.v2beta1.EntityId.Builder, com.google.privacy.dlp.v2beta1.EntityIdOrBuilder> entityIdBuilder_;
-      /**
-       * 
-       * Optional message indicating that each distinct `EntityId` should not
-       * contribute to the k-anonymity count more than once per equivalence class.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-       */
-      public boolean hasEntityId() {
-        return entityIdBuilder_ != null || entityId_ != null;
-      }
-      /**
-       * 
-       * Optional message indicating that each distinct `EntityId` should not
-       * contribute to the k-anonymity count more than once per equivalence class.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.EntityId getEntityId() {
-        if (entityIdBuilder_ == null) {
-          return entityId_ == null ? com.google.privacy.dlp.v2beta1.EntityId.getDefaultInstance() : entityId_;
-        } else {
-          return entityIdBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Optional message indicating that each distinct `EntityId` should not
-       * contribute to the k-anonymity count more than once per equivalence class.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-       */
-      public Builder setEntityId(com.google.privacy.dlp.v2beta1.EntityId value) {
-        if (entityIdBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          entityId_ = value;
-          onChanged();
-        } else {
-          entityIdBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Optional message indicating that each distinct `EntityId` should not
-       * contribute to the k-anonymity count more than once per equivalence class.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-       */
-      public Builder setEntityId(
-          com.google.privacy.dlp.v2beta1.EntityId.Builder builderForValue) {
-        if (entityIdBuilder_ == null) {
-          entityId_ = builderForValue.build();
-          onChanged();
-        } else {
-          entityIdBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Optional message indicating that each distinct `EntityId` should not
-       * contribute to the k-anonymity count more than once per equivalence class.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-       */
-      public Builder mergeEntityId(com.google.privacy.dlp.v2beta1.EntityId value) {
-        if (entityIdBuilder_ == null) {
-          if (entityId_ != null) {
-            entityId_ =
-              com.google.privacy.dlp.v2beta1.EntityId.newBuilder(entityId_).mergeFrom(value).buildPartial();
-          } else {
-            entityId_ = value;
-          }
-          onChanged();
-        } else {
-          entityIdBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Optional message indicating that each distinct `EntityId` should not
-       * contribute to the k-anonymity count more than once per equivalence class.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-       */
-      public Builder clearEntityId() {
-        if (entityIdBuilder_ == null) {
-          entityId_ = null;
-          onChanged();
-        } else {
-          entityId_ = null;
-          entityIdBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Optional message indicating that each distinct `EntityId` should not
-       * contribute to the k-anonymity count more than once per equivalence class.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.EntityId.Builder getEntityIdBuilder() {
-        
-        onChanged();
-        return getEntityIdFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Optional message indicating that each distinct `EntityId` should not
-       * contribute to the k-anonymity count more than once per equivalence class.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.EntityIdOrBuilder getEntityIdOrBuilder() {
-        if (entityIdBuilder_ != null) {
-          return entityIdBuilder_.getMessageOrBuilder();
-        } else {
-          return entityId_ == null ?
-              com.google.privacy.dlp.v2beta1.EntityId.getDefaultInstance() : entityId_;
-        }
-      }
-      /**
-       * 
-       * Optional message indicating that each distinct `EntityId` should not
-       * contribute to the k-anonymity count more than once per equivalence class.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.EntityId entity_id = 2;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.EntityId, com.google.privacy.dlp.v2beta1.EntityId.Builder, com.google.privacy.dlp.v2beta1.EntityIdOrBuilder> 
-          getEntityIdFieldBuilder() {
-        if (entityIdBuilder_ == null) {
-          entityIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.EntityId, com.google.privacy.dlp.v2beta1.EntityId.Builder, com.google.privacy.dlp.v2beta1.EntityIdOrBuilder>(
-                  getEntityId(),
-                  getParentForChildren(),
-                  isClean());
-          entityId_ = null;
-        }
-        return entityIdBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig)
-    private static final com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public KAnonymityConfig parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new KAnonymityConfig(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface LDiversityConfigOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Set of quasi-identifiers indicating how equivalence classes are
-     * defined for the l-diversity computation. When multiple fields are
-     * specified, they are considered a single composite key.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    java.util.List 
-        getQuasiIdsList();
-    /**
-     * 
-     * Set of quasi-identifiers indicating how equivalence classes are
-     * defined for the l-diversity computation. When multiple fields are
-     * specified, they are considered a single composite key.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    com.google.privacy.dlp.v2beta1.FieldId getQuasiIds(int index);
-    /**
-     * 
-     * Set of quasi-identifiers indicating how equivalence classes are
-     * defined for the l-diversity computation. When multiple fields are
-     * specified, they are considered a single composite key.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    int getQuasiIdsCount();
-    /**
-     * 
-     * Set of quasi-identifiers indicating how equivalence classes are
-     * defined for the l-diversity computation. When multiple fields are
-     * specified, they are considered a single composite key.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    java.util.List 
-        getQuasiIdsOrBuilderList();
-    /**
-     * 
-     * Set of quasi-identifiers indicating how equivalence classes are
-     * defined for the l-diversity computation. When multiple fields are
-     * specified, they are considered a single composite key.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getQuasiIdsOrBuilder(
-        int index);
-
-    /**
-     * 
-     * Sensitive field for computing the l-value.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-     */
-    boolean hasSensitiveAttribute();
-    /**
-     * 
-     * Sensitive field for computing the l-value.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-     */
-    com.google.privacy.dlp.v2beta1.FieldId getSensitiveAttribute();
-    /**
-     * 
-     * Sensitive field for computing the l-value.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-     */
-    com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getSensitiveAttributeOrBuilder();
-  }
-  /**
-   * 
-   * l-diversity metric, used for analysis of reidentification risk.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig}
-   */
-  public  static final class LDiversityConfig extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig)
-      LDiversityConfigOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use LDiversityConfig.newBuilder() to construct.
-    private LDiversityConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private LDiversityConfig() {
-      quasiIds_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private LDiversityConfig(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                quasiIds_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              quasiIds_.add(
-                  input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry));
-              break;
-            }
-            case 18: {
-              com.google.privacy.dlp.v2beta1.FieldId.Builder subBuilder = null;
-              if (sensitiveAttribute_ != null) {
-                subBuilder = sensitiveAttribute_.toBuilder();
-              }
-              sensitiveAttribute_ = input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(sensitiveAttribute_);
-                sensitiveAttribute_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-          quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_LDiversityConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_LDiversityConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.class, com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.Builder.class);
-    }
-
-    private int bitField0_;
-    public static final int QUASI_IDS_FIELD_NUMBER = 1;
-    private java.util.List quasiIds_;
-    /**
-     * 
-     * Set of quasi-identifiers indicating how equivalence classes are
-     * defined for the l-diversity computation. When multiple fields are
-     * specified, they are considered a single composite key.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    public java.util.List getQuasiIdsList() {
-      return quasiIds_;
-    }
-    /**
-     * 
-     * Set of quasi-identifiers indicating how equivalence classes are
-     * defined for the l-diversity computation. When multiple fields are
-     * specified, they are considered a single composite key.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    public java.util.List 
-        getQuasiIdsOrBuilderList() {
-      return quasiIds_;
-    }
-    /**
-     * 
-     * Set of quasi-identifiers indicating how equivalence classes are
-     * defined for the l-diversity computation. When multiple fields are
-     * specified, they are considered a single composite key.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    public int getQuasiIdsCount() {
-      return quasiIds_.size();
-    }
-    /**
-     * 
-     * Set of quasi-identifiers indicating how equivalence classes are
-     * defined for the l-diversity computation. When multiple fields are
-     * specified, they are considered a single composite key.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getQuasiIds(int index) {
-      return quasiIds_.get(index);
-    }
-    /**
-     * 
-     * Set of quasi-identifiers indicating how equivalence classes are
-     * defined for the l-diversity computation. When multiple fields are
-     * specified, they are considered a single composite key.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getQuasiIdsOrBuilder(
-        int index) {
-      return quasiIds_.get(index);
-    }
-
-    public static final int SENSITIVE_ATTRIBUTE_FIELD_NUMBER = 2;
-    private com.google.privacy.dlp.v2beta1.FieldId sensitiveAttribute_;
-    /**
-     * 
-     * Sensitive field for computing the l-value.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-     */
-    public boolean hasSensitiveAttribute() {
-      return sensitiveAttribute_ != null;
-    }
-    /**
-     * 
-     * Sensitive field for computing the l-value.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getSensitiveAttribute() {
-      return sensitiveAttribute_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : sensitiveAttribute_;
-    }
-    /**
-     * 
-     * Sensitive field for computing the l-value.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getSensitiveAttributeOrBuilder() {
-      return getSensitiveAttribute();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      for (int i = 0; i < quasiIds_.size(); i++) {
-        output.writeMessage(1, quasiIds_.get(i));
-      }
-      if (sensitiveAttribute_ != null) {
-        output.writeMessage(2, getSensitiveAttribute());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < quasiIds_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, quasiIds_.get(i));
-      }
-      if (sensitiveAttribute_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getSensitiveAttribute());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig other = (com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) obj;
-
-      boolean result = true;
-      result = result && getQuasiIdsList()
-          .equals(other.getQuasiIdsList());
-      result = result && (hasSensitiveAttribute() == other.hasSensitiveAttribute());
-      if (hasSensitiveAttribute()) {
-        result = result && getSensitiveAttribute()
-            .equals(other.getSensitiveAttribute());
-      }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getQuasiIdsCount() > 0) {
-        hash = (37 * hash) + QUASI_IDS_FIELD_NUMBER;
-        hash = (53 * hash) + getQuasiIdsList().hashCode();
-      }
-      if (hasSensitiveAttribute()) {
-        hash = (37 * hash) + SENSITIVE_ATTRIBUTE_FIELD_NUMBER;
-        hash = (53 * hash) + getSensitiveAttribute().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * l-diversity metric, used for analysis of reidentification risk.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig)
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfigOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_LDiversityConfig_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_LDiversityConfig_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.class, com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getQuasiIdsFieldBuilder();
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (quasiIdsBuilder_ == null) {
-          quasiIds_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          quasiIdsBuilder_.clear();
-        }
-        if (sensitiveAttributeBuilder_ == null) {
-          sensitiveAttribute_ = null;
-        } else {
-          sensitiveAttribute_ = null;
-          sensitiveAttributeBuilder_ = null;
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_LDiversityConfig_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig build() {
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig buildPartial() {
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig result = new com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (quasiIdsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001)) {
-            quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.quasiIds_ = quasiIds_;
-        } else {
-          result.quasiIds_ = quasiIdsBuilder_.build();
-        }
-        if (sensitiveAttributeBuilder_ == null) {
-          result.sensitiveAttribute_ = sensitiveAttribute_;
-        } else {
-          result.sensitiveAttribute_ = sensitiveAttributeBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig other) {
-        if (other == com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.getDefaultInstance()) return this;
-        if (quasiIdsBuilder_ == null) {
-          if (!other.quasiIds_.isEmpty()) {
-            if (quasiIds_.isEmpty()) {
-              quasiIds_ = other.quasiIds_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureQuasiIdsIsMutable();
-              quasiIds_.addAll(other.quasiIds_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.quasiIds_.isEmpty()) {
-            if (quasiIdsBuilder_.isEmpty()) {
-              quasiIdsBuilder_.dispose();
-              quasiIdsBuilder_ = null;
-              quasiIds_ = other.quasiIds_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              quasiIdsBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getQuasiIdsFieldBuilder() : null;
-            } else {
-              quasiIdsBuilder_.addAllMessages(other.quasiIds_);
-            }
-          }
-        }
-        if (other.hasSensitiveAttribute()) {
-          mergeSensitiveAttribute(other.getSensitiveAttribute());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List quasiIds_ =
-        java.util.Collections.emptyList();
-      private void ensureQuasiIdsIsMutable() {
-        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          quasiIds_ = new java.util.ArrayList(quasiIds_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> quasiIdsBuilder_;
-
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public java.util.List getQuasiIdsList() {
-        if (quasiIdsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(quasiIds_);
-        } else {
-          return quasiIdsBuilder_.getMessageList();
-        }
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public int getQuasiIdsCount() {
-        if (quasiIdsBuilder_ == null) {
-          return quasiIds_.size();
-        } else {
-          return quasiIdsBuilder_.getCount();
-        }
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId getQuasiIds(int index) {
-        if (quasiIdsBuilder_ == null) {
-          return quasiIds_.get(index);
-        } else {
-          return quasiIdsBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder setQuasiIds(
-          int index, com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (quasiIdsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureQuasiIdsIsMutable();
-          quasiIds_.set(index, value);
-          onChanged();
-        } else {
-          quasiIdsBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder setQuasiIds(
-          int index, com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-        if (quasiIdsBuilder_ == null) {
-          ensureQuasiIdsIsMutable();
-          quasiIds_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          quasiIdsBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder addQuasiIds(com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (quasiIdsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureQuasiIdsIsMutable();
-          quasiIds_.add(value);
-          onChanged();
-        } else {
-          quasiIdsBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder addQuasiIds(
-          int index, com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (quasiIdsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureQuasiIdsIsMutable();
-          quasiIds_.add(index, value);
-          onChanged();
-        } else {
-          quasiIdsBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder addQuasiIds(
-          com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-        if (quasiIdsBuilder_ == null) {
-          ensureQuasiIdsIsMutable();
-          quasiIds_.add(builderForValue.build());
-          onChanged();
-        } else {
-          quasiIdsBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder addQuasiIds(
-          int index, com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-        if (quasiIdsBuilder_ == null) {
-          ensureQuasiIdsIsMutable();
-          quasiIds_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          quasiIdsBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder addAllQuasiIds(
-          java.lang.Iterable values) {
-        if (quasiIdsBuilder_ == null) {
-          ensureQuasiIdsIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, quasiIds_);
-          onChanged();
-        } else {
-          quasiIdsBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder clearQuasiIds() {
-        if (quasiIdsBuilder_ == null) {
-          quasiIds_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          quasiIdsBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public Builder removeQuasiIds(int index) {
-        if (quasiIdsBuilder_ == null) {
-          ensureQuasiIdsIsMutable();
-          quasiIds_.remove(index);
-          onChanged();
-        } else {
-          quasiIdsBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId.Builder getQuasiIdsBuilder(
-          int index) {
-        return getQuasiIdsFieldBuilder().getBuilder(index);
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getQuasiIdsOrBuilder(
-          int index) {
-        if (quasiIdsBuilder_ == null) {
-          return quasiIds_.get(index);  } else {
-          return quasiIdsBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public java.util.List 
-           getQuasiIdsOrBuilderList() {
-        if (quasiIdsBuilder_ != null) {
-          return quasiIdsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(quasiIds_);
-        }
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId.Builder addQuasiIdsBuilder() {
-        return getQuasiIdsFieldBuilder().addBuilder(
-            com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance());
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId.Builder addQuasiIdsBuilder(
-          int index) {
-        return getQuasiIdsFieldBuilder().addBuilder(
-            index, com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance());
-      }
-      /**
-       * 
-       * Set of quasi-identifiers indicating how equivalence classes are
-       * defined for the l-diversity computation. When multiple fields are
-       * specified, they are considered a single composite key.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.FieldId quasi_ids = 1;
-       */
-      public java.util.List 
-           getQuasiIdsBuilderList() {
-        return getQuasiIdsFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-          getQuasiIdsFieldBuilder() {
-        if (quasiIdsBuilder_ == null) {
-          quasiIdsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                  quasiIds_,
-                  ((bitField0_ & 0x00000001) == 0x00000001),
-                  getParentForChildren(),
-                  isClean());
-          quasiIds_ = null;
-        }
-        return quasiIdsBuilder_;
-      }
-
-      private com.google.privacy.dlp.v2beta1.FieldId sensitiveAttribute_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> sensitiveAttributeBuilder_;
-      /**
-       * 
-       * Sensitive field for computing the l-value.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-       */
-      public boolean hasSensitiveAttribute() {
-        return sensitiveAttributeBuilder_ != null || sensitiveAttribute_ != null;
-      }
-      /**
-       * 
-       * Sensitive field for computing the l-value.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId getSensitiveAttribute() {
-        if (sensitiveAttributeBuilder_ == null) {
-          return sensitiveAttribute_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : sensitiveAttribute_;
-        } else {
-          return sensitiveAttributeBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Sensitive field for computing the l-value.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-       */
-      public Builder setSensitiveAttribute(com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (sensitiveAttributeBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          sensitiveAttribute_ = value;
-          onChanged();
-        } else {
-          sensitiveAttributeBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Sensitive field for computing the l-value.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-       */
-      public Builder setSensitiveAttribute(
-          com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-        if (sensitiveAttributeBuilder_ == null) {
-          sensitiveAttribute_ = builderForValue.build();
-          onChanged();
-        } else {
-          sensitiveAttributeBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Sensitive field for computing the l-value.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-       */
-      public Builder mergeSensitiveAttribute(com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (sensitiveAttributeBuilder_ == null) {
-          if (sensitiveAttribute_ != null) {
-            sensitiveAttribute_ =
-              com.google.privacy.dlp.v2beta1.FieldId.newBuilder(sensitiveAttribute_).mergeFrom(value).buildPartial();
-          } else {
-            sensitiveAttribute_ = value;
-          }
-          onChanged();
-        } else {
-          sensitiveAttributeBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Sensitive field for computing the l-value.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-       */
-      public Builder clearSensitiveAttribute() {
-        if (sensitiveAttributeBuilder_ == null) {
-          sensitiveAttribute_ = null;
-          onChanged();
-        } else {
-          sensitiveAttribute_ = null;
-          sensitiveAttributeBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Sensitive field for computing the l-value.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId.Builder getSensitiveAttributeBuilder() {
-        
-        onChanged();
-        return getSensitiveAttributeFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Sensitive field for computing the l-value.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getSensitiveAttributeOrBuilder() {
-        if (sensitiveAttributeBuilder_ != null) {
-          return sensitiveAttributeBuilder_.getMessageOrBuilder();
-        } else {
-          return sensitiveAttribute_ == null ?
-              com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : sensitiveAttribute_;
-        }
-      }
-      /**
-       * 
-       * Sensitive field for computing the l-value.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId sensitive_attribute = 2;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-          getSensitiveAttributeFieldBuilder() {
-        if (sensitiveAttributeBuilder_ == null) {
-          sensitiveAttributeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                  getSensitiveAttribute(),
-                  getParentForChildren(),
-                  isClean());
-          sensitiveAttribute_ = null;
-        }
-        return sensitiveAttributeBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig)
-    private static final com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public LDiversityConfig parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new LDiversityConfig(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private int typeCase_ = 0;
-  private java.lang.Object type_;
-  public enum TypeCase
-      implements com.google.protobuf.Internal.EnumLite {
-    NUMERICAL_STATS_CONFIG(1),
-    CATEGORICAL_STATS_CONFIG(2),
-    K_ANONYMITY_CONFIG(3),
-    L_DIVERSITY_CONFIG(4),
-    TYPE_NOT_SET(0);
-    private final int value;
-    private TypeCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static TypeCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static TypeCase forNumber(int value) {
-      switch (value) {
-        case 1: return NUMERICAL_STATS_CONFIG;
-        case 2: return CATEGORICAL_STATS_CONFIG;
-        case 3: return K_ANONYMITY_CONFIG;
-        case 4: return L_DIVERSITY_CONFIG;
-        case 0: return TYPE_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public TypeCase
-  getTypeCase() {
-    return TypeCase.forNumber(
-        typeCase_);
-  }
-
-  public static final int NUMERICAL_STATS_CONFIG_FIELD_NUMBER = 1;
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-   */
-  public boolean hasNumericalStatsConfig() {
-    return typeCase_ == 1;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig getNumericalStatsConfig() {
-    if (typeCase_ == 1) {
-       return (com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfigOrBuilder getNumericalStatsConfigOrBuilder() {
-    if (typeCase_ == 1) {
-       return (com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.getDefaultInstance();
-  }
-
-  public static final int CATEGORICAL_STATS_CONFIG_FIELD_NUMBER = 2;
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-   */
-  public boolean hasCategoricalStatsConfig() {
-    return typeCase_ == 2;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig getCategoricalStatsConfig() {
-    if (typeCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfigOrBuilder getCategoricalStatsConfigOrBuilder() {
-    if (typeCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.getDefaultInstance();
-  }
-
-  public static final int K_ANONYMITY_CONFIG_FIELD_NUMBER = 3;
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-   */
-  public boolean hasKAnonymityConfig() {
-    return typeCase_ == 3;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig getKAnonymityConfig() {
-    if (typeCase_ == 3) {
-       return (com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfigOrBuilder getKAnonymityConfigOrBuilder() {
-    if (typeCase_ == 3) {
-       return (com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.getDefaultInstance();
-  }
-
-  public static final int L_DIVERSITY_CONFIG_FIELD_NUMBER = 4;
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-   */
-  public boolean hasLDiversityConfig() {
-    return typeCase_ == 4;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig getLDiversityConfig() {
-    if (typeCase_ == 4) {
-       return (com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfigOrBuilder getLDiversityConfigOrBuilder() {
-    if (typeCase_ == 4) {
-       return (com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.getDefaultInstance();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (typeCase_ == 1) {
-      output.writeMessage(1, (com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) type_);
-    }
-    if (typeCase_ == 2) {
-      output.writeMessage(2, (com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) type_);
-    }
-    if (typeCase_ == 3) {
-      output.writeMessage(3, (com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) type_);
-    }
-    if (typeCase_ == 4) {
-      output.writeMessage(4, (com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) type_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (typeCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, (com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) type_);
-    }
-    if (typeCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, (com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) type_);
-    }
-    if (typeCase_ == 3) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, (com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) type_);
-    }
-    if (typeCase_ == 4) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, (com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) type_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.PrivacyMetric)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.PrivacyMetric other = (com.google.privacy.dlp.v2beta1.PrivacyMetric) obj;
-
-    boolean result = true;
-    result = result && getTypeCase().equals(
-        other.getTypeCase());
-    if (!result) return false;
-    switch (typeCase_) {
-      case 1:
-        result = result && getNumericalStatsConfig()
-            .equals(other.getNumericalStatsConfig());
-        break;
-      case 2:
-        result = result && getCategoricalStatsConfig()
-            .equals(other.getCategoricalStatsConfig());
-        break;
-      case 3:
-        result = result && getKAnonymityConfig()
-            .equals(other.getKAnonymityConfig());
-        break;
-      case 4:
-        result = result && getLDiversityConfig()
-            .equals(other.getLDiversityConfig());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    switch (typeCase_) {
-      case 1:
-        hash = (37 * hash) + NUMERICAL_STATS_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getNumericalStatsConfig().hashCode();
-        break;
-      case 2:
-        hash = (37 * hash) + CATEGORICAL_STATS_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getCategoricalStatsConfig().hashCode();
-        break;
-      case 3:
-        hash = (37 * hash) + K_ANONYMITY_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getKAnonymityConfig().hashCode();
-        break;
-      case 4:
-        hash = (37 * hash) + L_DIVERSITY_CONFIG_FIELD_NUMBER;
-        hash = (53 * hash) + getLDiversityConfig().hashCode();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.PrivacyMetric prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Privacy metric to compute for reidentification risk analysis.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.PrivacyMetric}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.PrivacyMetric)
-      com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.PrivacyMetric.class, com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.PrivacyMetric.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      typeCase_ = 0;
-      type_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_PrivacyMetric_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.PrivacyMetric.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric build() {
-      com.google.privacy.dlp.v2beta1.PrivacyMetric result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric buildPartial() {
-      com.google.privacy.dlp.v2beta1.PrivacyMetric result = new com.google.privacy.dlp.v2beta1.PrivacyMetric(this);
-      if (typeCase_ == 1) {
-        if (numericalStatsConfigBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = numericalStatsConfigBuilder_.build();
-        }
-      }
-      if (typeCase_ == 2) {
-        if (categoricalStatsConfigBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = categoricalStatsConfigBuilder_.build();
-        }
-      }
-      if (typeCase_ == 3) {
-        if (kAnonymityConfigBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = kAnonymityConfigBuilder_.build();
-        }
-      }
-      if (typeCase_ == 4) {
-        if (lDiversityConfigBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = lDiversityConfigBuilder_.build();
-        }
-      }
-      result.typeCase_ = typeCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.PrivacyMetric) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.PrivacyMetric)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.PrivacyMetric other) {
-      if (other == com.google.privacy.dlp.v2beta1.PrivacyMetric.getDefaultInstance()) return this;
-      switch (other.getTypeCase()) {
-        case NUMERICAL_STATS_CONFIG: {
-          mergeNumericalStatsConfig(other.getNumericalStatsConfig());
-          break;
-        }
-        case CATEGORICAL_STATS_CONFIG: {
-          mergeCategoricalStatsConfig(other.getCategoricalStatsConfig());
-          break;
-        }
-        case K_ANONYMITY_CONFIG: {
-          mergeKAnonymityConfig(other.getKAnonymityConfig());
-          break;
-        }
-        case L_DIVERSITY_CONFIG: {
-          mergeLDiversityConfig(other.getLDiversityConfig());
-          break;
-        }
-        case TYPE_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.PrivacyMetric parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.PrivacyMetric) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int typeCase_ = 0;
-    private java.lang.Object type_;
-    public TypeCase
-        getTypeCase() {
-      return TypeCase.forNumber(
-          typeCase_);
-    }
-
-    public Builder clearType() {
-      typeCase_ = 0;
-      type_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig, com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfigOrBuilder> numericalStatsConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-     */
-    public boolean hasNumericalStatsConfig() {
-      return typeCase_ == 1;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig getNumericalStatsConfig() {
-      if (numericalStatsConfigBuilder_ == null) {
-        if (typeCase_ == 1) {
-          return (com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.getDefaultInstance();
-      } else {
-        if (typeCase_ == 1) {
-          return numericalStatsConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-     */
-    public Builder setNumericalStatsConfig(com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig value) {
-      if (numericalStatsConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        numericalStatsConfigBuilder_.setMessage(value);
-      }
-      typeCase_ = 1;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-     */
-    public Builder setNumericalStatsConfig(
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.Builder builderForValue) {
-      if (numericalStatsConfigBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        numericalStatsConfigBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 1;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-     */
-    public Builder mergeNumericalStatsConfig(com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig value) {
-      if (numericalStatsConfigBuilder_ == null) {
-        if (typeCase_ == 1 &&
-            type_ != com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.getDefaultInstance()) {
-          type_ = com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.newBuilder((com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 1) {
-          numericalStatsConfigBuilder_.mergeFrom(value);
-        }
-        numericalStatsConfigBuilder_.setMessage(value);
-      }
-      typeCase_ = 1;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-     */
-    public Builder clearNumericalStatsConfig() {
-      if (numericalStatsConfigBuilder_ == null) {
-        if (typeCase_ == 1) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 1) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        numericalStatsConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.Builder getNumericalStatsConfigBuilder() {
-      return getNumericalStatsConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfigOrBuilder getNumericalStatsConfigOrBuilder() {
-      if ((typeCase_ == 1) && (numericalStatsConfigBuilder_ != null)) {
-        return numericalStatsConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 1) {
-          return (com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig, com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfigOrBuilder> 
-        getNumericalStatsConfigFieldBuilder() {
-      if (numericalStatsConfigBuilder_ == null) {
-        if (!(typeCase_ == 1)) {
-          type_ = com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.getDefaultInstance();
-        }
-        numericalStatsConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig, com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 1;
-      onChanged();;
-      return numericalStatsConfigBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig, com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfigOrBuilder> categoricalStatsConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-     */
-    public boolean hasCategoricalStatsConfig() {
-      return typeCase_ == 2;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig getCategoricalStatsConfig() {
-      if (categoricalStatsConfigBuilder_ == null) {
-        if (typeCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.getDefaultInstance();
-      } else {
-        if (typeCase_ == 2) {
-          return categoricalStatsConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-     */
-    public Builder setCategoricalStatsConfig(com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig value) {
-      if (categoricalStatsConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        categoricalStatsConfigBuilder_.setMessage(value);
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-     */
-    public Builder setCategoricalStatsConfig(
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.Builder builderForValue) {
-      if (categoricalStatsConfigBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        categoricalStatsConfigBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-     */
-    public Builder mergeCategoricalStatsConfig(com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig value) {
-      if (categoricalStatsConfigBuilder_ == null) {
-        if (typeCase_ == 2 &&
-            type_ != com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.getDefaultInstance()) {
-          type_ = com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.newBuilder((com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 2) {
-          categoricalStatsConfigBuilder_.mergeFrom(value);
-        }
-        categoricalStatsConfigBuilder_.setMessage(value);
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-     */
-    public Builder clearCategoricalStatsConfig() {
-      if (categoricalStatsConfigBuilder_ == null) {
-        if (typeCase_ == 2) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 2) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        categoricalStatsConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.Builder getCategoricalStatsConfigBuilder() {
-      return getCategoricalStatsConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfigOrBuilder getCategoricalStatsConfigOrBuilder() {
-      if ((typeCase_ == 2) && (categoricalStatsConfigBuilder_ != null)) {
-        return categoricalStatsConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig, com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfigOrBuilder> 
-        getCategoricalStatsConfigFieldBuilder() {
-      if (categoricalStatsConfigBuilder_ == null) {
-        if (!(typeCase_ == 2)) {
-          type_ = com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.getDefaultInstance();
-        }
-        categoricalStatsConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig, com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 2;
-      onChanged();;
-      return categoricalStatsConfigBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig, com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfigOrBuilder> kAnonymityConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-     */
-    public boolean hasKAnonymityConfig() {
-      return typeCase_ == 3;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig getKAnonymityConfig() {
-      if (kAnonymityConfigBuilder_ == null) {
-        if (typeCase_ == 3) {
-          return (com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.getDefaultInstance();
-      } else {
-        if (typeCase_ == 3) {
-          return kAnonymityConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-     */
-    public Builder setKAnonymityConfig(com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig value) {
-      if (kAnonymityConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        kAnonymityConfigBuilder_.setMessage(value);
-      }
-      typeCase_ = 3;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-     */
-    public Builder setKAnonymityConfig(
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.Builder builderForValue) {
-      if (kAnonymityConfigBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        kAnonymityConfigBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 3;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-     */
-    public Builder mergeKAnonymityConfig(com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig value) {
-      if (kAnonymityConfigBuilder_ == null) {
-        if (typeCase_ == 3 &&
-            type_ != com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.getDefaultInstance()) {
-          type_ = com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.newBuilder((com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 3) {
-          kAnonymityConfigBuilder_.mergeFrom(value);
-        }
-        kAnonymityConfigBuilder_.setMessage(value);
-      }
-      typeCase_ = 3;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-     */
-    public Builder clearKAnonymityConfig() {
-      if (kAnonymityConfigBuilder_ == null) {
-        if (typeCase_ == 3) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 3) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        kAnonymityConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.Builder getKAnonymityConfigBuilder() {
-      return getKAnonymityConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfigOrBuilder getKAnonymityConfigOrBuilder() {
-      if ((typeCase_ == 3) && (kAnonymityConfigBuilder_ != null)) {
-        return kAnonymityConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 3) {
-          return (com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig, com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfigOrBuilder> 
-        getKAnonymityConfigFieldBuilder() {
-      if (kAnonymityConfigBuilder_ == null) {
-        if (!(typeCase_ == 3)) {
-          type_ = com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.getDefaultInstance();
-        }
-        kAnonymityConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig, com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 3;
-      onChanged();;
-      return kAnonymityConfigBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig, com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfigOrBuilder> lDiversityConfigBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-     */
-    public boolean hasLDiversityConfig() {
-      return typeCase_ == 4;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig getLDiversityConfig() {
-      if (lDiversityConfigBuilder_ == null) {
-        if (typeCase_ == 4) {
-          return (com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.getDefaultInstance();
-      } else {
-        if (typeCase_ == 4) {
-          return lDiversityConfigBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-     */
-    public Builder setLDiversityConfig(com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig value) {
-      if (lDiversityConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        lDiversityConfigBuilder_.setMessage(value);
-      }
-      typeCase_ = 4;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-     */
-    public Builder setLDiversityConfig(
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.Builder builderForValue) {
-      if (lDiversityConfigBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        lDiversityConfigBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 4;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-     */
-    public Builder mergeLDiversityConfig(com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig value) {
-      if (lDiversityConfigBuilder_ == null) {
-        if (typeCase_ == 4 &&
-            type_ != com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.getDefaultInstance()) {
-          type_ = com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.newBuilder((com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 4) {
-          lDiversityConfigBuilder_.mergeFrom(value);
-        }
-        lDiversityConfigBuilder_.setMessage(value);
-      }
-      typeCase_ = 4;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-     */
-    public Builder clearLDiversityConfig() {
-      if (lDiversityConfigBuilder_ == null) {
-        if (typeCase_ == 4) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 4) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        lDiversityConfigBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.Builder getLDiversityConfigBuilder() {
-      return getLDiversityConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfigOrBuilder getLDiversityConfigOrBuilder() {
-      if ((typeCase_ == 4) && (lDiversityConfigBuilder_ != null)) {
-        return lDiversityConfigBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 4) {
-          return (com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig, com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfigOrBuilder> 
-        getLDiversityConfigFieldBuilder() {
-      if (lDiversityConfigBuilder_ == null) {
-        if (!(typeCase_ == 4)) {
-          type_ = com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.getDefaultInstance();
-        }
-        lDiversityConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig, com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfigOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 4;
-      onChanged();;
-      return lDiversityConfigBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.PrivacyMetric)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.PrivacyMetric)
-  private static final com.google.privacy.dlp.v2beta1.PrivacyMetric DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.PrivacyMetric();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.PrivacyMetric getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public PrivacyMetric parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PrivacyMetric(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.PrivacyMetric getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrivacyMetricOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrivacyMetricOrBuilder.java
deleted file mode 100644
index 789475a992be..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PrivacyMetricOrBuilder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface PrivacyMetricOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.PrivacyMetric)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-   */
-  boolean hasNumericalStatsConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-   */
-  com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig getNumericalStatsConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfig numerical_stats_config = 1;
-   */
-  com.google.privacy.dlp.v2beta1.PrivacyMetric.NumericalStatsConfigOrBuilder getNumericalStatsConfigOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-   */
-  boolean hasCategoricalStatsConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-   */
-  com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig getCategoricalStatsConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfig categorical_stats_config = 2;
-   */
-  com.google.privacy.dlp.v2beta1.PrivacyMetric.CategoricalStatsConfigOrBuilder getCategoricalStatsConfigOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-   */
-  boolean hasKAnonymityConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-   */
-  com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig getKAnonymityConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfig k_anonymity_config = 3;
-   */
-  com.google.privacy.dlp.v2beta1.PrivacyMetric.KAnonymityConfigOrBuilder getKAnonymityConfigOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-   */
-  boolean hasLDiversityConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-   */
-  com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig getLDiversityConfig();
-  /**
-   * .google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfig l_diversity_config = 4;
-   */
-  com.google.privacy.dlp.v2beta1.PrivacyMetric.LDiversityConfigOrBuilder getLDiversityConfigOrBuilder();
-
-  public com.google.privacy.dlp.v2beta1.PrivacyMetric.TypeCase getTypeCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Projection.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Projection.java
deleted file mode 100644
index 37c53076d5d5..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Projection.java
+++ /dev/null
@@ -1,626 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * A representation of a Datastore property in a projection.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.Projection}
- */
-public  final class Projection extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.Projection)
-    ProjectionOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Projection.newBuilder() to construct.
-  private Projection(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private Projection() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Projection(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.PropertyReference.Builder subBuilder = null;
-            if (property_ != null) {
-              subBuilder = property_.toBuilder();
-            }
-            property_ = input.readMessage(com.google.privacy.dlp.v2beta1.PropertyReference.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(property_);
-              property_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Projection_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Projection_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.Projection.class, com.google.privacy.dlp.v2beta1.Projection.Builder.class);
-  }
-
-  public static final int PROPERTY_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.PropertyReference property_;
-  /**
-   * 
-   * The property to project.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-   */
-  public boolean hasProperty() {
-    return property_ != null;
-  }
-  /**
-   * 
-   * The property to project.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.PropertyReference getProperty() {
-    return property_ == null ? com.google.privacy.dlp.v2beta1.PropertyReference.getDefaultInstance() : property_;
-  }
-  /**
-   * 
-   * The property to project.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.PropertyReferenceOrBuilder getPropertyOrBuilder() {
-    return getProperty();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (property_ != null) {
-      output.writeMessage(1, getProperty());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (property_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getProperty());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.Projection)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.Projection other = (com.google.privacy.dlp.v2beta1.Projection) obj;
-
-    boolean result = true;
-    result = result && (hasProperty() == other.hasProperty());
-    if (hasProperty()) {
-      result = result && getProperty()
-          .equals(other.getProperty());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasProperty()) {
-      hash = (37 * hash) + PROPERTY_FIELD_NUMBER;
-      hash = (53 * hash) + getProperty().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Projection parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Projection parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Projection parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Projection parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Projection parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Projection parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Projection parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Projection parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Projection parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Projection parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Projection parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Projection parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.Projection prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * A representation of a Datastore property in a projection.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.Projection}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.Projection)
-      com.google.privacy.dlp.v2beta1.ProjectionOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Projection_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Projection_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.Projection.class, com.google.privacy.dlp.v2beta1.Projection.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.Projection.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (propertyBuilder_ == null) {
-        property_ = null;
-      } else {
-        property_ = null;
-        propertyBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_Projection_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Projection getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.Projection.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.Projection build() {
-      com.google.privacy.dlp.v2beta1.Projection result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Projection buildPartial() {
-      com.google.privacy.dlp.v2beta1.Projection result = new com.google.privacy.dlp.v2beta1.Projection(this);
-      if (propertyBuilder_ == null) {
-        result.property_ = property_;
-      } else {
-        result.property_ = propertyBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.Projection) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.Projection)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.Projection other) {
-      if (other == com.google.privacy.dlp.v2beta1.Projection.getDefaultInstance()) return this;
-      if (other.hasProperty()) {
-        mergeProperty(other.getProperty());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.Projection parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.Projection) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.PropertyReference property_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PropertyReference, com.google.privacy.dlp.v2beta1.PropertyReference.Builder, com.google.privacy.dlp.v2beta1.PropertyReferenceOrBuilder> propertyBuilder_;
-    /**
-     * 
-     * The property to project.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-     */
-    public boolean hasProperty() {
-      return propertyBuilder_ != null || property_ != null;
-    }
-    /**
-     * 
-     * The property to project.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PropertyReference getProperty() {
-      if (propertyBuilder_ == null) {
-        return property_ == null ? com.google.privacy.dlp.v2beta1.PropertyReference.getDefaultInstance() : property_;
-      } else {
-        return propertyBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The property to project.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-     */
-    public Builder setProperty(com.google.privacy.dlp.v2beta1.PropertyReference value) {
-      if (propertyBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        property_ = value;
-        onChanged();
-      } else {
-        propertyBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The property to project.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-     */
-    public Builder setProperty(
-        com.google.privacy.dlp.v2beta1.PropertyReference.Builder builderForValue) {
-      if (propertyBuilder_ == null) {
-        property_ = builderForValue.build();
-        onChanged();
-      } else {
-        propertyBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The property to project.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-     */
-    public Builder mergeProperty(com.google.privacy.dlp.v2beta1.PropertyReference value) {
-      if (propertyBuilder_ == null) {
-        if (property_ != null) {
-          property_ =
-            com.google.privacy.dlp.v2beta1.PropertyReference.newBuilder(property_).mergeFrom(value).buildPartial();
-        } else {
-          property_ = value;
-        }
-        onChanged();
-      } else {
-        propertyBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The property to project.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-     */
-    public Builder clearProperty() {
-      if (propertyBuilder_ == null) {
-        property_ = null;
-        onChanged();
-      } else {
-        property_ = null;
-        propertyBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The property to project.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PropertyReference.Builder getPropertyBuilder() {
-      
-      onChanged();
-      return getPropertyFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The property to project.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.PropertyReferenceOrBuilder getPropertyOrBuilder() {
-      if (propertyBuilder_ != null) {
-        return propertyBuilder_.getMessageOrBuilder();
-      } else {
-        return property_ == null ?
-            com.google.privacy.dlp.v2beta1.PropertyReference.getDefaultInstance() : property_;
-      }
-    }
-    /**
-     * 
-     * The property to project.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PropertyReference, com.google.privacy.dlp.v2beta1.PropertyReference.Builder, com.google.privacy.dlp.v2beta1.PropertyReferenceOrBuilder> 
-        getPropertyFieldBuilder() {
-      if (propertyBuilder_ == null) {
-        propertyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.PropertyReference, com.google.privacy.dlp.v2beta1.PropertyReference.Builder, com.google.privacy.dlp.v2beta1.PropertyReferenceOrBuilder>(
-                getProperty(),
-                getParentForChildren(),
-                isClean());
-        property_ = null;
-      }
-      return propertyBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.Projection)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.Projection)
-  private static final com.google.privacy.dlp.v2beta1.Projection DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.Projection();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Projection getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public Projection parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Projection(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.Projection getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ProjectionOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ProjectionOrBuilder.java
deleted file mode 100644
index e02fa3eed86e..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ProjectionOrBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ProjectionOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.Projection)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The property to project.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-   */
-  boolean hasProperty();
-  /**
-   * 
-   * The property to project.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-   */
-  com.google.privacy.dlp.v2beta1.PropertyReference getProperty();
-  /**
-   * 
-   * The property to project.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PropertyReference property = 1;
-   */
-  com.google.privacy.dlp.v2beta1.PropertyReferenceOrBuilder getPropertyOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PropertyReference.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PropertyReference.java
deleted file mode 100644
index 35aa60a7cd92..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PropertyReference.java
+++ /dev/null
@@ -1,559 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * A reference to a property relative to the Datastore kind expressions.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.PropertyReference}
- */
-public  final class PropertyReference extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.PropertyReference)
-    PropertyReferenceOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use PropertyReference.newBuilder() to construct.
-  private PropertyReference(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private PropertyReference() {
-    name_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private PropertyReference(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_PropertyReference_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_PropertyReference_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.PropertyReference.class, com.google.privacy.dlp.v2beta1.PropertyReference.Builder.class);
-  }
-
-  public static final int NAME_FIELD_NUMBER = 2;
-  private volatile java.lang.Object name_;
-  /**
-   * 
-   * The name of the property.
-   * If name includes "."s, it may be interpreted as a property name path.
-   * 

-   *
-   * string name = 2;
-   */
-  public java.lang.String getName() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      name_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * The name of the property.
-   * If name includes "."s, it may be interpreted as a property name path.
-   * 

-   *
-   * string name = 2;
-   */
-  public com.google.protobuf.ByteString
-      getNameBytes() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      name_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.PropertyReference)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.PropertyReference other = (com.google.privacy.dlp.v2beta1.PropertyReference) obj;
-
-    boolean result = true;
-    result = result && getName()
-        .equals(other.getName());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.PropertyReference parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.PropertyReference parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PropertyReference parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.PropertyReference parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PropertyReference parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.PropertyReference parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PropertyReference parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.PropertyReference parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PropertyReference parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.PropertyReference parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.PropertyReference parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.PropertyReference parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.PropertyReference prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * A reference to a property relative to the Datastore kind expressions.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.PropertyReference}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.PropertyReference)
-      com.google.privacy.dlp.v2beta1.PropertyReferenceOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_PropertyReference_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_PropertyReference_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.PropertyReference.class, com.google.privacy.dlp.v2beta1.PropertyReference.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.PropertyReference.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      name_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_PropertyReference_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.PropertyReference getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.PropertyReference.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.PropertyReference build() {
-      com.google.privacy.dlp.v2beta1.PropertyReference result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.PropertyReference buildPartial() {
-      com.google.privacy.dlp.v2beta1.PropertyReference result = new com.google.privacy.dlp.v2beta1.PropertyReference(this);
-      result.name_ = name_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.PropertyReference) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.PropertyReference)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.PropertyReference other) {
-      if (other == com.google.privacy.dlp.v2beta1.PropertyReference.getDefaultInstance()) return this;
-      if (!other.getName().isEmpty()) {
-        name_ = other.name_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.PropertyReference parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.PropertyReference) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object name_ = "";
-    /**
-     * 
-     * The name of the property.
-     * If name includes "."s, it may be interpreted as a property name path.
-     * 

-     *
-     * string name = 2;
-     */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        name_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * The name of the property.
-     * If name includes "."s, it may be interpreted as a property name path.
-     * 

-     *
-     * string name = 2;
-     */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
-      java.lang.Object ref = name_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        name_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * The name of the property.
-     * If name includes "."s, it may be interpreted as a property name path.
-     * 

-     *
-     * string name = 2;
-     */
-    public Builder setName(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The name of the property.
-     * If name includes "."s, it may be interpreted as a property name path.
-     * 

-     *
-     * string name = 2;
-     */
-    public Builder clearName() {
-      
-      name_ = getDefaultInstance().getName();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The name of the property.
-     * If name includes "."s, it may be interpreted as a property name path.
-     * 

-     *
-     * string name = 2;
-     */
-    public Builder setNameBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.PropertyReference)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.PropertyReference)
-  private static final com.google.privacy.dlp.v2beta1.PropertyReference DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.PropertyReference();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.PropertyReference getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public PropertyReference parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PropertyReference(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.PropertyReference getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PropertyReferenceOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PropertyReferenceOrBuilder.java
deleted file mode 100644
index 07d5e12b4250..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/PropertyReferenceOrBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface PropertyReferenceOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.PropertyReference)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The name of the property.
-   * If name includes "."s, it may be interpreted as a property name path.
-   * 

-   *
-   * string name = 2;
-   */
-  java.lang.String getName();
-  /**
-   * 
-   * The name of the property.
-   * If name includes "."s, it may be interpreted as a property name path.
-   * 

-   *
-   * string name = 2;
-   */
-  com.google.protobuf.ByteString
-      getNameBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RangeOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RangeOrBuilder.java
deleted file mode 100644
index 868701fe0dd8..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RangeOrBuilder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface RangeOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.Range)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Index of the first character of the range (inclusive).
-   * 

-   *
-   * int64 start = 1;
-   */
-  long getStart();
-
-  /**
-   * 
-   * Index of the last character of the range (exclusive).
-   * 

-   *
-   * int64 end = 2;
-   */
-  long getEnd();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordCondition.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordCondition.java
deleted file mode 100644
index 2199910ed45b..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordCondition.java
+++ /dev/null
@@ -1,3315 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * A condition for determining whether a transformation should be applied to
- * a field.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.RecordCondition}
- */
-public  final class RecordCondition extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RecordCondition)
-    RecordConditionOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use RecordCondition.newBuilder() to construct.
-  private RecordCondition(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private RecordCondition() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private RecordCondition(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 26: {
-            com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.Builder subBuilder = null;
-            if (expressions_ != null) {
-              subBuilder = expressions_.toBuilder();
-            }
-            expressions_ = input.readMessage(com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(expressions_);
-              expressions_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.RecordCondition.class, com.google.privacy.dlp.v2beta1.RecordCondition.Builder.class);
-  }
-
-  public interface ConditionOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RecordCondition.Condition)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Field within the record this condition is evaluated against. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    boolean hasField();
-    /**
-     * 
-     * Field within the record this condition is evaluated against. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    com.google.privacy.dlp.v2beta1.FieldId getField();
-    /**
-     * 
-     * Field within the record this condition is evaluated against. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder();
-
-    /**
-     * 
-     * Operator used to compare the field or info type to the value. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RelationalOperator operator = 3;
-     */
-    int getOperatorValue();
-    /**
-     * 
-     * Operator used to compare the field or info type to the value. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RelationalOperator operator = 3;
-     */
-    com.google.privacy.dlp.v2beta1.RelationalOperator getOperator();
-
-    /**
-     * 
-     * Value to compare against. [Required, except for `EXISTS` tests.]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 4;
-     */
-    boolean hasValue();
-    /**
-     * 
-     * Value to compare against. [Required, except for `EXISTS` tests.]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 4;
-     */
-    com.google.privacy.dlp.v2beta1.Value getValue();
-    /**
-     * 
-     * Value to compare against. [Required, except for `EXISTS` tests.]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 4;
-     */
-    com.google.privacy.dlp.v2beta1.ValueOrBuilder getValueOrBuilder();
-  }
-  /**
-   * 
-   * The field type of `value` and `field` do not need to match to be
-   * considered equal, but not all comparisons are possible.
-   * A `value` of type:
-   * - `string` can be compared against all other types
-   * - `boolean` can only be compared against other booleans
-   * - `integer` can be compared against doubles or a string if the string value
-   * can be parsed as an integer.
-   * - `double` can be compared against integers or a string if the string can
-   * be parsed as a double.
-   * - `Timestamp` can be compared against strings in RFC 3339 date string
-   * format.
-   * - `TimeOfDay` can be compared against timestamps and strings in the format
-   * of 'HH:mm:ss'.
-   * If we fail to compare do to type mismatch, a warning will be given and
-   * the condition will evaluate to false.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RecordCondition.Condition}
-   */
-  public  static final class Condition extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RecordCondition.Condition)
-      ConditionOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use Condition.newBuilder() to construct.
-    private Condition(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private Condition() {
-      operator_ = 0;
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Condition(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              com.google.privacy.dlp.v2beta1.FieldId.Builder subBuilder = null;
-              if (field_ != null) {
-                subBuilder = field_.toBuilder();
-              }
-              field_ = input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(field_);
-                field_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 24: {
-              int rawValue = input.readEnum();
-
-              operator_ = rawValue;
-              break;
-            }
-            case 34: {
-              com.google.privacy.dlp.v2beta1.Value.Builder subBuilder = null;
-              if (value_ != null) {
-                subBuilder = value_.toBuilder();
-              }
-              value_ = input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(value_);
-                value_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Condition_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Condition_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RecordCondition.Condition.class, com.google.privacy.dlp.v2beta1.RecordCondition.Condition.Builder.class);
-    }
-
-    public static final int FIELD_FIELD_NUMBER = 1;
-    private com.google.privacy.dlp.v2beta1.FieldId field_;
-    /**
-     * 
-     * Field within the record this condition is evaluated against. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public boolean hasField() {
-      return field_ != null;
-    }
-    /**
-     * 
-     * Field within the record this condition is evaluated against. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getField() {
-      return field_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-    }
-    /**
-     * 
-     * Field within the record this condition is evaluated against. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder() {
-      return getField();
-    }
-
-    public static final int OPERATOR_FIELD_NUMBER = 3;
-    private int operator_;
-    /**
-     * 
-     * Operator used to compare the field or info type to the value. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RelationalOperator operator = 3;
-     */
-    public int getOperatorValue() {
-      return operator_;
-    }
-    /**
-     * 
-     * Operator used to compare the field or info type to the value. [required]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RelationalOperator operator = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RelationalOperator getOperator() {
-      com.google.privacy.dlp.v2beta1.RelationalOperator result = com.google.privacy.dlp.v2beta1.RelationalOperator.valueOf(operator_);
-      return result == null ? com.google.privacy.dlp.v2beta1.RelationalOperator.UNRECOGNIZED : result;
-    }
-
-    public static final int VALUE_FIELD_NUMBER = 4;
-    private com.google.privacy.dlp.v2beta1.Value value_;
-    /**
-     * 
-     * Value to compare against. [Required, except for `EXISTS` tests.]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 4;
-     */
-    public boolean hasValue() {
-      return value_ != null;
-    }
-    /**
-     * 
-     * Value to compare against. [Required, except for `EXISTS` tests.]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.Value getValue() {
-      return value_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : value_;
-    }
-    /**
-     * 
-     * Value to compare against. [Required, except for `EXISTS` tests.]
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.ValueOrBuilder getValueOrBuilder() {
-      return getValue();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (field_ != null) {
-        output.writeMessage(1, getField());
-      }
-      if (operator_ != com.google.privacy.dlp.v2beta1.RelationalOperator.RELATIONAL_OPERATOR_UNSPECIFIED.getNumber()) {
-        output.writeEnum(3, operator_);
-      }
-      if (value_ != null) {
-        output.writeMessage(4, getValue());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (field_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getField());
-      }
-      if (operator_ != com.google.privacy.dlp.v2beta1.RelationalOperator.RELATIONAL_OPERATOR_UNSPECIFIED.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(3, operator_);
-      }
-      if (value_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getValue());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.RecordCondition.Condition)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.RecordCondition.Condition other = (com.google.privacy.dlp.v2beta1.RecordCondition.Condition) obj;
-
-      boolean result = true;
-      result = result && (hasField() == other.hasField());
-      if (hasField()) {
-        result = result && getField()
-            .equals(other.getField());
-      }
-      result = result && operator_ == other.operator_;
-      result = result && (hasValue() == other.hasValue());
-      if (hasValue()) {
-        result = result && getValue()
-            .equals(other.getValue());
-      }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasField()) {
-        hash = (37 * hash) + FIELD_FIELD_NUMBER;
-        hash = (53 * hash) + getField().hashCode();
-      }
-      hash = (37 * hash) + OPERATOR_FIELD_NUMBER;
-      hash = (53 * hash) + operator_;
-      if (hasValue()) {
-        hash = (37 * hash) + VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + getValue().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RecordCondition.Condition prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * The field type of `value` and `field` do not need to match to be
-     * considered equal, but not all comparisons are possible.
-     * A `value` of type:
-     * - `string` can be compared against all other types
-     * - `boolean` can only be compared against other booleans
-     * - `integer` can be compared against doubles or a string if the string value
-     * can be parsed as an integer.
-     * - `double` can be compared against integers or a string if the string can
-     * be parsed as a double.
-     * - `Timestamp` can be compared against strings in RFC 3339 date string
-     * format.
-     * - `TimeOfDay` can be compared against timestamps and strings in the format
-     * of 'HH:mm:ss'.
-     * If we fail to compare do to type mismatch, a warning will be given and
-     * the condition will evaluate to false.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RecordCondition.Condition}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RecordCondition.Condition)
-        com.google.privacy.dlp.v2beta1.RecordCondition.ConditionOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Condition_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Condition_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RecordCondition.Condition.class, com.google.privacy.dlp.v2beta1.RecordCondition.Condition.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.RecordCondition.Condition.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (fieldBuilder_ == null) {
-          field_ = null;
-        } else {
-          field_ = null;
-          fieldBuilder_ = null;
-        }
-        operator_ = 0;
-
-        if (valueBuilder_ == null) {
-          value_ = null;
-        } else {
-          value_ = null;
-          valueBuilder_ = null;
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Condition_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Condition getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.RecordCondition.Condition.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Condition build() {
-        com.google.privacy.dlp.v2beta1.RecordCondition.Condition result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Condition buildPartial() {
-        com.google.privacy.dlp.v2beta1.RecordCondition.Condition result = new com.google.privacy.dlp.v2beta1.RecordCondition.Condition(this);
-        if (fieldBuilder_ == null) {
-          result.field_ = field_;
-        } else {
-          result.field_ = fieldBuilder_.build();
-        }
-        result.operator_ = operator_;
-        if (valueBuilder_ == null) {
-          result.value_ = value_;
-        } else {
-          result.value_ = valueBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.RecordCondition.Condition) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.RecordCondition.Condition)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RecordCondition.Condition other) {
-        if (other == com.google.privacy.dlp.v2beta1.RecordCondition.Condition.getDefaultInstance()) return this;
-        if (other.hasField()) {
-          mergeField(other.getField());
-        }
-        if (other.operator_ != 0) {
-          setOperatorValue(other.getOperatorValue());
-        }
-        if (other.hasValue()) {
-          mergeValue(other.getValue());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.RecordCondition.Condition parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.RecordCondition.Condition) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private com.google.privacy.dlp.v2beta1.FieldId field_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> fieldBuilder_;
-      /**
-       * 
-       * Field within the record this condition is evaluated against. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public boolean hasField() {
-        return fieldBuilder_ != null || field_ != null;
-      }
-      /**
-       * 
-       * Field within the record this condition is evaluated against. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId getField() {
-        if (fieldBuilder_ == null) {
-          return field_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-        } else {
-          return fieldBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Field within the record this condition is evaluated against. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public Builder setField(com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (fieldBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          field_ = value;
-          onChanged();
-        } else {
-          fieldBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Field within the record this condition is evaluated against. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public Builder setField(
-          com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-        if (fieldBuilder_ == null) {
-          field_ = builderForValue.build();
-          onChanged();
-        } else {
-          fieldBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Field within the record this condition is evaluated against. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public Builder mergeField(com.google.privacy.dlp.v2beta1.FieldId value) {
-        if (fieldBuilder_ == null) {
-          if (field_ != null) {
-            field_ =
-              com.google.privacy.dlp.v2beta1.FieldId.newBuilder(field_).mergeFrom(value).buildPartial();
-          } else {
-            field_ = value;
-          }
-          onChanged();
-        } else {
-          fieldBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Field within the record this condition is evaluated against. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public Builder clearField() {
-        if (fieldBuilder_ == null) {
-          field_ = null;
-          onChanged();
-        } else {
-          field_ = null;
-          fieldBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Field within the record this condition is evaluated against. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldId.Builder getFieldBuilder() {
-        
-        onChanged();
-        return getFieldFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Field within the record this condition is evaluated against. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder() {
-        if (fieldBuilder_ != null) {
-          return fieldBuilder_.getMessageOrBuilder();
-        } else {
-          return field_ == null ?
-              com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-        }
-      }
-      /**
-       * 
-       * Field within the record this condition is evaluated against. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.FieldId field = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-          getFieldFieldBuilder() {
-        if (fieldBuilder_ == null) {
-          fieldBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                  getField(),
-                  getParentForChildren(),
-                  isClean());
-          field_ = null;
-        }
-        return fieldBuilder_;
-      }
-
-      private int operator_ = 0;
-      /**
-       * 
-       * Operator used to compare the field or info type to the value. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.RelationalOperator operator = 3;
-       */
-      public int getOperatorValue() {
-        return operator_;
-      }
-      /**
-       * 
-       * Operator used to compare the field or info type to the value. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.RelationalOperator operator = 3;
-       */
-      public Builder setOperatorValue(int value) {
-        operator_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * Operator used to compare the field or info type to the value. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.RelationalOperator operator = 3;
-       */
-      public com.google.privacy.dlp.v2beta1.RelationalOperator getOperator() {
-        com.google.privacy.dlp.v2beta1.RelationalOperator result = com.google.privacy.dlp.v2beta1.RelationalOperator.valueOf(operator_);
-        return result == null ? com.google.privacy.dlp.v2beta1.RelationalOperator.UNRECOGNIZED : result;
-      }
-      /**
-       * 
-       * Operator used to compare the field or info type to the value. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.RelationalOperator operator = 3;
-       */
-      public Builder setOperator(com.google.privacy.dlp.v2beta1.RelationalOperator value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        operator_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * Operator used to compare the field or info type to the value. [required]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.RelationalOperator operator = 3;
-       */
-      public Builder clearOperator() {
-        
-        operator_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.privacy.dlp.v2beta1.Value value_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> valueBuilder_;
-      /**
-       * 
-       * Value to compare against. [Required, except for `EXISTS` tests.]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value value = 4;
-       */
-      public boolean hasValue() {
-        return valueBuilder_ != null || value_ != null;
-      }
-      /**
-       * 
-       * Value to compare against. [Required, except for `EXISTS` tests.]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value value = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.Value getValue() {
-        if (valueBuilder_ == null) {
-          return value_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : value_;
-        } else {
-          return valueBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Value to compare against. [Required, except for `EXISTS` tests.]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value value = 4;
-       */
-      public Builder setValue(com.google.privacy.dlp.v2beta1.Value value) {
-        if (valueBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          value_ = value;
-          onChanged();
-        } else {
-          valueBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Value to compare against. [Required, except for `EXISTS` tests.]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value value = 4;
-       */
-      public Builder setValue(
-          com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-        if (valueBuilder_ == null) {
-          value_ = builderForValue.build();
-          onChanged();
-        } else {
-          valueBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Value to compare against. [Required, except for `EXISTS` tests.]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value value = 4;
-       */
-      public Builder mergeValue(com.google.privacy.dlp.v2beta1.Value value) {
-        if (valueBuilder_ == null) {
-          if (value_ != null) {
-            value_ =
-              com.google.privacy.dlp.v2beta1.Value.newBuilder(value_).mergeFrom(value).buildPartial();
-          } else {
-            value_ = value;
-          }
-          onChanged();
-        } else {
-          valueBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Value to compare against. [Required, except for `EXISTS` tests.]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value value = 4;
-       */
-      public Builder clearValue() {
-        if (valueBuilder_ == null) {
-          value_ = null;
-          onChanged();
-        } else {
-          value_ = null;
-          valueBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Value to compare against. [Required, except for `EXISTS` tests.]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value value = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.Value.Builder getValueBuilder() {
-        
-        onChanged();
-        return getValueFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Value to compare against. [Required, except for `EXISTS` tests.]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value value = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueOrBuilder getValueOrBuilder() {
-        if (valueBuilder_ != null) {
-          return valueBuilder_.getMessageOrBuilder();
-        } else {
-          return value_ == null ?
-              com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : value_;
-        }
-      }
-      /**
-       * 
-       * Value to compare against. [Required, except for `EXISTS` tests.]
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value value = 4;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-          getValueFieldBuilder() {
-        if (valueBuilder_ == null) {
-          valueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                  getValue(),
-                  getParentForChildren(),
-                  isClean());
-          value_ = null;
-        }
-        return valueBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RecordCondition.Condition)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RecordCondition.Condition)
-    private static final com.google.privacy.dlp.v2beta1.RecordCondition.Condition DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RecordCondition.Condition();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Condition getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public Condition parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Condition(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordCondition.Condition getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface ConditionsOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RecordCondition.Conditions)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-     */
-    java.util.List 
-        getConditionsList();
-    /**
-     * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-     */
-    com.google.privacy.dlp.v2beta1.RecordCondition.Condition getConditions(int index);
-    /**
-     * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-     */
-    int getConditionsCount();
-    /**
-     * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-     */
-    java.util.List 
-        getConditionsOrBuilderList();
-    /**
-     * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-     */
-    com.google.privacy.dlp.v2beta1.RecordCondition.ConditionOrBuilder getConditionsOrBuilder(
-        int index);
-  }
-  /**
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RecordCondition.Conditions}
-   */
-  public  static final class Conditions extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RecordCondition.Conditions)
-      ConditionsOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use Conditions.newBuilder() to construct.
-    private Conditions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private Conditions() {
-      conditions_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Conditions(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                conditions_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              conditions_.add(
-                  input.readMessage(com.google.privacy.dlp.v2beta1.RecordCondition.Condition.parser(), extensionRegistry));
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-          conditions_ = java.util.Collections.unmodifiableList(conditions_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Conditions_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Conditions_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.class, com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.Builder.class);
-    }
-
-    public static final int CONDITIONS_FIELD_NUMBER = 1;
-    private java.util.List conditions_;
-    /**
-     * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-     */
-    public java.util.List getConditionsList() {
-      return conditions_;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-     */
-    public java.util.List 
-        getConditionsOrBuilderList() {
-      return conditions_;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-     */
-    public int getConditionsCount() {
-      return conditions_.size();
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordCondition.Condition getConditions(int index) {
-      return conditions_.get(index);
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordCondition.ConditionOrBuilder getConditionsOrBuilder(
-        int index) {
-      return conditions_.get(index);
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      for (int i = 0; i < conditions_.size(); i++) {
-        output.writeMessage(1, conditions_.get(i));
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < conditions_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, conditions_.get(i));
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.RecordCondition.Conditions)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.RecordCondition.Conditions other = (com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) obj;
-
-      boolean result = true;
-      result = result && getConditionsList()
-          .equals(other.getConditionsList());
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getConditionsCount() > 0) {
-        hash = (37 * hash) + CONDITIONS_FIELD_NUMBER;
-        hash = (53 * hash) + getConditionsList().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RecordCondition.Conditions prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RecordCondition.Conditions}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RecordCondition.Conditions)
-        com.google.privacy.dlp.v2beta1.RecordCondition.ConditionsOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Conditions_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Conditions_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.class, com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getConditionsFieldBuilder();
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (conditionsBuilder_ == null) {
-          conditions_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          conditionsBuilder_.clear();
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Conditions_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Conditions getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Conditions build() {
-        com.google.privacy.dlp.v2beta1.RecordCondition.Conditions result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Conditions buildPartial() {
-        com.google.privacy.dlp.v2beta1.RecordCondition.Conditions result = new com.google.privacy.dlp.v2beta1.RecordCondition.Conditions(this);
-        int from_bitField0_ = bitField0_;
-        if (conditionsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001)) {
-            conditions_ = java.util.Collections.unmodifiableList(conditions_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.conditions_ = conditions_;
-        } else {
-          result.conditions_ = conditionsBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.RecordCondition.Conditions)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RecordCondition.Conditions other) {
-        if (other == com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.getDefaultInstance()) return this;
-        if (conditionsBuilder_ == null) {
-          if (!other.conditions_.isEmpty()) {
-            if (conditions_.isEmpty()) {
-              conditions_ = other.conditions_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureConditionsIsMutable();
-              conditions_.addAll(other.conditions_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.conditions_.isEmpty()) {
-            if (conditionsBuilder_.isEmpty()) {
-              conditionsBuilder_.dispose();
-              conditionsBuilder_ = null;
-              conditions_ = other.conditions_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              conditionsBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getConditionsFieldBuilder() : null;
-            } else {
-              conditionsBuilder_.addAllMessages(other.conditions_);
-            }
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.RecordCondition.Conditions parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List conditions_ =
-        java.util.Collections.emptyList();
-      private void ensureConditionsIsMutable() {
-        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          conditions_ = new java.util.ArrayList(conditions_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.RecordCondition.Condition, com.google.privacy.dlp.v2beta1.RecordCondition.Condition.Builder, com.google.privacy.dlp.v2beta1.RecordCondition.ConditionOrBuilder> conditionsBuilder_;
-
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public java.util.List getConditionsList() {
-        if (conditionsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(conditions_);
-        } else {
-          return conditionsBuilder_.getMessageList();
-        }
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public int getConditionsCount() {
-        if (conditionsBuilder_ == null) {
-          return conditions_.size();
-        } else {
-          return conditionsBuilder_.getCount();
-        }
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Condition getConditions(int index) {
-        if (conditionsBuilder_ == null) {
-          return conditions_.get(index);
-        } else {
-          return conditionsBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public Builder setConditions(
-          int index, com.google.privacy.dlp.v2beta1.RecordCondition.Condition value) {
-        if (conditionsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureConditionsIsMutable();
-          conditions_.set(index, value);
-          onChanged();
-        } else {
-          conditionsBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public Builder setConditions(
-          int index, com.google.privacy.dlp.v2beta1.RecordCondition.Condition.Builder builderForValue) {
-        if (conditionsBuilder_ == null) {
-          ensureConditionsIsMutable();
-          conditions_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          conditionsBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public Builder addConditions(com.google.privacy.dlp.v2beta1.RecordCondition.Condition value) {
-        if (conditionsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureConditionsIsMutable();
-          conditions_.add(value);
-          onChanged();
-        } else {
-          conditionsBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public Builder addConditions(
-          int index, com.google.privacy.dlp.v2beta1.RecordCondition.Condition value) {
-        if (conditionsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureConditionsIsMutable();
-          conditions_.add(index, value);
-          onChanged();
-        } else {
-          conditionsBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public Builder addConditions(
-          com.google.privacy.dlp.v2beta1.RecordCondition.Condition.Builder builderForValue) {
-        if (conditionsBuilder_ == null) {
-          ensureConditionsIsMutable();
-          conditions_.add(builderForValue.build());
-          onChanged();
-        } else {
-          conditionsBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public Builder addConditions(
-          int index, com.google.privacy.dlp.v2beta1.RecordCondition.Condition.Builder builderForValue) {
-        if (conditionsBuilder_ == null) {
-          ensureConditionsIsMutable();
-          conditions_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          conditionsBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public Builder addAllConditions(
-          java.lang.Iterable values) {
-        if (conditionsBuilder_ == null) {
-          ensureConditionsIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, conditions_);
-          onChanged();
-        } else {
-          conditionsBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public Builder clearConditions() {
-        if (conditionsBuilder_ == null) {
-          conditions_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          conditionsBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public Builder removeConditions(int index) {
-        if (conditionsBuilder_ == null) {
-          ensureConditionsIsMutable();
-          conditions_.remove(index);
-          onChanged();
-        } else {
-          conditionsBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Condition.Builder getConditionsBuilder(
-          int index) {
-        return getConditionsFieldBuilder().getBuilder(index);
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.RecordCondition.ConditionOrBuilder getConditionsOrBuilder(
-          int index) {
-        if (conditionsBuilder_ == null) {
-          return conditions_.get(index);  } else {
-          return conditionsBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public java.util.List 
-           getConditionsOrBuilderList() {
-        if (conditionsBuilder_ != null) {
-          return conditionsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(conditions_);
-        }
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Condition.Builder addConditionsBuilder() {
-        return getConditionsFieldBuilder().addBuilder(
-            com.google.privacy.dlp.v2beta1.RecordCondition.Condition.getDefaultInstance());
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Condition.Builder addConditionsBuilder(
-          int index) {
-        return getConditionsFieldBuilder().addBuilder(
-            index, com.google.privacy.dlp.v2beta1.RecordCondition.Condition.getDefaultInstance());
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.RecordCondition.Condition conditions = 1;
-       */
-      public java.util.List 
-           getConditionsBuilderList() {
-        return getConditionsFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.RecordCondition.Condition, com.google.privacy.dlp.v2beta1.RecordCondition.Condition.Builder, com.google.privacy.dlp.v2beta1.RecordCondition.ConditionOrBuilder> 
-          getConditionsFieldBuilder() {
-        if (conditionsBuilder_ == null) {
-          conditionsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.RecordCondition.Condition, com.google.privacy.dlp.v2beta1.RecordCondition.Condition.Builder, com.google.privacy.dlp.v2beta1.RecordCondition.ConditionOrBuilder>(
-                  conditions_,
-                  ((bitField0_ & 0x00000001) == 0x00000001),
-                  getParentForChildren(),
-                  isClean());
-          conditions_ = null;
-        }
-        return conditionsBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RecordCondition.Conditions)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RecordCondition.Conditions)
-    private static final com.google.privacy.dlp.v2beta1.RecordCondition.Conditions DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RecordCondition.Conditions();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Conditions getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public Conditions parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Conditions(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordCondition.Conditions getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface ExpressionsOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RecordCondition.Expressions)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * The operator to apply to the result of conditions. Default and currently
-     * only supported value is `AND`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator logical_operator = 1;
-     */
-    int getLogicalOperatorValue();
-    /**
-     * 
-     * The operator to apply to the result of conditions. Default and currently
-     * only supported value is `AND`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator logical_operator = 1;
-     */
-    com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator getLogicalOperator();
-
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-     */
-    boolean hasConditions();
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-     */
-    com.google.privacy.dlp.v2beta1.RecordCondition.Conditions getConditions();
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-     */
-    com.google.privacy.dlp.v2beta1.RecordCondition.ConditionsOrBuilder getConditionsOrBuilder();
-
-    public com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.TypeCase getTypeCase();
-  }
-  /**
-   * 
-   * A collection of expressions
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RecordCondition.Expressions}
-   */
-  public  static final class Expressions extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RecordCondition.Expressions)
-      ExpressionsOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use Expressions.newBuilder() to construct.
-    private Expressions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private Expressions() {
-      logicalOperator_ = 0;
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Expressions(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 8: {
-              int rawValue = input.readEnum();
-
-              logicalOperator_ = rawValue;
-              break;
-            }
-            case 26: {
-              com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.Builder subBuilder = null;
-              if (typeCase_ == 3) {
-                subBuilder = ((com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) type_).toBuilder();
-              }
-              type_ =
-                  input.readMessage(com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) type_);
-                type_ = subBuilder.buildPartial();
-              }
-              typeCase_ = 3;
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Expressions_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Expressions_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.class, com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.Builder.class);
-    }
-
-    /**
-     * Protobuf enum {@code google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator}
-     */
-    public enum LogicalOperator
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * LOGICAL_OPERATOR_UNSPECIFIED = 0;
-       */
-      LOGICAL_OPERATOR_UNSPECIFIED(0),
-      /**
-       * AND = 1;
-       */
-      AND(1),
-      UNRECOGNIZED(-1),
-      ;
-
-      /**
-       * LOGICAL_OPERATOR_UNSPECIFIED = 0;
-       */
-      public static final int LOGICAL_OPERATOR_UNSPECIFIED_VALUE = 0;
-      /**
-       * AND = 1;
-       */
-      public static final int AND_VALUE = 1;
-
-
-      public final int getNumber() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalArgumentException(
-              "Can't get the number of an unknown enum value.");
-        }
-        return value;
-      }
-
-      /**
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static LogicalOperator valueOf(int value) {
-        return forNumber(value);
-      }
-
-      public static LogicalOperator forNumber(int value) {
-        switch (value) {
-          case 0: return LOGICAL_OPERATOR_UNSPECIFIED;
-          case 1: return AND;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          LogicalOperator> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap() {
-              public LogicalOperator findValueByNumber(int number) {
-                return LogicalOperator.forNumber(number);
-              }
-            };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        return getDescriptor().getValues().get(ordinal());
-      }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final LogicalOperator[] VALUES = values();
-
-      public static LogicalOperator valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        if (desc.getIndex() == -1) {
-          return UNRECOGNIZED;
-        }
-        return VALUES[desc.getIndex()];
-      }
-
-      private final int value;
-
-      private LogicalOperator(int value) {
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator)
-    }
-
-    private int typeCase_ = 0;
-    private java.lang.Object type_;
-    public enum TypeCase
-        implements com.google.protobuf.Internal.EnumLite {
-      CONDITIONS(3),
-      TYPE_NOT_SET(0);
-      private final int value;
-      private TypeCase(int value) {
-        this.value = value;
-      }
-      /**
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static TypeCase valueOf(int value) {
-        return forNumber(value);
-      }
-
-      public static TypeCase forNumber(int value) {
-        switch (value) {
-          case 3: return CONDITIONS;
-          case 0: return TYPE_NOT_SET;
-          default: return null;
-        }
-      }
-      public int getNumber() {
-        return this.value;
-      }
-    };
-
-    public TypeCase
-    getTypeCase() {
-      return TypeCase.forNumber(
-          typeCase_);
-    }
-
-    public static final int LOGICAL_OPERATOR_FIELD_NUMBER = 1;
-    private int logicalOperator_;
-    /**
-     * 
-     * The operator to apply to the result of conditions. Default and currently
-     * only supported value is `AND`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator logical_operator = 1;
-     */
-    public int getLogicalOperatorValue() {
-      return logicalOperator_;
-    }
-    /**
-     * 
-     * The operator to apply to the result of conditions. Default and currently
-     * only supported value is `AND`.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator logical_operator = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator getLogicalOperator() {
-      com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator result = com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator.valueOf(logicalOperator_);
-      return result == null ? com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator.UNRECOGNIZED : result;
-    }
-
-    public static final int CONDITIONS_FIELD_NUMBER = 3;
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-     */
-    public boolean hasConditions() {
-      return typeCase_ == 3;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordCondition.Conditions getConditions() {
-      if (typeCase_ == 3) {
-         return (com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) type_;
-      }
-      return com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.getDefaultInstance();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordCondition.ConditionsOrBuilder getConditionsOrBuilder() {
-      if (typeCase_ == 3) {
-         return (com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) type_;
-      }
-      return com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.getDefaultInstance();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (logicalOperator_ != com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator.LOGICAL_OPERATOR_UNSPECIFIED.getNumber()) {
-        output.writeEnum(1, logicalOperator_);
-      }
-      if (typeCase_ == 3) {
-        output.writeMessage(3, (com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) type_);
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (logicalOperator_ != com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator.LOGICAL_OPERATOR_UNSPECIFIED.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, logicalOperator_);
-      }
-      if (typeCase_ == 3) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, (com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) type_);
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.RecordCondition.Expressions)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.RecordCondition.Expressions other = (com.google.privacy.dlp.v2beta1.RecordCondition.Expressions) obj;
-
-      boolean result = true;
-      result = result && logicalOperator_ == other.logicalOperator_;
-      result = result && getTypeCase().equals(
-          other.getTypeCase());
-      if (!result) return false;
-      switch (typeCase_) {
-        case 3:
-          result = result && getConditions()
-              .equals(other.getConditions());
-          break;
-        case 0:
-        default:
-      }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + LOGICAL_OPERATOR_FIELD_NUMBER;
-      hash = (53 * hash) + logicalOperator_;
-      switch (typeCase_) {
-        case 3:
-          hash = (37 * hash) + CONDITIONS_FIELD_NUMBER;
-          hash = (53 * hash) + getConditions().hashCode();
-          break;
-        case 0:
-        default:
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RecordCondition.Expressions prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * A collection of expressions
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RecordCondition.Expressions}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RecordCondition.Expressions)
-        com.google.privacy.dlp.v2beta1.RecordCondition.ExpressionsOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Expressions_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Expressions_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.class, com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        logicalOperator_ = 0;
-
-        typeCase_ = 0;
-        type_ = null;
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_Expressions_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Expressions getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Expressions build() {
-        com.google.privacy.dlp.v2beta1.RecordCondition.Expressions result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Expressions buildPartial() {
-        com.google.privacy.dlp.v2beta1.RecordCondition.Expressions result = new com.google.privacy.dlp.v2beta1.RecordCondition.Expressions(this);
-        result.logicalOperator_ = logicalOperator_;
-        if (typeCase_ == 3) {
-          if (conditionsBuilder_ == null) {
-            result.type_ = type_;
-          } else {
-            result.type_ = conditionsBuilder_.build();
-          }
-        }
-        result.typeCase_ = typeCase_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.RecordCondition.Expressions) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.RecordCondition.Expressions)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RecordCondition.Expressions other) {
-        if (other == com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.getDefaultInstance()) return this;
-        if (other.logicalOperator_ != 0) {
-          setLogicalOperatorValue(other.getLogicalOperatorValue());
-        }
-        switch (other.getTypeCase()) {
-          case CONDITIONS: {
-            mergeConditions(other.getConditions());
-            break;
-          }
-          case TYPE_NOT_SET: {
-            break;
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.RecordCondition.Expressions parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.RecordCondition.Expressions) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int typeCase_ = 0;
-      private java.lang.Object type_;
-      public TypeCase
-          getTypeCase() {
-        return TypeCase.forNumber(
-            typeCase_);
-      }
-
-      public Builder clearType() {
-        typeCase_ = 0;
-        type_ = null;
-        onChanged();
-        return this;
-      }
-
-
-      private int logicalOperator_ = 0;
-      /**
-       * 
-       * The operator to apply to the result of conditions. Default and currently
-       * only supported value is `AND`.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator logical_operator = 1;
-       */
-      public int getLogicalOperatorValue() {
-        return logicalOperator_;
-      }
-      /**
-       * 
-       * The operator to apply to the result of conditions. Default and currently
-       * only supported value is `AND`.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator logical_operator = 1;
-       */
-      public Builder setLogicalOperatorValue(int value) {
-        logicalOperator_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The operator to apply to the result of conditions. Default and currently
-       * only supported value is `AND`.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator logical_operator = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator getLogicalOperator() {
-        com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator result = com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator.valueOf(logicalOperator_);
-        return result == null ? com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator.UNRECOGNIZED : result;
-      }
-      /**
-       * 
-       * The operator to apply to the result of conditions. Default and currently
-       * only supported value is `AND`.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator logical_operator = 1;
-       */
-      public Builder setLogicalOperator(com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        logicalOperator_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * The operator to apply to the result of conditions. Default and currently
-       * only supported value is `AND`.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.RecordCondition.Expressions.LogicalOperator logical_operator = 1;
-       */
-      public Builder clearLogicalOperator() {
-        
-        logicalOperator_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.RecordCondition.Conditions, com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.Builder, com.google.privacy.dlp.v2beta1.RecordCondition.ConditionsOrBuilder> conditionsBuilder_;
-      /**
-       * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-       */
-      public boolean hasConditions() {
-        return typeCase_ == 3;
-      }
-      /**
-       * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-       */
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Conditions getConditions() {
-        if (conditionsBuilder_ == null) {
-          if (typeCase_ == 3) {
-            return (com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) type_;
-          }
-          return com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.getDefaultInstance();
-        } else {
-          if (typeCase_ == 3) {
-            return conditionsBuilder_.getMessage();
-          }
-          return com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.getDefaultInstance();
-        }
-      }
-      /**
-       * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-       */
-      public Builder setConditions(com.google.privacy.dlp.v2beta1.RecordCondition.Conditions value) {
-        if (conditionsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          type_ = value;
-          onChanged();
-        } else {
-          conditionsBuilder_.setMessage(value);
-        }
-        typeCase_ = 3;
-        return this;
-      }
-      /**
-       * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-       */
-      public Builder setConditions(
-          com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.Builder builderForValue) {
-        if (conditionsBuilder_ == null) {
-          type_ = builderForValue.build();
-          onChanged();
-        } else {
-          conditionsBuilder_.setMessage(builderForValue.build());
-        }
-        typeCase_ = 3;
-        return this;
-      }
-      /**
-       * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-       */
-      public Builder mergeConditions(com.google.privacy.dlp.v2beta1.RecordCondition.Conditions value) {
-        if (conditionsBuilder_ == null) {
-          if (typeCase_ == 3 &&
-              type_ != com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.getDefaultInstance()) {
-            type_ = com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.newBuilder((com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) type_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            type_ = value;
-          }
-          onChanged();
-        } else {
-          if (typeCase_ == 3) {
-            conditionsBuilder_.mergeFrom(value);
-          }
-          conditionsBuilder_.setMessage(value);
-        }
-        typeCase_ = 3;
-        return this;
-      }
-      /**
-       * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-       */
-      public Builder clearConditions() {
-        if (conditionsBuilder_ == null) {
-          if (typeCase_ == 3) {
-            typeCase_ = 0;
-            type_ = null;
-            onChanged();
-          }
-        } else {
-          if (typeCase_ == 3) {
-            typeCase_ = 0;
-            type_ = null;
-          }
-          conditionsBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-       */
-      public com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.Builder getConditionsBuilder() {
-        return getConditionsFieldBuilder().getBuilder();
-      }
-      /**
-       * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-       */
-      public com.google.privacy.dlp.v2beta1.RecordCondition.ConditionsOrBuilder getConditionsOrBuilder() {
-        if ((typeCase_ == 3) && (conditionsBuilder_ != null)) {
-          return conditionsBuilder_.getMessageOrBuilder();
-        } else {
-          if (typeCase_ == 3) {
-            return (com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) type_;
-          }
-          return com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.getDefaultInstance();
-        }
-      }
-      /**
-       * .google.privacy.dlp.v2beta1.RecordCondition.Conditions conditions = 3;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.RecordCondition.Conditions, com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.Builder, com.google.privacy.dlp.v2beta1.RecordCondition.ConditionsOrBuilder> 
-          getConditionsFieldBuilder() {
-        if (conditionsBuilder_ == null) {
-          if (!(typeCase_ == 3)) {
-            type_ = com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.getDefaultInstance();
-          }
-          conditionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.RecordCondition.Conditions, com.google.privacy.dlp.v2beta1.RecordCondition.Conditions.Builder, com.google.privacy.dlp.v2beta1.RecordCondition.ConditionsOrBuilder>(
-                  (com.google.privacy.dlp.v2beta1.RecordCondition.Conditions) type_,
-                  getParentForChildren(),
-                  isClean());
-          type_ = null;
-        }
-        typeCase_ = 3;
-        onChanged();;
-        return conditionsBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RecordCondition.Expressions)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RecordCondition.Expressions)
-    private static final com.google.privacy.dlp.v2beta1.RecordCondition.Expressions DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RecordCondition.Expressions();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RecordCondition.Expressions getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public Expressions parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Expressions(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordCondition.Expressions getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public static final int EXPRESSIONS_FIELD_NUMBER = 3;
-  private com.google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions_;
-  /**
-   * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-   */
-  public boolean hasExpressions() {
-    return expressions_ != null;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordCondition.Expressions getExpressions() {
-    return expressions_ == null ? com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.getDefaultInstance() : expressions_;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordCondition.ExpressionsOrBuilder getExpressionsOrBuilder() {
-    return getExpressions();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (expressions_ != null) {
-      output.writeMessage(3, getExpressions());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (expressions_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, getExpressions());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.RecordCondition)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.RecordCondition other = (com.google.privacy.dlp.v2beta1.RecordCondition) obj;
-
-    boolean result = true;
-    result = result && (hasExpressions() == other.hasExpressions());
-    if (hasExpressions()) {
-      result = result && getExpressions()
-          .equals(other.getExpressions());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasExpressions()) {
-      hash = (37 * hash) + EXPRESSIONS_FIELD_NUMBER;
-      hash = (53 * hash) + getExpressions().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RecordCondition parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordCondition parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordCondition parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordCondition parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordCondition parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordCondition parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordCondition parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordCondition parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordCondition parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordCondition parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordCondition parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordCondition parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RecordCondition prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * A condition for determining whether a transformation should be applied to
-   * a field.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RecordCondition}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RecordCondition)
-      com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RecordCondition.class, com.google.privacy.dlp.v2beta1.RecordCondition.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.RecordCondition.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (expressionsBuilder_ == null) {
-        expressions_ = null;
-      } else {
-        expressions_ = null;
-        expressionsBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordCondition_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordCondition getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.RecordCondition.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordCondition build() {
-      com.google.privacy.dlp.v2beta1.RecordCondition result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordCondition buildPartial() {
-      com.google.privacy.dlp.v2beta1.RecordCondition result = new com.google.privacy.dlp.v2beta1.RecordCondition(this);
-      if (expressionsBuilder_ == null) {
-        result.expressions_ = expressions_;
-      } else {
-        result.expressions_ = expressionsBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.RecordCondition) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.RecordCondition)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RecordCondition other) {
-      if (other == com.google.privacy.dlp.v2beta1.RecordCondition.getDefaultInstance()) return this;
-      if (other.hasExpressions()) {
-        mergeExpressions(other.getExpressions());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.RecordCondition parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.RecordCondition) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordCondition.Expressions, com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.Builder, com.google.privacy.dlp.v2beta1.RecordCondition.ExpressionsOrBuilder> expressionsBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-     */
-    public boolean hasExpressions() {
-      return expressionsBuilder_ != null || expressions_ != null;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordCondition.Expressions getExpressions() {
-      if (expressionsBuilder_ == null) {
-        return expressions_ == null ? com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.getDefaultInstance() : expressions_;
-      } else {
-        return expressionsBuilder_.getMessage();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-     */
-    public Builder setExpressions(com.google.privacy.dlp.v2beta1.RecordCondition.Expressions value) {
-      if (expressionsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        expressions_ = value;
-        onChanged();
-      } else {
-        expressionsBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-     */
-    public Builder setExpressions(
-        com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.Builder builderForValue) {
-      if (expressionsBuilder_ == null) {
-        expressions_ = builderForValue.build();
-        onChanged();
-      } else {
-        expressionsBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-     */
-    public Builder mergeExpressions(com.google.privacy.dlp.v2beta1.RecordCondition.Expressions value) {
-      if (expressionsBuilder_ == null) {
-        if (expressions_ != null) {
-          expressions_ =
-            com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.newBuilder(expressions_).mergeFrom(value).buildPartial();
-        } else {
-          expressions_ = value;
-        }
-        onChanged();
-      } else {
-        expressionsBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-     */
-    public Builder clearExpressions() {
-      if (expressionsBuilder_ == null) {
-        expressions_ = null;
-        onChanged();
-      } else {
-        expressions_ = null;
-        expressionsBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.Builder getExpressionsBuilder() {
-      
-      onChanged();
-      return getExpressionsFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordCondition.ExpressionsOrBuilder getExpressionsOrBuilder() {
-      if (expressionsBuilder_ != null) {
-        return expressionsBuilder_.getMessageOrBuilder();
-      } else {
-        return expressions_ == null ?
-            com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.getDefaultInstance() : expressions_;
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordCondition.Expressions, com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.Builder, com.google.privacy.dlp.v2beta1.RecordCondition.ExpressionsOrBuilder> 
-        getExpressionsFieldBuilder() {
-      if (expressionsBuilder_ == null) {
-        expressionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RecordCondition.Expressions, com.google.privacy.dlp.v2beta1.RecordCondition.Expressions.Builder, com.google.privacy.dlp.v2beta1.RecordCondition.ExpressionsOrBuilder>(
-                getExpressions(),
-                getParentForChildren(),
-                isClean());
-        expressions_ = null;
-      }
-      return expressionsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RecordCondition)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RecordCondition)
-  private static final com.google.privacy.dlp.v2beta1.RecordCondition DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RecordCondition();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RecordCondition getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public RecordCondition parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecordCondition(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.RecordCondition getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordConditionOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordConditionOrBuilder.java
deleted file mode 100644
index f10caf61e360..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordConditionOrBuilder.java
+++ /dev/null
@@ -1,22 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface RecordConditionOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RecordCondition)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-   */
-  boolean hasExpressions();
-  /**
-   * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-   */
-  com.google.privacy.dlp.v2beta1.RecordCondition.Expressions getExpressions();
-  /**
-   * .google.privacy.dlp.v2beta1.RecordCondition.Expressions expressions = 3;
-   */
-  com.google.privacy.dlp.v2beta1.RecordCondition.ExpressionsOrBuilder getExpressionsOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordKey.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordKey.java
deleted file mode 100644
index e144c7be7420..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordKey.java
+++ /dev/null
@@ -1,873 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Message for a unique key indicating a record that contains a finding.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.RecordKey}
- */
-public  final class RecordKey extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RecordKey)
-    RecordKeyOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use RecordKey.newBuilder() to construct.
-  private RecordKey(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private RecordKey() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private RecordKey(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.CloudStorageKey.Builder subBuilder = null;
-            if (typeCase_ == 1) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.CloudStorageKey) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.CloudStorageKey.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.CloudStorageKey) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 1;
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.DatastoreKey.Builder subBuilder = null;
-            if (typeCase_ == 2) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.DatastoreKey) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.DatastoreKey.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.DatastoreKey) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 2;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_RecordKey_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_RecordKey_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.RecordKey.class, com.google.privacy.dlp.v2beta1.RecordKey.Builder.class);
-  }
-
-  private int typeCase_ = 0;
-  private java.lang.Object type_;
-  public enum TypeCase
-      implements com.google.protobuf.Internal.EnumLite {
-    CLOUD_STORAGE_KEY(1),
-    DATASTORE_KEY(2),
-    TYPE_NOT_SET(0);
-    private final int value;
-    private TypeCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static TypeCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static TypeCase forNumber(int value) {
-      switch (value) {
-        case 1: return CLOUD_STORAGE_KEY;
-        case 2: return DATASTORE_KEY;
-        case 0: return TYPE_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public TypeCase
-  getTypeCase() {
-    return TypeCase.forNumber(
-        typeCase_);
-  }
-
-  public static final int CLOUD_STORAGE_KEY_FIELD_NUMBER = 1;
-  /**
-   * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-   */
-  public boolean hasCloudStorageKey() {
-    return typeCase_ == 1;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.CloudStorageKey getCloudStorageKey() {
-    if (typeCase_ == 1) {
-       return (com.google.privacy.dlp.v2beta1.CloudStorageKey) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.CloudStorageKey.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.CloudStorageKeyOrBuilder getCloudStorageKeyOrBuilder() {
-    if (typeCase_ == 1) {
-       return (com.google.privacy.dlp.v2beta1.CloudStorageKey) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.CloudStorageKey.getDefaultInstance();
-  }
-
-  public static final int DATASTORE_KEY_FIELD_NUMBER = 2;
-  /**
-   * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-   */
-  public boolean hasDatastoreKey() {
-    return typeCase_ == 2;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.DatastoreKey getDatastoreKey() {
-    if (typeCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.DatastoreKey) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.DatastoreKey.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.DatastoreKeyOrBuilder getDatastoreKeyOrBuilder() {
-    if (typeCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.DatastoreKey) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.DatastoreKey.getDefaultInstance();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (typeCase_ == 1) {
-      output.writeMessage(1, (com.google.privacy.dlp.v2beta1.CloudStorageKey) type_);
-    }
-    if (typeCase_ == 2) {
-      output.writeMessage(2, (com.google.privacy.dlp.v2beta1.DatastoreKey) type_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (typeCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, (com.google.privacy.dlp.v2beta1.CloudStorageKey) type_);
-    }
-    if (typeCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, (com.google.privacy.dlp.v2beta1.DatastoreKey) type_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.RecordKey)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.RecordKey other = (com.google.privacy.dlp.v2beta1.RecordKey) obj;
-
-    boolean result = true;
-    result = result && getTypeCase().equals(
-        other.getTypeCase());
-    if (!result) return false;
-    switch (typeCase_) {
-      case 1:
-        result = result && getCloudStorageKey()
-            .equals(other.getCloudStorageKey());
-        break;
-      case 2:
-        result = result && getDatastoreKey()
-            .equals(other.getDatastoreKey());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    switch (typeCase_) {
-      case 1:
-        hash = (37 * hash) + CLOUD_STORAGE_KEY_FIELD_NUMBER;
-        hash = (53 * hash) + getCloudStorageKey().hashCode();
-        break;
-      case 2:
-        hash = (37 * hash) + DATASTORE_KEY_FIELD_NUMBER;
-        hash = (53 * hash) + getDatastoreKey().hashCode();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RecordKey parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordKey parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordKey parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordKey parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordKey parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordKey parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordKey parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordKey parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordKey parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordKey parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordKey parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordKey parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RecordKey prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Message for a unique key indicating a record that contains a finding.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RecordKey}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RecordKey)
-      com.google.privacy.dlp.v2beta1.RecordKeyOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_RecordKey_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_RecordKey_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RecordKey.class, com.google.privacy.dlp.v2beta1.RecordKey.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.RecordKey.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      typeCase_ = 0;
-      type_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_RecordKey_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordKey getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.RecordKey.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordKey build() {
-      com.google.privacy.dlp.v2beta1.RecordKey result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordKey buildPartial() {
-      com.google.privacy.dlp.v2beta1.RecordKey result = new com.google.privacy.dlp.v2beta1.RecordKey(this);
-      if (typeCase_ == 1) {
-        if (cloudStorageKeyBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = cloudStorageKeyBuilder_.build();
-        }
-      }
-      if (typeCase_ == 2) {
-        if (datastoreKeyBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = datastoreKeyBuilder_.build();
-        }
-      }
-      result.typeCase_ = typeCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.RecordKey) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.RecordKey)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RecordKey other) {
-      if (other == com.google.privacy.dlp.v2beta1.RecordKey.getDefaultInstance()) return this;
-      switch (other.getTypeCase()) {
-        case CLOUD_STORAGE_KEY: {
-          mergeCloudStorageKey(other.getCloudStorageKey());
-          break;
-        }
-        case DATASTORE_KEY: {
-          mergeDatastoreKey(other.getDatastoreKey());
-          break;
-        }
-        case TYPE_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.RecordKey parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.RecordKey) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int typeCase_ = 0;
-    private java.lang.Object type_;
-    public TypeCase
-        getTypeCase() {
-      return TypeCase.forNumber(
-          typeCase_);
-    }
-
-    public Builder clearType() {
-      typeCase_ = 0;
-      type_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CloudStorageKey, com.google.privacy.dlp.v2beta1.CloudStorageKey.Builder, com.google.privacy.dlp.v2beta1.CloudStorageKeyOrBuilder> cloudStorageKeyBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-     */
-    public boolean hasCloudStorageKey() {
-      return typeCase_ == 1;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CloudStorageKey getCloudStorageKey() {
-      if (cloudStorageKeyBuilder_ == null) {
-        if (typeCase_ == 1) {
-          return (com.google.privacy.dlp.v2beta1.CloudStorageKey) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.CloudStorageKey.getDefaultInstance();
-      } else {
-        if (typeCase_ == 1) {
-          return cloudStorageKeyBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.CloudStorageKey.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-     */
-    public Builder setCloudStorageKey(com.google.privacy.dlp.v2beta1.CloudStorageKey value) {
-      if (cloudStorageKeyBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        cloudStorageKeyBuilder_.setMessage(value);
-      }
-      typeCase_ = 1;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-     */
-    public Builder setCloudStorageKey(
-        com.google.privacy.dlp.v2beta1.CloudStorageKey.Builder builderForValue) {
-      if (cloudStorageKeyBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        cloudStorageKeyBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 1;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-     */
-    public Builder mergeCloudStorageKey(com.google.privacy.dlp.v2beta1.CloudStorageKey value) {
-      if (cloudStorageKeyBuilder_ == null) {
-        if (typeCase_ == 1 &&
-            type_ != com.google.privacy.dlp.v2beta1.CloudStorageKey.getDefaultInstance()) {
-          type_ = com.google.privacy.dlp.v2beta1.CloudStorageKey.newBuilder((com.google.privacy.dlp.v2beta1.CloudStorageKey) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 1) {
-          cloudStorageKeyBuilder_.mergeFrom(value);
-        }
-        cloudStorageKeyBuilder_.setMessage(value);
-      }
-      typeCase_ = 1;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-     */
-    public Builder clearCloudStorageKey() {
-      if (cloudStorageKeyBuilder_ == null) {
-        if (typeCase_ == 1) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 1) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        cloudStorageKeyBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CloudStorageKey.Builder getCloudStorageKeyBuilder() {
-      return getCloudStorageKeyFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.CloudStorageKeyOrBuilder getCloudStorageKeyOrBuilder() {
-      if ((typeCase_ == 1) && (cloudStorageKeyBuilder_ != null)) {
-        return cloudStorageKeyBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 1) {
-          return (com.google.privacy.dlp.v2beta1.CloudStorageKey) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.CloudStorageKey.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CloudStorageKey, com.google.privacy.dlp.v2beta1.CloudStorageKey.Builder, com.google.privacy.dlp.v2beta1.CloudStorageKeyOrBuilder> 
-        getCloudStorageKeyFieldBuilder() {
-      if (cloudStorageKeyBuilder_ == null) {
-        if (!(typeCase_ == 1)) {
-          type_ = com.google.privacy.dlp.v2beta1.CloudStorageKey.getDefaultInstance();
-        }
-        cloudStorageKeyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CloudStorageKey, com.google.privacy.dlp.v2beta1.CloudStorageKey.Builder, com.google.privacy.dlp.v2beta1.CloudStorageKeyOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.CloudStorageKey) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 1;
-      onChanged();;
-      return cloudStorageKeyBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.DatastoreKey, com.google.privacy.dlp.v2beta1.DatastoreKey.Builder, com.google.privacy.dlp.v2beta1.DatastoreKeyOrBuilder> datastoreKeyBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-     */
-    public boolean hasDatastoreKey() {
-      return typeCase_ == 2;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.DatastoreKey getDatastoreKey() {
-      if (datastoreKeyBuilder_ == null) {
-        if (typeCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.DatastoreKey) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.DatastoreKey.getDefaultInstance();
-      } else {
-        if (typeCase_ == 2) {
-          return datastoreKeyBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.DatastoreKey.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-     */
-    public Builder setDatastoreKey(com.google.privacy.dlp.v2beta1.DatastoreKey value) {
-      if (datastoreKeyBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        datastoreKeyBuilder_.setMessage(value);
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-     */
-    public Builder setDatastoreKey(
-        com.google.privacy.dlp.v2beta1.DatastoreKey.Builder builderForValue) {
-      if (datastoreKeyBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        datastoreKeyBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-     */
-    public Builder mergeDatastoreKey(com.google.privacy.dlp.v2beta1.DatastoreKey value) {
-      if (datastoreKeyBuilder_ == null) {
-        if (typeCase_ == 2 &&
-            type_ != com.google.privacy.dlp.v2beta1.DatastoreKey.getDefaultInstance()) {
-          type_ = com.google.privacy.dlp.v2beta1.DatastoreKey.newBuilder((com.google.privacy.dlp.v2beta1.DatastoreKey) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 2) {
-          datastoreKeyBuilder_.mergeFrom(value);
-        }
-        datastoreKeyBuilder_.setMessage(value);
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-     */
-    public Builder clearDatastoreKey() {
-      if (datastoreKeyBuilder_ == null) {
-        if (typeCase_ == 2) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 2) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        datastoreKeyBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.DatastoreKey.Builder getDatastoreKeyBuilder() {
-      return getDatastoreKeyFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.DatastoreKeyOrBuilder getDatastoreKeyOrBuilder() {
-      if ((typeCase_ == 2) && (datastoreKeyBuilder_ != null)) {
-        return datastoreKeyBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.DatastoreKey) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.DatastoreKey.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.DatastoreKey, com.google.privacy.dlp.v2beta1.DatastoreKey.Builder, com.google.privacy.dlp.v2beta1.DatastoreKeyOrBuilder> 
-        getDatastoreKeyFieldBuilder() {
-      if (datastoreKeyBuilder_ == null) {
-        if (!(typeCase_ == 2)) {
-          type_ = com.google.privacy.dlp.v2beta1.DatastoreKey.getDefaultInstance();
-        }
-        datastoreKeyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.DatastoreKey, com.google.privacy.dlp.v2beta1.DatastoreKey.Builder, com.google.privacy.dlp.v2beta1.DatastoreKeyOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.DatastoreKey) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 2;
-      onChanged();;
-      return datastoreKeyBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RecordKey)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RecordKey)
-  private static final com.google.privacy.dlp.v2beta1.RecordKey DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RecordKey();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RecordKey getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public RecordKey parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecordKey(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.RecordKey getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordKeyOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordKeyOrBuilder.java
deleted file mode 100644
index 06f4c0f266e1..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordKeyOrBuilder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface RecordKeyOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RecordKey)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-   */
-  boolean hasCloudStorageKey();
-  /**
-   * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-   */
-  com.google.privacy.dlp.v2beta1.CloudStorageKey getCloudStorageKey();
-  /**
-   * .google.privacy.dlp.v2beta1.CloudStorageKey cloud_storage_key = 1;
-   */
-  com.google.privacy.dlp.v2beta1.CloudStorageKeyOrBuilder getCloudStorageKeyOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-   */
-  boolean hasDatastoreKey();
-  /**
-   * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-   */
-  com.google.privacy.dlp.v2beta1.DatastoreKey getDatastoreKey();
-  /**
-   * .google.privacy.dlp.v2beta1.DatastoreKey datastore_key = 2;
-   */
-  com.google.privacy.dlp.v2beta1.DatastoreKeyOrBuilder getDatastoreKeyOrBuilder();
-
-  public com.google.privacy.dlp.v2beta1.RecordKey.TypeCase getTypeCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordSuppression.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordSuppression.java
deleted file mode 100644
index b3e9a714feaa..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordSuppression.java
+++ /dev/null
@@ -1,580 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Configuration to suppress records whose suppression conditions evaluate to
- * true.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.RecordSuppression}
- */
-public  final class RecordSuppression extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RecordSuppression)
-    RecordSuppressionOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use RecordSuppression.newBuilder() to construct.
-  private RecordSuppression(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private RecordSuppression() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private RecordSuppression(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.RecordCondition.Builder subBuilder = null;
-            if (condition_ != null) {
-              subBuilder = condition_.toBuilder();
-            }
-            condition_ = input.readMessage(com.google.privacy.dlp.v2beta1.RecordCondition.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(condition_);
-              condition_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordSuppression_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordSuppression_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.RecordSuppression.class, com.google.privacy.dlp.v2beta1.RecordSuppression.Builder.class);
-  }
-
-  public static final int CONDITION_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.RecordCondition condition_;
-  /**
-   * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-   */
-  public boolean hasCondition() {
-    return condition_ != null;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordCondition getCondition() {
-    return condition_ == null ? com.google.privacy.dlp.v2beta1.RecordCondition.getDefaultInstance() : condition_;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder getConditionOrBuilder() {
-    return getCondition();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (condition_ != null) {
-      output.writeMessage(1, getCondition());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (condition_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getCondition());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.RecordSuppression)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.RecordSuppression other = (com.google.privacy.dlp.v2beta1.RecordSuppression) obj;
-
-    boolean result = true;
-    result = result && (hasCondition() == other.hasCondition());
-    if (hasCondition()) {
-      result = result && getCondition()
-          .equals(other.getCondition());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasCondition()) {
-      hash = (37 * hash) + CONDITION_FIELD_NUMBER;
-      hash = (53 * hash) + getCondition().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RecordSuppression prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Configuration to suppress records whose suppression conditions evaluate to
-   * true.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RecordSuppression}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RecordSuppression)
-      com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordSuppression_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordSuppression_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RecordSuppression.class, com.google.privacy.dlp.v2beta1.RecordSuppression.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.RecordSuppression.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (conditionBuilder_ == null) {
-        condition_ = null;
-      } else {
-        condition_ = null;
-        conditionBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordSuppression_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordSuppression getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.RecordSuppression.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordSuppression build() {
-      com.google.privacy.dlp.v2beta1.RecordSuppression result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordSuppression buildPartial() {
-      com.google.privacy.dlp.v2beta1.RecordSuppression result = new com.google.privacy.dlp.v2beta1.RecordSuppression(this);
-      if (conditionBuilder_ == null) {
-        result.condition_ = condition_;
-      } else {
-        result.condition_ = conditionBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.RecordSuppression) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.RecordSuppression)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RecordSuppression other) {
-      if (other == com.google.privacy.dlp.v2beta1.RecordSuppression.getDefaultInstance()) return this;
-      if (other.hasCondition()) {
-        mergeCondition(other.getCondition());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.RecordSuppression parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.RecordSuppression) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.RecordCondition condition_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordCondition, com.google.privacy.dlp.v2beta1.RecordCondition.Builder, com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder> conditionBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-     */
-    public boolean hasCondition() {
-      return conditionBuilder_ != null || condition_ != null;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordCondition getCondition() {
-      if (conditionBuilder_ == null) {
-        return condition_ == null ? com.google.privacy.dlp.v2beta1.RecordCondition.getDefaultInstance() : condition_;
-      } else {
-        return conditionBuilder_.getMessage();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-     */
-    public Builder setCondition(com.google.privacy.dlp.v2beta1.RecordCondition value) {
-      if (conditionBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        condition_ = value;
-        onChanged();
-      } else {
-        conditionBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-     */
-    public Builder setCondition(
-        com.google.privacy.dlp.v2beta1.RecordCondition.Builder builderForValue) {
-      if (conditionBuilder_ == null) {
-        condition_ = builderForValue.build();
-        onChanged();
-      } else {
-        conditionBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-     */
-    public Builder mergeCondition(com.google.privacy.dlp.v2beta1.RecordCondition value) {
-      if (conditionBuilder_ == null) {
-        if (condition_ != null) {
-          condition_ =
-            com.google.privacy.dlp.v2beta1.RecordCondition.newBuilder(condition_).mergeFrom(value).buildPartial();
-        } else {
-          condition_ = value;
-        }
-        onChanged();
-      } else {
-        conditionBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-     */
-    public Builder clearCondition() {
-      if (conditionBuilder_ == null) {
-        condition_ = null;
-        onChanged();
-      } else {
-        condition_ = null;
-        conditionBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordCondition.Builder getConditionBuilder() {
-      
-      onChanged();
-      return getConditionFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder getConditionOrBuilder() {
-      if (conditionBuilder_ != null) {
-        return conditionBuilder_.getMessageOrBuilder();
-      } else {
-        return condition_ == null ?
-            com.google.privacy.dlp.v2beta1.RecordCondition.getDefaultInstance() : condition_;
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordCondition, com.google.privacy.dlp.v2beta1.RecordCondition.Builder, com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder> 
-        getConditionFieldBuilder() {
-      if (conditionBuilder_ == null) {
-        conditionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RecordCondition, com.google.privacy.dlp.v2beta1.RecordCondition.Builder, com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder>(
-                getCondition(),
-                getParentForChildren(),
-                isClean());
-        condition_ = null;
-      }
-      return conditionBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RecordSuppression)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RecordSuppression)
-  private static final com.google.privacy.dlp.v2beta1.RecordSuppression DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RecordSuppression();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RecordSuppression getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public RecordSuppression parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecordSuppression(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.RecordSuppression getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordSuppressionOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordSuppressionOrBuilder.java
deleted file mode 100644
index 2e93d3546b82..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordSuppressionOrBuilder.java
+++ /dev/null
@@ -1,22 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface RecordSuppressionOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RecordSuppression)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-   */
-  boolean hasCondition();
-  /**
-   * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-   */
-  com.google.privacy.dlp.v2beta1.RecordCondition getCondition();
-  /**
-   * .google.privacy.dlp.v2beta1.RecordCondition condition = 1;
-   */
-  com.google.privacy.dlp.v2beta1.RecordConditionOrBuilder getConditionOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordTransformations.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordTransformations.java
deleted file mode 100644
index d14fb510f3d2..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordTransformations.java
+++ /dev/null
@@ -1,1294 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * A type of transformation that is applied over structured data such as a
- * table.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.RecordTransformations}
- */
-public  final class RecordTransformations extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RecordTransformations)
-    RecordTransformationsOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use RecordTransformations.newBuilder() to construct.
-  private RecordTransformations(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private RecordTransformations() {
-    fieldTransformations_ = java.util.Collections.emptyList();
-    recordSuppressions_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private RecordTransformations(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              fieldTransformations_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            fieldTransformations_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.FieldTransformation.parser(), extensionRegistry));
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              recordSuppressions_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
-            }
-            recordSuppressions_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.RecordSuppression.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        fieldTransformations_ = java.util.Collections.unmodifiableList(fieldTransformations_);
-      }
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-        recordSuppressions_ = java.util.Collections.unmodifiableList(recordSuppressions_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordTransformations_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordTransformations_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.RecordTransformations.class, com.google.privacy.dlp.v2beta1.RecordTransformations.Builder.class);
-  }
-
-  public static final int FIELD_TRANSFORMATIONS_FIELD_NUMBER = 1;
-  private java.util.List fieldTransformations_;
-  /**
-   * 
-   * Transform the record by applying various field transformations.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-   */
-  public java.util.List getFieldTransformationsList() {
-    return fieldTransformations_;
-  }
-  /**
-   * 
-   * Transform the record by applying various field transformations.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-   */
-  public java.util.List 
-      getFieldTransformationsOrBuilderList() {
-    return fieldTransformations_;
-  }
-  /**
-   * 
-   * Transform the record by applying various field transformations.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-   */
-  public int getFieldTransformationsCount() {
-    return fieldTransformations_.size();
-  }
-  /**
-   * 
-   * Transform the record by applying various field transformations.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldTransformation getFieldTransformations(int index) {
-    return fieldTransformations_.get(index);
-  }
-  /**
-   * 
-   * Transform the record by applying various field transformations.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder getFieldTransformationsOrBuilder(
-      int index) {
-    return fieldTransformations_.get(index);
-  }
-
-  public static final int RECORD_SUPPRESSIONS_FIELD_NUMBER = 2;
-  private java.util.List recordSuppressions_;
-  /**
-   * 
-   * Configuration defining which records get suppressed entirely. Records that
-   * match any suppression rule are omitted from the output [optional].
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-   */
-  public java.util.List getRecordSuppressionsList() {
-    return recordSuppressions_;
-  }
-  /**
-   * 
-   * Configuration defining which records get suppressed entirely. Records that
-   * match any suppression rule are omitted from the output [optional].
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-   */
-  public java.util.List 
-      getRecordSuppressionsOrBuilderList() {
-    return recordSuppressions_;
-  }
-  /**
-   * 
-   * Configuration defining which records get suppressed entirely. Records that
-   * match any suppression rule are omitted from the output [optional].
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-   */
-  public int getRecordSuppressionsCount() {
-    return recordSuppressions_.size();
-  }
-  /**
-   * 
-   * Configuration defining which records get suppressed entirely. Records that
-   * match any suppression rule are omitted from the output [optional].
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordSuppression getRecordSuppressions(int index) {
-    return recordSuppressions_.get(index);
-  }
-  /**
-   * 
-   * Configuration defining which records get suppressed entirely. Records that
-   * match any suppression rule are omitted from the output [optional].
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder getRecordSuppressionsOrBuilder(
-      int index) {
-    return recordSuppressions_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < fieldTransformations_.size(); i++) {
-      output.writeMessage(1, fieldTransformations_.get(i));
-    }
-    for (int i = 0; i < recordSuppressions_.size(); i++) {
-      output.writeMessage(2, recordSuppressions_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < fieldTransformations_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, fieldTransformations_.get(i));
-    }
-    for (int i = 0; i < recordSuppressions_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, recordSuppressions_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.RecordTransformations)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.RecordTransformations other = (com.google.privacy.dlp.v2beta1.RecordTransformations) obj;
-
-    boolean result = true;
-    result = result && getFieldTransformationsList()
-        .equals(other.getFieldTransformationsList());
-    result = result && getRecordSuppressionsList()
-        .equals(other.getRecordSuppressionsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getFieldTransformationsCount() > 0) {
-      hash = (37 * hash) + FIELD_TRANSFORMATIONS_FIELD_NUMBER;
-      hash = (53 * hash) + getFieldTransformationsList().hashCode();
-    }
-    if (getRecordSuppressionsCount() > 0) {
-      hash = (37 * hash) + RECORD_SUPPRESSIONS_FIELD_NUMBER;
-      hash = (53 * hash) + getRecordSuppressionsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RecordTransformations prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * A type of transformation that is applied over structured data such as a
-   * table.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RecordTransformations}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RecordTransformations)
-      com.google.privacy.dlp.v2beta1.RecordTransformationsOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordTransformations_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordTransformations_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RecordTransformations.class, com.google.privacy.dlp.v2beta1.RecordTransformations.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.RecordTransformations.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getFieldTransformationsFieldBuilder();
-        getRecordSuppressionsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (fieldTransformationsBuilder_ == null) {
-        fieldTransformations_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        fieldTransformationsBuilder_.clear();
-      }
-      if (recordSuppressionsBuilder_ == null) {
-        recordSuppressions_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-      } else {
-        recordSuppressionsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RecordTransformations_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordTransformations getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.RecordTransformations.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordTransformations build() {
-      com.google.privacy.dlp.v2beta1.RecordTransformations result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RecordTransformations buildPartial() {
-      com.google.privacy.dlp.v2beta1.RecordTransformations result = new com.google.privacy.dlp.v2beta1.RecordTransformations(this);
-      int from_bitField0_ = bitField0_;
-      if (fieldTransformationsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          fieldTransformations_ = java.util.Collections.unmodifiableList(fieldTransformations_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.fieldTransformations_ = fieldTransformations_;
-      } else {
-        result.fieldTransformations_ = fieldTransformationsBuilder_.build();
-      }
-      if (recordSuppressionsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          recordSuppressions_ = java.util.Collections.unmodifiableList(recordSuppressions_);
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.recordSuppressions_ = recordSuppressions_;
-      } else {
-        result.recordSuppressions_ = recordSuppressionsBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.RecordTransformations) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.RecordTransformations)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RecordTransformations other) {
-      if (other == com.google.privacy.dlp.v2beta1.RecordTransformations.getDefaultInstance()) return this;
-      if (fieldTransformationsBuilder_ == null) {
-        if (!other.fieldTransformations_.isEmpty()) {
-          if (fieldTransformations_.isEmpty()) {
-            fieldTransformations_ = other.fieldTransformations_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureFieldTransformationsIsMutable();
-            fieldTransformations_.addAll(other.fieldTransformations_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.fieldTransformations_.isEmpty()) {
-          if (fieldTransformationsBuilder_.isEmpty()) {
-            fieldTransformationsBuilder_.dispose();
-            fieldTransformationsBuilder_ = null;
-            fieldTransformations_ = other.fieldTransformations_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            fieldTransformationsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getFieldTransformationsFieldBuilder() : null;
-          } else {
-            fieldTransformationsBuilder_.addAllMessages(other.fieldTransformations_);
-          }
-        }
-      }
-      if (recordSuppressionsBuilder_ == null) {
-        if (!other.recordSuppressions_.isEmpty()) {
-          if (recordSuppressions_.isEmpty()) {
-            recordSuppressions_ = other.recordSuppressions_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureRecordSuppressionsIsMutable();
-            recordSuppressions_.addAll(other.recordSuppressions_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.recordSuppressions_.isEmpty()) {
-          if (recordSuppressionsBuilder_.isEmpty()) {
-            recordSuppressionsBuilder_.dispose();
-            recordSuppressionsBuilder_ = null;
-            recordSuppressions_ = other.recordSuppressions_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-            recordSuppressionsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getRecordSuppressionsFieldBuilder() : null;
-          } else {
-            recordSuppressionsBuilder_.addAllMessages(other.recordSuppressions_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.RecordTransformations parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.RecordTransformations) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List fieldTransformations_ =
-      java.util.Collections.emptyList();
-    private void ensureFieldTransformationsIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        fieldTransformations_ = new java.util.ArrayList(fieldTransformations_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldTransformation, com.google.privacy.dlp.v2beta1.FieldTransformation.Builder, com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder> fieldTransformationsBuilder_;
-
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public java.util.List getFieldTransformationsList() {
-      if (fieldTransformationsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(fieldTransformations_);
-      } else {
-        return fieldTransformationsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public int getFieldTransformationsCount() {
-      if (fieldTransformationsBuilder_ == null) {
-        return fieldTransformations_.size();
-      } else {
-        return fieldTransformationsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldTransformation getFieldTransformations(int index) {
-      if (fieldTransformationsBuilder_ == null) {
-        return fieldTransformations_.get(index);
-      } else {
-        return fieldTransformationsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public Builder setFieldTransformations(
-        int index, com.google.privacy.dlp.v2beta1.FieldTransformation value) {
-      if (fieldTransformationsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.set(index, value);
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public Builder setFieldTransformations(
-        int index, com.google.privacy.dlp.v2beta1.FieldTransformation.Builder builderForValue) {
-      if (fieldTransformationsBuilder_ == null) {
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public Builder addFieldTransformations(com.google.privacy.dlp.v2beta1.FieldTransformation value) {
-      if (fieldTransformationsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.add(value);
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public Builder addFieldTransformations(
-        int index, com.google.privacy.dlp.v2beta1.FieldTransformation value) {
-      if (fieldTransformationsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.add(index, value);
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public Builder addFieldTransformations(
-        com.google.privacy.dlp.v2beta1.FieldTransformation.Builder builderForValue) {
-      if (fieldTransformationsBuilder_ == null) {
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.add(builderForValue.build());
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public Builder addFieldTransformations(
-        int index, com.google.privacy.dlp.v2beta1.FieldTransformation.Builder builderForValue) {
-      if (fieldTransformationsBuilder_ == null) {
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public Builder addAllFieldTransformations(
-        java.lang.Iterable values) {
-      if (fieldTransformationsBuilder_ == null) {
-        ensureFieldTransformationsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, fieldTransformations_);
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public Builder clearFieldTransformations() {
-      if (fieldTransformationsBuilder_ == null) {
-        fieldTransformations_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public Builder removeFieldTransformations(int index) {
-      if (fieldTransformationsBuilder_ == null) {
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.remove(index);
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldTransformation.Builder getFieldTransformationsBuilder(
-        int index) {
-      return getFieldTransformationsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder getFieldTransformationsOrBuilder(
-        int index) {
-      if (fieldTransformationsBuilder_ == null) {
-        return fieldTransformations_.get(index);  } else {
-        return fieldTransformationsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public java.util.List 
-         getFieldTransformationsOrBuilderList() {
-      if (fieldTransformationsBuilder_ != null) {
-        return fieldTransformationsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(fieldTransformations_);
-      }
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldTransformation.Builder addFieldTransformationsBuilder() {
-      return getFieldTransformationsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.FieldTransformation.getDefaultInstance());
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldTransformation.Builder addFieldTransformationsBuilder(
-        int index) {
-      return getFieldTransformationsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.FieldTransformation.getDefaultInstance());
-    }
-    /**
-     * 
-     * Transform the record by applying various field transformations.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-     */
-    public java.util.List 
-         getFieldTransformationsBuilderList() {
-      return getFieldTransformationsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldTransformation, com.google.privacy.dlp.v2beta1.FieldTransformation.Builder, com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder> 
-        getFieldTransformationsFieldBuilder() {
-      if (fieldTransformationsBuilder_ == null) {
-        fieldTransformationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.FieldTransformation, com.google.privacy.dlp.v2beta1.FieldTransformation.Builder, com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder>(
-                fieldTransformations_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        fieldTransformations_ = null;
-      }
-      return fieldTransformationsBuilder_;
-    }
-
-    private java.util.List recordSuppressions_ =
-      java.util.Collections.emptyList();
-    private void ensureRecordSuppressionsIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-        recordSuppressions_ = new java.util.ArrayList(recordSuppressions_);
-        bitField0_ |= 0x00000002;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordSuppression, com.google.privacy.dlp.v2beta1.RecordSuppression.Builder, com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder> recordSuppressionsBuilder_;
-
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public java.util.List getRecordSuppressionsList() {
-      if (recordSuppressionsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(recordSuppressions_);
-      } else {
-        return recordSuppressionsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public int getRecordSuppressionsCount() {
-      if (recordSuppressionsBuilder_ == null) {
-        return recordSuppressions_.size();
-      } else {
-        return recordSuppressionsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordSuppression getRecordSuppressions(int index) {
-      if (recordSuppressionsBuilder_ == null) {
-        return recordSuppressions_.get(index);
-      } else {
-        return recordSuppressionsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public Builder setRecordSuppressions(
-        int index, com.google.privacy.dlp.v2beta1.RecordSuppression value) {
-      if (recordSuppressionsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureRecordSuppressionsIsMutable();
-        recordSuppressions_.set(index, value);
-        onChanged();
-      } else {
-        recordSuppressionsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public Builder setRecordSuppressions(
-        int index, com.google.privacy.dlp.v2beta1.RecordSuppression.Builder builderForValue) {
-      if (recordSuppressionsBuilder_ == null) {
-        ensureRecordSuppressionsIsMutable();
-        recordSuppressions_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        recordSuppressionsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public Builder addRecordSuppressions(com.google.privacy.dlp.v2beta1.RecordSuppression value) {
-      if (recordSuppressionsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureRecordSuppressionsIsMutable();
-        recordSuppressions_.add(value);
-        onChanged();
-      } else {
-        recordSuppressionsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public Builder addRecordSuppressions(
-        int index, com.google.privacy.dlp.v2beta1.RecordSuppression value) {
-      if (recordSuppressionsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureRecordSuppressionsIsMutable();
-        recordSuppressions_.add(index, value);
-        onChanged();
-      } else {
-        recordSuppressionsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public Builder addRecordSuppressions(
-        com.google.privacy.dlp.v2beta1.RecordSuppression.Builder builderForValue) {
-      if (recordSuppressionsBuilder_ == null) {
-        ensureRecordSuppressionsIsMutable();
-        recordSuppressions_.add(builderForValue.build());
-        onChanged();
-      } else {
-        recordSuppressionsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public Builder addRecordSuppressions(
-        int index, com.google.privacy.dlp.v2beta1.RecordSuppression.Builder builderForValue) {
-      if (recordSuppressionsBuilder_ == null) {
-        ensureRecordSuppressionsIsMutable();
-        recordSuppressions_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        recordSuppressionsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public Builder addAllRecordSuppressions(
-        java.lang.Iterable values) {
-      if (recordSuppressionsBuilder_ == null) {
-        ensureRecordSuppressionsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, recordSuppressions_);
-        onChanged();
-      } else {
-        recordSuppressionsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public Builder clearRecordSuppressions() {
-      if (recordSuppressionsBuilder_ == null) {
-        recordSuppressions_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-      } else {
-        recordSuppressionsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public Builder removeRecordSuppressions(int index) {
-      if (recordSuppressionsBuilder_ == null) {
-        ensureRecordSuppressionsIsMutable();
-        recordSuppressions_.remove(index);
-        onChanged();
-      } else {
-        recordSuppressionsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordSuppression.Builder getRecordSuppressionsBuilder(
-        int index) {
-      return getRecordSuppressionsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder getRecordSuppressionsOrBuilder(
-        int index) {
-      if (recordSuppressionsBuilder_ == null) {
-        return recordSuppressions_.get(index);  } else {
-        return recordSuppressionsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public java.util.List 
-         getRecordSuppressionsOrBuilderList() {
-      if (recordSuppressionsBuilder_ != null) {
-        return recordSuppressionsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(recordSuppressions_);
-      }
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordSuppression.Builder addRecordSuppressionsBuilder() {
-      return getRecordSuppressionsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.RecordSuppression.getDefaultInstance());
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordSuppression.Builder addRecordSuppressionsBuilder(
-        int index) {
-      return getRecordSuppressionsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.RecordSuppression.getDefaultInstance());
-    }
-    /**
-     * 
-     * Configuration defining which records get suppressed entirely. Records that
-     * match any suppression rule are omitted from the output [optional].
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-     */
-    public java.util.List 
-         getRecordSuppressionsBuilderList() {
-      return getRecordSuppressionsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordSuppression, com.google.privacy.dlp.v2beta1.RecordSuppression.Builder, com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder> 
-        getRecordSuppressionsFieldBuilder() {
-      if (recordSuppressionsBuilder_ == null) {
-        recordSuppressionsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RecordSuppression, com.google.privacy.dlp.v2beta1.RecordSuppression.Builder, com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder>(
-                recordSuppressions_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
-        recordSuppressions_ = null;
-      }
-      return recordSuppressionsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RecordTransformations)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RecordTransformations)
-  private static final com.google.privacy.dlp.v2beta1.RecordTransformations DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RecordTransformations();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RecordTransformations getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public RecordTransformations parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecordTransformations(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.RecordTransformations getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordTransformationsOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordTransformationsOrBuilder.java
deleted file mode 100644
index 6dd33b94b428..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RecordTransformationsOrBuilder.java
+++ /dev/null
@@ -1,102 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface RecordTransformationsOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RecordTransformations)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Transform the record by applying various field transformations.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-   */
-  java.util.List 
-      getFieldTransformationsList();
-  /**
-   * 
-   * Transform the record by applying various field transformations.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-   */
-  com.google.privacy.dlp.v2beta1.FieldTransformation getFieldTransformations(int index);
-  /**
-   * 
-   * Transform the record by applying various field transformations.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-   */
-  int getFieldTransformationsCount();
-  /**
-   * 
-   * Transform the record by applying various field transformations.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-   */
-  java.util.List 
-      getFieldTransformationsOrBuilderList();
-  /**
-   * 
-   * Transform the record by applying various field transformations.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 1;
-   */
-  com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder getFieldTransformationsOrBuilder(
-      int index);
-
-  /**
-   * 
-   * Configuration defining which records get suppressed entirely. Records that
-   * match any suppression rule are omitted from the output [optional].
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-   */
-  java.util.List 
-      getRecordSuppressionsList();
-  /**
-   * 
-   * Configuration defining which records get suppressed entirely. Records that
-   * match any suppression rule are omitted from the output [optional].
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-   */
-  com.google.privacy.dlp.v2beta1.RecordSuppression getRecordSuppressions(int index);
-  /**
-   * 
-   * Configuration defining which records get suppressed entirely. Records that
-   * match any suppression rule are omitted from the output [optional].
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-   */
-  int getRecordSuppressionsCount();
-  /**
-   * 
-   * Configuration defining which records get suppressed entirely. Records that
-   * match any suppression rule are omitted from the output [optional].
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-   */
-  java.util.List 
-      getRecordSuppressionsOrBuilderList();
-  /**
-   * 
-   * Configuration defining which records get suppressed entirely. Records that
-   * match any suppression rule are omitted from the output [optional].
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RecordSuppression record_suppressions = 2;
-   */
-  com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder getRecordSuppressionsOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactConfig.java
deleted file mode 100644
index dee5d52dddf5..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactConfig.java
+++ /dev/null
@@ -1,400 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Redact a given value. For example, if used with an `InfoTypeTransformation`
- * transforming PHONE_NUMBER, and input 'My phone number is 206-555-0123', the
- * output would be 'My phone number is '.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.RedactConfig}
- */
-public  final class RedactConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RedactConfig)
-    RedactConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use RedactConfig.newBuilder() to construct.
-  private RedactConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private RedactConfig() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private RedactConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.RedactConfig.class, com.google.privacy.dlp.v2beta1.RedactConfig.Builder.class);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.RedactConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.RedactConfig other = (com.google.privacy.dlp.v2beta1.RedactConfig) obj;
-
-    boolean result = true;
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RedactConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RedactConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Redact a given value. For example, if used with an `InfoTypeTransformation`
-   * transforming PHONE_NUMBER, and input 'My phone number is 206-555-0123', the
-   * output would be 'My phone number is '.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RedactConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RedactConfig)
-      com.google.privacy.dlp.v2beta1.RedactConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RedactConfig.class, com.google.privacy.dlp.v2beta1.RedactConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.RedactConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RedactConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.RedactConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.RedactConfig build() {
-      com.google.privacy.dlp.v2beta1.RedactConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RedactConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.RedactConfig result = new com.google.privacy.dlp.v2beta1.RedactConfig(this);
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.RedactConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.RedactConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RedactConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.RedactConfig.getDefaultInstance()) return this;
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.RedactConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.RedactConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RedactConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RedactConfig)
-  private static final com.google.privacy.dlp.v2beta1.RedactConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RedactConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RedactConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public RedactConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RedactConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.RedactConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactConfigOrBuilder.java
deleted file mode 100644
index 8ce19c3d2f77..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactConfigOrBuilder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface RedactConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RedactConfig)
-    com.google.protobuf.MessageOrBuilder {
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentRequest.java
deleted file mode 100644
index 11a298cc984b..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentRequest.java
+++ /dev/null
@@ -1,3981 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Request to search for potentially sensitive info in a list of items
- * and replace it with a default or provided content.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.RedactContentRequest}
- */
-public  final class RedactContentRequest extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RedactContentRequest)
-    RedactContentRequestOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use RedactContentRequest.newBuilder() to construct.
-  private RedactContentRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private RedactContentRequest() {
-    items_ = java.util.Collections.emptyList();
-    replaceConfigs_ = java.util.Collections.emptyList();
-    imageRedactionConfigs_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private RedactContentRequest(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.InspectConfig.Builder subBuilder = null;
-            if (inspectConfig_ != null) {
-              subBuilder = inspectConfig_.toBuilder();
-            }
-            inspectConfig_ = input.readMessage(com.google.privacy.dlp.v2beta1.InspectConfig.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(inspectConfig_);
-              inspectConfig_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              items_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
-            }
-            items_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.ContentItem.parser(), extensionRegistry));
-            break;
-          }
-          case 26: {
-            if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-              replaceConfigs_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000004;
-            }
-            replaceConfigs_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.parser(), extensionRegistry));
-            break;
-          }
-          case 34: {
-            if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-              imageRedactionConfigs_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000008;
-            }
-            imageRedactionConfigs_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-        items_ = java.util.Collections.unmodifiableList(items_);
-      }
-      if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-        replaceConfigs_ = java.util.Collections.unmodifiableList(replaceConfigs_);
-      }
-      if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-        imageRedactionConfigs_ = java.util.Collections.unmodifiableList(imageRedactionConfigs_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.RedactContentRequest.class, com.google.privacy.dlp.v2beta1.RedactContentRequest.Builder.class);
-  }
-
-  public interface ReplaceConfigOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Type of information to replace. Only one ReplaceConfig per info_type
-     * should be provided. If ReplaceConfig does not have an info_type, the DLP
-     * API matches it against all info_types that are found but not specified in
-     * another ReplaceConfig.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    boolean hasInfoType();
-    /**
-     * 
-     * Type of information to replace. Only one ReplaceConfig per info_type
-     * should be provided. If ReplaceConfig does not have an info_type, the DLP
-     * API matches it against all info_types that are found but not specified in
-     * another ReplaceConfig.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    com.google.privacy.dlp.v2beta1.InfoType getInfoType();
-    /**
-     * 
-     * Type of information to replace. Only one ReplaceConfig per info_type
-     * should be provided. If ReplaceConfig does not have an info_type, the DLP
-     * API matches it against all info_types that are found but not specified in
-     * another ReplaceConfig.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder();
-
-    /**
-     * 
-     * Content replacing sensitive information of given type. Max 256 chars.
-     * 

-     *
-     * string replace_with = 2;
-     */
-    java.lang.String getReplaceWith();
-    /**
-     * 
-     * Content replacing sensitive information of given type. Max 256 chars.
-     * 

-     *
-     * string replace_with = 2;
-     */
-    com.google.protobuf.ByteString
-        getReplaceWithBytes();
-  }
-  /**
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig}
-   */
-  public  static final class ReplaceConfig extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig)
-      ReplaceConfigOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use ReplaceConfig.newBuilder() to construct.
-    private ReplaceConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private ReplaceConfig() {
-      replaceWith_ = "";
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ReplaceConfig(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              com.google.privacy.dlp.v2beta1.InfoType.Builder subBuilder = null;
-              if (infoType_ != null) {
-                subBuilder = infoType_.toBuilder();
-              }
-              infoType_ = input.readMessage(com.google.privacy.dlp.v2beta1.InfoType.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(infoType_);
-                infoType_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 18: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              replaceWith_ = s;
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ReplaceConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ReplaceConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.class, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.Builder.class);
-    }
-
-    public static final int INFO_TYPE_FIELD_NUMBER = 1;
-    private com.google.privacy.dlp.v2beta1.InfoType infoType_;
-    /**
-     * 
-     * Type of information to replace. Only one ReplaceConfig per info_type
-     * should be provided. If ReplaceConfig does not have an info_type, the DLP
-     * API matches it against all info_types that are found but not specified in
-     * another ReplaceConfig.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public boolean hasInfoType() {
-      return infoType_ != null;
-    }
-    /**
-     * 
-     * Type of information to replace. Only one ReplaceConfig per info_type
-     * should be provided. If ReplaceConfig does not have an info_type, the DLP
-     * API matches it against all info_types that are found but not specified in
-     * another ReplaceConfig.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-      return infoType_ == null ? com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-    }
-    /**
-     * 
-     * Type of information to replace. Only one ReplaceConfig per info_type
-     * should be provided. If ReplaceConfig does not have an info_type, the DLP
-     * API matches it against all info_types that are found but not specified in
-     * another ReplaceConfig.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-      return getInfoType();
-    }
-
-    public static final int REPLACE_WITH_FIELD_NUMBER = 2;
-    private volatile java.lang.Object replaceWith_;
-    /**
-     * 
-     * Content replacing sensitive information of given type. Max 256 chars.
-     * 

-     *
-     * string replace_with = 2;
-     */
-    public java.lang.String getReplaceWith() {
-      java.lang.Object ref = replaceWith_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        replaceWith_ = s;
-        return s;
-      }
-    }
-    /**
-     * 
-     * Content replacing sensitive information of given type. Max 256 chars.
-     * 

-     *
-     * string replace_with = 2;
-     */
-    public com.google.protobuf.ByteString
-        getReplaceWithBytes() {
-      java.lang.Object ref = replaceWith_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        replaceWith_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (infoType_ != null) {
-        output.writeMessage(1, getInfoType());
-      }
-      if (!getReplaceWithBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, replaceWith_);
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (infoType_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getInfoType());
-      }
-      if (!getReplaceWithBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, replaceWith_);
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig other = (com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig) obj;
-
-      boolean result = true;
-      result = result && (hasInfoType() == other.hasInfoType());
-      if (hasInfoType()) {
-        result = result && getInfoType()
-            .equals(other.getInfoType());
-      }
-      result = result && getReplaceWith()
-          .equals(other.getReplaceWith());
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasInfoType()) {
-        hash = (37 * hash) + INFO_TYPE_FIELD_NUMBER;
-        hash = (53 * hash) + getInfoType().hashCode();
-      }
-      hash = (37 * hash) + REPLACE_WITH_FIELD_NUMBER;
-      hash = (53 * hash) + getReplaceWith().hashCode();
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig)
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfigOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ReplaceConfig_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ReplaceConfig_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.class, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (infoTypeBuilder_ == null) {
-          infoType_ = null;
-        } else {
-          infoType_ = null;
-          infoTypeBuilder_ = null;
-        }
-        replaceWith_ = "";
-
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ReplaceConfig_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig build() {
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig buildPartial() {
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig result = new com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig(this);
-        if (infoTypeBuilder_ == null) {
-          result.infoType_ = infoType_;
-        } else {
-          result.infoType_ = infoTypeBuilder_.build();
-        }
-        result.replaceWith_ = replaceWith_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig other) {
-        if (other == com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.getDefaultInstance()) return this;
-        if (other.hasInfoType()) {
-          mergeInfoType(other.getInfoType());
-        }
-        if (!other.getReplaceWith().isEmpty()) {
-          replaceWith_ = other.replaceWith_;
-          onChanged();
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private com.google.privacy.dlp.v2beta1.InfoType infoType_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> infoTypeBuilder_;
-      /**
-       * 
-       * Type of information to replace. Only one ReplaceConfig per info_type
-       * should be provided. If ReplaceConfig does not have an info_type, the DLP
-       * API matches it against all info_types that are found but not specified in
-       * another ReplaceConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public boolean hasInfoType() {
-        return infoTypeBuilder_ != null || infoType_ != null;
-      }
-      /**
-       * 
-       * Type of information to replace. Only one ReplaceConfig per info_type
-       * should be provided. If ReplaceConfig does not have an info_type, the DLP
-       * API matches it against all info_types that are found but not specified in
-       * another ReplaceConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-        if (infoTypeBuilder_ == null) {
-          return infoType_ == null ? com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-        } else {
-          return infoTypeBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Type of information to replace. Only one ReplaceConfig per info_type
-       * should be provided. If ReplaceConfig does not have an info_type, the DLP
-       * API matches it against all info_types that are found but not specified in
-       * another ReplaceConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public Builder setInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-        if (infoTypeBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          infoType_ = value;
-          onChanged();
-        } else {
-          infoTypeBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Type of information to replace. Only one ReplaceConfig per info_type
-       * should be provided. If ReplaceConfig does not have an info_type, the DLP
-       * API matches it against all info_types that are found but not specified in
-       * another ReplaceConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public Builder setInfoType(
-          com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-        if (infoTypeBuilder_ == null) {
-          infoType_ = builderForValue.build();
-          onChanged();
-        } else {
-          infoTypeBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Type of information to replace. Only one ReplaceConfig per info_type
-       * should be provided. If ReplaceConfig does not have an info_type, the DLP
-       * API matches it against all info_types that are found but not specified in
-       * another ReplaceConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public Builder mergeInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-        if (infoTypeBuilder_ == null) {
-          if (infoType_ != null) {
-            infoType_ =
-              com.google.privacy.dlp.v2beta1.InfoType.newBuilder(infoType_).mergeFrom(value).buildPartial();
-          } else {
-            infoType_ = value;
-          }
-          onChanged();
-        } else {
-          infoTypeBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Type of information to replace. Only one ReplaceConfig per info_type
-       * should be provided. If ReplaceConfig does not have an info_type, the DLP
-       * API matches it against all info_types that are found but not specified in
-       * another ReplaceConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public Builder clearInfoType() {
-        if (infoTypeBuilder_ == null) {
-          infoType_ = null;
-          onChanged();
-        } else {
-          infoType_ = null;
-          infoTypeBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Type of information to replace. Only one ReplaceConfig per info_type
-       * should be provided. If ReplaceConfig does not have an info_type, the DLP
-       * API matches it against all info_types that are found but not specified in
-       * another ReplaceConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoType.Builder getInfoTypeBuilder() {
-        
-        onChanged();
-        return getInfoTypeFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Type of information to replace. Only one ReplaceConfig per info_type
-       * should be provided. If ReplaceConfig does not have an info_type, the DLP
-       * API matches it against all info_types that are found but not specified in
-       * another ReplaceConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-        if (infoTypeBuilder_ != null) {
-          return infoTypeBuilder_.getMessageOrBuilder();
-        } else {
-          return infoType_ == null ?
-              com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-        }
-      }
-      /**
-       * 
-       * Type of information to replace. Only one ReplaceConfig per info_type
-       * should be provided. If ReplaceConfig does not have an info_type, the DLP
-       * API matches it against all info_types that are found but not specified in
-       * another ReplaceConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> 
-          getInfoTypeFieldBuilder() {
-        if (infoTypeBuilder_ == null) {
-          infoTypeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder>(
-                  getInfoType(),
-                  getParentForChildren(),
-                  isClean());
-          infoType_ = null;
-        }
-        return infoTypeBuilder_;
-      }
-
-      private java.lang.Object replaceWith_ = "";
-      /**
-       * 
-       * Content replacing sensitive information of given type. Max 256 chars.
-       * 

-       *
-       * string replace_with = 2;
-       */
-      public java.lang.String getReplaceWith() {
-        java.lang.Object ref = replaceWith_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          replaceWith_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * 
-       * Content replacing sensitive information of given type. Max 256 chars.
-       * 

-       *
-       * string replace_with = 2;
-       */
-      public com.google.protobuf.ByteString
-          getReplaceWithBytes() {
-        java.lang.Object ref = replaceWith_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          replaceWith_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * 
-       * Content replacing sensitive information of given type. Max 256 chars.
-       * 

-       *
-       * string replace_with = 2;
-       */
-      public Builder setReplaceWith(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        replaceWith_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * Content replacing sensitive information of given type. Max 256 chars.
-       * 

-       *
-       * string replace_with = 2;
-       */
-      public Builder clearReplaceWith() {
-        
-        replaceWith_ = getDefaultInstance().getReplaceWith();
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * Content replacing sensitive information of given type. Max 256 chars.
-       * 

-       *
-       * string replace_with = 2;
-       */
-      public Builder setReplaceWithBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        replaceWith_ = value;
-        onChanged();
-        return this;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig)
-    private static final com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public ReplaceConfig parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReplaceConfig(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface ImageRedactionConfigOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Only one per info_type should be provided per request. If not
-     * specified, and redact_all_text is false, the DLP API will redact all
-     * text that it matches against all info_types that are found, but not
-     * specified in another ImageRedactionConfig.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    boolean hasInfoType();
-    /**
-     * 
-     * Only one per info_type should be provided per request. If not
-     * specified, and redact_all_text is false, the DLP API will redact all
-     * text that it matches against all info_types that are found, but not
-     * specified in another ImageRedactionConfig.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    com.google.privacy.dlp.v2beta1.InfoType getInfoType();
-    /**
-     * 
-     * Only one per info_type should be provided per request. If not
-     * specified, and redact_all_text is false, the DLP API will redact all
-     * text that it matches against all info_types that are found, but not
-     * specified in another ImageRedactionConfig.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder();
-
-    /**
-     * 
-     * If true, all text found in the image, regardless whether it matches an
-     * info_type, is redacted.
-     * 

-     *
-     * bool redact_all_text = 2;
-     */
-    boolean getRedactAllText();
-
-    /**
-     * 
-     * The color to use when redacting content from an image. If not specified,
-     * the default is black.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-     */
-    boolean hasRedactionColor();
-    /**
-     * 
-     * The color to use when redacting content from an image. If not specified,
-     * the default is black.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-     */
-    com.google.privacy.dlp.v2beta1.Color getRedactionColor();
-    /**
-     * 
-     * The color to use when redacting content from an image. If not specified,
-     * the default is black.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-     */
-    com.google.privacy.dlp.v2beta1.ColorOrBuilder getRedactionColorOrBuilder();
-
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.TargetCase getTargetCase();
-  }
-  /**
-   * 
-   * Configuration for determining how redaction of images should occur.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig}
-   */
-  public  static final class ImageRedactionConfig extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig)
-      ImageRedactionConfigOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use ImageRedactionConfig.newBuilder() to construct.
-    private ImageRedactionConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private ImageRedactionConfig() {
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ImageRedactionConfig(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              com.google.privacy.dlp.v2beta1.InfoType.Builder subBuilder = null;
-              if (targetCase_ == 1) {
-                subBuilder = ((com.google.privacy.dlp.v2beta1.InfoType) target_).toBuilder();
-              }
-              target_ =
-                  input.readMessage(com.google.privacy.dlp.v2beta1.InfoType.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.InfoType) target_);
-                target_ = subBuilder.buildPartial();
-              }
-              targetCase_ = 1;
-              break;
-            }
-            case 16: {
-              targetCase_ = 2;
-              target_ = input.readBool();
-              break;
-            }
-            case 26: {
-              com.google.privacy.dlp.v2beta1.Color.Builder subBuilder = null;
-              if (redactionColor_ != null) {
-                subBuilder = redactionColor_.toBuilder();
-              }
-              redactionColor_ = input.readMessage(com.google.privacy.dlp.v2beta1.Color.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(redactionColor_);
-                redactionColor_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ImageRedactionConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ImageRedactionConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.class, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.Builder.class);
-    }
-
-    private int targetCase_ = 0;
-    private java.lang.Object target_;
-    public enum TargetCase
-        implements com.google.protobuf.Internal.EnumLite {
-      INFO_TYPE(1),
-      REDACT_ALL_TEXT(2),
-      TARGET_NOT_SET(0);
-      private final int value;
-      private TargetCase(int value) {
-        this.value = value;
-      }
-      /**
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static TargetCase valueOf(int value) {
-        return forNumber(value);
-      }
-
-      public static TargetCase forNumber(int value) {
-        switch (value) {
-          case 1: return INFO_TYPE;
-          case 2: return REDACT_ALL_TEXT;
-          case 0: return TARGET_NOT_SET;
-          default: return null;
-        }
-      }
-      public int getNumber() {
-        return this.value;
-      }
-    };
-
-    public TargetCase
-    getTargetCase() {
-      return TargetCase.forNumber(
-          targetCase_);
-    }
-
-    public static final int INFO_TYPE_FIELD_NUMBER = 1;
-    /**
-     * 
-     * Only one per info_type should be provided per request. If not
-     * specified, and redact_all_text is false, the DLP API will redact all
-     * text that it matches against all info_types that are found, but not
-     * specified in another ImageRedactionConfig.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public boolean hasInfoType() {
-      return targetCase_ == 1;
-    }
-    /**
-     * 
-     * Only one per info_type should be provided per request. If not
-     * specified, and redact_all_text is false, the DLP API will redact all
-     * text that it matches against all info_types that are found, but not
-     * specified in another ImageRedactionConfig.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-      if (targetCase_ == 1) {
-         return (com.google.privacy.dlp.v2beta1.InfoType) target_;
-      }
-      return com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance();
-    }
-    /**
-     * 
-     * Only one per info_type should be provided per request. If not
-     * specified, and redact_all_text is false, the DLP API will redact all
-     * text that it matches against all info_types that are found, but not
-     * specified in another ImageRedactionConfig.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-      if (targetCase_ == 1) {
-         return (com.google.privacy.dlp.v2beta1.InfoType) target_;
-      }
-      return com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance();
-    }
-
-    public static final int REDACT_ALL_TEXT_FIELD_NUMBER = 2;
-    /**
-     * 
-     * If true, all text found in the image, regardless whether it matches an
-     * info_type, is redacted.
-     * 

-     *
-     * bool redact_all_text = 2;
-     */
-    public boolean getRedactAllText() {
-      if (targetCase_ == 2) {
-        return (java.lang.Boolean) target_;
-      }
-      return false;
-    }
-
-    public static final int REDACTION_COLOR_FIELD_NUMBER = 3;
-    private com.google.privacy.dlp.v2beta1.Color redactionColor_;
-    /**
-     * 
-     * The color to use when redacting content from an image. If not specified,
-     * the default is black.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-     */
-    public boolean hasRedactionColor() {
-      return redactionColor_ != null;
-    }
-    /**
-     * 
-     * The color to use when redacting content from an image. If not specified,
-     * the default is black.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.Color getRedactionColor() {
-      return redactionColor_ == null ? com.google.privacy.dlp.v2beta1.Color.getDefaultInstance() : redactionColor_;
-    }
-    /**
-     * 
-     * The color to use when redacting content from an image. If not specified,
-     * the default is black.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.ColorOrBuilder getRedactionColorOrBuilder() {
-      return getRedactionColor();
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (targetCase_ == 1) {
-        output.writeMessage(1, (com.google.privacy.dlp.v2beta1.InfoType) target_);
-      }
-      if (targetCase_ == 2) {
-        output.writeBool(
-            2, (boolean)((java.lang.Boolean) target_));
-      }
-      if (redactionColor_ != null) {
-        output.writeMessage(3, getRedactionColor());
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (targetCase_ == 1) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, (com.google.privacy.dlp.v2beta1.InfoType) target_);
-      }
-      if (targetCase_ == 2) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(
-              2, (boolean)((java.lang.Boolean) target_));
-      }
-      if (redactionColor_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getRedactionColor());
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig other = (com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig) obj;
-
-      boolean result = true;
-      result = result && (hasRedactionColor() == other.hasRedactionColor());
-      if (hasRedactionColor()) {
-        result = result && getRedactionColor()
-            .equals(other.getRedactionColor());
-      }
-      result = result && getTargetCase().equals(
-          other.getTargetCase());
-      if (!result) return false;
-      switch (targetCase_) {
-        case 1:
-          result = result && getInfoType()
-              .equals(other.getInfoType());
-          break;
-        case 2:
-          result = result && (getRedactAllText()
-              == other.getRedactAllText());
-          break;
-        case 0:
-        default:
-      }
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasRedactionColor()) {
-        hash = (37 * hash) + REDACTION_COLOR_FIELD_NUMBER;
-        hash = (53 * hash) + getRedactionColor().hashCode();
-      }
-      switch (targetCase_) {
-        case 1:
-          hash = (37 * hash) + INFO_TYPE_FIELD_NUMBER;
-          hash = (53 * hash) + getInfoType().hashCode();
-          break;
-        case 2:
-          hash = (37 * hash) + REDACT_ALL_TEXT_FIELD_NUMBER;
-          hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-              getRedactAllText());
-          break;
-        case 0:
-        default:
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Configuration for determining how redaction of images should occur.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig)
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfigOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ImageRedactionConfig_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ImageRedactionConfig_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.class, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (redactionColorBuilder_ == null) {
-          redactionColor_ = null;
-        } else {
-          redactionColor_ = null;
-          redactionColorBuilder_ = null;
-        }
-        targetCase_ = 0;
-        target_ = null;
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_ImageRedactionConfig_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig build() {
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig buildPartial() {
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig result = new com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig(this);
-        if (targetCase_ == 1) {
-          if (infoTypeBuilder_ == null) {
-            result.target_ = target_;
-          } else {
-            result.target_ = infoTypeBuilder_.build();
-          }
-        }
-        if (targetCase_ == 2) {
-          result.target_ = target_;
-        }
-        if (redactionColorBuilder_ == null) {
-          result.redactionColor_ = redactionColor_;
-        } else {
-          result.redactionColor_ = redactionColorBuilder_.build();
-        }
-        result.targetCase_ = targetCase_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig other) {
-        if (other == com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.getDefaultInstance()) return this;
-        if (other.hasRedactionColor()) {
-          mergeRedactionColor(other.getRedactionColor());
-        }
-        switch (other.getTargetCase()) {
-          case INFO_TYPE: {
-            mergeInfoType(other.getInfoType());
-            break;
-          }
-          case REDACT_ALL_TEXT: {
-            setRedactAllText(other.getRedactAllText());
-            break;
-          }
-          case TARGET_NOT_SET: {
-            break;
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int targetCase_ = 0;
-      private java.lang.Object target_;
-      public TargetCase
-          getTargetCase() {
-        return TargetCase.forNumber(
-            targetCase_);
-      }
-
-      public Builder clearTarget() {
-        targetCase_ = 0;
-        target_ = null;
-        onChanged();
-        return this;
-      }
-
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> infoTypeBuilder_;
-      /**
-       * 
-       * Only one per info_type should be provided per request. If not
-       * specified, and redact_all_text is false, the DLP API will redact all
-       * text that it matches against all info_types that are found, but not
-       * specified in another ImageRedactionConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public boolean hasInfoType() {
-        return targetCase_ == 1;
-      }
-      /**
-       * 
-       * Only one per info_type should be provided per request. If not
-       * specified, and redact_all_text is false, the DLP API will redact all
-       * text that it matches against all info_types that are found, but not
-       * specified in another ImageRedactionConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-        if (infoTypeBuilder_ == null) {
-          if (targetCase_ == 1) {
-            return (com.google.privacy.dlp.v2beta1.InfoType) target_;
-          }
-          return com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance();
-        } else {
-          if (targetCase_ == 1) {
-            return infoTypeBuilder_.getMessage();
-          }
-          return com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance();
-        }
-      }
-      /**
-       * 
-       * Only one per info_type should be provided per request. If not
-       * specified, and redact_all_text is false, the DLP API will redact all
-       * text that it matches against all info_types that are found, but not
-       * specified in another ImageRedactionConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public Builder setInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-        if (infoTypeBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          target_ = value;
-          onChanged();
-        } else {
-          infoTypeBuilder_.setMessage(value);
-        }
-        targetCase_ = 1;
-        return this;
-      }
-      /**
-       * 
-       * Only one per info_type should be provided per request. If not
-       * specified, and redact_all_text is false, the DLP API will redact all
-       * text that it matches against all info_types that are found, but not
-       * specified in another ImageRedactionConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public Builder setInfoType(
-          com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-        if (infoTypeBuilder_ == null) {
-          target_ = builderForValue.build();
-          onChanged();
-        } else {
-          infoTypeBuilder_.setMessage(builderForValue.build());
-        }
-        targetCase_ = 1;
-        return this;
-      }
-      /**
-       * 
-       * Only one per info_type should be provided per request. If not
-       * specified, and redact_all_text is false, the DLP API will redact all
-       * text that it matches against all info_types that are found, but not
-       * specified in another ImageRedactionConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public Builder mergeInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-        if (infoTypeBuilder_ == null) {
-          if (targetCase_ == 1 &&
-              target_ != com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance()) {
-            target_ = com.google.privacy.dlp.v2beta1.InfoType.newBuilder((com.google.privacy.dlp.v2beta1.InfoType) target_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            target_ = value;
-          }
-          onChanged();
-        } else {
-          if (targetCase_ == 1) {
-            infoTypeBuilder_.mergeFrom(value);
-          }
-          infoTypeBuilder_.setMessage(value);
-        }
-        targetCase_ = 1;
-        return this;
-      }
-      /**
-       * 
-       * Only one per info_type should be provided per request. If not
-       * specified, and redact_all_text is false, the DLP API will redact all
-       * text that it matches against all info_types that are found, but not
-       * specified in another ImageRedactionConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public Builder clearInfoType() {
-        if (infoTypeBuilder_ == null) {
-          if (targetCase_ == 1) {
-            targetCase_ = 0;
-            target_ = null;
-            onChanged();
-          }
-        } else {
-          if (targetCase_ == 1) {
-            targetCase_ = 0;
-            target_ = null;
-          }
-          infoTypeBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * 
-       * Only one per info_type should be provided per request. If not
-       * specified, and redact_all_text is false, the DLP API will redact all
-       * text that it matches against all info_types that are found, but not
-       * specified in another ImageRedactionConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoType.Builder getInfoTypeBuilder() {
-        return getInfoTypeFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Only one per info_type should be provided per request. If not
-       * specified, and redact_all_text is false, the DLP API will redact all
-       * text that it matches against all info_types that are found, but not
-       * specified in another ImageRedactionConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-        if ((targetCase_ == 1) && (infoTypeBuilder_ != null)) {
-          return infoTypeBuilder_.getMessageOrBuilder();
-        } else {
-          if (targetCase_ == 1) {
-            return (com.google.privacy.dlp.v2beta1.InfoType) target_;
-          }
-          return com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance();
-        }
-      }
-      /**
-       * 
-       * Only one per info_type should be provided per request. If not
-       * specified, and redact_all_text is false, the DLP API will redact all
-       * text that it matches against all info_types that are found, but not
-       * specified in another ImageRedactionConfig.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> 
-          getInfoTypeFieldBuilder() {
-        if (infoTypeBuilder_ == null) {
-          if (!(targetCase_ == 1)) {
-            target_ = com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance();
-          }
-          infoTypeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder>(
-                  (com.google.privacy.dlp.v2beta1.InfoType) target_,
-                  getParentForChildren(),
-                  isClean());
-          target_ = null;
-        }
-        targetCase_ = 1;
-        onChanged();;
-        return infoTypeBuilder_;
-      }
-
-      /**
-       * 
-       * If true, all text found in the image, regardless whether it matches an
-       * info_type, is redacted.
-       * 

-       *
-       * bool redact_all_text = 2;
-       */
-      public boolean getRedactAllText() {
-        if (targetCase_ == 2) {
-          return (java.lang.Boolean) target_;
-        }
-        return false;
-      }
-      /**
-       * 
-       * If true, all text found in the image, regardless whether it matches an
-       * info_type, is redacted.
-       * 

-       *
-       * bool redact_all_text = 2;
-       */
-      public Builder setRedactAllText(boolean value) {
-        targetCase_ = 2;
-        target_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * If true, all text found in the image, regardless whether it matches an
-       * info_type, is redacted.
-       * 

-       *
-       * bool redact_all_text = 2;
-       */
-      public Builder clearRedactAllText() {
-        if (targetCase_ == 2) {
-          targetCase_ = 0;
-          target_ = null;
-          onChanged();
-        }
-        return this;
-      }
-
-      private com.google.privacy.dlp.v2beta1.Color redactionColor_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Color, com.google.privacy.dlp.v2beta1.Color.Builder, com.google.privacy.dlp.v2beta1.ColorOrBuilder> redactionColorBuilder_;
-      /**
-       * 
-       * The color to use when redacting content from an image. If not specified,
-       * the default is black.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-       */
-      public boolean hasRedactionColor() {
-        return redactionColorBuilder_ != null || redactionColor_ != null;
-      }
-      /**
-       * 
-       * The color to use when redacting content from an image. If not specified,
-       * the default is black.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-       */
-      public com.google.privacy.dlp.v2beta1.Color getRedactionColor() {
-        if (redactionColorBuilder_ == null) {
-          return redactionColor_ == null ? com.google.privacy.dlp.v2beta1.Color.getDefaultInstance() : redactionColor_;
-        } else {
-          return redactionColorBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * The color to use when redacting content from an image. If not specified,
-       * the default is black.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-       */
-      public Builder setRedactionColor(com.google.privacy.dlp.v2beta1.Color value) {
-        if (redactionColorBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          redactionColor_ = value;
-          onChanged();
-        } else {
-          redactionColorBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * The color to use when redacting content from an image. If not specified,
-       * the default is black.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-       */
-      public Builder setRedactionColor(
-          com.google.privacy.dlp.v2beta1.Color.Builder builderForValue) {
-        if (redactionColorBuilder_ == null) {
-          redactionColor_ = builderForValue.build();
-          onChanged();
-        } else {
-          redactionColorBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * The color to use when redacting content from an image. If not specified,
-       * the default is black.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-       */
-      public Builder mergeRedactionColor(com.google.privacy.dlp.v2beta1.Color value) {
-        if (redactionColorBuilder_ == null) {
-          if (redactionColor_ != null) {
-            redactionColor_ =
-              com.google.privacy.dlp.v2beta1.Color.newBuilder(redactionColor_).mergeFrom(value).buildPartial();
-          } else {
-            redactionColor_ = value;
-          }
-          onChanged();
-        } else {
-          redactionColorBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * The color to use when redacting content from an image. If not specified,
-       * the default is black.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-       */
-      public Builder clearRedactionColor() {
-        if (redactionColorBuilder_ == null) {
-          redactionColor_ = null;
-          onChanged();
-        } else {
-          redactionColor_ = null;
-          redactionColorBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * The color to use when redacting content from an image. If not specified,
-       * the default is black.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-       */
-      public com.google.privacy.dlp.v2beta1.Color.Builder getRedactionColorBuilder() {
-        
-        onChanged();
-        return getRedactionColorFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * The color to use when redacting content from an image. If not specified,
-       * the default is black.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-       */
-      public com.google.privacy.dlp.v2beta1.ColorOrBuilder getRedactionColorOrBuilder() {
-        if (redactionColorBuilder_ != null) {
-          return redactionColorBuilder_.getMessageOrBuilder();
-        } else {
-          return redactionColor_ == null ?
-              com.google.privacy.dlp.v2beta1.Color.getDefaultInstance() : redactionColor_;
-        }
-      }
-      /**
-       * 
-       * The color to use when redacting content from an image. If not specified,
-       * the default is black.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Color redaction_color = 3;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Color, com.google.privacy.dlp.v2beta1.Color.Builder, com.google.privacy.dlp.v2beta1.ColorOrBuilder> 
-          getRedactionColorFieldBuilder() {
-        if (redactionColorBuilder_ == null) {
-          redactionColorBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.Color, com.google.privacy.dlp.v2beta1.Color.Builder, com.google.privacy.dlp.v2beta1.ColorOrBuilder>(
-                  getRedactionColor(),
-                  getParentForChildren(),
-                  isClean());
-          redactionColor_ = null;
-        }
-        return redactionColorBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig)
-    private static final com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public ImageRedactionConfig parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ImageRedactionConfig(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private int bitField0_;
-  public static final int INSPECT_CONFIG_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.InspectConfig inspectConfig_;
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  public boolean hasInspectConfig() {
-    return inspectConfig_ != null;
-  }
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectConfig getInspectConfig() {
-    return inspectConfig_ == null ? com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : inspectConfig_;
-  }
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getInspectConfigOrBuilder() {
-    return getInspectConfig();
-  }
-
-  public static final int ITEMS_FIELD_NUMBER = 2;
-  private java.util.List items_;
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  public java.util.List getItemsList() {
-    return items_;
-  }
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  public java.util.List 
-      getItemsOrBuilderList() {
-    return items_;
-  }
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  public int getItemsCount() {
-    return items_.size();
-  }
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.ContentItem getItems(int index) {
-    return items_.get(index);
-  }
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-      int index) {
-    return items_.get(index);
-  }
-
-  public static final int REPLACE_CONFIGS_FIELD_NUMBER = 3;
-  private java.util.List replaceConfigs_;
-  /**
-   * 
-   * The strings to replace findings text findings with. Must specify at least
-   * one of these or one ImageRedactionConfig if redacting images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-   */
-  public java.util.List getReplaceConfigsList() {
-    return replaceConfigs_;
-  }
-  /**
-   * 
-   * The strings to replace findings text findings with. Must specify at least
-   * one of these or one ImageRedactionConfig if redacting images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-   */
-  public java.util.List 
-      getReplaceConfigsOrBuilderList() {
-    return replaceConfigs_;
-  }
-  /**
-   * 
-   * The strings to replace findings text findings with. Must specify at least
-   * one of these or one ImageRedactionConfig if redacting images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-   */
-  public int getReplaceConfigsCount() {
-    return replaceConfigs_.size();
-  }
-  /**
-   * 
-   * The strings to replace findings text findings with. Must specify at least
-   * one of these or one ImageRedactionConfig if redacting images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig getReplaceConfigs(int index) {
-    return replaceConfigs_.get(index);
-  }
-  /**
-   * 
-   * The strings to replace findings text findings with. Must specify at least
-   * one of these or one ImageRedactionConfig if redacting images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfigOrBuilder getReplaceConfigsOrBuilder(
-      int index) {
-    return replaceConfigs_.get(index);
-  }
-
-  public static final int IMAGE_REDACTION_CONFIGS_FIELD_NUMBER = 4;
-  private java.util.List imageRedactionConfigs_;
-  /**
-   * 
-   * The configuration for specifying what content to redact from images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-   */
-  public java.util.List getImageRedactionConfigsList() {
-    return imageRedactionConfigs_;
-  }
-  /**
-   * 
-   * The configuration for specifying what content to redact from images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-   */
-  public java.util.List 
-      getImageRedactionConfigsOrBuilderList() {
-    return imageRedactionConfigs_;
-  }
-  /**
-   * 
-   * The configuration for specifying what content to redact from images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-   */
-  public int getImageRedactionConfigsCount() {
-    return imageRedactionConfigs_.size();
-  }
-  /**
-   * 
-   * The configuration for specifying what content to redact from images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig getImageRedactionConfigs(int index) {
-    return imageRedactionConfigs_.get(index);
-  }
-  /**
-   * 
-   * The configuration for specifying what content to redact from images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfigOrBuilder getImageRedactionConfigsOrBuilder(
-      int index) {
-    return imageRedactionConfigs_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (inspectConfig_ != null) {
-      output.writeMessage(1, getInspectConfig());
-    }
-    for (int i = 0; i < items_.size(); i++) {
-      output.writeMessage(2, items_.get(i));
-    }
-    for (int i = 0; i < replaceConfigs_.size(); i++) {
-      output.writeMessage(3, replaceConfigs_.get(i));
-    }
-    for (int i = 0; i < imageRedactionConfigs_.size(); i++) {
-      output.writeMessage(4, imageRedactionConfigs_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (inspectConfig_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getInspectConfig());
-    }
-    for (int i = 0; i < items_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, items_.get(i));
-    }
-    for (int i = 0; i < replaceConfigs_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, replaceConfigs_.get(i));
-    }
-    for (int i = 0; i < imageRedactionConfigs_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, imageRedactionConfigs_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.RedactContentRequest)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.RedactContentRequest other = (com.google.privacy.dlp.v2beta1.RedactContentRequest) obj;
-
-    boolean result = true;
-    result = result && (hasInspectConfig() == other.hasInspectConfig());
-    if (hasInspectConfig()) {
-      result = result && getInspectConfig()
-          .equals(other.getInspectConfig());
-    }
-    result = result && getItemsList()
-        .equals(other.getItemsList());
-    result = result && getReplaceConfigsList()
-        .equals(other.getReplaceConfigsList());
-    result = result && getImageRedactionConfigsList()
-        .equals(other.getImageRedactionConfigsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasInspectConfig()) {
-      hash = (37 * hash) + INSPECT_CONFIG_FIELD_NUMBER;
-      hash = (53 * hash) + getInspectConfig().hashCode();
-    }
-    if (getItemsCount() > 0) {
-      hash = (37 * hash) + ITEMS_FIELD_NUMBER;
-      hash = (53 * hash) + getItemsList().hashCode();
-    }
-    if (getReplaceConfigsCount() > 0) {
-      hash = (37 * hash) + REPLACE_CONFIGS_FIELD_NUMBER;
-      hash = (53 * hash) + getReplaceConfigsList().hashCode();
-    }
-    if (getImageRedactionConfigsCount() > 0) {
-      hash = (37 * hash) + IMAGE_REDACTION_CONFIGS_FIELD_NUMBER;
-      hash = (53 * hash) + getImageRedactionConfigsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RedactContentRequest prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Request to search for potentially sensitive info in a list of items
-   * and replace it with a default or provided content.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RedactContentRequest}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RedactContentRequest)
-      com.google.privacy.dlp.v2beta1.RedactContentRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RedactContentRequest.class, com.google.privacy.dlp.v2beta1.RedactContentRequest.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.RedactContentRequest.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getItemsFieldBuilder();
-        getReplaceConfigsFieldBuilder();
-        getImageRedactionConfigsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (inspectConfigBuilder_ == null) {
-        inspectConfig_ = null;
-      } else {
-        inspectConfig_ = null;
-        inspectConfigBuilder_ = null;
-      }
-      if (itemsBuilder_ == null) {
-        items_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-      } else {
-        itemsBuilder_.clear();
-      }
-      if (replaceConfigsBuilder_ == null) {
-        replaceConfigs_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-      } else {
-        replaceConfigsBuilder_.clear();
-      }
-      if (imageRedactionConfigsBuilder_ == null) {
-        imageRedactionConfigs_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-      } else {
-        imageRedactionConfigsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentRequest_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.RedactContentRequest.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest build() {
-      com.google.privacy.dlp.v2beta1.RedactContentRequest result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest buildPartial() {
-      com.google.privacy.dlp.v2beta1.RedactContentRequest result = new com.google.privacy.dlp.v2beta1.RedactContentRequest(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (inspectConfigBuilder_ == null) {
-        result.inspectConfig_ = inspectConfig_;
-      } else {
-        result.inspectConfig_ = inspectConfigBuilder_.build();
-      }
-      if (itemsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          items_ = java.util.Collections.unmodifiableList(items_);
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.items_ = items_;
-      } else {
-        result.items_ = itemsBuilder_.build();
-      }
-      if (replaceConfigsBuilder_ == null) {
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          replaceConfigs_ = java.util.Collections.unmodifiableList(replaceConfigs_);
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.replaceConfigs_ = replaceConfigs_;
-      } else {
-        result.replaceConfigs_ = replaceConfigsBuilder_.build();
-      }
-      if (imageRedactionConfigsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
-          imageRedactionConfigs_ = java.util.Collections.unmodifiableList(imageRedactionConfigs_);
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.imageRedactionConfigs_ = imageRedactionConfigs_;
-      } else {
-        result.imageRedactionConfigs_ = imageRedactionConfigsBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.RedactContentRequest) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.RedactContentRequest)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RedactContentRequest other) {
-      if (other == com.google.privacy.dlp.v2beta1.RedactContentRequest.getDefaultInstance()) return this;
-      if (other.hasInspectConfig()) {
-        mergeInspectConfig(other.getInspectConfig());
-      }
-      if (itemsBuilder_ == null) {
-        if (!other.items_.isEmpty()) {
-          if (items_.isEmpty()) {
-            items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureItemsIsMutable();
-            items_.addAll(other.items_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.items_.isEmpty()) {
-          if (itemsBuilder_.isEmpty()) {
-            itemsBuilder_.dispose();
-            itemsBuilder_ = null;
-            items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-            itemsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getItemsFieldBuilder() : null;
-          } else {
-            itemsBuilder_.addAllMessages(other.items_);
-          }
-        }
-      }
-      if (replaceConfigsBuilder_ == null) {
-        if (!other.replaceConfigs_.isEmpty()) {
-          if (replaceConfigs_.isEmpty()) {
-            replaceConfigs_ = other.replaceConfigs_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureReplaceConfigsIsMutable();
-            replaceConfigs_.addAll(other.replaceConfigs_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.replaceConfigs_.isEmpty()) {
-          if (replaceConfigsBuilder_.isEmpty()) {
-            replaceConfigsBuilder_.dispose();
-            replaceConfigsBuilder_ = null;
-            replaceConfigs_ = other.replaceConfigs_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-            replaceConfigsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getReplaceConfigsFieldBuilder() : null;
-          } else {
-            replaceConfigsBuilder_.addAllMessages(other.replaceConfigs_);
-          }
-        }
-      }
-      if (imageRedactionConfigsBuilder_ == null) {
-        if (!other.imageRedactionConfigs_.isEmpty()) {
-          if (imageRedactionConfigs_.isEmpty()) {
-            imageRedactionConfigs_ = other.imageRedactionConfigs_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            ensureImageRedactionConfigsIsMutable();
-            imageRedactionConfigs_.addAll(other.imageRedactionConfigs_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.imageRedactionConfigs_.isEmpty()) {
-          if (imageRedactionConfigsBuilder_.isEmpty()) {
-            imageRedactionConfigsBuilder_.dispose();
-            imageRedactionConfigsBuilder_ = null;
-            imageRedactionConfigs_ = other.imageRedactionConfigs_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-            imageRedactionConfigsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getImageRedactionConfigsFieldBuilder() : null;
-          } else {
-            imageRedactionConfigsBuilder_.addAllMessages(other.imageRedactionConfigs_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.RedactContentRequest parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.RedactContentRequest) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private com.google.privacy.dlp.v2beta1.InspectConfig inspectConfig_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder> inspectConfigBuilder_;
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public boolean hasInspectConfig() {
-      return inspectConfigBuilder_ != null || inspectConfig_ != null;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig getInspectConfig() {
-      if (inspectConfigBuilder_ == null) {
-        return inspectConfig_ == null ? com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : inspectConfig_;
-      } else {
-        return inspectConfigBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public Builder setInspectConfig(com.google.privacy.dlp.v2beta1.InspectConfig value) {
-      if (inspectConfigBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        inspectConfig_ = value;
-        onChanged();
-      } else {
-        inspectConfigBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public Builder setInspectConfig(
-        com.google.privacy.dlp.v2beta1.InspectConfig.Builder builderForValue) {
-      if (inspectConfigBuilder_ == null) {
-        inspectConfig_ = builderForValue.build();
-        onChanged();
-      } else {
-        inspectConfigBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public Builder mergeInspectConfig(com.google.privacy.dlp.v2beta1.InspectConfig value) {
-      if (inspectConfigBuilder_ == null) {
-        if (inspectConfig_ != null) {
-          inspectConfig_ =
-            com.google.privacy.dlp.v2beta1.InspectConfig.newBuilder(inspectConfig_).mergeFrom(value).buildPartial();
-        } else {
-          inspectConfig_ = value;
-        }
-        onChanged();
-      } else {
-        inspectConfigBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public Builder clearInspectConfig() {
-      if (inspectConfigBuilder_ == null) {
-        inspectConfig_ = null;
-        onChanged();
-      } else {
-        inspectConfig_ = null;
-        inspectConfigBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfig.Builder getInspectConfigBuilder() {
-      
-      onChanged();
-      return getInspectConfigFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getInspectConfigOrBuilder() {
-      if (inspectConfigBuilder_ != null) {
-        return inspectConfigBuilder_.getMessageOrBuilder();
-      } else {
-        return inspectConfig_ == null ?
-            com.google.privacy.dlp.v2beta1.InspectConfig.getDefaultInstance() : inspectConfig_;
-      }
-    }
-    /**
-     * 
-     * Configuration for the inspector.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder> 
-        getInspectConfigFieldBuilder() {
-      if (inspectConfigBuilder_ == null) {
-        inspectConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InspectConfig, com.google.privacy.dlp.v2beta1.InspectConfig.Builder, com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder>(
-                getInspectConfig(),
-                getParentForChildren(),
-                isClean());
-        inspectConfig_ = null;
-      }
-      return inspectConfigBuilder_;
-    }
-
-    private java.util.List items_ =
-      java.util.Collections.emptyList();
-    private void ensureItemsIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-        items_ = new java.util.ArrayList(items_);
-        bitField0_ |= 0x00000002;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder> itemsBuilder_;
-
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public java.util.List getItemsList() {
-      if (itemsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(items_);
-      } else {
-        return itemsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public int getItemsCount() {
-      if (itemsBuilder_ == null) {
-        return items_.size();
-      } else {
-        return itemsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem getItems(int index) {
-      if (itemsBuilder_ == null) {
-        return items_.get(index);
-      } else {
-        return itemsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder setItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.set(index, value);
-        onChanged();
-      } else {
-        itemsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder setItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder addItems(com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.add(value);
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder addItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.add(index, value);
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder addItems(
-        com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.add(builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder addItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder addAllItems(
-        java.lang.Iterable values) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, items_);
-        onChanged();
-      } else {
-        itemsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder clearItems() {
-      if (itemsBuilder_ == null) {
-        items_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-      } else {
-        itemsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public Builder removeItems(int index) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.remove(index);
-        onChanged();
-      } else {
-        itemsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder getItemsBuilder(
-        int index) {
-      return getItemsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-        int index) {
-      if (itemsBuilder_ == null) {
-        return items_.get(index);  } else {
-        return itemsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public java.util.List 
-         getItemsOrBuilderList() {
-      if (itemsBuilder_ != null) {
-        return itemsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(items_);
-      }
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder addItemsBuilder() {
-      return getItemsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.ContentItem.getDefaultInstance());
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder addItemsBuilder(
-        int index) {
-      return getItemsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.ContentItem.getDefaultInstance());
-    }
-    /**
-     * 
-     * The list of items to inspect. Up to 100 are allowed per request.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-     */
-    public java.util.List 
-         getItemsBuilderList() {
-      return getItemsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder> 
-        getItemsFieldBuilder() {
-      if (itemsBuilder_ == null) {
-        itemsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder>(
-                items_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
-        items_ = null;
-      }
-      return itemsBuilder_;
-    }
-
-    private java.util.List replaceConfigs_ =
-      java.util.Collections.emptyList();
-    private void ensureReplaceConfigsIsMutable() {
-      if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-        replaceConfigs_ = new java.util.ArrayList(replaceConfigs_);
-        bitField0_ |= 0x00000004;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.Builder, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfigOrBuilder> replaceConfigsBuilder_;
-
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public java.util.List getReplaceConfigsList() {
-      if (replaceConfigsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(replaceConfigs_);
-      } else {
-        return replaceConfigsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public int getReplaceConfigsCount() {
-      if (replaceConfigsBuilder_ == null) {
-        return replaceConfigs_.size();
-      } else {
-        return replaceConfigsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig getReplaceConfigs(int index) {
-      if (replaceConfigsBuilder_ == null) {
-        return replaceConfigs_.get(index);
-      } else {
-        return replaceConfigsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public Builder setReplaceConfigs(
-        int index, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig value) {
-      if (replaceConfigsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureReplaceConfigsIsMutable();
-        replaceConfigs_.set(index, value);
-        onChanged();
-      } else {
-        replaceConfigsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public Builder setReplaceConfigs(
-        int index, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.Builder builderForValue) {
-      if (replaceConfigsBuilder_ == null) {
-        ensureReplaceConfigsIsMutable();
-        replaceConfigs_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        replaceConfigsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public Builder addReplaceConfigs(com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig value) {
-      if (replaceConfigsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureReplaceConfigsIsMutable();
-        replaceConfigs_.add(value);
-        onChanged();
-      } else {
-        replaceConfigsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public Builder addReplaceConfigs(
-        int index, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig value) {
-      if (replaceConfigsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureReplaceConfigsIsMutable();
-        replaceConfigs_.add(index, value);
-        onChanged();
-      } else {
-        replaceConfigsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public Builder addReplaceConfigs(
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.Builder builderForValue) {
-      if (replaceConfigsBuilder_ == null) {
-        ensureReplaceConfigsIsMutable();
-        replaceConfigs_.add(builderForValue.build());
-        onChanged();
-      } else {
-        replaceConfigsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public Builder addReplaceConfigs(
-        int index, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.Builder builderForValue) {
-      if (replaceConfigsBuilder_ == null) {
-        ensureReplaceConfigsIsMutable();
-        replaceConfigs_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        replaceConfigsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public Builder addAllReplaceConfigs(
-        java.lang.Iterable values) {
-      if (replaceConfigsBuilder_ == null) {
-        ensureReplaceConfigsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, replaceConfigs_);
-        onChanged();
-      } else {
-        replaceConfigsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public Builder clearReplaceConfigs() {
-      if (replaceConfigsBuilder_ == null) {
-        replaceConfigs_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-      } else {
-        replaceConfigsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public Builder removeReplaceConfigs(int index) {
-      if (replaceConfigsBuilder_ == null) {
-        ensureReplaceConfigsIsMutable();
-        replaceConfigs_.remove(index);
-        onChanged();
-      } else {
-        replaceConfigsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.Builder getReplaceConfigsBuilder(
-        int index) {
-      return getReplaceConfigsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfigOrBuilder getReplaceConfigsOrBuilder(
-        int index) {
-      if (replaceConfigsBuilder_ == null) {
-        return replaceConfigs_.get(index);  } else {
-        return replaceConfigsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public java.util.List 
-         getReplaceConfigsOrBuilderList() {
-      if (replaceConfigsBuilder_ != null) {
-        return replaceConfigsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(replaceConfigs_);
-      }
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.Builder addReplaceConfigsBuilder() {
-      return getReplaceConfigsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.getDefaultInstance());
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.Builder addReplaceConfigsBuilder(
-        int index) {
-      return getReplaceConfigsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.getDefaultInstance());
-    }
-    /**
-     * 
-     * The strings to replace findings text findings with. Must specify at least
-     * one of these or one ImageRedactionConfig if redacting images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-     */
-    public java.util.List 
-         getReplaceConfigsBuilderList() {
-      return getReplaceConfigsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.Builder, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfigOrBuilder> 
-        getReplaceConfigsFieldBuilder() {
-      if (replaceConfigsBuilder_ == null) {
-        replaceConfigsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig.Builder, com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfigOrBuilder>(
-                replaceConfigs_,
-                ((bitField0_ & 0x00000004) == 0x00000004),
-                getParentForChildren(),
-                isClean());
-        replaceConfigs_ = null;
-      }
-      return replaceConfigsBuilder_;
-    }
-
-    private java.util.List imageRedactionConfigs_ =
-      java.util.Collections.emptyList();
-    private void ensureImageRedactionConfigsIsMutable() {
-      if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-        imageRedactionConfigs_ = new java.util.ArrayList(imageRedactionConfigs_);
-        bitField0_ |= 0x00000008;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.Builder, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfigOrBuilder> imageRedactionConfigsBuilder_;
-
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public java.util.List getImageRedactionConfigsList() {
-      if (imageRedactionConfigsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(imageRedactionConfigs_);
-      } else {
-        return imageRedactionConfigsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public int getImageRedactionConfigsCount() {
-      if (imageRedactionConfigsBuilder_ == null) {
-        return imageRedactionConfigs_.size();
-      } else {
-        return imageRedactionConfigsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig getImageRedactionConfigs(int index) {
-      if (imageRedactionConfigsBuilder_ == null) {
-        return imageRedactionConfigs_.get(index);
-      } else {
-        return imageRedactionConfigsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public Builder setImageRedactionConfigs(
-        int index, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig value) {
-      if (imageRedactionConfigsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureImageRedactionConfigsIsMutable();
-        imageRedactionConfigs_.set(index, value);
-        onChanged();
-      } else {
-        imageRedactionConfigsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public Builder setImageRedactionConfigs(
-        int index, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.Builder builderForValue) {
-      if (imageRedactionConfigsBuilder_ == null) {
-        ensureImageRedactionConfigsIsMutable();
-        imageRedactionConfigs_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        imageRedactionConfigsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public Builder addImageRedactionConfigs(com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig value) {
-      if (imageRedactionConfigsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureImageRedactionConfigsIsMutable();
-        imageRedactionConfigs_.add(value);
-        onChanged();
-      } else {
-        imageRedactionConfigsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public Builder addImageRedactionConfigs(
-        int index, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig value) {
-      if (imageRedactionConfigsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureImageRedactionConfigsIsMutable();
-        imageRedactionConfigs_.add(index, value);
-        onChanged();
-      } else {
-        imageRedactionConfigsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public Builder addImageRedactionConfigs(
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.Builder builderForValue) {
-      if (imageRedactionConfigsBuilder_ == null) {
-        ensureImageRedactionConfigsIsMutable();
-        imageRedactionConfigs_.add(builderForValue.build());
-        onChanged();
-      } else {
-        imageRedactionConfigsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public Builder addImageRedactionConfigs(
-        int index, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.Builder builderForValue) {
-      if (imageRedactionConfigsBuilder_ == null) {
-        ensureImageRedactionConfigsIsMutable();
-        imageRedactionConfigs_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        imageRedactionConfigsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public Builder addAllImageRedactionConfigs(
-        java.lang.Iterable values) {
-      if (imageRedactionConfigsBuilder_ == null) {
-        ensureImageRedactionConfigsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, imageRedactionConfigs_);
-        onChanged();
-      } else {
-        imageRedactionConfigsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public Builder clearImageRedactionConfigs() {
-      if (imageRedactionConfigsBuilder_ == null) {
-        imageRedactionConfigs_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-        onChanged();
-      } else {
-        imageRedactionConfigsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public Builder removeImageRedactionConfigs(int index) {
-      if (imageRedactionConfigsBuilder_ == null) {
-        ensureImageRedactionConfigsIsMutable();
-        imageRedactionConfigs_.remove(index);
-        onChanged();
-      } else {
-        imageRedactionConfigsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.Builder getImageRedactionConfigsBuilder(
-        int index) {
-      return getImageRedactionConfigsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfigOrBuilder getImageRedactionConfigsOrBuilder(
-        int index) {
-      if (imageRedactionConfigsBuilder_ == null) {
-        return imageRedactionConfigs_.get(index);  } else {
-        return imageRedactionConfigsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public java.util.List 
-         getImageRedactionConfigsOrBuilderList() {
-      if (imageRedactionConfigsBuilder_ != null) {
-        return imageRedactionConfigsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(imageRedactionConfigs_);
-      }
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.Builder addImageRedactionConfigsBuilder() {
-      return getImageRedactionConfigsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.getDefaultInstance());
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.Builder addImageRedactionConfigsBuilder(
-        int index) {
-      return getImageRedactionConfigsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.getDefaultInstance());
-    }
-    /**
-     * 
-     * The configuration for specifying what content to redact from images.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-     */
-    public java.util.List 
-         getImageRedactionConfigsBuilderList() {
-      return getImageRedactionConfigsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.Builder, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfigOrBuilder> 
-        getImageRedactionConfigsFieldBuilder() {
-      if (imageRedactionConfigsBuilder_ == null) {
-        imageRedactionConfigsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig.Builder, com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfigOrBuilder>(
-                imageRedactionConfigs_,
-                ((bitField0_ & 0x00000008) == 0x00000008),
-                getParentForChildren(),
-                isClean());
-        imageRedactionConfigs_ = null;
-      }
-      return imageRedactionConfigsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RedactContentRequest)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RedactContentRequest)
-  private static final com.google.privacy.dlp.v2beta1.RedactContentRequest DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RedactContentRequest();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RedactContentRequest getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public RedactContentRequest parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RedactContentRequest(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.RedactContentRequest getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentRequestOrBuilder.java
deleted file mode 100644
index fff95fbfe115..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentRequestOrBuilder.java
+++ /dev/null
@@ -1,171 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface RedactContentRequestOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RedactContentRequest)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  boolean hasInspectConfig();
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InspectConfig getInspectConfig();
-  /**
-   * 
-   * Configuration for the inspector.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InspectConfig inspect_config = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InspectConfigOrBuilder getInspectConfigOrBuilder();
-
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  java.util.List 
-      getItemsList();
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  com.google.privacy.dlp.v2beta1.ContentItem getItems(int index);
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  int getItemsCount();
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  java.util.List 
-      getItemsOrBuilderList();
-  /**
-   * 
-   * The list of items to inspect. Up to 100 are allowed per request.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 2;
-   */
-  com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-      int index);
-
-  /**
-   * 
-   * The strings to replace findings text findings with. Must specify at least
-   * one of these or one ImageRedactionConfig if redacting images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-   */
-  java.util.List 
-      getReplaceConfigsList();
-  /**
-   * 
-   * The strings to replace findings text findings with. Must specify at least
-   * one of these or one ImageRedactionConfig if redacting images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-   */
-  com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig getReplaceConfigs(int index);
-  /**
-   * 
-   * The strings to replace findings text findings with. Must specify at least
-   * one of these or one ImageRedactionConfig if redacting images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-   */
-  int getReplaceConfigsCount();
-  /**
-   * 
-   * The strings to replace findings text findings with. Must specify at least
-   * one of these or one ImageRedactionConfig if redacting images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-   */
-  java.util.List 
-      getReplaceConfigsOrBuilderList();
-  /**
-   * 
-   * The strings to replace findings text findings with. Must specify at least
-   * one of these or one ImageRedactionConfig if redacting images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfig replace_configs = 3;
-   */
-  com.google.privacy.dlp.v2beta1.RedactContentRequest.ReplaceConfigOrBuilder getReplaceConfigsOrBuilder(
-      int index);
-
-  /**
-   * 
-   * The configuration for specifying what content to redact from images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-   */
-  java.util.List 
-      getImageRedactionConfigsList();
-  /**
-   * 
-   * The configuration for specifying what content to redact from images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-   */
-  com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig getImageRedactionConfigs(int index);
-  /**
-   * 
-   * The configuration for specifying what content to redact from images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-   */
-  int getImageRedactionConfigsCount();
-  /**
-   * 
-   * The configuration for specifying what content to redact from images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-   */
-  java.util.List 
-      getImageRedactionConfigsOrBuilderList();
-  /**
-   * 
-   * The configuration for specifying what content to redact from images.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfig image_redaction_configs = 4;
-   */
-  com.google.privacy.dlp.v2beta1.RedactContentRequest.ImageRedactionConfigOrBuilder getImageRedactionConfigsOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentResponse.java
deleted file mode 100644
index 9a6cf06368b3..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentResponse.java
+++ /dev/null
@@ -1,834 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Results of redacting a list of items.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.RedactContentResponse}
- */
-public  final class RedactContentResponse extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RedactContentResponse)
-    RedactContentResponseOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use RedactContentResponse.newBuilder() to construct.
-  private RedactContentResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private RedactContentResponse() {
-    items_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private RedactContentResponse(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              items_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            items_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.ContentItem.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        items_ = java.util.Collections.unmodifiableList(items_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentResponse_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentResponse_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.RedactContentResponse.class, com.google.privacy.dlp.v2beta1.RedactContentResponse.Builder.class);
-  }
-
-  public static final int ITEMS_FIELD_NUMBER = 1;
-  private java.util.List items_;
-  /**
-   * 
-   * The redacted content.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  public java.util.List getItemsList() {
-    return items_;
-  }
-  /**
-   * 
-   * The redacted content.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  public java.util.List 
-      getItemsOrBuilderList() {
-    return items_;
-  }
-  /**
-   * 
-   * The redacted content.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  public int getItemsCount() {
-    return items_.size();
-  }
-  /**
-   * 
-   * The redacted content.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.ContentItem getItems(int index) {
-    return items_.get(index);
-  }
-  /**
-   * 
-   * The redacted content.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-      int index) {
-    return items_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < items_.size(); i++) {
-      output.writeMessage(1, items_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < items_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, items_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.RedactContentResponse)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.RedactContentResponse other = (com.google.privacy.dlp.v2beta1.RedactContentResponse) obj;
-
-    boolean result = true;
-    result = result && getItemsList()
-        .equals(other.getItemsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getItemsCount() > 0) {
-      hash = (37 * hash) + ITEMS_FIELD_NUMBER;
-      hash = (53 * hash) + getItemsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RedactContentResponse prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Results of redacting a list of items.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RedactContentResponse}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RedactContentResponse)
-      com.google.privacy.dlp.v2beta1.RedactContentResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentResponse_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentResponse_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RedactContentResponse.class, com.google.privacy.dlp.v2beta1.RedactContentResponse.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.RedactContentResponse.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getItemsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (itemsBuilder_ == null) {
-        items_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        itemsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RedactContentResponse_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RedactContentResponse getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.RedactContentResponse.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.RedactContentResponse build() {
-      com.google.privacy.dlp.v2beta1.RedactContentResponse result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RedactContentResponse buildPartial() {
-      com.google.privacy.dlp.v2beta1.RedactContentResponse result = new com.google.privacy.dlp.v2beta1.RedactContentResponse(this);
-      int from_bitField0_ = bitField0_;
-      if (itemsBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          items_ = java.util.Collections.unmodifiableList(items_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.items_ = items_;
-      } else {
-        result.items_ = itemsBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.RedactContentResponse) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.RedactContentResponse)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RedactContentResponse other) {
-      if (other == com.google.privacy.dlp.v2beta1.RedactContentResponse.getDefaultInstance()) return this;
-      if (itemsBuilder_ == null) {
-        if (!other.items_.isEmpty()) {
-          if (items_.isEmpty()) {
-            items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureItemsIsMutable();
-            items_.addAll(other.items_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.items_.isEmpty()) {
-          if (itemsBuilder_.isEmpty()) {
-            itemsBuilder_.dispose();
-            itemsBuilder_ = null;
-            items_ = other.items_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            itemsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getItemsFieldBuilder() : null;
-          } else {
-            itemsBuilder_.addAllMessages(other.items_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.RedactContentResponse parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.RedactContentResponse) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List items_ =
-      java.util.Collections.emptyList();
-    private void ensureItemsIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        items_ = new java.util.ArrayList(items_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder> itemsBuilder_;
-
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public java.util.List getItemsList() {
-      if (itemsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(items_);
-      } else {
-        return itemsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public int getItemsCount() {
-      if (itemsBuilder_ == null) {
-        return items_.size();
-      } else {
-        return itemsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem getItems(int index) {
-      if (itemsBuilder_ == null) {
-        return items_.get(index);
-      } else {
-        return itemsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder setItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.set(index, value);
-        onChanged();
-      } else {
-        itemsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder setItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder addItems(com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.add(value);
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder addItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem value) {
-      if (itemsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureItemsIsMutable();
-        items_.add(index, value);
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder addItems(
-        com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.add(builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder addItems(
-        int index, com.google.privacy.dlp.v2beta1.ContentItem.Builder builderForValue) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        itemsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder addAllItems(
-        java.lang.Iterable values) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, items_);
-        onChanged();
-      } else {
-        itemsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder clearItems() {
-      if (itemsBuilder_ == null) {
-        items_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        itemsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public Builder removeItems(int index) {
-      if (itemsBuilder_ == null) {
-        ensureItemsIsMutable();
-        items_.remove(index);
-        onChanged();
-      } else {
-        itemsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder getItemsBuilder(
-        int index) {
-      return getItemsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-        int index) {
-      if (itemsBuilder_ == null) {
-        return items_.get(index);  } else {
-        return itemsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public java.util.List 
-         getItemsOrBuilderList() {
-      if (itemsBuilder_ != null) {
-        return itemsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(items_);
-      }
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder addItemsBuilder() {
-      return getItemsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.ContentItem.getDefaultInstance());
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ContentItem.Builder addItemsBuilder(
-        int index) {
-      return getItemsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.ContentItem.getDefaultInstance());
-    }
-    /**
-     * 
-     * The redacted content.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-     */
-    public java.util.List 
-         getItemsBuilderList() {
-      return getItemsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder> 
-        getItemsFieldBuilder() {
-      if (itemsBuilder_ == null) {
-        itemsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.ContentItem, com.google.privacy.dlp.v2beta1.ContentItem.Builder, com.google.privacy.dlp.v2beta1.ContentItemOrBuilder>(
-                items_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        items_ = null;
-      }
-      return itemsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RedactContentResponse)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RedactContentResponse)
-  private static final com.google.privacy.dlp.v2beta1.RedactContentResponse DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RedactContentResponse();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RedactContentResponse getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public RedactContentResponse parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RedactContentResponse(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.RedactContentResponse getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentResponseOrBuilder.java
deleted file mode 100644
index cdd233ea15f5..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RedactContentResponseOrBuilder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface RedactContentResponseOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RedactContentResponse)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The redacted content.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  java.util.List 
-      getItemsList();
-  /**
-   * 
-   * The redacted content.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  com.google.privacy.dlp.v2beta1.ContentItem getItems(int index);
-  /**
-   * 
-   * The redacted content.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  int getItemsCount();
-  /**
-   * 
-   * The redacted content.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  java.util.List 
-      getItemsOrBuilderList();
-  /**
-   * 
-   * The redacted content.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.ContentItem items = 1;
-   */
-  com.google.privacy.dlp.v2beta1.ContentItemOrBuilder getItemsOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RelationalOperator.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RelationalOperator.java
deleted file mode 100644
index 05e068e665f9..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RelationalOperator.java
+++ /dev/null
@@ -1,217 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Operators available for comparing the value of fields.
- * 

- *
- * Protobuf enum {@code google.privacy.dlp.v2beta1.RelationalOperator}
- */
-public enum RelationalOperator
-    implements com.google.protobuf.ProtocolMessageEnum {
-  /**
-   * RELATIONAL_OPERATOR_UNSPECIFIED = 0;
-   */
-  RELATIONAL_OPERATOR_UNSPECIFIED(0),
-  /**
-   * 
-   * Equal.
-   * 

-   *
-   * EQUAL_TO = 1;
-   */
-  EQUAL_TO(1),
-  /**
-   * 
-   * Not equal to.
-   * 

-   *
-   * NOT_EQUAL_TO = 2;
-   */
-  NOT_EQUAL_TO(2),
-  /**
-   * 
-   * Greater than.
-   * 

-   *
-   * GREATER_THAN = 3;
-   */
-  GREATER_THAN(3),
-  /**
-   * 
-   * Less than.
-   * 

-   *
-   * LESS_THAN = 4;
-   */
-  LESS_THAN(4),
-  /**
-   * 
-   * Greater than or equals.
-   * 

-   *
-   * GREATER_THAN_OR_EQUALS = 5;
-   */
-  GREATER_THAN_OR_EQUALS(5),
-  /**
-   * 
-   * Less than or equals.
-   * 

-   *
-   * LESS_THAN_OR_EQUALS = 6;
-   */
-  LESS_THAN_OR_EQUALS(6),
-  /**
-   * 
-   * Exists
-   * 

-   *
-   * EXISTS = 7;
-   */
-  EXISTS(7),
-  UNRECOGNIZED(-1),
-  ;
-
-  /**
-   * RELATIONAL_OPERATOR_UNSPECIFIED = 0;
-   */
-  public static final int RELATIONAL_OPERATOR_UNSPECIFIED_VALUE = 0;
-  /**
-   * 
-   * Equal.
-   * 

-   *
-   * EQUAL_TO = 1;
-   */
-  public static final int EQUAL_TO_VALUE = 1;
-  /**
-   * 
-   * Not equal to.
-   * 

-   *
-   * NOT_EQUAL_TO = 2;
-   */
-  public static final int NOT_EQUAL_TO_VALUE = 2;
-  /**
-   * 
-   * Greater than.
-   * 

-   *
-   * GREATER_THAN = 3;
-   */
-  public static final int GREATER_THAN_VALUE = 3;
-  /**
-   * 
-   * Less than.
-   * 

-   *
-   * LESS_THAN = 4;
-   */
-  public static final int LESS_THAN_VALUE = 4;
-  /**
-   * 
-   * Greater than or equals.
-   * 

-   *
-   * GREATER_THAN_OR_EQUALS = 5;
-   */
-  public static final int GREATER_THAN_OR_EQUALS_VALUE = 5;
-  /**
-   * 
-   * Less than or equals.
-   * 

-   *
-   * LESS_THAN_OR_EQUALS = 6;
-   */
-  public static final int LESS_THAN_OR_EQUALS_VALUE = 6;
-  /**
-   * 
-   * Exists
-   * 

-   *
-   * EXISTS = 7;
-   */
-  public static final int EXISTS_VALUE = 7;
-
-
-  public final int getNumber() {
-    if (this == UNRECOGNIZED) {
-      throw new java.lang.IllegalArgumentException(
-          "Can't get the number of an unknown enum value.");
-    }
-    return value;
-  }
-
-  /**
-   * @deprecated Use {@link #forNumber(int)} instead.
-   */
-  @java.lang.Deprecated
-  public static RelationalOperator valueOf(int value) {
-    return forNumber(value);
-  }
-
-  public static RelationalOperator forNumber(int value) {
-    switch (value) {
-      case 0: return RELATIONAL_OPERATOR_UNSPECIFIED;
-      case 1: return EQUAL_TO;
-      case 2: return NOT_EQUAL_TO;
-      case 3: return GREATER_THAN;
-      case 4: return LESS_THAN;
-      case 5: return GREATER_THAN_OR_EQUALS;
-      case 6: return LESS_THAN_OR_EQUALS;
-      case 7: return EXISTS;
-      default: return null;
-    }
-  }
-
-  public static com.google.protobuf.Internal.EnumLiteMap
-      internalGetValueMap() {
-    return internalValueMap;
-  }
-  private static final com.google.protobuf.Internal.EnumLiteMap<
-      RelationalOperator> internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap() {
-          public RelationalOperator findValueByNumber(int number) {
-            return RelationalOperator.forNumber(number);
-          }
-        };
-
-  public final com.google.protobuf.Descriptors.EnumValueDescriptor
-      getValueDescriptor() {
-    return getDescriptor().getValues().get(ordinal());
-  }
-  public final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptorForType() {
-    return getDescriptor();
-  }
-  public static final com.google.protobuf.Descriptors.EnumDescriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.getDescriptor().getEnumTypes().get(1);
-  }
-
-  private static final RelationalOperator[] VALUES = values();
-
-  public static RelationalOperator valueOf(
-      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-    if (desc.getType() != getDescriptor()) {
-      throw new java.lang.IllegalArgumentException(
-        "EnumValueDescriptor is not for this type.");
-    }
-    if (desc.getIndex() == -1) {
-      return UNRECOGNIZED;
-    }
-    return VALUES[desc.getIndex()];
-  }
-
-  private final int value;
-
-  private RelationalOperator(int value) {
-    this.value = value;
-  }
-
-  // @@protoc_insertion_point(enum_scope:google.privacy.dlp.v2beta1.RelationalOperator)
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceValueConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceValueConfig.java
deleted file mode 100644
index a3713de644c4..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceValueConfig.java
+++ /dev/null
@@ -1,626 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Replace each input value with a given `Value`.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.ReplaceValueConfig}
- */
-public  final class ReplaceValueConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.ReplaceValueConfig)
-    ReplaceValueConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ReplaceValueConfig.newBuilder() to construct.
-  private ReplaceValueConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private ReplaceValueConfig() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ReplaceValueConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.Value.Builder subBuilder = null;
-            if (newValue_ != null) {
-              subBuilder = newValue_.toBuilder();
-            }
-            newValue_ = input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(newValue_);
-              newValue_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ReplaceValueConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ReplaceValueConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.ReplaceValueConfig.class, com.google.privacy.dlp.v2beta1.ReplaceValueConfig.Builder.class);
-  }
-
-  public static final int NEW_VALUE_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.Value newValue_;
-  /**
-   * 
-   * Value to replace it with.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value new_value = 1;
-   */
-  public boolean hasNewValue() {
-    return newValue_ != null;
-  }
-  /**
-   * 
-   * Value to replace it with.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value new_value = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.Value getNewValue() {
-    return newValue_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : newValue_;
-  }
-  /**
-   * 
-   * Value to replace it with.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value new_value = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.ValueOrBuilder getNewValueOrBuilder() {
-    return getNewValue();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (newValue_ != null) {
-      output.writeMessage(1, getNewValue());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (newValue_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getNewValue());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.ReplaceValueConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.ReplaceValueConfig other = (com.google.privacy.dlp.v2beta1.ReplaceValueConfig) obj;
-
-    boolean result = true;
-    result = result && (hasNewValue() == other.hasNewValue());
-    if (hasNewValue()) {
-      result = result && getNewValue()
-          .equals(other.getNewValue());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasNewValue()) {
-      hash = (37 * hash) + NEW_VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + getNewValue().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.ReplaceValueConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Replace each input value with a given `Value`.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.ReplaceValueConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.ReplaceValueConfig)
-      com.google.privacy.dlp.v2beta1.ReplaceValueConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ReplaceValueConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ReplaceValueConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.ReplaceValueConfig.class, com.google.privacy.dlp.v2beta1.ReplaceValueConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.ReplaceValueConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (newValueBuilder_ == null) {
-        newValue_ = null;
-      } else {
-        newValue_ = null;
-        newValueBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ReplaceValueConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ReplaceValueConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.ReplaceValueConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.ReplaceValueConfig build() {
-      com.google.privacy.dlp.v2beta1.ReplaceValueConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ReplaceValueConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.ReplaceValueConfig result = new com.google.privacy.dlp.v2beta1.ReplaceValueConfig(this);
-      if (newValueBuilder_ == null) {
-        result.newValue_ = newValue_;
-      } else {
-        result.newValue_ = newValueBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.ReplaceValueConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.ReplaceValueConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.ReplaceValueConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.ReplaceValueConfig.getDefaultInstance()) return this;
-      if (other.hasNewValue()) {
-        mergeNewValue(other.getNewValue());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.ReplaceValueConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.ReplaceValueConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.Value newValue_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> newValueBuilder_;
-    /**
-     * 
-     * Value to replace it with.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value new_value = 1;
-     */
-    public boolean hasNewValue() {
-      return newValueBuilder_ != null || newValue_ != null;
-    }
-    /**
-     * 
-     * Value to replace it with.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value new_value = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Value getNewValue() {
-      if (newValueBuilder_ == null) {
-        return newValue_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : newValue_;
-      } else {
-        return newValueBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Value to replace it with.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value new_value = 1;
-     */
-    public Builder setNewValue(com.google.privacy.dlp.v2beta1.Value value) {
-      if (newValueBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        newValue_ = value;
-        onChanged();
-      } else {
-        newValueBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Value to replace it with.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value new_value = 1;
-     */
-    public Builder setNewValue(
-        com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-      if (newValueBuilder_ == null) {
-        newValue_ = builderForValue.build();
-        onChanged();
-      } else {
-        newValueBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Value to replace it with.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value new_value = 1;
-     */
-    public Builder mergeNewValue(com.google.privacy.dlp.v2beta1.Value value) {
-      if (newValueBuilder_ == null) {
-        if (newValue_ != null) {
-          newValue_ =
-            com.google.privacy.dlp.v2beta1.Value.newBuilder(newValue_).mergeFrom(value).buildPartial();
-        } else {
-          newValue_ = value;
-        }
-        onChanged();
-      } else {
-        newValueBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Value to replace it with.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value new_value = 1;
-     */
-    public Builder clearNewValue() {
-      if (newValueBuilder_ == null) {
-        newValue_ = null;
-        onChanged();
-      } else {
-        newValue_ = null;
-        newValueBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Value to replace it with.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value new_value = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Value.Builder getNewValueBuilder() {
-      
-      onChanged();
-      return getNewValueFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Value to replace it with.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value new_value = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ValueOrBuilder getNewValueOrBuilder() {
-      if (newValueBuilder_ != null) {
-        return newValueBuilder_.getMessageOrBuilder();
-      } else {
-        return newValue_ == null ?
-            com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : newValue_;
-      }
-    }
-    /**
-     * 
-     * Value to replace it with.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value new_value = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-        getNewValueFieldBuilder() {
-      if (newValueBuilder_ == null) {
-        newValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                getNewValue(),
-                getParentForChildren(),
-                isClean());
-        newValue_ = null;
-      }
-      return newValueBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.ReplaceValueConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.ReplaceValueConfig)
-  private static final com.google.privacy.dlp.v2beta1.ReplaceValueConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.ReplaceValueConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ReplaceValueConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public ReplaceValueConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReplaceValueConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.ReplaceValueConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceValueConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceValueConfigOrBuilder.java
deleted file mode 100644
index 619c9ad52229..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceValueConfigOrBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ReplaceValueConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.ReplaceValueConfig)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Value to replace it with.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value new_value = 1;
-   */
-  boolean hasNewValue();
-  /**
-   * 
-   * Value to replace it with.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value new_value = 1;
-   */
-  com.google.privacy.dlp.v2beta1.Value getNewValue();
-  /**
-   * 
-   * Value to replace it with.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value new_value = 1;
-   */
-  com.google.privacy.dlp.v2beta1.ValueOrBuilder getNewValueOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceWithInfoTypeConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceWithInfoTypeConfig.java
deleted file mode 100644
index 176348a83f5f..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceWithInfoTypeConfig.java
+++ /dev/null
@@ -1,396 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Replace each matching finding with the name of the info_type.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig}
- */
-public  final class ReplaceWithInfoTypeConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig)
-    ReplaceWithInfoTypeConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ReplaceWithInfoTypeConfig.newBuilder() to construct.
-  private ReplaceWithInfoTypeConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private ReplaceWithInfoTypeConfig() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ReplaceWithInfoTypeConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ReplaceWithInfoTypeConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ReplaceWithInfoTypeConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.class, com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.Builder.class);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig other = (com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) obj;
-
-    boolean result = true;
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Replace each matching finding with the name of the info_type.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig)
-      com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ReplaceWithInfoTypeConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ReplaceWithInfoTypeConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.class, com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ReplaceWithInfoTypeConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig build() {
-      com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig result = new com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig(this);
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig.getDefaultInstance()) return this;
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig)
-  private static final com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public ReplaceWithInfoTypeConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReplaceWithInfoTypeConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceWithInfoTypeConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceWithInfoTypeConfigOrBuilder.java
deleted file mode 100644
index 8b48aec8b452..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ReplaceWithInfoTypeConfigOrBuilder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ReplaceWithInfoTypeConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.ReplaceWithInfoTypeConfig)
-    com.google.protobuf.MessageOrBuilder {
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ResultName.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ResultName.java
deleted file mode 100644
index f071b54b57fa..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ResultName.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, 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.
- */
-
-package com.google.privacy.dlp.v2beta1;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import com.google.api.pathtemplate.PathTemplate;
-import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
-import java.util.Map;
-import java.util.ArrayList;
-import java.util.List;
-
-// AUTO-GENERATED DOCUMENTATION AND CLASS
-@javax.annotation.Generated("by GAPIC protoc plugin")
-public class ResultName implements ResourceName {
-
-  private static final PathTemplate PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("inspect/results/{result}");
-
-  private volatile Map fieldValuesMap;
-
-  private final String result;
-
-  public String getResult() {
-    return result;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  private ResultName(Builder builder) {
-    result = Preconditions.checkNotNull(builder.getResult());
-  }
-
-  public static ResultName of(String result) {
-    return newBuilder()
-      .setResult(result)
-      .build();
-  }
-
-  public static String format(String result) {
-    return newBuilder()
-      .setResult(result)
-      .build()
-      .toString();
-  }
-
-  public static ResultName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map matchMap =
-        PATH_TEMPLATE.validatedMatch(formattedString, "ResultName.parse: formattedString not in valid format");
-    return of(matchMap.get("result"));
-  }
-
-  public static List parseList(List formattedStrings) {
-    List list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List toStringList(List values) {
-    List list = new ArrayList(values.size());
-    for (ResultName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PATH_TEMPLATE.matches(formattedString);
-  }
-
-  public Map getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
-          fieldMapBuilder.put("result", result);
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ResultName.getType() not supported");
-  }
-
-  @Override
-  public String toString() {
-    return PATH_TEMPLATE.instantiate("result", result);
-  }
-
-  /** Builder for ResultName. */
-  public static class Builder {
-
-    private String result;
-
-    public String getResult() {
-      return result;
-    }
-
-    public Builder setResult(String result) {
-      this.result = result;
-      return this;
-    }
-
-    private Builder() {
-    }
-
-    private Builder(ResultName resultName) {
-      result = resultName.result;
-    }
-
-    public ResultName build() {
-      return new ResultName(this);
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o instanceof ResultName) {
-      ResultName that = (ResultName) o;
-      return (this.result.equals(that.result));
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= result.hashCode();
-    return h;
-  }
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationMetadata.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationMetadata.java
deleted file mode 100644
index 52b4b99bf306..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationMetadata.java
+++ /dev/null
@@ -1,1088 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Metadata returned within the
- * [`riskAnalysis.operations.get`](/dlp/docs/reference/rest/v2beta1/riskAnalysis.operations/get)
- * for risk analysis.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata}
- */
-public  final class RiskAnalysisOperationMetadata extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata)
-    RiskAnalysisOperationMetadataOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use RiskAnalysisOperationMetadata.newBuilder() to construct.
-  private RiskAnalysisOperationMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private RiskAnalysisOperationMetadata() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private RiskAnalysisOperationMetadata(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.protobuf.Timestamp.Builder subBuilder = null;
-            if (createTime_ != null) {
-              subBuilder = createTime_.toBuilder();
-            }
-            createTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(createTime_);
-              createTime_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder subBuilder = null;
-            if (requestedPrivacyMetric_ != null) {
-              subBuilder = requestedPrivacyMetric_.toBuilder();
-            }
-            requestedPrivacyMetric_ = input.readMessage(com.google.privacy.dlp.v2beta1.PrivacyMetric.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(requestedPrivacyMetric_);
-              requestedPrivacyMetric_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 26: {
-            com.google.privacy.dlp.v2beta1.BigQueryTable.Builder subBuilder = null;
-            if (requestedSourceTable_ != null) {
-              subBuilder = requestedSourceTable_.toBuilder();
-            }
-            requestedSourceTable_ = input.readMessage(com.google.privacy.dlp.v2beta1.BigQueryTable.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(requestedSourceTable_);
-              requestedSourceTable_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationMetadata_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationMetadata_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata.Builder.class);
-  }
-
-  public static final int CREATE_TIME_FIELD_NUMBER = 1;
-  private com.google.protobuf.Timestamp createTime_;
-  /**
-   * 
-   * The time which this request was started.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 1;
-   */
-  public boolean hasCreateTime() {
-    return createTime_ != null;
-  }
-  /**
-   * 
-   * The time which this request was started.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 1;
-   */
-  public com.google.protobuf.Timestamp getCreateTime() {
-    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
-  }
-  /**
-   * 
-   * The time which this request was started.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 1;
-   */
-  public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-    return getCreateTime();
-  }
-
-  public static final int REQUESTED_PRIVACY_METRIC_FIELD_NUMBER = 2;
-  private com.google.privacy.dlp.v2beta1.PrivacyMetric requestedPrivacyMetric_;
-  /**
-   * 
-   * Privacy metric to compute.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-   */
-  public boolean hasRequestedPrivacyMetric() {
-    return requestedPrivacyMetric_ != null;
-  }
-  /**
-   * 
-   * Privacy metric to compute.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.PrivacyMetric getRequestedPrivacyMetric() {
-    return requestedPrivacyMetric_ == null ? com.google.privacy.dlp.v2beta1.PrivacyMetric.getDefaultInstance() : requestedPrivacyMetric_;
-  }
-  /**
-   * 
-   * Privacy metric to compute.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder getRequestedPrivacyMetricOrBuilder() {
-    return getRequestedPrivacyMetric();
-  }
-
-  public static final int REQUESTED_SOURCE_TABLE_FIELD_NUMBER = 3;
-  private com.google.privacy.dlp.v2beta1.BigQueryTable requestedSourceTable_;
-  /**
-   * 
-   * Input dataset to compute metrics over.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-   */
-  public boolean hasRequestedSourceTable() {
-    return requestedSourceTable_ != null;
-  }
-  /**
-   * 
-   * Input dataset to compute metrics over.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.BigQueryTable getRequestedSourceTable() {
-    return requestedSourceTable_ == null ? com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance() : requestedSourceTable_;
-  }
-  /**
-   * 
-   * Input dataset to compute metrics over.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder getRequestedSourceTableOrBuilder() {
-    return getRequestedSourceTable();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (createTime_ != null) {
-      output.writeMessage(1, getCreateTime());
-    }
-    if (requestedPrivacyMetric_ != null) {
-      output.writeMessage(2, getRequestedPrivacyMetric());
-    }
-    if (requestedSourceTable_ != null) {
-      output.writeMessage(3, getRequestedSourceTable());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (createTime_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getCreateTime());
-    }
-    if (requestedPrivacyMetric_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getRequestedPrivacyMetric());
-    }
-    if (requestedSourceTable_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, getRequestedSourceTable());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata other = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata) obj;
-
-    boolean result = true;
-    result = result && (hasCreateTime() == other.hasCreateTime());
-    if (hasCreateTime()) {
-      result = result && getCreateTime()
-          .equals(other.getCreateTime());
-    }
-    result = result && (hasRequestedPrivacyMetric() == other.hasRequestedPrivacyMetric());
-    if (hasRequestedPrivacyMetric()) {
-      result = result && getRequestedPrivacyMetric()
-          .equals(other.getRequestedPrivacyMetric());
-    }
-    result = result && (hasRequestedSourceTable() == other.hasRequestedSourceTable());
-    if (hasRequestedSourceTable()) {
-      result = result && getRequestedSourceTable()
-          .equals(other.getRequestedSourceTable());
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasCreateTime()) {
-      hash = (37 * hash) + CREATE_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getCreateTime().hashCode();
-    }
-    if (hasRequestedPrivacyMetric()) {
-      hash = (37 * hash) + REQUESTED_PRIVACY_METRIC_FIELD_NUMBER;
-      hash = (53 * hash) + getRequestedPrivacyMetric().hashCode();
-    }
-    if (hasRequestedSourceTable()) {
-      hash = (37 * hash) + REQUESTED_SOURCE_TABLE_FIELD_NUMBER;
-      hash = (53 * hash) + getRequestedSourceTable().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Metadata returned within the
-   * [`riskAnalysis.operations.get`](/dlp/docs/reference/rest/v2beta1/riskAnalysis.operations/get)
-   * for risk analysis.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata)
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadataOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationMetadata_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationMetadata_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-      } else {
-        createTime_ = null;
-        createTimeBuilder_ = null;
-      }
-      if (requestedPrivacyMetricBuilder_ == null) {
-        requestedPrivacyMetric_ = null;
-      } else {
-        requestedPrivacyMetric_ = null;
-        requestedPrivacyMetricBuilder_ = null;
-      }
-      if (requestedSourceTableBuilder_ == null) {
-        requestedSourceTable_ = null;
-      } else {
-        requestedSourceTable_ = null;
-        requestedSourceTableBuilder_ = null;
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationMetadata_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata build() {
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata buildPartial() {
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata result = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata(this);
-      if (createTimeBuilder_ == null) {
-        result.createTime_ = createTime_;
-      } else {
-        result.createTime_ = createTimeBuilder_.build();
-      }
-      if (requestedPrivacyMetricBuilder_ == null) {
-        result.requestedPrivacyMetric_ = requestedPrivacyMetric_;
-      } else {
-        result.requestedPrivacyMetric_ = requestedPrivacyMetricBuilder_.build();
-      }
-      if (requestedSourceTableBuilder_ == null) {
-        result.requestedSourceTable_ = requestedSourceTable_;
-      } else {
-        result.requestedSourceTable_ = requestedSourceTableBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata other) {
-      if (other == com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata.getDefaultInstance()) return this;
-      if (other.hasCreateTime()) {
-        mergeCreateTime(other.getCreateTime());
-      }
-      if (other.hasRequestedPrivacyMetric()) {
-        mergeRequestedPrivacyMetric(other.getRequestedPrivacyMetric());
-      }
-      if (other.hasRequestedSourceTable()) {
-        mergeRequestedSourceTable(other.getRequestedSourceTable());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.protobuf.Timestamp createTime_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> createTimeBuilder_;
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 1;
-     */
-    public boolean hasCreateTime() {
-      return createTimeBuilder_ != null || createTime_ != null;
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 1;
-     */
-    public com.google.protobuf.Timestamp getCreateTime() {
-      if (createTimeBuilder_ == null) {
-        return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
-      } else {
-        return createTimeBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 1;
-     */
-    public Builder setCreateTime(com.google.protobuf.Timestamp value) {
-      if (createTimeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        createTime_ = value;
-        onChanged();
-      } else {
-        createTimeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 1;
-     */
-    public Builder setCreateTime(
-        com.google.protobuf.Timestamp.Builder builderForValue) {
-      if (createTimeBuilder_ == null) {
-        createTime_ = builderForValue.build();
-        onChanged();
-      } else {
-        createTimeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 1;
-     */
-    public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
-      if (createTimeBuilder_ == null) {
-        if (createTime_ != null) {
-          createTime_ =
-            com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
-        } else {
-          createTime_ = value;
-        }
-        onChanged();
-      } else {
-        createTimeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 1;
-     */
-    public Builder clearCreateTime() {
-      if (createTimeBuilder_ == null) {
-        createTime_ = null;
-        onChanged();
-      } else {
-        createTime_ = null;
-        createTimeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 1;
-     */
-    public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
-      
-      onChanged();
-      return getCreateTimeFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 1;
-     */
-    public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
-      if (createTimeBuilder_ != null) {
-        return createTimeBuilder_.getMessageOrBuilder();
-      } else {
-        return createTime_ == null ?
-            com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
-      }
-    }
-    /**
-     * 
-     * The time which this request was started.
-     * 

-     *
-     * .google.protobuf.Timestamp create_time = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
-        getCreateTimeFieldBuilder() {
-      if (createTimeBuilder_ == null) {
-        createTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
-                getCreateTime(),
-                getParentForChildren(),
-                isClean());
-        createTime_ = null;
-      }
-      return createTimeBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.PrivacyMetric requestedPrivacyMetric_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrivacyMetric, com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder> requestedPrivacyMetricBuilder_;
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-     */
-    public boolean hasRequestedPrivacyMetric() {
-      return requestedPrivacyMetricBuilder_ != null || requestedPrivacyMetric_ != null;
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric getRequestedPrivacyMetric() {
-      if (requestedPrivacyMetricBuilder_ == null) {
-        return requestedPrivacyMetric_ == null ? com.google.privacy.dlp.v2beta1.PrivacyMetric.getDefaultInstance() : requestedPrivacyMetric_;
-      } else {
-        return requestedPrivacyMetricBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-     */
-    public Builder setRequestedPrivacyMetric(com.google.privacy.dlp.v2beta1.PrivacyMetric value) {
-      if (requestedPrivacyMetricBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        requestedPrivacyMetric_ = value;
-        onChanged();
-      } else {
-        requestedPrivacyMetricBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-     */
-    public Builder setRequestedPrivacyMetric(
-        com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder builderForValue) {
-      if (requestedPrivacyMetricBuilder_ == null) {
-        requestedPrivacyMetric_ = builderForValue.build();
-        onChanged();
-      } else {
-        requestedPrivacyMetricBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-     */
-    public Builder mergeRequestedPrivacyMetric(com.google.privacy.dlp.v2beta1.PrivacyMetric value) {
-      if (requestedPrivacyMetricBuilder_ == null) {
-        if (requestedPrivacyMetric_ != null) {
-          requestedPrivacyMetric_ =
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.newBuilder(requestedPrivacyMetric_).mergeFrom(value).buildPartial();
-        } else {
-          requestedPrivacyMetric_ = value;
-        }
-        onChanged();
-      } else {
-        requestedPrivacyMetricBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-     */
-    public Builder clearRequestedPrivacyMetric() {
-      if (requestedPrivacyMetricBuilder_ == null) {
-        requestedPrivacyMetric_ = null;
-        onChanged();
-      } else {
-        requestedPrivacyMetric_ = null;
-        requestedPrivacyMetricBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder getRequestedPrivacyMetricBuilder() {
-      
-      onChanged();
-      return getRequestedPrivacyMetricFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder getRequestedPrivacyMetricOrBuilder() {
-      if (requestedPrivacyMetricBuilder_ != null) {
-        return requestedPrivacyMetricBuilder_.getMessageOrBuilder();
-      } else {
-        return requestedPrivacyMetric_ == null ?
-            com.google.privacy.dlp.v2beta1.PrivacyMetric.getDefaultInstance() : requestedPrivacyMetric_;
-      }
-    }
-    /**
-     * 
-     * Privacy metric to compute.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrivacyMetric, com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder> 
-        getRequestedPrivacyMetricFieldBuilder() {
-      if (requestedPrivacyMetricBuilder_ == null) {
-        requestedPrivacyMetricBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.PrivacyMetric, com.google.privacy.dlp.v2beta1.PrivacyMetric.Builder, com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder>(
-                getRequestedPrivacyMetric(),
-                getParentForChildren(),
-                isClean());
-        requestedPrivacyMetric_ = null;
-      }
-      return requestedPrivacyMetricBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.BigQueryTable requestedSourceTable_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BigQueryTable, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder, com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder> requestedSourceTableBuilder_;
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-     */
-    public boolean hasRequestedSourceTable() {
-      return requestedSourceTableBuilder_ != null || requestedSourceTable_ != null;
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryTable getRequestedSourceTable() {
-      if (requestedSourceTableBuilder_ == null) {
-        return requestedSourceTable_ == null ? com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance() : requestedSourceTable_;
-      } else {
-        return requestedSourceTableBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-     */
-    public Builder setRequestedSourceTable(com.google.privacy.dlp.v2beta1.BigQueryTable value) {
-      if (requestedSourceTableBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        requestedSourceTable_ = value;
-        onChanged();
-      } else {
-        requestedSourceTableBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-     */
-    public Builder setRequestedSourceTable(
-        com.google.privacy.dlp.v2beta1.BigQueryTable.Builder builderForValue) {
-      if (requestedSourceTableBuilder_ == null) {
-        requestedSourceTable_ = builderForValue.build();
-        onChanged();
-      } else {
-        requestedSourceTableBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-     */
-    public Builder mergeRequestedSourceTable(com.google.privacy.dlp.v2beta1.BigQueryTable value) {
-      if (requestedSourceTableBuilder_ == null) {
-        if (requestedSourceTable_ != null) {
-          requestedSourceTable_ =
-            com.google.privacy.dlp.v2beta1.BigQueryTable.newBuilder(requestedSourceTable_).mergeFrom(value).buildPartial();
-        } else {
-          requestedSourceTable_ = value;
-        }
-        onChanged();
-      } else {
-        requestedSourceTableBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-     */
-    public Builder clearRequestedSourceTable() {
-      if (requestedSourceTableBuilder_ == null) {
-        requestedSourceTable_ = null;
-        onChanged();
-      } else {
-        requestedSourceTable_ = null;
-        requestedSourceTableBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryTable.Builder getRequestedSourceTableBuilder() {
-      
-      onChanged();
-      return getRequestedSourceTableFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder getRequestedSourceTableOrBuilder() {
-      if (requestedSourceTableBuilder_ != null) {
-        return requestedSourceTableBuilder_.getMessageOrBuilder();
-      } else {
-        return requestedSourceTable_ == null ?
-            com.google.privacy.dlp.v2beta1.BigQueryTable.getDefaultInstance() : requestedSourceTable_;
-      }
-    }
-    /**
-     * 
-     * Input dataset to compute metrics over.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BigQueryTable, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder, com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder> 
-        getRequestedSourceTableFieldBuilder() {
-      if (requestedSourceTableBuilder_ == null) {
-        requestedSourceTableBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.BigQueryTable, com.google.privacy.dlp.v2beta1.BigQueryTable.Builder, com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder>(
-                getRequestedSourceTable(),
-                getParentForChildren(),
-                isClean());
-        requestedSourceTable_ = null;
-      }
-      return requestedSourceTableBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata)
-  private static final com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public RiskAnalysisOperationMetadata parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RiskAnalysisOperationMetadata(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationMetadataOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationMetadataOrBuilder.java
deleted file mode 100644
index 488b7b2984ad..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationMetadataOrBuilder.java
+++ /dev/null
@@ -1,84 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface RiskAnalysisOperationMetadataOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The time which this request was started.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 1;
-   */
-  boolean hasCreateTime();
-  /**
-   * 
-   * The time which this request was started.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 1;
-   */
-  com.google.protobuf.Timestamp getCreateTime();
-  /**
-   * 
-   * The time which this request was started.
-   * 

-   *
-   * .google.protobuf.Timestamp create_time = 1;
-   */
-  com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder();
-
-  /**
-   * 
-   * Privacy metric to compute.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-   */
-  boolean hasRequestedPrivacyMetric();
-  /**
-   * 
-   * Privacy metric to compute.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-   */
-  com.google.privacy.dlp.v2beta1.PrivacyMetric getRequestedPrivacyMetric();
-  /**
-   * 
-   * Privacy metric to compute.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrivacyMetric requested_privacy_metric = 2;
-   */
-  com.google.privacy.dlp.v2beta1.PrivacyMetricOrBuilder getRequestedPrivacyMetricOrBuilder();
-
-  /**
-   * 
-   * Input dataset to compute metrics over.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-   */
-  boolean hasRequestedSourceTable();
-  /**
-   * 
-   * Input dataset to compute metrics over.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-   */
-  com.google.privacy.dlp.v2beta1.BigQueryTable getRequestedSourceTable();
-  /**
-   * 
-   * Input dataset to compute metrics over.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryTable requested_source_table = 3;
-   */
-  com.google.privacy.dlp.v2beta1.BigQueryTableOrBuilder getRequestedSourceTableOrBuilder();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationResult.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationResult.java
deleted file mode 100644
index 120662947824..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationResult.java
+++ /dev/null
@@ -1,11402 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Result of a risk analysis
- * [`Operation`](/dlp/docs/reference/rest/v2beta1/inspect.operations)
- * request.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult}
- */
-public  final class RiskAnalysisOperationResult extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult)
-    RiskAnalysisOperationResultOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use RiskAnalysisOperationResult.newBuilder() to construct.
-  private RiskAnalysisOperationResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private RiskAnalysisOperationResult() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private RiskAnalysisOperationResult(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 26: {
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.Builder subBuilder = null;
-            if (resultCase_ == 3) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) result_).toBuilder();
-            }
-            result_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) result_);
-              result_ = subBuilder.buildPartial();
-            }
-            resultCase_ = 3;
-            break;
-          }
-          case 34: {
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.Builder subBuilder = null;
-            if (resultCase_ == 4) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) result_).toBuilder();
-            }
-            result_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) result_);
-              result_ = subBuilder.buildPartial();
-            }
-            resultCase_ = 4;
-            break;
-          }
-          case 42: {
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.Builder subBuilder = null;
-            if (resultCase_ == 5) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) result_).toBuilder();
-            }
-            result_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) result_);
-              result_ = subBuilder.buildPartial();
-            }
-            resultCase_ = 5;
-            break;
-          }
-          case 50: {
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.Builder subBuilder = null;
-            if (resultCase_ == 6) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) result_).toBuilder();
-            }
-            result_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) result_);
-              result_ = subBuilder.buildPartial();
-            }
-            resultCase_ = 6;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.Builder.class);
-  }
-
-  public interface NumericalStatsResultOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Minimum value appearing in the column.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value min_value = 1;
-     */
-    boolean hasMinValue();
-    /**
-     * 
-     * Minimum value appearing in the column.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value min_value = 1;
-     */
-    com.google.privacy.dlp.v2beta1.Value getMinValue();
-    /**
-     * 
-     * Minimum value appearing in the column.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value min_value = 1;
-     */
-    com.google.privacy.dlp.v2beta1.ValueOrBuilder getMinValueOrBuilder();
-
-    /**
-     * 
-     * Maximum value appearing in the column.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value max_value = 2;
-     */
-    boolean hasMaxValue();
-    /**
-     * 
-     * Maximum value appearing in the column.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value max_value = 2;
-     */
-    com.google.privacy.dlp.v2beta1.Value getMaxValue();
-    /**
-     * 
-     * Maximum value appearing in the column.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value max_value = 2;
-     */
-    com.google.privacy.dlp.v2beta1.ValueOrBuilder getMaxValueOrBuilder();
-
-    /**
-     * 
-     * List of 99 values that partition the set of field values into 100 equal
-     * sized buckets.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-     */
-    java.util.List 
-        getQuantileValuesList();
-    /**
-     * 
-     * List of 99 values that partition the set of field values into 100 equal
-     * sized buckets.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-     */
-    com.google.privacy.dlp.v2beta1.Value getQuantileValues(int index);
-    /**
-     * 
-     * List of 99 values that partition the set of field values into 100 equal
-     * sized buckets.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-     */
-    int getQuantileValuesCount();
-    /**
-     * 
-     * List of 99 values that partition the set of field values into 100 equal
-     * sized buckets.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-     */
-    java.util.List 
-        getQuantileValuesOrBuilderList();
-    /**
-     * 
-     * List of 99 values that partition the set of field values into 100 equal
-     * sized buckets.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-     */
-    com.google.privacy.dlp.v2beta1.ValueOrBuilder getQuantileValuesOrBuilder(
-        int index);
-  }
-  /**
-   * 
-   * Result of the numerical stats computation.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult}
-   */
-  public  static final class NumericalStatsResult extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult)
-      NumericalStatsResultOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use NumericalStatsResult.newBuilder() to construct.
-    private NumericalStatsResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private NumericalStatsResult() {
-      quantileValues_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private NumericalStatsResult(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              com.google.privacy.dlp.v2beta1.Value.Builder subBuilder = null;
-              if (minValue_ != null) {
-                subBuilder = minValue_.toBuilder();
-              }
-              minValue_ = input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(minValue_);
-                minValue_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 18: {
-              com.google.privacy.dlp.v2beta1.Value.Builder subBuilder = null;
-              if (maxValue_ != null) {
-                subBuilder = maxValue_.toBuilder();
-              }
-              maxValue_ = input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(maxValue_);
-                maxValue_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 34: {
-              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-                quantileValues_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              quantileValues_.add(
-                  input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry));
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-          quantileValues_ = java.util.Collections.unmodifiableList(quantileValues_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_NumericalStatsResult_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_NumericalStatsResult_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.Builder.class);
-    }
-
-    private int bitField0_;
-    public static final int MIN_VALUE_FIELD_NUMBER = 1;
-    private com.google.privacy.dlp.v2beta1.Value minValue_;
-    /**
-     * 
-     * Minimum value appearing in the column.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value min_value = 1;
-     */
-    public boolean hasMinValue() {
-      return minValue_ != null;
-    }
-    /**
-     * 
-     * Minimum value appearing in the column.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value min_value = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Value getMinValue() {
-      return minValue_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : minValue_;
-    }
-    /**
-     * 
-     * Minimum value appearing in the column.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value min_value = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ValueOrBuilder getMinValueOrBuilder() {
-      return getMinValue();
-    }
-
-    public static final int MAX_VALUE_FIELD_NUMBER = 2;
-    private com.google.privacy.dlp.v2beta1.Value maxValue_;
-    /**
-     * 
-     * Maximum value appearing in the column.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value max_value = 2;
-     */
-    public boolean hasMaxValue() {
-      return maxValue_ != null;
-    }
-    /**
-     * 
-     * Maximum value appearing in the column.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value max_value = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Value getMaxValue() {
-      return maxValue_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : maxValue_;
-    }
-    /**
-     * 
-     * Maximum value appearing in the column.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value max_value = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.ValueOrBuilder getMaxValueOrBuilder() {
-      return getMaxValue();
-    }
-
-    public static final int QUANTILE_VALUES_FIELD_NUMBER = 4;
-    private java.util.List quantileValues_;
-    /**
-     * 
-     * List of 99 values that partition the set of field values into 100 equal
-     * sized buckets.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-     */
-    public java.util.List getQuantileValuesList() {
-      return quantileValues_;
-    }
-    /**
-     * 
-     * List of 99 values that partition the set of field values into 100 equal
-     * sized buckets.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-     */
-    public java.util.List 
-        getQuantileValuesOrBuilderList() {
-      return quantileValues_;
-    }
-    /**
-     * 
-     * List of 99 values that partition the set of field values into 100 equal
-     * sized buckets.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-     */
-    public int getQuantileValuesCount() {
-      return quantileValues_.size();
-    }
-    /**
-     * 
-     * List of 99 values that partition the set of field values into 100 equal
-     * sized buckets.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.Value getQuantileValues(int index) {
-      return quantileValues_.get(index);
-    }
-    /**
-     * 
-     * List of 99 values that partition the set of field values into 100 equal
-     * sized buckets.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.ValueOrBuilder getQuantileValuesOrBuilder(
-        int index) {
-      return quantileValues_.get(index);
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (minValue_ != null) {
-        output.writeMessage(1, getMinValue());
-      }
-      if (maxValue_ != null) {
-        output.writeMessage(2, getMaxValue());
-      }
-      for (int i = 0; i < quantileValues_.size(); i++) {
-        output.writeMessage(4, quantileValues_.get(i));
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (minValue_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getMinValue());
-      }
-      if (maxValue_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getMaxValue());
-      }
-      for (int i = 0; i < quantileValues_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, quantileValues_.get(i));
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult other = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) obj;
-
-      boolean result = true;
-      result = result && (hasMinValue() == other.hasMinValue());
-      if (hasMinValue()) {
-        result = result && getMinValue()
-            .equals(other.getMinValue());
-      }
-      result = result && (hasMaxValue() == other.hasMaxValue());
-      if (hasMaxValue()) {
-        result = result && getMaxValue()
-            .equals(other.getMaxValue());
-      }
-      result = result && getQuantileValuesList()
-          .equals(other.getQuantileValuesList());
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasMinValue()) {
-        hash = (37 * hash) + MIN_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + getMinValue().hashCode();
-      }
-      if (hasMaxValue()) {
-        hash = (37 * hash) + MAX_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + getMaxValue().hashCode();
-      }
-      if (getQuantileValuesCount() > 0) {
-        hash = (37 * hash) + QUANTILE_VALUES_FIELD_NUMBER;
-        hash = (53 * hash) + getQuantileValuesList().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Result of the numerical stats computation.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult)
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResultOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_NumericalStatsResult_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_NumericalStatsResult_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getQuantileValuesFieldBuilder();
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (minValueBuilder_ == null) {
-          minValue_ = null;
-        } else {
-          minValue_ = null;
-          minValueBuilder_ = null;
-        }
-        if (maxValueBuilder_ == null) {
-          maxValue_ = null;
-        } else {
-          maxValue_ = null;
-          maxValueBuilder_ = null;
-        }
-        if (quantileValuesBuilder_ == null) {
-          quantileValues_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        } else {
-          quantileValuesBuilder_.clear();
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_NumericalStatsResult_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult build() {
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult buildPartial() {
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult result = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (minValueBuilder_ == null) {
-          result.minValue_ = minValue_;
-        } else {
-          result.minValue_ = minValueBuilder_.build();
-        }
-        if (maxValueBuilder_ == null) {
-          result.maxValue_ = maxValue_;
-        } else {
-          result.maxValue_ = maxValueBuilder_.build();
-        }
-        if (quantileValuesBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) == 0x00000004)) {
-            quantileValues_ = java.util.Collections.unmodifiableList(quantileValues_);
-            bitField0_ = (bitField0_ & ~0x00000004);
-          }
-          result.quantileValues_ = quantileValues_;
-        } else {
-          result.quantileValues_ = quantileValuesBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult other) {
-        if (other == com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.getDefaultInstance()) return this;
-        if (other.hasMinValue()) {
-          mergeMinValue(other.getMinValue());
-        }
-        if (other.hasMaxValue()) {
-          mergeMaxValue(other.getMaxValue());
-        }
-        if (quantileValuesBuilder_ == null) {
-          if (!other.quantileValues_.isEmpty()) {
-            if (quantileValues_.isEmpty()) {
-              quantileValues_ = other.quantileValues_;
-              bitField0_ = (bitField0_ & ~0x00000004);
-            } else {
-              ensureQuantileValuesIsMutable();
-              quantileValues_.addAll(other.quantileValues_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.quantileValues_.isEmpty()) {
-            if (quantileValuesBuilder_.isEmpty()) {
-              quantileValuesBuilder_.dispose();
-              quantileValuesBuilder_ = null;
-              quantileValues_ = other.quantileValues_;
-              bitField0_ = (bitField0_ & ~0x00000004);
-              quantileValuesBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getQuantileValuesFieldBuilder() : null;
-            } else {
-              quantileValuesBuilder_.addAllMessages(other.quantileValues_);
-            }
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private com.google.privacy.dlp.v2beta1.Value minValue_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> minValueBuilder_;
-      /**
-       * 
-       * Minimum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min_value = 1;
-       */
-      public boolean hasMinValue() {
-        return minValueBuilder_ != null || minValue_ != null;
-      }
-      /**
-       * 
-       * Minimum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min_value = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.Value getMinValue() {
-        if (minValueBuilder_ == null) {
-          return minValue_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : minValue_;
-        } else {
-          return minValueBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Minimum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min_value = 1;
-       */
-      public Builder setMinValue(com.google.privacy.dlp.v2beta1.Value value) {
-        if (minValueBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          minValue_ = value;
-          onChanged();
-        } else {
-          minValueBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Minimum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min_value = 1;
-       */
-      public Builder setMinValue(
-          com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-        if (minValueBuilder_ == null) {
-          minValue_ = builderForValue.build();
-          onChanged();
-        } else {
-          minValueBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Minimum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min_value = 1;
-       */
-      public Builder mergeMinValue(com.google.privacy.dlp.v2beta1.Value value) {
-        if (minValueBuilder_ == null) {
-          if (minValue_ != null) {
-            minValue_ =
-              com.google.privacy.dlp.v2beta1.Value.newBuilder(minValue_).mergeFrom(value).buildPartial();
-          } else {
-            minValue_ = value;
-          }
-          onChanged();
-        } else {
-          minValueBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Minimum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min_value = 1;
-       */
-      public Builder clearMinValue() {
-        if (minValueBuilder_ == null) {
-          minValue_ = null;
-          onChanged();
-        } else {
-          minValue_ = null;
-          minValueBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Minimum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min_value = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.Value.Builder getMinValueBuilder() {
-        
-        onChanged();
-        return getMinValueFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Minimum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min_value = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueOrBuilder getMinValueOrBuilder() {
-        if (minValueBuilder_ != null) {
-          return minValueBuilder_.getMessageOrBuilder();
-        } else {
-          return minValue_ == null ?
-              com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : minValue_;
-        }
-      }
-      /**
-       * 
-       * Minimum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value min_value = 1;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-          getMinValueFieldBuilder() {
-        if (minValueBuilder_ == null) {
-          minValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                  getMinValue(),
-                  getParentForChildren(),
-                  isClean());
-          minValue_ = null;
-        }
-        return minValueBuilder_;
-      }
-
-      private com.google.privacy.dlp.v2beta1.Value maxValue_ = null;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> maxValueBuilder_;
-      /**
-       * 
-       * Maximum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max_value = 2;
-       */
-      public boolean hasMaxValue() {
-        return maxValueBuilder_ != null || maxValue_ != null;
-      }
-      /**
-       * 
-       * Maximum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max_value = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.Value getMaxValue() {
-        if (maxValueBuilder_ == null) {
-          return maxValue_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : maxValue_;
-        } else {
-          return maxValueBuilder_.getMessage();
-        }
-      }
-      /**
-       * 
-       * Maximum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max_value = 2;
-       */
-      public Builder setMaxValue(com.google.privacy.dlp.v2beta1.Value value) {
-        if (maxValueBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          maxValue_ = value;
-          onChanged();
-        } else {
-          maxValueBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Maximum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max_value = 2;
-       */
-      public Builder setMaxValue(
-          com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-        if (maxValueBuilder_ == null) {
-          maxValue_ = builderForValue.build();
-          onChanged();
-        } else {
-          maxValueBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Maximum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max_value = 2;
-       */
-      public Builder mergeMaxValue(com.google.privacy.dlp.v2beta1.Value value) {
-        if (maxValueBuilder_ == null) {
-          if (maxValue_ != null) {
-            maxValue_ =
-              com.google.privacy.dlp.v2beta1.Value.newBuilder(maxValue_).mergeFrom(value).buildPartial();
-          } else {
-            maxValue_ = value;
-          }
-          onChanged();
-        } else {
-          maxValueBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Maximum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max_value = 2;
-       */
-      public Builder clearMaxValue() {
-        if (maxValueBuilder_ == null) {
-          maxValue_ = null;
-          onChanged();
-        } else {
-          maxValue_ = null;
-          maxValueBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * 
-       * Maximum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max_value = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.Value.Builder getMaxValueBuilder() {
-        
-        onChanged();
-        return getMaxValueFieldBuilder().getBuilder();
-      }
-      /**
-       * 
-       * Maximum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max_value = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueOrBuilder getMaxValueOrBuilder() {
-        if (maxValueBuilder_ != null) {
-          return maxValueBuilder_.getMessageOrBuilder();
-        } else {
-          return maxValue_ == null ?
-              com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : maxValue_;
-        }
-      }
-      /**
-       * 
-       * Maximum value appearing in the column.
-       * 

-       *
-       * .google.privacy.dlp.v2beta1.Value max_value = 2;
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-          getMaxValueFieldBuilder() {
-        if (maxValueBuilder_ == null) {
-          maxValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                  getMaxValue(),
-                  getParentForChildren(),
-                  isClean());
-          maxValue_ = null;
-        }
-        return maxValueBuilder_;
-      }
-
-      private java.util.List quantileValues_ =
-        java.util.Collections.emptyList();
-      private void ensureQuantileValuesIsMutable() {
-        if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          quantileValues_ = new java.util.ArrayList(quantileValues_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> quantileValuesBuilder_;
-
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public java.util.List getQuantileValuesList() {
-        if (quantileValuesBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(quantileValues_);
-        } else {
-          return quantileValuesBuilder_.getMessageList();
-        }
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public int getQuantileValuesCount() {
-        if (quantileValuesBuilder_ == null) {
-          return quantileValues_.size();
-        } else {
-          return quantileValuesBuilder_.getCount();
-        }
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.Value getQuantileValues(int index) {
-        if (quantileValuesBuilder_ == null) {
-          return quantileValues_.get(index);
-        } else {
-          return quantileValuesBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public Builder setQuantileValues(
-          int index, com.google.privacy.dlp.v2beta1.Value value) {
-        if (quantileValuesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureQuantileValuesIsMutable();
-          quantileValues_.set(index, value);
-          onChanged();
-        } else {
-          quantileValuesBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public Builder setQuantileValues(
-          int index, com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-        if (quantileValuesBuilder_ == null) {
-          ensureQuantileValuesIsMutable();
-          quantileValues_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          quantileValuesBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public Builder addQuantileValues(com.google.privacy.dlp.v2beta1.Value value) {
-        if (quantileValuesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureQuantileValuesIsMutable();
-          quantileValues_.add(value);
-          onChanged();
-        } else {
-          quantileValuesBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public Builder addQuantileValues(
-          int index, com.google.privacy.dlp.v2beta1.Value value) {
-        if (quantileValuesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureQuantileValuesIsMutable();
-          quantileValues_.add(index, value);
-          onChanged();
-        } else {
-          quantileValuesBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public Builder addQuantileValues(
-          com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-        if (quantileValuesBuilder_ == null) {
-          ensureQuantileValuesIsMutable();
-          quantileValues_.add(builderForValue.build());
-          onChanged();
-        } else {
-          quantileValuesBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public Builder addQuantileValues(
-          int index, com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-        if (quantileValuesBuilder_ == null) {
-          ensureQuantileValuesIsMutable();
-          quantileValues_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          quantileValuesBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public Builder addAllQuantileValues(
-          java.lang.Iterable values) {
-        if (quantileValuesBuilder_ == null) {
-          ensureQuantileValuesIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, quantileValues_);
-          onChanged();
-        } else {
-          quantileValuesBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public Builder clearQuantileValues() {
-        if (quantileValuesBuilder_ == null) {
-          quantileValues_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
-          onChanged();
-        } else {
-          quantileValuesBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public Builder removeQuantileValues(int index) {
-        if (quantileValuesBuilder_ == null) {
-          ensureQuantileValuesIsMutable();
-          quantileValues_.remove(index);
-          onChanged();
-        } else {
-          quantileValuesBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.Value.Builder getQuantileValuesBuilder(
-          int index) {
-        return getQuantileValuesFieldBuilder().getBuilder(index);
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueOrBuilder getQuantileValuesOrBuilder(
-          int index) {
-        if (quantileValuesBuilder_ == null) {
-          return quantileValues_.get(index);  } else {
-          return quantileValuesBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public java.util.List 
-           getQuantileValuesOrBuilderList() {
-        if (quantileValuesBuilder_ != null) {
-          return quantileValuesBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(quantileValues_);
-        }
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.Value.Builder addQuantileValuesBuilder() {
-        return getQuantileValuesFieldBuilder().addBuilder(
-            com.google.privacy.dlp.v2beta1.Value.getDefaultInstance());
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.Value.Builder addQuantileValuesBuilder(
-          int index) {
-        return getQuantileValuesFieldBuilder().addBuilder(
-            index, com.google.privacy.dlp.v2beta1.Value.getDefaultInstance());
-      }
-      /**
-       * 
-       * List of 99 values that partition the set of field values into 100 equal
-       * sized buckets.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quantile_values = 4;
-       */
-      public java.util.List 
-           getQuantileValuesBuilderList() {
-        return getQuantileValuesFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-          getQuantileValuesFieldBuilder() {
-        if (quantileValuesBuilder_ == null) {
-          quantileValuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                  quantileValues_,
-                  ((bitField0_ & 0x00000004) == 0x00000004),
-                  getParentForChildren(),
-                  isClean());
-          quantileValues_ = null;
-        }
-        return quantileValuesBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult)
-    private static final com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public NumericalStatsResult parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new NumericalStatsResult(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface CategoricalStatsResultOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Histogram of value frequencies in the column.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-     */
-    java.util.List 
-        getValueFrequencyHistogramBucketsList();
-    /**
-     * 
-     * Histogram of value frequencies in the column.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-     */
-    com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket getValueFrequencyHistogramBuckets(int index);
-    /**
-     * 
-     * Histogram of value frequencies in the column.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-     */
-    int getValueFrequencyHistogramBucketsCount();
-    /**
-     * 
-     * Histogram of value frequencies in the column.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-     */
-    java.util.List 
-        getValueFrequencyHistogramBucketsOrBuilderList();
-    /**
-     * 
-     * Histogram of value frequencies in the column.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-     */
-    com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucketOrBuilder getValueFrequencyHistogramBucketsOrBuilder(
-        int index);
-  }
-  /**
-   * 
-   * Result of the categorical stats computation.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult}
-   */
-  public  static final class CategoricalStatsResult extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult)
-      CategoricalStatsResultOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use CategoricalStatsResult.newBuilder() to construct.
-    private CategoricalStatsResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private CategoricalStatsResult() {
-      valueFrequencyHistogramBuckets_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private CategoricalStatsResult(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 42: {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                valueFrequencyHistogramBuckets_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              valueFrequencyHistogramBuckets_.add(
-                  input.readMessage(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.parser(), extensionRegistry));
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-          valueFrequencyHistogramBuckets_ = java.util.Collections.unmodifiableList(valueFrequencyHistogramBuckets_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.Builder.class);
-    }
-
-    public interface CategoricalStatsHistogramBucketOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket)
-        com.google.protobuf.MessageOrBuilder {
-
-      /**
-       * 
-       * Lower bound on the value frequency of the values in this bucket.
-       * 

-       *
-       * int64 value_frequency_lower_bound = 1;
-       */
-      long getValueFrequencyLowerBound();
-
-      /**
-       * 
-       * Upper bound on the value frequency of the values in this bucket.
-       * 

-       *
-       * int64 value_frequency_upper_bound = 2;
-       */
-      long getValueFrequencyUpperBound();
-
-      /**
-       * 
-       * Total number of records in this bucket.
-       * 

-       *
-       * int64 bucket_size = 3;
-       */
-      long getBucketSize();
-
-      /**
-       * 
-       * Sample of value frequencies in this bucket. The total number of
-       * values returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-       */
-      java.util.List 
-          getBucketValuesList();
-      /**
-       * 
-       * Sample of value frequencies in this bucket. The total number of
-       * values returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-       */
-      com.google.privacy.dlp.v2beta1.ValueFrequency getBucketValues(int index);
-      /**
-       * 
-       * Sample of value frequencies in this bucket. The total number of
-       * values returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-       */
-      int getBucketValuesCount();
-      /**
-       * 
-       * Sample of value frequencies in this bucket. The total number of
-       * values returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-       */
-      java.util.List 
-          getBucketValuesOrBuilderList();
-      /**
-       * 
-       * Sample of value frequencies in this bucket. The total number of
-       * values returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-       */
-      com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder getBucketValuesOrBuilder(
-          int index);
-    }
-    /**
-     * 
-     * Histogram bucket of value frequencies in the column.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket}
-     */
-    public  static final class CategoricalStatsHistogramBucket extends
-        com.google.protobuf.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket)
-        CategoricalStatsHistogramBucketOrBuilder {
-    private static final long serialVersionUID = 0L;
-      // Use CategoricalStatsHistogramBucket.newBuilder() to construct.
-      private CategoricalStatsHistogramBucket(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-        super(builder);
-      }
-      private CategoricalStatsHistogramBucket() {
-        valueFrequencyLowerBound_ = 0L;
-        valueFrequencyUpperBound_ = 0L;
-        bucketSize_ = 0L;
-        bucketValues_ = java.util.Collections.emptyList();
-      }
-
-      @java.lang.Override
-      public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private CategoricalStatsHistogramBucket(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-            com.google.protobuf.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-              case 8: {
-
-                valueFrequencyLowerBound_ = input.readInt64();
-                break;
-              }
-              case 16: {
-
-                valueFrequencyUpperBound_ = input.readInt64();
-                break;
-              }
-              case 24: {
-
-                bucketSize_ = input.readInt64();
-                break;
-              }
-              case 34: {
-                if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                  bucketValues_ = new java.util.ArrayList();
-                  mutable_bitField0_ |= 0x00000008;
-                }
-                bucketValues_.add(
-                    input.readMessage(com.google.privacy.dlp.v2beta1.ValueFrequency.parser(), extensionRegistry));
-                break;
-              }
-            }
-          }
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-            bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_);
-          }
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.Builder.class);
-      }
-
-      private int bitField0_;
-      public static final int VALUE_FREQUENCY_LOWER_BOUND_FIELD_NUMBER = 1;
-      private long valueFrequencyLowerBound_;
-      /**
-       * 
-       * Lower bound on the value frequency of the values in this bucket.
-       * 

-       *
-       * int64 value_frequency_lower_bound = 1;
-       */
-      public long getValueFrequencyLowerBound() {
-        return valueFrequencyLowerBound_;
-      }
-
-      public static final int VALUE_FREQUENCY_UPPER_BOUND_FIELD_NUMBER = 2;
-      private long valueFrequencyUpperBound_;
-      /**
-       * 
-       * Upper bound on the value frequency of the values in this bucket.
-       * 

-       *
-       * int64 value_frequency_upper_bound = 2;
-       */
-      public long getValueFrequencyUpperBound() {
-        return valueFrequencyUpperBound_;
-      }
-
-      public static final int BUCKET_SIZE_FIELD_NUMBER = 3;
-      private long bucketSize_;
-      /**
-       * 
-       * Total number of records in this bucket.
-       * 

-       *
-       * int64 bucket_size = 3;
-       */
-      public long getBucketSize() {
-        return bucketSize_;
-      }
-
-      public static final int BUCKET_VALUES_FIELD_NUMBER = 4;
-      private java.util.List bucketValues_;
-      /**
-       * 
-       * Sample of value frequencies in this bucket. The total number of
-       * values returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-       */
-      public java.util.List getBucketValuesList() {
-        return bucketValues_;
-      }
-      /**
-       * 
-       * Sample of value frequencies in this bucket. The total number of
-       * values returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-       */
-      public java.util.List 
-          getBucketValuesOrBuilderList() {
-        return bucketValues_;
-      }
-      /**
-       * 
-       * Sample of value frequencies in this bucket. The total number of
-       * values returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-       */
-      public int getBucketValuesCount() {
-        return bucketValues_.size();
-      }
-      /**
-       * 
-       * Sample of value frequencies in this bucket. The total number of
-       * values returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueFrequency getBucketValues(int index) {
-        return bucketValues_.get(index);
-      }
-      /**
-       * 
-       * Sample of value frequencies in this bucket. The total number of
-       * values returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder getBucketValuesOrBuilder(
-          int index) {
-        return bucketValues_.get(index);
-      }
-
-      private byte memoizedIsInitialized = -1;
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized == 1) return true;
-        if (isInitialized == 0) return false;
-
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      public void writeTo(com.google.protobuf.CodedOutputStream output)
-                          throws java.io.IOException {
-        if (valueFrequencyLowerBound_ != 0L) {
-          output.writeInt64(1, valueFrequencyLowerBound_);
-        }
-        if (valueFrequencyUpperBound_ != 0L) {
-          output.writeInt64(2, valueFrequencyUpperBound_);
-        }
-        if (bucketSize_ != 0L) {
-          output.writeInt64(3, bucketSize_);
-        }
-        for (int i = 0; i < bucketValues_.size(); i++) {
-          output.writeMessage(4, bucketValues_.get(i));
-        }
-        unknownFields.writeTo(output);
-      }
-
-      public int getSerializedSize() {
-        int size = memoizedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        if (valueFrequencyLowerBound_ != 0L) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeInt64Size(1, valueFrequencyLowerBound_);
-        }
-        if (valueFrequencyUpperBound_ != 0L) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeInt64Size(2, valueFrequencyUpperBound_);
-        }
-        if (bucketSize_ != 0L) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeInt64Size(3, bucketSize_);
-        }
-        for (int i = 0; i < bucketValues_.size(); i++) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(4, bucketValues_.get(i));
-        }
-        size += unknownFields.getSerializedSize();
-        memoizedSize = size;
-        return size;
-      }
-
-      @java.lang.Override
-      public boolean equals(final java.lang.Object obj) {
-        if (obj == this) {
-         return true;
-        }
-        if (!(obj instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket)) {
-          return super.equals(obj);
-        }
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket other = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket) obj;
-
-        boolean result = true;
-        result = result && (getValueFrequencyLowerBound()
-            == other.getValueFrequencyLowerBound());
-        result = result && (getValueFrequencyUpperBound()
-            == other.getValueFrequencyUpperBound());
-        result = result && (getBucketSize()
-            == other.getBucketSize());
-        result = result && getBucketValuesList()
-            .equals(other.getBucketValuesList());
-        result = result && unknownFields.equals(other.unknownFields);
-        return result;
-      }
-
-      @java.lang.Override
-      public int hashCode() {
-        if (memoizedHashCode != 0) {
-          return memoizedHashCode;
-        }
-        int hash = 41;
-        hash = (19 * hash) + getDescriptor().hashCode();
-        hash = (37 * hash) + VALUE_FREQUENCY_LOWER_BOUND_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getValueFrequencyLowerBound());
-        hash = (37 * hash) + VALUE_FREQUENCY_UPPER_BOUND_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getValueFrequencyUpperBound());
-        hash = (37 * hash) + BUCKET_SIZE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getBucketSize());
-        if (getBucketValuesCount() > 0) {
-          hash = (37 * hash) + BUCKET_VALUES_FIELD_NUMBER;
-          hash = (53 * hash) + getBucketValuesList().hashCode();
-        }
-        hash = (29 * hash) + unknownFields.hashCode();
-        memoizedHashCode = hash;
-        return hash;
-      }
-
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parseFrom(
-          java.nio.ByteBuffer data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parseFrom(
-          java.nio.ByteBuffer data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parseFrom(
-          com.google.protobuf.ByteString data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parseFrom(
-          com.google.protobuf.ByteString data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parseFrom(byte[] data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parseFrom(
-          byte[] data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parseFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parseDelimitedFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parseFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parseFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder() {
-        return DEFAULT_INSTANCE.toBuilder();
-      }
-      public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket prototype) {
-        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-      }
-      public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE
-            ? new Builder() : new Builder().mergeFrom(this);
-      }
-
-      @java.lang.Override
-      protected Builder newBuilderForType(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        Builder builder = new Builder(parent);
-        return builder;
-      }
-      /**
-       * 
-       * Histogram bucket of value frequencies in the column.
-       * 

-       *
-       * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket}
-       */
-      public static final class Builder extends
-          com.google.protobuf.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket)
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucketOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor
-            getDescriptor() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket_descriptor;
-        }
-
-        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-            internalGetFieldAccessorTable() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket_fieldAccessorTable
-              .ensureFieldAccessorsInitialized(
-                  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.Builder.class);
-        }
-
-        // Construct using com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private Builder(
-            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-          super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-            getBucketValuesFieldBuilder();
-          }
-        }
-        public Builder clear() {
-          super.clear();
-          valueFrequencyLowerBound_ = 0L;
-
-          valueFrequencyUpperBound_ = 0L;
-
-          bucketSize_ = 0L;
-
-          if (bucketValuesBuilder_ == null) {
-            bucketValues_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            bucketValuesBuilder_.clear();
-          }
-          return this;
-        }
-
-        public com.google.protobuf.Descriptors.Descriptor
-            getDescriptorForType() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_CategoricalStatsHistogramBucket_descriptor;
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket getDefaultInstanceForType() {
-          return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.getDefaultInstance();
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket build() {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket buildPartial() {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket result = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket(this);
-          int from_bitField0_ = bitField0_;
-          int to_bitField0_ = 0;
-          result.valueFrequencyLowerBound_ = valueFrequencyLowerBound_;
-          result.valueFrequencyUpperBound_ = valueFrequencyUpperBound_;
-          result.bucketSize_ = bucketSize_;
-          if (bucketValuesBuilder_ == null) {
-            if (((bitField0_ & 0x00000008) == 0x00000008)) {
-              bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_);
-              bitField0_ = (bitField0_ & ~0x00000008);
-            }
-            result.bucketValues_ = bucketValues_;
-          } else {
-            result.bucketValues_ = bucketValuesBuilder_.build();
-          }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
-        }
-
-        public Builder clone() {
-          return (Builder) super.clone();
-        }
-        public Builder setField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return (Builder) super.setField(field, value);
-        }
-        public Builder clearField(
-            com.google.protobuf.Descriptors.FieldDescriptor field) {
-          return (Builder) super.clearField(field);
-        }
-        public Builder clearOneof(
-            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-          return (Builder) super.clearOneof(oneof);
-        }
-        public Builder setRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, java.lang.Object value) {
-          return (Builder) super.setRepeatedField(field, index, value);
-        }
-        public Builder addRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return (Builder) super.addRepeatedField(field, value);
-        }
-        public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket) {
-            return mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket)other);
-          } else {
-            super.mergeFrom(other);
-            return this;
-          }
-        }
-
-        public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket other) {
-          if (other == com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.getDefaultInstance()) return this;
-          if (other.getValueFrequencyLowerBound() != 0L) {
-            setValueFrequencyLowerBound(other.getValueFrequencyLowerBound());
-          }
-          if (other.getValueFrequencyUpperBound() != 0L) {
-            setValueFrequencyUpperBound(other.getValueFrequencyUpperBound());
-          }
-          if (other.getBucketSize() != 0L) {
-            setBucketSize(other.getBucketSize());
-          }
-          if (bucketValuesBuilder_ == null) {
-            if (!other.bucketValues_.isEmpty()) {
-              if (bucketValues_.isEmpty()) {
-                bucketValues_ = other.bucketValues_;
-                bitField0_ = (bitField0_ & ~0x00000008);
-              } else {
-                ensureBucketValuesIsMutable();
-                bucketValues_.addAll(other.bucketValues_);
-              }
-              onChanged();
-            }
-          } else {
-            if (!other.bucketValues_.isEmpty()) {
-              if (bucketValuesBuilder_.isEmpty()) {
-                bucketValuesBuilder_.dispose();
-                bucketValuesBuilder_ = null;
-                bucketValues_ = other.bucketValues_;
-                bitField0_ = (bitField0_ & ~0x00000008);
-                bucketValuesBuilder_ = 
-                  com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                     getBucketValuesFieldBuilder() : null;
-              } else {
-                bucketValuesBuilder_.addAllMessages(other.bucketValues_);
-              }
-            }
-          }
-          this.mergeUnknownFields(other.unknownFields);
-          onChanged();
-          return this;
-        }
-
-        public final boolean isInitialized() {
-          return true;
-        }
-
-        public Builder mergeFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket) e.getUnfinishedMessage();
-            throw e.unwrapIOException();
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-        private int bitField0_;
-
-        private long valueFrequencyLowerBound_ ;
-        /**
-         * 
-         * Lower bound on the value frequency of the values in this bucket.
-         * 

-         *
-         * int64 value_frequency_lower_bound = 1;
-         */
-        public long getValueFrequencyLowerBound() {
-          return valueFrequencyLowerBound_;
-        }
-        /**
-         * 
-         * Lower bound on the value frequency of the values in this bucket.
-         * 

-         *
-         * int64 value_frequency_lower_bound = 1;
-         */
-        public Builder setValueFrequencyLowerBound(long value) {
-          
-          valueFrequencyLowerBound_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Lower bound on the value frequency of the values in this bucket.
-         * 

-         *
-         * int64 value_frequency_lower_bound = 1;
-         */
-        public Builder clearValueFrequencyLowerBound() {
-          
-          valueFrequencyLowerBound_ = 0L;
-          onChanged();
-          return this;
-        }
-
-        private long valueFrequencyUpperBound_ ;
-        /**
-         * 
-         * Upper bound on the value frequency of the values in this bucket.
-         * 

-         *
-         * int64 value_frequency_upper_bound = 2;
-         */
-        public long getValueFrequencyUpperBound() {
-          return valueFrequencyUpperBound_;
-        }
-        /**
-         * 
-         * Upper bound on the value frequency of the values in this bucket.
-         * 

-         *
-         * int64 value_frequency_upper_bound = 2;
-         */
-        public Builder setValueFrequencyUpperBound(long value) {
-          
-          valueFrequencyUpperBound_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Upper bound on the value frequency of the values in this bucket.
-         * 

-         *
-         * int64 value_frequency_upper_bound = 2;
-         */
-        public Builder clearValueFrequencyUpperBound() {
-          
-          valueFrequencyUpperBound_ = 0L;
-          onChanged();
-          return this;
-        }
-
-        private long bucketSize_ ;
-        /**
-         * 
-         * Total number of records in this bucket.
-         * 

-         *
-         * int64 bucket_size = 3;
-         */
-        public long getBucketSize() {
-          return bucketSize_;
-        }
-        /**
-         * 
-         * Total number of records in this bucket.
-         * 

-         *
-         * int64 bucket_size = 3;
-         */
-        public Builder setBucketSize(long value) {
-          
-          bucketSize_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Total number of records in this bucket.
-         * 

-         *
-         * int64 bucket_size = 3;
-         */
-        public Builder clearBucketSize() {
-          
-          bucketSize_ = 0L;
-          onChanged();
-          return this;
-        }
-
-        private java.util.List bucketValues_ =
-          java.util.Collections.emptyList();
-        private void ensureBucketValuesIsMutable() {
-          if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-            bucketValues_ = new java.util.ArrayList(bucketValues_);
-            bitField0_ |= 0x00000008;
-           }
-        }
-
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.ValueFrequency, com.google.privacy.dlp.v2beta1.ValueFrequency.Builder, com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder> bucketValuesBuilder_;
-
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public java.util.List getBucketValuesList() {
-          if (bucketValuesBuilder_ == null) {
-            return java.util.Collections.unmodifiableList(bucketValues_);
-          } else {
-            return bucketValuesBuilder_.getMessageList();
-          }
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public int getBucketValuesCount() {
-          if (bucketValuesBuilder_ == null) {
-            return bucketValues_.size();
-          } else {
-            return bucketValuesBuilder_.getCount();
-          }
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.ValueFrequency getBucketValues(int index) {
-          if (bucketValuesBuilder_ == null) {
-            return bucketValues_.get(index);
-          } else {
-            return bucketValuesBuilder_.getMessage(index);
-          }
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public Builder setBucketValues(
-            int index, com.google.privacy.dlp.v2beta1.ValueFrequency value) {
-          if (bucketValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureBucketValuesIsMutable();
-            bucketValues_.set(index, value);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.setMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public Builder setBucketValues(
-            int index, com.google.privacy.dlp.v2beta1.ValueFrequency.Builder builderForValue) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            bucketValues_.set(index, builderForValue.build());
-            onChanged();
-          } else {
-            bucketValuesBuilder_.setMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public Builder addBucketValues(com.google.privacy.dlp.v2beta1.ValueFrequency value) {
-          if (bucketValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureBucketValuesIsMutable();
-            bucketValues_.add(value);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addMessage(value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public Builder addBucketValues(
-            int index, com.google.privacy.dlp.v2beta1.ValueFrequency value) {
-          if (bucketValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureBucketValuesIsMutable();
-            bucketValues_.add(index, value);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public Builder addBucketValues(
-            com.google.privacy.dlp.v2beta1.ValueFrequency.Builder builderForValue) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            bucketValues_.add(builderForValue.build());
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addMessage(builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public Builder addBucketValues(
-            int index, com.google.privacy.dlp.v2beta1.ValueFrequency.Builder builderForValue) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            bucketValues_.add(index, builderForValue.build());
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public Builder addAllBucketValues(
-            java.lang.Iterable values) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            com.google.protobuf.AbstractMessageLite.Builder.addAll(
-                values, bucketValues_);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addAllMessages(values);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public Builder clearBucketValues() {
-          if (bucketValuesBuilder_ == null) {
-            bucketValues_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000008);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.clear();
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public Builder removeBucketValues(int index) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            bucketValues_.remove(index);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.remove(index);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.ValueFrequency.Builder getBucketValuesBuilder(
-            int index) {
-          return getBucketValuesFieldBuilder().getBuilder(index);
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder getBucketValuesOrBuilder(
-            int index) {
-          if (bucketValuesBuilder_ == null) {
-            return bucketValues_.get(index);  } else {
-            return bucketValuesBuilder_.getMessageOrBuilder(index);
-          }
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public java.util.List 
-             getBucketValuesOrBuilderList() {
-          if (bucketValuesBuilder_ != null) {
-            return bucketValuesBuilder_.getMessageOrBuilderList();
-          } else {
-            return java.util.Collections.unmodifiableList(bucketValues_);
-          }
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.ValueFrequency.Builder addBucketValuesBuilder() {
-          return getBucketValuesFieldBuilder().addBuilder(
-              com.google.privacy.dlp.v2beta1.ValueFrequency.getDefaultInstance());
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.ValueFrequency.Builder addBucketValuesBuilder(
-            int index) {
-          return getBucketValuesFieldBuilder().addBuilder(
-              index, com.google.privacy.dlp.v2beta1.ValueFrequency.getDefaultInstance());
-        }
-        /**
-         * 
-         * Sample of value frequencies in this bucket. The total number of
-         * values returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency bucket_values = 4;
-         */
-        public java.util.List 
-             getBucketValuesBuilderList() {
-          return getBucketValuesFieldBuilder().getBuilderList();
-        }
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.ValueFrequency, com.google.privacy.dlp.v2beta1.ValueFrequency.Builder, com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder> 
-            getBucketValuesFieldBuilder() {
-          if (bucketValuesBuilder_ == null) {
-            bucketValuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.privacy.dlp.v2beta1.ValueFrequency, com.google.privacy.dlp.v2beta1.ValueFrequency.Builder, com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder>(
-                    bucketValues_,
-                    ((bitField0_ & 0x00000008) == 0x00000008),
-                    getParentForChildren(),
-                    isClean());
-            bucketValues_ = null;
-          }
-          return bucketValuesBuilder_;
-        }
-        public final Builder setUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.setUnknownFieldsProto3(unknownFields);
-        }
-
-        public final Builder mergeUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.mergeUnknownFields(unknownFields);
-        }
-
-
-        // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket)
-      }
-
-      // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket)
-      private static final com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket DEFAULT_INSTANCE;
-      static {
-        DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket();
-      }
-
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket getDefaultInstance() {
-        return DEFAULT_INSTANCE;
-      }
-
-      private static final com.google.protobuf.Parser
-          PARSER = new com.google.protobuf.AbstractParser() {
-        public CategoricalStatsHistogramBucket parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CategoricalStatsHistogramBucket(input, extensionRegistry);
-        }
-      };
-
-      public static com.google.protobuf.Parser parser() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Parser getParserForType() {
-        return PARSER;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket getDefaultInstanceForType() {
-        return DEFAULT_INSTANCE;
-      }
-
-    }
-
-    public static final int VALUE_FREQUENCY_HISTOGRAM_BUCKETS_FIELD_NUMBER = 5;
-    private java.util.List valueFrequencyHistogramBuckets_;
-    /**
-     * 
-     * Histogram of value frequencies in the column.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-     */
-    public java.util.List getValueFrequencyHistogramBucketsList() {
-      return valueFrequencyHistogramBuckets_;
-    }
-    /**
-     * 
-     * Histogram of value frequencies in the column.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-     */
-    public java.util.List 
-        getValueFrequencyHistogramBucketsOrBuilderList() {
-      return valueFrequencyHistogramBuckets_;
-    }
-    /**
-     * 
-     * Histogram of value frequencies in the column.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-     */
-    public int getValueFrequencyHistogramBucketsCount() {
-      return valueFrequencyHistogramBuckets_.size();
-    }
-    /**
-     * 
-     * Histogram of value frequencies in the column.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket getValueFrequencyHistogramBuckets(int index) {
-      return valueFrequencyHistogramBuckets_.get(index);
-    }
-    /**
-     * 
-     * Histogram of value frequencies in the column.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucketOrBuilder getValueFrequencyHistogramBucketsOrBuilder(
-        int index) {
-      return valueFrequencyHistogramBuckets_.get(index);
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      for (int i = 0; i < valueFrequencyHistogramBuckets_.size(); i++) {
-        output.writeMessage(5, valueFrequencyHistogramBuckets_.get(i));
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < valueFrequencyHistogramBuckets_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, valueFrequencyHistogramBuckets_.get(i));
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult other = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) obj;
-
-      boolean result = true;
-      result = result && getValueFrequencyHistogramBucketsList()
-          .equals(other.getValueFrequencyHistogramBucketsList());
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getValueFrequencyHistogramBucketsCount() > 0) {
-        hash = (37 * hash) + VALUE_FREQUENCY_HISTOGRAM_BUCKETS_FIELD_NUMBER;
-        hash = (53 * hash) + getValueFrequencyHistogramBucketsList().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Result of the categorical stats computation.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult)
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResultOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getValueFrequencyHistogramBucketsFieldBuilder();
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          valueFrequencyHistogramBuckets_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          valueFrequencyHistogramBucketsBuilder_.clear();
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_CategoricalStatsResult_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult build() {
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult buildPartial() {
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult result = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult(this);
-        int from_bitField0_ = bitField0_;
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001)) {
-            valueFrequencyHistogramBuckets_ = java.util.Collections.unmodifiableList(valueFrequencyHistogramBuckets_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.valueFrequencyHistogramBuckets_ = valueFrequencyHistogramBuckets_;
-        } else {
-          result.valueFrequencyHistogramBuckets_ = valueFrequencyHistogramBucketsBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult other) {
-        if (other == com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.getDefaultInstance()) return this;
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          if (!other.valueFrequencyHistogramBuckets_.isEmpty()) {
-            if (valueFrequencyHistogramBuckets_.isEmpty()) {
-              valueFrequencyHistogramBuckets_ = other.valueFrequencyHistogramBuckets_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureValueFrequencyHistogramBucketsIsMutable();
-              valueFrequencyHistogramBuckets_.addAll(other.valueFrequencyHistogramBuckets_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.valueFrequencyHistogramBuckets_.isEmpty()) {
-            if (valueFrequencyHistogramBucketsBuilder_.isEmpty()) {
-              valueFrequencyHistogramBucketsBuilder_.dispose();
-              valueFrequencyHistogramBucketsBuilder_ = null;
-              valueFrequencyHistogramBuckets_ = other.valueFrequencyHistogramBuckets_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              valueFrequencyHistogramBucketsBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getValueFrequencyHistogramBucketsFieldBuilder() : null;
-            } else {
-              valueFrequencyHistogramBucketsBuilder_.addAllMessages(other.valueFrequencyHistogramBuckets_);
-            }
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List valueFrequencyHistogramBuckets_ =
-        java.util.Collections.emptyList();
-      private void ensureValueFrequencyHistogramBucketsIsMutable() {
-        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          valueFrequencyHistogramBuckets_ = new java.util.ArrayList(valueFrequencyHistogramBuckets_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucketOrBuilder> valueFrequencyHistogramBucketsBuilder_;
-
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public java.util.List getValueFrequencyHistogramBucketsList() {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(valueFrequencyHistogramBuckets_);
-        } else {
-          return valueFrequencyHistogramBucketsBuilder_.getMessageList();
-        }
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public int getValueFrequencyHistogramBucketsCount() {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          return valueFrequencyHistogramBuckets_.size();
-        } else {
-          return valueFrequencyHistogramBucketsBuilder_.getCount();
-        }
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket getValueFrequencyHistogramBuckets(int index) {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          return valueFrequencyHistogramBuckets_.get(index);
-        } else {
-          return valueFrequencyHistogramBucketsBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public Builder setValueFrequencyHistogramBuckets(
-          int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value) {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureValueFrequencyHistogramBucketsIsMutable();
-          valueFrequencyHistogramBuckets_.set(index, value);
-          onChanged();
-        } else {
-          valueFrequencyHistogramBucketsBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public Builder setValueFrequencyHistogramBuckets(
-          int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.Builder builderForValue) {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          ensureValueFrequencyHistogramBucketsIsMutable();
-          valueFrequencyHistogramBuckets_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          valueFrequencyHistogramBucketsBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public Builder addValueFrequencyHistogramBuckets(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value) {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureValueFrequencyHistogramBucketsIsMutable();
-          valueFrequencyHistogramBuckets_.add(value);
-          onChanged();
-        } else {
-          valueFrequencyHistogramBucketsBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public Builder addValueFrequencyHistogramBuckets(
-          int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value) {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureValueFrequencyHistogramBucketsIsMutable();
-          valueFrequencyHistogramBuckets_.add(index, value);
-          onChanged();
-        } else {
-          valueFrequencyHistogramBucketsBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public Builder addValueFrequencyHistogramBuckets(
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.Builder builderForValue) {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          ensureValueFrequencyHistogramBucketsIsMutable();
-          valueFrequencyHistogramBuckets_.add(builderForValue.build());
-          onChanged();
-        } else {
-          valueFrequencyHistogramBucketsBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public Builder addValueFrequencyHistogramBuckets(
-          int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.Builder builderForValue) {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          ensureValueFrequencyHistogramBucketsIsMutable();
-          valueFrequencyHistogramBuckets_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          valueFrequencyHistogramBucketsBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public Builder addAllValueFrequencyHistogramBuckets(
-          java.lang.Iterable values) {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          ensureValueFrequencyHistogramBucketsIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, valueFrequencyHistogramBuckets_);
-          onChanged();
-        } else {
-          valueFrequencyHistogramBucketsBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public Builder clearValueFrequencyHistogramBuckets() {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          valueFrequencyHistogramBuckets_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          valueFrequencyHistogramBucketsBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public Builder removeValueFrequencyHistogramBuckets(int index) {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          ensureValueFrequencyHistogramBucketsIsMutable();
-          valueFrequencyHistogramBuckets_.remove(index);
-          onChanged();
-        } else {
-          valueFrequencyHistogramBucketsBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.Builder getValueFrequencyHistogramBucketsBuilder(
-          int index) {
-        return getValueFrequencyHistogramBucketsFieldBuilder().getBuilder(index);
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucketOrBuilder getValueFrequencyHistogramBucketsOrBuilder(
-          int index) {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          return valueFrequencyHistogramBuckets_.get(index);  } else {
-          return valueFrequencyHistogramBucketsBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public java.util.List 
-           getValueFrequencyHistogramBucketsOrBuilderList() {
-        if (valueFrequencyHistogramBucketsBuilder_ != null) {
-          return valueFrequencyHistogramBucketsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(valueFrequencyHistogramBuckets_);
-        }
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.Builder addValueFrequencyHistogramBucketsBuilder() {
-        return getValueFrequencyHistogramBucketsFieldBuilder().addBuilder(
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.getDefaultInstance());
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.Builder addValueFrequencyHistogramBucketsBuilder(
-          int index) {
-        return getValueFrequencyHistogramBucketsFieldBuilder().addBuilder(
-            index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.getDefaultInstance());
-      }
-      /**
-       * 
-       * Histogram of value frequencies in the column.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-       */
-      public java.util.List 
-           getValueFrequencyHistogramBucketsBuilderList() {
-        return getValueFrequencyHistogramBucketsFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucketOrBuilder> 
-          getValueFrequencyHistogramBucketsFieldBuilder() {
-        if (valueFrequencyHistogramBucketsBuilder_ == null) {
-          valueFrequencyHistogramBucketsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucket.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.CategoricalStatsHistogramBucketOrBuilder>(
-                  valueFrequencyHistogramBuckets_,
-                  ((bitField0_ & 0x00000001) == 0x00000001),
-                  getParentForChildren(),
-                  isClean());
-          valueFrequencyHistogramBuckets_ = null;
-        }
-        return valueFrequencyHistogramBucketsBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult)
-    private static final com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public CategoricalStatsResult parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CategoricalStatsResult(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface KAnonymityResultOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Histogram of k-anonymity equivalence classes.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-     */
-    java.util.List 
-        getEquivalenceClassHistogramBucketsList();
-    /**
-     * 
-     * Histogram of k-anonymity equivalence classes.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-     */
-    com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket getEquivalenceClassHistogramBuckets(int index);
-    /**
-     * 
-     * Histogram of k-anonymity equivalence classes.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-     */
-    int getEquivalenceClassHistogramBucketsCount();
-    /**
-     * 
-     * Histogram of k-anonymity equivalence classes.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-     */
-    java.util.List 
-        getEquivalenceClassHistogramBucketsOrBuilderList();
-    /**
-     * 
-     * Histogram of k-anonymity equivalence classes.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-     */
-    com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucketOrBuilder getEquivalenceClassHistogramBucketsOrBuilder(
-        int index);
-  }
-  /**
-   * 
-   * Result of the k-anonymity computation.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult}
-   */
-  public  static final class KAnonymityResult extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult)
-      KAnonymityResultOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use KAnonymityResult.newBuilder() to construct.
-    private KAnonymityResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private KAnonymityResult() {
-      equivalenceClassHistogramBuckets_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private KAnonymityResult(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 42: {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                equivalenceClassHistogramBuckets_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              equivalenceClassHistogramBuckets_.add(
-                  input.readMessage(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.parser(), extensionRegistry));
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-          equivalenceClassHistogramBuckets_ = java.util.Collections.unmodifiableList(equivalenceClassHistogramBuckets_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.Builder.class);
-    }
-
-    public interface KAnonymityEquivalenceClassOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass)
-        com.google.protobuf.MessageOrBuilder {
-
-      /**
-       * 
-       * Set of values defining the equivalence class. One value per
-       * quasi-identifier column in the original KAnonymity metric message.
-       * The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      java.util.List 
-          getQuasiIdsValuesList();
-      /**
-       * 
-       * Set of values defining the equivalence class. One value per
-       * quasi-identifier column in the original KAnonymity metric message.
-       * The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      com.google.privacy.dlp.v2beta1.Value getQuasiIdsValues(int index);
-      /**
-       * 
-       * Set of values defining the equivalence class. One value per
-       * quasi-identifier column in the original KAnonymity metric message.
-       * The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      int getQuasiIdsValuesCount();
-      /**
-       * 
-       * Set of values defining the equivalence class. One value per
-       * quasi-identifier column in the original KAnonymity metric message.
-       * The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      java.util.List 
-          getQuasiIdsValuesOrBuilderList();
-      /**
-       * 
-       * Set of values defining the equivalence class. One value per
-       * quasi-identifier column in the original KAnonymity metric message.
-       * The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      com.google.privacy.dlp.v2beta1.ValueOrBuilder getQuasiIdsValuesOrBuilder(
-          int index);
-
-      /**
-       * 
-       * Size of the equivalence class, for example number of rows with the
-       * above set of values.
-       * 

-       *
-       * int64 equivalence_class_size = 2;
-       */
-      long getEquivalenceClassSize();
-    }
-    /**
-     * 
-     * The set of columns' values that share the same k-anonymity value.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass}
-     */
-    public  static final class KAnonymityEquivalenceClass extends
-        com.google.protobuf.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass)
-        KAnonymityEquivalenceClassOrBuilder {
-    private static final long serialVersionUID = 0L;
-      // Use KAnonymityEquivalenceClass.newBuilder() to construct.
-      private KAnonymityEquivalenceClass(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-        super(builder);
-      }
-      private KAnonymityEquivalenceClass() {
-        quasiIdsValues_ = java.util.Collections.emptyList();
-        equivalenceClassSize_ = 0L;
-      }
-
-      @java.lang.Override
-      public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private KAnonymityEquivalenceClass(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-            com.google.protobuf.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-              case 10: {
-                if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                  quasiIdsValues_ = new java.util.ArrayList();
-                  mutable_bitField0_ |= 0x00000001;
-                }
-                quasiIdsValues_.add(
-                    input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry));
-                break;
-              }
-              case 16: {
-
-                equivalenceClassSize_ = input.readInt64();
-                break;
-              }
-            }
-          }
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-            quasiIdsValues_ = java.util.Collections.unmodifiableList(quasiIdsValues_);
-          }
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.Builder.class);
-      }
-
-      private int bitField0_;
-      public static final int QUASI_IDS_VALUES_FIELD_NUMBER = 1;
-      private java.util.List quasiIdsValues_;
-      /**
-       * 
-       * Set of values defining the equivalence class. One value per
-       * quasi-identifier column in the original KAnonymity metric message.
-       * The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      public java.util.List getQuasiIdsValuesList() {
-        return quasiIdsValues_;
-      }
-      /**
-       * 
-       * Set of values defining the equivalence class. One value per
-       * quasi-identifier column in the original KAnonymity metric message.
-       * The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      public java.util.List 
-          getQuasiIdsValuesOrBuilderList() {
-        return quasiIdsValues_;
-      }
-      /**
-       * 
-       * Set of values defining the equivalence class. One value per
-       * quasi-identifier column in the original KAnonymity metric message.
-       * The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      public int getQuasiIdsValuesCount() {
-        return quasiIdsValues_.size();
-      }
-      /**
-       * 
-       * Set of values defining the equivalence class. One value per
-       * quasi-identifier column in the original KAnonymity metric message.
-       * The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.Value getQuasiIdsValues(int index) {
-        return quasiIdsValues_.get(index);
-      }
-      /**
-       * 
-       * Set of values defining the equivalence class. One value per
-       * quasi-identifier column in the original KAnonymity metric message.
-       * The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueOrBuilder getQuasiIdsValuesOrBuilder(
-          int index) {
-        return quasiIdsValues_.get(index);
-      }
-
-      public static final int EQUIVALENCE_CLASS_SIZE_FIELD_NUMBER = 2;
-      private long equivalenceClassSize_;
-      /**
-       * 
-       * Size of the equivalence class, for example number of rows with the
-       * above set of values.
-       * 

-       *
-       * int64 equivalence_class_size = 2;
-       */
-      public long getEquivalenceClassSize() {
-        return equivalenceClassSize_;
-      }
-
-      private byte memoizedIsInitialized = -1;
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized == 1) return true;
-        if (isInitialized == 0) return false;
-
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      public void writeTo(com.google.protobuf.CodedOutputStream output)
-                          throws java.io.IOException {
-        for (int i = 0; i < quasiIdsValues_.size(); i++) {
-          output.writeMessage(1, quasiIdsValues_.get(i));
-        }
-        if (equivalenceClassSize_ != 0L) {
-          output.writeInt64(2, equivalenceClassSize_);
-        }
-        unknownFields.writeTo(output);
-      }
-
-      public int getSerializedSize() {
-        int size = memoizedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        for (int i = 0; i < quasiIdsValues_.size(); i++) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(1, quasiIdsValues_.get(i));
-        }
-        if (equivalenceClassSize_ != 0L) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeInt64Size(2, equivalenceClassSize_);
-        }
-        size += unknownFields.getSerializedSize();
-        memoizedSize = size;
-        return size;
-      }
-
-      @java.lang.Override
-      public boolean equals(final java.lang.Object obj) {
-        if (obj == this) {
-         return true;
-        }
-        if (!(obj instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass)) {
-          return super.equals(obj);
-        }
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass other = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass) obj;
-
-        boolean result = true;
-        result = result && getQuasiIdsValuesList()
-            .equals(other.getQuasiIdsValuesList());
-        result = result && (getEquivalenceClassSize()
-            == other.getEquivalenceClassSize());
-        result = result && unknownFields.equals(other.unknownFields);
-        return result;
-      }
-
-      @java.lang.Override
-      public int hashCode() {
-        if (memoizedHashCode != 0) {
-          return memoizedHashCode;
-        }
-        int hash = 41;
-        hash = (19 * hash) + getDescriptor().hashCode();
-        if (getQuasiIdsValuesCount() > 0) {
-          hash = (37 * hash) + QUASI_IDS_VALUES_FIELD_NUMBER;
-          hash = (53 * hash) + getQuasiIdsValuesList().hashCode();
-        }
-        hash = (37 * hash) + EQUIVALENCE_CLASS_SIZE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getEquivalenceClassSize());
-        hash = (29 * hash) + unknownFields.hashCode();
-        memoizedHashCode = hash;
-        return hash;
-      }
-
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parseFrom(
-          java.nio.ByteBuffer data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parseFrom(
-          java.nio.ByteBuffer data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parseFrom(
-          com.google.protobuf.ByteString data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parseFrom(
-          com.google.protobuf.ByteString data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parseFrom(byte[] data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parseFrom(
-          byte[] data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parseFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parseDelimitedFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parseFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parseFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder() {
-        return DEFAULT_INSTANCE.toBuilder();
-      }
-      public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass prototype) {
-        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-      }
-      public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE
-            ? new Builder() : new Builder().mergeFrom(this);
-      }
-
-      @java.lang.Override
-      protected Builder newBuilderForType(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        Builder builder = new Builder(parent);
-        return builder;
-      }
-      /**
-       * 
-       * The set of columns' values that share the same k-anonymity value.
-       * 

-       *
-       * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass}
-       */
-      public static final class Builder extends
-          com.google.protobuf.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass)
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClassOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor
-            getDescriptor() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass_descriptor;
-        }
-
-        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-            internalGetFieldAccessorTable() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass_fieldAccessorTable
-              .ensureFieldAccessorsInitialized(
-                  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.Builder.class);
-        }
-
-        // Construct using com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private Builder(
-            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-          super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-            getQuasiIdsValuesFieldBuilder();
-          }
-        }
-        public Builder clear() {
-          super.clear();
-          if (quasiIdsValuesBuilder_ == null) {
-            quasiIdsValues_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            quasiIdsValuesBuilder_.clear();
-          }
-          equivalenceClassSize_ = 0L;
-
-          return this;
-        }
-
-        public com.google.protobuf.Descriptors.Descriptor
-            getDescriptorForType() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityEquivalenceClass_descriptor;
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass getDefaultInstanceForType() {
-          return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.getDefaultInstance();
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass build() {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass buildPartial() {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass result = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass(this);
-          int from_bitField0_ = bitField0_;
-          int to_bitField0_ = 0;
-          if (quasiIdsValuesBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) == 0x00000001)) {
-              quasiIdsValues_ = java.util.Collections.unmodifiableList(quasiIdsValues_);
-              bitField0_ = (bitField0_ & ~0x00000001);
-            }
-            result.quasiIdsValues_ = quasiIdsValues_;
-          } else {
-            result.quasiIdsValues_ = quasiIdsValuesBuilder_.build();
-          }
-          result.equivalenceClassSize_ = equivalenceClassSize_;
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
-        }
-
-        public Builder clone() {
-          return (Builder) super.clone();
-        }
-        public Builder setField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return (Builder) super.setField(field, value);
-        }
-        public Builder clearField(
-            com.google.protobuf.Descriptors.FieldDescriptor field) {
-          return (Builder) super.clearField(field);
-        }
-        public Builder clearOneof(
-            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-          return (Builder) super.clearOneof(oneof);
-        }
-        public Builder setRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, java.lang.Object value) {
-          return (Builder) super.setRepeatedField(field, index, value);
-        }
-        public Builder addRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return (Builder) super.addRepeatedField(field, value);
-        }
-        public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass) {
-            return mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass)other);
-          } else {
-            super.mergeFrom(other);
-            return this;
-          }
-        }
-
-        public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass other) {
-          if (other == com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.getDefaultInstance()) return this;
-          if (quasiIdsValuesBuilder_ == null) {
-            if (!other.quasiIdsValues_.isEmpty()) {
-              if (quasiIdsValues_.isEmpty()) {
-                quasiIdsValues_ = other.quasiIdsValues_;
-                bitField0_ = (bitField0_ & ~0x00000001);
-              } else {
-                ensureQuasiIdsValuesIsMutable();
-                quasiIdsValues_.addAll(other.quasiIdsValues_);
-              }
-              onChanged();
-            }
-          } else {
-            if (!other.quasiIdsValues_.isEmpty()) {
-              if (quasiIdsValuesBuilder_.isEmpty()) {
-                quasiIdsValuesBuilder_.dispose();
-                quasiIdsValuesBuilder_ = null;
-                quasiIdsValues_ = other.quasiIdsValues_;
-                bitField0_ = (bitField0_ & ~0x00000001);
-                quasiIdsValuesBuilder_ = 
-                  com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                     getQuasiIdsValuesFieldBuilder() : null;
-              } else {
-                quasiIdsValuesBuilder_.addAllMessages(other.quasiIdsValues_);
-              }
-            }
-          }
-          if (other.getEquivalenceClassSize() != 0L) {
-            setEquivalenceClassSize(other.getEquivalenceClassSize());
-          }
-          this.mergeUnknownFields(other.unknownFields);
-          onChanged();
-          return this;
-        }
-
-        public final boolean isInitialized() {
-          return true;
-        }
-
-        public Builder mergeFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass) e.getUnfinishedMessage();
-            throw e.unwrapIOException();
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-        private int bitField0_;
-
-        private java.util.List quasiIdsValues_ =
-          java.util.Collections.emptyList();
-        private void ensureQuasiIdsValuesIsMutable() {
-          if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-            quasiIdsValues_ = new java.util.ArrayList(quasiIdsValues_);
-            bitField0_ |= 0x00000001;
-           }
-        }
-
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> quasiIdsValuesBuilder_;
-
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public java.util.List getQuasiIdsValuesList() {
-          if (quasiIdsValuesBuilder_ == null) {
-            return java.util.Collections.unmodifiableList(quasiIdsValues_);
-          } else {
-            return quasiIdsValuesBuilder_.getMessageList();
-          }
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public int getQuasiIdsValuesCount() {
-          if (quasiIdsValuesBuilder_ == null) {
-            return quasiIdsValues_.size();
-          } else {
-            return quasiIdsValuesBuilder_.getCount();
-          }
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public com.google.privacy.dlp.v2beta1.Value getQuasiIdsValues(int index) {
-          if (quasiIdsValuesBuilder_ == null) {
-            return quasiIdsValues_.get(index);
-          } else {
-            return quasiIdsValuesBuilder_.getMessage(index);
-          }
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder setQuasiIdsValues(
-            int index, com.google.privacy.dlp.v2beta1.Value value) {
-          if (quasiIdsValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.set(index, value);
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.setMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder setQuasiIdsValues(
-            int index, com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-          if (quasiIdsValuesBuilder_ == null) {
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.set(index, builderForValue.build());
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.setMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder addQuasiIdsValues(com.google.privacy.dlp.v2beta1.Value value) {
-          if (quasiIdsValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.add(value);
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.addMessage(value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder addQuasiIdsValues(
-            int index, com.google.privacy.dlp.v2beta1.Value value) {
-          if (quasiIdsValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.add(index, value);
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.addMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder addQuasiIdsValues(
-            com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-          if (quasiIdsValuesBuilder_ == null) {
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.add(builderForValue.build());
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.addMessage(builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder addQuasiIdsValues(
-            int index, com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-          if (quasiIdsValuesBuilder_ == null) {
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.add(index, builderForValue.build());
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.addMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder addAllQuasiIdsValues(
-            java.lang.Iterable values) {
-          if (quasiIdsValuesBuilder_ == null) {
-            ensureQuasiIdsValuesIsMutable();
-            com.google.protobuf.AbstractMessageLite.Builder.addAll(
-                values, quasiIdsValues_);
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.addAllMessages(values);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder clearQuasiIdsValues() {
-          if (quasiIdsValuesBuilder_ == null) {
-            quasiIdsValues_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.clear();
-          }
-          return this;
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder removeQuasiIdsValues(int index) {
-          if (quasiIdsValuesBuilder_ == null) {
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.remove(index);
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.remove(index);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public com.google.privacy.dlp.v2beta1.Value.Builder getQuasiIdsValuesBuilder(
-            int index) {
-          return getQuasiIdsValuesFieldBuilder().getBuilder(index);
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public com.google.privacy.dlp.v2beta1.ValueOrBuilder getQuasiIdsValuesOrBuilder(
-            int index) {
-          if (quasiIdsValuesBuilder_ == null) {
-            return quasiIdsValues_.get(index);  } else {
-            return quasiIdsValuesBuilder_.getMessageOrBuilder(index);
-          }
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public java.util.List 
-             getQuasiIdsValuesOrBuilderList() {
-          if (quasiIdsValuesBuilder_ != null) {
-            return quasiIdsValuesBuilder_.getMessageOrBuilderList();
-          } else {
-            return java.util.Collections.unmodifiableList(quasiIdsValues_);
-          }
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public com.google.privacy.dlp.v2beta1.Value.Builder addQuasiIdsValuesBuilder() {
-          return getQuasiIdsValuesFieldBuilder().addBuilder(
-              com.google.privacy.dlp.v2beta1.Value.getDefaultInstance());
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public com.google.privacy.dlp.v2beta1.Value.Builder addQuasiIdsValuesBuilder(
-            int index) {
-          return getQuasiIdsValuesFieldBuilder().addBuilder(
-              index, com.google.privacy.dlp.v2beta1.Value.getDefaultInstance());
-        }
-        /**
-         * 
-         * Set of values defining the equivalence class. One value per
-         * quasi-identifier column in the original KAnonymity metric message.
-         * The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public java.util.List 
-             getQuasiIdsValuesBuilderList() {
-          return getQuasiIdsValuesFieldBuilder().getBuilderList();
-        }
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-            getQuasiIdsValuesFieldBuilder() {
-          if (quasiIdsValuesBuilder_ == null) {
-            quasiIdsValuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                    quasiIdsValues_,
-                    ((bitField0_ & 0x00000001) == 0x00000001),
-                    getParentForChildren(),
-                    isClean());
-            quasiIdsValues_ = null;
-          }
-          return quasiIdsValuesBuilder_;
-        }
-
-        private long equivalenceClassSize_ ;
-        /**
-         * 
-         * Size of the equivalence class, for example number of rows with the
-         * above set of values.
-         * 

-         *
-         * int64 equivalence_class_size = 2;
-         */
-        public long getEquivalenceClassSize() {
-          return equivalenceClassSize_;
-        }
-        /**
-         * 
-         * Size of the equivalence class, for example number of rows with the
-         * above set of values.
-         * 

-         *
-         * int64 equivalence_class_size = 2;
-         */
-        public Builder setEquivalenceClassSize(long value) {
-          
-          equivalenceClassSize_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Size of the equivalence class, for example number of rows with the
-         * above set of values.
-         * 

-         *
-         * int64 equivalence_class_size = 2;
-         */
-        public Builder clearEquivalenceClassSize() {
-          
-          equivalenceClassSize_ = 0L;
-          onChanged();
-          return this;
-        }
-        public final Builder setUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.setUnknownFieldsProto3(unknownFields);
-        }
-
-        public final Builder mergeUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.mergeUnknownFields(unknownFields);
-        }
-
-
-        // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass)
-      }
-
-      // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass)
-      private static final com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass DEFAULT_INSTANCE;
-      static {
-        DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass();
-      }
-
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass getDefaultInstance() {
-        return DEFAULT_INSTANCE;
-      }
-
-      private static final com.google.protobuf.Parser
-          PARSER = new com.google.protobuf.AbstractParser() {
-        public KAnonymityEquivalenceClass parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new KAnonymityEquivalenceClass(input, extensionRegistry);
-        }
-      };
-
-      public static com.google.protobuf.Parser parser() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Parser getParserForType() {
-        return PARSER;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass getDefaultInstanceForType() {
-        return DEFAULT_INSTANCE;
-      }
-
-    }
-
-    public interface KAnonymityHistogramBucketOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket)
-        com.google.protobuf.MessageOrBuilder {
-
-      /**
-       * 
-       * Lower bound on the size of the equivalence classes in this bucket.
-       * 

-       *
-       * int64 equivalence_class_size_lower_bound = 1;
-       */
-      long getEquivalenceClassSizeLowerBound();
-
-      /**
-       * 
-       * Upper bound on the size of the equivalence classes in this bucket.
-       * 

-       *
-       * int64 equivalence_class_size_upper_bound = 2;
-       */
-      long getEquivalenceClassSizeUpperBound();
-
-      /**
-       * 
-       * Total number of records in this bucket.
-       * 

-       *
-       * int64 bucket_size = 3;
-       */
-      long getBucketSize();
-
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-       */
-      java.util.List 
-          getBucketValuesList();
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-       */
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass getBucketValues(int index);
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-       */
-      int getBucketValuesCount();
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-       */
-      java.util.List 
-          getBucketValuesOrBuilderList();
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-       */
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClassOrBuilder getBucketValuesOrBuilder(
-          int index);
-    }
-    /**
-     * 
-     * Histogram bucket of equivalence class sizes in the table.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket}
-     */
-    public  static final class KAnonymityHistogramBucket extends
-        com.google.protobuf.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket)
-        KAnonymityHistogramBucketOrBuilder {
-    private static final long serialVersionUID = 0L;
-      // Use KAnonymityHistogramBucket.newBuilder() to construct.
-      private KAnonymityHistogramBucket(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-        super(builder);
-      }
-      private KAnonymityHistogramBucket() {
-        equivalenceClassSizeLowerBound_ = 0L;
-        equivalenceClassSizeUpperBound_ = 0L;
-        bucketSize_ = 0L;
-        bucketValues_ = java.util.Collections.emptyList();
-      }
-
-      @java.lang.Override
-      public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private KAnonymityHistogramBucket(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-            com.google.protobuf.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-              case 8: {
-
-                equivalenceClassSizeLowerBound_ = input.readInt64();
-                break;
-              }
-              case 16: {
-
-                equivalenceClassSizeUpperBound_ = input.readInt64();
-                break;
-              }
-              case 24: {
-
-                bucketSize_ = input.readInt64();
-                break;
-              }
-              case 34: {
-                if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                  bucketValues_ = new java.util.ArrayList();
-                  mutable_bitField0_ |= 0x00000008;
-                }
-                bucketValues_.add(
-                    input.readMessage(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.parser(), extensionRegistry));
-                break;
-              }
-            }
-          }
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-            bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_);
-          }
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.Builder.class);
-      }
-
-      private int bitField0_;
-      public static final int EQUIVALENCE_CLASS_SIZE_LOWER_BOUND_FIELD_NUMBER = 1;
-      private long equivalenceClassSizeLowerBound_;
-      /**
-       * 
-       * Lower bound on the size of the equivalence classes in this bucket.
-       * 

-       *
-       * int64 equivalence_class_size_lower_bound = 1;
-       */
-      public long getEquivalenceClassSizeLowerBound() {
-        return equivalenceClassSizeLowerBound_;
-      }
-
-      public static final int EQUIVALENCE_CLASS_SIZE_UPPER_BOUND_FIELD_NUMBER = 2;
-      private long equivalenceClassSizeUpperBound_;
-      /**
-       * 
-       * Upper bound on the size of the equivalence classes in this bucket.
-       * 

-       *
-       * int64 equivalence_class_size_upper_bound = 2;
-       */
-      public long getEquivalenceClassSizeUpperBound() {
-        return equivalenceClassSizeUpperBound_;
-      }
-
-      public static final int BUCKET_SIZE_FIELD_NUMBER = 3;
-      private long bucketSize_;
-      /**
-       * 
-       * Total number of records in this bucket.
-       * 

-       *
-       * int64 bucket_size = 3;
-       */
-      public long getBucketSize() {
-        return bucketSize_;
-      }
-
-      public static final int BUCKET_VALUES_FIELD_NUMBER = 4;
-      private java.util.List bucketValues_;
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-       */
-      public java.util.List getBucketValuesList() {
-        return bucketValues_;
-      }
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-       */
-      public java.util.List 
-          getBucketValuesOrBuilderList() {
-        return bucketValues_;
-      }
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-       */
-      public int getBucketValuesCount() {
-        return bucketValues_.size();
-      }
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass getBucketValues(int index) {
-        return bucketValues_.get(index);
-      }
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClassOrBuilder getBucketValuesOrBuilder(
-          int index) {
-        return bucketValues_.get(index);
-      }
-
-      private byte memoizedIsInitialized = -1;
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized == 1) return true;
-        if (isInitialized == 0) return false;
-
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      public void writeTo(com.google.protobuf.CodedOutputStream output)
-                          throws java.io.IOException {
-        if (equivalenceClassSizeLowerBound_ != 0L) {
-          output.writeInt64(1, equivalenceClassSizeLowerBound_);
-        }
-        if (equivalenceClassSizeUpperBound_ != 0L) {
-          output.writeInt64(2, equivalenceClassSizeUpperBound_);
-        }
-        if (bucketSize_ != 0L) {
-          output.writeInt64(3, bucketSize_);
-        }
-        for (int i = 0; i < bucketValues_.size(); i++) {
-          output.writeMessage(4, bucketValues_.get(i));
-        }
-        unknownFields.writeTo(output);
-      }
-
-      public int getSerializedSize() {
-        int size = memoizedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        if (equivalenceClassSizeLowerBound_ != 0L) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeInt64Size(1, equivalenceClassSizeLowerBound_);
-        }
-        if (equivalenceClassSizeUpperBound_ != 0L) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeInt64Size(2, equivalenceClassSizeUpperBound_);
-        }
-        if (bucketSize_ != 0L) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeInt64Size(3, bucketSize_);
-        }
-        for (int i = 0; i < bucketValues_.size(); i++) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(4, bucketValues_.get(i));
-        }
-        size += unknownFields.getSerializedSize();
-        memoizedSize = size;
-        return size;
-      }
-
-      @java.lang.Override
-      public boolean equals(final java.lang.Object obj) {
-        if (obj == this) {
-         return true;
-        }
-        if (!(obj instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket)) {
-          return super.equals(obj);
-        }
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket other = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket) obj;
-
-        boolean result = true;
-        result = result && (getEquivalenceClassSizeLowerBound()
-            == other.getEquivalenceClassSizeLowerBound());
-        result = result && (getEquivalenceClassSizeUpperBound()
-            == other.getEquivalenceClassSizeUpperBound());
-        result = result && (getBucketSize()
-            == other.getBucketSize());
-        result = result && getBucketValuesList()
-            .equals(other.getBucketValuesList());
-        result = result && unknownFields.equals(other.unknownFields);
-        return result;
-      }
-
-      @java.lang.Override
-      public int hashCode() {
-        if (memoizedHashCode != 0) {
-          return memoizedHashCode;
-        }
-        int hash = 41;
-        hash = (19 * hash) + getDescriptor().hashCode();
-        hash = (37 * hash) + EQUIVALENCE_CLASS_SIZE_LOWER_BOUND_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getEquivalenceClassSizeLowerBound());
-        hash = (37 * hash) + EQUIVALENCE_CLASS_SIZE_UPPER_BOUND_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getEquivalenceClassSizeUpperBound());
-        hash = (37 * hash) + BUCKET_SIZE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getBucketSize());
-        if (getBucketValuesCount() > 0) {
-          hash = (37 * hash) + BUCKET_VALUES_FIELD_NUMBER;
-          hash = (53 * hash) + getBucketValuesList().hashCode();
-        }
-        hash = (29 * hash) + unknownFields.hashCode();
-        memoizedHashCode = hash;
-        return hash;
-      }
-
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parseFrom(
-          java.nio.ByteBuffer data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parseFrom(
-          java.nio.ByteBuffer data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parseFrom(
-          com.google.protobuf.ByteString data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parseFrom(
-          com.google.protobuf.ByteString data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parseFrom(byte[] data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parseFrom(
-          byte[] data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parseFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parseDelimitedFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parseFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parseFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder() {
-        return DEFAULT_INSTANCE.toBuilder();
-      }
-      public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket prototype) {
-        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-      }
-      public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE
-            ? new Builder() : new Builder().mergeFrom(this);
-      }
-
-      @java.lang.Override
-      protected Builder newBuilderForType(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        Builder builder = new Builder(parent);
-        return builder;
-      }
-      /**
-       * 
-       * Histogram bucket of equivalence class sizes in the table.
-       * 

-       *
-       * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket}
-       */
-      public static final class Builder extends
-          com.google.protobuf.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket)
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucketOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor
-            getDescriptor() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket_descriptor;
-        }
-
-        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-            internalGetFieldAccessorTable() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket_fieldAccessorTable
-              .ensureFieldAccessorsInitialized(
-                  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.Builder.class);
-        }
-
-        // Construct using com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private Builder(
-            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-          super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-            getBucketValuesFieldBuilder();
-          }
-        }
-        public Builder clear() {
-          super.clear();
-          equivalenceClassSizeLowerBound_ = 0L;
-
-          equivalenceClassSizeUpperBound_ = 0L;
-
-          bucketSize_ = 0L;
-
-          if (bucketValuesBuilder_ == null) {
-            bucketValues_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            bucketValuesBuilder_.clear();
-          }
-          return this;
-        }
-
-        public com.google.protobuf.Descriptors.Descriptor
-            getDescriptorForType() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_KAnonymityHistogramBucket_descriptor;
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket getDefaultInstanceForType() {
-          return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.getDefaultInstance();
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket build() {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket buildPartial() {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket result = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket(this);
-          int from_bitField0_ = bitField0_;
-          int to_bitField0_ = 0;
-          result.equivalenceClassSizeLowerBound_ = equivalenceClassSizeLowerBound_;
-          result.equivalenceClassSizeUpperBound_ = equivalenceClassSizeUpperBound_;
-          result.bucketSize_ = bucketSize_;
-          if (bucketValuesBuilder_ == null) {
-            if (((bitField0_ & 0x00000008) == 0x00000008)) {
-              bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_);
-              bitField0_ = (bitField0_ & ~0x00000008);
-            }
-            result.bucketValues_ = bucketValues_;
-          } else {
-            result.bucketValues_ = bucketValuesBuilder_.build();
-          }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
-        }
-
-        public Builder clone() {
-          return (Builder) super.clone();
-        }
-        public Builder setField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return (Builder) super.setField(field, value);
-        }
-        public Builder clearField(
-            com.google.protobuf.Descriptors.FieldDescriptor field) {
-          return (Builder) super.clearField(field);
-        }
-        public Builder clearOneof(
-            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-          return (Builder) super.clearOneof(oneof);
-        }
-        public Builder setRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, java.lang.Object value) {
-          return (Builder) super.setRepeatedField(field, index, value);
-        }
-        public Builder addRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return (Builder) super.addRepeatedField(field, value);
-        }
-        public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket) {
-            return mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket)other);
-          } else {
-            super.mergeFrom(other);
-            return this;
-          }
-        }
-
-        public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket other) {
-          if (other == com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.getDefaultInstance()) return this;
-          if (other.getEquivalenceClassSizeLowerBound() != 0L) {
-            setEquivalenceClassSizeLowerBound(other.getEquivalenceClassSizeLowerBound());
-          }
-          if (other.getEquivalenceClassSizeUpperBound() != 0L) {
-            setEquivalenceClassSizeUpperBound(other.getEquivalenceClassSizeUpperBound());
-          }
-          if (other.getBucketSize() != 0L) {
-            setBucketSize(other.getBucketSize());
-          }
-          if (bucketValuesBuilder_ == null) {
-            if (!other.bucketValues_.isEmpty()) {
-              if (bucketValues_.isEmpty()) {
-                bucketValues_ = other.bucketValues_;
-                bitField0_ = (bitField0_ & ~0x00000008);
-              } else {
-                ensureBucketValuesIsMutable();
-                bucketValues_.addAll(other.bucketValues_);
-              }
-              onChanged();
-            }
-          } else {
-            if (!other.bucketValues_.isEmpty()) {
-              if (bucketValuesBuilder_.isEmpty()) {
-                bucketValuesBuilder_.dispose();
-                bucketValuesBuilder_ = null;
-                bucketValues_ = other.bucketValues_;
-                bitField0_ = (bitField0_ & ~0x00000008);
-                bucketValuesBuilder_ = 
-                  com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                     getBucketValuesFieldBuilder() : null;
-              } else {
-                bucketValuesBuilder_.addAllMessages(other.bucketValues_);
-              }
-            }
-          }
-          this.mergeUnknownFields(other.unknownFields);
-          onChanged();
-          return this;
-        }
-
-        public final boolean isInitialized() {
-          return true;
-        }
-
-        public Builder mergeFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket) e.getUnfinishedMessage();
-            throw e.unwrapIOException();
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-        private int bitField0_;
-
-        private long equivalenceClassSizeLowerBound_ ;
-        /**
-         * 
-         * Lower bound on the size of the equivalence classes in this bucket.
-         * 

-         *
-         * int64 equivalence_class_size_lower_bound = 1;
-         */
-        public long getEquivalenceClassSizeLowerBound() {
-          return equivalenceClassSizeLowerBound_;
-        }
-        /**
-         * 
-         * Lower bound on the size of the equivalence classes in this bucket.
-         * 

-         *
-         * int64 equivalence_class_size_lower_bound = 1;
-         */
-        public Builder setEquivalenceClassSizeLowerBound(long value) {
-          
-          equivalenceClassSizeLowerBound_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Lower bound on the size of the equivalence classes in this bucket.
-         * 

-         *
-         * int64 equivalence_class_size_lower_bound = 1;
-         */
-        public Builder clearEquivalenceClassSizeLowerBound() {
-          
-          equivalenceClassSizeLowerBound_ = 0L;
-          onChanged();
-          return this;
-        }
-
-        private long equivalenceClassSizeUpperBound_ ;
-        /**
-         * 
-         * Upper bound on the size of the equivalence classes in this bucket.
-         * 

-         *
-         * int64 equivalence_class_size_upper_bound = 2;
-         */
-        public long getEquivalenceClassSizeUpperBound() {
-          return equivalenceClassSizeUpperBound_;
-        }
-        /**
-         * 
-         * Upper bound on the size of the equivalence classes in this bucket.
-         * 

-         *
-         * int64 equivalence_class_size_upper_bound = 2;
-         */
-        public Builder setEquivalenceClassSizeUpperBound(long value) {
-          
-          equivalenceClassSizeUpperBound_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Upper bound on the size of the equivalence classes in this bucket.
-         * 

-         *
-         * int64 equivalence_class_size_upper_bound = 2;
-         */
-        public Builder clearEquivalenceClassSizeUpperBound() {
-          
-          equivalenceClassSizeUpperBound_ = 0L;
-          onChanged();
-          return this;
-        }
-
-        private long bucketSize_ ;
-        /**
-         * 
-         * Total number of records in this bucket.
-         * 

-         *
-         * int64 bucket_size = 3;
-         */
-        public long getBucketSize() {
-          return bucketSize_;
-        }
-        /**
-         * 
-         * Total number of records in this bucket.
-         * 

-         *
-         * int64 bucket_size = 3;
-         */
-        public Builder setBucketSize(long value) {
-          
-          bucketSize_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Total number of records in this bucket.
-         * 

-         *
-         * int64 bucket_size = 3;
-         */
-        public Builder clearBucketSize() {
-          
-          bucketSize_ = 0L;
-          onChanged();
-          return this;
-        }
-
-        private java.util.List bucketValues_ =
-          java.util.Collections.emptyList();
-        private void ensureBucketValuesIsMutable() {
-          if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-            bucketValues_ = new java.util.ArrayList(bucketValues_);
-            bitField0_ |= 0x00000008;
-           }
-        }
-
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClassOrBuilder> bucketValuesBuilder_;
-
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public java.util.List getBucketValuesList() {
-          if (bucketValuesBuilder_ == null) {
-            return java.util.Collections.unmodifiableList(bucketValues_);
-          } else {
-            return bucketValuesBuilder_.getMessageList();
-          }
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public int getBucketValuesCount() {
-          if (bucketValuesBuilder_ == null) {
-            return bucketValues_.size();
-          } else {
-            return bucketValuesBuilder_.getCount();
-          }
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass getBucketValues(int index) {
-          if (bucketValuesBuilder_ == null) {
-            return bucketValues_.get(index);
-          } else {
-            return bucketValuesBuilder_.getMessage(index);
-          }
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public Builder setBucketValues(
-            int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass value) {
-          if (bucketValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureBucketValuesIsMutable();
-            bucketValues_.set(index, value);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.setMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public Builder setBucketValues(
-            int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.Builder builderForValue) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            bucketValues_.set(index, builderForValue.build());
-            onChanged();
-          } else {
-            bucketValuesBuilder_.setMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public Builder addBucketValues(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass value) {
-          if (bucketValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureBucketValuesIsMutable();
-            bucketValues_.add(value);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addMessage(value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public Builder addBucketValues(
-            int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass value) {
-          if (bucketValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureBucketValuesIsMutable();
-            bucketValues_.add(index, value);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public Builder addBucketValues(
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.Builder builderForValue) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            bucketValues_.add(builderForValue.build());
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addMessage(builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public Builder addBucketValues(
-            int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.Builder builderForValue) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            bucketValues_.add(index, builderForValue.build());
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public Builder addAllBucketValues(
-            java.lang.Iterable values) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            com.google.protobuf.AbstractMessageLite.Builder.addAll(
-                values, bucketValues_);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addAllMessages(values);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public Builder clearBucketValues() {
-          if (bucketValuesBuilder_ == null) {
-            bucketValues_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000008);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.clear();
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public Builder removeBucketValues(int index) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            bucketValues_.remove(index);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.remove(index);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.Builder getBucketValuesBuilder(
-            int index) {
-          return getBucketValuesFieldBuilder().getBuilder(index);
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClassOrBuilder getBucketValuesOrBuilder(
-            int index) {
-          if (bucketValuesBuilder_ == null) {
-            return bucketValues_.get(index);  } else {
-            return bucketValuesBuilder_.getMessageOrBuilder(index);
-          }
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public java.util.List 
-             getBucketValuesOrBuilderList() {
-          if (bucketValuesBuilder_ != null) {
-            return bucketValuesBuilder_.getMessageOrBuilderList();
-          } else {
-            return java.util.Collections.unmodifiableList(bucketValues_);
-          }
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.Builder addBucketValuesBuilder() {
-          return getBucketValuesFieldBuilder().addBuilder(
-              com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.getDefaultInstance());
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.Builder addBucketValuesBuilder(
-            int index) {
-          return getBucketValuesFieldBuilder().addBuilder(
-              index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.getDefaultInstance());
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass bucket_values = 4;
-         */
-        public java.util.List 
-             getBucketValuesBuilderList() {
-          return getBucketValuesFieldBuilder().getBuilderList();
-        }
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClassOrBuilder> 
-            getBucketValuesFieldBuilder() {
-          if (bucketValuesBuilder_ == null) {
-            bucketValuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClass.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityEquivalenceClassOrBuilder>(
-                    bucketValues_,
-                    ((bitField0_ & 0x00000008) == 0x00000008),
-                    getParentForChildren(),
-                    isClean());
-            bucketValues_ = null;
-          }
-          return bucketValuesBuilder_;
-        }
-        public final Builder setUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.setUnknownFieldsProto3(unknownFields);
-        }
-
-        public final Builder mergeUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.mergeUnknownFields(unknownFields);
-        }
-
-
-        // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket)
-      }
-
-      // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket)
-      private static final com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket DEFAULT_INSTANCE;
-      static {
-        DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket();
-      }
-
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket getDefaultInstance() {
-        return DEFAULT_INSTANCE;
-      }
-
-      private static final com.google.protobuf.Parser
-          PARSER = new com.google.protobuf.AbstractParser() {
-        public KAnonymityHistogramBucket parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new KAnonymityHistogramBucket(input, extensionRegistry);
-        }
-      };
-
-      public static com.google.protobuf.Parser parser() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Parser getParserForType() {
-        return PARSER;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket getDefaultInstanceForType() {
-        return DEFAULT_INSTANCE;
-      }
-
-    }
-
-    public static final int EQUIVALENCE_CLASS_HISTOGRAM_BUCKETS_FIELD_NUMBER = 5;
-    private java.util.List equivalenceClassHistogramBuckets_;
-    /**
-     * 
-     * Histogram of k-anonymity equivalence classes.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-     */
-    public java.util.List getEquivalenceClassHistogramBucketsList() {
-      return equivalenceClassHistogramBuckets_;
-    }
-    /**
-     * 
-     * Histogram of k-anonymity equivalence classes.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-     */
-    public java.util.List 
-        getEquivalenceClassHistogramBucketsOrBuilderList() {
-      return equivalenceClassHistogramBuckets_;
-    }
-    /**
-     * 
-     * Histogram of k-anonymity equivalence classes.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-     */
-    public int getEquivalenceClassHistogramBucketsCount() {
-      return equivalenceClassHistogramBuckets_.size();
-    }
-    /**
-     * 
-     * Histogram of k-anonymity equivalence classes.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket getEquivalenceClassHistogramBuckets(int index) {
-      return equivalenceClassHistogramBuckets_.get(index);
-    }
-    /**
-     * 
-     * Histogram of k-anonymity equivalence classes.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucketOrBuilder getEquivalenceClassHistogramBucketsOrBuilder(
-        int index) {
-      return equivalenceClassHistogramBuckets_.get(index);
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      for (int i = 0; i < equivalenceClassHistogramBuckets_.size(); i++) {
-        output.writeMessage(5, equivalenceClassHistogramBuckets_.get(i));
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < equivalenceClassHistogramBuckets_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, equivalenceClassHistogramBuckets_.get(i));
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult other = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) obj;
-
-      boolean result = true;
-      result = result && getEquivalenceClassHistogramBucketsList()
-          .equals(other.getEquivalenceClassHistogramBucketsList());
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getEquivalenceClassHistogramBucketsCount() > 0) {
-        hash = (37 * hash) + EQUIVALENCE_CLASS_HISTOGRAM_BUCKETS_FIELD_NUMBER;
-        hash = (53 * hash) + getEquivalenceClassHistogramBucketsList().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Result of the k-anonymity computation.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult)
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResultOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getEquivalenceClassHistogramBucketsFieldBuilder();
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          equivalenceClassHistogramBuckets_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          equivalenceClassHistogramBucketsBuilder_.clear();
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_KAnonymityResult_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult build() {
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult buildPartial() {
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult result = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult(this);
-        int from_bitField0_ = bitField0_;
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001)) {
-            equivalenceClassHistogramBuckets_ = java.util.Collections.unmodifiableList(equivalenceClassHistogramBuckets_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.equivalenceClassHistogramBuckets_ = equivalenceClassHistogramBuckets_;
-        } else {
-          result.equivalenceClassHistogramBuckets_ = equivalenceClassHistogramBucketsBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult other) {
-        if (other == com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.getDefaultInstance()) return this;
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          if (!other.equivalenceClassHistogramBuckets_.isEmpty()) {
-            if (equivalenceClassHistogramBuckets_.isEmpty()) {
-              equivalenceClassHistogramBuckets_ = other.equivalenceClassHistogramBuckets_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureEquivalenceClassHistogramBucketsIsMutable();
-              equivalenceClassHistogramBuckets_.addAll(other.equivalenceClassHistogramBuckets_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.equivalenceClassHistogramBuckets_.isEmpty()) {
-            if (equivalenceClassHistogramBucketsBuilder_.isEmpty()) {
-              equivalenceClassHistogramBucketsBuilder_.dispose();
-              equivalenceClassHistogramBucketsBuilder_ = null;
-              equivalenceClassHistogramBuckets_ = other.equivalenceClassHistogramBuckets_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              equivalenceClassHistogramBucketsBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getEquivalenceClassHistogramBucketsFieldBuilder() : null;
-            } else {
-              equivalenceClassHistogramBucketsBuilder_.addAllMessages(other.equivalenceClassHistogramBuckets_);
-            }
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List equivalenceClassHistogramBuckets_ =
-        java.util.Collections.emptyList();
-      private void ensureEquivalenceClassHistogramBucketsIsMutable() {
-        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          equivalenceClassHistogramBuckets_ = new java.util.ArrayList(equivalenceClassHistogramBuckets_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucketOrBuilder> equivalenceClassHistogramBucketsBuilder_;
-
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public java.util.List getEquivalenceClassHistogramBucketsList() {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(equivalenceClassHistogramBuckets_);
-        } else {
-          return equivalenceClassHistogramBucketsBuilder_.getMessageList();
-        }
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public int getEquivalenceClassHistogramBucketsCount() {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          return equivalenceClassHistogramBuckets_.size();
-        } else {
-          return equivalenceClassHistogramBucketsBuilder_.getCount();
-        }
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket getEquivalenceClassHistogramBuckets(int index) {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          return equivalenceClassHistogramBuckets_.get(index);
-        } else {
-          return equivalenceClassHistogramBucketsBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public Builder setEquivalenceClassHistogramBuckets(
-          int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket value) {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureEquivalenceClassHistogramBucketsIsMutable();
-          equivalenceClassHistogramBuckets_.set(index, value);
-          onChanged();
-        } else {
-          equivalenceClassHistogramBucketsBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public Builder setEquivalenceClassHistogramBuckets(
-          int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.Builder builderForValue) {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          ensureEquivalenceClassHistogramBucketsIsMutable();
-          equivalenceClassHistogramBuckets_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          equivalenceClassHistogramBucketsBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public Builder addEquivalenceClassHistogramBuckets(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket value) {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureEquivalenceClassHistogramBucketsIsMutable();
-          equivalenceClassHistogramBuckets_.add(value);
-          onChanged();
-        } else {
-          equivalenceClassHistogramBucketsBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public Builder addEquivalenceClassHistogramBuckets(
-          int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket value) {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureEquivalenceClassHistogramBucketsIsMutable();
-          equivalenceClassHistogramBuckets_.add(index, value);
-          onChanged();
-        } else {
-          equivalenceClassHistogramBucketsBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public Builder addEquivalenceClassHistogramBuckets(
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.Builder builderForValue) {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          ensureEquivalenceClassHistogramBucketsIsMutable();
-          equivalenceClassHistogramBuckets_.add(builderForValue.build());
-          onChanged();
-        } else {
-          equivalenceClassHistogramBucketsBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public Builder addEquivalenceClassHistogramBuckets(
-          int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.Builder builderForValue) {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          ensureEquivalenceClassHistogramBucketsIsMutable();
-          equivalenceClassHistogramBuckets_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          equivalenceClassHistogramBucketsBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public Builder addAllEquivalenceClassHistogramBuckets(
-          java.lang.Iterable values) {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          ensureEquivalenceClassHistogramBucketsIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, equivalenceClassHistogramBuckets_);
-          onChanged();
-        } else {
-          equivalenceClassHistogramBucketsBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public Builder clearEquivalenceClassHistogramBuckets() {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          equivalenceClassHistogramBuckets_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          equivalenceClassHistogramBucketsBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public Builder removeEquivalenceClassHistogramBuckets(int index) {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          ensureEquivalenceClassHistogramBucketsIsMutable();
-          equivalenceClassHistogramBuckets_.remove(index);
-          onChanged();
-        } else {
-          equivalenceClassHistogramBucketsBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.Builder getEquivalenceClassHistogramBucketsBuilder(
-          int index) {
-        return getEquivalenceClassHistogramBucketsFieldBuilder().getBuilder(index);
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucketOrBuilder getEquivalenceClassHistogramBucketsOrBuilder(
-          int index) {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          return equivalenceClassHistogramBuckets_.get(index);  } else {
-          return equivalenceClassHistogramBucketsBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public java.util.List 
-           getEquivalenceClassHistogramBucketsOrBuilderList() {
-        if (equivalenceClassHistogramBucketsBuilder_ != null) {
-          return equivalenceClassHistogramBucketsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(equivalenceClassHistogramBuckets_);
-        }
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.Builder addEquivalenceClassHistogramBucketsBuilder() {
-        return getEquivalenceClassHistogramBucketsFieldBuilder().addBuilder(
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.getDefaultInstance());
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.Builder addEquivalenceClassHistogramBucketsBuilder(
-          int index) {
-        return getEquivalenceClassHistogramBucketsFieldBuilder().addBuilder(
-            index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.getDefaultInstance());
-      }
-      /**
-       * 
-       * Histogram of k-anonymity equivalence classes.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-       */
-      public java.util.List 
-           getEquivalenceClassHistogramBucketsBuilderList() {
-        return getEquivalenceClassHistogramBucketsFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucketOrBuilder> 
-          getEquivalenceClassHistogramBucketsFieldBuilder() {
-        if (equivalenceClassHistogramBucketsBuilder_ == null) {
-          equivalenceClassHistogramBucketsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucket.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.KAnonymityHistogramBucketOrBuilder>(
-                  equivalenceClassHistogramBuckets_,
-                  ((bitField0_ & 0x00000001) == 0x00000001),
-                  getParentForChildren(),
-                  isClean());
-          equivalenceClassHistogramBuckets_ = null;
-        }
-        return equivalenceClassHistogramBucketsBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult)
-    private static final com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public KAnonymityResult parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new KAnonymityResult(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public interface LDiversityResultOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * 
-     * Histogram of l-diversity equivalence class sensitive value frequencies.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-     */
-    java.util.List 
-        getSensitiveValueFrequencyHistogramBucketsList();
-    /**
-     * 
-     * Histogram of l-diversity equivalence class sensitive value frequencies.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-     */
-    com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket getSensitiveValueFrequencyHistogramBuckets(int index);
-    /**
-     * 
-     * Histogram of l-diversity equivalence class sensitive value frequencies.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-     */
-    int getSensitiveValueFrequencyHistogramBucketsCount();
-    /**
-     * 
-     * Histogram of l-diversity equivalence class sensitive value frequencies.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-     */
-    java.util.List 
-        getSensitiveValueFrequencyHistogramBucketsOrBuilderList();
-    /**
-     * 
-     * Histogram of l-diversity equivalence class sensitive value frequencies.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-     */
-    com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucketOrBuilder getSensitiveValueFrequencyHistogramBucketsOrBuilder(
-        int index);
-  }
-  /**
-   * 
-   * Result of the l-diversity computation.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult}
-   */
-  public  static final class LDiversityResult extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult)
-      LDiversityResultOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use LDiversityResult.newBuilder() to construct.
-    private LDiversityResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private LDiversityResult() {
-      sensitiveValueFrequencyHistogramBuckets_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private LDiversityResult(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 42: {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                sensitiveValueFrequencyHistogramBuckets_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              sensitiveValueFrequencyHistogramBuckets_.add(
-                  input.readMessage(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.parser(), extensionRegistry));
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-          sensitiveValueFrequencyHistogramBuckets_ = java.util.Collections.unmodifiableList(sensitiveValueFrequencyHistogramBuckets_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.Builder.class);
-    }
-
-    public interface LDiversityEquivalenceClassOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass)
-        com.google.protobuf.MessageOrBuilder {
-
-      /**
-       * 
-       * Quasi-identifier values defining the k-anonymity equivalence
-       * class. The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      java.util.List 
-          getQuasiIdsValuesList();
-      /**
-       * 
-       * Quasi-identifier values defining the k-anonymity equivalence
-       * class. The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      com.google.privacy.dlp.v2beta1.Value getQuasiIdsValues(int index);
-      /**
-       * 
-       * Quasi-identifier values defining the k-anonymity equivalence
-       * class. The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      int getQuasiIdsValuesCount();
-      /**
-       * 
-       * Quasi-identifier values defining the k-anonymity equivalence
-       * class. The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      java.util.List 
-          getQuasiIdsValuesOrBuilderList();
-      /**
-       * 
-       * Quasi-identifier values defining the k-anonymity equivalence
-       * class. The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      com.google.privacy.dlp.v2beta1.ValueOrBuilder getQuasiIdsValuesOrBuilder(
-          int index);
-
-      /**
-       * 
-       * Size of the k-anonymity equivalence class.
-       * 

-       *
-       * int64 equivalence_class_size = 2;
-       */
-      long getEquivalenceClassSize();
-
-      /**
-       * 
-       * Number of distinct sensitive values in this equivalence class.
-       * 

-       *
-       * int64 num_distinct_sensitive_values = 3;
-       */
-      long getNumDistinctSensitiveValues();
-
-      /**
-       * 
-       * Estimated frequencies of top sensitive values.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-       */
-      java.util.List 
-          getTopSensitiveValuesList();
-      /**
-       * 
-       * Estimated frequencies of top sensitive values.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-       */
-      com.google.privacy.dlp.v2beta1.ValueFrequency getTopSensitiveValues(int index);
-      /**
-       * 
-       * Estimated frequencies of top sensitive values.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-       */
-      int getTopSensitiveValuesCount();
-      /**
-       * 
-       * Estimated frequencies of top sensitive values.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-       */
-      java.util.List 
-          getTopSensitiveValuesOrBuilderList();
-      /**
-       * 
-       * Estimated frequencies of top sensitive values.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-       */
-      com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder getTopSensitiveValuesOrBuilder(
-          int index);
-    }
-    /**
-     * 
-     * The set of columns' values that share the same l-diversity value.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass}
-     */
-    public  static final class LDiversityEquivalenceClass extends
-        com.google.protobuf.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass)
-        LDiversityEquivalenceClassOrBuilder {
-    private static final long serialVersionUID = 0L;
-      // Use LDiversityEquivalenceClass.newBuilder() to construct.
-      private LDiversityEquivalenceClass(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-        super(builder);
-      }
-      private LDiversityEquivalenceClass() {
-        quasiIdsValues_ = java.util.Collections.emptyList();
-        equivalenceClassSize_ = 0L;
-        numDistinctSensitiveValues_ = 0L;
-        topSensitiveValues_ = java.util.Collections.emptyList();
-      }
-
-      @java.lang.Override
-      public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private LDiversityEquivalenceClass(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-            com.google.protobuf.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-              case 10: {
-                if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                  quasiIdsValues_ = new java.util.ArrayList();
-                  mutable_bitField0_ |= 0x00000001;
-                }
-                quasiIdsValues_.add(
-                    input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry));
-                break;
-              }
-              case 16: {
-
-                equivalenceClassSize_ = input.readInt64();
-                break;
-              }
-              case 24: {
-
-                numDistinctSensitiveValues_ = input.readInt64();
-                break;
-              }
-              case 34: {
-                if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                  topSensitiveValues_ = new java.util.ArrayList();
-                  mutable_bitField0_ |= 0x00000008;
-                }
-                topSensitiveValues_.add(
-                    input.readMessage(com.google.privacy.dlp.v2beta1.ValueFrequency.parser(), extensionRegistry));
-                break;
-              }
-            }
-          }
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-            quasiIdsValues_ = java.util.Collections.unmodifiableList(quasiIdsValues_);
-          }
-          if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-            topSensitiveValues_ = java.util.Collections.unmodifiableList(topSensitiveValues_);
-          }
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.Builder.class);
-      }
-
-      private int bitField0_;
-      public static final int QUASI_IDS_VALUES_FIELD_NUMBER = 1;
-      private java.util.List quasiIdsValues_;
-      /**
-       * 
-       * Quasi-identifier values defining the k-anonymity equivalence
-       * class. The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      public java.util.List getQuasiIdsValuesList() {
-        return quasiIdsValues_;
-      }
-      /**
-       * 
-       * Quasi-identifier values defining the k-anonymity equivalence
-       * class. The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      public java.util.List 
-          getQuasiIdsValuesOrBuilderList() {
-        return quasiIdsValues_;
-      }
-      /**
-       * 
-       * Quasi-identifier values defining the k-anonymity equivalence
-       * class. The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      public int getQuasiIdsValuesCount() {
-        return quasiIdsValues_.size();
-      }
-      /**
-       * 
-       * Quasi-identifier values defining the k-anonymity equivalence
-       * class. The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.Value getQuasiIdsValues(int index) {
-        return quasiIdsValues_.get(index);
-      }
-      /**
-       * 
-       * Quasi-identifier values defining the k-anonymity equivalence
-       * class. The order is always the same as the original request.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueOrBuilder getQuasiIdsValuesOrBuilder(
-          int index) {
-        return quasiIdsValues_.get(index);
-      }
-
-      public static final int EQUIVALENCE_CLASS_SIZE_FIELD_NUMBER = 2;
-      private long equivalenceClassSize_;
-      /**
-       * 
-       * Size of the k-anonymity equivalence class.
-       * 

-       *
-       * int64 equivalence_class_size = 2;
-       */
-      public long getEquivalenceClassSize() {
-        return equivalenceClassSize_;
-      }
-
-      public static final int NUM_DISTINCT_SENSITIVE_VALUES_FIELD_NUMBER = 3;
-      private long numDistinctSensitiveValues_;
-      /**
-       * 
-       * Number of distinct sensitive values in this equivalence class.
-       * 

-       *
-       * int64 num_distinct_sensitive_values = 3;
-       */
-      public long getNumDistinctSensitiveValues() {
-        return numDistinctSensitiveValues_;
-      }
-
-      public static final int TOP_SENSITIVE_VALUES_FIELD_NUMBER = 4;
-      private java.util.List topSensitiveValues_;
-      /**
-       * 
-       * Estimated frequencies of top sensitive values.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-       */
-      public java.util.List getTopSensitiveValuesList() {
-        return topSensitiveValues_;
-      }
-      /**
-       * 
-       * Estimated frequencies of top sensitive values.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-       */
-      public java.util.List 
-          getTopSensitiveValuesOrBuilderList() {
-        return topSensitiveValues_;
-      }
-      /**
-       * 
-       * Estimated frequencies of top sensitive values.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-       */
-      public int getTopSensitiveValuesCount() {
-        return topSensitiveValues_.size();
-      }
-      /**
-       * 
-       * Estimated frequencies of top sensitive values.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueFrequency getTopSensitiveValues(int index) {
-        return topSensitiveValues_.get(index);
-      }
-      /**
-       * 
-       * Estimated frequencies of top sensitive values.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder getTopSensitiveValuesOrBuilder(
-          int index) {
-        return topSensitiveValues_.get(index);
-      }
-
-      private byte memoizedIsInitialized = -1;
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized == 1) return true;
-        if (isInitialized == 0) return false;
-
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      public void writeTo(com.google.protobuf.CodedOutputStream output)
-                          throws java.io.IOException {
-        for (int i = 0; i < quasiIdsValues_.size(); i++) {
-          output.writeMessage(1, quasiIdsValues_.get(i));
-        }
-        if (equivalenceClassSize_ != 0L) {
-          output.writeInt64(2, equivalenceClassSize_);
-        }
-        if (numDistinctSensitiveValues_ != 0L) {
-          output.writeInt64(3, numDistinctSensitiveValues_);
-        }
-        for (int i = 0; i < topSensitiveValues_.size(); i++) {
-          output.writeMessage(4, topSensitiveValues_.get(i));
-        }
-        unknownFields.writeTo(output);
-      }
-
-      public int getSerializedSize() {
-        int size = memoizedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        for (int i = 0; i < quasiIdsValues_.size(); i++) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(1, quasiIdsValues_.get(i));
-        }
-        if (equivalenceClassSize_ != 0L) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeInt64Size(2, equivalenceClassSize_);
-        }
-        if (numDistinctSensitiveValues_ != 0L) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeInt64Size(3, numDistinctSensitiveValues_);
-        }
-        for (int i = 0; i < topSensitiveValues_.size(); i++) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(4, topSensitiveValues_.get(i));
-        }
-        size += unknownFields.getSerializedSize();
-        memoizedSize = size;
-        return size;
-      }
-
-      @java.lang.Override
-      public boolean equals(final java.lang.Object obj) {
-        if (obj == this) {
-         return true;
-        }
-        if (!(obj instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass)) {
-          return super.equals(obj);
-        }
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass other = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass) obj;
-
-        boolean result = true;
-        result = result && getQuasiIdsValuesList()
-            .equals(other.getQuasiIdsValuesList());
-        result = result && (getEquivalenceClassSize()
-            == other.getEquivalenceClassSize());
-        result = result && (getNumDistinctSensitiveValues()
-            == other.getNumDistinctSensitiveValues());
-        result = result && getTopSensitiveValuesList()
-            .equals(other.getTopSensitiveValuesList());
-        result = result && unknownFields.equals(other.unknownFields);
-        return result;
-      }
-
-      @java.lang.Override
-      public int hashCode() {
-        if (memoizedHashCode != 0) {
-          return memoizedHashCode;
-        }
-        int hash = 41;
-        hash = (19 * hash) + getDescriptor().hashCode();
-        if (getQuasiIdsValuesCount() > 0) {
-          hash = (37 * hash) + QUASI_IDS_VALUES_FIELD_NUMBER;
-          hash = (53 * hash) + getQuasiIdsValuesList().hashCode();
-        }
-        hash = (37 * hash) + EQUIVALENCE_CLASS_SIZE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getEquivalenceClassSize());
-        hash = (37 * hash) + NUM_DISTINCT_SENSITIVE_VALUES_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getNumDistinctSensitiveValues());
-        if (getTopSensitiveValuesCount() > 0) {
-          hash = (37 * hash) + TOP_SENSITIVE_VALUES_FIELD_NUMBER;
-          hash = (53 * hash) + getTopSensitiveValuesList().hashCode();
-        }
-        hash = (29 * hash) + unknownFields.hashCode();
-        memoizedHashCode = hash;
-        return hash;
-      }
-
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parseFrom(
-          java.nio.ByteBuffer data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parseFrom(
-          java.nio.ByteBuffer data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parseFrom(
-          com.google.protobuf.ByteString data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parseFrom(
-          com.google.protobuf.ByteString data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parseFrom(byte[] data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parseFrom(
-          byte[] data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parseFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parseDelimitedFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parseFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parseFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder() {
-        return DEFAULT_INSTANCE.toBuilder();
-      }
-      public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass prototype) {
-        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-      }
-      public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE
-            ? new Builder() : new Builder().mergeFrom(this);
-      }
-
-      @java.lang.Override
-      protected Builder newBuilderForType(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        Builder builder = new Builder(parent);
-        return builder;
-      }
-      /**
-       * 
-       * The set of columns' values that share the same l-diversity value.
-       * 

-       *
-       * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass}
-       */
-      public static final class Builder extends
-          com.google.protobuf.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass)
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClassOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor
-            getDescriptor() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass_descriptor;
-        }
-
-        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-            internalGetFieldAccessorTable() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass_fieldAccessorTable
-              .ensureFieldAccessorsInitialized(
-                  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.Builder.class);
-        }
-
-        // Construct using com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private Builder(
-            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-          super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-            getQuasiIdsValuesFieldBuilder();
-            getTopSensitiveValuesFieldBuilder();
-          }
-        }
-        public Builder clear() {
-          super.clear();
-          if (quasiIdsValuesBuilder_ == null) {
-            quasiIdsValues_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            quasiIdsValuesBuilder_.clear();
-          }
-          equivalenceClassSize_ = 0L;
-
-          numDistinctSensitiveValues_ = 0L;
-
-          if (topSensitiveValuesBuilder_ == null) {
-            topSensitiveValues_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            topSensitiveValuesBuilder_.clear();
-          }
-          return this;
-        }
-
-        public com.google.protobuf.Descriptors.Descriptor
-            getDescriptorForType() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityEquivalenceClass_descriptor;
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass getDefaultInstanceForType() {
-          return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.getDefaultInstance();
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass build() {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass buildPartial() {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass result = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass(this);
-          int from_bitField0_ = bitField0_;
-          int to_bitField0_ = 0;
-          if (quasiIdsValuesBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) == 0x00000001)) {
-              quasiIdsValues_ = java.util.Collections.unmodifiableList(quasiIdsValues_);
-              bitField0_ = (bitField0_ & ~0x00000001);
-            }
-            result.quasiIdsValues_ = quasiIdsValues_;
-          } else {
-            result.quasiIdsValues_ = quasiIdsValuesBuilder_.build();
-          }
-          result.equivalenceClassSize_ = equivalenceClassSize_;
-          result.numDistinctSensitiveValues_ = numDistinctSensitiveValues_;
-          if (topSensitiveValuesBuilder_ == null) {
-            if (((bitField0_ & 0x00000008) == 0x00000008)) {
-              topSensitiveValues_ = java.util.Collections.unmodifiableList(topSensitiveValues_);
-              bitField0_ = (bitField0_ & ~0x00000008);
-            }
-            result.topSensitiveValues_ = topSensitiveValues_;
-          } else {
-            result.topSensitiveValues_ = topSensitiveValuesBuilder_.build();
-          }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
-        }
-
-        public Builder clone() {
-          return (Builder) super.clone();
-        }
-        public Builder setField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return (Builder) super.setField(field, value);
-        }
-        public Builder clearField(
-            com.google.protobuf.Descriptors.FieldDescriptor field) {
-          return (Builder) super.clearField(field);
-        }
-        public Builder clearOneof(
-            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-          return (Builder) super.clearOneof(oneof);
-        }
-        public Builder setRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, java.lang.Object value) {
-          return (Builder) super.setRepeatedField(field, index, value);
-        }
-        public Builder addRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return (Builder) super.addRepeatedField(field, value);
-        }
-        public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass) {
-            return mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass)other);
-          } else {
-            super.mergeFrom(other);
-            return this;
-          }
-        }
-
-        public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass other) {
-          if (other == com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.getDefaultInstance()) return this;
-          if (quasiIdsValuesBuilder_ == null) {
-            if (!other.quasiIdsValues_.isEmpty()) {
-              if (quasiIdsValues_.isEmpty()) {
-                quasiIdsValues_ = other.quasiIdsValues_;
-                bitField0_ = (bitField0_ & ~0x00000001);
-              } else {
-                ensureQuasiIdsValuesIsMutable();
-                quasiIdsValues_.addAll(other.quasiIdsValues_);
-              }
-              onChanged();
-            }
-          } else {
-            if (!other.quasiIdsValues_.isEmpty()) {
-              if (quasiIdsValuesBuilder_.isEmpty()) {
-                quasiIdsValuesBuilder_.dispose();
-                quasiIdsValuesBuilder_ = null;
-                quasiIdsValues_ = other.quasiIdsValues_;
-                bitField0_ = (bitField0_ & ~0x00000001);
-                quasiIdsValuesBuilder_ = 
-                  com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                     getQuasiIdsValuesFieldBuilder() : null;
-              } else {
-                quasiIdsValuesBuilder_.addAllMessages(other.quasiIdsValues_);
-              }
-            }
-          }
-          if (other.getEquivalenceClassSize() != 0L) {
-            setEquivalenceClassSize(other.getEquivalenceClassSize());
-          }
-          if (other.getNumDistinctSensitiveValues() != 0L) {
-            setNumDistinctSensitiveValues(other.getNumDistinctSensitiveValues());
-          }
-          if (topSensitiveValuesBuilder_ == null) {
-            if (!other.topSensitiveValues_.isEmpty()) {
-              if (topSensitiveValues_.isEmpty()) {
-                topSensitiveValues_ = other.topSensitiveValues_;
-                bitField0_ = (bitField0_ & ~0x00000008);
-              } else {
-                ensureTopSensitiveValuesIsMutable();
-                topSensitiveValues_.addAll(other.topSensitiveValues_);
-              }
-              onChanged();
-            }
-          } else {
-            if (!other.topSensitiveValues_.isEmpty()) {
-              if (topSensitiveValuesBuilder_.isEmpty()) {
-                topSensitiveValuesBuilder_.dispose();
-                topSensitiveValuesBuilder_ = null;
-                topSensitiveValues_ = other.topSensitiveValues_;
-                bitField0_ = (bitField0_ & ~0x00000008);
-                topSensitiveValuesBuilder_ = 
-                  com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                     getTopSensitiveValuesFieldBuilder() : null;
-              } else {
-                topSensitiveValuesBuilder_.addAllMessages(other.topSensitiveValues_);
-              }
-            }
-          }
-          this.mergeUnknownFields(other.unknownFields);
-          onChanged();
-          return this;
-        }
-
-        public final boolean isInitialized() {
-          return true;
-        }
-
-        public Builder mergeFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass) e.getUnfinishedMessage();
-            throw e.unwrapIOException();
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-        private int bitField0_;
-
-        private java.util.List quasiIdsValues_ =
-          java.util.Collections.emptyList();
-        private void ensureQuasiIdsValuesIsMutable() {
-          if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-            quasiIdsValues_ = new java.util.ArrayList(quasiIdsValues_);
-            bitField0_ |= 0x00000001;
-           }
-        }
-
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> quasiIdsValuesBuilder_;
-
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public java.util.List getQuasiIdsValuesList() {
-          if (quasiIdsValuesBuilder_ == null) {
-            return java.util.Collections.unmodifiableList(quasiIdsValues_);
-          } else {
-            return quasiIdsValuesBuilder_.getMessageList();
-          }
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public int getQuasiIdsValuesCount() {
-          if (quasiIdsValuesBuilder_ == null) {
-            return quasiIdsValues_.size();
-          } else {
-            return quasiIdsValuesBuilder_.getCount();
-          }
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public com.google.privacy.dlp.v2beta1.Value getQuasiIdsValues(int index) {
-          if (quasiIdsValuesBuilder_ == null) {
-            return quasiIdsValues_.get(index);
-          } else {
-            return quasiIdsValuesBuilder_.getMessage(index);
-          }
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder setQuasiIdsValues(
-            int index, com.google.privacy.dlp.v2beta1.Value value) {
-          if (quasiIdsValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.set(index, value);
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.setMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder setQuasiIdsValues(
-            int index, com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-          if (quasiIdsValuesBuilder_ == null) {
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.set(index, builderForValue.build());
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.setMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder addQuasiIdsValues(com.google.privacy.dlp.v2beta1.Value value) {
-          if (quasiIdsValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.add(value);
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.addMessage(value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder addQuasiIdsValues(
-            int index, com.google.privacy.dlp.v2beta1.Value value) {
-          if (quasiIdsValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.add(index, value);
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.addMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder addQuasiIdsValues(
-            com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-          if (quasiIdsValuesBuilder_ == null) {
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.add(builderForValue.build());
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.addMessage(builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder addQuasiIdsValues(
-            int index, com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-          if (quasiIdsValuesBuilder_ == null) {
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.add(index, builderForValue.build());
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.addMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder addAllQuasiIdsValues(
-            java.lang.Iterable values) {
-          if (quasiIdsValuesBuilder_ == null) {
-            ensureQuasiIdsValuesIsMutable();
-            com.google.protobuf.AbstractMessageLite.Builder.addAll(
-                values, quasiIdsValues_);
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.addAllMessages(values);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder clearQuasiIdsValues() {
-          if (quasiIdsValuesBuilder_ == null) {
-            quasiIdsValues_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.clear();
-          }
-          return this;
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public Builder removeQuasiIdsValues(int index) {
-          if (quasiIdsValuesBuilder_ == null) {
-            ensureQuasiIdsValuesIsMutable();
-            quasiIdsValues_.remove(index);
-            onChanged();
-          } else {
-            quasiIdsValuesBuilder_.remove(index);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public com.google.privacy.dlp.v2beta1.Value.Builder getQuasiIdsValuesBuilder(
-            int index) {
-          return getQuasiIdsValuesFieldBuilder().getBuilder(index);
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public com.google.privacy.dlp.v2beta1.ValueOrBuilder getQuasiIdsValuesOrBuilder(
-            int index) {
-          if (quasiIdsValuesBuilder_ == null) {
-            return quasiIdsValues_.get(index);  } else {
-            return quasiIdsValuesBuilder_.getMessageOrBuilder(index);
-          }
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public java.util.List 
-             getQuasiIdsValuesOrBuilderList() {
-          if (quasiIdsValuesBuilder_ != null) {
-            return quasiIdsValuesBuilder_.getMessageOrBuilderList();
-          } else {
-            return java.util.Collections.unmodifiableList(quasiIdsValues_);
-          }
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public com.google.privacy.dlp.v2beta1.Value.Builder addQuasiIdsValuesBuilder() {
-          return getQuasiIdsValuesFieldBuilder().addBuilder(
-              com.google.privacy.dlp.v2beta1.Value.getDefaultInstance());
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public com.google.privacy.dlp.v2beta1.Value.Builder addQuasiIdsValuesBuilder(
-            int index) {
-          return getQuasiIdsValuesFieldBuilder().addBuilder(
-              index, com.google.privacy.dlp.v2beta1.Value.getDefaultInstance());
-        }
-        /**
-         * 
-         * Quasi-identifier values defining the k-anonymity equivalence
-         * class. The order is always the same as the original request.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.Value quasi_ids_values = 1;
-         */
-        public java.util.List 
-             getQuasiIdsValuesBuilderList() {
-          return getQuasiIdsValuesFieldBuilder().getBuilderList();
-        }
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-            getQuasiIdsValuesFieldBuilder() {
-          if (quasiIdsValuesBuilder_ == null) {
-            quasiIdsValuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                    quasiIdsValues_,
-                    ((bitField0_ & 0x00000001) == 0x00000001),
-                    getParentForChildren(),
-                    isClean());
-            quasiIdsValues_ = null;
-          }
-          return quasiIdsValuesBuilder_;
-        }
-
-        private long equivalenceClassSize_ ;
-        /**
-         * 
-         * Size of the k-anonymity equivalence class.
-         * 

-         *
-         * int64 equivalence_class_size = 2;
-         */
-        public long getEquivalenceClassSize() {
-          return equivalenceClassSize_;
-        }
-        /**
-         * 
-         * Size of the k-anonymity equivalence class.
-         * 

-         *
-         * int64 equivalence_class_size = 2;
-         */
-        public Builder setEquivalenceClassSize(long value) {
-          
-          equivalenceClassSize_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Size of the k-anonymity equivalence class.
-         * 

-         *
-         * int64 equivalence_class_size = 2;
-         */
-        public Builder clearEquivalenceClassSize() {
-          
-          equivalenceClassSize_ = 0L;
-          onChanged();
-          return this;
-        }
-
-        private long numDistinctSensitiveValues_ ;
-        /**
-         * 
-         * Number of distinct sensitive values in this equivalence class.
-         * 

-         *
-         * int64 num_distinct_sensitive_values = 3;
-         */
-        public long getNumDistinctSensitiveValues() {
-          return numDistinctSensitiveValues_;
-        }
-        /**
-         * 
-         * Number of distinct sensitive values in this equivalence class.
-         * 

-         *
-         * int64 num_distinct_sensitive_values = 3;
-         */
-        public Builder setNumDistinctSensitiveValues(long value) {
-          
-          numDistinctSensitiveValues_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Number of distinct sensitive values in this equivalence class.
-         * 

-         *
-         * int64 num_distinct_sensitive_values = 3;
-         */
-        public Builder clearNumDistinctSensitiveValues() {
-          
-          numDistinctSensitiveValues_ = 0L;
-          onChanged();
-          return this;
-        }
-
-        private java.util.List topSensitiveValues_ =
-          java.util.Collections.emptyList();
-        private void ensureTopSensitiveValuesIsMutable() {
-          if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-            topSensitiveValues_ = new java.util.ArrayList(topSensitiveValues_);
-            bitField0_ |= 0x00000008;
-           }
-        }
-
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.ValueFrequency, com.google.privacy.dlp.v2beta1.ValueFrequency.Builder, com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder> topSensitiveValuesBuilder_;
-
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public java.util.List getTopSensitiveValuesList() {
-          if (topSensitiveValuesBuilder_ == null) {
-            return java.util.Collections.unmodifiableList(topSensitiveValues_);
-          } else {
-            return topSensitiveValuesBuilder_.getMessageList();
-          }
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public int getTopSensitiveValuesCount() {
-          if (topSensitiveValuesBuilder_ == null) {
-            return topSensitiveValues_.size();
-          } else {
-            return topSensitiveValuesBuilder_.getCount();
-          }
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.ValueFrequency getTopSensitiveValues(int index) {
-          if (topSensitiveValuesBuilder_ == null) {
-            return topSensitiveValues_.get(index);
-          } else {
-            return topSensitiveValuesBuilder_.getMessage(index);
-          }
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public Builder setTopSensitiveValues(
-            int index, com.google.privacy.dlp.v2beta1.ValueFrequency value) {
-          if (topSensitiveValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureTopSensitiveValuesIsMutable();
-            topSensitiveValues_.set(index, value);
-            onChanged();
-          } else {
-            topSensitiveValuesBuilder_.setMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public Builder setTopSensitiveValues(
-            int index, com.google.privacy.dlp.v2beta1.ValueFrequency.Builder builderForValue) {
-          if (topSensitiveValuesBuilder_ == null) {
-            ensureTopSensitiveValuesIsMutable();
-            topSensitiveValues_.set(index, builderForValue.build());
-            onChanged();
-          } else {
-            topSensitiveValuesBuilder_.setMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public Builder addTopSensitiveValues(com.google.privacy.dlp.v2beta1.ValueFrequency value) {
-          if (topSensitiveValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureTopSensitiveValuesIsMutable();
-            topSensitiveValues_.add(value);
-            onChanged();
-          } else {
-            topSensitiveValuesBuilder_.addMessage(value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public Builder addTopSensitiveValues(
-            int index, com.google.privacy.dlp.v2beta1.ValueFrequency value) {
-          if (topSensitiveValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureTopSensitiveValuesIsMutable();
-            topSensitiveValues_.add(index, value);
-            onChanged();
-          } else {
-            topSensitiveValuesBuilder_.addMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public Builder addTopSensitiveValues(
-            com.google.privacy.dlp.v2beta1.ValueFrequency.Builder builderForValue) {
-          if (topSensitiveValuesBuilder_ == null) {
-            ensureTopSensitiveValuesIsMutable();
-            topSensitiveValues_.add(builderForValue.build());
-            onChanged();
-          } else {
-            topSensitiveValuesBuilder_.addMessage(builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public Builder addTopSensitiveValues(
-            int index, com.google.privacy.dlp.v2beta1.ValueFrequency.Builder builderForValue) {
-          if (topSensitiveValuesBuilder_ == null) {
-            ensureTopSensitiveValuesIsMutable();
-            topSensitiveValues_.add(index, builderForValue.build());
-            onChanged();
-          } else {
-            topSensitiveValuesBuilder_.addMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public Builder addAllTopSensitiveValues(
-            java.lang.Iterable values) {
-          if (topSensitiveValuesBuilder_ == null) {
-            ensureTopSensitiveValuesIsMutable();
-            com.google.protobuf.AbstractMessageLite.Builder.addAll(
-                values, topSensitiveValues_);
-            onChanged();
-          } else {
-            topSensitiveValuesBuilder_.addAllMessages(values);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public Builder clearTopSensitiveValues() {
-          if (topSensitiveValuesBuilder_ == null) {
-            topSensitiveValues_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000008);
-            onChanged();
-          } else {
-            topSensitiveValuesBuilder_.clear();
-          }
-          return this;
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public Builder removeTopSensitiveValues(int index) {
-          if (topSensitiveValuesBuilder_ == null) {
-            ensureTopSensitiveValuesIsMutable();
-            topSensitiveValues_.remove(index);
-            onChanged();
-          } else {
-            topSensitiveValuesBuilder_.remove(index);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.ValueFrequency.Builder getTopSensitiveValuesBuilder(
-            int index) {
-          return getTopSensitiveValuesFieldBuilder().getBuilder(index);
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder getTopSensitiveValuesOrBuilder(
-            int index) {
-          if (topSensitiveValuesBuilder_ == null) {
-            return topSensitiveValues_.get(index);  } else {
-            return topSensitiveValuesBuilder_.getMessageOrBuilder(index);
-          }
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public java.util.List 
-             getTopSensitiveValuesOrBuilderList() {
-          if (topSensitiveValuesBuilder_ != null) {
-            return topSensitiveValuesBuilder_.getMessageOrBuilderList();
-          } else {
-            return java.util.Collections.unmodifiableList(topSensitiveValues_);
-          }
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.ValueFrequency.Builder addTopSensitiveValuesBuilder() {
-          return getTopSensitiveValuesFieldBuilder().addBuilder(
-              com.google.privacy.dlp.v2beta1.ValueFrequency.getDefaultInstance());
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.ValueFrequency.Builder addTopSensitiveValuesBuilder(
-            int index) {
-          return getTopSensitiveValuesFieldBuilder().addBuilder(
-              index, com.google.privacy.dlp.v2beta1.ValueFrequency.getDefaultInstance());
-        }
-        /**
-         * 
-         * Estimated frequencies of top sensitive values.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.ValueFrequency top_sensitive_values = 4;
-         */
-        public java.util.List 
-             getTopSensitiveValuesBuilderList() {
-          return getTopSensitiveValuesFieldBuilder().getBuilderList();
-        }
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.ValueFrequency, com.google.privacy.dlp.v2beta1.ValueFrequency.Builder, com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder> 
-            getTopSensitiveValuesFieldBuilder() {
-          if (topSensitiveValuesBuilder_ == null) {
-            topSensitiveValuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.privacy.dlp.v2beta1.ValueFrequency, com.google.privacy.dlp.v2beta1.ValueFrequency.Builder, com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder>(
-                    topSensitiveValues_,
-                    ((bitField0_ & 0x00000008) == 0x00000008),
-                    getParentForChildren(),
-                    isClean());
-            topSensitiveValues_ = null;
-          }
-          return topSensitiveValuesBuilder_;
-        }
-        public final Builder setUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.setUnknownFieldsProto3(unknownFields);
-        }
-
-        public final Builder mergeUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.mergeUnknownFields(unknownFields);
-        }
-
-
-        // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass)
-      }
-
-      // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass)
-      private static final com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass DEFAULT_INSTANCE;
-      static {
-        DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass();
-      }
-
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass getDefaultInstance() {
-        return DEFAULT_INSTANCE;
-      }
-
-      private static final com.google.protobuf.Parser
-          PARSER = new com.google.protobuf.AbstractParser() {
-        public LDiversityEquivalenceClass parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new LDiversityEquivalenceClass(input, extensionRegistry);
-        }
-      };
-
-      public static com.google.protobuf.Parser parser() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Parser getParserForType() {
-        return PARSER;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass getDefaultInstanceForType() {
-        return DEFAULT_INSTANCE;
-      }
-
-    }
-
-    public interface LDiversityHistogramBucketOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket)
-        com.google.protobuf.MessageOrBuilder {
-
-      /**
-       * 
-       * Lower bound on the sensitive value frequencies of the equivalence
-       * classes in this bucket.
-       * 

-       *
-       * int64 sensitive_value_frequency_lower_bound = 1;
-       */
-      long getSensitiveValueFrequencyLowerBound();
-
-      /**
-       * 
-       * Upper bound on the sensitive value frequencies of the equivalence
-       * classes in this bucket.
-       * 

-       *
-       * int64 sensitive_value_frequency_upper_bound = 2;
-       */
-      long getSensitiveValueFrequencyUpperBound();
-
-      /**
-       * 
-       * Total number of records in this bucket.
-       * 

-       *
-       * int64 bucket_size = 3;
-       */
-      long getBucketSize();
-
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-       */
-      java.util.List 
-          getBucketValuesList();
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-       */
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass getBucketValues(int index);
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-       */
-      int getBucketValuesCount();
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-       */
-      java.util.List 
-          getBucketValuesOrBuilderList();
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-       */
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClassOrBuilder getBucketValuesOrBuilder(
-          int index);
-    }
-    /**
-     * 
-     * Histogram bucket of sensitive value frequencies in the table.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket}
-     */
-    public  static final class LDiversityHistogramBucket extends
-        com.google.protobuf.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket)
-        LDiversityHistogramBucketOrBuilder {
-    private static final long serialVersionUID = 0L;
-      // Use LDiversityHistogramBucket.newBuilder() to construct.
-      private LDiversityHistogramBucket(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-        super(builder);
-      }
-      private LDiversityHistogramBucket() {
-        sensitiveValueFrequencyLowerBound_ = 0L;
-        sensitiveValueFrequencyUpperBound_ = 0L;
-        bucketSize_ = 0L;
-        bucketValues_ = java.util.Collections.emptyList();
-      }
-
-      @java.lang.Override
-      public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private LDiversityHistogramBucket(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-            com.google.protobuf.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-              case 8: {
-
-                sensitiveValueFrequencyLowerBound_ = input.readInt64();
-                break;
-              }
-              case 16: {
-
-                sensitiveValueFrequencyUpperBound_ = input.readInt64();
-                break;
-              }
-              case 24: {
-
-                bucketSize_ = input.readInt64();
-                break;
-              }
-              case 34: {
-                if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                  bucketValues_ = new java.util.ArrayList();
-                  mutable_bitField0_ |= 0x00000008;
-                }
-                bucketValues_.add(
-                    input.readMessage(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.parser(), extensionRegistry));
-                break;
-              }
-            }
-          }
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-            bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_);
-          }
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.Builder.class);
-      }
-
-      private int bitField0_;
-      public static final int SENSITIVE_VALUE_FREQUENCY_LOWER_BOUND_FIELD_NUMBER = 1;
-      private long sensitiveValueFrequencyLowerBound_;
-      /**
-       * 
-       * Lower bound on the sensitive value frequencies of the equivalence
-       * classes in this bucket.
-       * 

-       *
-       * int64 sensitive_value_frequency_lower_bound = 1;
-       */
-      public long getSensitiveValueFrequencyLowerBound() {
-        return sensitiveValueFrequencyLowerBound_;
-      }
-
-      public static final int SENSITIVE_VALUE_FREQUENCY_UPPER_BOUND_FIELD_NUMBER = 2;
-      private long sensitiveValueFrequencyUpperBound_;
-      /**
-       * 
-       * Upper bound on the sensitive value frequencies of the equivalence
-       * classes in this bucket.
-       * 

-       *
-       * int64 sensitive_value_frequency_upper_bound = 2;
-       */
-      public long getSensitiveValueFrequencyUpperBound() {
-        return sensitiveValueFrequencyUpperBound_;
-      }
-
-      public static final int BUCKET_SIZE_FIELD_NUMBER = 3;
-      private long bucketSize_;
-      /**
-       * 
-       * Total number of records in this bucket.
-       * 

-       *
-       * int64 bucket_size = 3;
-       */
-      public long getBucketSize() {
-        return bucketSize_;
-      }
-
-      public static final int BUCKET_VALUES_FIELD_NUMBER = 4;
-      private java.util.List bucketValues_;
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-       */
-      public java.util.List getBucketValuesList() {
-        return bucketValues_;
-      }
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-       */
-      public java.util.List 
-          getBucketValuesOrBuilderList() {
-        return bucketValues_;
-      }
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-       */
-      public int getBucketValuesCount() {
-        return bucketValues_.size();
-      }
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass getBucketValues(int index) {
-        return bucketValues_.get(index);
-      }
-      /**
-       * 
-       * Sample of equivalence classes in this bucket. The total number of
-       * classes returned per bucket is capped at 20.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClassOrBuilder getBucketValuesOrBuilder(
-          int index) {
-        return bucketValues_.get(index);
-      }
-
-      private byte memoizedIsInitialized = -1;
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized == 1) return true;
-        if (isInitialized == 0) return false;
-
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      public void writeTo(com.google.protobuf.CodedOutputStream output)
-                          throws java.io.IOException {
-        if (sensitiveValueFrequencyLowerBound_ != 0L) {
-          output.writeInt64(1, sensitiveValueFrequencyLowerBound_);
-        }
-        if (sensitiveValueFrequencyUpperBound_ != 0L) {
-          output.writeInt64(2, sensitiveValueFrequencyUpperBound_);
-        }
-        if (bucketSize_ != 0L) {
-          output.writeInt64(3, bucketSize_);
-        }
-        for (int i = 0; i < bucketValues_.size(); i++) {
-          output.writeMessage(4, bucketValues_.get(i));
-        }
-        unknownFields.writeTo(output);
-      }
-
-      public int getSerializedSize() {
-        int size = memoizedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        if (sensitiveValueFrequencyLowerBound_ != 0L) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeInt64Size(1, sensitiveValueFrequencyLowerBound_);
-        }
-        if (sensitiveValueFrequencyUpperBound_ != 0L) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeInt64Size(2, sensitiveValueFrequencyUpperBound_);
-        }
-        if (bucketSize_ != 0L) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeInt64Size(3, bucketSize_);
-        }
-        for (int i = 0; i < bucketValues_.size(); i++) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(4, bucketValues_.get(i));
-        }
-        size += unknownFields.getSerializedSize();
-        memoizedSize = size;
-        return size;
-      }
-
-      @java.lang.Override
-      public boolean equals(final java.lang.Object obj) {
-        if (obj == this) {
-         return true;
-        }
-        if (!(obj instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket)) {
-          return super.equals(obj);
-        }
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket other = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket) obj;
-
-        boolean result = true;
-        result = result && (getSensitiveValueFrequencyLowerBound()
-            == other.getSensitiveValueFrequencyLowerBound());
-        result = result && (getSensitiveValueFrequencyUpperBound()
-            == other.getSensitiveValueFrequencyUpperBound());
-        result = result && (getBucketSize()
-            == other.getBucketSize());
-        result = result && getBucketValuesList()
-            .equals(other.getBucketValuesList());
-        result = result && unknownFields.equals(other.unknownFields);
-        return result;
-      }
-
-      @java.lang.Override
-      public int hashCode() {
-        if (memoizedHashCode != 0) {
-          return memoizedHashCode;
-        }
-        int hash = 41;
-        hash = (19 * hash) + getDescriptor().hashCode();
-        hash = (37 * hash) + SENSITIVE_VALUE_FREQUENCY_LOWER_BOUND_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getSensitiveValueFrequencyLowerBound());
-        hash = (37 * hash) + SENSITIVE_VALUE_FREQUENCY_UPPER_BOUND_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getSensitiveValueFrequencyUpperBound());
-        hash = (37 * hash) + BUCKET_SIZE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getBucketSize());
-        if (getBucketValuesCount() > 0) {
-          hash = (37 * hash) + BUCKET_VALUES_FIELD_NUMBER;
-          hash = (53 * hash) + getBucketValuesList().hashCode();
-        }
-        hash = (29 * hash) + unknownFields.hashCode();
-        memoizedHashCode = hash;
-        return hash;
-      }
-
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parseFrom(
-          java.nio.ByteBuffer data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parseFrom(
-          java.nio.ByteBuffer data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parseFrom(
-          com.google.protobuf.ByteString data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parseFrom(
-          com.google.protobuf.ByteString data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parseFrom(byte[] data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parseFrom(
-          byte[] data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parseFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parseDelimitedFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parseFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parseFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder() {
-        return DEFAULT_INSTANCE.toBuilder();
-      }
-      public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket prototype) {
-        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-      }
-      public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE
-            ? new Builder() : new Builder().mergeFrom(this);
-      }
-
-      @java.lang.Override
-      protected Builder newBuilderForType(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        Builder builder = new Builder(parent);
-        return builder;
-      }
-      /**
-       * 
-       * Histogram bucket of sensitive value frequencies in the table.
-       * 

-       *
-       * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket}
-       */
-      public static final class Builder extends
-          com.google.protobuf.GeneratedMessageV3.Builder implements
-          // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket)
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucketOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor
-            getDescriptor() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket_descriptor;
-        }
-
-        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-            internalGetFieldAccessorTable() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket_fieldAccessorTable
-              .ensureFieldAccessorsInitialized(
-                  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.Builder.class);
-        }
-
-        // Construct using com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private Builder(
-            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-          super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-            getBucketValuesFieldBuilder();
-          }
-        }
-        public Builder clear() {
-          super.clear();
-          sensitiveValueFrequencyLowerBound_ = 0L;
-
-          sensitiveValueFrequencyUpperBound_ = 0L;
-
-          bucketSize_ = 0L;
-
-          if (bucketValuesBuilder_ == null) {
-            bucketValues_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            bucketValuesBuilder_.clear();
-          }
-          return this;
-        }
-
-        public com.google.protobuf.Descriptors.Descriptor
-            getDescriptorForType() {
-          return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_LDiversityHistogramBucket_descriptor;
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket getDefaultInstanceForType() {
-          return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.getDefaultInstance();
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket build() {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket buildPartial() {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket result = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket(this);
-          int from_bitField0_ = bitField0_;
-          int to_bitField0_ = 0;
-          result.sensitiveValueFrequencyLowerBound_ = sensitiveValueFrequencyLowerBound_;
-          result.sensitiveValueFrequencyUpperBound_ = sensitiveValueFrequencyUpperBound_;
-          result.bucketSize_ = bucketSize_;
-          if (bucketValuesBuilder_ == null) {
-            if (((bitField0_ & 0x00000008) == 0x00000008)) {
-              bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_);
-              bitField0_ = (bitField0_ & ~0x00000008);
-            }
-            result.bucketValues_ = bucketValues_;
-          } else {
-            result.bucketValues_ = bucketValuesBuilder_.build();
-          }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
-        }
-
-        public Builder clone() {
-          return (Builder) super.clone();
-        }
-        public Builder setField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return (Builder) super.setField(field, value);
-        }
-        public Builder clearField(
-            com.google.protobuf.Descriptors.FieldDescriptor field) {
-          return (Builder) super.clearField(field);
-        }
-        public Builder clearOneof(
-            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-          return (Builder) super.clearOneof(oneof);
-        }
-        public Builder setRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, java.lang.Object value) {
-          return (Builder) super.setRepeatedField(field, index, value);
-        }
-        public Builder addRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return (Builder) super.addRepeatedField(field, value);
-        }
-        public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket) {
-            return mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket)other);
-          } else {
-            super.mergeFrom(other);
-            return this;
-          }
-        }
-
-        public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket other) {
-          if (other == com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.getDefaultInstance()) return this;
-          if (other.getSensitiveValueFrequencyLowerBound() != 0L) {
-            setSensitiveValueFrequencyLowerBound(other.getSensitiveValueFrequencyLowerBound());
-          }
-          if (other.getSensitiveValueFrequencyUpperBound() != 0L) {
-            setSensitiveValueFrequencyUpperBound(other.getSensitiveValueFrequencyUpperBound());
-          }
-          if (other.getBucketSize() != 0L) {
-            setBucketSize(other.getBucketSize());
-          }
-          if (bucketValuesBuilder_ == null) {
-            if (!other.bucketValues_.isEmpty()) {
-              if (bucketValues_.isEmpty()) {
-                bucketValues_ = other.bucketValues_;
-                bitField0_ = (bitField0_ & ~0x00000008);
-              } else {
-                ensureBucketValuesIsMutable();
-                bucketValues_.addAll(other.bucketValues_);
-              }
-              onChanged();
-            }
-          } else {
-            if (!other.bucketValues_.isEmpty()) {
-              if (bucketValuesBuilder_.isEmpty()) {
-                bucketValuesBuilder_.dispose();
-                bucketValuesBuilder_ = null;
-                bucketValues_ = other.bucketValues_;
-                bitField0_ = (bitField0_ & ~0x00000008);
-                bucketValuesBuilder_ = 
-                  com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                     getBucketValuesFieldBuilder() : null;
-              } else {
-                bucketValuesBuilder_.addAllMessages(other.bucketValues_);
-              }
-            }
-          }
-          this.mergeUnknownFields(other.unknownFields);
-          onChanged();
-          return this;
-        }
-
-        public final boolean isInitialized() {
-          return true;
-        }
-
-        public Builder mergeFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket) e.getUnfinishedMessage();
-            throw e.unwrapIOException();
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-        private int bitField0_;
-
-        private long sensitiveValueFrequencyLowerBound_ ;
-        /**
-         * 
-         * Lower bound on the sensitive value frequencies of the equivalence
-         * classes in this bucket.
-         * 

-         *
-         * int64 sensitive_value_frequency_lower_bound = 1;
-         */
-        public long getSensitiveValueFrequencyLowerBound() {
-          return sensitiveValueFrequencyLowerBound_;
-        }
-        /**
-         * 
-         * Lower bound on the sensitive value frequencies of the equivalence
-         * classes in this bucket.
-         * 

-         *
-         * int64 sensitive_value_frequency_lower_bound = 1;
-         */
-        public Builder setSensitiveValueFrequencyLowerBound(long value) {
-          
-          sensitiveValueFrequencyLowerBound_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Lower bound on the sensitive value frequencies of the equivalence
-         * classes in this bucket.
-         * 

-         *
-         * int64 sensitive_value_frequency_lower_bound = 1;
-         */
-        public Builder clearSensitiveValueFrequencyLowerBound() {
-          
-          sensitiveValueFrequencyLowerBound_ = 0L;
-          onChanged();
-          return this;
-        }
-
-        private long sensitiveValueFrequencyUpperBound_ ;
-        /**
-         * 
-         * Upper bound on the sensitive value frequencies of the equivalence
-         * classes in this bucket.
-         * 

-         *
-         * int64 sensitive_value_frequency_upper_bound = 2;
-         */
-        public long getSensitiveValueFrequencyUpperBound() {
-          return sensitiveValueFrequencyUpperBound_;
-        }
-        /**
-         * 
-         * Upper bound on the sensitive value frequencies of the equivalence
-         * classes in this bucket.
-         * 

-         *
-         * int64 sensitive_value_frequency_upper_bound = 2;
-         */
-        public Builder setSensitiveValueFrequencyUpperBound(long value) {
-          
-          sensitiveValueFrequencyUpperBound_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Upper bound on the sensitive value frequencies of the equivalence
-         * classes in this bucket.
-         * 

-         *
-         * int64 sensitive_value_frequency_upper_bound = 2;
-         */
-        public Builder clearSensitiveValueFrequencyUpperBound() {
-          
-          sensitiveValueFrequencyUpperBound_ = 0L;
-          onChanged();
-          return this;
-        }
-
-        private long bucketSize_ ;
-        /**
-         * 
-         * Total number of records in this bucket.
-         * 

-         *
-         * int64 bucket_size = 3;
-         */
-        public long getBucketSize() {
-          return bucketSize_;
-        }
-        /**
-         * 
-         * Total number of records in this bucket.
-         * 

-         *
-         * int64 bucket_size = 3;
-         */
-        public Builder setBucketSize(long value) {
-          
-          bucketSize_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * 
-         * Total number of records in this bucket.
-         * 

-         *
-         * int64 bucket_size = 3;
-         */
-        public Builder clearBucketSize() {
-          
-          bucketSize_ = 0L;
-          onChanged();
-          return this;
-        }
-
-        private java.util.List bucketValues_ =
-          java.util.Collections.emptyList();
-        private void ensureBucketValuesIsMutable() {
-          if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-            bucketValues_ = new java.util.ArrayList(bucketValues_);
-            bitField0_ |= 0x00000008;
-           }
-        }
-
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClassOrBuilder> bucketValuesBuilder_;
-
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public java.util.List getBucketValuesList() {
-          if (bucketValuesBuilder_ == null) {
-            return java.util.Collections.unmodifiableList(bucketValues_);
-          } else {
-            return bucketValuesBuilder_.getMessageList();
-          }
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public int getBucketValuesCount() {
-          if (bucketValuesBuilder_ == null) {
-            return bucketValues_.size();
-          } else {
-            return bucketValuesBuilder_.getCount();
-          }
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass getBucketValues(int index) {
-          if (bucketValuesBuilder_ == null) {
-            return bucketValues_.get(index);
-          } else {
-            return bucketValuesBuilder_.getMessage(index);
-          }
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public Builder setBucketValues(
-            int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass value) {
-          if (bucketValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureBucketValuesIsMutable();
-            bucketValues_.set(index, value);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.setMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public Builder setBucketValues(
-            int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.Builder builderForValue) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            bucketValues_.set(index, builderForValue.build());
-            onChanged();
-          } else {
-            bucketValuesBuilder_.setMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public Builder addBucketValues(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass value) {
-          if (bucketValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureBucketValuesIsMutable();
-            bucketValues_.add(value);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addMessage(value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public Builder addBucketValues(
-            int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass value) {
-          if (bucketValuesBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureBucketValuesIsMutable();
-            bucketValues_.add(index, value);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public Builder addBucketValues(
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.Builder builderForValue) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            bucketValues_.add(builderForValue.build());
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addMessage(builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public Builder addBucketValues(
-            int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.Builder builderForValue) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            bucketValues_.add(index, builderForValue.build());
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public Builder addAllBucketValues(
-            java.lang.Iterable values) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            com.google.protobuf.AbstractMessageLite.Builder.addAll(
-                values, bucketValues_);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.addAllMessages(values);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public Builder clearBucketValues() {
-          if (bucketValuesBuilder_ == null) {
-            bucketValues_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000008);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.clear();
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public Builder removeBucketValues(int index) {
-          if (bucketValuesBuilder_ == null) {
-            ensureBucketValuesIsMutable();
-            bucketValues_.remove(index);
-            onChanged();
-          } else {
-            bucketValuesBuilder_.remove(index);
-          }
-          return this;
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.Builder getBucketValuesBuilder(
-            int index) {
-          return getBucketValuesFieldBuilder().getBuilder(index);
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClassOrBuilder getBucketValuesOrBuilder(
-            int index) {
-          if (bucketValuesBuilder_ == null) {
-            return bucketValues_.get(index);  } else {
-            return bucketValuesBuilder_.getMessageOrBuilder(index);
-          }
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public java.util.List 
-             getBucketValuesOrBuilderList() {
-          if (bucketValuesBuilder_ != null) {
-            return bucketValuesBuilder_.getMessageOrBuilderList();
-          } else {
-            return java.util.Collections.unmodifiableList(bucketValues_);
-          }
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.Builder addBucketValuesBuilder() {
-          return getBucketValuesFieldBuilder().addBuilder(
-              com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.getDefaultInstance());
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.Builder addBucketValuesBuilder(
-            int index) {
-          return getBucketValuesFieldBuilder().addBuilder(
-              index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.getDefaultInstance());
-        }
-        /**
-         * 
-         * Sample of equivalence classes in this bucket. The total number of
-         * classes returned per bucket is capped at 20.
-         * 

-         *
-         * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass bucket_values = 4;
-         */
-        public java.util.List 
-             getBucketValuesBuilderList() {
-          return getBucketValuesFieldBuilder().getBuilderList();
-        }
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClassOrBuilder> 
-            getBucketValuesFieldBuilder() {
-          if (bucketValuesBuilder_ == null) {
-            bucketValuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClass.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityEquivalenceClassOrBuilder>(
-                    bucketValues_,
-                    ((bitField0_ & 0x00000008) == 0x00000008),
-                    getParentForChildren(),
-                    isClean());
-            bucketValues_ = null;
-          }
-          return bucketValuesBuilder_;
-        }
-        public final Builder setUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.setUnknownFieldsProto3(unknownFields);
-        }
-
-        public final Builder mergeUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.mergeUnknownFields(unknownFields);
-        }
-
-
-        // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket)
-      }
-
-      // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket)
-      private static final com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket DEFAULT_INSTANCE;
-      static {
-        DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket();
-      }
-
-      public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket getDefaultInstance() {
-        return DEFAULT_INSTANCE;
-      }
-
-      private static final com.google.protobuf.Parser
-          PARSER = new com.google.protobuf.AbstractParser() {
-        public LDiversityHistogramBucket parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new LDiversityHistogramBucket(input, extensionRegistry);
-        }
-      };
-
-      public static com.google.protobuf.Parser parser() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Parser getParserForType() {
-        return PARSER;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket getDefaultInstanceForType() {
-        return DEFAULT_INSTANCE;
-      }
-
-    }
-
-    public static final int SENSITIVE_VALUE_FREQUENCY_HISTOGRAM_BUCKETS_FIELD_NUMBER = 5;
-    private java.util.List sensitiveValueFrequencyHistogramBuckets_;
-    /**
-     * 
-     * Histogram of l-diversity equivalence class sensitive value frequencies.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-     */
-    public java.util.List getSensitiveValueFrequencyHistogramBucketsList() {
-      return sensitiveValueFrequencyHistogramBuckets_;
-    }
-    /**
-     * 
-     * Histogram of l-diversity equivalence class sensitive value frequencies.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-     */
-    public java.util.List 
-        getSensitiveValueFrequencyHistogramBucketsOrBuilderList() {
-      return sensitiveValueFrequencyHistogramBuckets_;
-    }
-    /**
-     * 
-     * Histogram of l-diversity equivalence class sensitive value frequencies.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-     */
-    public int getSensitiveValueFrequencyHistogramBucketsCount() {
-      return sensitiveValueFrequencyHistogramBuckets_.size();
-    }
-    /**
-     * 
-     * Histogram of l-diversity equivalence class sensitive value frequencies.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket getSensitiveValueFrequencyHistogramBuckets(int index) {
-      return sensitiveValueFrequencyHistogramBuckets_.get(index);
-    }
-    /**
-     * 
-     * Histogram of l-diversity equivalence class sensitive value frequencies.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucketOrBuilder getSensitiveValueFrequencyHistogramBucketsOrBuilder(
-        int index) {
-      return sensitiveValueFrequencyHistogramBuckets_.get(index);
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      for (int i = 0; i < sensitiveValueFrequencyHistogramBuckets_.size(); i++) {
-        output.writeMessage(5, sensitiveValueFrequencyHistogramBuckets_.get(i));
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < sensitiveValueFrequencyHistogramBuckets_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, sensitiveValueFrequencyHistogramBuckets_.get(i));
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult other = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) obj;
-
-      boolean result = true;
-      result = result && getSensitiveValueFrequencyHistogramBucketsList()
-          .equals(other.getSensitiveValueFrequencyHistogramBucketsList());
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getSensitiveValueFrequencyHistogramBucketsCount() > 0) {
-        hash = (37 * hash) + SENSITIVE_VALUE_FREQUENCY_HISTOGRAM_BUCKETS_FIELD_NUMBER;
-        hash = (53 * hash) + getSensitiveValueFrequencyHistogramBucketsList().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * Result of the l-diversity computation.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult)
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResultOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getSensitiveValueFrequencyHistogramBucketsFieldBuilder();
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          sensitiveValueFrequencyHistogramBuckets_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          sensitiveValueFrequencyHistogramBucketsBuilder_.clear();
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_LDiversityResult_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult build() {
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult buildPartial() {
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult result = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult(this);
-        int from_bitField0_ = bitField0_;
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001)) {
-            sensitiveValueFrequencyHistogramBuckets_ = java.util.Collections.unmodifiableList(sensitiveValueFrequencyHistogramBuckets_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.sensitiveValueFrequencyHistogramBuckets_ = sensitiveValueFrequencyHistogramBuckets_;
-        } else {
-          result.sensitiveValueFrequencyHistogramBuckets_ = sensitiveValueFrequencyHistogramBucketsBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult other) {
-        if (other == com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.getDefaultInstance()) return this;
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          if (!other.sensitiveValueFrequencyHistogramBuckets_.isEmpty()) {
-            if (sensitiveValueFrequencyHistogramBuckets_.isEmpty()) {
-              sensitiveValueFrequencyHistogramBuckets_ = other.sensitiveValueFrequencyHistogramBuckets_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureSensitiveValueFrequencyHistogramBucketsIsMutable();
-              sensitiveValueFrequencyHistogramBuckets_.addAll(other.sensitiveValueFrequencyHistogramBuckets_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.sensitiveValueFrequencyHistogramBuckets_.isEmpty()) {
-            if (sensitiveValueFrequencyHistogramBucketsBuilder_.isEmpty()) {
-              sensitiveValueFrequencyHistogramBucketsBuilder_.dispose();
-              sensitiveValueFrequencyHistogramBucketsBuilder_ = null;
-              sensitiveValueFrequencyHistogramBuckets_ = other.sensitiveValueFrequencyHistogramBuckets_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              sensitiveValueFrequencyHistogramBucketsBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getSensitiveValueFrequencyHistogramBucketsFieldBuilder() : null;
-            } else {
-              sensitiveValueFrequencyHistogramBucketsBuilder_.addAllMessages(other.sensitiveValueFrequencyHistogramBuckets_);
-            }
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List sensitiveValueFrequencyHistogramBuckets_ =
-        java.util.Collections.emptyList();
-      private void ensureSensitiveValueFrequencyHistogramBucketsIsMutable() {
-        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          sensitiveValueFrequencyHistogramBuckets_ = new java.util.ArrayList(sensitiveValueFrequencyHistogramBuckets_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucketOrBuilder> sensitiveValueFrequencyHistogramBucketsBuilder_;
-
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public java.util.List getSensitiveValueFrequencyHistogramBucketsList() {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(sensitiveValueFrequencyHistogramBuckets_);
-        } else {
-          return sensitiveValueFrequencyHistogramBucketsBuilder_.getMessageList();
-        }
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public int getSensitiveValueFrequencyHistogramBucketsCount() {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          return sensitiveValueFrequencyHistogramBuckets_.size();
-        } else {
-          return sensitiveValueFrequencyHistogramBucketsBuilder_.getCount();
-        }
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket getSensitiveValueFrequencyHistogramBuckets(int index) {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          return sensitiveValueFrequencyHistogramBuckets_.get(index);
-        } else {
-          return sensitiveValueFrequencyHistogramBucketsBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public Builder setSensitiveValueFrequencyHistogramBuckets(
-          int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket value) {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureSensitiveValueFrequencyHistogramBucketsIsMutable();
-          sensitiveValueFrequencyHistogramBuckets_.set(index, value);
-          onChanged();
-        } else {
-          sensitiveValueFrequencyHistogramBucketsBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public Builder setSensitiveValueFrequencyHistogramBuckets(
-          int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.Builder builderForValue) {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          ensureSensitiveValueFrequencyHistogramBucketsIsMutable();
-          sensitiveValueFrequencyHistogramBuckets_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          sensitiveValueFrequencyHistogramBucketsBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public Builder addSensitiveValueFrequencyHistogramBuckets(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket value) {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureSensitiveValueFrequencyHistogramBucketsIsMutable();
-          sensitiveValueFrequencyHistogramBuckets_.add(value);
-          onChanged();
-        } else {
-          sensitiveValueFrequencyHistogramBucketsBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public Builder addSensitiveValueFrequencyHistogramBuckets(
-          int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket value) {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureSensitiveValueFrequencyHistogramBucketsIsMutable();
-          sensitiveValueFrequencyHistogramBuckets_.add(index, value);
-          onChanged();
-        } else {
-          sensitiveValueFrequencyHistogramBucketsBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public Builder addSensitiveValueFrequencyHistogramBuckets(
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.Builder builderForValue) {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          ensureSensitiveValueFrequencyHistogramBucketsIsMutable();
-          sensitiveValueFrequencyHistogramBuckets_.add(builderForValue.build());
-          onChanged();
-        } else {
-          sensitiveValueFrequencyHistogramBucketsBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public Builder addSensitiveValueFrequencyHistogramBuckets(
-          int index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.Builder builderForValue) {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          ensureSensitiveValueFrequencyHistogramBucketsIsMutable();
-          sensitiveValueFrequencyHistogramBuckets_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          sensitiveValueFrequencyHistogramBucketsBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public Builder addAllSensitiveValueFrequencyHistogramBuckets(
-          java.lang.Iterable values) {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          ensureSensitiveValueFrequencyHistogramBucketsIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, sensitiveValueFrequencyHistogramBuckets_);
-          onChanged();
-        } else {
-          sensitiveValueFrequencyHistogramBucketsBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public Builder clearSensitiveValueFrequencyHistogramBuckets() {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          sensitiveValueFrequencyHistogramBuckets_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          sensitiveValueFrequencyHistogramBucketsBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public Builder removeSensitiveValueFrequencyHistogramBuckets(int index) {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          ensureSensitiveValueFrequencyHistogramBucketsIsMutable();
-          sensitiveValueFrequencyHistogramBuckets_.remove(index);
-          onChanged();
-        } else {
-          sensitiveValueFrequencyHistogramBucketsBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.Builder getSensitiveValueFrequencyHistogramBucketsBuilder(
-          int index) {
-        return getSensitiveValueFrequencyHistogramBucketsFieldBuilder().getBuilder(index);
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucketOrBuilder getSensitiveValueFrequencyHistogramBucketsOrBuilder(
-          int index) {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          return sensitiveValueFrequencyHistogramBuckets_.get(index);  } else {
-          return sensitiveValueFrequencyHistogramBucketsBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public java.util.List 
-           getSensitiveValueFrequencyHistogramBucketsOrBuilderList() {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ != null) {
-          return sensitiveValueFrequencyHistogramBucketsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(sensitiveValueFrequencyHistogramBuckets_);
-        }
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.Builder addSensitiveValueFrequencyHistogramBucketsBuilder() {
-        return getSensitiveValueFrequencyHistogramBucketsFieldBuilder().addBuilder(
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.getDefaultInstance());
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.Builder addSensitiveValueFrequencyHistogramBucketsBuilder(
-          int index) {
-        return getSensitiveValueFrequencyHistogramBucketsFieldBuilder().addBuilder(
-            index, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.getDefaultInstance());
-      }
-      /**
-       * 
-       * Histogram of l-diversity equivalence class sensitive value frequencies.
-       * 

-       *
-       * repeated .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-       */
-      public java.util.List 
-           getSensitiveValueFrequencyHistogramBucketsBuilderList() {
-        return getSensitiveValueFrequencyHistogramBucketsFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucketOrBuilder> 
-          getSensitiveValueFrequencyHistogramBucketsFieldBuilder() {
-        if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) {
-          sensitiveValueFrequencyHistogramBucketsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucket.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.LDiversityHistogramBucketOrBuilder>(
-                  sensitiveValueFrequencyHistogramBuckets_,
-                  ((bitField0_ & 0x00000001) == 0x00000001),
-                  getParentForChildren(),
-                  isClean());
-          sensitiveValueFrequencyHistogramBuckets_ = null;
-        }
-        return sensitiveValueFrequencyHistogramBucketsBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult)
-    private static final com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public LDiversityResult parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new LDiversityResult(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private int resultCase_ = 0;
-  private java.lang.Object result_;
-  public enum ResultCase
-      implements com.google.protobuf.Internal.EnumLite {
-    NUMERICAL_STATS_RESULT(3),
-    CATEGORICAL_STATS_RESULT(4),
-    K_ANONYMITY_RESULT(5),
-    L_DIVERSITY_RESULT(6),
-    RESULT_NOT_SET(0);
-    private final int value;
-    private ResultCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static ResultCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static ResultCase forNumber(int value) {
-      switch (value) {
-        case 3: return NUMERICAL_STATS_RESULT;
-        case 4: return CATEGORICAL_STATS_RESULT;
-        case 5: return K_ANONYMITY_RESULT;
-        case 6: return L_DIVERSITY_RESULT;
-        case 0: return RESULT_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public ResultCase
-  getResultCase() {
-    return ResultCase.forNumber(
-        resultCase_);
-  }
-
-  public static final int NUMERICAL_STATS_RESULT_FIELD_NUMBER = 3;
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-   */
-  public boolean hasNumericalStatsResult() {
-    return resultCase_ == 3;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult getNumericalStatsResult() {
-    if (resultCase_ == 3) {
-       return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) result_;
-    }
-    return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResultOrBuilder getNumericalStatsResultOrBuilder() {
-    if (resultCase_ == 3) {
-       return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) result_;
-    }
-    return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.getDefaultInstance();
-  }
-
-  public static final int CATEGORICAL_STATS_RESULT_FIELD_NUMBER = 4;
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-   */
-  public boolean hasCategoricalStatsResult() {
-    return resultCase_ == 4;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult getCategoricalStatsResult() {
-    if (resultCase_ == 4) {
-       return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) result_;
-    }
-    return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResultOrBuilder getCategoricalStatsResultOrBuilder() {
-    if (resultCase_ == 4) {
-       return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) result_;
-    }
-    return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.getDefaultInstance();
-  }
-
-  public static final int K_ANONYMITY_RESULT_FIELD_NUMBER = 5;
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-   */
-  public boolean hasKAnonymityResult() {
-    return resultCase_ == 5;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult getKAnonymityResult() {
-    if (resultCase_ == 5) {
-       return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) result_;
-    }
-    return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResultOrBuilder getKAnonymityResultOrBuilder() {
-    if (resultCase_ == 5) {
-       return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) result_;
-    }
-    return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.getDefaultInstance();
-  }
-
-  public static final int L_DIVERSITY_RESULT_FIELD_NUMBER = 6;
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-   */
-  public boolean hasLDiversityResult() {
-    return resultCase_ == 6;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-   */
-  public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult getLDiversityResult() {
-    if (resultCase_ == 6) {
-       return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) result_;
-    }
-    return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.getDefaultInstance();
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-   */
-  public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResultOrBuilder getLDiversityResultOrBuilder() {
-    if (resultCase_ == 6) {
-       return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) result_;
-    }
-    return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.getDefaultInstance();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (resultCase_ == 3) {
-      output.writeMessage(3, (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) result_);
-    }
-    if (resultCase_ == 4) {
-      output.writeMessage(4, (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) result_);
-    }
-    if (resultCase_ == 5) {
-      output.writeMessage(5, (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) result_);
-    }
-    if (resultCase_ == 6) {
-      output.writeMessage(6, (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) result_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (resultCase_ == 3) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) result_);
-    }
-    if (resultCase_ == 4) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) result_);
-    }
-    if (resultCase_ == 5) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) result_);
-    }
-    if (resultCase_ == 6) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(6, (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) result_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult other = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult) obj;
-
-    boolean result = true;
-    result = result && getResultCase().equals(
-        other.getResultCase());
-    if (!result) return false;
-    switch (resultCase_) {
-      case 3:
-        result = result && getNumericalStatsResult()
-            .equals(other.getNumericalStatsResult());
-        break;
-      case 4:
-        result = result && getCategoricalStatsResult()
-            .equals(other.getCategoricalStatsResult());
-        break;
-      case 5:
-        result = result && getKAnonymityResult()
-            .equals(other.getKAnonymityResult());
-        break;
-      case 6:
-        result = result && getLDiversityResult()
-            .equals(other.getLDiversityResult());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    switch (resultCase_) {
-      case 3:
-        hash = (37 * hash) + NUMERICAL_STATS_RESULT_FIELD_NUMBER;
-        hash = (53 * hash) + getNumericalStatsResult().hashCode();
-        break;
-      case 4:
-        hash = (37 * hash) + CATEGORICAL_STATS_RESULT_FIELD_NUMBER;
-        hash = (53 * hash) + getCategoricalStatsResult().hashCode();
-        break;
-      case 5:
-        hash = (37 * hash) + K_ANONYMITY_RESULT_FIELD_NUMBER;
-        hash = (53 * hash) + getKAnonymityResult().hashCode();
-        break;
-      case 6:
-        hash = (37 * hash) + L_DIVERSITY_RESULT_FIELD_NUMBER;
-        hash = (53 * hash) + getLDiversityResult().hashCode();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Result of a risk analysis
-   * [`Operation`](/dlp/docs/reference/rest/v2beta1/inspect.operations)
-   * request.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.RiskAnalysisOperationResult}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult)
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResultOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.class, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      resultCase_ = 0;
-      result_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_RiskAnalysisOperationResult_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult build() {
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult buildPartial() {
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult result = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult(this);
-      if (resultCase_ == 3) {
-        if (numericalStatsResultBuilder_ == null) {
-          result.result_ = result_;
-        } else {
-          result.result_ = numericalStatsResultBuilder_.build();
-        }
-      }
-      if (resultCase_ == 4) {
-        if (categoricalStatsResultBuilder_ == null) {
-          result.result_ = result_;
-        } else {
-          result.result_ = categoricalStatsResultBuilder_.build();
-        }
-      }
-      if (resultCase_ == 5) {
-        if (kAnonymityResultBuilder_ == null) {
-          result.result_ = result_;
-        } else {
-          result.result_ = kAnonymityResultBuilder_.build();
-        }
-      }
-      if (resultCase_ == 6) {
-        if (lDiversityResultBuilder_ == null) {
-          result.result_ = result_;
-        } else {
-          result.result_ = lDiversityResultBuilder_.build();
-        }
-      }
-      result.resultCase_ = resultCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult other) {
-      if (other == com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.getDefaultInstance()) return this;
-      switch (other.getResultCase()) {
-        case NUMERICAL_STATS_RESULT: {
-          mergeNumericalStatsResult(other.getNumericalStatsResult());
-          break;
-        }
-        case CATEGORICAL_STATS_RESULT: {
-          mergeCategoricalStatsResult(other.getCategoricalStatsResult());
-          break;
-        }
-        case K_ANONYMITY_RESULT: {
-          mergeKAnonymityResult(other.getKAnonymityResult());
-          break;
-        }
-        case L_DIVERSITY_RESULT: {
-          mergeLDiversityResult(other.getLDiversityResult());
-          break;
-        }
-        case RESULT_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int resultCase_ = 0;
-    private java.lang.Object result_;
-    public ResultCase
-        getResultCase() {
-      return ResultCase.forNumber(
-          resultCase_);
-    }
-
-    public Builder clearResult() {
-      resultCase_ = 0;
-      result_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResultOrBuilder> numericalStatsResultBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-     */
-    public boolean hasNumericalStatsResult() {
-      return resultCase_ == 3;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult getNumericalStatsResult() {
-      if (numericalStatsResultBuilder_ == null) {
-        if (resultCase_ == 3) {
-          return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) result_;
-        }
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.getDefaultInstance();
-      } else {
-        if (resultCase_ == 3) {
-          return numericalStatsResultBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-     */
-    public Builder setNumericalStatsResult(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult value) {
-      if (numericalStatsResultBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        result_ = value;
-        onChanged();
-      } else {
-        numericalStatsResultBuilder_.setMessage(value);
-      }
-      resultCase_ = 3;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-     */
-    public Builder setNumericalStatsResult(
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.Builder builderForValue) {
-      if (numericalStatsResultBuilder_ == null) {
-        result_ = builderForValue.build();
-        onChanged();
-      } else {
-        numericalStatsResultBuilder_.setMessage(builderForValue.build());
-      }
-      resultCase_ = 3;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-     */
-    public Builder mergeNumericalStatsResult(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult value) {
-      if (numericalStatsResultBuilder_ == null) {
-        if (resultCase_ == 3 &&
-            result_ != com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.getDefaultInstance()) {
-          result_ = com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.newBuilder((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) result_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          result_ = value;
-        }
-        onChanged();
-      } else {
-        if (resultCase_ == 3) {
-          numericalStatsResultBuilder_.mergeFrom(value);
-        }
-        numericalStatsResultBuilder_.setMessage(value);
-      }
-      resultCase_ = 3;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-     */
-    public Builder clearNumericalStatsResult() {
-      if (numericalStatsResultBuilder_ == null) {
-        if (resultCase_ == 3) {
-          resultCase_ = 0;
-          result_ = null;
-          onChanged();
-        }
-      } else {
-        if (resultCase_ == 3) {
-          resultCase_ = 0;
-          result_ = null;
-        }
-        numericalStatsResultBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.Builder getNumericalStatsResultBuilder() {
-      return getNumericalStatsResultFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResultOrBuilder getNumericalStatsResultOrBuilder() {
-      if ((resultCase_ == 3) && (numericalStatsResultBuilder_ != null)) {
-        return numericalStatsResultBuilder_.getMessageOrBuilder();
-      } else {
-        if (resultCase_ == 3) {
-          return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) result_;
-        }
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResultOrBuilder> 
-        getNumericalStatsResultFieldBuilder() {
-      if (numericalStatsResultBuilder_ == null) {
-        if (!(resultCase_ == 3)) {
-          result_ = com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.getDefaultInstance();
-        }
-        numericalStatsResultBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResultOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult) result_,
-                getParentForChildren(),
-                isClean());
-        result_ = null;
-      }
-      resultCase_ = 3;
-      onChanged();;
-      return numericalStatsResultBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResultOrBuilder> categoricalStatsResultBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-     */
-    public boolean hasCategoricalStatsResult() {
-      return resultCase_ == 4;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult getCategoricalStatsResult() {
-      if (categoricalStatsResultBuilder_ == null) {
-        if (resultCase_ == 4) {
-          return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) result_;
-        }
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.getDefaultInstance();
-      } else {
-        if (resultCase_ == 4) {
-          return categoricalStatsResultBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-     */
-    public Builder setCategoricalStatsResult(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult value) {
-      if (categoricalStatsResultBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        result_ = value;
-        onChanged();
-      } else {
-        categoricalStatsResultBuilder_.setMessage(value);
-      }
-      resultCase_ = 4;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-     */
-    public Builder setCategoricalStatsResult(
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.Builder builderForValue) {
-      if (categoricalStatsResultBuilder_ == null) {
-        result_ = builderForValue.build();
-        onChanged();
-      } else {
-        categoricalStatsResultBuilder_.setMessage(builderForValue.build());
-      }
-      resultCase_ = 4;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-     */
-    public Builder mergeCategoricalStatsResult(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult value) {
-      if (categoricalStatsResultBuilder_ == null) {
-        if (resultCase_ == 4 &&
-            result_ != com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.getDefaultInstance()) {
-          result_ = com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.newBuilder((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) result_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          result_ = value;
-        }
-        onChanged();
-      } else {
-        if (resultCase_ == 4) {
-          categoricalStatsResultBuilder_.mergeFrom(value);
-        }
-        categoricalStatsResultBuilder_.setMessage(value);
-      }
-      resultCase_ = 4;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-     */
-    public Builder clearCategoricalStatsResult() {
-      if (categoricalStatsResultBuilder_ == null) {
-        if (resultCase_ == 4) {
-          resultCase_ = 0;
-          result_ = null;
-          onChanged();
-        }
-      } else {
-        if (resultCase_ == 4) {
-          resultCase_ = 0;
-          result_ = null;
-        }
-        categoricalStatsResultBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.Builder getCategoricalStatsResultBuilder() {
-      return getCategoricalStatsResultFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResultOrBuilder getCategoricalStatsResultOrBuilder() {
-      if ((resultCase_ == 4) && (categoricalStatsResultBuilder_ != null)) {
-        return categoricalStatsResultBuilder_.getMessageOrBuilder();
-      } else {
-        if (resultCase_ == 4) {
-          return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) result_;
-        }
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResultOrBuilder> 
-        getCategoricalStatsResultFieldBuilder() {
-      if (categoricalStatsResultBuilder_ == null) {
-        if (!(resultCase_ == 4)) {
-          result_ = com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.getDefaultInstance();
-        }
-        categoricalStatsResultBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResultOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult) result_,
-                getParentForChildren(),
-                isClean());
-        result_ = null;
-      }
-      resultCase_ = 4;
-      onChanged();;
-      return categoricalStatsResultBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResultOrBuilder> kAnonymityResultBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-     */
-    public boolean hasKAnonymityResult() {
-      return resultCase_ == 5;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult getKAnonymityResult() {
-      if (kAnonymityResultBuilder_ == null) {
-        if (resultCase_ == 5) {
-          return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) result_;
-        }
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.getDefaultInstance();
-      } else {
-        if (resultCase_ == 5) {
-          return kAnonymityResultBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-     */
-    public Builder setKAnonymityResult(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult value) {
-      if (kAnonymityResultBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        result_ = value;
-        onChanged();
-      } else {
-        kAnonymityResultBuilder_.setMessage(value);
-      }
-      resultCase_ = 5;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-     */
-    public Builder setKAnonymityResult(
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.Builder builderForValue) {
-      if (kAnonymityResultBuilder_ == null) {
-        result_ = builderForValue.build();
-        onChanged();
-      } else {
-        kAnonymityResultBuilder_.setMessage(builderForValue.build());
-      }
-      resultCase_ = 5;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-     */
-    public Builder mergeKAnonymityResult(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult value) {
-      if (kAnonymityResultBuilder_ == null) {
-        if (resultCase_ == 5 &&
-            result_ != com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.getDefaultInstance()) {
-          result_ = com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.newBuilder((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) result_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          result_ = value;
-        }
-        onChanged();
-      } else {
-        if (resultCase_ == 5) {
-          kAnonymityResultBuilder_.mergeFrom(value);
-        }
-        kAnonymityResultBuilder_.setMessage(value);
-      }
-      resultCase_ = 5;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-     */
-    public Builder clearKAnonymityResult() {
-      if (kAnonymityResultBuilder_ == null) {
-        if (resultCase_ == 5) {
-          resultCase_ = 0;
-          result_ = null;
-          onChanged();
-        }
-      } else {
-        if (resultCase_ == 5) {
-          resultCase_ = 0;
-          result_ = null;
-        }
-        kAnonymityResultBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.Builder getKAnonymityResultBuilder() {
-      return getKAnonymityResultFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResultOrBuilder getKAnonymityResultOrBuilder() {
-      if ((resultCase_ == 5) && (kAnonymityResultBuilder_ != null)) {
-        return kAnonymityResultBuilder_.getMessageOrBuilder();
-      } else {
-        if (resultCase_ == 5) {
-          return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) result_;
-        }
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResultOrBuilder> 
-        getKAnonymityResultFieldBuilder() {
-      if (kAnonymityResultBuilder_ == null) {
-        if (!(resultCase_ == 5)) {
-          result_ = com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.getDefaultInstance();
-        }
-        kAnonymityResultBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResultOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult) result_,
-                getParentForChildren(),
-                isClean());
-        result_ = null;
-      }
-      resultCase_ = 5;
-      onChanged();;
-      return kAnonymityResultBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResultOrBuilder> lDiversityResultBuilder_;
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-     */
-    public boolean hasLDiversityResult() {
-      return resultCase_ == 6;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult getLDiversityResult() {
-      if (lDiversityResultBuilder_ == null) {
-        if (resultCase_ == 6) {
-          return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) result_;
-        }
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.getDefaultInstance();
-      } else {
-        if (resultCase_ == 6) {
-          return lDiversityResultBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-     */
-    public Builder setLDiversityResult(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult value) {
-      if (lDiversityResultBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        result_ = value;
-        onChanged();
-      } else {
-        lDiversityResultBuilder_.setMessage(value);
-      }
-      resultCase_ = 6;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-     */
-    public Builder setLDiversityResult(
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.Builder builderForValue) {
-      if (lDiversityResultBuilder_ == null) {
-        result_ = builderForValue.build();
-        onChanged();
-      } else {
-        lDiversityResultBuilder_.setMessage(builderForValue.build());
-      }
-      resultCase_ = 6;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-     */
-    public Builder mergeLDiversityResult(com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult value) {
-      if (lDiversityResultBuilder_ == null) {
-        if (resultCase_ == 6 &&
-            result_ != com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.getDefaultInstance()) {
-          result_ = com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.newBuilder((com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) result_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          result_ = value;
-        }
-        onChanged();
-      } else {
-        if (resultCase_ == 6) {
-          lDiversityResultBuilder_.mergeFrom(value);
-        }
-        lDiversityResultBuilder_.setMessage(value);
-      }
-      resultCase_ = 6;
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-     */
-    public Builder clearLDiversityResult() {
-      if (lDiversityResultBuilder_ == null) {
-        if (resultCase_ == 6) {
-          resultCase_ = 0;
-          result_ = null;
-          onChanged();
-        }
-      } else {
-        if (resultCase_ == 6) {
-          resultCase_ = 0;
-          result_ = null;
-        }
-        lDiversityResultBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.Builder getLDiversityResultBuilder() {
-      return getLDiversityResultFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResultOrBuilder getLDiversityResultOrBuilder() {
-      if ((resultCase_ == 6) && (lDiversityResultBuilder_ != null)) {
-        return lDiversityResultBuilder_.getMessageOrBuilder();
-      } else {
-        if (resultCase_ == 6) {
-          return (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) result_;
-        }
-        return com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResultOrBuilder> 
-        getLDiversityResultFieldBuilder() {
-      if (lDiversityResultBuilder_ == null) {
-        if (!(resultCase_ == 6)) {
-          result_ = com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.getDefaultInstance();
-        }
-        lDiversityResultBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult.Builder, com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResultOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult) result_,
-                getParentForChildren(),
-                isClean());
-        result_ = null;
-      }
-      resultCase_ = 6;
-      onChanged();;
-      return lDiversityResultBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult)
-  private static final com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public RiskAnalysisOperationResult parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RiskAnalysisOperationResult(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationResultOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationResultOrBuilder.java
deleted file mode 100644
index 2d2e02b5fae2..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/RiskAnalysisOperationResultOrBuilder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface RiskAnalysisOperationResultOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.RiskAnalysisOperationResult)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-   */
-  boolean hasNumericalStatsResult();
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-   */
-  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult getNumericalStatsResult();
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResult numerical_stats_result = 3;
-   */
-  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.NumericalStatsResultOrBuilder getNumericalStatsResultOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-   */
-  boolean hasCategoricalStatsResult();
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-   */
-  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult getCategoricalStatsResult();
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResult categorical_stats_result = 4;
-   */
-  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.CategoricalStatsResultOrBuilder getCategoricalStatsResultOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-   */
-  boolean hasKAnonymityResult();
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-   */
-  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult getKAnonymityResult();
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResult k_anonymity_result = 5;
-   */
-  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.KAnonymityResultOrBuilder getKAnonymityResultOrBuilder();
-
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-   */
-  boolean hasLDiversityResult();
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-   */
-  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult getLDiversityResult();
-  /**
-   * .google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResult l_diversity_result = 6;
-   */
-  com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.LDiversityResultOrBuilder getLDiversityResultOrBuilder();
-
-  public com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult.ResultCase getResultCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/StorageConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/StorageConfig.java
deleted file mode 100644
index 10b6a5044e1d..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/StorageConfig.java
+++ /dev/null
@@ -1,1221 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Shared message indicating Cloud storage type.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.StorageConfig}
- */
-public  final class StorageConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.StorageConfig)
-    StorageConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use StorageConfig.newBuilder() to construct.
-  private StorageConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private StorageConfig() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private StorageConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.DatastoreOptions.Builder subBuilder = null;
-            if (typeCase_ == 2) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.DatastoreOptions) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.DatastoreOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.DatastoreOptions) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 2;
-            break;
-          }
-          case 26: {
-            com.google.privacy.dlp.v2beta1.CloudStorageOptions.Builder subBuilder = null;
-            if (typeCase_ == 3) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.CloudStorageOptions) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.CloudStorageOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.CloudStorageOptions) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 3;
-            break;
-          }
-          case 34: {
-            com.google.privacy.dlp.v2beta1.BigQueryOptions.Builder subBuilder = null;
-            if (typeCase_ == 4) {
-              subBuilder = ((com.google.privacy.dlp.v2beta1.BigQueryOptions) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.privacy.dlp.v2beta1.BigQueryOptions.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.privacy.dlp.v2beta1.BigQueryOptions) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 4;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_StorageConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_StorageConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.StorageConfig.class, com.google.privacy.dlp.v2beta1.StorageConfig.Builder.class);
-  }
-
-  private int typeCase_ = 0;
-  private java.lang.Object type_;
-  public enum TypeCase
-      implements com.google.protobuf.Internal.EnumLite {
-    DATASTORE_OPTIONS(2),
-    CLOUD_STORAGE_OPTIONS(3),
-    BIG_QUERY_OPTIONS(4),
-    TYPE_NOT_SET(0);
-    private final int value;
-    private TypeCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static TypeCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static TypeCase forNumber(int value) {
-      switch (value) {
-        case 2: return DATASTORE_OPTIONS;
-        case 3: return CLOUD_STORAGE_OPTIONS;
-        case 4: return BIG_QUERY_OPTIONS;
-        case 0: return TYPE_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public TypeCase
-  getTypeCase() {
-    return TypeCase.forNumber(
-        typeCase_);
-  }
-
-  public static final int DATASTORE_OPTIONS_FIELD_NUMBER = 2;
-  /**
-   * 
-   * Google Cloud Datastore options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-   */
-  public boolean hasDatastoreOptions() {
-    return typeCase_ == 2;
-  }
-  /**
-   * 
-   * Google Cloud Datastore options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.DatastoreOptions getDatastoreOptions() {
-    if (typeCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.DatastoreOptions) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.DatastoreOptions.getDefaultInstance();
-  }
-  /**
-   * 
-   * Google Cloud Datastore options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.DatastoreOptionsOrBuilder getDatastoreOptionsOrBuilder() {
-    if (typeCase_ == 2) {
-       return (com.google.privacy.dlp.v2beta1.DatastoreOptions) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.DatastoreOptions.getDefaultInstance();
-  }
-
-  public static final int CLOUD_STORAGE_OPTIONS_FIELD_NUMBER = 3;
-  /**
-   * 
-   * Google Cloud Storage options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-   */
-  public boolean hasCloudStorageOptions() {
-    return typeCase_ == 3;
-  }
-  /**
-   * 
-   * Google Cloud Storage options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.CloudStorageOptions getCloudStorageOptions() {
-    if (typeCase_ == 3) {
-       return (com.google.privacy.dlp.v2beta1.CloudStorageOptions) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.CloudStorageOptions.getDefaultInstance();
-  }
-  /**
-   * 
-   * Google Cloud Storage options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.CloudStorageOptionsOrBuilder getCloudStorageOptionsOrBuilder() {
-    if (typeCase_ == 3) {
-       return (com.google.privacy.dlp.v2beta1.CloudStorageOptions) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.CloudStorageOptions.getDefaultInstance();
-  }
-
-  public static final int BIG_QUERY_OPTIONS_FIELD_NUMBER = 4;
-  /**
-   * 
-   * BigQuery options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-   */
-  public boolean hasBigQueryOptions() {
-    return typeCase_ == 4;
-  }
-  /**
-   * 
-   * BigQuery options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.BigQueryOptions getBigQueryOptions() {
-    if (typeCase_ == 4) {
-       return (com.google.privacy.dlp.v2beta1.BigQueryOptions) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.BigQueryOptions.getDefaultInstance();
-  }
-  /**
-   * 
-   * BigQuery options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.BigQueryOptionsOrBuilder getBigQueryOptionsOrBuilder() {
-    if (typeCase_ == 4) {
-       return (com.google.privacy.dlp.v2beta1.BigQueryOptions) type_;
-    }
-    return com.google.privacy.dlp.v2beta1.BigQueryOptions.getDefaultInstance();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (typeCase_ == 2) {
-      output.writeMessage(2, (com.google.privacy.dlp.v2beta1.DatastoreOptions) type_);
-    }
-    if (typeCase_ == 3) {
-      output.writeMessage(3, (com.google.privacy.dlp.v2beta1.CloudStorageOptions) type_);
-    }
-    if (typeCase_ == 4) {
-      output.writeMessage(4, (com.google.privacy.dlp.v2beta1.BigQueryOptions) type_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (typeCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, (com.google.privacy.dlp.v2beta1.DatastoreOptions) type_);
-    }
-    if (typeCase_ == 3) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, (com.google.privacy.dlp.v2beta1.CloudStorageOptions) type_);
-    }
-    if (typeCase_ == 4) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, (com.google.privacy.dlp.v2beta1.BigQueryOptions) type_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.StorageConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.StorageConfig other = (com.google.privacy.dlp.v2beta1.StorageConfig) obj;
-
-    boolean result = true;
-    result = result && getTypeCase().equals(
-        other.getTypeCase());
-    if (!result) return false;
-    switch (typeCase_) {
-      case 2:
-        result = result && getDatastoreOptions()
-            .equals(other.getDatastoreOptions());
-        break;
-      case 3:
-        result = result && getCloudStorageOptions()
-            .equals(other.getCloudStorageOptions());
-        break;
-      case 4:
-        result = result && getBigQueryOptions()
-            .equals(other.getBigQueryOptions());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    switch (typeCase_) {
-      case 2:
-        hash = (37 * hash) + DATASTORE_OPTIONS_FIELD_NUMBER;
-        hash = (53 * hash) + getDatastoreOptions().hashCode();
-        break;
-      case 3:
-        hash = (37 * hash) + CLOUD_STORAGE_OPTIONS_FIELD_NUMBER;
-        hash = (53 * hash) + getCloudStorageOptions().hashCode();
-        break;
-      case 4:
-        hash = (37 * hash) + BIG_QUERY_OPTIONS_FIELD_NUMBER;
-        hash = (53 * hash) + getBigQueryOptions().hashCode();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.StorageConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.StorageConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.StorageConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.StorageConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.StorageConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.StorageConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.StorageConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.StorageConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.StorageConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.StorageConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.StorageConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.StorageConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.StorageConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Shared message indicating Cloud storage type.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.StorageConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.StorageConfig)
-      com.google.privacy.dlp.v2beta1.StorageConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_StorageConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_StorageConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.StorageConfig.class, com.google.privacy.dlp.v2beta1.StorageConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.StorageConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      typeCase_ = 0;
-      type_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_StorageConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.StorageConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.StorageConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.StorageConfig build() {
-      com.google.privacy.dlp.v2beta1.StorageConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.StorageConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.StorageConfig result = new com.google.privacy.dlp.v2beta1.StorageConfig(this);
-      if (typeCase_ == 2) {
-        if (datastoreOptionsBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = datastoreOptionsBuilder_.build();
-        }
-      }
-      if (typeCase_ == 3) {
-        if (cloudStorageOptionsBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = cloudStorageOptionsBuilder_.build();
-        }
-      }
-      if (typeCase_ == 4) {
-        if (bigQueryOptionsBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = bigQueryOptionsBuilder_.build();
-        }
-      }
-      result.typeCase_ = typeCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.StorageConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.StorageConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.StorageConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.StorageConfig.getDefaultInstance()) return this;
-      switch (other.getTypeCase()) {
-        case DATASTORE_OPTIONS: {
-          mergeDatastoreOptions(other.getDatastoreOptions());
-          break;
-        }
-        case CLOUD_STORAGE_OPTIONS: {
-          mergeCloudStorageOptions(other.getCloudStorageOptions());
-          break;
-        }
-        case BIG_QUERY_OPTIONS: {
-          mergeBigQueryOptions(other.getBigQueryOptions());
-          break;
-        }
-        case TYPE_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.StorageConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.StorageConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int typeCase_ = 0;
-    private java.lang.Object type_;
-    public TypeCase
-        getTypeCase() {
-      return TypeCase.forNumber(
-          typeCase_);
-    }
-
-    public Builder clearType() {
-      typeCase_ = 0;
-      type_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.DatastoreOptions, com.google.privacy.dlp.v2beta1.DatastoreOptions.Builder, com.google.privacy.dlp.v2beta1.DatastoreOptionsOrBuilder> datastoreOptionsBuilder_;
-    /**
-     * 
-     * Google Cloud Datastore options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-     */
-    public boolean hasDatastoreOptions() {
-      return typeCase_ == 2;
-    }
-    /**
-     * 
-     * Google Cloud Datastore options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.DatastoreOptions getDatastoreOptions() {
-      if (datastoreOptionsBuilder_ == null) {
-        if (typeCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.DatastoreOptions) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.DatastoreOptions.getDefaultInstance();
-      } else {
-        if (typeCase_ == 2) {
-          return datastoreOptionsBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.DatastoreOptions.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Google Cloud Datastore options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-     */
-    public Builder setDatastoreOptions(com.google.privacy.dlp.v2beta1.DatastoreOptions value) {
-      if (datastoreOptionsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        datastoreOptionsBuilder_.setMessage(value);
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * 
-     * Google Cloud Datastore options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-     */
-    public Builder setDatastoreOptions(
-        com.google.privacy.dlp.v2beta1.DatastoreOptions.Builder builderForValue) {
-      if (datastoreOptionsBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        datastoreOptionsBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * 
-     * Google Cloud Datastore options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-     */
-    public Builder mergeDatastoreOptions(com.google.privacy.dlp.v2beta1.DatastoreOptions value) {
-      if (datastoreOptionsBuilder_ == null) {
-        if (typeCase_ == 2 &&
-            type_ != com.google.privacy.dlp.v2beta1.DatastoreOptions.getDefaultInstance()) {
-          type_ = com.google.privacy.dlp.v2beta1.DatastoreOptions.newBuilder((com.google.privacy.dlp.v2beta1.DatastoreOptions) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 2) {
-          datastoreOptionsBuilder_.mergeFrom(value);
-        }
-        datastoreOptionsBuilder_.setMessage(value);
-      }
-      typeCase_ = 2;
-      return this;
-    }
-    /**
-     * 
-     * Google Cloud Datastore options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-     */
-    public Builder clearDatastoreOptions() {
-      if (datastoreOptionsBuilder_ == null) {
-        if (typeCase_ == 2) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 2) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        datastoreOptionsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Google Cloud Datastore options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.DatastoreOptions.Builder getDatastoreOptionsBuilder() {
-      return getDatastoreOptionsFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Google Cloud Datastore options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.DatastoreOptionsOrBuilder getDatastoreOptionsOrBuilder() {
-      if ((typeCase_ == 2) && (datastoreOptionsBuilder_ != null)) {
-        return datastoreOptionsBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 2) {
-          return (com.google.privacy.dlp.v2beta1.DatastoreOptions) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.DatastoreOptions.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Google Cloud Datastore options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.DatastoreOptions, com.google.privacy.dlp.v2beta1.DatastoreOptions.Builder, com.google.privacy.dlp.v2beta1.DatastoreOptionsOrBuilder> 
-        getDatastoreOptionsFieldBuilder() {
-      if (datastoreOptionsBuilder_ == null) {
-        if (!(typeCase_ == 2)) {
-          type_ = com.google.privacy.dlp.v2beta1.DatastoreOptions.getDefaultInstance();
-        }
-        datastoreOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.DatastoreOptions, com.google.privacy.dlp.v2beta1.DatastoreOptions.Builder, com.google.privacy.dlp.v2beta1.DatastoreOptionsOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.DatastoreOptions) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 2;
-      onChanged();;
-      return datastoreOptionsBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CloudStorageOptions, com.google.privacy.dlp.v2beta1.CloudStorageOptions.Builder, com.google.privacy.dlp.v2beta1.CloudStorageOptionsOrBuilder> cloudStorageOptionsBuilder_;
-    /**
-     * 
-     * Google Cloud Storage options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-     */
-    public boolean hasCloudStorageOptions() {
-      return typeCase_ == 3;
-    }
-    /**
-     * 
-     * Google Cloud Storage options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.CloudStorageOptions getCloudStorageOptions() {
-      if (cloudStorageOptionsBuilder_ == null) {
-        if (typeCase_ == 3) {
-          return (com.google.privacy.dlp.v2beta1.CloudStorageOptions) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.CloudStorageOptions.getDefaultInstance();
-      } else {
-        if (typeCase_ == 3) {
-          return cloudStorageOptionsBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.CloudStorageOptions.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Google Cloud Storage options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-     */
-    public Builder setCloudStorageOptions(com.google.privacy.dlp.v2beta1.CloudStorageOptions value) {
-      if (cloudStorageOptionsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        cloudStorageOptionsBuilder_.setMessage(value);
-      }
-      typeCase_ = 3;
-      return this;
-    }
-    /**
-     * 
-     * Google Cloud Storage options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-     */
-    public Builder setCloudStorageOptions(
-        com.google.privacy.dlp.v2beta1.CloudStorageOptions.Builder builderForValue) {
-      if (cloudStorageOptionsBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        cloudStorageOptionsBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 3;
-      return this;
-    }
-    /**
-     * 
-     * Google Cloud Storage options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-     */
-    public Builder mergeCloudStorageOptions(com.google.privacy.dlp.v2beta1.CloudStorageOptions value) {
-      if (cloudStorageOptionsBuilder_ == null) {
-        if (typeCase_ == 3 &&
-            type_ != com.google.privacy.dlp.v2beta1.CloudStorageOptions.getDefaultInstance()) {
-          type_ = com.google.privacy.dlp.v2beta1.CloudStorageOptions.newBuilder((com.google.privacy.dlp.v2beta1.CloudStorageOptions) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 3) {
-          cloudStorageOptionsBuilder_.mergeFrom(value);
-        }
-        cloudStorageOptionsBuilder_.setMessage(value);
-      }
-      typeCase_ = 3;
-      return this;
-    }
-    /**
-     * 
-     * Google Cloud Storage options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-     */
-    public Builder clearCloudStorageOptions() {
-      if (cloudStorageOptionsBuilder_ == null) {
-        if (typeCase_ == 3) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 3) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        cloudStorageOptionsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * Google Cloud Storage options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.CloudStorageOptions.Builder getCloudStorageOptionsBuilder() {
-      return getCloudStorageOptionsFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Google Cloud Storage options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.CloudStorageOptionsOrBuilder getCloudStorageOptionsOrBuilder() {
-      if ((typeCase_ == 3) && (cloudStorageOptionsBuilder_ != null)) {
-        return cloudStorageOptionsBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 3) {
-          return (com.google.privacy.dlp.v2beta1.CloudStorageOptions) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.CloudStorageOptions.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * Google Cloud Storage options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.CloudStorageOptions, com.google.privacy.dlp.v2beta1.CloudStorageOptions.Builder, com.google.privacy.dlp.v2beta1.CloudStorageOptionsOrBuilder> 
-        getCloudStorageOptionsFieldBuilder() {
-      if (cloudStorageOptionsBuilder_ == null) {
-        if (!(typeCase_ == 3)) {
-          type_ = com.google.privacy.dlp.v2beta1.CloudStorageOptions.getDefaultInstance();
-        }
-        cloudStorageOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.CloudStorageOptions, com.google.privacy.dlp.v2beta1.CloudStorageOptions.Builder, com.google.privacy.dlp.v2beta1.CloudStorageOptionsOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.CloudStorageOptions) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 3;
-      onChanged();;
-      return cloudStorageOptionsBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BigQueryOptions, com.google.privacy.dlp.v2beta1.BigQueryOptions.Builder, com.google.privacy.dlp.v2beta1.BigQueryOptionsOrBuilder> bigQueryOptionsBuilder_;
-    /**
-     * 
-     * BigQuery options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-     */
-    public boolean hasBigQueryOptions() {
-      return typeCase_ == 4;
-    }
-    /**
-     * 
-     * BigQuery options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryOptions getBigQueryOptions() {
-      if (bigQueryOptionsBuilder_ == null) {
-        if (typeCase_ == 4) {
-          return (com.google.privacy.dlp.v2beta1.BigQueryOptions) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.BigQueryOptions.getDefaultInstance();
-      } else {
-        if (typeCase_ == 4) {
-          return bigQueryOptionsBuilder_.getMessage();
-        }
-        return com.google.privacy.dlp.v2beta1.BigQueryOptions.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * BigQuery options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-     */
-    public Builder setBigQueryOptions(com.google.privacy.dlp.v2beta1.BigQueryOptions value) {
-      if (bigQueryOptionsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        bigQueryOptionsBuilder_.setMessage(value);
-      }
-      typeCase_ = 4;
-      return this;
-    }
-    /**
-     * 
-     * BigQuery options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-     */
-    public Builder setBigQueryOptions(
-        com.google.privacy.dlp.v2beta1.BigQueryOptions.Builder builderForValue) {
-      if (bigQueryOptionsBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        bigQueryOptionsBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 4;
-      return this;
-    }
-    /**
-     * 
-     * BigQuery options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-     */
-    public Builder mergeBigQueryOptions(com.google.privacy.dlp.v2beta1.BigQueryOptions value) {
-      if (bigQueryOptionsBuilder_ == null) {
-        if (typeCase_ == 4 &&
-            type_ != com.google.privacy.dlp.v2beta1.BigQueryOptions.getDefaultInstance()) {
-          type_ = com.google.privacy.dlp.v2beta1.BigQueryOptions.newBuilder((com.google.privacy.dlp.v2beta1.BigQueryOptions) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 4) {
-          bigQueryOptionsBuilder_.mergeFrom(value);
-        }
-        bigQueryOptionsBuilder_.setMessage(value);
-      }
-      typeCase_ = 4;
-      return this;
-    }
-    /**
-     * 
-     * BigQuery options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-     */
-    public Builder clearBigQueryOptions() {
-      if (bigQueryOptionsBuilder_ == null) {
-        if (typeCase_ == 4) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 4) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        bigQueryOptionsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * BigQuery options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryOptions.Builder getBigQueryOptionsBuilder() {
-      return getBigQueryOptionsFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * BigQuery options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.BigQueryOptionsOrBuilder getBigQueryOptionsOrBuilder() {
-      if ((typeCase_ == 4) && (bigQueryOptionsBuilder_ != null)) {
-        return bigQueryOptionsBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 4) {
-          return (com.google.privacy.dlp.v2beta1.BigQueryOptions) type_;
-        }
-        return com.google.privacy.dlp.v2beta1.BigQueryOptions.getDefaultInstance();
-      }
-    }
-    /**
-     * 
-     * BigQuery options specification.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.BigQueryOptions, com.google.privacy.dlp.v2beta1.BigQueryOptions.Builder, com.google.privacy.dlp.v2beta1.BigQueryOptionsOrBuilder> 
-        getBigQueryOptionsFieldBuilder() {
-      if (bigQueryOptionsBuilder_ == null) {
-        if (!(typeCase_ == 4)) {
-          type_ = com.google.privacy.dlp.v2beta1.BigQueryOptions.getDefaultInstance();
-        }
-        bigQueryOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.BigQueryOptions, com.google.privacy.dlp.v2beta1.BigQueryOptions.Builder, com.google.privacy.dlp.v2beta1.BigQueryOptionsOrBuilder>(
-                (com.google.privacy.dlp.v2beta1.BigQueryOptions) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 4;
-      onChanged();;
-      return bigQueryOptionsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.StorageConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.StorageConfig)
-  private static final com.google.privacy.dlp.v2beta1.StorageConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.StorageConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.StorageConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public StorageConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StorageConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.StorageConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/StorageConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/StorageConfigOrBuilder.java
deleted file mode 100644
index 53f9479228b9..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/StorageConfigOrBuilder.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface StorageConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.StorageConfig)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Google Cloud Datastore options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-   */
-  boolean hasDatastoreOptions();
-  /**
-   * 
-   * Google Cloud Datastore options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-   */
-  com.google.privacy.dlp.v2beta1.DatastoreOptions getDatastoreOptions();
-  /**
-   * 
-   * Google Cloud Datastore options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.DatastoreOptions datastore_options = 2;
-   */
-  com.google.privacy.dlp.v2beta1.DatastoreOptionsOrBuilder getDatastoreOptionsOrBuilder();
-
-  /**
-   * 
-   * Google Cloud Storage options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-   */
-  boolean hasCloudStorageOptions();
-  /**
-   * 
-   * Google Cloud Storage options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-   */
-  com.google.privacy.dlp.v2beta1.CloudStorageOptions getCloudStorageOptions();
-  /**
-   * 
-   * Google Cloud Storage options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.CloudStorageOptions cloud_storage_options = 3;
-   */
-  com.google.privacy.dlp.v2beta1.CloudStorageOptionsOrBuilder getCloudStorageOptionsOrBuilder();
-
-  /**
-   * 
-   * BigQuery options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-   */
-  boolean hasBigQueryOptions();
-  /**
-   * 
-   * BigQuery options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-   */
-  com.google.privacy.dlp.v2beta1.BigQueryOptions getBigQueryOptions();
-  /**
-   * 
-   * BigQuery options specification.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.BigQueryOptions big_query_options = 4;
-   */
-  com.google.privacy.dlp.v2beta1.BigQueryOptionsOrBuilder getBigQueryOptionsOrBuilder();
-
-  public com.google.privacy.dlp.v2beta1.StorageConfig.TypeCase getTypeCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Table.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Table.java
deleted file mode 100644
index cf0e775e57ac..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Table.java
+++ /dev/null
@@ -1,1842 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Structured content to inspect. Up to 50,000 `Value`s per request allowed.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.Table}
- */
-public  final class Table extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.Table)
-    TableOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Table.newBuilder() to construct.
-  private Table(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private Table() {
-    headers_ = java.util.Collections.emptyList();
-    rows_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Table(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-              headers_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000001;
-            }
-            headers_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry));
-            break;
-          }
-          case 18: {
-            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              rows_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000002;
-            }
-            rows_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.Table.Row.parser(), extensionRegistry));
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-        headers_ = java.util.Collections.unmodifiableList(headers_);
-      }
-      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-        rows_ = java.util.Collections.unmodifiableList(rows_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Table_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Table_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.Table.class, com.google.privacy.dlp.v2beta1.Table.Builder.class);
-  }
-
-  public interface RowOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.Table.Row)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-     */
-    java.util.List 
-        getValuesList();
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-     */
-    com.google.privacy.dlp.v2beta1.Value getValues(int index);
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-     */
-    int getValuesCount();
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-     */
-    java.util.List 
-        getValuesOrBuilderList();
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-     */
-    com.google.privacy.dlp.v2beta1.ValueOrBuilder getValuesOrBuilder(
-        int index);
-  }
-  /**
-   * Protobuf type {@code google.privacy.dlp.v2beta1.Table.Row}
-   */
-  public  static final class Row extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.Table.Row)
-      RowOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use Row.newBuilder() to construct.
-    private Row(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private Row() {
-      values_ = java.util.Collections.emptyList();
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Row(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                values_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              values_.add(
-                  input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry));
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-          values_ = java.util.Collections.unmodifiableList(values_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Table_Row_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Table_Row_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.Table.Row.class, com.google.privacy.dlp.v2beta1.Table.Row.Builder.class);
-    }
-
-    public static final int VALUES_FIELD_NUMBER = 1;
-    private java.util.List values_;
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-     */
-    public java.util.List getValuesList() {
-      return values_;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-     */
-    public java.util.List 
-        getValuesOrBuilderList() {
-      return values_;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-     */
-    public int getValuesCount() {
-      return values_.size();
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Value getValues(int index) {
-      return values_.get(index);
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ValueOrBuilder getValuesOrBuilder(
-        int index) {
-      return values_.get(index);
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      for (int i = 0; i < values_.size(); i++) {
-        output.writeMessage(1, values_.get(i));
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < values_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, values_.get(i));
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.Table.Row)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.Table.Row other = (com.google.privacy.dlp.v2beta1.Table.Row) obj;
-
-      boolean result = true;
-      result = result && getValuesList()
-          .equals(other.getValuesList());
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      if (getValuesCount() > 0) {
-        hash = (37 * hash) + VALUES_FIELD_NUMBER;
-        hash = (53 * hash) + getValuesList().hashCode();
-      }
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.Table.Row parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.Table.Row parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.Table.Row parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.Table.Row parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.Table.Row parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.Table.Row parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.Table.Row parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.Table.Row parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.Table.Row parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.Table.Row parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.Table.Row parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.Table.Row parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.Table.Row prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code google.privacy.dlp.v2beta1.Table.Row}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.Table.Row)
-        com.google.privacy.dlp.v2beta1.Table.RowOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Table_Row_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Table_Row_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.Table.Row.class, com.google.privacy.dlp.v2beta1.Table.Row.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.Table.Row.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-          getValuesFieldBuilder();
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        if (valuesBuilder_ == null) {
-          values_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          valuesBuilder_.clear();
-        }
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Table_Row_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.Table.Row getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.Table.Row.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.Table.Row build() {
-        com.google.privacy.dlp.v2beta1.Table.Row result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.Table.Row buildPartial() {
-        com.google.privacy.dlp.v2beta1.Table.Row result = new com.google.privacy.dlp.v2beta1.Table.Row(this);
-        int from_bitField0_ = bitField0_;
-        if (valuesBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001)) {
-            values_ = java.util.Collections.unmodifiableList(values_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.values_ = values_;
-        } else {
-          result.values_ = valuesBuilder_.build();
-        }
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.Table.Row) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.Table.Row)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.Table.Row other) {
-        if (other == com.google.privacy.dlp.v2beta1.Table.Row.getDefaultInstance()) return this;
-        if (valuesBuilder_ == null) {
-          if (!other.values_.isEmpty()) {
-            if (values_.isEmpty()) {
-              values_ = other.values_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureValuesIsMutable();
-              values_.addAll(other.values_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.values_.isEmpty()) {
-            if (valuesBuilder_.isEmpty()) {
-              valuesBuilder_.dispose();
-              valuesBuilder_ = null;
-              values_ = other.values_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              valuesBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getValuesFieldBuilder() : null;
-            } else {
-              valuesBuilder_.addAllMessages(other.values_);
-            }
-          }
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.Table.Row parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.Table.Row) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List values_ =
-        java.util.Collections.emptyList();
-      private void ensureValuesIsMutable() {
-        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          values_ = new java.util.ArrayList(values_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> valuesBuilder_;
-
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public java.util.List getValuesList() {
-        if (valuesBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(values_);
-        } else {
-          return valuesBuilder_.getMessageList();
-        }
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public int getValuesCount() {
-        if (valuesBuilder_ == null) {
-          return values_.size();
-        } else {
-          return valuesBuilder_.getCount();
-        }
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.Value getValues(int index) {
-        if (valuesBuilder_ == null) {
-          return values_.get(index);
-        } else {
-          return valuesBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public Builder setValues(
-          int index, com.google.privacy.dlp.v2beta1.Value value) {
-        if (valuesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureValuesIsMutable();
-          values_.set(index, value);
-          onChanged();
-        } else {
-          valuesBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public Builder setValues(
-          int index, com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-        if (valuesBuilder_ == null) {
-          ensureValuesIsMutable();
-          values_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          valuesBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public Builder addValues(com.google.privacy.dlp.v2beta1.Value value) {
-        if (valuesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureValuesIsMutable();
-          values_.add(value);
-          onChanged();
-        } else {
-          valuesBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public Builder addValues(
-          int index, com.google.privacy.dlp.v2beta1.Value value) {
-        if (valuesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureValuesIsMutable();
-          values_.add(index, value);
-          onChanged();
-        } else {
-          valuesBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public Builder addValues(
-          com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-        if (valuesBuilder_ == null) {
-          ensureValuesIsMutable();
-          values_.add(builderForValue.build());
-          onChanged();
-        } else {
-          valuesBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public Builder addValues(
-          int index, com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-        if (valuesBuilder_ == null) {
-          ensureValuesIsMutable();
-          values_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          valuesBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public Builder addAllValues(
-          java.lang.Iterable values) {
-        if (valuesBuilder_ == null) {
-          ensureValuesIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, values_);
-          onChanged();
-        } else {
-          valuesBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public Builder clearValues() {
-        if (valuesBuilder_ == null) {
-          values_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          valuesBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public Builder removeValues(int index) {
-        if (valuesBuilder_ == null) {
-          ensureValuesIsMutable();
-          values_.remove(index);
-          onChanged();
-        } else {
-          valuesBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.Value.Builder getValuesBuilder(
-          int index) {
-        return getValuesFieldBuilder().getBuilder(index);
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.ValueOrBuilder getValuesOrBuilder(
-          int index) {
-        if (valuesBuilder_ == null) {
-          return values_.get(index);  } else {
-          return valuesBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public java.util.List 
-           getValuesOrBuilderList() {
-        if (valuesBuilder_ != null) {
-          return valuesBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(values_);
-        }
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.Value.Builder addValuesBuilder() {
-        return getValuesFieldBuilder().addBuilder(
-            com.google.privacy.dlp.v2beta1.Value.getDefaultInstance());
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public com.google.privacy.dlp.v2beta1.Value.Builder addValuesBuilder(
-          int index) {
-        return getValuesFieldBuilder().addBuilder(
-            index, com.google.privacy.dlp.v2beta1.Value.getDefaultInstance());
-      }
-      /**
-       * repeated .google.privacy.dlp.v2beta1.Value values = 1;
-       */
-      public java.util.List 
-           getValuesBuilderList() {
-        return getValuesFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-          getValuesFieldBuilder() {
-        if (valuesBuilder_ == null) {
-          valuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                  values_,
-                  ((bitField0_ & 0x00000001) == 0x00000001),
-                  getParentForChildren(),
-                  isClean());
-          values_ = null;
-        }
-        return valuesBuilder_;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.Table.Row)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.Table.Row)
-    private static final com.google.privacy.dlp.v2beta1.Table.Row DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.Table.Row();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.Table.Row getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public Row parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Row(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Table.Row getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  public static final int HEADERS_FIELD_NUMBER = 1;
-  private java.util.List headers_;
-  /**
-   * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-   */
-  public java.util.List getHeadersList() {
-    return headers_;
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-   */
-  public java.util.List 
-      getHeadersOrBuilderList() {
-    return headers_;
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-   */
-  public int getHeadersCount() {
-    return headers_.size();
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldId getHeaders(int index) {
-    return headers_.get(index);
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getHeadersOrBuilder(
-      int index) {
-    return headers_.get(index);
-  }
-
-  public static final int ROWS_FIELD_NUMBER = 2;
-  private java.util.List rows_;
-  /**
-   * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-   */
-  public java.util.List getRowsList() {
-    return rows_;
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-   */
-  public java.util.List 
-      getRowsOrBuilderList() {
-    return rows_;
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-   */
-  public int getRowsCount() {
-    return rows_.size();
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.Table.Row getRows(int index) {
-    return rows_.get(index);
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.Table.RowOrBuilder getRowsOrBuilder(
-      int index) {
-    return rows_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    for (int i = 0; i < headers_.size(); i++) {
-      output.writeMessage(1, headers_.get(i));
-    }
-    for (int i = 0; i < rows_.size(); i++) {
-      output.writeMessage(2, rows_.get(i));
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    for (int i = 0; i < headers_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, headers_.get(i));
-    }
-    for (int i = 0; i < rows_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, rows_.get(i));
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.Table)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.Table other = (com.google.privacy.dlp.v2beta1.Table) obj;
-
-    boolean result = true;
-    result = result && getHeadersList()
-        .equals(other.getHeadersList());
-    result = result && getRowsList()
-        .equals(other.getRowsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (getHeadersCount() > 0) {
-      hash = (37 * hash) + HEADERS_FIELD_NUMBER;
-      hash = (53 * hash) + getHeadersList().hashCode();
-    }
-    if (getRowsCount() > 0) {
-      hash = (37 * hash) + ROWS_FIELD_NUMBER;
-      hash = (53 * hash) + getRowsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Table parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Table parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Table parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Table parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Table parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Table parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Table parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Table parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Table parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Table parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Table parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Table parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.Table prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Structured content to inspect. Up to 50,000 `Value`s per request allowed.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.Table}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.Table)
-      com.google.privacy.dlp.v2beta1.TableOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Table_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Table_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.Table.class, com.google.privacy.dlp.v2beta1.Table.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.Table.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getHeadersFieldBuilder();
-        getRowsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (headersBuilder_ == null) {
-        headers_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-      } else {
-        headersBuilder_.clear();
-      }
-      if (rowsBuilder_ == null) {
-        rows_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-      } else {
-        rowsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Table_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Table getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.Table.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.Table build() {
-      com.google.privacy.dlp.v2beta1.Table result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Table buildPartial() {
-      com.google.privacy.dlp.v2beta1.Table result = new com.google.privacy.dlp.v2beta1.Table(this);
-      int from_bitField0_ = bitField0_;
-      if (headersBuilder_ == null) {
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          headers_ = java.util.Collections.unmodifiableList(headers_);
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.headers_ = headers_;
-      } else {
-        result.headers_ = headersBuilder_.build();
-      }
-      if (rowsBuilder_ == null) {
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          rows_ = java.util.Collections.unmodifiableList(rows_);
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.rows_ = rows_;
-      } else {
-        result.rows_ = rowsBuilder_.build();
-      }
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.Table) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.Table)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.Table other) {
-      if (other == com.google.privacy.dlp.v2beta1.Table.getDefaultInstance()) return this;
-      if (headersBuilder_ == null) {
-        if (!other.headers_.isEmpty()) {
-          if (headers_.isEmpty()) {
-            headers_ = other.headers_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureHeadersIsMutable();
-            headers_.addAll(other.headers_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.headers_.isEmpty()) {
-          if (headersBuilder_.isEmpty()) {
-            headersBuilder_.dispose();
-            headersBuilder_ = null;
-            headers_ = other.headers_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-            headersBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getHeadersFieldBuilder() : null;
-          } else {
-            headersBuilder_.addAllMessages(other.headers_);
-          }
-        }
-      }
-      if (rowsBuilder_ == null) {
-        if (!other.rows_.isEmpty()) {
-          if (rows_.isEmpty()) {
-            rows_ = other.rows_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureRowsIsMutable();
-            rows_.addAll(other.rows_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.rows_.isEmpty()) {
-          if (rowsBuilder_.isEmpty()) {
-            rowsBuilder_.dispose();
-            rowsBuilder_ = null;
-            rows_ = other.rows_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-            rowsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getRowsFieldBuilder() : null;
-          } else {
-            rowsBuilder_.addAllMessages(other.rows_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.Table parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.Table) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private java.util.List headers_ =
-      java.util.Collections.emptyList();
-    private void ensureHeadersIsMutable() {
-      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-        headers_ = new java.util.ArrayList(headers_);
-        bitField0_ |= 0x00000001;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> headersBuilder_;
-
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public java.util.List getHeadersList() {
-      if (headersBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(headers_);
-      } else {
-        return headersBuilder_.getMessageList();
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public int getHeadersCount() {
-      if (headersBuilder_ == null) {
-        return headers_.size();
-      } else {
-        return headersBuilder_.getCount();
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getHeaders(int index) {
-      if (headersBuilder_ == null) {
-        return headers_.get(index);
-      } else {
-        return headersBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public Builder setHeaders(
-        int index, com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (headersBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureHeadersIsMutable();
-        headers_.set(index, value);
-        onChanged();
-      } else {
-        headersBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public Builder setHeaders(
-        int index, com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (headersBuilder_ == null) {
-        ensureHeadersIsMutable();
-        headers_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        headersBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public Builder addHeaders(com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (headersBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureHeadersIsMutable();
-        headers_.add(value);
-        onChanged();
-      } else {
-        headersBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public Builder addHeaders(
-        int index, com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (headersBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureHeadersIsMutable();
-        headers_.add(index, value);
-        onChanged();
-      } else {
-        headersBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public Builder addHeaders(
-        com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (headersBuilder_ == null) {
-        ensureHeadersIsMutable();
-        headers_.add(builderForValue.build());
-        onChanged();
-      } else {
-        headersBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public Builder addHeaders(
-        int index, com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (headersBuilder_ == null) {
-        ensureHeadersIsMutable();
-        headers_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        headersBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public Builder addAllHeaders(
-        java.lang.Iterable values) {
-      if (headersBuilder_ == null) {
-        ensureHeadersIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, headers_);
-        onChanged();
-      } else {
-        headersBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public Builder clearHeaders() {
-      if (headersBuilder_ == null) {
-        headers_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-      } else {
-        headersBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public Builder removeHeaders(int index) {
-      if (headersBuilder_ == null) {
-        ensureHeadersIsMutable();
-        headers_.remove(index);
-        onChanged();
-      } else {
-        headersBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder getHeadersBuilder(
-        int index) {
-      return getHeadersFieldBuilder().getBuilder(index);
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getHeadersOrBuilder(
-        int index) {
-      if (headersBuilder_ == null) {
-        return headers_.get(index);  } else {
-        return headersBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public java.util.List 
-         getHeadersOrBuilderList() {
-      if (headersBuilder_ != null) {
-        return headersBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(headers_);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder addHeadersBuilder() {
-      return getHeadersFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance());
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder addHeadersBuilder(
-        int index) {
-      return getHeadersFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance());
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-     */
-    public java.util.List 
-         getHeadersBuilderList() {
-      return getHeadersFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-        getHeadersFieldBuilder() {
-      if (headersBuilder_ == null) {
-        headersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                headers_,
-                ((bitField0_ & 0x00000001) == 0x00000001),
-                getParentForChildren(),
-                isClean());
-        headers_ = null;
-      }
-      return headersBuilder_;
-    }
-
-    private java.util.List rows_ =
-      java.util.Collections.emptyList();
-    private void ensureRowsIsMutable() {
-      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-        rows_ = new java.util.ArrayList(rows_);
-        bitField0_ |= 0x00000002;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Table.Row, com.google.privacy.dlp.v2beta1.Table.Row.Builder, com.google.privacy.dlp.v2beta1.Table.RowOrBuilder> rowsBuilder_;
-
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public java.util.List getRowsList() {
-      if (rowsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(rows_);
-      } else {
-        return rowsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public int getRowsCount() {
-      if (rowsBuilder_ == null) {
-        return rows_.size();
-      } else {
-        return rowsBuilder_.getCount();
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Table.Row getRows(int index) {
-      if (rowsBuilder_ == null) {
-        return rows_.get(index);
-      } else {
-        return rowsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public Builder setRows(
-        int index, com.google.privacy.dlp.v2beta1.Table.Row value) {
-      if (rowsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureRowsIsMutable();
-        rows_.set(index, value);
-        onChanged();
-      } else {
-        rowsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public Builder setRows(
-        int index, com.google.privacy.dlp.v2beta1.Table.Row.Builder builderForValue) {
-      if (rowsBuilder_ == null) {
-        ensureRowsIsMutable();
-        rows_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        rowsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public Builder addRows(com.google.privacy.dlp.v2beta1.Table.Row value) {
-      if (rowsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureRowsIsMutable();
-        rows_.add(value);
-        onChanged();
-      } else {
-        rowsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public Builder addRows(
-        int index, com.google.privacy.dlp.v2beta1.Table.Row value) {
-      if (rowsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureRowsIsMutable();
-        rows_.add(index, value);
-        onChanged();
-      } else {
-        rowsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public Builder addRows(
-        com.google.privacy.dlp.v2beta1.Table.Row.Builder builderForValue) {
-      if (rowsBuilder_ == null) {
-        ensureRowsIsMutable();
-        rows_.add(builderForValue.build());
-        onChanged();
-      } else {
-        rowsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public Builder addRows(
-        int index, com.google.privacy.dlp.v2beta1.Table.Row.Builder builderForValue) {
-      if (rowsBuilder_ == null) {
-        ensureRowsIsMutable();
-        rows_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        rowsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public Builder addAllRows(
-        java.lang.Iterable values) {
-      if (rowsBuilder_ == null) {
-        ensureRowsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, rows_);
-        onChanged();
-      } else {
-        rowsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public Builder clearRows() {
-      if (rowsBuilder_ == null) {
-        rows_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-      } else {
-        rowsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public Builder removeRows(int index) {
-      if (rowsBuilder_ == null) {
-        ensureRowsIsMutable();
-        rows_.remove(index);
-        onChanged();
-      } else {
-        rowsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Table.Row.Builder getRowsBuilder(
-        int index) {
-      return getRowsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Table.RowOrBuilder getRowsOrBuilder(
-        int index) {
-      if (rowsBuilder_ == null) {
-        return rows_.get(index);  } else {
-        return rowsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public java.util.List 
-         getRowsOrBuilderList() {
-      if (rowsBuilder_ != null) {
-        return rowsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(rows_);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Table.Row.Builder addRowsBuilder() {
-      return getRowsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.Table.Row.getDefaultInstance());
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.Table.Row.Builder addRowsBuilder(
-        int index) {
-      return getRowsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.Table.Row.getDefaultInstance());
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-     */
-    public java.util.List 
-         getRowsBuilderList() {
-      return getRowsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Table.Row, com.google.privacy.dlp.v2beta1.Table.Row.Builder, com.google.privacy.dlp.v2beta1.Table.RowOrBuilder> 
-        getRowsFieldBuilder() {
-      if (rowsBuilder_ == null) {
-        rowsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Table.Row, com.google.privacy.dlp.v2beta1.Table.Row.Builder, com.google.privacy.dlp.v2beta1.Table.RowOrBuilder>(
-                rows_,
-                ((bitField0_ & 0x00000002) == 0x00000002),
-                getParentForChildren(),
-                isClean());
-        rows_ = null;
-      }
-      return rowsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.Table)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.Table)
-  private static final com.google.privacy.dlp.v2beta1.Table DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.Table();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Table getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser
() {
-    public Table parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Table(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser
 parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser
 getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.Table getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TableLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TableLocation.java
deleted file mode 100644
index 2cff7e41e7a0..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TableLocation.java
+++ /dev/null
@@ -1,472 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Location of a finding within a `ContentItem.Table`.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.TableLocation}
- */
-public  final class TableLocation extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.TableLocation)
-    TableLocationOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use TableLocation.newBuilder() to construct.
-  private TableLocation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private TableLocation() {
-    rowIndex_ = 0L;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private TableLocation(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-
-            rowIndex_ = input.readInt64();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TableLocation_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TableLocation_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.TableLocation.class, com.google.privacy.dlp.v2beta1.TableLocation.Builder.class);
-  }
-
-  public static final int ROW_INDEX_FIELD_NUMBER = 1;
-  private long rowIndex_;
-  /**
-   * 
-   * The zero-based index of the row where the finding is located.
-   * 

-   *
-   * int64 row_index = 1;
-   */
-  public long getRowIndex() {
-    return rowIndex_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (rowIndex_ != 0L) {
-      output.writeInt64(1, rowIndex_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (rowIndex_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(1, rowIndex_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.TableLocation)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.TableLocation other = (com.google.privacy.dlp.v2beta1.TableLocation) obj;
-
-    boolean result = true;
-    result = result && (getRowIndex()
-        == other.getRowIndex());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + ROW_INDEX_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getRowIndex());
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.TableLocation parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.TableLocation parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TableLocation parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.TableLocation parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TableLocation parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.TableLocation parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TableLocation parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.TableLocation parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TableLocation parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.TableLocation parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TableLocation parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.TableLocation parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.TableLocation prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Location of a finding within a `ContentItem.Table`.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.TableLocation}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.TableLocation)
-      com.google.privacy.dlp.v2beta1.TableLocationOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TableLocation_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TableLocation_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.TableLocation.class, com.google.privacy.dlp.v2beta1.TableLocation.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.TableLocation.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      rowIndex_ = 0L;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TableLocation_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.TableLocation getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.TableLocation.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.TableLocation build() {
-      com.google.privacy.dlp.v2beta1.TableLocation result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.TableLocation buildPartial() {
-      com.google.privacy.dlp.v2beta1.TableLocation result = new com.google.privacy.dlp.v2beta1.TableLocation(this);
-      result.rowIndex_ = rowIndex_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.TableLocation) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.TableLocation)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.TableLocation other) {
-      if (other == com.google.privacy.dlp.v2beta1.TableLocation.getDefaultInstance()) return this;
-      if (other.getRowIndex() != 0L) {
-        setRowIndex(other.getRowIndex());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.TableLocation parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.TableLocation) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private long rowIndex_ ;
-    /**
-     * 
-     * The zero-based index of the row where the finding is located.
-     * 

-     *
-     * int64 row_index = 1;
-     */
-    public long getRowIndex() {
-      return rowIndex_;
-    }
-    /**
-     * 
-     * The zero-based index of the row where the finding is located.
-     * 

-     *
-     * int64 row_index = 1;
-     */
-    public Builder setRowIndex(long value) {
-      
-      rowIndex_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The zero-based index of the row where the finding is located.
-     * 

-     *
-     * int64 row_index = 1;
-     */
-    public Builder clearRowIndex() {
-      
-      rowIndex_ = 0L;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.TableLocation)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.TableLocation)
-  private static final com.google.privacy.dlp.v2beta1.TableLocation DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.TableLocation();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.TableLocation getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public TableLocation parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TableLocation(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.TableLocation getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TableLocationOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TableLocationOrBuilder.java
deleted file mode 100644
index bf595a42da1a..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TableLocationOrBuilder.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface TableLocationOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.TableLocation)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The zero-based index of the row where the finding is located.
-   * 

-   *
-   * int64 row_index = 1;
-   */
-  long getRowIndex();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TableOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TableOrBuilder.java
deleted file mode 100644
index 8e376727779e..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TableOrBuilder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface TableOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.Table)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-   */
-  java.util.List 
-      getHeadersList();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-   */
-  com.google.privacy.dlp.v2beta1.FieldId getHeaders(int index);
-  /**
-   * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-   */
-  int getHeadersCount();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-   */
-  java.util.List 
-      getHeadersOrBuilderList();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.FieldId headers = 1;
-   */
-  com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getHeadersOrBuilder(
-      int index);
-
-  /**
-   * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-   */
-  java.util.List 
-      getRowsList();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-   */
-  com.google.privacy.dlp.v2beta1.Table.Row getRows(int index);
-  /**
-   * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-   */
-  int getRowsCount();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-   */
-  java.util.List 
-      getRowsOrBuilderList();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.Table.Row rows = 2;
-   */
-  com.google.privacy.dlp.v2beta1.Table.RowOrBuilder getRowsOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TimePartConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TimePartConfig.java
deleted file mode 100644
index 4e7934f44e54..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TimePartConfig.java
+++ /dev/null
@@ -1,673 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * For use with `Date`, `Timestamp`, and `TimeOfDay`, extract or preserve a
- * portion of the value.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.TimePartConfig}
- */
-public  final class TimePartConfig extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.TimePartConfig)
-    TimePartConfigOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use TimePartConfig.newBuilder() to construct.
-  private TimePartConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private TimePartConfig() {
-    partToExtract_ = 0;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private TimePartConfig(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            int rawValue = input.readEnum();
-
-            partToExtract_ = rawValue;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TimePartConfig_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TimePartConfig_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.TimePartConfig.class, com.google.privacy.dlp.v2beta1.TimePartConfig.Builder.class);
-  }
-
-  /**
-   * Protobuf enum {@code google.privacy.dlp.v2beta1.TimePartConfig.TimePart}
-   */
-  public enum TimePart
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * TIME_PART_UNSPECIFIED = 0;
-     */
-    TIME_PART_UNSPECIFIED(0),
-    /**
-     * 
-     * [000-9999]
-     * 

-     *
-     * YEAR = 1;
-     */
-    YEAR(1),
-    /**
-     * 
-     * [1-12]
-     * 

-     *
-     * MONTH = 2;
-     */
-    MONTH(2),
-    /**
-     * 
-     * [1-31]
-     * 

-     *
-     * DAY_OF_MONTH = 3;
-     */
-    DAY_OF_MONTH(3),
-    /**
-     * 
-     * [1-7]
-     * 

-     *
-     * DAY_OF_WEEK = 4;
-     */
-    DAY_OF_WEEK(4),
-    /**
-     * 
-     * [1-52]
-     * 

-     *
-     * WEEK_OF_YEAR = 5;
-     */
-    WEEK_OF_YEAR(5),
-    /**
-     * 
-     * [0-24]
-     * 

-     *
-     * HOUR_OF_DAY = 6;
-     */
-    HOUR_OF_DAY(6),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * TIME_PART_UNSPECIFIED = 0;
-     */
-    public static final int TIME_PART_UNSPECIFIED_VALUE = 0;
-    /**
-     * 
-     * [000-9999]
-     * 

-     *
-     * YEAR = 1;
-     */
-    public static final int YEAR_VALUE = 1;
-    /**
-     * 
-     * [1-12]
-     * 

-     *
-     * MONTH = 2;
-     */
-    public static final int MONTH_VALUE = 2;
-    /**
-     * 
-     * [1-31]
-     * 

-     *
-     * DAY_OF_MONTH = 3;
-     */
-    public static final int DAY_OF_MONTH_VALUE = 3;
-    /**
-     * 
-     * [1-7]
-     * 

-     *
-     * DAY_OF_WEEK = 4;
-     */
-    public static final int DAY_OF_WEEK_VALUE = 4;
-    /**
-     * 
-     * [1-52]
-     * 

-     *
-     * WEEK_OF_YEAR = 5;
-     */
-    public static final int WEEK_OF_YEAR_VALUE = 5;
-    /**
-     * 
-     * [0-24]
-     * 

-     *
-     * HOUR_OF_DAY = 6;
-     */
-    public static final int HOUR_OF_DAY_VALUE = 6;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static TimePart valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static TimePart forNumber(int value) {
-      switch (value) {
-        case 0: return TIME_PART_UNSPECIFIED;
-        case 1: return YEAR;
-        case 2: return MONTH;
-        case 3: return DAY_OF_MONTH;
-        case 4: return DAY_OF_WEEK;
-        case 5: return WEEK_OF_YEAR;
-        case 6: return HOUR_OF_DAY;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        TimePart> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap() {
-            public TimePart findValueByNumber(int number) {
-              return TimePart.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.TimePartConfig.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final TimePart[] VALUES = values();
-
-    public static TimePart valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private TimePart(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:google.privacy.dlp.v2beta1.TimePartConfig.TimePart)
-  }
-
-  public static final int PART_TO_EXTRACT_FIELD_NUMBER = 1;
-  private int partToExtract_;
-  /**
-   * .google.privacy.dlp.v2beta1.TimePartConfig.TimePart part_to_extract = 1;
-   */
-  public int getPartToExtractValue() {
-    return partToExtract_;
-  }
-  /**
-   * .google.privacy.dlp.v2beta1.TimePartConfig.TimePart part_to_extract = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.TimePartConfig.TimePart getPartToExtract() {
-    com.google.privacy.dlp.v2beta1.TimePartConfig.TimePart result = com.google.privacy.dlp.v2beta1.TimePartConfig.TimePart.valueOf(partToExtract_);
-    return result == null ? com.google.privacy.dlp.v2beta1.TimePartConfig.TimePart.UNRECOGNIZED : result;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (partToExtract_ != com.google.privacy.dlp.v2beta1.TimePartConfig.TimePart.TIME_PART_UNSPECIFIED.getNumber()) {
-      output.writeEnum(1, partToExtract_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (partToExtract_ != com.google.privacy.dlp.v2beta1.TimePartConfig.TimePart.TIME_PART_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, partToExtract_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.TimePartConfig)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.TimePartConfig other = (com.google.privacy.dlp.v2beta1.TimePartConfig) obj;
-
-    boolean result = true;
-    result = result && partToExtract_ == other.partToExtract_;
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + PART_TO_EXTRACT_FIELD_NUMBER;
-    hash = (53 * hash) + partToExtract_;
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.TimePartConfig prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * For use with `Date`, `Timestamp`, and `TimeOfDay`, extract or preserve a
-   * portion of the value.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.TimePartConfig}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.TimePartConfig)
-      com.google.privacy.dlp.v2beta1.TimePartConfigOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TimePartConfig_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TimePartConfig_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.TimePartConfig.class, com.google.privacy.dlp.v2beta1.TimePartConfig.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.TimePartConfig.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      partToExtract_ = 0;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TimePartConfig_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.TimePartConfig getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.TimePartConfig.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.TimePartConfig build() {
-      com.google.privacy.dlp.v2beta1.TimePartConfig result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.TimePartConfig buildPartial() {
-      com.google.privacy.dlp.v2beta1.TimePartConfig result = new com.google.privacy.dlp.v2beta1.TimePartConfig(this);
-      result.partToExtract_ = partToExtract_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.TimePartConfig) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.TimePartConfig)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.TimePartConfig other) {
-      if (other == com.google.privacy.dlp.v2beta1.TimePartConfig.getDefaultInstance()) return this;
-      if (other.partToExtract_ != 0) {
-        setPartToExtractValue(other.getPartToExtractValue());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.TimePartConfig parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.TimePartConfig) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private int partToExtract_ = 0;
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig.TimePart part_to_extract = 1;
-     */
-    public int getPartToExtractValue() {
-      return partToExtract_;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig.TimePart part_to_extract = 1;
-     */
-    public Builder setPartToExtractValue(int value) {
-      partToExtract_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig.TimePart part_to_extract = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.TimePartConfig.TimePart getPartToExtract() {
-      com.google.privacy.dlp.v2beta1.TimePartConfig.TimePart result = com.google.privacy.dlp.v2beta1.TimePartConfig.TimePart.valueOf(partToExtract_);
-      return result == null ? com.google.privacy.dlp.v2beta1.TimePartConfig.TimePart.UNRECOGNIZED : result;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig.TimePart part_to_extract = 1;
-     */
-    public Builder setPartToExtract(com.google.privacy.dlp.v2beta1.TimePartConfig.TimePart value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      
-      partToExtract_ = value.getNumber();
-      onChanged();
-      return this;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TimePartConfig.TimePart part_to_extract = 1;
-     */
-    public Builder clearPartToExtract() {
-      
-      partToExtract_ = 0;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.TimePartConfig)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.TimePartConfig)
-  private static final com.google.privacy.dlp.v2beta1.TimePartConfig DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.TimePartConfig();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.TimePartConfig getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public TimePartConfig parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TimePartConfig(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.TimePartConfig getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TimePartConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TimePartConfigOrBuilder.java
deleted file mode 100644
index 2195c30a96c5..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TimePartConfigOrBuilder.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface TimePartConfigOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.TimePartConfig)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * .google.privacy.dlp.v2beta1.TimePartConfig.TimePart part_to_extract = 1;
-   */
-  int getPartToExtractValue();
-  /**
-   * .google.privacy.dlp.v2beta1.TimePartConfig.TimePart part_to_extract = 1;
-   */
-  com.google.privacy.dlp.v2beta1.TimePartConfig.TimePart getPartToExtract();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransformationSummary.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransformationSummary.java
deleted file mode 100644
index 4f263250a028..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransformationSummary.java
+++ /dev/null
@@ -1,2966 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Summary of a single tranformation.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.TransformationSummary}
- */
-public  final class TransformationSummary extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.TransformationSummary)
-    TransformationSummaryOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use TransformationSummary.newBuilder() to construct.
-  private TransformationSummary(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private TransformationSummary() {
-    fieldTransformations_ = java.util.Collections.emptyList();
-    results_ = java.util.Collections.emptyList();
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private TransformationSummary(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.InfoType.Builder subBuilder = null;
-            if (infoType_ != null) {
-              subBuilder = infoType_.toBuilder();
-            }
-            infoType_ = input.readMessage(com.google.privacy.dlp.v2beta1.InfoType.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(infoType_);
-              infoType_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 18: {
-            com.google.privacy.dlp.v2beta1.FieldId.Builder subBuilder = null;
-            if (field_ != null) {
-              subBuilder = field_.toBuilder();
-            }
-            field_ = input.readMessage(com.google.privacy.dlp.v2beta1.FieldId.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(field_);
-              field_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 26: {
-            com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder subBuilder = null;
-            if (transformation_ != null) {
-              subBuilder = transformation_.toBuilder();
-            }
-            transformation_ = input.readMessage(com.google.privacy.dlp.v2beta1.PrimitiveTransformation.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(transformation_);
-              transformation_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 34: {
-            if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-              results_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000020;
-            }
-            results_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.parser(), extensionRegistry));
-            break;
-          }
-          case 42: {
-            if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-              fieldTransformations_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000008;
-            }
-            fieldTransformations_.add(
-                input.readMessage(com.google.privacy.dlp.v2beta1.FieldTransformation.parser(), extensionRegistry));
-            break;
-          }
-          case 50: {
-            com.google.privacy.dlp.v2beta1.RecordSuppression.Builder subBuilder = null;
-            if (recordSuppress_ != null) {
-              subBuilder = recordSuppress_.toBuilder();
-            }
-            recordSuppress_ = input.readMessage(com.google.privacy.dlp.v2beta1.RecordSuppression.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(recordSuppress_);
-              recordSuppress_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-        results_ = java.util.Collections.unmodifiableList(results_);
-      }
-      if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-        fieldTransformations_ = java.util.Collections.unmodifiableList(fieldTransformations_);
-      }
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransformationSummary_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransformationSummary_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.TransformationSummary.class, com.google.privacy.dlp.v2beta1.TransformationSummary.Builder.class);
-  }
-
-  /**
-   * 
-   * Possible outcomes of transformations.
-   * 

-   *
-   * Protobuf enum {@code google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode}
-   */
-  public enum TransformationResultCode
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * TRANSFORMATION_RESULT_CODE_UNSPECIFIED = 0;
-     */
-    TRANSFORMATION_RESULT_CODE_UNSPECIFIED(0),
-    /**
-     * SUCCESS = 1;
-     */
-    SUCCESS(1),
-    /**
-     * ERROR = 2;
-     */
-    ERROR(2),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * TRANSFORMATION_RESULT_CODE_UNSPECIFIED = 0;
-     */
-    public static final int TRANSFORMATION_RESULT_CODE_UNSPECIFIED_VALUE = 0;
-    /**
-     * SUCCESS = 1;
-     */
-    public static final int SUCCESS_VALUE = 1;
-    /**
-     * ERROR = 2;
-     */
-    public static final int ERROR_VALUE = 2;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static TransformationResultCode valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static TransformationResultCode forNumber(int value) {
-      switch (value) {
-        case 0: return TRANSFORMATION_RESULT_CODE_UNSPECIFIED;
-        case 1: return SUCCESS;
-        case 2: return ERROR;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        TransformationResultCode> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap() {
-            public TransformationResultCode findValueByNumber(int number) {
-              return TransformationResultCode.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.TransformationSummary.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final TransformationResultCode[] VALUES = values();
-
-    public static TransformationResultCode valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private TransformationResultCode(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode)
-  }
-
-  public interface SummaryResultOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * int64 count = 1;
-     */
-    long getCount();
-
-    /**
-     * .google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode code = 2;
-     */
-    int getCodeValue();
-    /**
-     * .google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode code = 2;
-     */
-    com.google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode getCode();
-
-    /**
-     * 
-     * A place for warnings or errors to show up if a transformation didn't
-     * work as expected.
-     * 

-     *
-     * string details = 3;
-     */
-    java.lang.String getDetails();
-    /**
-     * 
-     * A place for warnings or errors to show up if a transformation didn't
-     * work as expected.
-     * 

-     *
-     * string details = 3;
-     */
-    com.google.protobuf.ByteString
-        getDetailsBytes();
-  }
-  /**
-   * 
-   * A collection that informs the user the number of times a particular
-   * `TransformationResultCode` and error details occurred.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult}
-   */
-  public  static final class SummaryResult extends
-      com.google.protobuf.GeneratedMessageV3 implements
-      // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult)
-      SummaryResultOrBuilder {
-  private static final long serialVersionUID = 0L;
-    // Use SummaryResult.newBuilder() to construct.
-    private SummaryResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-      super(builder);
-    }
-    private SummaryResult() {
-      count_ = 0L;
-      code_ = 0;
-      details_ = "";
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-    getUnknownFields() {
-      return this.unknownFields;
-    }
-    private SummaryResult(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 8: {
-
-              count_ = input.readInt64();
-              break;
-            }
-            case 16: {
-              int rawValue = input.readEnum();
-
-              code_ = rawValue;
-              break;
-            }
-            case 26: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              details_ = s;
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransformationSummary_SummaryResult_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransformationSummary_SummaryResult_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.class, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.Builder.class);
-    }
-
-    public static final int COUNT_FIELD_NUMBER = 1;
-    private long count_;
-    /**
-     * int64 count = 1;
-     */
-    public long getCount() {
-      return count_;
-    }
-
-    public static final int CODE_FIELD_NUMBER = 2;
-    private int code_;
-    /**
-     * .google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode code = 2;
-     */
-    public int getCodeValue() {
-      return code_;
-    }
-    /**
-     * .google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode code = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode getCode() {
-      com.google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode result = com.google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode.valueOf(code_);
-      return result == null ? com.google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode.UNRECOGNIZED : result;
-    }
-
-    public static final int DETAILS_FIELD_NUMBER = 3;
-    private volatile java.lang.Object details_;
-    /**
-     * 
-     * A place for warnings or errors to show up if a transformation didn't
-     * work as expected.
-     * 

-     *
-     * string details = 3;
-     */
-    public java.lang.String getDetails() {
-      java.lang.Object ref = details_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        details_ = s;
-        return s;
-      }
-    }
-    /**
-     * 
-     * A place for warnings or errors to show up if a transformation didn't
-     * work as expected.
-     * 

-     *
-     * string details = 3;
-     */
-    public com.google.protobuf.ByteString
-        getDetailsBytes() {
-      java.lang.Object ref = details_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        details_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      if (count_ != 0L) {
-        output.writeInt64(1, count_);
-      }
-      if (code_ != com.google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode.TRANSFORMATION_RESULT_CODE_UNSPECIFIED.getNumber()) {
-        output.writeEnum(2, code_);
-      }
-      if (!getDetailsBytes().isEmpty()) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, details_);
-      }
-      unknownFields.writeTo(output);
-    }
-
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (count_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt64Size(1, count_);
-      }
-      if (code_ != com.google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode.TRANSFORMATION_RESULT_CODE_UNSPECIFIED.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(2, code_);
-      }
-      if (!getDetailsBytes().isEmpty()) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, details_);
-      }
-      size += unknownFields.getSerializedSize();
-      memoizedSize = size;
-      return size;
-    }
-
-    @java.lang.Override
-    public boolean equals(final java.lang.Object obj) {
-      if (obj == this) {
-       return true;
-      }
-      if (!(obj instanceof com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult)) {
-        return super.equals(obj);
-      }
-      com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult other = (com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult) obj;
-
-      boolean result = true;
-      result = result && (getCount()
-          == other.getCount());
-      result = result && code_ == other.code_;
-      result = result && getDetails()
-          .equals(other.getDetails());
-      result = result && unknownFields.equals(other.unknownFields);
-      return result;
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-      if (memoizedHashCode != 0) {
-        return memoizedHashCode;
-      }
-      int hash = 41;
-      hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + COUNT_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getCount());
-      hash = (37 * hash) + CODE_FIELD_NUMBER;
-      hash = (53 * hash) + code_;
-      hash = (37 * hash) + DETAILS_FIELD_NUMBER;
-      hash = (53 * hash) + getDetails().hashCode();
-      hash = (29 * hash) + unknownFields.hashCode();
-      memoizedHashCode = hash;
-      return hash;
-    }
-
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-    }
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
-    }
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
-    }
-
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder() {
-      return DEFAULT_INSTANCE.toBuilder();
-    }
-    public static Builder newBuilder(com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult prototype) {
-      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * 
-     * A collection that informs the user the number of times a particular
-     * `TransformationResultCode` and error details occurred.
-     * 

-     *
-     * Protobuf type {@code google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder implements
-        // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult)
-        com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResultOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransformationSummary_SummaryResult_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransformationSummary_SummaryResult_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.class, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.Builder.class);
-      }
-
-      // Construct using com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3
-                .alwaysUseFieldBuilders) {
-        }
-      }
-      public Builder clear() {
-        super.clear();
-        count_ = 0L;
-
-        code_ = 0;
-
-        details_ = "";
-
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransformationSummary_SummaryResult_descriptor;
-      }
-
-      public com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult getDefaultInstanceForType() {
-        return com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.getDefaultInstance();
-      }
-
-      public com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult build() {
-        com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult buildPartial() {
-        com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult result = new com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult(this);
-        result.count_ = count_;
-        result.code_ = code_;
-        result.details_ = details_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder clone() {
-        return (Builder) super.clone();
-      }
-      public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.setField(field, value);
-      }
-      public Builder clearField(
-          com.google.protobuf.Descriptors.FieldDescriptor field) {
-        return (Builder) super.clearField(field);
-      }
-      public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-        return (Builder) super.clearOneof(oneof);
-      }
-      public Builder setRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, java.lang.Object value) {
-        return (Builder) super.setRepeatedField(field, index, value);
-      }
-      public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
-        return (Builder) super.addRepeatedField(field, value);
-      }
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult) {
-          return mergeFrom((com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult other) {
-        if (other == com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.getDefaultInstance()) return this;
-        if (other.getCount() != 0L) {
-          setCount(other.getCount());
-        }
-        if (other.code_ != 0) {
-          setCodeValue(other.getCodeValue());
-        }
-        if (!other.getDetails().isEmpty()) {
-          details_ = other.details_;
-          onChanged();
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-
-      private long count_ ;
-      /**
-       * int64 count = 1;
-       */
-      public long getCount() {
-        return count_;
-      }
-      /**
-       * int64 count = 1;
-       */
-      public Builder setCount(long value) {
-        
-        count_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * int64 count = 1;
-       */
-      public Builder clearCount() {
-        
-        count_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private int code_ = 0;
-      /**
-       * .google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode code = 2;
-       */
-      public int getCodeValue() {
-        return code_;
-      }
-      /**
-       * .google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode code = 2;
-       */
-      public Builder setCodeValue(int value) {
-        code_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * .google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode code = 2;
-       */
-      public com.google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode getCode() {
-        com.google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode result = com.google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode.valueOf(code_);
-        return result == null ? com.google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode.UNRECOGNIZED : result;
-      }
-      /**
-       * .google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode code = 2;
-       */
-      public Builder setCode(com.google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        code_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * .google.privacy.dlp.v2beta1.TransformationSummary.TransformationResultCode code = 2;
-       */
-      public Builder clearCode() {
-        
-        code_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object details_ = "";
-      /**
-       * 
-       * A place for warnings or errors to show up if a transformation didn't
-       * work as expected.
-       * 

-       *
-       * string details = 3;
-       */
-      public java.lang.String getDetails() {
-        java.lang.Object ref = details_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          details_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * 
-       * A place for warnings or errors to show up if a transformation didn't
-       * work as expected.
-       * 

-       *
-       * string details = 3;
-       */
-      public com.google.protobuf.ByteString
-          getDetailsBytes() {
-        java.lang.Object ref = details_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          details_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * 
-       * A place for warnings or errors to show up if a transformation didn't
-       * work as expected.
-       * 

-       *
-       * string details = 3;
-       */
-      public Builder setDetails(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        details_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * A place for warnings or errors to show up if a transformation didn't
-       * work as expected.
-       * 

-       *
-       * string details = 3;
-       */
-      public Builder clearDetails() {
-        
-        details_ = getDefaultInstance().getDetails();
-        onChanged();
-        return this;
-      }
-      /**
-       * 
-       * A place for warnings or errors to show up if a transformation didn't
-       * work as expected.
-       * 

-       *
-       * string details = 3;
-       */
-      public Builder setDetailsBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        details_ = value;
-        onChanged();
-        return this;
-      }
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.setUnknownFieldsProto3(unknownFields);
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return super.mergeUnknownFields(unknownFields);
-      }
-
-
-      // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult)
-    }
-
-    // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult)
-    private static final com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult DEFAULT_INSTANCE;
-    static {
-      DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult();
-    }
-
-    public static com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult getDefaultInstance() {
-      return DEFAULT_INSTANCE;
-    }
-
-    private static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
-      public SummaryResult parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SummaryResult(input, extensionRegistry);
-      }
-    };
-
-    public static com.google.protobuf.Parser parser() {
-      return PARSER;
-    }
-
-    @java.lang.Override
-    public com.google.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult getDefaultInstanceForType() {
-      return DEFAULT_INSTANCE;
-    }
-
-  }
-
-  private int bitField0_;
-  public static final int INFO_TYPE_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.InfoType infoType_;
-  /**
-   * 
-   * Set if the transformation was limited to a specific info_type.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  public boolean hasInfoType() {
-    return infoType_ != null;
-  }
-  /**
-   * 
-   * Set if the transformation was limited to a specific info_type.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-    return infoType_ == null ? com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-  }
-  /**
-   * 
-   * Set if the transformation was limited to a specific info_type.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-    return getInfoType();
-  }
-
-  public static final int FIELD_FIELD_NUMBER = 2;
-  private com.google.privacy.dlp.v2beta1.FieldId field_;
-  /**
-   * 
-   * Set if the transformation was limited to a specific FieldId.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field = 2;
-   */
-  public boolean hasField() {
-    return field_ != null;
-  }
-  /**
-   * 
-   * Set if the transformation was limited to a specific FieldId.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldId getField() {
-    return field_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-  }
-  /**
-   * 
-   * Set if the transformation was limited to a specific FieldId.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field = 2;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder() {
-    return getField();
-  }
-
-  public static final int TRANSFORMATION_FIELD_NUMBER = 3;
-  private com.google.privacy.dlp.v2beta1.PrimitiveTransformation transformation_;
-  /**
-   * 
-   * The specific transformation these stats apply to.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-   */
-  public boolean hasTransformation() {
-    return transformation_ != null;
-  }
-  /**
-   * 
-   * The specific transformation these stats apply to.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.PrimitiveTransformation getTransformation() {
-    return transformation_ == null ? com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance() : transformation_;
-  }
-  /**
-   * 
-   * The specific transformation these stats apply to.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-   */
-  public com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder getTransformationOrBuilder() {
-    return getTransformation();
-  }
-
-  public static final int FIELD_TRANSFORMATIONS_FIELD_NUMBER = 5;
-  private java.util.List fieldTransformations_;
-  /**
-   * 
-   * The field transformation that was applied. This list will contain
-   * multiple only in the case of errors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-   */
-  public java.util.List getFieldTransformationsList() {
-    return fieldTransformations_;
-  }
-  /**
-   * 
-   * The field transformation that was applied. This list will contain
-   * multiple only in the case of errors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-   */
-  public java.util.List 
-      getFieldTransformationsOrBuilderList() {
-    return fieldTransformations_;
-  }
-  /**
-   * 
-   * The field transformation that was applied. This list will contain
-   * multiple only in the case of errors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-   */
-  public int getFieldTransformationsCount() {
-    return fieldTransformations_.size();
-  }
-  /**
-   * 
-   * The field transformation that was applied. This list will contain
-   * multiple only in the case of errors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldTransformation getFieldTransformations(int index) {
-    return fieldTransformations_.get(index);
-  }
-  /**
-   * 
-   * The field transformation that was applied. This list will contain
-   * multiple only in the case of errors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-   */
-  public com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder getFieldTransformationsOrBuilder(
-      int index) {
-    return fieldTransformations_.get(index);
-  }
-
-  public static final int RECORD_SUPPRESS_FIELD_NUMBER = 6;
-  private com.google.privacy.dlp.v2beta1.RecordSuppression recordSuppress_;
-  /**
-   * 
-   * The specific suppression option these stats apply to.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-   */
-  public boolean hasRecordSuppress() {
-    return recordSuppress_ != null;
-  }
-  /**
-   * 
-   * The specific suppression option these stats apply to.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordSuppression getRecordSuppress() {
-    return recordSuppress_ == null ? com.google.privacy.dlp.v2beta1.RecordSuppression.getDefaultInstance() : recordSuppress_;
-  }
-  /**
-   * 
-   * The specific suppression option these stats apply to.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-   */
-  public com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder getRecordSuppressOrBuilder() {
-    return getRecordSuppress();
-  }
-
-  public static final int RESULTS_FIELD_NUMBER = 4;
-  private java.util.List results_;
-  /**
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-   */
-  public java.util.List getResultsList() {
-    return results_;
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-   */
-  public java.util.List 
-      getResultsOrBuilderList() {
-    return results_;
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-   */
-  public int getResultsCount() {
-    return results_.size();
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult getResults(int index) {
-    return results_.get(index);
-  }
-  /**
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-   */
-  public com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResultOrBuilder getResultsOrBuilder(
-      int index) {
-    return results_.get(index);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (infoType_ != null) {
-      output.writeMessage(1, getInfoType());
-    }
-    if (field_ != null) {
-      output.writeMessage(2, getField());
-    }
-    if (transformation_ != null) {
-      output.writeMessage(3, getTransformation());
-    }
-    for (int i = 0; i < results_.size(); i++) {
-      output.writeMessage(4, results_.get(i));
-    }
-    for (int i = 0; i < fieldTransformations_.size(); i++) {
-      output.writeMessage(5, fieldTransformations_.get(i));
-    }
-    if (recordSuppress_ != null) {
-      output.writeMessage(6, getRecordSuppress());
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (infoType_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getInfoType());
-    }
-    if (field_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(2, getField());
-    }
-    if (transformation_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(3, getTransformation());
-    }
-    for (int i = 0; i < results_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(4, results_.get(i));
-    }
-    for (int i = 0; i < fieldTransformations_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, fieldTransformations_.get(i));
-    }
-    if (recordSuppress_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(6, getRecordSuppress());
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.TransformationSummary)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.TransformationSummary other = (com.google.privacy.dlp.v2beta1.TransformationSummary) obj;
-
-    boolean result = true;
-    result = result && (hasInfoType() == other.hasInfoType());
-    if (hasInfoType()) {
-      result = result && getInfoType()
-          .equals(other.getInfoType());
-    }
-    result = result && (hasField() == other.hasField());
-    if (hasField()) {
-      result = result && getField()
-          .equals(other.getField());
-    }
-    result = result && (hasTransformation() == other.hasTransformation());
-    if (hasTransformation()) {
-      result = result && getTransformation()
-          .equals(other.getTransformation());
-    }
-    result = result && getFieldTransformationsList()
-        .equals(other.getFieldTransformationsList());
-    result = result && (hasRecordSuppress() == other.hasRecordSuppress());
-    if (hasRecordSuppress()) {
-      result = result && getRecordSuppress()
-          .equals(other.getRecordSuppress());
-    }
-    result = result && getResultsList()
-        .equals(other.getResultsList());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasInfoType()) {
-      hash = (37 * hash) + INFO_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getInfoType().hashCode();
-    }
-    if (hasField()) {
-      hash = (37 * hash) + FIELD_FIELD_NUMBER;
-      hash = (53 * hash) + getField().hashCode();
-    }
-    if (hasTransformation()) {
-      hash = (37 * hash) + TRANSFORMATION_FIELD_NUMBER;
-      hash = (53 * hash) + getTransformation().hashCode();
-    }
-    if (getFieldTransformationsCount() > 0) {
-      hash = (37 * hash) + FIELD_TRANSFORMATIONS_FIELD_NUMBER;
-      hash = (53 * hash) + getFieldTransformationsList().hashCode();
-    }
-    if (hasRecordSuppress()) {
-      hash = (37 * hash) + RECORD_SUPPRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getRecordSuppress().hashCode();
-    }
-    if (getResultsCount() > 0) {
-      hash = (37 * hash) + RESULTS_FIELD_NUMBER;
-      hash = (53 * hash) + getResultsList().hashCode();
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.TransformationSummary prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Summary of a single tranformation.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.TransformationSummary}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.TransformationSummary)
-      com.google.privacy.dlp.v2beta1.TransformationSummaryOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransformationSummary_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransformationSummary_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.TransformationSummary.class, com.google.privacy.dlp.v2beta1.TransformationSummary.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.TransformationSummary.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-        getFieldTransformationsFieldBuilder();
-        getResultsFieldBuilder();
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (infoTypeBuilder_ == null) {
-        infoType_ = null;
-      } else {
-        infoType_ = null;
-        infoTypeBuilder_ = null;
-      }
-      if (fieldBuilder_ == null) {
-        field_ = null;
-      } else {
-        field_ = null;
-        fieldBuilder_ = null;
-      }
-      if (transformationBuilder_ == null) {
-        transformation_ = null;
-      } else {
-        transformation_ = null;
-        transformationBuilder_ = null;
-      }
-      if (fieldTransformationsBuilder_ == null) {
-        fieldTransformations_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-      } else {
-        fieldTransformationsBuilder_.clear();
-      }
-      if (recordSuppressBuilder_ == null) {
-        recordSuppress_ = null;
-      } else {
-        recordSuppress_ = null;
-        recordSuppressBuilder_ = null;
-      }
-      if (resultsBuilder_ == null) {
-        results_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
-      } else {
-        resultsBuilder_.clear();
-      }
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransformationSummary_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.TransformationSummary getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.TransformationSummary.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.TransformationSummary build() {
-      com.google.privacy.dlp.v2beta1.TransformationSummary result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.TransformationSummary buildPartial() {
-      com.google.privacy.dlp.v2beta1.TransformationSummary result = new com.google.privacy.dlp.v2beta1.TransformationSummary(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (infoTypeBuilder_ == null) {
-        result.infoType_ = infoType_;
-      } else {
-        result.infoType_ = infoTypeBuilder_.build();
-      }
-      if (fieldBuilder_ == null) {
-        result.field_ = field_;
-      } else {
-        result.field_ = fieldBuilder_.build();
-      }
-      if (transformationBuilder_ == null) {
-        result.transformation_ = transformation_;
-      } else {
-        result.transformation_ = transformationBuilder_.build();
-      }
-      if (fieldTransformationsBuilder_ == null) {
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
-          fieldTransformations_ = java.util.Collections.unmodifiableList(fieldTransformations_);
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.fieldTransformations_ = fieldTransformations_;
-      } else {
-        result.fieldTransformations_ = fieldTransformationsBuilder_.build();
-      }
-      if (recordSuppressBuilder_ == null) {
-        result.recordSuppress_ = recordSuppress_;
-      } else {
-        result.recordSuppress_ = recordSuppressBuilder_.build();
-      }
-      if (resultsBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) == 0x00000020)) {
-          results_ = java.util.Collections.unmodifiableList(results_);
-          bitField0_ = (bitField0_ & ~0x00000020);
-        }
-        result.results_ = results_;
-      } else {
-        result.results_ = resultsBuilder_.build();
-      }
-      result.bitField0_ = to_bitField0_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.TransformationSummary) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.TransformationSummary)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.TransformationSummary other) {
-      if (other == com.google.privacy.dlp.v2beta1.TransformationSummary.getDefaultInstance()) return this;
-      if (other.hasInfoType()) {
-        mergeInfoType(other.getInfoType());
-      }
-      if (other.hasField()) {
-        mergeField(other.getField());
-      }
-      if (other.hasTransformation()) {
-        mergeTransformation(other.getTransformation());
-      }
-      if (fieldTransformationsBuilder_ == null) {
-        if (!other.fieldTransformations_.isEmpty()) {
-          if (fieldTransformations_.isEmpty()) {
-            fieldTransformations_ = other.fieldTransformations_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            ensureFieldTransformationsIsMutable();
-            fieldTransformations_.addAll(other.fieldTransformations_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.fieldTransformations_.isEmpty()) {
-          if (fieldTransformationsBuilder_.isEmpty()) {
-            fieldTransformationsBuilder_.dispose();
-            fieldTransformationsBuilder_ = null;
-            fieldTransformations_ = other.fieldTransformations_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-            fieldTransformationsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getFieldTransformationsFieldBuilder() : null;
-          } else {
-            fieldTransformationsBuilder_.addAllMessages(other.fieldTransformations_);
-          }
-        }
-      }
-      if (other.hasRecordSuppress()) {
-        mergeRecordSuppress(other.getRecordSuppress());
-      }
-      if (resultsBuilder_ == null) {
-        if (!other.results_.isEmpty()) {
-          if (results_.isEmpty()) {
-            results_ = other.results_;
-            bitField0_ = (bitField0_ & ~0x00000020);
-          } else {
-            ensureResultsIsMutable();
-            results_.addAll(other.results_);
-          }
-          onChanged();
-        }
-      } else {
-        if (!other.results_.isEmpty()) {
-          if (resultsBuilder_.isEmpty()) {
-            resultsBuilder_.dispose();
-            resultsBuilder_ = null;
-            results_ = other.results_;
-            bitField0_ = (bitField0_ & ~0x00000020);
-            resultsBuilder_ = 
-              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                 getResultsFieldBuilder() : null;
-          } else {
-            resultsBuilder_.addAllMessages(other.results_);
-          }
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.TransformationSummary parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.TransformationSummary) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private com.google.privacy.dlp.v2beta1.InfoType infoType_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> infoTypeBuilder_;
-    /**
-     * 
-     * Set if the transformation was limited to a specific info_type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public boolean hasInfoType() {
-      return infoTypeBuilder_ != null || infoType_ != null;
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific info_type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType getInfoType() {
-      if (infoTypeBuilder_ == null) {
-        return infoType_ == null ? com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-      } else {
-        return infoTypeBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific info_type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public Builder setInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-      if (infoTypeBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        infoType_ = value;
-        onChanged();
-      } else {
-        infoTypeBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific info_type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public Builder setInfoType(
-        com.google.privacy.dlp.v2beta1.InfoType.Builder builderForValue) {
-      if (infoTypeBuilder_ == null) {
-        infoType_ = builderForValue.build();
-        onChanged();
-      } else {
-        infoTypeBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific info_type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public Builder mergeInfoType(com.google.privacy.dlp.v2beta1.InfoType value) {
-      if (infoTypeBuilder_ == null) {
-        if (infoType_ != null) {
-          infoType_ =
-            com.google.privacy.dlp.v2beta1.InfoType.newBuilder(infoType_).mergeFrom(value).buildPartial();
-        } else {
-          infoType_ = value;
-        }
-        onChanged();
-      } else {
-        infoTypeBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific info_type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public Builder clearInfoType() {
-      if (infoTypeBuilder_ == null) {
-        infoType_ = null;
-        onChanged();
-      } else {
-        infoType_ = null;
-        infoTypeBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific info_type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoType.Builder getInfoTypeBuilder() {
-      
-      onChanged();
-      return getInfoTypeFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific info_type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder() {
-      if (infoTypeBuilder_ != null) {
-        return infoTypeBuilder_.getMessageOrBuilder();
-      } else {
-        return infoType_ == null ?
-            com.google.privacy.dlp.v2beta1.InfoType.getDefaultInstance() : infoType_;
-      }
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific info_type.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder> 
-        getInfoTypeFieldBuilder() {
-      if (infoTypeBuilder_ == null) {
-        infoTypeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.InfoType, com.google.privacy.dlp.v2beta1.InfoType.Builder, com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder>(
-                getInfoType(),
-                getParentForChildren(),
-                isClean());
-        infoType_ = null;
-      }
-      return infoTypeBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.FieldId field_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> fieldBuilder_;
-    /**
-     * 
-     * Set if the transformation was limited to a specific FieldId.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 2;
-     */
-    public boolean hasField() {
-      return fieldBuilder_ != null || field_ != null;
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific FieldId.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId getField() {
-      if (fieldBuilder_ == null) {
-        return field_ == null ? com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-      } else {
-        return fieldBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific FieldId.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 2;
-     */
-    public Builder setField(com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (fieldBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        field_ = value;
-        onChanged();
-      } else {
-        fieldBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific FieldId.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 2;
-     */
-    public Builder setField(
-        com.google.privacy.dlp.v2beta1.FieldId.Builder builderForValue) {
-      if (fieldBuilder_ == null) {
-        field_ = builderForValue.build();
-        onChanged();
-      } else {
-        fieldBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific FieldId.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 2;
-     */
-    public Builder mergeField(com.google.privacy.dlp.v2beta1.FieldId value) {
-      if (fieldBuilder_ == null) {
-        if (field_ != null) {
-          field_ =
-            com.google.privacy.dlp.v2beta1.FieldId.newBuilder(field_).mergeFrom(value).buildPartial();
-        } else {
-          field_ = value;
-        }
-        onChanged();
-      } else {
-        fieldBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific FieldId.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 2;
-     */
-    public Builder clearField() {
-      if (fieldBuilder_ == null) {
-        field_ = null;
-        onChanged();
-      } else {
-        field_ = null;
-        fieldBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific FieldId.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldId.Builder getFieldBuilder() {
-      
-      onChanged();
-      return getFieldFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific FieldId.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 2;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder() {
-      if (fieldBuilder_ != null) {
-        return fieldBuilder_.getMessageOrBuilder();
-      } else {
-        return field_ == null ?
-            com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance() : field_;
-      }
-    }
-    /**
-     * 
-     * Set if the transformation was limited to a specific FieldId.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.FieldId field = 2;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder> 
-        getFieldFieldBuilder() {
-      if (fieldBuilder_ == null) {
-        fieldBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.FieldId, com.google.privacy.dlp.v2beta1.FieldId.Builder, com.google.privacy.dlp.v2beta1.FieldIdOrBuilder>(
-                getField(),
-                getParentForChildren(),
-                isClean());
-        field_ = null;
-      }
-      return fieldBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.PrimitiveTransformation transformation_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrimitiveTransformation, com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder, com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder> transformationBuilder_;
-    /**
-     * 
-     * The specific transformation these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-     */
-    public boolean hasTransformation() {
-      return transformationBuilder_ != null || transformation_ != null;
-    }
-    /**
-     * 
-     * The specific transformation these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.PrimitiveTransformation getTransformation() {
-      if (transformationBuilder_ == null) {
-        return transformation_ == null ? com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance() : transformation_;
-      } else {
-        return transformationBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The specific transformation these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-     */
-    public Builder setTransformation(com.google.privacy.dlp.v2beta1.PrimitiveTransformation value) {
-      if (transformationBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        transformation_ = value;
-        onChanged();
-      } else {
-        transformationBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The specific transformation these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-     */
-    public Builder setTransformation(
-        com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder builderForValue) {
-      if (transformationBuilder_ == null) {
-        transformation_ = builderForValue.build();
-        onChanged();
-      } else {
-        transformationBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The specific transformation these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-     */
-    public Builder mergeTransformation(com.google.privacy.dlp.v2beta1.PrimitiveTransformation value) {
-      if (transformationBuilder_ == null) {
-        if (transformation_ != null) {
-          transformation_ =
-            com.google.privacy.dlp.v2beta1.PrimitiveTransformation.newBuilder(transformation_).mergeFrom(value).buildPartial();
-        } else {
-          transformation_ = value;
-        }
-        onChanged();
-      } else {
-        transformationBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The specific transformation these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-     */
-    public Builder clearTransformation() {
-      if (transformationBuilder_ == null) {
-        transformation_ = null;
-        onChanged();
-      } else {
-        transformation_ = null;
-        transformationBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The specific transformation these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder getTransformationBuilder() {
-      
-      onChanged();
-      return getTransformationFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The specific transformation these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-     */
-    public com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder getTransformationOrBuilder() {
-      if (transformationBuilder_ != null) {
-        return transformationBuilder_.getMessageOrBuilder();
-      } else {
-        return transformation_ == null ?
-            com.google.privacy.dlp.v2beta1.PrimitiveTransformation.getDefaultInstance() : transformation_;
-      }
-    }
-    /**
-     * 
-     * The specific transformation these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.PrimitiveTransformation, com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder, com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder> 
-        getTransformationFieldBuilder() {
-      if (transformationBuilder_ == null) {
-        transformationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.PrimitiveTransformation, com.google.privacy.dlp.v2beta1.PrimitiveTransformation.Builder, com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder>(
-                getTransformation(),
-                getParentForChildren(),
-                isClean());
-        transformation_ = null;
-      }
-      return transformationBuilder_;
-    }
-
-    private java.util.List fieldTransformations_ =
-      java.util.Collections.emptyList();
-    private void ensureFieldTransformationsIsMutable() {
-      if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-        fieldTransformations_ = new java.util.ArrayList(fieldTransformations_);
-        bitField0_ |= 0x00000008;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldTransformation, com.google.privacy.dlp.v2beta1.FieldTransformation.Builder, com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder> fieldTransformationsBuilder_;
-
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public java.util.List getFieldTransformationsList() {
-      if (fieldTransformationsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(fieldTransformations_);
-      } else {
-        return fieldTransformationsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public int getFieldTransformationsCount() {
-      if (fieldTransformationsBuilder_ == null) {
-        return fieldTransformations_.size();
-      } else {
-        return fieldTransformationsBuilder_.getCount();
-      }
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldTransformation getFieldTransformations(int index) {
-      if (fieldTransformationsBuilder_ == null) {
-        return fieldTransformations_.get(index);
-      } else {
-        return fieldTransformationsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public Builder setFieldTransformations(
-        int index, com.google.privacy.dlp.v2beta1.FieldTransformation value) {
-      if (fieldTransformationsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.set(index, value);
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public Builder setFieldTransformations(
-        int index, com.google.privacy.dlp.v2beta1.FieldTransformation.Builder builderForValue) {
-      if (fieldTransformationsBuilder_ == null) {
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public Builder addFieldTransformations(com.google.privacy.dlp.v2beta1.FieldTransformation value) {
-      if (fieldTransformationsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.add(value);
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public Builder addFieldTransformations(
-        int index, com.google.privacy.dlp.v2beta1.FieldTransformation value) {
-      if (fieldTransformationsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.add(index, value);
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public Builder addFieldTransformations(
-        com.google.privacy.dlp.v2beta1.FieldTransformation.Builder builderForValue) {
-      if (fieldTransformationsBuilder_ == null) {
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.add(builderForValue.build());
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public Builder addFieldTransformations(
-        int index, com.google.privacy.dlp.v2beta1.FieldTransformation.Builder builderForValue) {
-      if (fieldTransformationsBuilder_ == null) {
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public Builder addAllFieldTransformations(
-        java.lang.Iterable values) {
-      if (fieldTransformationsBuilder_ == null) {
-        ensureFieldTransformationsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, fieldTransformations_);
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public Builder clearFieldTransformations() {
-      if (fieldTransformationsBuilder_ == null) {
-        fieldTransformations_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public Builder removeFieldTransformations(int index) {
-      if (fieldTransformationsBuilder_ == null) {
-        ensureFieldTransformationsIsMutable();
-        fieldTransformations_.remove(index);
-        onChanged();
-      } else {
-        fieldTransformationsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldTransformation.Builder getFieldTransformationsBuilder(
-        int index) {
-      return getFieldTransformationsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder getFieldTransformationsOrBuilder(
-        int index) {
-      if (fieldTransformationsBuilder_ == null) {
-        return fieldTransformations_.get(index);  } else {
-        return fieldTransformationsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public java.util.List 
-         getFieldTransformationsOrBuilderList() {
-      if (fieldTransformationsBuilder_ != null) {
-        return fieldTransformationsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(fieldTransformations_);
-      }
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldTransformation.Builder addFieldTransformationsBuilder() {
-      return getFieldTransformationsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.FieldTransformation.getDefaultInstance());
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public com.google.privacy.dlp.v2beta1.FieldTransformation.Builder addFieldTransformationsBuilder(
-        int index) {
-      return getFieldTransformationsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.FieldTransformation.getDefaultInstance());
-    }
-    /**
-     * 
-     * The field transformation that was applied. This list will contain
-     * multiple only in the case of errors.
-     * 

-     *
-     * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-     */
-    public java.util.List 
-         getFieldTransformationsBuilderList() {
-      return getFieldTransformationsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.FieldTransformation, com.google.privacy.dlp.v2beta1.FieldTransformation.Builder, com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder> 
-        getFieldTransformationsFieldBuilder() {
-      if (fieldTransformationsBuilder_ == null) {
-        fieldTransformationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.FieldTransformation, com.google.privacy.dlp.v2beta1.FieldTransformation.Builder, com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder>(
-                fieldTransformations_,
-                ((bitField0_ & 0x00000008) == 0x00000008),
-                getParentForChildren(),
-                isClean());
-        fieldTransformations_ = null;
-      }
-      return fieldTransformationsBuilder_;
-    }
-
-    private com.google.privacy.dlp.v2beta1.RecordSuppression recordSuppress_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordSuppression, com.google.privacy.dlp.v2beta1.RecordSuppression.Builder, com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder> recordSuppressBuilder_;
-    /**
-     * 
-     * The specific suppression option these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-     */
-    public boolean hasRecordSuppress() {
-      return recordSuppressBuilder_ != null || recordSuppress_ != null;
-    }
-    /**
-     * 
-     * The specific suppression option these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordSuppression getRecordSuppress() {
-      if (recordSuppressBuilder_ == null) {
-        return recordSuppress_ == null ? com.google.privacy.dlp.v2beta1.RecordSuppression.getDefaultInstance() : recordSuppress_;
-      } else {
-        return recordSuppressBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * The specific suppression option these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-     */
-    public Builder setRecordSuppress(com.google.privacy.dlp.v2beta1.RecordSuppression value) {
-      if (recordSuppressBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        recordSuppress_ = value;
-        onChanged();
-      } else {
-        recordSuppressBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The specific suppression option these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-     */
-    public Builder setRecordSuppress(
-        com.google.privacy.dlp.v2beta1.RecordSuppression.Builder builderForValue) {
-      if (recordSuppressBuilder_ == null) {
-        recordSuppress_ = builderForValue.build();
-        onChanged();
-      } else {
-        recordSuppressBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The specific suppression option these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-     */
-    public Builder mergeRecordSuppress(com.google.privacy.dlp.v2beta1.RecordSuppression value) {
-      if (recordSuppressBuilder_ == null) {
-        if (recordSuppress_ != null) {
-          recordSuppress_ =
-            com.google.privacy.dlp.v2beta1.RecordSuppression.newBuilder(recordSuppress_).mergeFrom(value).buildPartial();
-        } else {
-          recordSuppress_ = value;
-        }
-        onChanged();
-      } else {
-        recordSuppressBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The specific suppression option these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-     */
-    public Builder clearRecordSuppress() {
-      if (recordSuppressBuilder_ == null) {
-        recordSuppress_ = null;
-        onChanged();
-      } else {
-        recordSuppress_ = null;
-        recordSuppressBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * The specific suppression option these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordSuppression.Builder getRecordSuppressBuilder() {
-      
-      onChanged();
-      return getRecordSuppressFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * The specific suppression option these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-     */
-    public com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder getRecordSuppressOrBuilder() {
-      if (recordSuppressBuilder_ != null) {
-        return recordSuppressBuilder_.getMessageOrBuilder();
-      } else {
-        return recordSuppress_ == null ?
-            com.google.privacy.dlp.v2beta1.RecordSuppression.getDefaultInstance() : recordSuppress_;
-      }
-    }
-    /**
-     * 
-     * The specific suppression option these stats apply to.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.RecordSuppression, com.google.privacy.dlp.v2beta1.RecordSuppression.Builder, com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder> 
-        getRecordSuppressFieldBuilder() {
-      if (recordSuppressBuilder_ == null) {
-        recordSuppressBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.RecordSuppression, com.google.privacy.dlp.v2beta1.RecordSuppression.Builder, com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder>(
-                getRecordSuppress(),
-                getParentForChildren(),
-                isClean());
-        recordSuppress_ = null;
-      }
-      return recordSuppressBuilder_;
-    }
-
-    private java.util.List results_ =
-      java.util.Collections.emptyList();
-    private void ensureResultsIsMutable() {
-      if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-        results_ = new java.util.ArrayList(results_);
-        bitField0_ |= 0x00000020;
-       }
-    }
-
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.Builder, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResultOrBuilder> resultsBuilder_;
-
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public java.util.List getResultsList() {
-      if (resultsBuilder_ == null) {
-        return java.util.Collections.unmodifiableList(results_);
-      } else {
-        return resultsBuilder_.getMessageList();
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public int getResultsCount() {
-      if (resultsBuilder_ == null) {
-        return results_.size();
-      } else {
-        return resultsBuilder_.getCount();
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult getResults(int index) {
-      if (resultsBuilder_ == null) {
-        return results_.get(index);
-      } else {
-        return resultsBuilder_.getMessage(index);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public Builder setResults(
-        int index, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult value) {
-      if (resultsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureResultsIsMutable();
-        results_.set(index, value);
-        onChanged();
-      } else {
-        resultsBuilder_.setMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public Builder setResults(
-        int index, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.Builder builderForValue) {
-      if (resultsBuilder_ == null) {
-        ensureResultsIsMutable();
-        results_.set(index, builderForValue.build());
-        onChanged();
-      } else {
-        resultsBuilder_.setMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public Builder addResults(com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult value) {
-      if (resultsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureResultsIsMutable();
-        results_.add(value);
-        onChanged();
-      } else {
-        resultsBuilder_.addMessage(value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public Builder addResults(
-        int index, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult value) {
-      if (resultsBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureResultsIsMutable();
-        results_.add(index, value);
-        onChanged();
-      } else {
-        resultsBuilder_.addMessage(index, value);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public Builder addResults(
-        com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.Builder builderForValue) {
-      if (resultsBuilder_ == null) {
-        ensureResultsIsMutable();
-        results_.add(builderForValue.build());
-        onChanged();
-      } else {
-        resultsBuilder_.addMessage(builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public Builder addResults(
-        int index, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.Builder builderForValue) {
-      if (resultsBuilder_ == null) {
-        ensureResultsIsMutable();
-        results_.add(index, builderForValue.build());
-        onChanged();
-      } else {
-        resultsBuilder_.addMessage(index, builderForValue.build());
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public Builder addAllResults(
-        java.lang.Iterable values) {
-      if (resultsBuilder_ == null) {
-        ensureResultsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, results_);
-        onChanged();
-      } else {
-        resultsBuilder_.addAllMessages(values);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public Builder clearResults() {
-      if (resultsBuilder_ == null) {
-        results_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
-        onChanged();
-      } else {
-        resultsBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public Builder removeResults(int index) {
-      if (resultsBuilder_ == null) {
-        ensureResultsIsMutable();
-        results_.remove(index);
-        onChanged();
-      } else {
-        resultsBuilder_.remove(index);
-      }
-      return this;
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.Builder getResultsBuilder(
-        int index) {
-      return getResultsFieldBuilder().getBuilder(index);
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResultOrBuilder getResultsOrBuilder(
-        int index) {
-      if (resultsBuilder_ == null) {
-        return results_.get(index);  } else {
-        return resultsBuilder_.getMessageOrBuilder(index);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public java.util.List 
-         getResultsOrBuilderList() {
-      if (resultsBuilder_ != null) {
-        return resultsBuilder_.getMessageOrBuilderList();
-      } else {
-        return java.util.Collections.unmodifiableList(results_);
-      }
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.Builder addResultsBuilder() {
-      return getResultsFieldBuilder().addBuilder(
-          com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.getDefaultInstance());
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.Builder addResultsBuilder(
-        int index) {
-      return getResultsFieldBuilder().addBuilder(
-          index, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.getDefaultInstance());
-    }
-    /**
-     * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-     */
-    public java.util.List 
-         getResultsBuilderList() {
-      return getResultsFieldBuilder().getBuilderList();
-    }
-    private com.google.protobuf.RepeatedFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.Builder, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResultOrBuilder> 
-        getResultsFieldBuilder() {
-      if (resultsBuilder_ == null) {
-        resultsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult.Builder, com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResultOrBuilder>(
-                results_,
-                ((bitField0_ & 0x00000020) == 0x00000020),
-                getParentForChildren(),
-                isClean());
-        results_ = null;
-      }
-      return resultsBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.TransformationSummary)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.TransformationSummary)
-  private static final com.google.privacy.dlp.v2beta1.TransformationSummary DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.TransformationSummary();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.TransformationSummary getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public TransformationSummary parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransformationSummary(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.TransformationSummary getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransformationSummaryOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransformationSummaryOrBuilder.java
deleted file mode 100644
index 031b4e940083..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransformationSummaryOrBuilder.java
+++ /dev/null
@@ -1,182 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface TransformationSummaryOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.TransformationSummary)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Set if the transformation was limited to a specific info_type.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  boolean hasInfoType();
-  /**
-   * 
-   * Set if the transformation was limited to a specific info_type.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoType getInfoType();
-  /**
-   * 
-   * Set if the transformation was limited to a specific info_type.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.InfoType info_type = 1;
-   */
-  com.google.privacy.dlp.v2beta1.InfoTypeOrBuilder getInfoTypeOrBuilder();
-
-  /**
-   * 
-   * Set if the transformation was limited to a specific FieldId.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field = 2;
-   */
-  boolean hasField();
-  /**
-   * 
-   * Set if the transformation was limited to a specific FieldId.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field = 2;
-   */
-  com.google.privacy.dlp.v2beta1.FieldId getField();
-  /**
-   * 
-   * Set if the transformation was limited to a specific FieldId.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.FieldId field = 2;
-   */
-  com.google.privacy.dlp.v2beta1.FieldIdOrBuilder getFieldOrBuilder();
-
-  /**
-   * 
-   * The specific transformation these stats apply to.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-   */
-  boolean hasTransformation();
-  /**
-   * 
-   * The specific transformation these stats apply to.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-   */
-  com.google.privacy.dlp.v2beta1.PrimitiveTransformation getTransformation();
-  /**
-   * 
-   * The specific transformation these stats apply to.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.PrimitiveTransformation transformation = 3;
-   */
-  com.google.privacy.dlp.v2beta1.PrimitiveTransformationOrBuilder getTransformationOrBuilder();
-
-  /**
-   * 
-   * The field transformation that was applied. This list will contain
-   * multiple only in the case of errors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-   */
-  java.util.List 
-      getFieldTransformationsList();
-  /**
-   * 
-   * The field transformation that was applied. This list will contain
-   * multiple only in the case of errors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-   */
-  com.google.privacy.dlp.v2beta1.FieldTransformation getFieldTransformations(int index);
-  /**
-   * 
-   * The field transformation that was applied. This list will contain
-   * multiple only in the case of errors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-   */
-  int getFieldTransformationsCount();
-  /**
-   * 
-   * The field transformation that was applied. This list will contain
-   * multiple only in the case of errors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-   */
-  java.util.List 
-      getFieldTransformationsOrBuilderList();
-  /**
-   * 
-   * The field transformation that was applied. This list will contain
-   * multiple only in the case of errors.
-   * 

-   *
-   * repeated .google.privacy.dlp.v2beta1.FieldTransformation field_transformations = 5;
-   */
-  com.google.privacy.dlp.v2beta1.FieldTransformationOrBuilder getFieldTransformationsOrBuilder(
-      int index);
-
-  /**
-   * 
-   * The specific suppression option these stats apply to.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-   */
-  boolean hasRecordSuppress();
-  /**
-   * 
-   * The specific suppression option these stats apply to.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-   */
-  com.google.privacy.dlp.v2beta1.RecordSuppression getRecordSuppress();
-  /**
-   * 
-   * The specific suppression option these stats apply to.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.RecordSuppression record_suppress = 6;
-   */
-  com.google.privacy.dlp.v2beta1.RecordSuppressionOrBuilder getRecordSuppressOrBuilder();
-
-  /**
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-   */
-  java.util.List 
-      getResultsList();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-   */
-  com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult getResults(int index);
-  /**
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-   */
-  int getResultsCount();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-   */
-  java.util.List 
-      getResultsOrBuilderList();
-  /**
-   * repeated .google.privacy.dlp.v2beta1.TransformationSummary.SummaryResult results = 4;
-   */
-  com.google.privacy.dlp.v2beta1.TransformationSummary.SummaryResultOrBuilder getResultsOrBuilder(
-      int index);
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransientCryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransientCryptoKey.java
deleted file mode 100644
index b4a22c63c72f..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransientCryptoKey.java
+++ /dev/null
@@ -1,589 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Use this to have a random data crypto key generated.
- * It will be discarded after the operation/request finishes.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.TransientCryptoKey}
- */
-public  final class TransientCryptoKey extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.TransientCryptoKey)
-    TransientCryptoKeyOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use TransientCryptoKey.newBuilder() to construct.
-  private TransientCryptoKey(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private TransientCryptoKey() {
-    name_ = "";
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private TransientCryptoKey(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransientCryptoKey_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransientCryptoKey_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.TransientCryptoKey.class, com.google.privacy.dlp.v2beta1.TransientCryptoKey.Builder.class);
-  }
-
-  public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
-  /**
-   * 
-   * Name of the key. [required]
-   * This is an arbitrary string used to differentiate different keys.
-   * A unique key is generated per name: two separate `TransientCryptoKey`
-   * protos share the same generated key if their names are the same.
-   * When the data crypto key is generated, this name is not used in any way
-   * (repeating the api call will result in a different key being generated).
-   * 

-   *
-   * string name = 1;
-   */
-  public java.lang.String getName() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      name_ = s;
-      return s;
-    }
-  }
-  /**
-   * 
-   * Name of the key. [required]
-   * This is an arbitrary string used to differentiate different keys.
-   * A unique key is generated per name: two separate `TransientCryptoKey`
-   * protos share the same generated key if their names are the same.
-   * When the data crypto key is generated, this name is not used in any way
-   * (repeating the api call will result in a different key being generated).
-   * 

-   *
-   * string name = 1;
-   */
-  public com.google.protobuf.ByteString
-      getNameBytes() {
-    java.lang.Object ref = name_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      name_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!getNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.TransientCryptoKey)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.TransientCryptoKey other = (com.google.privacy.dlp.v2beta1.TransientCryptoKey) obj;
-
-    boolean result = true;
-    result = result && getName()
-        .equals(other.getName());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getName().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.TransientCryptoKey prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Use this to have a random data crypto key generated.
-   * It will be discarded after the operation/request finishes.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.TransientCryptoKey}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.TransientCryptoKey)
-      com.google.privacy.dlp.v2beta1.TransientCryptoKeyOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransientCryptoKey_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransientCryptoKey_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.TransientCryptoKey.class, com.google.privacy.dlp.v2beta1.TransientCryptoKey.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.TransientCryptoKey.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      name_ = "";
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_TransientCryptoKey_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.TransientCryptoKey getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.TransientCryptoKey.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.TransientCryptoKey build() {
-      com.google.privacy.dlp.v2beta1.TransientCryptoKey result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.TransientCryptoKey buildPartial() {
-      com.google.privacy.dlp.v2beta1.TransientCryptoKey result = new com.google.privacy.dlp.v2beta1.TransientCryptoKey(this);
-      result.name_ = name_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.TransientCryptoKey) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.TransientCryptoKey)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.TransientCryptoKey other) {
-      if (other == com.google.privacy.dlp.v2beta1.TransientCryptoKey.getDefaultInstance()) return this;
-      if (!other.getName().isEmpty()) {
-        name_ = other.name_;
-        onChanged();
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.TransientCryptoKey parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.TransientCryptoKey) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private java.lang.Object name_ = "";
-    /**
-     * 
-     * Name of the key. [required]
-     * This is an arbitrary string used to differentiate different keys.
-     * A unique key is generated per name: two separate `TransientCryptoKey`
-     * protos share the same generated key if their names are the same.
-     * When the data crypto key is generated, this name is not used in any way
-     * (repeating the api call will result in a different key being generated).
-     * 

-     *
-     * string name = 1;
-     */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        name_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * 
-     * Name of the key. [required]
-     * This is an arbitrary string used to differentiate different keys.
-     * A unique key is generated per name: two separate `TransientCryptoKey`
-     * protos share the same generated key if their names are the same.
-     * When the data crypto key is generated, this name is not used in any way
-     * (repeating the api call will result in a different key being generated).
-     * 

-     *
-     * string name = 1;
-     */
-    public com.google.protobuf.ByteString
-        getNameBytes() {
-      java.lang.Object ref = name_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        name_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * 
-     * Name of the key. [required]
-     * This is an arbitrary string used to differentiate different keys.
-     * A unique key is generated per name: two separate `TransientCryptoKey`
-     * protos share the same generated key if their names are the same.
-     * When the data crypto key is generated, this name is not used in any way
-     * (repeating the api call will result in a different key being generated).
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder setName(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Name of the key. [required]
-     * This is an arbitrary string used to differentiate different keys.
-     * A unique key is generated per name: two separate `TransientCryptoKey`
-     * protos share the same generated key if their names are the same.
-     * When the data crypto key is generated, this name is not used in any way
-     * (repeating the api call will result in a different key being generated).
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder clearName() {
-      
-      name_ = getDefaultInstance().getName();
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * Name of the key. [required]
-     * This is an arbitrary string used to differentiate different keys.
-     * A unique key is generated per name: two separate `TransientCryptoKey`
-     * protos share the same generated key if their names are the same.
-     * When the data crypto key is generated, this name is not used in any way
-     * (repeating the api call will result in a different key being generated).
-     * 

-     *
-     * string name = 1;
-     */
-    public Builder setNameBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      
-      name_ = value;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.TransientCryptoKey)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.TransientCryptoKey)
-  private static final com.google.privacy.dlp.v2beta1.TransientCryptoKey DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.TransientCryptoKey();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.TransientCryptoKey getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public TransientCryptoKey parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransientCryptoKey(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.TransientCryptoKey getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransientCryptoKeyOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransientCryptoKeyOrBuilder.java
deleted file mode 100644
index 4b01fba94dd1..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/TransientCryptoKeyOrBuilder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface TransientCryptoKeyOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.TransientCryptoKey)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * Name of the key. [required]
-   * This is an arbitrary string used to differentiate different keys.
-   * A unique key is generated per name: two separate `TransientCryptoKey`
-   * protos share the same generated key if their names are the same.
-   * When the data crypto key is generated, this name is not used in any way
-   * (repeating the api call will result in a different key being generated).
-   * 

-   *
-   * string name = 1;
-   */
-  java.lang.String getName();
-  /**
-   * 
-   * Name of the key. [required]
-   * This is an arbitrary string used to differentiate different keys.
-   * A unique key is generated per name: two separate `TransientCryptoKey`
-   * protos share the same generated key if their names are the same.
-   * When the data crypto key is generated, this name is not used in any way
-   * (repeating the api call will result in a different key being generated).
-   * 

-   *
-   * string name = 1;
-   */
-  com.google.protobuf.ByteString
-      getNameBytes();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/UnwrappedCryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/UnwrappedCryptoKey.java
deleted file mode 100644
index 946cf5a6caf1..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/UnwrappedCryptoKey.java
+++ /dev/null
@@ -1,476 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Using raw keys is prone to security risks due to accidentally
- * leaking the key. Choose another type of key if possible.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.UnwrappedCryptoKey}
- */
-public  final class UnwrappedCryptoKey extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.UnwrappedCryptoKey)
-    UnwrappedCryptoKeyOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use UnwrappedCryptoKey.newBuilder() to construct.
-  private UnwrappedCryptoKey(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private UnwrappedCryptoKey() {
-    key_ = com.google.protobuf.ByteString.EMPTY;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private UnwrappedCryptoKey(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-
-            key_ = input.readBytes();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_UnwrappedCryptoKey_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_UnwrappedCryptoKey_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.class, com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.Builder.class);
-  }
-
-  public static final int KEY_FIELD_NUMBER = 1;
-  private com.google.protobuf.ByteString key_;
-  /**
-   * 
-   * The AES 128/192/256 bit key. [required]
-   * 

-   *
-   * bytes key = 1;
-   */
-  public com.google.protobuf.ByteString getKey() {
-    return key_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (!key_.isEmpty()) {
-      output.writeBytes(1, key_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (!key_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBytesSize(1, key_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey other = (com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) obj;
-
-    boolean result = true;
-    result = result && getKey()
-        .equals(other.getKey());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + KEY_FIELD_NUMBER;
-    hash = (53 * hash) + getKey().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Using raw keys is prone to security risks due to accidentally
-   * leaking the key. Choose another type of key if possible.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.UnwrappedCryptoKey}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.UnwrappedCryptoKey)
-      com.google.privacy.dlp.v2beta1.UnwrappedCryptoKeyOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_UnwrappedCryptoKey_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_UnwrappedCryptoKey_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.class, com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      key_ = com.google.protobuf.ByteString.EMPTY;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_UnwrappedCryptoKey_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey build() {
-      com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey buildPartial() {
-      com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey result = new com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey(this);
-      result.key_ = key_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey other) {
-      if (other == com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey.getDefaultInstance()) return this;
-      if (other.getKey() != com.google.protobuf.ByteString.EMPTY) {
-        setKey(other.getKey());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.protobuf.ByteString key_ = com.google.protobuf.ByteString.EMPTY;
-    /**
-     * 
-     * The AES 128/192/256 bit key. [required]
-     * 

-     *
-     * bytes key = 1;
-     */
-    public com.google.protobuf.ByteString getKey() {
-      return key_;
-    }
-    /**
-     * 
-     * The AES 128/192/256 bit key. [required]
-     * 

-     *
-     * bytes key = 1;
-     */
-    public Builder setKey(com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      key_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * The AES 128/192/256 bit key. [required]
-     * 

-     *
-     * bytes key = 1;
-     */
-    public Builder clearKey() {
-      
-      key_ = getDefaultInstance().getKey();
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.UnwrappedCryptoKey)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.UnwrappedCryptoKey)
-  private static final com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public UnwrappedCryptoKey parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UnwrappedCryptoKey(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.UnwrappedCryptoKey getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/UnwrappedCryptoKeyOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/UnwrappedCryptoKeyOrBuilder.java
deleted file mode 100644
index ca177eb60e10..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/UnwrappedCryptoKeyOrBuilder.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface UnwrappedCryptoKeyOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.UnwrappedCryptoKey)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * The AES 128/192/256 bit key. [required]
-   * 

-   *
-   * bytes key = 1;
-   */
-  com.google.protobuf.ByteString getKey();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Value.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Value.java
deleted file mode 100644
index 2034d4155654..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Value.java
+++ /dev/null
@@ -1,1452 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * Set of primitive values supported by the system.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.Value}
- */
-public  final class Value extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.Value)
-    ValueOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use Value.newBuilder() to construct.
-  private Value(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private Value() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private Value(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            typeCase_ = 1;
-            type_ = input.readInt64();
-            break;
-          }
-          case 17: {
-            typeCase_ = 2;
-            type_ = input.readDouble();
-            break;
-          }
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-            typeCase_ = 3;
-            type_ = s;
-            break;
-          }
-          case 32: {
-            typeCase_ = 4;
-            type_ = input.readBool();
-            break;
-          }
-          case 42: {
-            com.google.protobuf.Timestamp.Builder subBuilder = null;
-            if (typeCase_ == 5) {
-              subBuilder = ((com.google.protobuf.Timestamp) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.protobuf.Timestamp) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 5;
-            break;
-          }
-          case 50: {
-            com.google.type.TimeOfDay.Builder subBuilder = null;
-            if (typeCase_ == 6) {
-              subBuilder = ((com.google.type.TimeOfDay) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.type.TimeOfDay.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.type.TimeOfDay) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 6;
-            break;
-          }
-          case 58: {
-            com.google.type.Date.Builder subBuilder = null;
-            if (typeCase_ == 7) {
-              subBuilder = ((com.google.type.Date) type_).toBuilder();
-            }
-            type_ =
-                input.readMessage(com.google.type.Date.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((com.google.type.Date) type_);
-              type_ = subBuilder.buildPartial();
-            }
-            typeCase_ = 7;
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Value_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Value_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.Value.class, com.google.privacy.dlp.v2beta1.Value.Builder.class);
-  }
-
-  private int typeCase_ = 0;
-  private java.lang.Object type_;
-  public enum TypeCase
-      implements com.google.protobuf.Internal.EnumLite {
-    INTEGER_VALUE(1),
-    FLOAT_VALUE(2),
-    STRING_VALUE(3),
-    BOOLEAN_VALUE(4),
-    TIMESTAMP_VALUE(5),
-    TIME_VALUE(6),
-    DATE_VALUE(7),
-    TYPE_NOT_SET(0);
-    private final int value;
-    private TypeCase(int value) {
-      this.value = value;
-    }
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static TypeCase valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static TypeCase forNumber(int value) {
-      switch (value) {
-        case 1: return INTEGER_VALUE;
-        case 2: return FLOAT_VALUE;
-        case 3: return STRING_VALUE;
-        case 4: return BOOLEAN_VALUE;
-        case 5: return TIMESTAMP_VALUE;
-        case 6: return TIME_VALUE;
-        case 7: return DATE_VALUE;
-        case 0: return TYPE_NOT_SET;
-        default: return null;
-      }
-    }
-    public int getNumber() {
-      return this.value;
-    }
-  };
-
-  public TypeCase
-  getTypeCase() {
-    return TypeCase.forNumber(
-        typeCase_);
-  }
-
-  public static final int INTEGER_VALUE_FIELD_NUMBER = 1;
-  /**
-   * int64 integer_value = 1;
-   */
-  public long getIntegerValue() {
-    if (typeCase_ == 1) {
-      return (java.lang.Long) type_;
-    }
-    return 0L;
-  }
-
-  public static final int FLOAT_VALUE_FIELD_NUMBER = 2;
-  /**
-   * double float_value = 2;
-   */
-  public double getFloatValue() {
-    if (typeCase_ == 2) {
-      return (java.lang.Double) type_;
-    }
-    return 0D;
-  }
-
-  public static final int STRING_VALUE_FIELD_NUMBER = 3;
-  /**
-   * string string_value = 3;
-   */
-  public java.lang.String getStringValue() {
-    java.lang.Object ref = "";
-    if (typeCase_ == 3) {
-      ref = type_;
-    }
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      if (typeCase_ == 3) {
-        type_ = s;
-      }
-      return s;
-    }
-  }
-  /**
-   * string string_value = 3;
-   */
-  public com.google.protobuf.ByteString
-      getStringValueBytes() {
-    java.lang.Object ref = "";
-    if (typeCase_ == 3) {
-      ref = type_;
-    }
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      if (typeCase_ == 3) {
-        type_ = b;
-      }
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int BOOLEAN_VALUE_FIELD_NUMBER = 4;
-  /**
-   * bool boolean_value = 4;
-   */
-  public boolean getBooleanValue() {
-    if (typeCase_ == 4) {
-      return (java.lang.Boolean) type_;
-    }
-    return false;
-  }
-
-  public static final int TIMESTAMP_VALUE_FIELD_NUMBER = 5;
-  /**
-   * .google.protobuf.Timestamp timestamp_value = 5;
-   */
-  public boolean hasTimestampValue() {
-    return typeCase_ == 5;
-  }
-  /**
-   * .google.protobuf.Timestamp timestamp_value = 5;
-   */
-  public com.google.protobuf.Timestamp getTimestampValue() {
-    if (typeCase_ == 5) {
-       return (com.google.protobuf.Timestamp) type_;
-    }
-    return com.google.protobuf.Timestamp.getDefaultInstance();
-  }
-  /**
-   * .google.protobuf.Timestamp timestamp_value = 5;
-   */
-  public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
-    if (typeCase_ == 5) {
-       return (com.google.protobuf.Timestamp) type_;
-    }
-    return com.google.protobuf.Timestamp.getDefaultInstance();
-  }
-
-  public static final int TIME_VALUE_FIELD_NUMBER = 6;
-  /**
-   * .google.type.TimeOfDay time_value = 6;
-   */
-  public boolean hasTimeValue() {
-    return typeCase_ == 6;
-  }
-  /**
-   * .google.type.TimeOfDay time_value = 6;
-   */
-  public com.google.type.TimeOfDay getTimeValue() {
-    if (typeCase_ == 6) {
-       return (com.google.type.TimeOfDay) type_;
-    }
-    return com.google.type.TimeOfDay.getDefaultInstance();
-  }
-  /**
-   * .google.type.TimeOfDay time_value = 6;
-   */
-  public com.google.type.TimeOfDayOrBuilder getTimeValueOrBuilder() {
-    if (typeCase_ == 6) {
-       return (com.google.type.TimeOfDay) type_;
-    }
-    return com.google.type.TimeOfDay.getDefaultInstance();
-  }
-
-  public static final int DATE_VALUE_FIELD_NUMBER = 7;
-  /**
-   * .google.type.Date date_value = 7;
-   */
-  public boolean hasDateValue() {
-    return typeCase_ == 7;
-  }
-  /**
-   * .google.type.Date date_value = 7;
-   */
-  public com.google.type.Date getDateValue() {
-    if (typeCase_ == 7) {
-       return (com.google.type.Date) type_;
-    }
-    return com.google.type.Date.getDefaultInstance();
-  }
-  /**
-   * .google.type.Date date_value = 7;
-   */
-  public com.google.type.DateOrBuilder getDateValueOrBuilder() {
-    if (typeCase_ == 7) {
-       return (com.google.type.Date) type_;
-    }
-    return com.google.type.Date.getDefaultInstance();
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (typeCase_ == 1) {
-      output.writeInt64(
-          1, (long)((java.lang.Long) type_));
-    }
-    if (typeCase_ == 2) {
-      output.writeDouble(
-          2, (double)((java.lang.Double) type_));
-    }
-    if (typeCase_ == 3) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 3, type_);
-    }
-    if (typeCase_ == 4) {
-      output.writeBool(
-          4, (boolean)((java.lang.Boolean) type_));
-    }
-    if (typeCase_ == 5) {
-      output.writeMessage(5, (com.google.protobuf.Timestamp) type_);
-    }
-    if (typeCase_ == 6) {
-      output.writeMessage(6, (com.google.type.TimeOfDay) type_);
-    }
-    if (typeCase_ == 7) {
-      output.writeMessage(7, (com.google.type.Date) type_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (typeCase_ == 1) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(
-            1, (long)((java.lang.Long) type_));
-    }
-    if (typeCase_ == 2) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeDoubleSize(
-            2, (double)((java.lang.Double) type_));
-    }
-    if (typeCase_ == 3) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, type_);
-    }
-    if (typeCase_ == 4) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeBoolSize(
-            4, (boolean)((java.lang.Boolean) type_));
-    }
-    if (typeCase_ == 5) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(5, (com.google.protobuf.Timestamp) type_);
-    }
-    if (typeCase_ == 6) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(6, (com.google.type.TimeOfDay) type_);
-    }
-    if (typeCase_ == 7) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(7, (com.google.type.Date) type_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.Value)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.Value other = (com.google.privacy.dlp.v2beta1.Value) obj;
-
-    boolean result = true;
-    result = result && getTypeCase().equals(
-        other.getTypeCase());
-    if (!result) return false;
-    switch (typeCase_) {
-      case 1:
-        result = result && (getIntegerValue()
-            == other.getIntegerValue());
-        break;
-      case 2:
-        result = result && (
-            java.lang.Double.doubleToLongBits(getFloatValue())
-            == java.lang.Double.doubleToLongBits(
-                other.getFloatValue()));
-        break;
-      case 3:
-        result = result && getStringValue()
-            .equals(other.getStringValue());
-        break;
-      case 4:
-        result = result && (getBooleanValue()
-            == other.getBooleanValue());
-        break;
-      case 5:
-        result = result && getTimestampValue()
-            .equals(other.getTimestampValue());
-        break;
-      case 6:
-        result = result && getTimeValue()
-            .equals(other.getTimeValue());
-        break;
-      case 7:
-        result = result && getDateValue()
-            .equals(other.getDateValue());
-        break;
-      case 0:
-      default:
-    }
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    switch (typeCase_) {
-      case 1:
-        hash = (37 * hash) + INTEGER_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            getIntegerValue());
-        break;
-      case 2:
-        hash = (37 * hash) + FLOAT_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-            java.lang.Double.doubleToLongBits(getFloatValue()));
-        break;
-      case 3:
-        hash = (37 * hash) + STRING_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + getStringValue().hashCode();
-        break;
-      case 4:
-        hash = (37 * hash) + BOOLEAN_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-            getBooleanValue());
-        break;
-      case 5:
-        hash = (37 * hash) + TIMESTAMP_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + getTimestampValue().hashCode();
-        break;
-      case 6:
-        hash = (37 * hash) + TIME_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + getTimeValue().hashCode();
-        break;
-      case 7:
-        hash = (37 * hash) + DATE_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + getDateValue().hashCode();
-        break;
-      case 0:
-      default:
-    }
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Value parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Value parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Value parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Value parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Value parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.Value parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Value parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Value parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Value parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Value parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.Value parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.Value parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.Value prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * Set of primitive values supported by the system.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.Value}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.Value)
-      com.google.privacy.dlp.v2beta1.ValueOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Value_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Value_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.Value.class, com.google.privacy.dlp.v2beta1.Value.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.Value.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      typeCase_ = 0;
-      type_ = null;
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Value_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Value getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.Value.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.Value build() {
-      com.google.privacy.dlp.v2beta1.Value result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.Value buildPartial() {
-      com.google.privacy.dlp.v2beta1.Value result = new com.google.privacy.dlp.v2beta1.Value(this);
-      if (typeCase_ == 1) {
-        result.type_ = type_;
-      }
-      if (typeCase_ == 2) {
-        result.type_ = type_;
-      }
-      if (typeCase_ == 3) {
-        result.type_ = type_;
-      }
-      if (typeCase_ == 4) {
-        result.type_ = type_;
-      }
-      if (typeCase_ == 5) {
-        if (timestampValueBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = timestampValueBuilder_.build();
-        }
-      }
-      if (typeCase_ == 6) {
-        if (timeValueBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = timeValueBuilder_.build();
-        }
-      }
-      if (typeCase_ == 7) {
-        if (dateValueBuilder_ == null) {
-          result.type_ = type_;
-        } else {
-          result.type_ = dateValueBuilder_.build();
-        }
-      }
-      result.typeCase_ = typeCase_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.Value) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.Value)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.Value other) {
-      if (other == com.google.privacy.dlp.v2beta1.Value.getDefaultInstance()) return this;
-      switch (other.getTypeCase()) {
-        case INTEGER_VALUE: {
-          setIntegerValue(other.getIntegerValue());
-          break;
-        }
-        case FLOAT_VALUE: {
-          setFloatValue(other.getFloatValue());
-          break;
-        }
-        case STRING_VALUE: {
-          typeCase_ = 3;
-          type_ = other.type_;
-          onChanged();
-          break;
-        }
-        case BOOLEAN_VALUE: {
-          setBooleanValue(other.getBooleanValue());
-          break;
-        }
-        case TIMESTAMP_VALUE: {
-          mergeTimestampValue(other.getTimestampValue());
-          break;
-        }
-        case TIME_VALUE: {
-          mergeTimeValue(other.getTimeValue());
-          break;
-        }
-        case DATE_VALUE: {
-          mergeDateValue(other.getDateValue());
-          break;
-        }
-        case TYPE_NOT_SET: {
-          break;
-        }
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.Value parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.Value) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int typeCase_ = 0;
-    private java.lang.Object type_;
-    public TypeCase
-        getTypeCase() {
-      return TypeCase.forNumber(
-          typeCase_);
-    }
-
-    public Builder clearType() {
-      typeCase_ = 0;
-      type_ = null;
-      onChanged();
-      return this;
-    }
-
-
-    /**
-     * int64 integer_value = 1;
-     */
-    public long getIntegerValue() {
-      if (typeCase_ == 1) {
-        return (java.lang.Long) type_;
-      }
-      return 0L;
-    }
-    /**
-     * int64 integer_value = 1;
-     */
-    public Builder setIntegerValue(long value) {
-      typeCase_ = 1;
-      type_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * int64 integer_value = 1;
-     */
-    public Builder clearIntegerValue() {
-      if (typeCase_ == 1) {
-        typeCase_ = 0;
-        type_ = null;
-        onChanged();
-      }
-      return this;
-    }
-
-    /**
-     * double float_value = 2;
-     */
-    public double getFloatValue() {
-      if (typeCase_ == 2) {
-        return (java.lang.Double) type_;
-      }
-      return 0D;
-    }
-    /**
-     * double float_value = 2;
-     */
-    public Builder setFloatValue(double value) {
-      typeCase_ = 2;
-      type_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * double float_value = 2;
-     */
-    public Builder clearFloatValue() {
-      if (typeCase_ == 2) {
-        typeCase_ = 0;
-        type_ = null;
-        onChanged();
-      }
-      return this;
-    }
-
-    /**
-     * string string_value = 3;
-     */
-    public java.lang.String getStringValue() {
-      java.lang.Object ref = "";
-      if (typeCase_ == 3) {
-        ref = type_;
-      }
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (typeCase_ == 3) {
-          type_ = s;
-        }
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * string string_value = 3;
-     */
-    public com.google.protobuf.ByteString
-        getStringValueBytes() {
-      java.lang.Object ref = "";
-      if (typeCase_ == 3) {
-        ref = type_;
-      }
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        if (typeCase_ == 3) {
-          type_ = b;
-        }
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * string string_value = 3;
-     */
-    public Builder setStringValue(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  typeCase_ = 3;
-      type_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * string string_value = 3;
-     */
-    public Builder clearStringValue() {
-      if (typeCase_ == 3) {
-        typeCase_ = 0;
-        type_ = null;
-        onChanged();
-      }
-      return this;
-    }
-    /**
-     * string string_value = 3;
-     */
-    public Builder setStringValueBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      typeCase_ = 3;
-      type_ = value;
-      onChanged();
-      return this;
-    }
-
-    /**
-     * bool boolean_value = 4;
-     */
-    public boolean getBooleanValue() {
-      if (typeCase_ == 4) {
-        return (java.lang.Boolean) type_;
-      }
-      return false;
-    }
-    /**
-     * bool boolean_value = 4;
-     */
-    public Builder setBooleanValue(boolean value) {
-      typeCase_ = 4;
-      type_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * bool boolean_value = 4;
-     */
-    public Builder clearBooleanValue() {
-      if (typeCase_ == 4) {
-        typeCase_ = 0;
-        type_ = null;
-        onChanged();
-      }
-      return this;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> timestampValueBuilder_;
-    /**
-     * .google.protobuf.Timestamp timestamp_value = 5;
-     */
-    public boolean hasTimestampValue() {
-      return typeCase_ == 5;
-    }
-    /**
-     * .google.protobuf.Timestamp timestamp_value = 5;
-     */
-    public com.google.protobuf.Timestamp getTimestampValue() {
-      if (timestampValueBuilder_ == null) {
-        if (typeCase_ == 5) {
-          return (com.google.protobuf.Timestamp) type_;
-        }
-        return com.google.protobuf.Timestamp.getDefaultInstance();
-      } else {
-        if (typeCase_ == 5) {
-          return timestampValueBuilder_.getMessage();
-        }
-        return com.google.protobuf.Timestamp.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.protobuf.Timestamp timestamp_value = 5;
-     */
-    public Builder setTimestampValue(com.google.protobuf.Timestamp value) {
-      if (timestampValueBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        timestampValueBuilder_.setMessage(value);
-      }
-      typeCase_ = 5;
-      return this;
-    }
-    /**
-     * .google.protobuf.Timestamp timestamp_value = 5;
-     */
-    public Builder setTimestampValue(
-        com.google.protobuf.Timestamp.Builder builderForValue) {
-      if (timestampValueBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        timestampValueBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 5;
-      return this;
-    }
-    /**
-     * .google.protobuf.Timestamp timestamp_value = 5;
-     */
-    public Builder mergeTimestampValue(com.google.protobuf.Timestamp value) {
-      if (timestampValueBuilder_ == null) {
-        if (typeCase_ == 5 &&
-            type_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          type_ = com.google.protobuf.Timestamp.newBuilder((com.google.protobuf.Timestamp) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 5) {
-          timestampValueBuilder_.mergeFrom(value);
-        }
-        timestampValueBuilder_.setMessage(value);
-      }
-      typeCase_ = 5;
-      return this;
-    }
-    /**
-     * .google.protobuf.Timestamp timestamp_value = 5;
-     */
-    public Builder clearTimestampValue() {
-      if (timestampValueBuilder_ == null) {
-        if (typeCase_ == 5) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 5) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        timestampValueBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.protobuf.Timestamp timestamp_value = 5;
-     */
-    public com.google.protobuf.Timestamp.Builder getTimestampValueBuilder() {
-      return getTimestampValueFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.protobuf.Timestamp timestamp_value = 5;
-     */
-    public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
-      if ((typeCase_ == 5) && (timestampValueBuilder_ != null)) {
-        return timestampValueBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 5) {
-          return (com.google.protobuf.Timestamp) type_;
-        }
-        return com.google.protobuf.Timestamp.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.protobuf.Timestamp timestamp_value = 5;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
-        getTimestampValueFieldBuilder() {
-      if (timestampValueBuilder_ == null) {
-        if (!(typeCase_ == 5)) {
-          type_ = com.google.protobuf.Timestamp.getDefaultInstance();
-        }
-        timestampValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
-                (com.google.protobuf.Timestamp) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 5;
-      onChanged();;
-      return timestampValueBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.type.TimeOfDay, com.google.type.TimeOfDay.Builder, com.google.type.TimeOfDayOrBuilder> timeValueBuilder_;
-    /**
-     * .google.type.TimeOfDay time_value = 6;
-     */
-    public boolean hasTimeValue() {
-      return typeCase_ == 6;
-    }
-    /**
-     * .google.type.TimeOfDay time_value = 6;
-     */
-    public com.google.type.TimeOfDay getTimeValue() {
-      if (timeValueBuilder_ == null) {
-        if (typeCase_ == 6) {
-          return (com.google.type.TimeOfDay) type_;
-        }
-        return com.google.type.TimeOfDay.getDefaultInstance();
-      } else {
-        if (typeCase_ == 6) {
-          return timeValueBuilder_.getMessage();
-        }
-        return com.google.type.TimeOfDay.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.type.TimeOfDay time_value = 6;
-     */
-    public Builder setTimeValue(com.google.type.TimeOfDay value) {
-      if (timeValueBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        timeValueBuilder_.setMessage(value);
-      }
-      typeCase_ = 6;
-      return this;
-    }
-    /**
-     * .google.type.TimeOfDay time_value = 6;
-     */
-    public Builder setTimeValue(
-        com.google.type.TimeOfDay.Builder builderForValue) {
-      if (timeValueBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        timeValueBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 6;
-      return this;
-    }
-    /**
-     * .google.type.TimeOfDay time_value = 6;
-     */
-    public Builder mergeTimeValue(com.google.type.TimeOfDay value) {
-      if (timeValueBuilder_ == null) {
-        if (typeCase_ == 6 &&
-            type_ != com.google.type.TimeOfDay.getDefaultInstance()) {
-          type_ = com.google.type.TimeOfDay.newBuilder((com.google.type.TimeOfDay) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 6) {
-          timeValueBuilder_.mergeFrom(value);
-        }
-        timeValueBuilder_.setMessage(value);
-      }
-      typeCase_ = 6;
-      return this;
-    }
-    /**
-     * .google.type.TimeOfDay time_value = 6;
-     */
-    public Builder clearTimeValue() {
-      if (timeValueBuilder_ == null) {
-        if (typeCase_ == 6) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 6) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        timeValueBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.type.TimeOfDay time_value = 6;
-     */
-    public com.google.type.TimeOfDay.Builder getTimeValueBuilder() {
-      return getTimeValueFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.type.TimeOfDay time_value = 6;
-     */
-    public com.google.type.TimeOfDayOrBuilder getTimeValueOrBuilder() {
-      if ((typeCase_ == 6) && (timeValueBuilder_ != null)) {
-        return timeValueBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 6) {
-          return (com.google.type.TimeOfDay) type_;
-        }
-        return com.google.type.TimeOfDay.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.type.TimeOfDay time_value = 6;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.type.TimeOfDay, com.google.type.TimeOfDay.Builder, com.google.type.TimeOfDayOrBuilder> 
-        getTimeValueFieldBuilder() {
-      if (timeValueBuilder_ == null) {
-        if (!(typeCase_ == 6)) {
-          type_ = com.google.type.TimeOfDay.getDefaultInstance();
-        }
-        timeValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.type.TimeOfDay, com.google.type.TimeOfDay.Builder, com.google.type.TimeOfDayOrBuilder>(
-                (com.google.type.TimeOfDay) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 6;
-      onChanged();;
-      return timeValueBuilder_;
-    }
-
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.type.Date, com.google.type.Date.Builder, com.google.type.DateOrBuilder> dateValueBuilder_;
-    /**
-     * .google.type.Date date_value = 7;
-     */
-    public boolean hasDateValue() {
-      return typeCase_ == 7;
-    }
-    /**
-     * .google.type.Date date_value = 7;
-     */
-    public com.google.type.Date getDateValue() {
-      if (dateValueBuilder_ == null) {
-        if (typeCase_ == 7) {
-          return (com.google.type.Date) type_;
-        }
-        return com.google.type.Date.getDefaultInstance();
-      } else {
-        if (typeCase_ == 7) {
-          return dateValueBuilder_.getMessage();
-        }
-        return com.google.type.Date.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.type.Date date_value = 7;
-     */
-    public Builder setDateValue(com.google.type.Date value) {
-      if (dateValueBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        type_ = value;
-        onChanged();
-      } else {
-        dateValueBuilder_.setMessage(value);
-      }
-      typeCase_ = 7;
-      return this;
-    }
-    /**
-     * .google.type.Date date_value = 7;
-     */
-    public Builder setDateValue(
-        com.google.type.Date.Builder builderForValue) {
-      if (dateValueBuilder_ == null) {
-        type_ = builderForValue.build();
-        onChanged();
-      } else {
-        dateValueBuilder_.setMessage(builderForValue.build());
-      }
-      typeCase_ = 7;
-      return this;
-    }
-    /**
-     * .google.type.Date date_value = 7;
-     */
-    public Builder mergeDateValue(com.google.type.Date value) {
-      if (dateValueBuilder_ == null) {
-        if (typeCase_ == 7 &&
-            type_ != com.google.type.Date.getDefaultInstance()) {
-          type_ = com.google.type.Date.newBuilder((com.google.type.Date) type_)
-              .mergeFrom(value).buildPartial();
-        } else {
-          type_ = value;
-        }
-        onChanged();
-      } else {
-        if (typeCase_ == 7) {
-          dateValueBuilder_.mergeFrom(value);
-        }
-        dateValueBuilder_.setMessage(value);
-      }
-      typeCase_ = 7;
-      return this;
-    }
-    /**
-     * .google.type.Date date_value = 7;
-     */
-    public Builder clearDateValue() {
-      if (dateValueBuilder_ == null) {
-        if (typeCase_ == 7) {
-          typeCase_ = 0;
-          type_ = null;
-          onChanged();
-        }
-      } else {
-        if (typeCase_ == 7) {
-          typeCase_ = 0;
-          type_ = null;
-        }
-        dateValueBuilder_.clear();
-      }
-      return this;
-    }
-    /**
-     * .google.type.Date date_value = 7;
-     */
-    public com.google.type.Date.Builder getDateValueBuilder() {
-      return getDateValueFieldBuilder().getBuilder();
-    }
-    /**
-     * .google.type.Date date_value = 7;
-     */
-    public com.google.type.DateOrBuilder getDateValueOrBuilder() {
-      if ((typeCase_ == 7) && (dateValueBuilder_ != null)) {
-        return dateValueBuilder_.getMessageOrBuilder();
-      } else {
-        if (typeCase_ == 7) {
-          return (com.google.type.Date) type_;
-        }
-        return com.google.type.Date.getDefaultInstance();
-      }
-    }
-    /**
-     * .google.type.Date date_value = 7;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.type.Date, com.google.type.Date.Builder, com.google.type.DateOrBuilder> 
-        getDateValueFieldBuilder() {
-      if (dateValueBuilder_ == null) {
-        if (!(typeCase_ == 7)) {
-          type_ = com.google.type.Date.getDefaultInstance();
-        }
-        dateValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.type.Date, com.google.type.Date.Builder, com.google.type.DateOrBuilder>(
-                (com.google.type.Date) type_,
-                getParentForChildren(),
-                isClean());
-        type_ = null;
-      }
-      typeCase_ = 7;
-      onChanged();;
-      return dateValueBuilder_;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.Value)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.Value)
-  private static final com.google.privacy.dlp.v2beta1.Value DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.Value();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.Value getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public Value parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Value(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.Value getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ValueFrequency.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ValueFrequency.java
deleted file mode 100644
index 94d3f09e3f97..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ValueFrequency.java
+++ /dev/null
@@ -1,701 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-/**
- * 
- * A value of a field, including its frequency.
- * 

- *
- * Protobuf type {@code google.privacy.dlp.v2beta1.ValueFrequency}
- */
-public  final class ValueFrequency extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.ValueFrequency)
-    ValueFrequencyOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ValueFrequency.newBuilder() to construct.
-  private ValueFrequency(com.google.protobuf.GeneratedMessageV3.Builder builder) {
-    super(builder);
-  }
-  private ValueFrequency() {
-    count_ = 0L;
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ValueFrequency(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    int mutable_bitField0_ = 0;
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 10: {
-            com.google.privacy.dlp.v2beta1.Value.Builder subBuilder = null;
-            if (value_ != null) {
-              subBuilder = value_.toBuilder();
-            }
-            value_ = input.readMessage(com.google.privacy.dlp.v2beta1.Value.parser(), extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom(value_);
-              value_ = subBuilder.buildPartial();
-            }
-
-            break;
-          }
-          case 16: {
-
-            count_ = input.readInt64();
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ValueFrequency_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ValueFrequency_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.ValueFrequency.class, com.google.privacy.dlp.v2beta1.ValueFrequency.Builder.class);
-  }
-
-  public static final int VALUE_FIELD_NUMBER = 1;
-  private com.google.privacy.dlp.v2beta1.Value value_;
-  /**
-   * 
-   * A value contained in the field in question.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value value = 1;
-   */
-  public boolean hasValue() {
-    return value_ != null;
-  }
-  /**
-   * 
-   * A value contained in the field in question.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value value = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.Value getValue() {
-    return value_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : value_;
-  }
-  /**
-   * 
-   * A value contained in the field in question.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value value = 1;
-   */
-  public com.google.privacy.dlp.v2beta1.ValueOrBuilder getValueOrBuilder() {
-    return getValue();
-  }
-
-  public static final int COUNT_FIELD_NUMBER = 2;
-  private long count_;
-  /**
-   * 
-   * How many times the value is contained in the field.
-   * 

-   *
-   * int64 count = 2;
-   */
-  public long getCount() {
-    return count_;
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    if (value_ != null) {
-      output.writeMessage(1, getValue());
-    }
-    if (count_ != 0L) {
-      output.writeInt64(2, count_);
-    }
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (value_ != null) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeMessageSize(1, getValue());
-    }
-    if (count_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(2, count_);
-    }
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.ValueFrequency)) {
-      return super.equals(obj);
-    }
-    com.google.privacy.dlp.v2beta1.ValueFrequency other = (com.google.privacy.dlp.v2beta1.ValueFrequency) obj;
-
-    boolean result = true;
-    result = result && (hasValue() == other.hasValue());
-    if (hasValue()) {
-      result = result && getValue()
-          .equals(other.getValue());
-    }
-    result = result && (getCount()
-        == other.getCount());
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    if (hasValue()) {
-      hash = (37 * hash) + VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + getValue().hashCode();
-    }
-    hash = (37 * hash) + COUNT_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getCount());
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.ValueFrequency prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * 
-   * A value of a field, including its frequency.
-   * 

-   *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.ValueFrequency}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.ValueFrequency)
-      com.google.privacy.dlp.v2beta1.ValueFrequencyOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ValueFrequency_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ValueFrequency_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.ValueFrequency.class, com.google.privacy.dlp.v2beta1.ValueFrequency.Builder.class);
-    }
-
-    // Construct using com.google.privacy.dlp.v2beta1.ValueFrequency.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      if (valueBuilder_ == null) {
-        value_ = null;
-      } else {
-        value_ = null;
-        valueBuilder_ = null;
-      }
-      count_ = 0L;
-
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_ValueFrequency_descriptor;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ValueFrequency getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.ValueFrequency.getDefaultInstance();
-    }
-
-    public com.google.privacy.dlp.v2beta1.ValueFrequency build() {
-      com.google.privacy.dlp.v2beta1.ValueFrequency result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public com.google.privacy.dlp.v2beta1.ValueFrequency buildPartial() {
-      com.google.privacy.dlp.v2beta1.ValueFrequency result = new com.google.privacy.dlp.v2beta1.ValueFrequency(this);
-      if (valueBuilder_ == null) {
-        result.value_ = value_;
-      } else {
-        result.value_ = valueBuilder_.build();
-      }
-      result.count_ = count_;
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.ValueFrequency) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.ValueFrequency)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.ValueFrequency other) {
-      if (other == com.google.privacy.dlp.v2beta1.ValueFrequency.getDefaultInstance()) return this;
-      if (other.hasValue()) {
-        mergeValue(other.getValue());
-      }
-      if (other.getCount() != 0L) {
-        setCount(other.getCount());
-      }
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.ValueFrequency parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.ValueFrequency) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-
-    private com.google.privacy.dlp.v2beta1.Value value_ = null;
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> valueBuilder_;
-    /**
-     * 
-     * A value contained in the field in question.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 1;
-     */
-    public boolean hasValue() {
-      return valueBuilder_ != null || value_ != null;
-    }
-    /**
-     * 
-     * A value contained in the field in question.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Value getValue() {
-      if (valueBuilder_ == null) {
-        return value_ == null ? com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : value_;
-      } else {
-        return valueBuilder_.getMessage();
-      }
-    }
-    /**
-     * 
-     * A value contained in the field in question.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 1;
-     */
-    public Builder setValue(com.google.privacy.dlp.v2beta1.Value value) {
-      if (valueBuilder_ == null) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        value_ = value;
-        onChanged();
-      } else {
-        valueBuilder_.setMessage(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * A value contained in the field in question.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 1;
-     */
-    public Builder setValue(
-        com.google.privacy.dlp.v2beta1.Value.Builder builderForValue) {
-      if (valueBuilder_ == null) {
-        value_ = builderForValue.build();
-        onChanged();
-      } else {
-        valueBuilder_.setMessage(builderForValue.build());
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * A value contained in the field in question.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 1;
-     */
-    public Builder mergeValue(com.google.privacy.dlp.v2beta1.Value value) {
-      if (valueBuilder_ == null) {
-        if (value_ != null) {
-          value_ =
-            com.google.privacy.dlp.v2beta1.Value.newBuilder(value_).mergeFrom(value).buildPartial();
-        } else {
-          value_ = value;
-        }
-        onChanged();
-      } else {
-        valueBuilder_.mergeFrom(value);
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * A value contained in the field in question.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 1;
-     */
-    public Builder clearValue() {
-      if (valueBuilder_ == null) {
-        value_ = null;
-        onChanged();
-      } else {
-        value_ = null;
-        valueBuilder_ = null;
-      }
-
-      return this;
-    }
-    /**
-     * 
-     * A value contained in the field in question.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.Value.Builder getValueBuilder() {
-      
-      onChanged();
-      return getValueFieldBuilder().getBuilder();
-    }
-    /**
-     * 
-     * A value contained in the field in question.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 1;
-     */
-    public com.google.privacy.dlp.v2beta1.ValueOrBuilder getValueOrBuilder() {
-      if (valueBuilder_ != null) {
-        return valueBuilder_.getMessageOrBuilder();
-      } else {
-        return value_ == null ?
-            com.google.privacy.dlp.v2beta1.Value.getDefaultInstance() : value_;
-      }
-    }
-    /**
-     * 
-     * A value contained in the field in question.
-     * 

-     *
-     * .google.privacy.dlp.v2beta1.Value value = 1;
-     */
-    private com.google.protobuf.SingleFieldBuilderV3<
-        com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder> 
-        getValueFieldBuilder() {
-      if (valueBuilder_ == null) {
-        valueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            com.google.privacy.dlp.v2beta1.Value, com.google.privacy.dlp.v2beta1.Value.Builder, com.google.privacy.dlp.v2beta1.ValueOrBuilder>(
-                getValue(),
-                getParentForChildren(),
-                isClean());
-        value_ = null;
-      }
-      return valueBuilder_;
-    }
-
-    private long count_ ;
-    /**
-     * 
-     * How many times the value is contained in the field.
-     * 

-     *
-     * int64 count = 2;
-     */
-    public long getCount() {
-      return count_;
-    }
-    /**
-     * 
-     * How many times the value is contained in the field.
-     * 

-     *
-     * int64 count = 2;
-     */
-    public Builder setCount(long value) {
-      
-      count_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * 
-     * How many times the value is contained in the field.
-     * 

-     *
-     * int64 count = 2;
-     */
-    public Builder clearCount() {
-      
-      count_ = 0L;
-      onChanged();
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.ValueFrequency)
-  }
-
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.ValueFrequency)
-  private static final com.google.privacy.dlp.v2beta1.ValueFrequency DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.ValueFrequency();
-  }
-
-  public static com.google.privacy.dlp.v2beta1.ValueFrequency getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public ValueFrequency parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ValueFrequency(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
-    return PARSER;
-  }
-
-  public com.google.privacy.dlp.v2beta1.ValueFrequency getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ValueFrequencyOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ValueFrequencyOrBuilder.java
deleted file mode 100644
index b53b8646e948..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ValueFrequencyOrBuilder.java
+++ /dev/null
@@ -1,43 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ValueFrequencyOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.ValueFrequency)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * 
-   * A value contained in the field in question.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value value = 1;
-   */
-  boolean hasValue();
-  /**
-   * 
-   * A value contained in the field in question.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value value = 1;
-   */
-  com.google.privacy.dlp.v2beta1.Value getValue();
-  /**
-   * 
-   * A value contained in the field in question.
-   * 

-   *
-   * .google.privacy.dlp.v2beta1.Value value = 1;
-   */
-  com.google.privacy.dlp.v2beta1.ValueOrBuilder getValueOrBuilder();
-
-  /**
-   * 
-   * How many times the value is contained in the field.
-   * 

-   *
-   * int64 count = 2;
-   */
-  long getCount();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ValueOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ValueOrBuilder.java
deleted file mode 100644
index 7b9618601f4b..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/ValueOrBuilder.java
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
-
-package com.google.privacy.dlp.v2beta1;
-
-public interface ValueOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2beta1.Value)
-    com.google.protobuf.MessageOrBuilder {
-
-  /**
-   * int64 integer_value = 1;
-   */
-  long getIntegerValue();
-
-  /**
-   * double float_value = 2;
-   */
-  double getFloatValue();
-
-  /**
-   * string string_value = 3;
-   */
-  java.lang.String getStringValue();
-  /**
-   * string string_value = 3;
-   */
-  com.google.protobuf.ByteString
-      getStringValueBytes();
-
-  /**
-   * bool boolean_value = 4;
-   */
-  boolean getBooleanValue();
-
-  /**
-   * .google.protobuf.Timestamp timestamp_value = 5;
-   */
-  boolean hasTimestampValue();
-  /**
-   * .google.protobuf.Timestamp timestamp_value = 5;
-   */
-  com.google.protobuf.Timestamp getTimestampValue();
-  /**
-   * .google.protobuf.Timestamp timestamp_value = 5;
-   */
-  com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder();
-
-  /**
-   * .google.type.TimeOfDay time_value = 6;
-   */
-  boolean hasTimeValue();
-  /**
-   * .google.type.TimeOfDay time_value = 6;
-   */
-  com.google.type.TimeOfDay getTimeValue();
-  /**
-   * .google.type.TimeOfDay time_value = 6;
-   */
-  com.google.type.TimeOfDayOrBuilder getTimeValueOrBuilder();
-
-  /**
-   * .google.type.Date date_value = 7;
-   */
-  boolean hasDateValue();
-  /**
-   * .google.type.Date date_value = 7;
-   */
-  com.google.type.Date getDateValue();
-  /**
-   * .google.type.Date date_value = 7;
-   */
-  com.google.type.DateOrBuilder getDateValueOrBuilder();
-
-  public com.google.privacy.dlp.v2beta1.Value.TypeCase getTypeCase();
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/proto/google/privacy/dlp/v2beta1/dlp.proto b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/proto/google/privacy/dlp/v2beta1/dlp.proto
deleted file mode 100644
index 1b978eb6c035..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/proto/google/privacy/dlp/v2beta1/dlp.proto
+++ /dev/null
@@ -1,1329 +0,0 @@
-// Copyright 2017 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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";
-
-package google.privacy.dlp.v2beta1;
-
-import "google/api/annotations.proto";
-import "google/longrunning/operations.proto";
-import "google/privacy/dlp/v2beta1/storage.proto";
-import "google/protobuf/empty.proto";
-import "google/protobuf/timestamp.proto";
-import "google/type/date.proto";
-import "google/type/timeofday.proto";
-
-option csharp_namespace = "Google.Cloud.Dlp.V2Beta1";
-option go_package = "google.golang.org/genproto/googleapis/privacy/dlp/v2beta1;dlp";
-option java_multiple_files = true;
-option java_outer_classname = "DlpProto";
-option java_package = "com.google.privacy.dlp.v2beta1";
-option php_namespace = "Google\\Cloud\\Dlp\\V2beta1";
-
-
-// The DLP API is a service that allows clients
-// to detect the presence of Personally Identifiable Information (PII) and other
-// privacy-sensitive data in user-supplied, unstructured data streams, like text
-// blocks or images.
-// The service also includes methods for sensitive data redaction and
-// scheduling of data scans on Google Cloud Platform based data sets.
-service DlpService {
-  // Finds potentially sensitive info in a list of strings.
-  // This method has limits on input size, processing time, and output size.
-  rpc InspectContent(InspectContentRequest) returns (InspectContentResponse) {
-    option (google.api.http) = { post: "/v2beta1/content:inspect" body: "*" };
-  }
-
-  // Redacts potentially sensitive info from a list of strings.
-  // This method has limits on input size, processing time, and output size.
-  rpc RedactContent(RedactContentRequest) returns (RedactContentResponse) {
-    option (google.api.http) = { post: "/v2beta1/content:redact" body: "*" };
-  }
-
-  // De-identifies potentially sensitive info from a list of strings.
-  // This method has limits on input size and output size.
-  rpc DeidentifyContent(DeidentifyContentRequest) returns (DeidentifyContentResponse) {
-    option (google.api.http) = { post: "/v2beta1/content:deidentify" body: "*" };
-  }
-
-  // Schedules a job scanning content in a Google Cloud Platform data
-  // repository.
-  rpc CreateInspectOperation(CreateInspectOperationRequest) returns (google.longrunning.Operation) {
-    option (google.api.http) = { post: "/v2beta1/inspect/operations" body: "*" };
-  }
-
-  // Schedules a job to compute risk analysis metrics over content in a Google
-  // Cloud Platform repository.
-  rpc AnalyzeDataSourceRisk(AnalyzeDataSourceRiskRequest) returns (google.longrunning.Operation) {
-    option (google.api.http) = { post: "/v2beta1/dataSource:analyze" body: "*" };
-  }
-
-  // Returns list of results for given inspect operation result set id.
-  rpc ListInspectFindings(ListInspectFindingsRequest) returns (ListInspectFindingsResponse) {
-    option (google.api.http) = { get: "/v2beta1/{name=inspect/results/*}/findings" };
-  }
-
-  // Returns sensitive information types for given category.
-  rpc ListInfoTypes(ListInfoTypesRequest) returns (ListInfoTypesResponse) {
-    option (google.api.http) = { get: "/v2beta1/rootCategories/{category=*}/infoTypes" };
-  }
-
-  // Returns the list of root categories of sensitive information.
-  rpc ListRootCategories(ListRootCategoriesRequest) returns (ListRootCategoriesResponse) {
-    option (google.api.http) = { get: "/v2beta1/rootCategories" };
-  }
-}
-
-// Configuration description of the scanning process.
-// When used with redactContent only info_types and min_likelihood are currently
-// used.
-message InspectConfig {
-  // Max findings configuration per info type, per content item or long running
-  // operation.
-  message InfoTypeLimit {
-    // Type of information the findings limit applies to. Only one limit per
-    // info_type should be provided. If InfoTypeLimit does not have an
-    // info_type, the DLP API applies the limit against all info_types that are
-    // found but not specified in another InfoTypeLimit.
-    InfoType info_type = 1;
-
-    // Max findings limit for the given infoType.
-    int32 max_findings = 2;
-  }
-
-  // Restricts what info_types to look for. The values must correspond to
-  // InfoType values returned by ListInfoTypes or found in documentation.
-  // Empty info_types runs all enabled detectors.
-  repeated InfoType info_types = 1;
-
-  // Only returns findings equal or above this threshold.
-  Likelihood min_likelihood = 2;
-
-  // Limits the number of findings per content item or long running operation.
-  int32 max_findings = 3;
-
-  // When true, a contextual quote from the data that triggered a finding is
-  // included in the response; see Finding.quote.
-  bool include_quote = 4;
-
-  // When true, excludes type information of the findings.
-  bool exclude_types = 6;
-
-  // Configuration of findings limit given for specified info types.
-  repeated InfoTypeLimit info_type_limits = 7;
-
-  // Custom info types provided by the user.
-  repeated CustomInfoType custom_info_types = 8;
-}
-
-// Additional configuration for inspect long running operations.
-message OperationConfig {
-  // Max number of findings per file, Datastore entity, or database row.
-  int64 max_item_findings = 1;
-}
-
-// Container structure for the content to inspect.
-message ContentItem {
-  // Type of the content, as defined in Content-Type HTTP header.
-  // Supported types are: all "text" types, octet streams, PNG images,
-  // JPEG images.
-  string type = 1;
-
-  // Data of the item either in the byte array or UTF-8 string form.
-  oneof data_item {
-    // Content data to inspect or redact.
-    bytes data = 2;
-
-    // String data to inspect or redact.
-    string value = 3;
-
-    // Structured content for inspection.
-    Table table = 4;
-  }
-}
-
-// Structured content to inspect. Up to 50,000 `Value`s per request allowed.
-message Table {
-  message Row {
-    repeated Value values = 1;
-  }
-
-  repeated FieldId headers = 1;
-
-  repeated Row rows = 2;
-}
-
-// All the findings for a single scanned item.
-message InspectResult {
-  // List of findings for an item.
-  repeated Finding findings = 1;
-
-  // If true, then this item might have more findings than were returned,
-  // and the findings returned are an arbitrary subset of all findings.
-  // The findings list might be truncated because the input items were too
-  // large, or because the server reached the maximum amount of resources
-  // allowed for a single API call. For best results, divide the input into
-  // smaller batches.
-  bool findings_truncated = 2;
-}
-
-// Container structure describing a single finding within a string or image.
-message Finding {
-  // The specific string that may be potentially sensitive info.
-  string quote = 1;
-
-  // The specific type of info the string might be.
-  InfoType info_type = 2;
-
-  // Estimate of how likely it is that the info_type is correct.
-  Likelihood likelihood = 3;
-
-  // Location of the info found.
-  Location location = 4;
-
-  // Timestamp when finding was detected.
-  google.protobuf.Timestamp create_time = 6;
-}
-
-// Specifies the location of a finding within its source item.
-message Location {
-  // Zero-based byte offsets within a content item.
-  Range byte_range = 1;
-
-  // Character offsets within a content item, included when content type
-  // is a text. Default charset assumed to be UTF-8.
-  Range codepoint_range = 2;
-
-  // Location within an image's pixels.
-  repeated ImageLocation image_boxes = 3;
-
-  // Key of the finding.
-  RecordKey record_key = 4;
-
-  // Field id of the field containing the finding.
-  FieldId field_id = 5;
-
-  // Location within a `ContentItem.Table`.
-  TableLocation table_location = 6;
-}
-
-// Location of a finding within a `ContentItem.Table`.
-message TableLocation {
-  // The zero-based index of the row where the finding is located.
-  int64 row_index = 1;
-}
-
-// Generic half-open interval [start, end)
-message Range {
-  // Index of the first character of the range (inclusive).
-  int64 start = 1;
-
-  // Index of the last character of the range (exclusive).
-  int64 end = 2;
-}
-
-// Bounding box encompassing detected text within an image.
-message ImageLocation {
-  // Top coordinate of the bounding box. (0,0) is upper left.
-  int32 top = 1;
-
-  // Left coordinate of the bounding box. (0,0) is upper left.
-  int32 left = 2;
-
-  // Width of the bounding box in pixels.
-  int32 width = 3;
-
-  // Height of the bounding box in pixels.
-  int32 height = 4;
-}
-
-// Request to search for potentially sensitive info in a list of items
-// and replace it with a default or provided content.
-message RedactContentRequest {
-  message ReplaceConfig {
-    // Type of information to replace. Only one ReplaceConfig per info_type
-    // should be provided. If ReplaceConfig does not have an info_type, the DLP
-    // API matches it against all info_types that are found but not specified in
-    // another ReplaceConfig.
-    InfoType info_type = 1;
-
-    // Content replacing sensitive information of given type. Max 256 chars.
-    string replace_with = 2;
-  }
-
-  // Configuration for determining how redaction of images should occur.
-  message ImageRedactionConfig {
-    // Type of information to redact from images.
-    oneof target {
-      // Only one per info_type should be provided per request. If not
-      // specified, and redact_all_text is false, the DLP API will redact all
-      // text that it matches against all info_types that are found, but not
-      // specified in another ImageRedactionConfig.
-      InfoType info_type = 1;
-
-      // If true, all text found in the image, regardless whether it matches an
-      // info_type, is redacted.
-      bool redact_all_text = 2;
-    }
-
-    // The color to use when redacting content from an image. If not specified,
-    // the default is black.
-    Color redaction_color = 3;
-  }
-
-  // Configuration for the inspector.
-  InspectConfig inspect_config = 1;
-
-  // The list of items to inspect. Up to 100 are allowed per request.
-  repeated ContentItem items = 2;
-
-  // The strings to replace findings text findings with. Must specify at least
-  // one of these or one ImageRedactionConfig if redacting images.
-  repeated ReplaceConfig replace_configs = 3;
-
-  // The configuration for specifying what content to redact from images.
-  repeated ImageRedactionConfig image_redaction_configs = 4;
-}
-
-// Represents a color in the RGB color space.
-message Color {
-  // The amount of red in the color as a value in the interval [0, 1].
-  float red = 1;
-
-  // The amount of green in the color as a value in the interval [0, 1].
-  float green = 2;
-
-  // The amount of blue in the color as a value in the interval [0, 1].
-  float blue = 3;
-}
-
-// Results of redacting a list of items.
-message RedactContentResponse {
-  // The redacted content.
-  repeated ContentItem items = 1;
-}
-
-// Request to de-identify a list of items.
-message DeidentifyContentRequest {
-  // Configuration for the de-identification of the list of content items.
-  DeidentifyConfig deidentify_config = 1;
-
-  // Configuration for the inspector.
-  InspectConfig inspect_config = 2;
-
-  // The list of items to inspect. Up to 100 are allowed per request.
-  // All items will be treated as text/*.
-  repeated ContentItem items = 3;
-}
-
-// Results of de-identifying a list of items.
-message DeidentifyContentResponse {
-  repeated ContentItem items = 1;
-
-  // A review of the transformations that took place for each item.
-  repeated DeidentificationSummary summaries = 2;
-}
-
-// Request to search for potentially sensitive info in a list of items.
-message InspectContentRequest {
-  // Configuration for the inspector.
-  InspectConfig inspect_config = 1;
-
-  // The list of items to inspect. Items in a single request are
-  // considered "related" unless inspect_config.independent_inputs is true.
-  // Up to 100 are allowed per request.
-  repeated ContentItem items = 2;
-}
-
-// Results of inspecting a list of items.
-message InspectContentResponse {
-  // Each content_item from the request has a result in this list, in the
-  // same order as the request.
-  repeated InspectResult results = 1;
-}
-
-// Request for scheduling a scan of a data subset from a Google Platform data
-// repository.
-message CreateInspectOperationRequest {
-  // Configuration for the inspector.
-  InspectConfig inspect_config = 1;
-
-  // Specification of the data set to process.
-  StorageConfig storage_config = 2;
-
-  // Optional location to store findings.
-  OutputStorageConfig output_config = 3;
-
-  // Additional configuration settings for long running operations.
-  OperationConfig operation_config = 5;
-}
-
-// Cloud repository for storing output.
-message OutputStorageConfig {
-  oneof type {
-    // Store findings in a new table in the dataset.
-    BigQueryTable table = 1;
-
-    // The path to a Google Cloud Storage location to store output.
-    // The bucket must already exist and
-    // the Google APIs service account for DLP must have write permission to
-    // write to the given bucket.
-    // Results are split over multiple csv files with each file name matching
-    // the pattern "[operation_id]_[count].csv", for example
-    // `3094877188788974909_1.csv`. The `operation_id` matches the
-    // identifier for the Operation, and the `count` is a counter used for
-    // tracking the number of files written.
-    //
-    // The CSV file(s) contain the following columns regardless of storage type
-    // scanned:
-    // - id
-    // - info_type
-    // - likelihood
-    // - byte size of finding
-    // - quote
-    // - timestamp
-    //
-    // For Cloud Storage the next columns are:
-    //
-    // - file_path
-    // - start_offset
-    //
-    // For Cloud Datastore the next columns are:
-    //
-    // - project_id
-    // - namespace_id
-    // - path
-    // - column_name
-    // - offset
-    //
-    // For BigQuery the next columns are:
-    //
-    // - row_number
-    // - project_id
-    // - dataset_id
-    // - table_id
-    CloudStoragePath storage_path = 2;
-  }
-}
-
-// Statistics regarding a specific InfoType.
-message InfoTypeStatistics {
-  // The type of finding this stat is for.
-  InfoType info_type = 1;
-
-  // Number of findings for this info type.
-  int64 count = 2;
-}
-
-// Metadata returned within GetOperation for an inspect request.
-message InspectOperationMetadata {
-  // Total size in bytes that were processed.
-  int64 processed_bytes = 1;
-
-  // Estimate of the number of bytes to process.
-  int64 total_estimated_bytes = 4;
-
-  repeated InfoTypeStatistics info_type_stats = 2;
-
-  // The time which this request was started.
-  google.protobuf.Timestamp create_time = 3;
-
-  // The inspect config used to create the Operation.
-  InspectConfig request_inspect_config = 5;
-
-  // The storage config used to create the Operation.
-  StorageConfig request_storage_config = 6;
-
-  // Optional location to store findings.
-  OutputStorageConfig request_output_config = 7;
-}
-
-// The operational data.
-message InspectOperationResult {
-  // The server-assigned name, which is only unique within the same service that
-  // originally returns it. If you use the default HTTP mapping, the
-  // `name` should have the format of `inspect/results/{id}`.
-  string name = 1;
-}
-
-// Request for the list of results in a given inspect operation.
-message ListInspectFindingsRequest {
-  // Identifier of the results set returned as metadata of
-  // the longrunning operation created by a call to InspectDataSource.
-  // Should be in the format of `inspect/results/{id}`.
-  string name = 1;
-
-  // Maximum number of results to return.
-  // If 0, the implementation selects a reasonable value.
-  int32 page_size = 2;
-
-  // The value returned by the last `ListInspectFindingsResponse`; indicates
-  // that this is a continuation of a prior `ListInspectFindings` call, and that
-  // the system should return the next page of data.
-  string page_token = 3;
-
-  // Restricts findings to items that match. Supports info_type and likelihood.
-  //
-  // Examples:
-  //
-  // - info_type=EMAIL_ADDRESS
-  // - info_type=PHONE_NUMBER,EMAIL_ADDRESS
-  // - likelihood=VERY_LIKELY
-  // - likelihood=VERY_LIKELY,LIKELY
-  // - info_type=EMAIL_ADDRESS,likelihood=VERY_LIKELY,LIKELY
-  string filter = 4;
-}
-
-// Response to the ListInspectFindings request.
-message ListInspectFindingsResponse {
-  // The results.
-  InspectResult result = 1;
-
-  // If not empty, indicates that there may be more results that match the
-  // request; this value should be passed in a new `ListInspectFindingsRequest`.
-  string next_page_token = 2;
-}
-
-// Description of the information type (infoType).
-message InfoTypeDescription {
-  // Internal name of the infoType.
-  string name = 1;
-
-  // Human readable form of the infoType name.
-  string display_name = 2;
-
-  // List of categories this infoType belongs to.
-  repeated CategoryDescription categories = 3;
-}
-
-// Request for the list of info types belonging to a given category,
-// or all supported info types if no category is specified.
-message ListInfoTypesRequest {
-  // Category name as returned by ListRootCategories.
-  string category = 1;
-
-  // Optional BCP-47 language code for localized info type friendly
-  // names. If omitted, or if localized strings are not available,
-  // en-US strings will be returned.
-  string language_code = 2;
-}
-
-// Response to the ListInfoTypes request.
-message ListInfoTypesResponse {
-  // Set of sensitive info types belonging to a category.
-  repeated InfoTypeDescription info_types = 1;
-}
-
-// Info Type Category description.
-message CategoryDescription {
-  // Internal name of the category.
-  string name = 1;
-
-  // Human readable form of the category name.
-  string display_name = 2;
-}
-
-// Request for root categories of Info Types supported by the API.
-// Example values might include "FINANCE", "HEALTH", "FAST", "DEFAULT".
-message ListRootCategoriesRequest {
-  // Optional language code for localized friendly category names.
-  // If omitted or if localized strings are not available,
-  // en-US strings will be returned.
-  string language_code = 1;
-}
-
-// Response for ListRootCategories request.
-message ListRootCategoriesResponse {
-  // List of all into type categories supported by the API.
-  repeated CategoryDescription categories = 1;
-}
-
-// Request for creating a risk analysis operation.
-message AnalyzeDataSourceRiskRequest {
-  // Privacy metric to compute.
-  PrivacyMetric privacy_metric = 1;
-
-  // Input dataset to compute metrics over.
-  BigQueryTable source_table = 3;
-}
-
-// Privacy metric to compute for reidentification risk analysis.
-message PrivacyMetric {
-  // Compute numerical stats over an individual column, including
-  // min, max, and quantiles.
-  message NumericalStatsConfig {
-    // Field to compute numerical stats on. Supported types are
-    // integer, float, date, datetime, timestamp, time.
-    FieldId field = 1;
-  }
-
-  // Compute numerical stats over an individual column, including
-  // number of distinct values and value count distribution.
-  message CategoricalStatsConfig {
-    // Field to compute categorical stats on. All column types are
-    // supported except for arrays and structs. However, it may be more
-    // informative to use NumericalStats when the field type is supported,
-    // depending on the data.
-    FieldId field = 1;
-  }
-
-  // k-anonymity metric, used for analysis of reidentification risk.
-  message KAnonymityConfig {
-    // Set of fields to compute k-anonymity over. When multiple fields are
-    // specified, they are considered a single composite key. Structs and
-    // repeated data types are not supported; however, nested fields are
-    // supported so long as they are not structs themselves or nested within
-    // a repeated field.
-    repeated FieldId quasi_ids = 1;
-
-    // Optional message indicating that each distinct `EntityId` should not
-    // contribute to the k-anonymity count more than once per equivalence class.
-    EntityId entity_id = 2;
-  }
-
-  // l-diversity metric, used for analysis of reidentification risk.
-  message LDiversityConfig {
-    // Set of quasi-identifiers indicating how equivalence classes are
-    // defined for the l-diversity computation. When multiple fields are
-    // specified, they are considered a single composite key.
-    repeated FieldId quasi_ids = 1;
-
-    // Sensitive field for computing the l-value.
-    FieldId sensitive_attribute = 2;
-  }
-
-  oneof type {
-    NumericalStatsConfig numerical_stats_config = 1;
-
-    CategoricalStatsConfig categorical_stats_config = 2;
-
-    KAnonymityConfig k_anonymity_config = 3;
-
-    LDiversityConfig l_diversity_config = 4;
-  }
-}
-
-// Metadata returned within the
-// [`riskAnalysis.operations.get`](/dlp/docs/reference/rest/v2beta1/riskAnalysis.operations/get)
-// for risk analysis.
-message RiskAnalysisOperationMetadata {
-  // The time which this request was started.
-  google.protobuf.Timestamp create_time = 1;
-
-  // Privacy metric to compute.
-  PrivacyMetric requested_privacy_metric = 2;
-
-  // Input dataset to compute metrics over.
-  BigQueryTable requested_source_table = 3;
-}
-
-// Result of a risk analysis
-// [`Operation`](/dlp/docs/reference/rest/v2beta1/inspect.operations)
-// request.
-message RiskAnalysisOperationResult {
-  // Result of the numerical stats computation.
-  message NumericalStatsResult {
-    // Minimum value appearing in the column.
-    Value min_value = 1;
-
-    // Maximum value appearing in the column.
-    Value max_value = 2;
-
-    // List of 99 values that partition the set of field values into 100 equal
-    // sized buckets.
-    repeated Value quantile_values = 4;
-  }
-
-  // Result of the categorical stats computation.
-  message CategoricalStatsResult {
-    // Histogram bucket of value frequencies in the column.
-    message CategoricalStatsHistogramBucket {
-      // Lower bound on the value frequency of the values in this bucket.
-      int64 value_frequency_lower_bound = 1;
-
-      // Upper bound on the value frequency of the values in this bucket.
-      int64 value_frequency_upper_bound = 2;
-
-      // Total number of records in this bucket.
-      int64 bucket_size = 3;
-
-      // Sample of value frequencies in this bucket. The total number of
-      // values returned per bucket is capped at 20.
-      repeated ValueFrequency bucket_values = 4;
-    }
-
-    // Histogram of value frequencies in the column.
-    repeated CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5;
-  }
-
-  // Result of the k-anonymity computation.
-  message KAnonymityResult {
-    // The set of columns' values that share the same k-anonymity value.
-    message KAnonymityEquivalenceClass {
-      // Set of values defining the equivalence class. One value per
-      // quasi-identifier column in the original KAnonymity metric message.
-      // The order is always the same as the original request.
-      repeated Value quasi_ids_values = 1;
-
-      // Size of the equivalence class, for example number of rows with the
-      // above set of values.
-      int64 equivalence_class_size = 2;
-    }
-
-    // Histogram bucket of equivalence class sizes in the table.
-    message KAnonymityHistogramBucket {
-      // Lower bound on the size of the equivalence classes in this bucket.
-      int64 equivalence_class_size_lower_bound = 1;
-
-      // Upper bound on the size of the equivalence classes in this bucket.
-      int64 equivalence_class_size_upper_bound = 2;
-
-      // Total number of records in this bucket.
-      int64 bucket_size = 3;
-
-      // Sample of equivalence classes in this bucket. The total number of
-      // classes returned per bucket is capped at 20.
-      repeated KAnonymityEquivalenceClass bucket_values = 4;
-    }
-
-    // Histogram of k-anonymity equivalence classes.
-    repeated KAnonymityHistogramBucket equivalence_class_histogram_buckets = 5;
-  }
-
-  // Result of the l-diversity computation.
-  message LDiversityResult {
-    // The set of columns' values that share the same l-diversity value.
-    message LDiversityEquivalenceClass {
-      // Quasi-identifier values defining the k-anonymity equivalence
-      // class. The order is always the same as the original request.
-      repeated Value quasi_ids_values = 1;
-
-      // Size of the k-anonymity equivalence class.
-      int64 equivalence_class_size = 2;
-
-      // Number of distinct sensitive values in this equivalence class.
-      int64 num_distinct_sensitive_values = 3;
-
-      // Estimated frequencies of top sensitive values.
-      repeated ValueFrequency top_sensitive_values = 4;
-    }
-
-    // Histogram bucket of sensitive value frequencies in the table.
-    message LDiversityHistogramBucket {
-      // Lower bound on the sensitive value frequencies of the equivalence
-      // classes in this bucket.
-      int64 sensitive_value_frequency_lower_bound = 1;
-
-      // Upper bound on the sensitive value frequencies of the equivalence
-      // classes in this bucket.
-      int64 sensitive_value_frequency_upper_bound = 2;
-
-      // Total number of records in this bucket.
-      int64 bucket_size = 3;
-
-      // Sample of equivalence classes in this bucket. The total number of
-      // classes returned per bucket is capped at 20.
-      repeated LDiversityEquivalenceClass bucket_values = 4;
-    }
-
-    // Histogram of l-diversity equivalence class sensitive value frequencies.
-    repeated LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5;
-  }
-
-  // Values associated with this metric.
-  oneof result {
-    NumericalStatsResult numerical_stats_result = 3;
-
-    CategoricalStatsResult categorical_stats_result = 4;
-
-    KAnonymityResult k_anonymity_result = 5;
-
-    LDiversityResult l_diversity_result = 6;
-  }
-}
-
-// A value of a field, including its frequency.
-message ValueFrequency {
-  // A value contained in the field in question.
-  Value value = 1;
-
-  // How many times the value is contained in the field.
-  int64 count = 2;
-}
-
-// Set of primitive values supported by the system.
-message Value {
-  oneof type {
-    int64 integer_value = 1;
-
-    double float_value = 2;
-
-    string string_value = 3;
-
-    bool boolean_value = 4;
-
-    google.protobuf.Timestamp timestamp_value = 5;
-
-    google.type.TimeOfDay time_value = 6;
-
-    google.type.Date date_value = 7;
-  }
-}
-
-// The configuration that controls how the data will change.
-message DeidentifyConfig {
-  oneof transformation {
-    // Treat the dataset as free-form text and apply the same free text
-    // transformation everywhere.
-    InfoTypeTransformations info_type_transformations = 1;
-
-    // Treat the dataset as structured. Transformations can be applied to
-    // specific locations within structured datasets, such as transforming
-    // a column within a table.
-    RecordTransformations record_transformations = 2;
-  }
-}
-
-// A rule for transforming a value.
-message PrimitiveTransformation {
-  oneof transformation {
-    ReplaceValueConfig replace_config = 1;
-
-    RedactConfig redact_config = 2;
-
-    CharacterMaskConfig character_mask_config = 3;
-
-    CryptoReplaceFfxFpeConfig crypto_replace_ffx_fpe_config = 4;
-
-    FixedSizeBucketingConfig fixed_size_bucketing_config = 5;
-
-    BucketingConfig bucketing_config = 6;
-
-    ReplaceWithInfoTypeConfig replace_with_info_type_config = 7;
-
-    TimePartConfig time_part_config = 8;
-
-    CryptoHashConfig crypto_hash_config = 9;
-  }
-}
-
-// For use with `Date`, `Timestamp`, and `TimeOfDay`, extract or preserve a
-// portion of the value.
-message TimePartConfig {
-  enum TimePart {
-    TIME_PART_UNSPECIFIED = 0;
-
-    // [000-9999]
-    YEAR = 1;
-
-    // [1-12]
-    MONTH = 2;
-
-    // [1-31]
-    DAY_OF_MONTH = 3;
-
-    // [1-7]
-    DAY_OF_WEEK = 4;
-
-    // [1-52]
-    WEEK_OF_YEAR = 5;
-
-    // [0-24]
-    HOUR_OF_DAY = 6;
-  }
-
-  TimePart part_to_extract = 1;
-}
-
-// Pseudonymization method that generates surrogates via cryptographic hashing.
-// Uses SHA-256.
-// Outputs a 32 byte digest as an uppercase hex string
-// (for example, 41D1567F7F99F1DC2A5FAB886DEE5BEE).
-// Currently, only string and integer values can be hashed.
-message CryptoHashConfig {
-  // The key used by the hash function.
-  CryptoKey crypto_key = 1;
-}
-
-// Replace each input value with a given `Value`.
-message ReplaceValueConfig {
-  // Value to replace it with.
-  Value new_value = 1;
-}
-
-// Replace each matching finding with the name of the info_type.
-message ReplaceWithInfoTypeConfig {
-
-}
-
-// Redact a given value. For example, if used with an `InfoTypeTransformation`
-// transforming PHONE_NUMBER, and input 'My phone number is 206-555-0123', the
-// output would be 'My phone number is '.
-message RedactConfig {
-
-}
-
-// Characters to skip when doing deidentification of a value. These will be left
-// alone and skipped.
-message CharsToIgnore {
-  enum CharacterGroup {
-    CHARACTER_GROUP_UNSPECIFIED = 0;
-
-    // 0-9
-    NUMERIC = 1;
-
-    // A-Z
-    ALPHA_UPPER_CASE = 2;
-
-    // a-z
-    ALPHA_LOWER_CASE = 3;
-
-    // US Punctuation, one of !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
-    PUNCTUATION = 4;
-
-    // Whitespace character, one of [ \t\n\x0B\f\r]
-    WHITESPACE = 5;
-  }
-
-  oneof characters {
-    string characters_to_skip = 1;
-
-    CharacterGroup common_characters_to_ignore = 2;
-  }
-}
-
-// Partially mask a string by replacing a given number of characters with a
-// fixed character. Masking can start from the beginning or end of the string.
-// This can be used on data of any type (numbers, longs, and so on) and when
-// de-identifying structured data we'll attempt to preserve the original data's
-// type. (This allows you to take a long like 123 and modify it to a string like
-// **3.
-message CharacterMaskConfig {
-  // Character to mask the sensitive values—for example, "*" for an
-  // alphabetic string such as name, or "0" for a numeric string such as ZIP
-  // code or credit card number. String must have length 1. If not supplied, we
-  // will default to "*" for strings, 0 for digits.
-  string masking_character = 1;
-
-  // Number of characters to mask. If not set, all matching chars will be
-  // masked. Skipped characters do not count towards this tally.
-  int32 number_to_mask = 2;
-
-  // Mask characters in reverse order. For example, if `masking_character` is
-  // '0', number_to_mask is 14, and `reverse_order` is false, then
-  // 1234-5678-9012-3456 -> 00000000000000-3456
-  // If `masking_character` is '*', `number_to_mask` is 3, and `reverse_order`
-  // is true, then 12345 -> 12***
-  bool reverse_order = 3;
-
-  // When masking a string, items in this list will be skipped when replacing.
-  // For example, if your string is 555-555-5555 and you ask us to skip `-` and
-  // mask 5 chars with * we would produce ***-*55-5555.
-  repeated CharsToIgnore characters_to_ignore = 4;
-}
-
-// Buckets values based on fixed size ranges. The
-// Bucketing transformation can provide all of this functionality,
-// but requires more configuration. This message is provided as a convenience to
-// the user for simple bucketing strategies.
-// The resulting value will be a hyphenated string of
-// lower_bound-upper_bound.
-// This can be used on data of type: double, long.
-// If the bound Value type differs from the type of data
-// being transformed, we will first attempt converting the type of the data to
-// be transformed to match the type of the bound before comparing.
-message FixedSizeBucketingConfig {
-  // Lower bound value of buckets. All values less than `lower_bound` are
-  // grouped together into a single bucket; for example if `lower_bound` = 10,
-  // then all values less than 10 are replaced with the value “-10”. [Required].
-  Value lower_bound = 1;
-
-  // Upper bound value of buckets. All values greater than upper_bound are
-  // grouped together into a single bucket; for example if `upper_bound` = 89,
-  // then all values greater than 89 are replaced with the value “89+”.
-  // [Required].
-  Value upper_bound = 2;
-
-  // Size of each bucket (except for minimum and maximum buckets). So if
-  // `lower_bound` = 10, `upper_bound` = 89, and `bucket_size` = 10, then the
-  // following buckets would be used: -10, 10-20, 20-30, 30-40, 40-50, 50-60,
-  // 60-70, 70-80, 80-89, 89+. Precision up to 2 decimals works. [Required].
-  double bucket_size = 3;
-}
-
-// Generalization function that buckets values based on ranges. The ranges and
-// replacement values are dynamically provided by the user for custom behavior,
-// such as 1-30 -> LOW 31-65 -> MEDIUM 66-100 -> HIGH
-// This can be used on
-// data of type: number, long, string, timestamp.
-// If the bound `Value` type differs from the type of data being transformed, we
-// will first attempt converting the type of the data to be transformed to match
-// the type of the bound before comparing.
-message BucketingConfig {
-  // Buckets represented as ranges, along with replacement values. Ranges must
-  // be non-overlapping.
-  message Bucket {
-    // Lower bound of the range, inclusive. Type should be the same as max if
-    // used.
-    Value min = 1;
-
-    // Upper bound of the range, exclusive; type must match min.
-    Value max = 2;
-
-    // Replacement value for this bucket. If not provided
-    // the default behavior will be to hyphenate the min-max range.
-    Value replacement_value = 3;
-  }
-
-  repeated Bucket buckets = 1;
-}
-
-// Replaces an identifier with a surrogate using FPE with the FFX
-// mode of operation.
-// The identifier must be representable by the US-ASCII character set.
-// For a given crypto key and context, the same identifier will be
-// replaced with the same surrogate.
-// Identifiers must be at least two characters long.
-// In the case that the identifier is the empty string, it will be skipped.
-message CryptoReplaceFfxFpeConfig {
-  // These are commonly used subsets of the alphabet that the FFX mode
-  // natively supports. In the algorithm, the alphabet is selected using
-  // the "radix". Therefore each corresponds to particular radix.
-  enum FfxCommonNativeAlphabet {
-    FFX_COMMON_NATIVE_ALPHABET_UNSPECIFIED = 0;
-
-    // [0-9] (radix of 10)
-    NUMERIC = 1;
-
-    // [0-9A-F] (radix of 16)
-    HEXADECIMAL = 2;
-
-    // [0-9A-Z] (radix of 36)
-    UPPER_CASE_ALPHA_NUMERIC = 3;
-
-    // [0-9A-Za-z] (radix of 62)
-    ALPHA_NUMERIC = 4;
-  }
-
-  // The key used by the encryption algorithm. [required]
-  CryptoKey crypto_key = 1;
-
-  // A context may be used for higher security since the same
-  // identifier in two different contexts likely will be given a distinct
-  // surrogate. The principle is that the likeliness is inversely related
-  // to the ratio of the number of distinct identifiers per context over the
-  // number of possible surrogates: As long as this ratio is small, the
-  // likehood is large.
-  //
-  // If the context is not set, a default tweak will be used.
-  // If the context is set but:
-  //
-  // 1. there is no record present when transforming a given value or
-  // 1. the field is not present when transforming a given value,
-  //
-  // a default tweak will be used.
-  //
-  // Note that case (1) is expected when an `InfoTypeTransformation` is
-  // applied to both structured and non-structured `ContentItem`s.
-  // Currently, the referenced field may be of value type integer or string.
-  //
-  // The tweak is constructed as a sequence of bytes in big endian byte order
-  // such that:
-  //
-  // - a 64 bit integer is encoded followed by a single byte of value 1
-  // - a string is encoded in UTF-8 format followed by a single byte of value 2
-  //
-  // This is also known as the 'tweak', as in tweakable encryption.
-  FieldId context = 2;
-
-  oneof alphabet {
-    FfxCommonNativeAlphabet common_alphabet = 4;
-
-    // This is supported by mapping these to the alphanumeric characters
-    // that the FFX mode natively supports. This happens before/after
-    // encryption/decryption.
-    // Each character listed must appear only once.
-    // Number of characters must be in the range [2, 62].
-    // This must be encoded as ASCII.
-    // The order of characters does not matter.
-    string custom_alphabet = 5;
-
-    // The native way to select the alphabet. Must be in the range [2, 62].
-    int32 radix = 6;
-  }
-}
-
-// This is a data encryption key (DEK) (as opposed to
-// a key encryption key (KEK) stored by KMS).
-// When using KMS to wrap/unwrap DEKs, be sure to set an appropriate
-// IAM policy on the KMS CryptoKey (KEK) to ensure an attacker cannot
-// unwrap the data crypto key.
-message CryptoKey {
-  oneof source {
-    TransientCryptoKey transient = 1;
-
-    UnwrappedCryptoKey unwrapped = 2;
-
-    KmsWrappedCryptoKey kms_wrapped = 3;
-  }
-}
-
-// Use this to have a random data crypto key generated.
-// It will be discarded after the operation/request finishes.
-message TransientCryptoKey {
-  // Name of the key. [required]
-  // This is an arbitrary string used to differentiate different keys.
-  // A unique key is generated per name: two separate `TransientCryptoKey`
-  // protos share the same generated key if their names are the same.
-  // When the data crypto key is generated, this name is not used in any way
-  // (repeating the api call will result in a different key being generated).
-  string name = 1;
-}
-
-// Using raw keys is prone to security risks due to accidentally
-// leaking the key. Choose another type of key if possible.
-message UnwrappedCryptoKey {
-  // The AES 128/192/256 bit key. [required]
-  bytes key = 1;
-}
-
-// Include to use an existing data crypto key wrapped by KMS.
-// Authorization requires the following IAM permissions when sending a request
-// to perform a crypto transformation using a kms-wrapped crypto key:
-// dlp.kms.encrypt
-message KmsWrappedCryptoKey {
-  // The wrapped data crypto key. [required]
-  bytes wrapped_key = 1;
-
-  // The resource name of the KMS CryptoKey to use for unwrapping. [required]
-  string crypto_key_name = 2;
-}
-
-// A type of transformation that will scan unstructured text and
-// apply various `PrimitiveTransformation`s to each finding, where the
-// transformation is applied to only values that were identified as a specific
-// info_type.
-message InfoTypeTransformations {
-  // A transformation to apply to text that is identified as a specific
-  // info_type.
-  message InfoTypeTransformation {
-    // Info types to apply the transformation to. Empty list will match all
-    // available info types for this transformation.
-    repeated InfoType info_types = 1;
-
-    // Primitive transformation to apply to the info type. [required]
-    PrimitiveTransformation primitive_transformation = 2;
-  }
-
-  // Transformation for each info type. Cannot specify more than one
-  // for a given info type. [required]
-  repeated InfoTypeTransformation transformations = 1;
-}
-
-// The transformation to apply to the field.
-message FieldTransformation {
-  // Input field(s) to apply the transformation to. [required]
-  repeated FieldId fields = 1;
-
-  // Only apply the transformation if the condition evaluates to true for the
-  // given `RecordCondition`. The conditions are allowed to reference fields
-  // that are not used in the actual transformation. [optional]
-  //
-  // Example Use Cases:
-  //
-  // - Apply a different bucket transformation to an age column if the zip code
-  // column for the same record is within a specific range.
-  // - Redact a field if the date of birth field is greater than 85.
-  RecordCondition condition = 3;
-
-  // Transformation to apply. [required]
-  oneof transformation {
-    // Apply the transformation to the entire field.
-    PrimitiveTransformation primitive_transformation = 4;
-
-    // Treat the contents of the field as free text, and selectively
-    // transform content that matches an `InfoType`.
-    InfoTypeTransformations info_type_transformations = 5;
-  }
-}
-
-// A type of transformation that is applied over structured data such as a
-// table.
-message RecordTransformations {
-  // Transform the record by applying various field transformations.
-  repeated FieldTransformation field_transformations = 1;
-
-  // Configuration defining which records get suppressed entirely. Records that
-  // match any suppression rule are omitted from the output [optional].
-  repeated RecordSuppression record_suppressions = 2;
-}
-
-// Configuration to suppress records whose suppression conditions evaluate to
-// true.
-message RecordSuppression {
-  RecordCondition condition = 1;
-}
-
-// A condition for determining whether a transformation should be applied to
-// a field.
-message RecordCondition {
-  // The field type of `value` and `field` do not need to match to be
-  // considered equal, but not all comparisons are possible.
-  //
-  // A `value` of type:
-  //
-  // - `string` can be compared against all other types
-  // - `boolean` can only be compared against other booleans
-  // - `integer` can be compared against doubles or a string if the string value
-  // can be parsed as an integer.
-  // - `double` can be compared against integers or a string if the string can
-  // be parsed as a double.
-  // - `Timestamp` can be compared against strings in RFC 3339 date string
-  // format.
-  // - `TimeOfDay` can be compared against timestamps and strings in the format
-  // of 'HH:mm:ss'.
-  //
-  // If we fail to compare do to type mismatch, a warning will be given and
-  // the condition will evaluate to false.
-  message Condition {
-    // Field within the record this condition is evaluated against. [required]
-    FieldId field = 1;
-
-    // Operator used to compare the field or info type to the value. [required]
-    RelationalOperator operator = 3;
-
-    // Value to compare against. [Required, except for `EXISTS` tests.]
-    Value value = 4;
-  }
-
-  message Conditions {
-    repeated Condition conditions = 1;
-  }
-
-  // A collection of expressions
-  message Expressions {
-    enum LogicalOperator {
-      LOGICAL_OPERATOR_UNSPECIFIED = 0;
-
-      AND = 1;
-    }
-
-    // The operator to apply to the result of conditions. Default and currently
-    // only supported value is `AND`.
-    LogicalOperator logical_operator = 1;
-
-    oneof type {
-      Conditions conditions = 3;
-    }
-  }
-
-  Expressions expressions = 3;
-}
-
-// High level summary of deidentification.
-message DeidentificationSummary {
-  // Total size in bytes that were transformed in some way.
-  int64 transformed_bytes = 2;
-
-  // Transformations applied to the dataset.
-  repeated TransformationSummary transformation_summaries = 3;
-}
-
-// Summary of a single tranformation.
-message TransformationSummary {
-  // A collection that informs the user the number of times a particular
-  // `TransformationResultCode` and error details occurred.
-  message SummaryResult {
-    int64 count = 1;
-
-    TransformationResultCode code = 2;
-
-    // A place for warnings or errors to show up if a transformation didn't
-    // work as expected.
-    string details = 3;
-  }
-
-  // Possible outcomes of transformations.
-  enum TransformationResultCode {
-    TRANSFORMATION_RESULT_CODE_UNSPECIFIED = 0;
-
-    SUCCESS = 1;
-
-    ERROR = 2;
-  }
-
-  // Set if the transformation was limited to a specific info_type.
-  InfoType info_type = 1;
-
-  // Set if the transformation was limited to a specific FieldId.
-  FieldId field = 2;
-
-  // The specific transformation these stats apply to.
-  PrimitiveTransformation transformation = 3;
-
-  // The field transformation that was applied. This list will contain
-  // multiple only in the case of errors.
-  repeated FieldTransformation field_transformations = 5;
-
-  // The specific suppression option these stats apply to.
-  RecordSuppression record_suppress = 6;
-
-  repeated SummaryResult results = 4;
-}
-
-// Categorization of results based on how likely they are to represent a match,
-// based on the number of elements they contain which imply a match.
-enum Likelihood {
-  // Default value; information with all likelihoods is included.
-  LIKELIHOOD_UNSPECIFIED = 0;
-
-  // Few matching elements.
-  VERY_UNLIKELY = 1;
-
-  UNLIKELY = 2;
-
-  // Some matching elements.
-  POSSIBLE = 3;
-
-  LIKELY = 4;
-
-  // Many matching elements.
-  VERY_LIKELY = 5;
-}
-
-// Operators available for comparing the value of fields.
-enum RelationalOperator {
-  RELATIONAL_OPERATOR_UNSPECIFIED = 0;
-
-  // Equal.
-  EQUAL_TO = 1;
-
-  // Not equal to.
-  NOT_EQUAL_TO = 2;
-
-  // Greater than.
-  GREATER_THAN = 3;
-
-  // Less than.
-  LESS_THAN = 4;
-
-  // Greater than or equals.
-  GREATER_THAN_OR_EQUALS = 5;
-
-  // Less than or equals.
-  LESS_THAN_OR_EQUALS = 6;
-
-  // Exists
-  EXISTS = 7;
-}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/proto/google/privacy/dlp/v2beta1/storage.proto b/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/proto/google/privacy/dlp/v2beta1/storage.proto
deleted file mode 100644
index d44724c47c03..000000000000
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/proto/google/privacy/dlp/v2beta1/storage.proto
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright 2017 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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";
-
-package google.privacy.dlp.v2beta1;
-
-import "google/api/annotations.proto";
-import "google/protobuf/timestamp.proto";
-
-option csharp_namespace = "Google.Cloud.Dlp.V2Beta1";
-option go_package = "google.golang.org/genproto/googleapis/privacy/dlp/v2beta1;dlp";
-option java_multiple_files = true;
-option java_outer_classname = "DlpStorage";
-option java_package = "com.google.privacy.dlp.v2beta1";
-option php_namespace = "Google\\Cloud\\Dlp\\V2beta1";
-
-
-// Type of information detected by the API.
-message InfoType {
-  // Name of the information type.
-  string name = 1;
-}
-
-// Custom information type provided by the user. Used to find domain-specific
-// sensitive information configurable to the data in question.
-message CustomInfoType {
-  // Custom information type based on a dictionary of words or phrases. This can
-  // be used to match sensitive information specific to the data, such as a list
-  // of employee IDs or job titles.
-  //
-  // Dictionary words are case-insensitive and all characters other than letters
-  // and digits in the unicode [Basic Multilingual
-  // Plane](https://en.wikipedia.org/wiki/Plane_%28Unicode%29#Basic_Multilingual_Plane)
-  // will be replaced with whitespace when scanning for matches, so the
-  // dictionary phrase "Sam Johnson" will match all three phrases "sam johnson",
-  // "Sam, Johnson", and "Sam (Johnson)". Additionally, the characters
-  // surrounding any match must be of a different type than the adjacent
-  // characters within the word, so letters must be next to non-letters and
-  // digits next to non-digits. For example, the dictionary word "jen" will
-  // match the first three letters of the text "jen123" but will return no
-  // matches for "jennifer".
-  //
-  // Dictionary words containing a large number of characters that are not
-  // letters or digits may result in unexpected findings because such characters
-  // are treated as whitespace.
-  message Dictionary {
-    // Message defining a list of words or phrases to search for in the data.
-    message WordList {
-      // Words or phrases defining the dictionary. The dictionary must contain
-      // at least one phrase and every phrase must contain at least 2 characters
-      // that are letters or digits. [required]
-      repeated string words = 1;
-    }
-
-    oneof source {
-      // List of words or phrases to search for.
-      WordList word_list = 1;
-    }
-  }
-
-  // Info type configuration. All custom info types must have configurations
-  // that do not conflict with built-in info types or other custom info types.
-  InfoType info_type = 1;
-
-  oneof type {
-    // Dictionary-based custom info type.
-    Dictionary dictionary = 2;
-  }
-}
-
-// General identifier of a data field in a storage service.
-message FieldId {
-  // Name describing the field.
-  string column_name = 1;
-}
-
-// Datastore partition ID.
-// A partition ID identifies a grouping of entities. The grouping is always
-// by project and namespace, however the namespace ID may be empty.
-//
-// A partition ID contains several dimensions:
-// project ID and namespace ID.
-message PartitionId {
-  // The ID of the project to which the entities belong.
-  string project_id = 2;
-
-  // If not empty, the ID of the namespace to which the entities belong.
-  string namespace_id = 4;
-}
-
-// A representation of a Datastore kind.
-message KindExpression {
-  // The name of the kind.
-  string name = 1;
-}
-
-// A reference to a property relative to the Datastore kind expressions.
-message PropertyReference {
-  // The name of the property.
-  // If name includes "."s, it may be interpreted as a property name path.
-  string name = 2;
-}
-
-// A representation of a Datastore property in a projection.
-message Projection {
-  // The property to project.
-  PropertyReference property = 1;
-}
-
-// Options defining a data set within Google Cloud Datastore.
-message DatastoreOptions {
-  // A partition ID identifies a grouping of entities. The grouping is always
-  // by project and namespace, however the namespace ID may be empty.
-  PartitionId partition_id = 1;
-
-  // The kind to process.
-  KindExpression kind = 2;
-
-  // Properties to scan. If none are specified, all properties will be scanned
-  // by default.
-  repeated Projection projection = 3;
-}
-
-// Options defining a file or a set of files (path ending with *) within
-// a Google Cloud Storage bucket.
-message CloudStorageOptions {
-  // Set of files to scan.
-  message FileSet {
-    // The url, in the format `gs:///`. Trailing wildcard in the
-    // path is allowed.
-    string url = 1;
-  }
-
-  FileSet file_set = 1;
-}
-
-// A location in Cloud Storage.
-message CloudStoragePath {
-  // The url, in the format of `gs://bucket/`.
-  string path = 1;
-}
-
-// Options defining BigQuery table and row identifiers.
-message BigQueryOptions {
-  // Complete BigQuery table reference.
-  BigQueryTable table_reference = 1;
-
-  // References to fields uniquely identifying rows within the table.
-  // Nested fields in the format, like `person.birthdate.year`, are allowed.
-  repeated FieldId identifying_fields = 2;
-}
-
-// Shared message indicating Cloud storage type.
-message StorageConfig {
-  oneof type {
-    // Google Cloud Datastore options specification.
-    DatastoreOptions datastore_options = 2;
-
-    // Google Cloud Storage options specification.
-    CloudStorageOptions cloud_storage_options = 3;
-
-    // BigQuery options specification.
-    BigQueryOptions big_query_options = 4;
-  }
-}
-
-// Record key for a finding in a Cloud Storage file.
-message CloudStorageKey {
-  // Path to the file.
-  string file_path = 1;
-
-  // Byte offset of the referenced data in the file.
-  int64 start_offset = 2;
-}
-
-// Record key for a finding in Cloud Datastore.
-message DatastoreKey {
-  // Datastore entity key.
-  Key entity_key = 1;
-}
-
-// A unique identifier for a Datastore entity.
-// If a key's partition ID or any of its path kinds or names are
-// reserved/read-only, the key is reserved/read-only.
-// A reserved/read-only key is forbidden in certain documented contexts.
-message Key {
-  // A (kind, ID/name) pair used to construct a key path.
-  //
-  // If either name or ID is set, the element is complete.
-  // If neither is set, the element is incomplete.
-  message PathElement {
-    // The kind of the entity.
-    // A kind matching regex `__.*__` is reserved/read-only.
-    // A kind must not contain more than 1500 bytes when UTF-8 encoded.
-    // Cannot be `""`.
-    string kind = 1;
-
-    // The type of ID.
-    oneof id_type {
-      // The auto-allocated ID of the entity.
-      // Never equal to zero. Values less than zero are discouraged and may not
-      // be supported in the future.
-      int64 id = 2;
-
-      // The name of the entity.
-      // A name matching regex `__.*__` is reserved/read-only.
-      // A name must not be more than 1500 bytes when UTF-8 encoded.
-      // Cannot be `""`.
-      string name = 3;
-    }
-  }
-
-  // Entities are partitioned into subsets, currently identified by a project
-  // ID and namespace ID.
-  // Queries are scoped to a single partition.
-  PartitionId partition_id = 1;
-
-  // The entity path.
-  // An entity path consists of one or more elements composed of a kind and a
-  // string or numerical identifier, which identify entities. The first
-  // element identifies a _root entity_, the second element identifies
-  // a _child_ of the root entity, the third element identifies a child of the
-  // second entity, and so forth. The entities identified by all prefixes of
-  // the path are called the element's _ancestors_.
-  //
-  // A path can never be empty, and a path can have at most 100 elements.
-  repeated PathElement path = 2;
-}
-
-// Message for a unique key indicating a record that contains a finding.
-message RecordKey {
-  oneof type {
-    CloudStorageKey cloud_storage_key = 1;
-
-    DatastoreKey datastore_key = 2;
-  }
-}
-
-// Message defining the location of a BigQuery table. A table is uniquely
-// identified  by its project_id, dataset_id, and table_name. Within a query
-// a table is often referenced with a string in the format of:
-// `:.` or
-// `..`.
-message BigQueryTable {
-  // The Google Cloud Platform project ID of the project containing the table.
-  // If omitted, project ID is inferred from the API call.
-  string project_id = 1;
-
-  // Dataset ID of the table.
-  string dataset_id = 2;
-
-  // Name of the table.
-  string table_id = 3;
-}
-
-// An entity in a dataset is a field or set of fields that correspond to a
-// single person. For example, in medical records the `EntityId` might be
-// a patient identifier, or for financial records it might be an account
-// identifier. This message is used when generalizations or analysis must be
-// consistent across multiple rows pertaining to the same entity.
-message EntityId {
-  // Composite key indicating which field contains the entity identifier.
-  FieldId field = 1;
-}
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/pom.xml b/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
similarity index 84%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/pom.xml
rename to google-api-grpc/proto-google-cloud-iot-v1/pom.xml
index 719aa6215677..aeafe2c2d214 100644
--- a/google-api-grpc/proto-google-cloud-cloudiot-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
@@ -2,10 +2,10 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
-  proto-google-cloud-cloudiot-v1
-  0.12.1-SNAPSHOT
-  proto-google-cloud-cloudiot-v1
-  PROTO library for proto-google-cloud-cloudiot-v1
+  proto-google-cloud-iot-v1
+  0.12.1-SNAPSHOT
+  proto-google-cloud-iot-v1
+  PROTO library for proto-google-cloud-iot-v1
   
     com.google.api.grpc
     google-api-grpc
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/Device.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/Device.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfigOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfigOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfigOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredentialOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredentialOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredentialOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredentialOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceName.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceName.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceName.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceName.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistryOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistryOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistryOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistryOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceStateOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceStateOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/DeviceStateOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceStateOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfigOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfigOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfigOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfigOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfigOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfigOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpState.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpState.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/HttpState.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpState.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponseOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponseOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponseOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponseOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponseOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponseOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponseOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponseOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponseOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponseOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponseOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponseOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/LocationName.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/LocationName.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/LocationName.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/LocationName.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfigOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfigOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfigOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttState.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttState.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/MqttState.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttState.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateFormat.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateFormat.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateFormat.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateFormat.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificateOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredentialOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredentialOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredentialOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredentialOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyFormat.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyFormat.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyFormat.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyFormat.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredentialOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredentialOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredentialOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredentialOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryName.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryName.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/RegistryName.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryName.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfigOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfigOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfigOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequestOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequestOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequestOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetailsOrBuilder.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetailsOrBuilder.java
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetailsOrBuilder.java
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetailsOrBuilder.java
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/proto/google/cloud/iot/v1/device_manager.proto b/google-api-grpc/proto-google-cloud-iot-v1/src/main/proto/google/cloud/iot/v1/device_manager.proto
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/proto/google/cloud/iot/v1/device_manager.proto
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/proto/google/cloud/iot/v1/device_manager.proto
diff --git a/google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/proto/google/cloud/iot/v1/resources.proto b/google-api-grpc/proto-google-cloud-iot-v1/src/main/proto/google/cloud/iot/v1/resources.proto
similarity index 100%
rename from google-api-grpc/proto-google-cloud-cloudiot-v1/src/main/proto/google/cloud/iot/v1/resources.proto
rename to google-api-grpc/proto-google-cloud-iot-v1/src/main/proto/google/cloud/iot/v1/resources.proto
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponse.java
new file mode 100644
index 000000000000..2ac0c3be8fee
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponse.java
@@ -0,0 +1,1068 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+/**
+ * 
+ * Response to a single file annotation request. A file may contain one or more
+ * images, which individually have their own responses.
+ * 

+ *
+ * Protobuf type {@code google.cloud.vision.v1.AnnotateFileResponse}
+ */
+public  final class AnnotateFileResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.vision.v1.AnnotateFileResponse)
+    AnnotateFileResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use AnnotateFileResponse.newBuilder() to construct.
+  private AnnotateFileResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private AnnotateFileResponse() {
+    responses_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private AnnotateFileResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            com.google.cloud.vision.v1.InputConfig.Builder subBuilder = null;
+            if (inputConfig_ != null) {
+              subBuilder = inputConfig_.toBuilder();
+            }
+            inputConfig_ = input.readMessage(com.google.cloud.vision.v1.InputConfig.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(inputConfig_);
+              inputConfig_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 18: {
+            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+              responses_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000002;
+            }
+            responses_.add(
+                input.readMessage(com.google.cloud.vision.v1.AnnotateImageResponse.parser(), extensionRegistry));
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+        responses_ = java.util.Collections.unmodifiableList(responses_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateFileResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateFileResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.vision.v1.AnnotateFileResponse.class, com.google.cloud.vision.v1.AnnotateFileResponse.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int INPUT_CONFIG_FIELD_NUMBER = 1;
+  private com.google.cloud.vision.v1.InputConfig inputConfig_;
+  /**
+   * 
+   * Information about the file for which this response is generated.
+   * 

+   *
+   * .google.cloud.vision.v1.InputConfig input_config = 1;
+   */
+  public boolean hasInputConfig() {
+    return inputConfig_ != null;
+  }
+  /**
+   * 
+   * Information about the file for which this response is generated.
+   * 

+   *
+   * .google.cloud.vision.v1.InputConfig input_config = 1;
+   */
+  public com.google.cloud.vision.v1.InputConfig getInputConfig() {
+    return inputConfig_ == null ? com.google.cloud.vision.v1.InputConfig.getDefaultInstance() : inputConfig_;
+  }
+  /**
+   * 
+   * Information about the file for which this response is generated.
+   * 

+   *
+   * .google.cloud.vision.v1.InputConfig input_config = 1;
+   */
+  public com.google.cloud.vision.v1.InputConfigOrBuilder getInputConfigOrBuilder() {
+    return getInputConfig();
+  }
+
+  public static final int RESPONSES_FIELD_NUMBER = 2;
+  private java.util.List responses_;
+  /**
+   * 
+   * Individual responses to images found within the file.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+   */
+  public java.util.List getResponsesList() {
+    return responses_;
+  }
+  /**
+   * 
+   * Individual responses to images found within the file.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+   */
+  public java.util.List 
+      getResponsesOrBuilderList() {
+    return responses_;
+  }
+  /**
+   * 
+   * Individual responses to images found within the file.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+   */
+  public int getResponsesCount() {
+    return responses_.size();
+  }
+  /**
+   * 
+   * Individual responses to images found within the file.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+   */
+  public com.google.cloud.vision.v1.AnnotateImageResponse getResponses(int index) {
+    return responses_.get(index);
+  }
+  /**
+   * 
+   * Individual responses to images found within the file.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+   */
+  public com.google.cloud.vision.v1.AnnotateImageResponseOrBuilder getResponsesOrBuilder(
+      int index) {
+    return responses_.get(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (inputConfig_ != null) {
+      output.writeMessage(1, getInputConfig());
+    }
+    for (int i = 0; i < responses_.size(); i++) {
+      output.writeMessage(2, responses_.get(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (inputConfig_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getInputConfig());
+    }
+    for (int i = 0; i < responses_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, responses_.get(i));
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.vision.v1.AnnotateFileResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.vision.v1.AnnotateFileResponse other = (com.google.cloud.vision.v1.AnnotateFileResponse) obj;
+
+    boolean result = true;
+    result = result && (hasInputConfig() == other.hasInputConfig());
+    if (hasInputConfig()) {
+      result = result && getInputConfig()
+          .equals(other.getInputConfig());
+    }
+    result = result && getResponsesList()
+        .equals(other.getResponsesList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasInputConfig()) {
+      hash = (37 * hash) + INPUT_CONFIG_FIELD_NUMBER;
+      hash = (53 * hash) + getInputConfig().hashCode();
+    }
+    if (getResponsesCount() > 0) {
+      hash = (37 * hash) + RESPONSES_FIELD_NUMBER;
+      hash = (53 * hash) + getResponsesList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.vision.v1.AnnotateFileResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AnnotateFileResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AnnotateFileResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AnnotateFileResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AnnotateFileResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AnnotateFileResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AnnotateFileResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AnnotateFileResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AnnotateFileResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AnnotateFileResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AnnotateFileResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AnnotateFileResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.vision.v1.AnnotateFileResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Response to a single file annotation request. A file may contain one or more
+   * images, which individually have their own responses.
+   * 

+   *
+   * Protobuf type {@code google.cloud.vision.v1.AnnotateFileResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.vision.v1.AnnotateFileResponse)
+      com.google.cloud.vision.v1.AnnotateFileResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateFileResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateFileResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.vision.v1.AnnotateFileResponse.class, com.google.cloud.vision.v1.AnnotateFileResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.vision.v1.AnnotateFileResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getResponsesFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (inputConfigBuilder_ == null) {
+        inputConfig_ = null;
+      } else {
+        inputConfig_ = null;
+        inputConfigBuilder_ = null;
+      }
+      if (responsesBuilder_ == null) {
+        responses_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      } else {
+        responsesBuilder_.clear();
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateFileResponse_descriptor;
+    }
+
+    public com.google.cloud.vision.v1.AnnotateFileResponse getDefaultInstanceForType() {
+      return com.google.cloud.vision.v1.AnnotateFileResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.vision.v1.AnnotateFileResponse build() {
+      com.google.cloud.vision.v1.AnnotateFileResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.vision.v1.AnnotateFileResponse buildPartial() {
+      com.google.cloud.vision.v1.AnnotateFileResponse result = new com.google.cloud.vision.v1.AnnotateFileResponse(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (inputConfigBuilder_ == null) {
+        result.inputConfig_ = inputConfig_;
+      } else {
+        result.inputConfig_ = inputConfigBuilder_.build();
+      }
+      if (responsesBuilder_ == null) {
+        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+          responses_ = java.util.Collections.unmodifiableList(responses_);
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.responses_ = responses_;
+      } else {
+        result.responses_ = responsesBuilder_.build();
+      }
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.vision.v1.AnnotateFileResponse) {
+        return mergeFrom((com.google.cloud.vision.v1.AnnotateFileResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.vision.v1.AnnotateFileResponse other) {
+      if (other == com.google.cloud.vision.v1.AnnotateFileResponse.getDefaultInstance()) return this;
+      if (other.hasInputConfig()) {
+        mergeInputConfig(other.getInputConfig());
+      }
+      if (responsesBuilder_ == null) {
+        if (!other.responses_.isEmpty()) {
+          if (responses_.isEmpty()) {
+            responses_ = other.responses_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureResponsesIsMutable();
+            responses_.addAll(other.responses_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.responses_.isEmpty()) {
+          if (responsesBuilder_.isEmpty()) {
+            responsesBuilder_.dispose();
+            responsesBuilder_ = null;
+            responses_ = other.responses_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+            responsesBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getResponsesFieldBuilder() : null;
+          } else {
+            responsesBuilder_.addAllMessages(other.responses_);
+          }
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.vision.v1.AnnotateFileResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.vision.v1.AnnotateFileResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private com.google.cloud.vision.v1.InputConfig inputConfig_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.InputConfig, com.google.cloud.vision.v1.InputConfig.Builder, com.google.cloud.vision.v1.InputConfigOrBuilder> inputConfigBuilder_;
+    /**
+     * 
+     * Information about the file for which this response is generated.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public boolean hasInputConfig() {
+      return inputConfigBuilder_ != null || inputConfig_ != null;
+    }
+    /**
+     * 
+     * Information about the file for which this response is generated.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public com.google.cloud.vision.v1.InputConfig getInputConfig() {
+      if (inputConfigBuilder_ == null) {
+        return inputConfig_ == null ? com.google.cloud.vision.v1.InputConfig.getDefaultInstance() : inputConfig_;
+      } else {
+        return inputConfigBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Information about the file for which this response is generated.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public Builder setInputConfig(com.google.cloud.vision.v1.InputConfig value) {
+      if (inputConfigBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        inputConfig_ = value;
+        onChanged();
+      } else {
+        inputConfigBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Information about the file for which this response is generated.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public Builder setInputConfig(
+        com.google.cloud.vision.v1.InputConfig.Builder builderForValue) {
+      if (inputConfigBuilder_ == null) {
+        inputConfig_ = builderForValue.build();
+        onChanged();
+      } else {
+        inputConfigBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Information about the file for which this response is generated.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public Builder mergeInputConfig(com.google.cloud.vision.v1.InputConfig value) {
+      if (inputConfigBuilder_ == null) {
+        if (inputConfig_ != null) {
+          inputConfig_ =
+            com.google.cloud.vision.v1.InputConfig.newBuilder(inputConfig_).mergeFrom(value).buildPartial();
+        } else {
+          inputConfig_ = value;
+        }
+        onChanged();
+      } else {
+        inputConfigBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Information about the file for which this response is generated.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public Builder clearInputConfig() {
+      if (inputConfigBuilder_ == null) {
+        inputConfig_ = null;
+        onChanged();
+      } else {
+        inputConfig_ = null;
+        inputConfigBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Information about the file for which this response is generated.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public com.google.cloud.vision.v1.InputConfig.Builder getInputConfigBuilder() {
+      
+      onChanged();
+      return getInputConfigFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Information about the file for which this response is generated.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public com.google.cloud.vision.v1.InputConfigOrBuilder getInputConfigOrBuilder() {
+      if (inputConfigBuilder_ != null) {
+        return inputConfigBuilder_.getMessageOrBuilder();
+      } else {
+        return inputConfig_ == null ?
+            com.google.cloud.vision.v1.InputConfig.getDefaultInstance() : inputConfig_;
+      }
+    }
+    /**
+     * 
+     * Information about the file for which this response is generated.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.InputConfig, com.google.cloud.vision.v1.InputConfig.Builder, com.google.cloud.vision.v1.InputConfigOrBuilder> 
+        getInputConfigFieldBuilder() {
+      if (inputConfigBuilder_ == null) {
+        inputConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.vision.v1.InputConfig, com.google.cloud.vision.v1.InputConfig.Builder, com.google.cloud.vision.v1.InputConfigOrBuilder>(
+                getInputConfig(),
+                getParentForChildren(),
+                isClean());
+        inputConfig_ = null;
+      }
+      return inputConfigBuilder_;
+    }
+
+    private java.util.List responses_ =
+      java.util.Collections.emptyList();
+    private void ensureResponsesIsMutable() {
+      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+        responses_ = new java.util.ArrayList(responses_);
+        bitField0_ |= 0x00000002;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.vision.v1.AnnotateImageResponse, com.google.cloud.vision.v1.AnnotateImageResponse.Builder, com.google.cloud.vision.v1.AnnotateImageResponseOrBuilder> responsesBuilder_;
+
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public java.util.List getResponsesList() {
+      if (responsesBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(responses_);
+      } else {
+        return responsesBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public int getResponsesCount() {
+      if (responsesBuilder_ == null) {
+        return responses_.size();
+      } else {
+        return responsesBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public com.google.cloud.vision.v1.AnnotateImageResponse getResponses(int index) {
+      if (responsesBuilder_ == null) {
+        return responses_.get(index);
+      } else {
+        return responsesBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public Builder setResponses(
+        int index, com.google.cloud.vision.v1.AnnotateImageResponse value) {
+      if (responsesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureResponsesIsMutable();
+        responses_.set(index, value);
+        onChanged();
+      } else {
+        responsesBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public Builder setResponses(
+        int index, com.google.cloud.vision.v1.AnnotateImageResponse.Builder builderForValue) {
+      if (responsesBuilder_ == null) {
+        ensureResponsesIsMutable();
+        responses_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        responsesBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public Builder addResponses(com.google.cloud.vision.v1.AnnotateImageResponse value) {
+      if (responsesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureResponsesIsMutable();
+        responses_.add(value);
+        onChanged();
+      } else {
+        responsesBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public Builder addResponses(
+        int index, com.google.cloud.vision.v1.AnnotateImageResponse value) {
+      if (responsesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureResponsesIsMutable();
+        responses_.add(index, value);
+        onChanged();
+      } else {
+        responsesBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public Builder addResponses(
+        com.google.cloud.vision.v1.AnnotateImageResponse.Builder builderForValue) {
+      if (responsesBuilder_ == null) {
+        ensureResponsesIsMutable();
+        responses_.add(builderForValue.build());
+        onChanged();
+      } else {
+        responsesBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public Builder addResponses(
+        int index, com.google.cloud.vision.v1.AnnotateImageResponse.Builder builderForValue) {
+      if (responsesBuilder_ == null) {
+        ensureResponsesIsMutable();
+        responses_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        responsesBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public Builder addAllResponses(
+        java.lang.Iterable values) {
+      if (responsesBuilder_ == null) {
+        ensureResponsesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, responses_);
+        onChanged();
+      } else {
+        responsesBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public Builder clearResponses() {
+      if (responsesBuilder_ == null) {
+        responses_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+      } else {
+        responsesBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public Builder removeResponses(int index) {
+      if (responsesBuilder_ == null) {
+        ensureResponsesIsMutable();
+        responses_.remove(index);
+        onChanged();
+      } else {
+        responsesBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public com.google.cloud.vision.v1.AnnotateImageResponse.Builder getResponsesBuilder(
+        int index) {
+      return getResponsesFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public com.google.cloud.vision.v1.AnnotateImageResponseOrBuilder getResponsesOrBuilder(
+        int index) {
+      if (responsesBuilder_ == null) {
+        return responses_.get(index);  } else {
+        return responsesBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public java.util.List 
+         getResponsesOrBuilderList() {
+      if (responsesBuilder_ != null) {
+        return responsesBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(responses_);
+      }
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public com.google.cloud.vision.v1.AnnotateImageResponse.Builder addResponsesBuilder() {
+      return getResponsesFieldBuilder().addBuilder(
+          com.google.cloud.vision.v1.AnnotateImageResponse.getDefaultInstance());
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public com.google.cloud.vision.v1.AnnotateImageResponse.Builder addResponsesBuilder(
+        int index) {
+      return getResponsesFieldBuilder().addBuilder(
+          index, com.google.cloud.vision.v1.AnnotateImageResponse.getDefaultInstance());
+    }
+    /**
+     * 
+     * Individual responses to images found within the file.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+     */
+    public java.util.List 
+         getResponsesBuilderList() {
+      return getResponsesFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.vision.v1.AnnotateImageResponse, com.google.cloud.vision.v1.AnnotateImageResponse.Builder, com.google.cloud.vision.v1.AnnotateImageResponseOrBuilder> 
+        getResponsesFieldBuilder() {
+      if (responsesBuilder_ == null) {
+        responsesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.vision.v1.AnnotateImageResponse, com.google.cloud.vision.v1.AnnotateImageResponse.Builder, com.google.cloud.vision.v1.AnnotateImageResponseOrBuilder>(
+                responses_,
+                ((bitField0_ & 0x00000002) == 0x00000002),
+                getParentForChildren(),
+                isClean());
+        responses_ = null;
+      }
+      return responsesBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.vision.v1.AnnotateFileResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.vision.v1.AnnotateFileResponse)
+  private static final com.google.cloud.vision.v1.AnnotateFileResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.vision.v1.AnnotateFileResponse();
+  }
+
+  public static com.google.cloud.vision.v1.AnnotateFileResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public AnnotateFileResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new AnnotateFileResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.vision.v1.AnnotateFileResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponseOrBuilder.java
new file mode 100644
index 000000000000..1597910bba3f
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponseOrBuilder.java
@@ -0,0 +1,78 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+public interface AnnotateFileResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.vision.v1.AnnotateFileResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Information about the file for which this response is generated.
+   * 

+   *
+   * .google.cloud.vision.v1.InputConfig input_config = 1;
+   */
+  boolean hasInputConfig();
+  /**
+   * 
+   * Information about the file for which this response is generated.
+   * 

+   *
+   * .google.cloud.vision.v1.InputConfig input_config = 1;
+   */
+  com.google.cloud.vision.v1.InputConfig getInputConfig();
+  /**
+   * 
+   * Information about the file for which this response is generated.
+   * 

+   *
+   * .google.cloud.vision.v1.InputConfig input_config = 1;
+   */
+  com.google.cloud.vision.v1.InputConfigOrBuilder getInputConfigOrBuilder();
+
+  /**
+   * 
+   * Individual responses to images found within the file.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+   */
+  java.util.List 
+      getResponsesList();
+  /**
+   * 
+   * Individual responses to images found within the file.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+   */
+  com.google.cloud.vision.v1.AnnotateImageResponse getResponses(int index);
+  /**
+   * 
+   * Individual responses to images found within the file.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+   */
+  int getResponsesCount();
+  /**
+   * 
+   * Individual responses to images found within the file.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+   */
+  java.util.List 
+      getResponsesOrBuilderList();
+  /**
+   * 
+   * Individual responses to images found within the file.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AnnotateImageResponse responses = 2;
+   */
+  com.google.cloud.vision.v1.AnnotateImageResponseOrBuilder getResponsesOrBuilder(
+      int index);
+}
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponse.java
index cc725278962b..5fd304e6d65e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponse.java
@@ -179,6 +179,19 @@ private AnnotateImageResponse(
               webDetection_ = subBuilder.buildPartial();
             }
 
+            break;
+          }
+          case 170: {
+            com.google.cloud.vision.v1.ImageAnnotationContext.Builder subBuilder = null;
+            if (context_ != null) {
+              subBuilder = context_.toBuilder();
+            }
+            context_ = input.readMessage(com.google.cloud.vision.v1.ImageAnnotationContext.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(context_);
+              context_ = subBuilder.buildPartial();
+            }
+
             break;
           }
         }
@@ -709,6 +722,42 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
     return getError();
   }
 
+  public static final int CONTEXT_FIELD_NUMBER = 21;
+  private com.google.cloud.vision.v1.ImageAnnotationContext context_;
+  /**
+   * 
+   * If present, contextual information is needed to understand where this image
+   * comes from.
+   * 

+   *
+   * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+   */
+  public boolean hasContext() {
+    return context_ != null;
+  }
+  /**
+   * 
+   * If present, contextual information is needed to understand where this image
+   * comes from.
+   * 

+   *
+   * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+   */
+  public com.google.cloud.vision.v1.ImageAnnotationContext getContext() {
+    return context_ == null ? com.google.cloud.vision.v1.ImageAnnotationContext.getDefaultInstance() : context_;
+  }
+  /**
+   * 
+   * If present, contextual information is needed to understand where this image
+   * comes from.
+   * 

+   *
+   * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+   */
+  public com.google.cloud.vision.v1.ImageAnnotationContextOrBuilder getContextOrBuilder() {
+    return getContext();
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -754,6 +803,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (webDetection_ != null) {
       output.writeMessage(13, getWebDetection());
     }
+    if (context_ != null) {
+      output.writeMessage(21, getContext());
+    }
     unknownFields.writeTo(output);
   }
 
@@ -806,6 +858,10 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(13, getWebDetection());
     }
+    if (context_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(21, getContext());
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -862,6 +918,11 @@ public boolean equals(final java.lang.Object obj) {
       result = result && getError()
           .equals(other.getError());
     }
+    result = result && (hasContext() == other.hasContext());
+    if (hasContext()) {
+      result = result && getContext()
+          .equals(other.getContext());
+    }
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -917,6 +978,10 @@ public int hashCode() {
       hash = (37 * hash) + ERROR_FIELD_NUMBER;
       hash = (53 * hash) + getError().hashCode();
     }
+    if (hasContext()) {
+      hash = (37 * hash) + CONTEXT_FIELD_NUMBER;
+      hash = (53 * hash) + getContext().hashCode();
+    }
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1121,6 +1186,12 @@ public Builder clear() {
         error_ = null;
         errorBuilder_ = null;
       }
+      if (contextBuilder_ == null) {
+        context_ = null;
+      } else {
+        context_ = null;
+        contextBuilder_ = null;
+      }
       return this;
     }
 
@@ -1220,6 +1291,11 @@ public com.google.cloud.vision.v1.AnnotateImageResponse buildPartial() {
       } else {
         result.error_ = errorBuilder_.build();
       }
+      if (contextBuilder_ == null) {
+        result.context_ = context_;
+      } else {
+        result.context_ = contextBuilder_.build();
+      }
       result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
@@ -1410,6 +1486,9 @@ public Builder mergeFrom(com.google.cloud.vision.v1.AnnotateImageResponse other)
       if (other.hasError()) {
         mergeError(other.getError());
       }
+      if (other.hasContext()) {
+        mergeContext(other.getContext());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -3960,6 +4039,168 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       return errorBuilder_;
     }
+
+    private com.google.cloud.vision.v1.ImageAnnotationContext context_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.ImageAnnotationContext, com.google.cloud.vision.v1.ImageAnnotationContext.Builder, com.google.cloud.vision.v1.ImageAnnotationContextOrBuilder> contextBuilder_;
+    /**
+     * 
+     * If present, contextual information is needed to understand where this image
+     * comes from.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+     */
+    public boolean hasContext() {
+      return contextBuilder_ != null || context_ != null;
+    }
+    /**
+     * 
+     * If present, contextual information is needed to understand where this image
+     * comes from.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+     */
+    public com.google.cloud.vision.v1.ImageAnnotationContext getContext() {
+      if (contextBuilder_ == null) {
+        return context_ == null ? com.google.cloud.vision.v1.ImageAnnotationContext.getDefaultInstance() : context_;
+      } else {
+        return contextBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * If present, contextual information is needed to understand where this image
+     * comes from.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+     */
+    public Builder setContext(com.google.cloud.vision.v1.ImageAnnotationContext value) {
+      if (contextBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        context_ = value;
+        onChanged();
+      } else {
+        contextBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * If present, contextual information is needed to understand where this image
+     * comes from.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+     */
+    public Builder setContext(
+        com.google.cloud.vision.v1.ImageAnnotationContext.Builder builderForValue) {
+      if (contextBuilder_ == null) {
+        context_ = builderForValue.build();
+        onChanged();
+      } else {
+        contextBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * If present, contextual information is needed to understand where this image
+     * comes from.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+     */
+    public Builder mergeContext(com.google.cloud.vision.v1.ImageAnnotationContext value) {
+      if (contextBuilder_ == null) {
+        if (context_ != null) {
+          context_ =
+            com.google.cloud.vision.v1.ImageAnnotationContext.newBuilder(context_).mergeFrom(value).buildPartial();
+        } else {
+          context_ = value;
+        }
+        onChanged();
+      } else {
+        contextBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * If present, contextual information is needed to understand where this image
+     * comes from.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+     */
+    public Builder clearContext() {
+      if (contextBuilder_ == null) {
+        context_ = null;
+        onChanged();
+      } else {
+        context_ = null;
+        contextBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * If present, contextual information is needed to understand where this image
+     * comes from.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+     */
+    public com.google.cloud.vision.v1.ImageAnnotationContext.Builder getContextBuilder() {
+      
+      onChanged();
+      return getContextFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * If present, contextual information is needed to understand where this image
+     * comes from.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+     */
+    public com.google.cloud.vision.v1.ImageAnnotationContextOrBuilder getContextOrBuilder() {
+      if (contextBuilder_ != null) {
+        return contextBuilder_.getMessageOrBuilder();
+      } else {
+        return context_ == null ?
+            com.google.cloud.vision.v1.ImageAnnotationContext.getDefaultInstance() : context_;
+      }
+    }
+    /**
+     * 
+     * If present, contextual information is needed to understand where this image
+     * comes from.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.ImageAnnotationContext, com.google.cloud.vision.v1.ImageAnnotationContext.Builder, com.google.cloud.vision.v1.ImageAnnotationContextOrBuilder> 
+        getContextFieldBuilder() {
+      if (contextBuilder_ == null) {
+        contextBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.vision.v1.ImageAnnotationContext, com.google.cloud.vision.v1.ImageAnnotationContext.Builder, com.google.cloud.vision.v1.ImageAnnotationContextOrBuilder>(
+                getContext(),
+                getParentForChildren(),
+                isClean());
+        context_ = null;
+      }
+      return contextBuilder_;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponseOrBuilder.java
index e4e6a58da1cc..4daa4801b4a5 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponseOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponseOrBuilder.java
@@ -391,4 +391,32 @@ com.google.cloud.vision.v1.EntityAnnotationOrBuilder getTextAnnotationsOrBuilder
    * .google.rpc.Status error = 9;
    */
   com.google.rpc.StatusOrBuilder getErrorOrBuilder();
+
+  /**
+   * 
+   * If present, contextual information is needed to understand where this image
+   * comes from.
+   * 

+   *
+   * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+   */
+  boolean hasContext();
+  /**
+   * 
+   * If present, contextual information is needed to understand where this image
+   * comes from.
+   * 

+   *
+   * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+   */
+  com.google.cloud.vision.v1.ImageAnnotationContext getContext();
+  /**
+   * 
+   * If present, contextual information is needed to understand where this image
+   * comes from.
+   * 

+   *
+   * .google.cloud.vision.v1.ImageAnnotationContext context = 21;
+   */
+  com.google.cloud.vision.v1.ImageAnnotationContextOrBuilder getContextOrBuilder();
 }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequest.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequest.java
new file mode 100644
index 000000000000..e2c3b337f233
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequest.java
@@ -0,0 +1,1524 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+/**
+ * 
+ * An offline file annotation request.
+ * 

+ *
+ * Protobuf type {@code google.cloud.vision.v1.AsyncAnnotateFileRequest}
+ */
+public  final class AsyncAnnotateFileRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.vision.v1.AsyncAnnotateFileRequest)
+    AsyncAnnotateFileRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use AsyncAnnotateFileRequest.newBuilder() to construct.
+  private AsyncAnnotateFileRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private AsyncAnnotateFileRequest() {
+    features_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private AsyncAnnotateFileRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            com.google.cloud.vision.v1.InputConfig.Builder subBuilder = null;
+            if (inputConfig_ != null) {
+              subBuilder = inputConfig_.toBuilder();
+            }
+            inputConfig_ = input.readMessage(com.google.cloud.vision.v1.InputConfig.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(inputConfig_);
+              inputConfig_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 18: {
+            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+              features_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000002;
+            }
+            features_.add(
+                input.readMessage(com.google.cloud.vision.v1.Feature.parser(), extensionRegistry));
+            break;
+          }
+          case 26: {
+            com.google.cloud.vision.v1.ImageContext.Builder subBuilder = null;
+            if (imageContext_ != null) {
+              subBuilder = imageContext_.toBuilder();
+            }
+            imageContext_ = input.readMessage(com.google.cloud.vision.v1.ImageContext.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(imageContext_);
+              imageContext_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 34: {
+            com.google.cloud.vision.v1.OutputConfig.Builder subBuilder = null;
+            if (outputConfig_ != null) {
+              subBuilder = outputConfig_.toBuilder();
+            }
+            outputConfig_ = input.readMessage(com.google.cloud.vision.v1.OutputConfig.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(outputConfig_);
+              outputConfig_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+        features_ = java.util.Collections.unmodifiableList(features_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.vision.v1.AsyncAnnotateFileRequest.class, com.google.cloud.vision.v1.AsyncAnnotateFileRequest.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int INPUT_CONFIG_FIELD_NUMBER = 1;
+  private com.google.cloud.vision.v1.InputConfig inputConfig_;
+  /**
+   * 
+   * Required. Information about the input file.
+   * 

+   *
+   * .google.cloud.vision.v1.InputConfig input_config = 1;
+   */
+  public boolean hasInputConfig() {
+    return inputConfig_ != null;
+  }
+  /**
+   * 
+   * Required. Information about the input file.
+   * 

+   *
+   * .google.cloud.vision.v1.InputConfig input_config = 1;
+   */
+  public com.google.cloud.vision.v1.InputConfig getInputConfig() {
+    return inputConfig_ == null ? com.google.cloud.vision.v1.InputConfig.getDefaultInstance() : inputConfig_;
+  }
+  /**
+   * 
+   * Required. Information about the input file.
+   * 

+   *
+   * .google.cloud.vision.v1.InputConfig input_config = 1;
+   */
+  public com.google.cloud.vision.v1.InputConfigOrBuilder getInputConfigOrBuilder() {
+    return getInputConfig();
+  }
+
+  public static final int FEATURES_FIELD_NUMBER = 2;
+  private java.util.List features_;
+  /**
+   * 
+   * Required. Requested features.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.Feature features = 2;
+   */
+  public java.util.List getFeaturesList() {
+    return features_;
+  }
+  /**
+   * 
+   * Required. Requested features.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.Feature features = 2;
+   */
+  public java.util.List 
+      getFeaturesOrBuilderList() {
+    return features_;
+  }
+  /**
+   * 
+   * Required. Requested features.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.Feature features = 2;
+   */
+  public int getFeaturesCount() {
+    return features_.size();
+  }
+  /**
+   * 
+   * Required. Requested features.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.Feature features = 2;
+   */
+  public com.google.cloud.vision.v1.Feature getFeatures(int index) {
+    return features_.get(index);
+  }
+  /**
+   * 
+   * Required. Requested features.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.Feature features = 2;
+   */
+  public com.google.cloud.vision.v1.FeatureOrBuilder getFeaturesOrBuilder(
+      int index) {
+    return features_.get(index);
+  }
+
+  public static final int IMAGE_CONTEXT_FIELD_NUMBER = 3;
+  private com.google.cloud.vision.v1.ImageContext imageContext_;
+  /**
+   * 
+   * Additional context that may accompany the image(s) in the file.
+   * 

+   *
+   * .google.cloud.vision.v1.ImageContext image_context = 3;
+   */
+  public boolean hasImageContext() {
+    return imageContext_ != null;
+  }
+  /**
+   * 
+   * Additional context that may accompany the image(s) in the file.
+   * 

+   *
+   * .google.cloud.vision.v1.ImageContext image_context = 3;
+   */
+  public com.google.cloud.vision.v1.ImageContext getImageContext() {
+    return imageContext_ == null ? com.google.cloud.vision.v1.ImageContext.getDefaultInstance() : imageContext_;
+  }
+  /**
+   * 
+   * Additional context that may accompany the image(s) in the file.
+   * 

+   *
+   * .google.cloud.vision.v1.ImageContext image_context = 3;
+   */
+  public com.google.cloud.vision.v1.ImageContextOrBuilder getImageContextOrBuilder() {
+    return getImageContext();
+  }
+
+  public static final int OUTPUT_CONFIG_FIELD_NUMBER = 4;
+  private com.google.cloud.vision.v1.OutputConfig outputConfig_;
+  /**
+   * 
+   * Required. The desired output location and metadata (e.g. format).
+   * 

+   *
+   * .google.cloud.vision.v1.OutputConfig output_config = 4;
+   */
+  public boolean hasOutputConfig() {
+    return outputConfig_ != null;
+  }
+  /**
+   * 
+   * Required. The desired output location and metadata (e.g. format).
+   * 

+   *
+   * .google.cloud.vision.v1.OutputConfig output_config = 4;
+   */
+  public com.google.cloud.vision.v1.OutputConfig getOutputConfig() {
+    return outputConfig_ == null ? com.google.cloud.vision.v1.OutputConfig.getDefaultInstance() : outputConfig_;
+  }
+  /**
+   * 
+   * Required. The desired output location and metadata (e.g. format).
+   * 

+   *
+   * .google.cloud.vision.v1.OutputConfig output_config = 4;
+   */
+  public com.google.cloud.vision.v1.OutputConfigOrBuilder getOutputConfigOrBuilder() {
+    return getOutputConfig();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (inputConfig_ != null) {
+      output.writeMessage(1, getInputConfig());
+    }
+    for (int i = 0; i < features_.size(); i++) {
+      output.writeMessage(2, features_.get(i));
+    }
+    if (imageContext_ != null) {
+      output.writeMessage(3, getImageContext());
+    }
+    if (outputConfig_ != null) {
+      output.writeMessage(4, getOutputConfig());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (inputConfig_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getInputConfig());
+    }
+    for (int i = 0; i < features_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, features_.get(i));
+    }
+    if (imageContext_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, getImageContext());
+    }
+    if (outputConfig_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(4, getOutputConfig());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.vision.v1.AsyncAnnotateFileRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.vision.v1.AsyncAnnotateFileRequest other = (com.google.cloud.vision.v1.AsyncAnnotateFileRequest) obj;
+
+    boolean result = true;
+    result = result && (hasInputConfig() == other.hasInputConfig());
+    if (hasInputConfig()) {
+      result = result && getInputConfig()
+          .equals(other.getInputConfig());
+    }
+    result = result && getFeaturesList()
+        .equals(other.getFeaturesList());
+    result = result && (hasImageContext() == other.hasImageContext());
+    if (hasImageContext()) {
+      result = result && getImageContext()
+          .equals(other.getImageContext());
+    }
+    result = result && (hasOutputConfig() == other.hasOutputConfig());
+    if (hasOutputConfig()) {
+      result = result && getOutputConfig()
+          .equals(other.getOutputConfig());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasInputConfig()) {
+      hash = (37 * hash) + INPUT_CONFIG_FIELD_NUMBER;
+      hash = (53 * hash) + getInputConfig().hashCode();
+    }
+    if (getFeaturesCount() > 0) {
+      hash = (37 * hash) + FEATURES_FIELD_NUMBER;
+      hash = (53 * hash) + getFeaturesList().hashCode();
+    }
+    if (hasImageContext()) {
+      hash = (37 * hash) + IMAGE_CONTEXT_FIELD_NUMBER;
+      hash = (53 * hash) + getImageContext().hashCode();
+    }
+    if (hasOutputConfig()) {
+      hash = (37 * hash) + OUTPUT_CONFIG_FIELD_NUMBER;
+      hash = (53 * hash) + getOutputConfig().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.vision.v1.AsyncAnnotateFileRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * An offline file annotation request.
+   * 

+   *
+   * Protobuf type {@code google.cloud.vision.v1.AsyncAnnotateFileRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.vision.v1.AsyncAnnotateFileRequest)
+      com.google.cloud.vision.v1.AsyncAnnotateFileRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.vision.v1.AsyncAnnotateFileRequest.class, com.google.cloud.vision.v1.AsyncAnnotateFileRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.vision.v1.AsyncAnnotateFileRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getFeaturesFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (inputConfigBuilder_ == null) {
+        inputConfig_ = null;
+      } else {
+        inputConfig_ = null;
+        inputConfigBuilder_ = null;
+      }
+      if (featuresBuilder_ == null) {
+        features_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      } else {
+        featuresBuilder_.clear();
+      }
+      if (imageContextBuilder_ == null) {
+        imageContext_ = null;
+      } else {
+        imageContext_ = null;
+        imageContextBuilder_ = null;
+      }
+      if (outputConfigBuilder_ == null) {
+        outputConfig_ = null;
+      } else {
+        outputConfig_ = null;
+        outputConfigBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileRequest_descriptor;
+    }
+
+    public com.google.cloud.vision.v1.AsyncAnnotateFileRequest getDefaultInstanceForType() {
+      return com.google.cloud.vision.v1.AsyncAnnotateFileRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.vision.v1.AsyncAnnotateFileRequest build() {
+      com.google.cloud.vision.v1.AsyncAnnotateFileRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.vision.v1.AsyncAnnotateFileRequest buildPartial() {
+      com.google.cloud.vision.v1.AsyncAnnotateFileRequest result = new com.google.cloud.vision.v1.AsyncAnnotateFileRequest(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (inputConfigBuilder_ == null) {
+        result.inputConfig_ = inputConfig_;
+      } else {
+        result.inputConfig_ = inputConfigBuilder_.build();
+      }
+      if (featuresBuilder_ == null) {
+        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+          features_ = java.util.Collections.unmodifiableList(features_);
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.features_ = features_;
+      } else {
+        result.features_ = featuresBuilder_.build();
+      }
+      if (imageContextBuilder_ == null) {
+        result.imageContext_ = imageContext_;
+      } else {
+        result.imageContext_ = imageContextBuilder_.build();
+      }
+      if (outputConfigBuilder_ == null) {
+        result.outputConfig_ = outputConfig_;
+      } else {
+        result.outputConfig_ = outputConfigBuilder_.build();
+      }
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.vision.v1.AsyncAnnotateFileRequest) {
+        return mergeFrom((com.google.cloud.vision.v1.AsyncAnnotateFileRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.vision.v1.AsyncAnnotateFileRequest other) {
+      if (other == com.google.cloud.vision.v1.AsyncAnnotateFileRequest.getDefaultInstance()) return this;
+      if (other.hasInputConfig()) {
+        mergeInputConfig(other.getInputConfig());
+      }
+      if (featuresBuilder_ == null) {
+        if (!other.features_.isEmpty()) {
+          if (features_.isEmpty()) {
+            features_ = other.features_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureFeaturesIsMutable();
+            features_.addAll(other.features_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.features_.isEmpty()) {
+          if (featuresBuilder_.isEmpty()) {
+            featuresBuilder_.dispose();
+            featuresBuilder_ = null;
+            features_ = other.features_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+            featuresBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getFeaturesFieldBuilder() : null;
+          } else {
+            featuresBuilder_.addAllMessages(other.features_);
+          }
+        }
+      }
+      if (other.hasImageContext()) {
+        mergeImageContext(other.getImageContext());
+      }
+      if (other.hasOutputConfig()) {
+        mergeOutputConfig(other.getOutputConfig());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.vision.v1.AsyncAnnotateFileRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.vision.v1.AsyncAnnotateFileRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private com.google.cloud.vision.v1.InputConfig inputConfig_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.InputConfig, com.google.cloud.vision.v1.InputConfig.Builder, com.google.cloud.vision.v1.InputConfigOrBuilder> inputConfigBuilder_;
+    /**
+     * 
+     * Required. Information about the input file.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public boolean hasInputConfig() {
+      return inputConfigBuilder_ != null || inputConfig_ != null;
+    }
+    /**
+     * 
+     * Required. Information about the input file.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public com.google.cloud.vision.v1.InputConfig getInputConfig() {
+      if (inputConfigBuilder_ == null) {
+        return inputConfig_ == null ? com.google.cloud.vision.v1.InputConfig.getDefaultInstance() : inputConfig_;
+      } else {
+        return inputConfigBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Required. Information about the input file.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public Builder setInputConfig(com.google.cloud.vision.v1.InputConfig value) {
+      if (inputConfigBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        inputConfig_ = value;
+        onChanged();
+      } else {
+        inputConfigBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. Information about the input file.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public Builder setInputConfig(
+        com.google.cloud.vision.v1.InputConfig.Builder builderForValue) {
+      if (inputConfigBuilder_ == null) {
+        inputConfig_ = builderForValue.build();
+        onChanged();
+      } else {
+        inputConfigBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. Information about the input file.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public Builder mergeInputConfig(com.google.cloud.vision.v1.InputConfig value) {
+      if (inputConfigBuilder_ == null) {
+        if (inputConfig_ != null) {
+          inputConfig_ =
+            com.google.cloud.vision.v1.InputConfig.newBuilder(inputConfig_).mergeFrom(value).buildPartial();
+        } else {
+          inputConfig_ = value;
+        }
+        onChanged();
+      } else {
+        inputConfigBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. Information about the input file.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public Builder clearInputConfig() {
+      if (inputConfigBuilder_ == null) {
+        inputConfig_ = null;
+        onChanged();
+      } else {
+        inputConfig_ = null;
+        inputConfigBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. Information about the input file.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public com.google.cloud.vision.v1.InputConfig.Builder getInputConfigBuilder() {
+      
+      onChanged();
+      return getInputConfigFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Required. Information about the input file.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    public com.google.cloud.vision.v1.InputConfigOrBuilder getInputConfigOrBuilder() {
+      if (inputConfigBuilder_ != null) {
+        return inputConfigBuilder_.getMessageOrBuilder();
+      } else {
+        return inputConfig_ == null ?
+            com.google.cloud.vision.v1.InputConfig.getDefaultInstance() : inputConfig_;
+      }
+    }
+    /**
+     * 
+     * Required. Information about the input file.
+     * 

+     *
+     * .google.cloud.vision.v1.InputConfig input_config = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.InputConfig, com.google.cloud.vision.v1.InputConfig.Builder, com.google.cloud.vision.v1.InputConfigOrBuilder> 
+        getInputConfigFieldBuilder() {
+      if (inputConfigBuilder_ == null) {
+        inputConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.vision.v1.InputConfig, com.google.cloud.vision.v1.InputConfig.Builder, com.google.cloud.vision.v1.InputConfigOrBuilder>(
+                getInputConfig(),
+                getParentForChildren(),
+                isClean());
+        inputConfig_ = null;
+      }
+      return inputConfigBuilder_;
+    }
+
+    private java.util.List features_ =
+      java.util.Collections.emptyList();
+    private void ensureFeaturesIsMutable() {
+      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+        features_ = new java.util.ArrayList(features_);
+        bitField0_ |= 0x00000002;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.vision.v1.Feature, com.google.cloud.vision.v1.Feature.Builder, com.google.cloud.vision.v1.FeatureOrBuilder> featuresBuilder_;
+
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public java.util.List getFeaturesList() {
+      if (featuresBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(features_);
+      } else {
+        return featuresBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public int getFeaturesCount() {
+      if (featuresBuilder_ == null) {
+        return features_.size();
+      } else {
+        return featuresBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public com.google.cloud.vision.v1.Feature getFeatures(int index) {
+      if (featuresBuilder_ == null) {
+        return features_.get(index);
+      } else {
+        return featuresBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public Builder setFeatures(
+        int index, com.google.cloud.vision.v1.Feature value) {
+      if (featuresBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureFeaturesIsMutable();
+        features_.set(index, value);
+        onChanged();
+      } else {
+        featuresBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public Builder setFeatures(
+        int index, com.google.cloud.vision.v1.Feature.Builder builderForValue) {
+      if (featuresBuilder_ == null) {
+        ensureFeaturesIsMutable();
+        features_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        featuresBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public Builder addFeatures(com.google.cloud.vision.v1.Feature value) {
+      if (featuresBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureFeaturesIsMutable();
+        features_.add(value);
+        onChanged();
+      } else {
+        featuresBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public Builder addFeatures(
+        int index, com.google.cloud.vision.v1.Feature value) {
+      if (featuresBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureFeaturesIsMutable();
+        features_.add(index, value);
+        onChanged();
+      } else {
+        featuresBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public Builder addFeatures(
+        com.google.cloud.vision.v1.Feature.Builder builderForValue) {
+      if (featuresBuilder_ == null) {
+        ensureFeaturesIsMutable();
+        features_.add(builderForValue.build());
+        onChanged();
+      } else {
+        featuresBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public Builder addFeatures(
+        int index, com.google.cloud.vision.v1.Feature.Builder builderForValue) {
+      if (featuresBuilder_ == null) {
+        ensureFeaturesIsMutable();
+        features_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        featuresBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public Builder addAllFeatures(
+        java.lang.Iterable values) {
+      if (featuresBuilder_ == null) {
+        ensureFeaturesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, features_);
+        onChanged();
+      } else {
+        featuresBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public Builder clearFeatures() {
+      if (featuresBuilder_ == null) {
+        features_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+      } else {
+        featuresBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public Builder removeFeatures(int index) {
+      if (featuresBuilder_ == null) {
+        ensureFeaturesIsMutable();
+        features_.remove(index);
+        onChanged();
+      } else {
+        featuresBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public com.google.cloud.vision.v1.Feature.Builder getFeaturesBuilder(
+        int index) {
+      return getFeaturesFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public com.google.cloud.vision.v1.FeatureOrBuilder getFeaturesOrBuilder(
+        int index) {
+      if (featuresBuilder_ == null) {
+        return features_.get(index);  } else {
+        return featuresBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public java.util.List 
+         getFeaturesOrBuilderList() {
+      if (featuresBuilder_ != null) {
+        return featuresBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(features_);
+      }
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public com.google.cloud.vision.v1.Feature.Builder addFeaturesBuilder() {
+      return getFeaturesFieldBuilder().addBuilder(
+          com.google.cloud.vision.v1.Feature.getDefaultInstance());
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public com.google.cloud.vision.v1.Feature.Builder addFeaturesBuilder(
+        int index) {
+      return getFeaturesFieldBuilder().addBuilder(
+          index, com.google.cloud.vision.v1.Feature.getDefaultInstance());
+    }
+    /**
+     * 
+     * Required. Requested features.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.Feature features = 2;
+     */
+    public java.util.List 
+         getFeaturesBuilderList() {
+      return getFeaturesFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.vision.v1.Feature, com.google.cloud.vision.v1.Feature.Builder, com.google.cloud.vision.v1.FeatureOrBuilder> 
+        getFeaturesFieldBuilder() {
+      if (featuresBuilder_ == null) {
+        featuresBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.vision.v1.Feature, com.google.cloud.vision.v1.Feature.Builder, com.google.cloud.vision.v1.FeatureOrBuilder>(
+                features_,
+                ((bitField0_ & 0x00000002) == 0x00000002),
+                getParentForChildren(),
+                isClean());
+        features_ = null;
+      }
+      return featuresBuilder_;
+    }
+
+    private com.google.cloud.vision.v1.ImageContext imageContext_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.ImageContext, com.google.cloud.vision.v1.ImageContext.Builder, com.google.cloud.vision.v1.ImageContextOrBuilder> imageContextBuilder_;
+    /**
+     * 
+     * Additional context that may accompany the image(s) in the file.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageContext image_context = 3;
+     */
+    public boolean hasImageContext() {
+      return imageContextBuilder_ != null || imageContext_ != null;
+    }
+    /**
+     * 
+     * Additional context that may accompany the image(s) in the file.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageContext image_context = 3;
+     */
+    public com.google.cloud.vision.v1.ImageContext getImageContext() {
+      if (imageContextBuilder_ == null) {
+        return imageContext_ == null ? com.google.cloud.vision.v1.ImageContext.getDefaultInstance() : imageContext_;
+      } else {
+        return imageContextBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Additional context that may accompany the image(s) in the file.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageContext image_context = 3;
+     */
+    public Builder setImageContext(com.google.cloud.vision.v1.ImageContext value) {
+      if (imageContextBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        imageContext_ = value;
+        onChanged();
+      } else {
+        imageContextBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Additional context that may accompany the image(s) in the file.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageContext image_context = 3;
+     */
+    public Builder setImageContext(
+        com.google.cloud.vision.v1.ImageContext.Builder builderForValue) {
+      if (imageContextBuilder_ == null) {
+        imageContext_ = builderForValue.build();
+        onChanged();
+      } else {
+        imageContextBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Additional context that may accompany the image(s) in the file.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageContext image_context = 3;
+     */
+    public Builder mergeImageContext(com.google.cloud.vision.v1.ImageContext value) {
+      if (imageContextBuilder_ == null) {
+        if (imageContext_ != null) {
+          imageContext_ =
+            com.google.cloud.vision.v1.ImageContext.newBuilder(imageContext_).mergeFrom(value).buildPartial();
+        } else {
+          imageContext_ = value;
+        }
+        onChanged();
+      } else {
+        imageContextBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Additional context that may accompany the image(s) in the file.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageContext image_context = 3;
+     */
+    public Builder clearImageContext() {
+      if (imageContextBuilder_ == null) {
+        imageContext_ = null;
+        onChanged();
+      } else {
+        imageContext_ = null;
+        imageContextBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Additional context that may accompany the image(s) in the file.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageContext image_context = 3;
+     */
+    public com.google.cloud.vision.v1.ImageContext.Builder getImageContextBuilder() {
+      
+      onChanged();
+      return getImageContextFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Additional context that may accompany the image(s) in the file.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageContext image_context = 3;
+     */
+    public com.google.cloud.vision.v1.ImageContextOrBuilder getImageContextOrBuilder() {
+      if (imageContextBuilder_ != null) {
+        return imageContextBuilder_.getMessageOrBuilder();
+      } else {
+        return imageContext_ == null ?
+            com.google.cloud.vision.v1.ImageContext.getDefaultInstance() : imageContext_;
+      }
+    }
+    /**
+     * 
+     * Additional context that may accompany the image(s) in the file.
+     * 

+     *
+     * .google.cloud.vision.v1.ImageContext image_context = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.ImageContext, com.google.cloud.vision.v1.ImageContext.Builder, com.google.cloud.vision.v1.ImageContextOrBuilder> 
+        getImageContextFieldBuilder() {
+      if (imageContextBuilder_ == null) {
+        imageContextBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.vision.v1.ImageContext, com.google.cloud.vision.v1.ImageContext.Builder, com.google.cloud.vision.v1.ImageContextOrBuilder>(
+                getImageContext(),
+                getParentForChildren(),
+                isClean());
+        imageContext_ = null;
+      }
+      return imageContextBuilder_;
+    }
+
+    private com.google.cloud.vision.v1.OutputConfig outputConfig_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.OutputConfig, com.google.cloud.vision.v1.OutputConfig.Builder, com.google.cloud.vision.v1.OutputConfigOrBuilder> outputConfigBuilder_;
+    /**
+     * 
+     * Required. The desired output location and metadata (e.g. format).
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 4;
+     */
+    public boolean hasOutputConfig() {
+      return outputConfigBuilder_ != null || outputConfig_ != null;
+    }
+    /**
+     * 
+     * Required. The desired output location and metadata (e.g. format).
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 4;
+     */
+    public com.google.cloud.vision.v1.OutputConfig getOutputConfig() {
+      if (outputConfigBuilder_ == null) {
+        return outputConfig_ == null ? com.google.cloud.vision.v1.OutputConfig.getDefaultInstance() : outputConfig_;
+      } else {
+        return outputConfigBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * Required. The desired output location and metadata (e.g. format).
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 4;
+     */
+    public Builder setOutputConfig(com.google.cloud.vision.v1.OutputConfig value) {
+      if (outputConfigBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        outputConfig_ = value;
+        onChanged();
+      } else {
+        outputConfigBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. The desired output location and metadata (e.g. format).
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 4;
+     */
+    public Builder setOutputConfig(
+        com.google.cloud.vision.v1.OutputConfig.Builder builderForValue) {
+      if (outputConfigBuilder_ == null) {
+        outputConfig_ = builderForValue.build();
+        onChanged();
+      } else {
+        outputConfigBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. The desired output location and metadata (e.g. format).
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 4;
+     */
+    public Builder mergeOutputConfig(com.google.cloud.vision.v1.OutputConfig value) {
+      if (outputConfigBuilder_ == null) {
+        if (outputConfig_ != null) {
+          outputConfig_ =
+            com.google.cloud.vision.v1.OutputConfig.newBuilder(outputConfig_).mergeFrom(value).buildPartial();
+        } else {
+          outputConfig_ = value;
+        }
+        onChanged();
+      } else {
+        outputConfigBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. The desired output location and metadata (e.g. format).
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 4;
+     */
+    public Builder clearOutputConfig() {
+      if (outputConfigBuilder_ == null) {
+        outputConfig_ = null;
+        onChanged();
+      } else {
+        outputConfig_ = null;
+        outputConfigBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * Required. The desired output location and metadata (e.g. format).
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 4;
+     */
+    public com.google.cloud.vision.v1.OutputConfig.Builder getOutputConfigBuilder() {
+      
+      onChanged();
+      return getOutputConfigFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * Required. The desired output location and metadata (e.g. format).
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 4;
+     */
+    public com.google.cloud.vision.v1.OutputConfigOrBuilder getOutputConfigOrBuilder() {
+      if (outputConfigBuilder_ != null) {
+        return outputConfigBuilder_.getMessageOrBuilder();
+      } else {
+        return outputConfig_ == null ?
+            com.google.cloud.vision.v1.OutputConfig.getDefaultInstance() : outputConfig_;
+      }
+    }
+    /**
+     * 
+     * Required. The desired output location and metadata (e.g. format).
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 4;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.OutputConfig, com.google.cloud.vision.v1.OutputConfig.Builder, com.google.cloud.vision.v1.OutputConfigOrBuilder> 
+        getOutputConfigFieldBuilder() {
+      if (outputConfigBuilder_ == null) {
+        outputConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.vision.v1.OutputConfig, com.google.cloud.vision.v1.OutputConfig.Builder, com.google.cloud.vision.v1.OutputConfigOrBuilder>(
+                getOutputConfig(),
+                getParentForChildren(),
+                isClean());
+        outputConfig_ = null;
+      }
+      return outputConfigBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.vision.v1.AsyncAnnotateFileRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.vision.v1.AsyncAnnotateFileRequest)
+  private static final com.google.cloud.vision.v1.AsyncAnnotateFileRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.vision.v1.AsyncAnnotateFileRequest();
+  }
+
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public AsyncAnnotateFileRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new AsyncAnnotateFileRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.vision.v1.AsyncAnnotateFileRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequestOrBuilder.java
new file mode 100644
index 000000000000..d1a997a06296
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequestOrBuilder.java
@@ -0,0 +1,128 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+public interface AsyncAnnotateFileRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.vision.v1.AsyncAnnotateFileRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Required. Information about the input file.
+   * 

+   *
+   * .google.cloud.vision.v1.InputConfig input_config = 1;
+   */
+  boolean hasInputConfig();
+  /**
+   * 
+   * Required. Information about the input file.
+   * 

+   *
+   * .google.cloud.vision.v1.InputConfig input_config = 1;
+   */
+  com.google.cloud.vision.v1.InputConfig getInputConfig();
+  /**
+   * 
+   * Required. Information about the input file.
+   * 

+   *
+   * .google.cloud.vision.v1.InputConfig input_config = 1;
+   */
+  com.google.cloud.vision.v1.InputConfigOrBuilder getInputConfigOrBuilder();
+
+  /**
+   * 
+   * Required. Requested features.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.Feature features = 2;
+   */
+  java.util.List 
+      getFeaturesList();
+  /**
+   * 
+   * Required. Requested features.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.Feature features = 2;
+   */
+  com.google.cloud.vision.v1.Feature getFeatures(int index);
+  /**
+   * 
+   * Required. Requested features.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.Feature features = 2;
+   */
+  int getFeaturesCount();
+  /**
+   * 
+   * Required. Requested features.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.Feature features = 2;
+   */
+  java.util.List 
+      getFeaturesOrBuilderList();
+  /**
+   * 
+   * Required. Requested features.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.Feature features = 2;
+   */
+  com.google.cloud.vision.v1.FeatureOrBuilder getFeaturesOrBuilder(
+      int index);
+
+  /**
+   * 
+   * Additional context that may accompany the image(s) in the file.
+   * 

+   *
+   * .google.cloud.vision.v1.ImageContext image_context = 3;
+   */
+  boolean hasImageContext();
+  /**
+   * 
+   * Additional context that may accompany the image(s) in the file.
+   * 

+   *
+   * .google.cloud.vision.v1.ImageContext image_context = 3;
+   */
+  com.google.cloud.vision.v1.ImageContext getImageContext();
+  /**
+   * 
+   * Additional context that may accompany the image(s) in the file.
+   * 

+   *
+   * .google.cloud.vision.v1.ImageContext image_context = 3;
+   */
+  com.google.cloud.vision.v1.ImageContextOrBuilder getImageContextOrBuilder();
+
+  /**
+   * 
+   * Required. The desired output location and metadata (e.g. format).
+   * 

+   *
+   * .google.cloud.vision.v1.OutputConfig output_config = 4;
+   */
+  boolean hasOutputConfig();
+  /**
+   * 
+   * Required. The desired output location and metadata (e.g. format).
+   * 

+   *
+   * .google.cloud.vision.v1.OutputConfig output_config = 4;
+   */
+  com.google.cloud.vision.v1.OutputConfig getOutputConfig();
+  /**
+   * 
+   * Required. The desired output location and metadata (e.g. format).
+   * 

+   *
+   * .google.cloud.vision.v1.OutputConfig output_config = 4;
+   */
+  com.google.cloud.vision.v1.OutputConfigOrBuilder getOutputConfigOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponse.java
new file mode 100644
index 000000000000..ec0014e39824
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponse.java
@@ -0,0 +1,626 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+/**
+ * 
+ * The response for a single offline file annotation request.
+ * 

+ *
+ * Protobuf type {@code google.cloud.vision.v1.AsyncAnnotateFileResponse}
+ */
+public  final class AsyncAnnotateFileResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.vision.v1.AsyncAnnotateFileResponse)
+    AsyncAnnotateFileResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use AsyncAnnotateFileResponse.newBuilder() to construct.
+  private AsyncAnnotateFileResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private AsyncAnnotateFileResponse() {
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private AsyncAnnotateFileResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            com.google.cloud.vision.v1.OutputConfig.Builder subBuilder = null;
+            if (outputConfig_ != null) {
+              subBuilder = outputConfig_.toBuilder();
+            }
+            outputConfig_ = input.readMessage(com.google.cloud.vision.v1.OutputConfig.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(outputConfig_);
+              outputConfig_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.vision.v1.AsyncAnnotateFileResponse.class, com.google.cloud.vision.v1.AsyncAnnotateFileResponse.Builder.class);
+  }
+
+  public static final int OUTPUT_CONFIG_FIELD_NUMBER = 1;
+  private com.google.cloud.vision.v1.OutputConfig outputConfig_;
+  /**
+   * 
+   * The output location and metadata from AsyncAnnotateFileRequest.
+   * 

+   *
+   * .google.cloud.vision.v1.OutputConfig output_config = 1;
+   */
+  public boolean hasOutputConfig() {
+    return outputConfig_ != null;
+  }
+  /**
+   * 
+   * The output location and metadata from AsyncAnnotateFileRequest.
+   * 

+   *
+   * .google.cloud.vision.v1.OutputConfig output_config = 1;
+   */
+  public com.google.cloud.vision.v1.OutputConfig getOutputConfig() {
+    return outputConfig_ == null ? com.google.cloud.vision.v1.OutputConfig.getDefaultInstance() : outputConfig_;
+  }
+  /**
+   * 
+   * The output location and metadata from AsyncAnnotateFileRequest.
+   * 

+   *
+   * .google.cloud.vision.v1.OutputConfig output_config = 1;
+   */
+  public com.google.cloud.vision.v1.OutputConfigOrBuilder getOutputConfigOrBuilder() {
+    return getOutputConfig();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (outputConfig_ != null) {
+      output.writeMessage(1, getOutputConfig());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (outputConfig_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getOutputConfig());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.vision.v1.AsyncAnnotateFileResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.vision.v1.AsyncAnnotateFileResponse other = (com.google.cloud.vision.v1.AsyncAnnotateFileResponse) obj;
+
+    boolean result = true;
+    result = result && (hasOutputConfig() == other.hasOutputConfig());
+    if (hasOutputConfig()) {
+      result = result && getOutputConfig()
+          .equals(other.getOutputConfig());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasOutputConfig()) {
+      hash = (37 * hash) + OUTPUT_CONFIG_FIELD_NUMBER;
+      hash = (53 * hash) + getOutputConfig().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.vision.v1.AsyncAnnotateFileResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * The response for a single offline file annotation request.
+   * 

+   *
+   * Protobuf type {@code google.cloud.vision.v1.AsyncAnnotateFileResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.vision.v1.AsyncAnnotateFileResponse)
+      com.google.cloud.vision.v1.AsyncAnnotateFileResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.vision.v1.AsyncAnnotateFileResponse.class, com.google.cloud.vision.v1.AsyncAnnotateFileResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.vision.v1.AsyncAnnotateFileResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (outputConfigBuilder_ == null) {
+        outputConfig_ = null;
+      } else {
+        outputConfig_ = null;
+        outputConfigBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileResponse_descriptor;
+    }
+
+    public com.google.cloud.vision.v1.AsyncAnnotateFileResponse getDefaultInstanceForType() {
+      return com.google.cloud.vision.v1.AsyncAnnotateFileResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.vision.v1.AsyncAnnotateFileResponse build() {
+      com.google.cloud.vision.v1.AsyncAnnotateFileResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.vision.v1.AsyncAnnotateFileResponse buildPartial() {
+      com.google.cloud.vision.v1.AsyncAnnotateFileResponse result = new com.google.cloud.vision.v1.AsyncAnnotateFileResponse(this);
+      if (outputConfigBuilder_ == null) {
+        result.outputConfig_ = outputConfig_;
+      } else {
+        result.outputConfig_ = outputConfigBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.vision.v1.AsyncAnnotateFileResponse) {
+        return mergeFrom((com.google.cloud.vision.v1.AsyncAnnotateFileResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.vision.v1.AsyncAnnotateFileResponse other) {
+      if (other == com.google.cloud.vision.v1.AsyncAnnotateFileResponse.getDefaultInstance()) return this;
+      if (other.hasOutputConfig()) {
+        mergeOutputConfig(other.getOutputConfig());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.vision.v1.AsyncAnnotateFileResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.vision.v1.AsyncAnnotateFileResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.cloud.vision.v1.OutputConfig outputConfig_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.OutputConfig, com.google.cloud.vision.v1.OutputConfig.Builder, com.google.cloud.vision.v1.OutputConfigOrBuilder> outputConfigBuilder_;
+    /**
+     * 
+     * The output location and metadata from AsyncAnnotateFileRequest.
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 1;
+     */
+    public boolean hasOutputConfig() {
+      return outputConfigBuilder_ != null || outputConfig_ != null;
+    }
+    /**
+     * 
+     * The output location and metadata from AsyncAnnotateFileRequest.
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 1;
+     */
+    public com.google.cloud.vision.v1.OutputConfig getOutputConfig() {
+      if (outputConfigBuilder_ == null) {
+        return outputConfig_ == null ? com.google.cloud.vision.v1.OutputConfig.getDefaultInstance() : outputConfig_;
+      } else {
+        return outputConfigBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The output location and metadata from AsyncAnnotateFileRequest.
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 1;
+     */
+    public Builder setOutputConfig(com.google.cloud.vision.v1.OutputConfig value) {
+      if (outputConfigBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        outputConfig_ = value;
+        onChanged();
+      } else {
+        outputConfigBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The output location and metadata from AsyncAnnotateFileRequest.
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 1;
+     */
+    public Builder setOutputConfig(
+        com.google.cloud.vision.v1.OutputConfig.Builder builderForValue) {
+      if (outputConfigBuilder_ == null) {
+        outputConfig_ = builderForValue.build();
+        onChanged();
+      } else {
+        outputConfigBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The output location and metadata from AsyncAnnotateFileRequest.
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 1;
+     */
+    public Builder mergeOutputConfig(com.google.cloud.vision.v1.OutputConfig value) {
+      if (outputConfigBuilder_ == null) {
+        if (outputConfig_ != null) {
+          outputConfig_ =
+            com.google.cloud.vision.v1.OutputConfig.newBuilder(outputConfig_).mergeFrom(value).buildPartial();
+        } else {
+          outputConfig_ = value;
+        }
+        onChanged();
+      } else {
+        outputConfigBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The output location and metadata from AsyncAnnotateFileRequest.
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 1;
+     */
+    public Builder clearOutputConfig() {
+      if (outputConfigBuilder_ == null) {
+        outputConfig_ = null;
+        onChanged();
+      } else {
+        outputConfig_ = null;
+        outputConfigBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The output location and metadata from AsyncAnnotateFileRequest.
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 1;
+     */
+    public com.google.cloud.vision.v1.OutputConfig.Builder getOutputConfigBuilder() {
+      
+      onChanged();
+      return getOutputConfigFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The output location and metadata from AsyncAnnotateFileRequest.
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 1;
+     */
+    public com.google.cloud.vision.v1.OutputConfigOrBuilder getOutputConfigOrBuilder() {
+      if (outputConfigBuilder_ != null) {
+        return outputConfigBuilder_.getMessageOrBuilder();
+      } else {
+        return outputConfig_ == null ?
+            com.google.cloud.vision.v1.OutputConfig.getDefaultInstance() : outputConfig_;
+      }
+    }
+    /**
+     * 
+     * The output location and metadata from AsyncAnnotateFileRequest.
+     * 

+     *
+     * .google.cloud.vision.v1.OutputConfig output_config = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.OutputConfig, com.google.cloud.vision.v1.OutputConfig.Builder, com.google.cloud.vision.v1.OutputConfigOrBuilder> 
+        getOutputConfigFieldBuilder() {
+      if (outputConfigBuilder_ == null) {
+        outputConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.vision.v1.OutputConfig, com.google.cloud.vision.v1.OutputConfig.Builder, com.google.cloud.vision.v1.OutputConfigOrBuilder>(
+                getOutputConfig(),
+                getParentForChildren(),
+                isClean());
+        outputConfig_ = null;
+      }
+      return outputConfigBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.vision.v1.AsyncAnnotateFileResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.vision.v1.AsyncAnnotateFileResponse)
+  private static final com.google.cloud.vision.v1.AsyncAnnotateFileResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.vision.v1.AsyncAnnotateFileResponse();
+  }
+
+  public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public AsyncAnnotateFileResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new AsyncAnnotateFileResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.vision.v1.AsyncAnnotateFileResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponseOrBuilder.java
new file mode 100644
index 000000000000..36b15dd011bb
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponseOrBuilder.java
@@ -0,0 +1,34 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+public interface AsyncAnnotateFileResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.vision.v1.AsyncAnnotateFileResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The output location and metadata from AsyncAnnotateFileRequest.
+   * 

+   *
+   * .google.cloud.vision.v1.OutputConfig output_config = 1;
+   */
+  boolean hasOutputConfig();
+  /**
+   * 
+   * The output location and metadata from AsyncAnnotateFileRequest.
+   * 

+   *
+   * .google.cloud.vision.v1.OutputConfig output_config = 1;
+   */
+  com.google.cloud.vision.v1.OutputConfig getOutputConfig();
+  /**
+   * 
+   * The output location and metadata from AsyncAnnotateFileRequest.
+   * 

+   *
+   * .google.cloud.vision.v1.OutputConfig output_config = 1;
+   */
+  com.google.cloud.vision.v1.OutputConfigOrBuilder getOutputConfigOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequest.java
new file mode 100644
index 000000000000..df368dd99d37
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequest.java
@@ -0,0 +1,836 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+/**
+ * 
+ * Multiple async file annotation requests are batched into a single service
+ * call.
+ * 

+ *
+ * Protobuf type {@code google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest}
+ */
+public  final class AsyncBatchAnnotateFilesRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest)
+    AsyncBatchAnnotateFilesRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use AsyncBatchAnnotateFilesRequest.newBuilder() to construct.
+  private AsyncBatchAnnotateFilesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private AsyncBatchAnnotateFilesRequest() {
+    requests_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private AsyncBatchAnnotateFilesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              requests_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            requests_.add(
+                input.readMessage(com.google.cloud.vision.v1.AsyncAnnotateFileRequest.parser(), extensionRegistry));
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        requests_ = java.util.Collections.unmodifiableList(requests_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest.class, com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest.Builder.class);
+  }
+
+  public static final int REQUESTS_FIELD_NUMBER = 1;
+  private java.util.List requests_;
+  /**
+   * 
+   * Individual async file annotation requests for this batch.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+   */
+  public java.util.List getRequestsList() {
+    return requests_;
+  }
+  /**
+   * 
+   * Individual async file annotation requests for this batch.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+   */
+  public java.util.List 
+      getRequestsOrBuilderList() {
+    return requests_;
+  }
+  /**
+   * 
+   * Individual async file annotation requests for this batch.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+   */
+  public int getRequestsCount() {
+    return requests_.size();
+  }
+  /**
+   * 
+   * Individual async file annotation requests for this batch.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+   */
+  public com.google.cloud.vision.v1.AsyncAnnotateFileRequest getRequests(int index) {
+    return requests_.get(index);
+  }
+  /**
+   * 
+   * Individual async file annotation requests for this batch.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+   */
+  public com.google.cloud.vision.v1.AsyncAnnotateFileRequestOrBuilder getRequestsOrBuilder(
+      int index) {
+    return requests_.get(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < requests_.size(); i++) {
+      output.writeMessage(1, requests_.get(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < requests_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, requests_.get(i));
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest other = (com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest) obj;
+
+    boolean result = true;
+    result = result && getRequestsList()
+        .equals(other.getRequestsList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getRequestsCount() > 0) {
+      hash = (37 * hash) + REQUESTS_FIELD_NUMBER;
+      hash = (53 * hash) + getRequestsList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Multiple async file annotation requests are batched into a single service
+   * call.
+   * 

+   *
+   * Protobuf type {@code google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest)
+      com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest.class, com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getRequestsFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (requestsBuilder_ == null) {
+        requests_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        requestsBuilder_.clear();
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesRequest_descriptor;
+    }
+
+    public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest getDefaultInstanceForType() {
+      return com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest build() {
+      com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest buildPartial() {
+      com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest result = new com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest(this);
+      int from_bitField0_ = bitField0_;
+      if (requestsBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          requests_ = java.util.Collections.unmodifiableList(requests_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.requests_ = requests_;
+      } else {
+        result.requests_ = requestsBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest) {
+        return mergeFrom((com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest other) {
+      if (other == com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest.getDefaultInstance()) return this;
+      if (requestsBuilder_ == null) {
+        if (!other.requests_.isEmpty()) {
+          if (requests_.isEmpty()) {
+            requests_ = other.requests_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureRequestsIsMutable();
+            requests_.addAll(other.requests_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.requests_.isEmpty()) {
+          if (requestsBuilder_.isEmpty()) {
+            requestsBuilder_.dispose();
+            requestsBuilder_ = null;
+            requests_ = other.requests_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            requestsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getRequestsFieldBuilder() : null;
+          } else {
+            requestsBuilder_.addAllMessages(other.requests_);
+          }
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List requests_ =
+      java.util.Collections.emptyList();
+    private void ensureRequestsIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        requests_ = new java.util.ArrayList(requests_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.vision.v1.AsyncAnnotateFileRequest, com.google.cloud.vision.v1.AsyncAnnotateFileRequest.Builder, com.google.cloud.vision.v1.AsyncAnnotateFileRequestOrBuilder> requestsBuilder_;
+
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public java.util.List getRequestsList() {
+      if (requestsBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(requests_);
+      } else {
+        return requestsBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public int getRequestsCount() {
+      if (requestsBuilder_ == null) {
+        return requests_.size();
+      } else {
+        return requestsBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public com.google.cloud.vision.v1.AsyncAnnotateFileRequest getRequests(int index) {
+      if (requestsBuilder_ == null) {
+        return requests_.get(index);
+      } else {
+        return requestsBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public Builder setRequests(
+        int index, com.google.cloud.vision.v1.AsyncAnnotateFileRequest value) {
+      if (requestsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRequestsIsMutable();
+        requests_.set(index, value);
+        onChanged();
+      } else {
+        requestsBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public Builder setRequests(
+        int index, com.google.cloud.vision.v1.AsyncAnnotateFileRequest.Builder builderForValue) {
+      if (requestsBuilder_ == null) {
+        ensureRequestsIsMutable();
+        requests_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        requestsBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public Builder addRequests(com.google.cloud.vision.v1.AsyncAnnotateFileRequest value) {
+      if (requestsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRequestsIsMutable();
+        requests_.add(value);
+        onChanged();
+      } else {
+        requestsBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public Builder addRequests(
+        int index, com.google.cloud.vision.v1.AsyncAnnotateFileRequest value) {
+      if (requestsBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureRequestsIsMutable();
+        requests_.add(index, value);
+        onChanged();
+      } else {
+        requestsBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public Builder addRequests(
+        com.google.cloud.vision.v1.AsyncAnnotateFileRequest.Builder builderForValue) {
+      if (requestsBuilder_ == null) {
+        ensureRequestsIsMutable();
+        requests_.add(builderForValue.build());
+        onChanged();
+      } else {
+        requestsBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public Builder addRequests(
+        int index, com.google.cloud.vision.v1.AsyncAnnotateFileRequest.Builder builderForValue) {
+      if (requestsBuilder_ == null) {
+        ensureRequestsIsMutable();
+        requests_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        requestsBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public Builder addAllRequests(
+        java.lang.Iterable values) {
+      if (requestsBuilder_ == null) {
+        ensureRequestsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, requests_);
+        onChanged();
+      } else {
+        requestsBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public Builder clearRequests() {
+      if (requestsBuilder_ == null) {
+        requests_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        requestsBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public Builder removeRequests(int index) {
+      if (requestsBuilder_ == null) {
+        ensureRequestsIsMutable();
+        requests_.remove(index);
+        onChanged();
+      } else {
+        requestsBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public com.google.cloud.vision.v1.AsyncAnnotateFileRequest.Builder getRequestsBuilder(
+        int index) {
+      return getRequestsFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public com.google.cloud.vision.v1.AsyncAnnotateFileRequestOrBuilder getRequestsOrBuilder(
+        int index) {
+      if (requestsBuilder_ == null) {
+        return requests_.get(index);  } else {
+        return requestsBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public java.util.List 
+         getRequestsOrBuilderList() {
+      if (requestsBuilder_ != null) {
+        return requestsBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(requests_);
+      }
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public com.google.cloud.vision.v1.AsyncAnnotateFileRequest.Builder addRequestsBuilder() {
+      return getRequestsFieldBuilder().addBuilder(
+          com.google.cloud.vision.v1.AsyncAnnotateFileRequest.getDefaultInstance());
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public com.google.cloud.vision.v1.AsyncAnnotateFileRequest.Builder addRequestsBuilder(
+        int index) {
+      return getRequestsFieldBuilder().addBuilder(
+          index, com.google.cloud.vision.v1.AsyncAnnotateFileRequest.getDefaultInstance());
+    }
+    /**
+     * 
+     * Individual async file annotation requests for this batch.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+     */
+    public java.util.List 
+         getRequestsBuilderList() {
+      return getRequestsFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.vision.v1.AsyncAnnotateFileRequest, com.google.cloud.vision.v1.AsyncAnnotateFileRequest.Builder, com.google.cloud.vision.v1.AsyncAnnotateFileRequestOrBuilder> 
+        getRequestsFieldBuilder() {
+      if (requestsBuilder_ == null) {
+        requestsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.vision.v1.AsyncAnnotateFileRequest, com.google.cloud.vision.v1.AsyncAnnotateFileRequest.Builder, com.google.cloud.vision.v1.AsyncAnnotateFileRequestOrBuilder>(
+                requests_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        requests_ = null;
+      }
+      return requestsBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest)
+  private static final com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest();
+  }
+
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public AsyncBatchAnnotateFilesRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new AsyncBatchAnnotateFilesRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequestOrBuilder.java
new file mode 100644
index 000000000000..a56a419b5126
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequestOrBuilder.java
@@ -0,0 +1,53 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+public interface AsyncBatchAnnotateFilesRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Individual async file annotation requests for this batch.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+   */
+  java.util.List 
+      getRequestsList();
+  /**
+   * 
+   * Individual async file annotation requests for this batch.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+   */
+  com.google.cloud.vision.v1.AsyncAnnotateFileRequest getRequests(int index);
+  /**
+   * 
+   * Individual async file annotation requests for this batch.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+   */
+  int getRequestsCount();
+  /**
+   * 
+   * Individual async file annotation requests for this batch.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+   */
+  java.util.List 
+      getRequestsOrBuilderList();
+  /**
+   * 
+   * Individual async file annotation requests for this batch.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileRequest requests = 1;
+   */
+  com.google.cloud.vision.v1.AsyncAnnotateFileRequestOrBuilder getRequestsOrBuilder(
+      int index);
+}
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponse.java
new file mode 100644
index 000000000000..3107b23f498b
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponse.java
@@ -0,0 +1,857 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+/**
+ * 
+ * Response to an async batch file annotation request.
+ * 

+ *
+ * Protobuf type {@code google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse}
+ */
+public  final class AsyncBatchAnnotateFilesResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse)
+    AsyncBatchAnnotateFilesResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use AsyncBatchAnnotateFilesResponse.newBuilder() to construct.
+  private AsyncBatchAnnotateFilesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private AsyncBatchAnnotateFilesResponse() {
+    responses_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private AsyncBatchAnnotateFilesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              responses_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            responses_.add(
+                input.readMessage(com.google.cloud.vision.v1.AsyncAnnotateFileResponse.parser(), extensionRegistry));
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        responses_ = java.util.Collections.unmodifiableList(responses_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse.class, com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse.Builder.class);
+  }
+
+  public static final int RESPONSES_FIELD_NUMBER = 1;
+  private java.util.List responses_;
+  /**
+   * 
+   * The list of file annotation responses, one for each request in
+   * AsyncBatchAnnotateFilesRequest.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+   */
+  public java.util.List getResponsesList() {
+    return responses_;
+  }
+  /**
+   * 
+   * The list of file annotation responses, one for each request in
+   * AsyncBatchAnnotateFilesRequest.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+   */
+  public java.util.List 
+      getResponsesOrBuilderList() {
+    return responses_;
+  }
+  /**
+   * 
+   * The list of file annotation responses, one for each request in
+   * AsyncBatchAnnotateFilesRequest.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+   */
+  public int getResponsesCount() {
+    return responses_.size();
+  }
+  /**
+   * 
+   * The list of file annotation responses, one for each request in
+   * AsyncBatchAnnotateFilesRequest.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+   */
+  public com.google.cloud.vision.v1.AsyncAnnotateFileResponse getResponses(int index) {
+    return responses_.get(index);
+  }
+  /**
+   * 
+   * The list of file annotation responses, one for each request in
+   * AsyncBatchAnnotateFilesRequest.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+   */
+  public com.google.cloud.vision.v1.AsyncAnnotateFileResponseOrBuilder getResponsesOrBuilder(
+      int index) {
+    return responses_.get(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < responses_.size(); i++) {
+      output.writeMessage(1, responses_.get(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < responses_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, responses_.get(i));
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse other = (com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse) obj;
+
+    boolean result = true;
+    result = result && getResponsesList()
+        .equals(other.getResponsesList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getResponsesCount() > 0) {
+      hash = (37 * hash) + RESPONSES_FIELD_NUMBER;
+      hash = (53 * hash) + getResponsesList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Response to an async batch file annotation request.
+   * 

+   *
+   * Protobuf type {@code google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse)
+      com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse.class, com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getResponsesFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (responsesBuilder_ == null) {
+        responses_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        responsesBuilder_.clear();
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesResponse_descriptor;
+    }
+
+    public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse getDefaultInstanceForType() {
+      return com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse build() {
+      com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse buildPartial() {
+      com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse result = new com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse(this);
+      int from_bitField0_ = bitField0_;
+      if (responsesBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          responses_ = java.util.Collections.unmodifiableList(responses_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.responses_ = responses_;
+      } else {
+        result.responses_ = responsesBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse) {
+        return mergeFrom((com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse other) {
+      if (other == com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse.getDefaultInstance()) return this;
+      if (responsesBuilder_ == null) {
+        if (!other.responses_.isEmpty()) {
+          if (responses_.isEmpty()) {
+            responses_ = other.responses_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureResponsesIsMutable();
+            responses_.addAll(other.responses_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.responses_.isEmpty()) {
+          if (responsesBuilder_.isEmpty()) {
+            responsesBuilder_.dispose();
+            responsesBuilder_ = null;
+            responses_ = other.responses_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            responsesBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getResponsesFieldBuilder() : null;
+          } else {
+            responsesBuilder_.addAllMessages(other.responses_);
+          }
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List responses_ =
+      java.util.Collections.emptyList();
+    private void ensureResponsesIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        responses_ = new java.util.ArrayList(responses_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.vision.v1.AsyncAnnotateFileResponse, com.google.cloud.vision.v1.AsyncAnnotateFileResponse.Builder, com.google.cloud.vision.v1.AsyncAnnotateFileResponseOrBuilder> responsesBuilder_;
+
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public java.util.List getResponsesList() {
+      if (responsesBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(responses_);
+      } else {
+        return responsesBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public int getResponsesCount() {
+      if (responsesBuilder_ == null) {
+        return responses_.size();
+      } else {
+        return responsesBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public com.google.cloud.vision.v1.AsyncAnnotateFileResponse getResponses(int index) {
+      if (responsesBuilder_ == null) {
+        return responses_.get(index);
+      } else {
+        return responsesBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public Builder setResponses(
+        int index, com.google.cloud.vision.v1.AsyncAnnotateFileResponse value) {
+      if (responsesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureResponsesIsMutable();
+        responses_.set(index, value);
+        onChanged();
+      } else {
+        responsesBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public Builder setResponses(
+        int index, com.google.cloud.vision.v1.AsyncAnnotateFileResponse.Builder builderForValue) {
+      if (responsesBuilder_ == null) {
+        ensureResponsesIsMutable();
+        responses_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        responsesBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public Builder addResponses(com.google.cloud.vision.v1.AsyncAnnotateFileResponse value) {
+      if (responsesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureResponsesIsMutable();
+        responses_.add(value);
+        onChanged();
+      } else {
+        responsesBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public Builder addResponses(
+        int index, com.google.cloud.vision.v1.AsyncAnnotateFileResponse value) {
+      if (responsesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureResponsesIsMutable();
+        responses_.add(index, value);
+        onChanged();
+      } else {
+        responsesBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public Builder addResponses(
+        com.google.cloud.vision.v1.AsyncAnnotateFileResponse.Builder builderForValue) {
+      if (responsesBuilder_ == null) {
+        ensureResponsesIsMutable();
+        responses_.add(builderForValue.build());
+        onChanged();
+      } else {
+        responsesBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public Builder addResponses(
+        int index, com.google.cloud.vision.v1.AsyncAnnotateFileResponse.Builder builderForValue) {
+      if (responsesBuilder_ == null) {
+        ensureResponsesIsMutable();
+        responses_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        responsesBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public Builder addAllResponses(
+        java.lang.Iterable values) {
+      if (responsesBuilder_ == null) {
+        ensureResponsesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, responses_);
+        onChanged();
+      } else {
+        responsesBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public Builder clearResponses() {
+      if (responsesBuilder_ == null) {
+        responses_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        responsesBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public Builder removeResponses(int index) {
+      if (responsesBuilder_ == null) {
+        ensureResponsesIsMutable();
+        responses_.remove(index);
+        onChanged();
+      } else {
+        responsesBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public com.google.cloud.vision.v1.AsyncAnnotateFileResponse.Builder getResponsesBuilder(
+        int index) {
+      return getResponsesFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public com.google.cloud.vision.v1.AsyncAnnotateFileResponseOrBuilder getResponsesOrBuilder(
+        int index) {
+      if (responsesBuilder_ == null) {
+        return responses_.get(index);  } else {
+        return responsesBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public java.util.List 
+         getResponsesOrBuilderList() {
+      if (responsesBuilder_ != null) {
+        return responsesBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(responses_);
+      }
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public com.google.cloud.vision.v1.AsyncAnnotateFileResponse.Builder addResponsesBuilder() {
+      return getResponsesFieldBuilder().addBuilder(
+          com.google.cloud.vision.v1.AsyncAnnotateFileResponse.getDefaultInstance());
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public com.google.cloud.vision.v1.AsyncAnnotateFileResponse.Builder addResponsesBuilder(
+        int index) {
+      return getResponsesFieldBuilder().addBuilder(
+          index, com.google.cloud.vision.v1.AsyncAnnotateFileResponse.getDefaultInstance());
+    }
+    /**
+     * 
+     * The list of file annotation responses, one for each request in
+     * AsyncBatchAnnotateFilesRequest.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+     */
+    public java.util.List 
+         getResponsesBuilderList() {
+      return getResponsesFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.vision.v1.AsyncAnnotateFileResponse, com.google.cloud.vision.v1.AsyncAnnotateFileResponse.Builder, com.google.cloud.vision.v1.AsyncAnnotateFileResponseOrBuilder> 
+        getResponsesFieldBuilder() {
+      if (responsesBuilder_ == null) {
+        responsesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.vision.v1.AsyncAnnotateFileResponse, com.google.cloud.vision.v1.AsyncAnnotateFileResponse.Builder, com.google.cloud.vision.v1.AsyncAnnotateFileResponseOrBuilder>(
+                responses_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        responses_ = null;
+      }
+      return responsesBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse)
+  private static final com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse();
+  }
+
+  public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public AsyncBatchAnnotateFilesResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new AsyncBatchAnnotateFilesResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponseOrBuilder.java
new file mode 100644
index 000000000000..29a29014543a
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponseOrBuilder.java
@@ -0,0 +1,58 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+public interface AsyncBatchAnnotateFilesResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The list of file annotation responses, one for each request in
+   * AsyncBatchAnnotateFilesRequest.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+   */
+  java.util.List 
+      getResponsesList();
+  /**
+   * 
+   * The list of file annotation responses, one for each request in
+   * AsyncBatchAnnotateFilesRequest.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+   */
+  com.google.cloud.vision.v1.AsyncAnnotateFileResponse getResponses(int index);
+  /**
+   * 
+   * The list of file annotation responses, one for each request in
+   * AsyncBatchAnnotateFilesRequest.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+   */
+  int getResponsesCount();
+  /**
+   * 
+   * The list of file annotation responses, one for each request in
+   * AsyncBatchAnnotateFilesRequest.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+   */
+  java.util.List 
+      getResponsesOrBuilderList();
+  /**
+   * 
+   * The list of file annotation responses, one for each request in
+   * AsyncBatchAnnotateFilesRequest.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.AsyncAnnotateFileResponse responses = 1;
+   */
+  com.google.cloud.vision.v1.AsyncAnnotateFileResponseOrBuilder getResponsesOrBuilder(
+      int index);
+}
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPoly.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPoly.java
index ccbbe30fe87a..25f4ec64b791 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPoly.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPoly.java
@@ -21,6 +21,7 @@ private BoundingPoly(com.google.protobuf.GeneratedMessageV3.Builder builder)
   }
   private BoundingPoly() {
     vertices_ = java.util.Collections.emptyList();
+    normalizedVertices_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
@@ -63,6 +64,15 @@ private BoundingPoly(
                 input.readMessage(com.google.cloud.vision.v1.Vertex.parser(), extensionRegistry));
             break;
           }
+          case 18: {
+            if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+              normalizedVertices_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000002;
+            }
+            normalizedVertices_.add(
+                input.readMessage(com.google.cloud.vision.v1.NormalizedVertex.parser(), extensionRegistry));
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -74,6 +84,9 @@ private BoundingPoly(
       if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
         vertices_ = java.util.Collections.unmodifiableList(vertices_);
       }
+      if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+        normalizedVertices_ = java.util.Collections.unmodifiableList(normalizedVertices_);
+      }
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
@@ -145,6 +158,61 @@ public com.google.cloud.vision.v1.VertexOrBuilder getVerticesOrBuilder(
     return vertices_.get(index);
   }
 
+  public static final int NORMALIZED_VERTICES_FIELD_NUMBER = 2;
+  private java.util.List normalizedVertices_;
+  /**
+   * 
+   * The bounding polygon normalized vertices.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+   */
+  public java.util.List getNormalizedVerticesList() {
+    return normalizedVertices_;
+  }
+  /**
+   * 
+   * The bounding polygon normalized vertices.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+   */
+  public java.util.List 
+      getNormalizedVerticesOrBuilderList() {
+    return normalizedVertices_;
+  }
+  /**
+   * 
+   * The bounding polygon normalized vertices.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+   */
+  public int getNormalizedVerticesCount() {
+    return normalizedVertices_.size();
+  }
+  /**
+   * 
+   * The bounding polygon normalized vertices.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+   */
+  public com.google.cloud.vision.v1.NormalizedVertex getNormalizedVertices(int index) {
+    return normalizedVertices_.get(index);
+  }
+  /**
+   * 
+   * The bounding polygon normalized vertices.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+   */
+  public com.google.cloud.vision.v1.NormalizedVertexOrBuilder getNormalizedVerticesOrBuilder(
+      int index) {
+    return normalizedVertices_.get(index);
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -160,6 +228,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     for (int i = 0; i < vertices_.size(); i++) {
       output.writeMessage(1, vertices_.get(i));
     }
+    for (int i = 0; i < normalizedVertices_.size(); i++) {
+      output.writeMessage(2, normalizedVertices_.get(i));
+    }
     unknownFields.writeTo(output);
   }
 
@@ -172,6 +243,10 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, vertices_.get(i));
     }
+    for (int i = 0; i < normalizedVertices_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, normalizedVertices_.get(i));
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -190,6 +265,8 @@ public boolean equals(final java.lang.Object obj) {
     boolean result = true;
     result = result && getVerticesList()
         .equals(other.getVerticesList());
+    result = result && getNormalizedVerticesList()
+        .equals(other.getNormalizedVerticesList());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -205,6 +282,10 @@ public int hashCode() {
       hash = (37 * hash) + VERTICES_FIELD_NUMBER;
       hash = (53 * hash) + getVerticesList().hashCode();
     }
+    if (getNormalizedVerticesCount() > 0) {
+      hash = (37 * hash) + NORMALIZED_VERTICES_FIELD_NUMBER;
+      hash = (53 * hash) + getNormalizedVerticesList().hashCode();
+    }
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -335,6 +416,7 @@ private void maybeForceBuilderInitialization() {
       if (com.google.protobuf.GeneratedMessageV3
               .alwaysUseFieldBuilders) {
         getVerticesFieldBuilder();
+        getNormalizedVerticesFieldBuilder();
       }
     }
     public Builder clear() {
@@ -345,6 +427,12 @@ public Builder clear() {
       } else {
         verticesBuilder_.clear();
       }
+      if (normalizedVerticesBuilder_ == null) {
+        normalizedVertices_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+      } else {
+        normalizedVerticesBuilder_.clear();
+      }
       return this;
     }
 
@@ -377,6 +465,15 @@ public com.google.cloud.vision.v1.BoundingPoly buildPartial() {
       } else {
         result.vertices_ = verticesBuilder_.build();
       }
+      if (normalizedVerticesBuilder_ == null) {
+        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+          normalizedVertices_ = java.util.Collections.unmodifiableList(normalizedVertices_);
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.normalizedVertices_ = normalizedVertices_;
+      } else {
+        result.normalizedVertices_ = normalizedVerticesBuilder_.build();
+      }
       onBuilt();
       return result;
     }
@@ -444,6 +541,32 @@ public Builder mergeFrom(com.google.cloud.vision.v1.BoundingPoly other) {
           }
         }
       }
+      if (normalizedVerticesBuilder_ == null) {
+        if (!other.normalizedVertices_.isEmpty()) {
+          if (normalizedVertices_.isEmpty()) {
+            normalizedVertices_ = other.normalizedVertices_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureNormalizedVerticesIsMutable();
+            normalizedVertices_.addAll(other.normalizedVertices_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.normalizedVertices_.isEmpty()) {
+          if (normalizedVerticesBuilder_.isEmpty()) {
+            normalizedVerticesBuilder_.dispose();
+            normalizedVerticesBuilder_ = null;
+            normalizedVertices_ = other.normalizedVertices_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+            normalizedVerticesBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getNormalizedVerticesFieldBuilder() : null;
+          } else {
+            normalizedVerticesBuilder_.addAllMessages(other.normalizedVertices_);
+          }
+        }
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -783,6 +906,318 @@ public com.google.cloud.vision.v1.Vertex.Builder addVerticesBuilder(
       }
       return verticesBuilder_;
     }
+
+    private java.util.List normalizedVertices_ =
+      java.util.Collections.emptyList();
+    private void ensureNormalizedVerticesIsMutable() {
+      if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+        normalizedVertices_ = new java.util.ArrayList(normalizedVertices_);
+        bitField0_ |= 0x00000002;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.vision.v1.NormalizedVertex, com.google.cloud.vision.v1.NormalizedVertex.Builder, com.google.cloud.vision.v1.NormalizedVertexOrBuilder> normalizedVerticesBuilder_;
+
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public java.util.List getNormalizedVerticesList() {
+      if (normalizedVerticesBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(normalizedVertices_);
+      } else {
+        return normalizedVerticesBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public int getNormalizedVerticesCount() {
+      if (normalizedVerticesBuilder_ == null) {
+        return normalizedVertices_.size();
+      } else {
+        return normalizedVerticesBuilder_.getCount();
+      }
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public com.google.cloud.vision.v1.NormalizedVertex getNormalizedVertices(int index) {
+      if (normalizedVerticesBuilder_ == null) {
+        return normalizedVertices_.get(index);
+      } else {
+        return normalizedVerticesBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public Builder setNormalizedVertices(
+        int index, com.google.cloud.vision.v1.NormalizedVertex value) {
+      if (normalizedVerticesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureNormalizedVerticesIsMutable();
+        normalizedVertices_.set(index, value);
+        onChanged();
+      } else {
+        normalizedVerticesBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public Builder setNormalizedVertices(
+        int index, com.google.cloud.vision.v1.NormalizedVertex.Builder builderForValue) {
+      if (normalizedVerticesBuilder_ == null) {
+        ensureNormalizedVerticesIsMutable();
+        normalizedVertices_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        normalizedVerticesBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public Builder addNormalizedVertices(com.google.cloud.vision.v1.NormalizedVertex value) {
+      if (normalizedVerticesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureNormalizedVerticesIsMutable();
+        normalizedVertices_.add(value);
+        onChanged();
+      } else {
+        normalizedVerticesBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public Builder addNormalizedVertices(
+        int index, com.google.cloud.vision.v1.NormalizedVertex value) {
+      if (normalizedVerticesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureNormalizedVerticesIsMutable();
+        normalizedVertices_.add(index, value);
+        onChanged();
+      } else {
+        normalizedVerticesBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public Builder addNormalizedVertices(
+        com.google.cloud.vision.v1.NormalizedVertex.Builder builderForValue) {
+      if (normalizedVerticesBuilder_ == null) {
+        ensureNormalizedVerticesIsMutable();
+        normalizedVertices_.add(builderForValue.build());
+        onChanged();
+      } else {
+        normalizedVerticesBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public Builder addNormalizedVertices(
+        int index, com.google.cloud.vision.v1.NormalizedVertex.Builder builderForValue) {
+      if (normalizedVerticesBuilder_ == null) {
+        ensureNormalizedVerticesIsMutable();
+        normalizedVertices_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        normalizedVerticesBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public Builder addAllNormalizedVertices(
+        java.lang.Iterable values) {
+      if (normalizedVerticesBuilder_ == null) {
+        ensureNormalizedVerticesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, normalizedVertices_);
+        onChanged();
+      } else {
+        normalizedVerticesBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public Builder clearNormalizedVertices() {
+      if (normalizedVerticesBuilder_ == null) {
+        normalizedVertices_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+      } else {
+        normalizedVerticesBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public Builder removeNormalizedVertices(int index) {
+      if (normalizedVerticesBuilder_ == null) {
+        ensureNormalizedVerticesIsMutable();
+        normalizedVertices_.remove(index);
+        onChanged();
+      } else {
+        normalizedVerticesBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public com.google.cloud.vision.v1.NormalizedVertex.Builder getNormalizedVerticesBuilder(
+        int index) {
+      return getNormalizedVerticesFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public com.google.cloud.vision.v1.NormalizedVertexOrBuilder getNormalizedVerticesOrBuilder(
+        int index) {
+      if (normalizedVerticesBuilder_ == null) {
+        return normalizedVertices_.get(index);  } else {
+        return normalizedVerticesBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public java.util.List 
+         getNormalizedVerticesOrBuilderList() {
+      if (normalizedVerticesBuilder_ != null) {
+        return normalizedVerticesBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(normalizedVertices_);
+      }
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public com.google.cloud.vision.v1.NormalizedVertex.Builder addNormalizedVerticesBuilder() {
+      return getNormalizedVerticesFieldBuilder().addBuilder(
+          com.google.cloud.vision.v1.NormalizedVertex.getDefaultInstance());
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public com.google.cloud.vision.v1.NormalizedVertex.Builder addNormalizedVerticesBuilder(
+        int index) {
+      return getNormalizedVerticesFieldBuilder().addBuilder(
+          index, com.google.cloud.vision.v1.NormalizedVertex.getDefaultInstance());
+    }
+    /**
+     * 
+     * The bounding polygon normalized vertices.
+     * 

+     *
+     * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+     */
+    public java.util.List 
+         getNormalizedVerticesBuilderList() {
+      return getNormalizedVerticesFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.vision.v1.NormalizedVertex, com.google.cloud.vision.v1.NormalizedVertex.Builder, com.google.cloud.vision.v1.NormalizedVertexOrBuilder> 
+        getNormalizedVerticesFieldBuilder() {
+      if (normalizedVerticesBuilder_ == null) {
+        normalizedVerticesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.vision.v1.NormalizedVertex, com.google.cloud.vision.v1.NormalizedVertex.Builder, com.google.cloud.vision.v1.NormalizedVertexOrBuilder>(
+                normalizedVertices_,
+                ((bitField0_ & 0x00000002) == 0x00000002),
+                getParentForChildren(),
+                isClean());
+        normalizedVertices_ = null;
+      }
+      return normalizedVerticesBuilder_;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPolyOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPolyOrBuilder.java
index 730347650d55..ddae3582c7f2 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPolyOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPolyOrBuilder.java
@@ -50,4 +50,48 @@ public interface BoundingPolyOrBuilder extends
    */
   com.google.cloud.vision.v1.VertexOrBuilder getVerticesOrBuilder(
       int index);
+
+  /**
+   * 
+   * The bounding polygon normalized vertices.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+   */
+  java.util.List 
+      getNormalizedVerticesList();
+  /**
+   * 
+   * The bounding polygon normalized vertices.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+   */
+  com.google.cloud.vision.v1.NormalizedVertex getNormalizedVertices(int index);
+  /**
+   * 
+   * The bounding polygon normalized vertices.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+   */
+  int getNormalizedVerticesCount();
+  /**
+   * 
+   * The bounding polygon normalized vertices.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+   */
+  java.util.List 
+      getNormalizedVerticesOrBuilderList();
+  /**
+   * 
+   * The bounding polygon normalized vertices.
+   * 

+   *
+   * repeated .google.cloud.vision.v1.NormalizedVertex normalized_vertices = 2;
+   */
+  com.google.cloud.vision.v1.NormalizedVertexOrBuilder getNormalizedVerticesOrBuilder(
+      int index);
 }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KindExpression.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestination.java
similarity index 51%
rename from google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KindExpression.java
rename to google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestination.java
index e1dc7d6e0027..101cf4784e3e 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/KindExpression.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestination.java
@@ -1,26 +1,26 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
+// source: google/cloud/vision/v1/image_annotator.proto
 
-package com.google.privacy.dlp.v2beta1;
+package com.google.cloud.vision.v1;
 
 /**
  * 
- * A representation of a Datastore kind.
+ * The Google Cloud Storage location where the output will be written to.
  * 

  *
- * Protobuf type {@code google.privacy.dlp.v2beta1.KindExpression}
+ * Protobuf type {@code google.cloud.vision.v1.GcsDestination}
  */
-public  final class KindExpression extends
+public  final class GcsDestination extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.KindExpression)
-    KindExpressionOrBuilder {
+    // @@protoc_insertion_point(message_implements:google.cloud.vision.v1.GcsDestination)
+    GcsDestinationOrBuilder {
 private static final long serialVersionUID = 0L;
-  // Use KindExpression.newBuilder() to construct.
-  private KindExpression(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+  // Use GcsDestination.newBuilder() to construct.
+  private GcsDestination(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private KindExpression() {
-    name_ = "";
+  private GcsDestination() {
+    uri_ = "";
   }
 
   @java.lang.Override
@@ -28,7 +28,7 @@ private KindExpression() {
   getUnknownFields() {
     return this.unknownFields;
   }
-  private KindExpression(
+  private GcsDestination(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
@@ -57,7 +57,7 @@ private KindExpression(
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
-            name_ = s;
+            uri_ = s;
             break;
           }
         }
@@ -74,52 +74,74 @@ private KindExpression(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_KindExpression_descriptor;
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsDestination_descriptor;
   }
 
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_KindExpression_fieldAccessorTable
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsDestination_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.KindExpression.class, com.google.privacy.dlp.v2beta1.KindExpression.Builder.class);
+            com.google.cloud.vision.v1.GcsDestination.class, com.google.cloud.vision.v1.GcsDestination.Builder.class);
   }
 
-  public static final int NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object name_;
+  public static final int URI_FIELD_NUMBER = 1;
+  private volatile java.lang.Object uri_;
   /**
    * 
-   * The name of the kind.
+   * Google Cloud Storage URI where the results will be stored. Results will
+   * be in JSON format and preceded by its corresponding input URI. This field
+   * can either represent a single file, or a prefix for multiple outputs.
+   * Prefixes must end in a `/`.
+   * Examples:
+   * *    File: gs://bucket-name/filename.json
+   * *    Prefix: gs://bucket-name/prefix/here/
+   * *    File: gs://bucket-name/prefix/here
+   * If multiple outputs, each response is still AnnotateFileResponse, each of
+   * which contains some subset of the full list of AnnotateImageResponse.
+   * Multiple outputs can happen if, for example, the output JSON is too large
+   * and overflows into multiple sharded files.
    * 

    *
-   * string name = 1;
+   * string uri = 1;
    */
-  public java.lang.String getName() {
-    java.lang.Object ref = name_;
+  public java.lang.String getUri() {
+    java.lang.Object ref = uri_;
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
-      name_ = s;
+      uri_ = s;
       return s;
     }
   }
   /**
    * 
-   * The name of the kind.
+   * Google Cloud Storage URI where the results will be stored. Results will
+   * be in JSON format and preceded by its corresponding input URI. This field
+   * can either represent a single file, or a prefix for multiple outputs.
+   * Prefixes must end in a `/`.
+   * Examples:
+   * *    File: gs://bucket-name/filename.json
+   * *    Prefix: gs://bucket-name/prefix/here/
+   * *    File: gs://bucket-name/prefix/here
+   * If multiple outputs, each response is still AnnotateFileResponse, each of
+   * which contains some subset of the full list of AnnotateImageResponse.
+   * Multiple outputs can happen if, for example, the output JSON is too large
+   * and overflows into multiple sharded files.
    * 

    *
-   * string name = 1;
+   * string uri = 1;
    */
   public com.google.protobuf.ByteString
-      getNameBytes() {
-    java.lang.Object ref = name_;
+      getUriBytes() {
+    java.lang.Object ref = uri_;
     if (ref instanceof java.lang.String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
               (java.lang.String) ref);
-      name_ = b;
+      uri_ = b;
       return b;
     } else {
       return (com.google.protobuf.ByteString) ref;
@@ -138,8 +160,8 @@ public final boolean isInitialized() {
 
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
+    if (!getUriBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, uri_);
     }
     unknownFields.writeTo(output);
   }
@@ -149,8 +171,8 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
+    if (!getUriBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, uri_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -162,14 +184,14 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.KindExpression)) {
+    if (!(obj instanceof com.google.cloud.vision.v1.GcsDestination)) {
       return super.equals(obj);
     }
-    com.google.privacy.dlp.v2beta1.KindExpression other = (com.google.privacy.dlp.v2beta1.KindExpression) obj;
+    com.google.cloud.vision.v1.GcsDestination other = (com.google.cloud.vision.v1.GcsDestination) obj;
 
     boolean result = true;
-    result = result && getName()
-        .equals(other.getName());
+    result = result && getUri()
+        .equals(other.getUri());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -181,76 +203,76 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getName().hashCode();
+    hash = (37 * hash) + URI_FIELD_NUMBER;
+    hash = (53 * hash) + getUri().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
 
-  public static com.google.privacy.dlp.v2beta1.KindExpression parseFrom(
+  public static com.google.cloud.vision.v1.GcsDestination parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.privacy.dlp.v2beta1.KindExpression parseFrom(
+  public static com.google.cloud.vision.v1.GcsDestination parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.KindExpression parseFrom(
+  public static com.google.cloud.vision.v1.GcsDestination parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.privacy.dlp.v2beta1.KindExpression parseFrom(
+  public static com.google.cloud.vision.v1.GcsDestination parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.KindExpression parseFrom(byte[] data)
+  public static com.google.cloud.vision.v1.GcsDestination parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.privacy.dlp.v2beta1.KindExpression parseFrom(
+  public static com.google.cloud.vision.v1.GcsDestination parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.KindExpression parseFrom(java.io.InputStream input)
+  public static com.google.cloud.vision.v1.GcsDestination parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.google.privacy.dlp.v2beta1.KindExpression parseFrom(
+  public static com.google.cloud.vision.v1.GcsDestination parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.KindExpression parseDelimitedFrom(java.io.InputStream input)
+  public static com.google.cloud.vision.v1.GcsDestination parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.google.privacy.dlp.v2beta1.KindExpression parseDelimitedFrom(
+  public static com.google.cloud.vision.v1.GcsDestination parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.KindExpression parseFrom(
+  public static com.google.cloud.vision.v1.GcsDestination parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.google.privacy.dlp.v2beta1.KindExpression parseFrom(
+  public static com.google.cloud.vision.v1.GcsDestination parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -262,7 +284,7 @@ public static com.google.privacy.dlp.v2beta1.KindExpression parseFrom(
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.KindExpression prototype) {
+  public static Builder newBuilder(com.google.cloud.vision.v1.GcsDestination prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   public Builder toBuilder() {
@@ -278,28 +300,28 @@ protected Builder newBuilderForType(
   }
   /**
    * 
-   * A representation of a Datastore kind.
+   * The Google Cloud Storage location where the output will be written to.
    * 

    *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.KindExpression}
+   * Protobuf type {@code google.cloud.vision.v1.GcsDestination}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.KindExpression)
-      com.google.privacy.dlp.v2beta1.KindExpressionOrBuilder {
+      // @@protoc_insertion_point(builder_implements:google.cloud.vision.v1.GcsDestination)
+      com.google.cloud.vision.v1.GcsDestinationOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_KindExpression_descriptor;
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsDestination_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_KindExpression_fieldAccessorTable
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsDestination_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.KindExpression.class, com.google.privacy.dlp.v2beta1.KindExpression.Builder.class);
+              com.google.cloud.vision.v1.GcsDestination.class, com.google.cloud.vision.v1.GcsDestination.Builder.class);
     }
 
-    // Construct using com.google.privacy.dlp.v2beta1.KindExpression.newBuilder()
+    // Construct using com.google.cloud.vision.v1.GcsDestination.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -316,31 +338,31 @@ private void maybeForceBuilderInitialization() {
     }
     public Builder clear() {
       super.clear();
-      name_ = "";
+      uri_ = "";
 
       return this;
     }
 
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_KindExpression_descriptor;
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsDestination_descriptor;
     }
 
-    public com.google.privacy.dlp.v2beta1.KindExpression getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.KindExpression.getDefaultInstance();
+    public com.google.cloud.vision.v1.GcsDestination getDefaultInstanceForType() {
+      return com.google.cloud.vision.v1.GcsDestination.getDefaultInstance();
     }
 
-    public com.google.privacy.dlp.v2beta1.KindExpression build() {
-      com.google.privacy.dlp.v2beta1.KindExpression result = buildPartial();
+    public com.google.cloud.vision.v1.GcsDestination build() {
+      com.google.cloud.vision.v1.GcsDestination result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.google.privacy.dlp.v2beta1.KindExpression buildPartial() {
-      com.google.privacy.dlp.v2beta1.KindExpression result = new com.google.privacy.dlp.v2beta1.KindExpression(this);
-      result.name_ = name_;
+    public com.google.cloud.vision.v1.GcsDestination buildPartial() {
+      com.google.cloud.vision.v1.GcsDestination result = new com.google.cloud.vision.v1.GcsDestination(this);
+      result.uri_ = uri_;
       onBuilt();
       return result;
     }
@@ -372,18 +394,18 @@ public Builder addRepeatedField(
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.KindExpression) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.KindExpression)other);
+      if (other instanceof com.google.cloud.vision.v1.GcsDestination) {
+        return mergeFrom((com.google.cloud.vision.v1.GcsDestination)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.KindExpression other) {
-      if (other == com.google.privacy.dlp.v2beta1.KindExpression.getDefaultInstance()) return this;
-      if (!other.getName().isEmpty()) {
-        name_ = other.name_;
+    public Builder mergeFrom(com.google.cloud.vision.v1.GcsDestination other) {
+      if (other == com.google.cloud.vision.v1.GcsDestination.getDefaultInstance()) return this;
+      if (!other.getUri().isEmpty()) {
+        uri_ = other.uri_;
         onChanged();
       }
       this.mergeUnknownFields(other.unknownFields);
@@ -399,11 +421,11 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.KindExpression parsedMessage = null;
+      com.google.cloud.vision.v1.GcsDestination parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.KindExpression) e.getUnfinishedMessage();
+        parsedMessage = (com.google.cloud.vision.v1.GcsDestination) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -413,21 +435,32 @@ public Builder mergeFrom(
       return this;
     }
 
-    private java.lang.Object name_ = "";
+    private java.lang.Object uri_ = "";
     /**
      * 
-     * The name of the kind.
+     * Google Cloud Storage URI where the results will be stored. Results will
+     * be in JSON format and preceded by its corresponding input URI. This field
+     * can either represent a single file, or a prefix for multiple outputs.
+     * Prefixes must end in a `/`.
+     * Examples:
+     * *    File: gs://bucket-name/filename.json
+     * *    Prefix: gs://bucket-name/prefix/here/
+     * *    File: gs://bucket-name/prefix/here
+     * If multiple outputs, each response is still AnnotateFileResponse, each of
+     * which contains some subset of the full list of AnnotateImageResponse.
+     * Multiple outputs can happen if, for example, the output JSON is too large
+     * and overflows into multiple sharded files.
      * 

      *
-     * string name = 1;
+     * string uri = 1;
      */
-    public java.lang.String getName() {
-      java.lang.Object ref = name_;
+    public java.lang.String getUri() {
+      java.lang.Object ref = uri_;
       if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        name_ = s;
+        uri_ = s;
         return s;
       } else {
         return (java.lang.String) ref;
@@ -435,19 +468,30 @@ public java.lang.String getName() {
     }
     /**
      * 
-     * The name of the kind.
+     * Google Cloud Storage URI where the results will be stored. Results will
+     * be in JSON format and preceded by its corresponding input URI. This field
+     * can either represent a single file, or a prefix for multiple outputs.
+     * Prefixes must end in a `/`.
+     * Examples:
+     * *    File: gs://bucket-name/filename.json
+     * *    Prefix: gs://bucket-name/prefix/here/
+     * *    File: gs://bucket-name/prefix/here
+     * If multiple outputs, each response is still AnnotateFileResponse, each of
+     * which contains some subset of the full list of AnnotateImageResponse.
+     * Multiple outputs can happen if, for example, the output JSON is too large
+     * and overflows into multiple sharded files.
      * 

      *
-     * string name = 1;
+     * string uri = 1;
      */
     public com.google.protobuf.ByteString
-        getNameBytes() {
-      java.lang.Object ref = name_;
+        getUriBytes() {
+      java.lang.Object ref = uri_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        name_ = b;
+        uri_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
@@ -455,49 +499,82 @@ public java.lang.String getName() {
     }
     /**
      * 
-     * The name of the kind.
+     * Google Cloud Storage URI where the results will be stored. Results will
+     * be in JSON format and preceded by its corresponding input URI. This field
+     * can either represent a single file, or a prefix for multiple outputs.
+     * Prefixes must end in a `/`.
+     * Examples:
+     * *    File: gs://bucket-name/filename.json
+     * *    Prefix: gs://bucket-name/prefix/here/
+     * *    File: gs://bucket-name/prefix/here
+     * If multiple outputs, each response is still AnnotateFileResponse, each of
+     * which contains some subset of the full list of AnnotateImageResponse.
+     * Multiple outputs can happen if, for example, the output JSON is too large
+     * and overflows into multiple sharded files.
      * 

      *
-     * string name = 1;
+     * string uri = 1;
      */
-    public Builder setName(
+    public Builder setUri(
         java.lang.String value) {
       if (value == null) {
     throw new NullPointerException();
   }
   
-      name_ = value;
+      uri_ = value;
       onChanged();
       return this;
     }
     /**
      * 
-     * The name of the kind.
+     * Google Cloud Storage URI where the results will be stored. Results will
+     * be in JSON format and preceded by its corresponding input URI. This field
+     * can either represent a single file, or a prefix for multiple outputs.
+     * Prefixes must end in a `/`.
+     * Examples:
+     * *    File: gs://bucket-name/filename.json
+     * *    Prefix: gs://bucket-name/prefix/here/
+     * *    File: gs://bucket-name/prefix/here
+     * If multiple outputs, each response is still AnnotateFileResponse, each of
+     * which contains some subset of the full list of AnnotateImageResponse.
+     * Multiple outputs can happen if, for example, the output JSON is too large
+     * and overflows into multiple sharded files.
      * 

      *
-     * string name = 1;
+     * string uri = 1;
      */
-    public Builder clearName() {
+    public Builder clearUri() {
       
-      name_ = getDefaultInstance().getName();
+      uri_ = getDefaultInstance().getUri();
       onChanged();
       return this;
     }
     /**
      * 
-     * The name of the kind.
+     * Google Cloud Storage URI where the results will be stored. Results will
+     * be in JSON format and preceded by its corresponding input URI. This field
+     * can either represent a single file, or a prefix for multiple outputs.
+     * Prefixes must end in a `/`.
+     * Examples:
+     * *    File: gs://bucket-name/filename.json
+     * *    Prefix: gs://bucket-name/prefix/here/
+     * *    File: gs://bucket-name/prefix/here
+     * If multiple outputs, each response is still AnnotateFileResponse, each of
+     * which contains some subset of the full list of AnnotateImageResponse.
+     * Multiple outputs can happen if, for example, the output JSON is too large
+     * and overflows into multiple sharded files.
      * 

      *
-     * string name = 1;
+     * string uri = 1;
      */
-    public Builder setNameBytes(
+    public Builder setUriBytes(
         com.google.protobuf.ByteString value) {
       if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
       
-      name_ = value;
+      uri_ = value;
       onChanged();
       return this;
     }
@@ -512,39 +589,39 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.KindExpression)
+    // @@protoc_insertion_point(builder_scope:google.cloud.vision.v1.GcsDestination)
   }
 
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.KindExpression)
-  private static final com.google.privacy.dlp.v2beta1.KindExpression DEFAULT_INSTANCE;
+  // @@protoc_insertion_point(class_scope:google.cloud.vision.v1.GcsDestination)
+  private static final com.google.cloud.vision.v1.GcsDestination DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.KindExpression();
+    DEFAULT_INSTANCE = new com.google.cloud.vision.v1.GcsDestination();
   }
 
-  public static com.google.privacy.dlp.v2beta1.KindExpression getDefaultInstance() {
+  public static com.google.cloud.vision.v1.GcsDestination getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public KindExpression parsePartialFrom(
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public GcsDestination parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new KindExpression(input, extensionRegistry);
+      return new GcsDestination(input, extensionRegistry);
     }
   };
 
-  public static com.google.protobuf.Parser parser() {
+  public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
   @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
+  public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  public com.google.privacy.dlp.v2beta1.KindExpression getDefaultInstanceForType() {
+  public com.google.cloud.vision.v1.GcsDestination getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestinationOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestinationOrBuilder.java
new file mode 100644
index 000000000000..50c3e1bc5053
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestinationOrBuilder.java
@@ -0,0 +1,49 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+public interface GcsDestinationOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.vision.v1.GcsDestination)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Google Cloud Storage URI where the results will be stored. Results will
+   * be in JSON format and preceded by its corresponding input URI. This field
+   * can either represent a single file, or a prefix for multiple outputs.
+   * Prefixes must end in a `/`.
+   * Examples:
+   * *    File: gs://bucket-name/filename.json
+   * *    Prefix: gs://bucket-name/prefix/here/
+   * *    File: gs://bucket-name/prefix/here
+   * If multiple outputs, each response is still AnnotateFileResponse, each of
+   * which contains some subset of the full list of AnnotateImageResponse.
+   * Multiple outputs can happen if, for example, the output JSON is too large
+   * and overflows into multiple sharded files.
+   * 

+   *
+   * string uri = 1;
+   */
+  java.lang.String getUri();
+  /**
+   * 
+   * Google Cloud Storage URI where the results will be stored. Results will
+   * be in JSON format and preceded by its corresponding input URI. This field
+   * can either represent a single file, or a prefix for multiple outputs.
+   * Prefixes must end in a `/`.
+   * Examples:
+   * *    File: gs://bucket-name/filename.json
+   * *    Prefix: gs://bucket-name/prefix/here/
+   * *    File: gs://bucket-name/prefix/here
+   * If multiple outputs, each response is still AnnotateFileResponse, each of
+   * which contains some subset of the full list of AnnotateImageResponse.
+   * Multiple outputs can happen if, for example, the output JSON is too large
+   * and overflows into multiple sharded files.
+   * 

+   *
+   * string uri = 1;
+   */
+  com.google.protobuf.ByteString
+      getUriBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldId.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSource.java
similarity index 63%
rename from google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldId.java
rename to google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSource.java
index d1b50418924c..58f68067640e 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/FieldId.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSource.java
@@ -1,26 +1,26 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/storage.proto
+// source: google/cloud/vision/v1/image_annotator.proto
 
-package com.google.privacy.dlp.v2beta1;
+package com.google.cloud.vision.v1;
 
 /**
  * 
- * General identifier of a data field in a storage service.
+ * The Google Cloud Storage location where the input will be read from.
  * 

  *
- * Protobuf type {@code google.privacy.dlp.v2beta1.FieldId}
+ * Protobuf type {@code google.cloud.vision.v1.GcsSource}
  */
-public  final class FieldId extends
+public  final class GcsSource extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.FieldId)
-    FieldIdOrBuilder {
+    // @@protoc_insertion_point(message_implements:google.cloud.vision.v1.GcsSource)
+    GcsSourceOrBuilder {
 private static final long serialVersionUID = 0L;
-  // Use FieldId.newBuilder() to construct.
-  private FieldId(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+  // Use GcsSource.newBuilder() to construct.
+  private GcsSource(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private FieldId() {
-    columnName_ = "";
+  private GcsSource() {
+    uri_ = "";
   }
 
   @java.lang.Override
@@ -28,7 +28,7 @@ private FieldId() {
   getUnknownFields() {
     return this.unknownFields;
   }
-  private FieldId(
+  private GcsSource(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
@@ -57,7 +57,7 @@ private FieldId(
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
-            columnName_ = s;
+            uri_ = s;
             break;
           }
         }
@@ -74,52 +74,54 @@ private FieldId(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_FieldId_descriptor;
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsSource_descriptor;
   }
 
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_FieldId_fieldAccessorTable
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsSource_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.FieldId.class, com.google.privacy.dlp.v2beta1.FieldId.Builder.class);
+            com.google.cloud.vision.v1.GcsSource.class, com.google.cloud.vision.v1.GcsSource.Builder.class);
   }
 
-  public static final int COLUMN_NAME_FIELD_NUMBER = 1;
-  private volatile java.lang.Object columnName_;
+  public static final int URI_FIELD_NUMBER = 1;
+  private volatile java.lang.Object uri_;
   /**
    * 
-   * Name describing the field.
+   * Google Cloud Storage URI for the input file. This must only be a
+   * Google Cloud Storage object. Wildcards are not currently supported.
    * 

    *
-   * string column_name = 1;
+   * string uri = 1;
    */
-  public java.lang.String getColumnName() {
-    java.lang.Object ref = columnName_;
+  public java.lang.String getUri() {
+    java.lang.Object ref = uri_;
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
-      columnName_ = s;
+      uri_ = s;
       return s;
     }
   }
   /**
    * 
-   * Name describing the field.
+   * Google Cloud Storage URI for the input file. This must only be a
+   * Google Cloud Storage object. Wildcards are not currently supported.
    * 

    *
-   * string column_name = 1;
+   * string uri = 1;
    */
   public com.google.protobuf.ByteString
-      getColumnNameBytes() {
-    java.lang.Object ref = columnName_;
+      getUriBytes() {
+    java.lang.Object ref = uri_;
     if (ref instanceof java.lang.String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
               (java.lang.String) ref);
-      columnName_ = b;
+      uri_ = b;
       return b;
     } else {
       return (com.google.protobuf.ByteString) ref;
@@ -138,8 +140,8 @@ public final boolean isInitialized() {
 
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (!getColumnNameBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, columnName_);
+    if (!getUriBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, uri_);
     }
     unknownFields.writeTo(output);
   }
@@ -149,8 +151,8 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getColumnNameBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, columnName_);
+    if (!getUriBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, uri_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -162,14 +164,14 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.FieldId)) {
+    if (!(obj instanceof com.google.cloud.vision.v1.GcsSource)) {
       return super.equals(obj);
     }
-    com.google.privacy.dlp.v2beta1.FieldId other = (com.google.privacy.dlp.v2beta1.FieldId) obj;
+    com.google.cloud.vision.v1.GcsSource other = (com.google.cloud.vision.v1.GcsSource) obj;
 
     boolean result = true;
-    result = result && getColumnName()
-        .equals(other.getColumnName());
+    result = result && getUri()
+        .equals(other.getUri());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -181,76 +183,76 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + COLUMN_NAME_FIELD_NUMBER;
-    hash = (53 * hash) + getColumnName().hashCode();
+    hash = (37 * hash) + URI_FIELD_NUMBER;
+    hash = (53 * hash) + getUri().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
 
-  public static com.google.privacy.dlp.v2beta1.FieldId parseFrom(
+  public static com.google.cloud.vision.v1.GcsSource parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.privacy.dlp.v2beta1.FieldId parseFrom(
+  public static com.google.cloud.vision.v1.GcsSource parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.FieldId parseFrom(
+  public static com.google.cloud.vision.v1.GcsSource parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.privacy.dlp.v2beta1.FieldId parseFrom(
+  public static com.google.cloud.vision.v1.GcsSource parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.FieldId parseFrom(byte[] data)
+  public static com.google.cloud.vision.v1.GcsSource parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.privacy.dlp.v2beta1.FieldId parseFrom(
+  public static com.google.cloud.vision.v1.GcsSource parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.FieldId parseFrom(java.io.InputStream input)
+  public static com.google.cloud.vision.v1.GcsSource parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.google.privacy.dlp.v2beta1.FieldId parseFrom(
+  public static com.google.cloud.vision.v1.GcsSource parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.FieldId parseDelimitedFrom(java.io.InputStream input)
+  public static com.google.cloud.vision.v1.GcsSource parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.google.privacy.dlp.v2beta1.FieldId parseDelimitedFrom(
+  public static com.google.cloud.vision.v1.GcsSource parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.FieldId parseFrom(
+  public static com.google.cloud.vision.v1.GcsSource parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.google.privacy.dlp.v2beta1.FieldId parseFrom(
+  public static com.google.cloud.vision.v1.GcsSource parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -262,7 +264,7 @@ public static com.google.privacy.dlp.v2beta1.FieldId parseFrom(
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.FieldId prototype) {
+  public static Builder newBuilder(com.google.cloud.vision.v1.GcsSource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   public Builder toBuilder() {
@@ -278,28 +280,28 @@ protected Builder newBuilderForType(
   }
   /**
    * 
-   * General identifier of a data field in a storage service.
+   * The Google Cloud Storage location where the input will be read from.
    * 

    *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.FieldId}
+   * Protobuf type {@code google.cloud.vision.v1.GcsSource}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.FieldId)
-      com.google.privacy.dlp.v2beta1.FieldIdOrBuilder {
+      // @@protoc_insertion_point(builder_implements:google.cloud.vision.v1.GcsSource)
+      com.google.cloud.vision.v1.GcsSourceOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_FieldId_descriptor;
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsSource_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_FieldId_fieldAccessorTable
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsSource_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.FieldId.class, com.google.privacy.dlp.v2beta1.FieldId.Builder.class);
+              com.google.cloud.vision.v1.GcsSource.class, com.google.cloud.vision.v1.GcsSource.Builder.class);
     }
 
-    // Construct using com.google.privacy.dlp.v2beta1.FieldId.newBuilder()
+    // Construct using com.google.cloud.vision.v1.GcsSource.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -316,31 +318,31 @@ private void maybeForceBuilderInitialization() {
     }
     public Builder clear() {
       super.clear();
-      columnName_ = "";
+      uri_ = "";
 
       return this;
     }
 
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_FieldId_descriptor;
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsSource_descriptor;
     }
 
-    public com.google.privacy.dlp.v2beta1.FieldId getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance();
+    public com.google.cloud.vision.v1.GcsSource getDefaultInstanceForType() {
+      return com.google.cloud.vision.v1.GcsSource.getDefaultInstance();
     }
 
-    public com.google.privacy.dlp.v2beta1.FieldId build() {
-      com.google.privacy.dlp.v2beta1.FieldId result = buildPartial();
+    public com.google.cloud.vision.v1.GcsSource build() {
+      com.google.cloud.vision.v1.GcsSource result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.google.privacy.dlp.v2beta1.FieldId buildPartial() {
-      com.google.privacy.dlp.v2beta1.FieldId result = new com.google.privacy.dlp.v2beta1.FieldId(this);
-      result.columnName_ = columnName_;
+    public com.google.cloud.vision.v1.GcsSource buildPartial() {
+      com.google.cloud.vision.v1.GcsSource result = new com.google.cloud.vision.v1.GcsSource(this);
+      result.uri_ = uri_;
       onBuilt();
       return result;
     }
@@ -372,18 +374,18 @@ public Builder addRepeatedField(
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.FieldId) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.FieldId)other);
+      if (other instanceof com.google.cloud.vision.v1.GcsSource) {
+        return mergeFrom((com.google.cloud.vision.v1.GcsSource)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.FieldId other) {
-      if (other == com.google.privacy.dlp.v2beta1.FieldId.getDefaultInstance()) return this;
-      if (!other.getColumnName().isEmpty()) {
-        columnName_ = other.columnName_;
+    public Builder mergeFrom(com.google.cloud.vision.v1.GcsSource other) {
+      if (other == com.google.cloud.vision.v1.GcsSource.getDefaultInstance()) return this;
+      if (!other.getUri().isEmpty()) {
+        uri_ = other.uri_;
         onChanged();
       }
       this.mergeUnknownFields(other.unknownFields);
@@ -399,11 +401,11 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.FieldId parsedMessage = null;
+      com.google.cloud.vision.v1.GcsSource parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.FieldId) e.getUnfinishedMessage();
+        parsedMessage = (com.google.cloud.vision.v1.GcsSource) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -413,21 +415,22 @@ public Builder mergeFrom(
       return this;
     }
 
-    private java.lang.Object columnName_ = "";
+    private java.lang.Object uri_ = "";
     /**
      * 
-     * Name describing the field.
+     * Google Cloud Storage URI for the input file. This must only be a
+     * Google Cloud Storage object. Wildcards are not currently supported.
      * 

      *
-     * string column_name = 1;
+     * string uri = 1;
      */
-    public java.lang.String getColumnName() {
-      java.lang.Object ref = columnName_;
+    public java.lang.String getUri() {
+      java.lang.Object ref = uri_;
       if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        columnName_ = s;
+        uri_ = s;
         return s;
       } else {
         return (java.lang.String) ref;
@@ -435,19 +438,20 @@ public java.lang.String getColumnName() {
     }
     /**
      * 
-     * Name describing the field.
+     * Google Cloud Storage URI for the input file. This must only be a
+     * Google Cloud Storage object. Wildcards are not currently supported.
      * 

      *
-     * string column_name = 1;
+     * string uri = 1;
      */
     public com.google.protobuf.ByteString
-        getColumnNameBytes() {
-      java.lang.Object ref = columnName_;
+        getUriBytes() {
+      java.lang.Object ref = uri_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        columnName_ = b;
+        uri_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
@@ -455,49 +459,52 @@ public java.lang.String getColumnName() {
     }
     /**
      * 
-     * Name describing the field.
+     * Google Cloud Storage URI for the input file. This must only be a
+     * Google Cloud Storage object. Wildcards are not currently supported.
      * 

      *
-     * string column_name = 1;
+     * string uri = 1;
      */
-    public Builder setColumnName(
+    public Builder setUri(
         java.lang.String value) {
       if (value == null) {
     throw new NullPointerException();
   }
   
-      columnName_ = value;
+      uri_ = value;
       onChanged();
       return this;
     }
     /**
      * 
-     * Name describing the field.
+     * Google Cloud Storage URI for the input file. This must only be a
+     * Google Cloud Storage object. Wildcards are not currently supported.
      * 

      *
-     * string column_name = 1;
+     * string uri = 1;
      */
-    public Builder clearColumnName() {
+    public Builder clearUri() {
       
-      columnName_ = getDefaultInstance().getColumnName();
+      uri_ = getDefaultInstance().getUri();
       onChanged();
       return this;
     }
     /**
      * 
-     * Name describing the field.
+     * Google Cloud Storage URI for the input file. This must only be a
+     * Google Cloud Storage object. Wildcards are not currently supported.
      * 

      *
-     * string column_name = 1;
+     * string uri = 1;
      */
-    public Builder setColumnNameBytes(
+    public Builder setUriBytes(
         com.google.protobuf.ByteString value) {
       if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
       
-      columnName_ = value;
+      uri_ = value;
       onChanged();
       return this;
     }
@@ -512,39 +519,39 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.FieldId)
+    // @@protoc_insertion_point(builder_scope:google.cloud.vision.v1.GcsSource)
   }
 
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.FieldId)
-  private static final com.google.privacy.dlp.v2beta1.FieldId DEFAULT_INSTANCE;
+  // @@protoc_insertion_point(class_scope:google.cloud.vision.v1.GcsSource)
+  private static final com.google.cloud.vision.v1.GcsSource DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.FieldId();
+    DEFAULT_INSTANCE = new com.google.cloud.vision.v1.GcsSource();
   }
 
-  public static com.google.privacy.dlp.v2beta1.FieldId getDefaultInstance() {
+  public static com.google.cloud.vision.v1.GcsSource getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public FieldId parsePartialFrom(
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public GcsSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FieldId(input, extensionRegistry);
+      return new GcsSource(input, extensionRegistry);
     }
   };
 
-  public static com.google.protobuf.Parser parser() {
+  public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
   @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
+  public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  public com.google.privacy.dlp.v2beta1.FieldId getDefaultInstanceForType() {
+  public com.google.cloud.vision.v1.GcsSource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSourceOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSourceOrBuilder.java
new file mode 100644
index 000000000000..cf50ba9c6341
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSourceOrBuilder.java
@@ -0,0 +1,29 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+public interface GcsSourceOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.vision.v1.GcsSource)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Google Cloud Storage URI for the input file. This must only be a
+   * Google Cloud Storage object. Wildcards are not currently supported.
+   * 

+   *
+   * string uri = 1;
+   */
+  java.lang.String getUri();
+  /**
+   * 
+   * Google Cloud Storage URI for the input file. This must only be a
+   * Google Cloud Storage object. Wildcards are not currently supported.
+   * 

+   *
+   * string uri = 1;
+   */
+  com.google.protobuf.ByteString
+      getUriBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GeometryProto.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GeometryProto.java
index 2a53c2d94114..106c89d581aa 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GeometryProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GeometryProto.java
@@ -19,6 +19,11 @@ public static void registerAllExtensions(
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_cloud_vision_v1_Vertex_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_vision_v1_NormalizedVertex_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_vision_v1_NormalizedVertex_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
     internal_static_google_cloud_vision_v1_BoundingPoly_descriptor;
   static final 
@@ -40,13 +45,15 @@ public static void registerAllExtensions(
     java.lang.String[] descriptorData = {
       "\n%google/cloud/vision/v1/geometry.proto\022" +
       "\026google.cloud.vision.v1\"\036\n\006Vertex\022\t\n\001x\030\001" +
-      " \001(\005\022\t\n\001y\030\002 \001(\005\"@\n\014BoundingPoly\0220\n\010verti" +
-      "ces\030\001 \003(\0132\036.google.cloud.vision.v1.Verte" +
-      "x\"+\n\010Position\022\t\n\001x\030\001 \001(\002\022\t\n\001y\030\002 \001(\002\022\t\n\001z" +
-      "\030\003 \001(\002Bn\n\032com.google.cloud.vision.v1B\rGe" +
-      "ometryProtoP\001Z
- * Record key for a finding in a Cloud Storage file.
+ * If an image was produced from a file (e.g. a PDF), this message gives
+ * information about the source of that image.
  * 
  *
- * Protobuf type {@code google.privacy.dlp.v2beta1.CloudStorageKey}
+ * Protobuf type {@code google.cloud.vision.v1.ImageAnnotationContext}
  */
-public  final class CloudStorageKey extends
+public  final class ImageAnnotationContext extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.CloudStorageKey)
-    CloudStorageKeyOrBuilder {
+    // @@protoc_insertion_point(message_implements:google.cloud.vision.v1.ImageAnnotationContext)
+    ImageAnnotationContextOrBuilder {
 private static final long serialVersionUID = 0L;
-  // Use CloudStorageKey.newBuilder() to construct.
-  private CloudStorageKey(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+  // Use ImageAnnotationContext.newBuilder() to construct.
+  private ImageAnnotationContext(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private CloudStorageKey() {
-    filePath_ = "";
-    startOffset_ = 0L;
+  private ImageAnnotationContext() {
+    uri_ = "";
+    pageNumber_ = 0;
   }
 
   @java.lang.Override
@@ -29,7 +30,7 @@ private CloudStorageKey() {
   getUnknownFields() {
     return this.unknownFields;
   }
-  private CloudStorageKey(
+  private ImageAnnotationContext(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
@@ -58,12 +59,12 @@ private CloudStorageKey(
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
-            filePath_ = s;
+            uri_ = s;
             break;
           }
           case 16: {
 
-            startOffset_ = input.readInt64();
+            pageNumber_ = input.readInt32();
             break;
           }
         }
@@ -80,69 +81,70 @@ private CloudStorageKey(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageKey_descriptor;
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageAnnotationContext_descriptor;
   }
 
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageKey_fieldAccessorTable
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageAnnotationContext_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.CloudStorageKey.class, com.google.privacy.dlp.v2beta1.CloudStorageKey.Builder.class);
+            com.google.cloud.vision.v1.ImageAnnotationContext.class, com.google.cloud.vision.v1.ImageAnnotationContext.Builder.class);
   }
 
-  public static final int FILE_PATH_FIELD_NUMBER = 1;
-  private volatile java.lang.Object filePath_;
+  public static final int URI_FIELD_NUMBER = 1;
+  private volatile java.lang.Object uri_;
   /**
    * 
-   * Path to the file.
+   * The URI of the file used to produce the image.
    * 

    *
-   * string file_path = 1;
+   * string uri = 1;
    */
-  public java.lang.String getFilePath() {
-    java.lang.Object ref = filePath_;
+  public java.lang.String getUri() {
+    java.lang.Object ref = uri_;
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
       com.google.protobuf.ByteString bs = 
           (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
-      filePath_ = s;
+      uri_ = s;
       return s;
     }
   }
   /**
    * 
-   * Path to the file.
+   * The URI of the file used to produce the image.
    * 

    *
-   * string file_path = 1;
+   * string uri = 1;
    */
   public com.google.protobuf.ByteString
-      getFilePathBytes() {
-    java.lang.Object ref = filePath_;
+      getUriBytes() {
+    java.lang.Object ref = uri_;
     if (ref instanceof java.lang.String) {
       com.google.protobuf.ByteString b = 
           com.google.protobuf.ByteString.copyFromUtf8(
               (java.lang.String) ref);
-      filePath_ = b;
+      uri_ = b;
       return b;
     } else {
       return (com.google.protobuf.ByteString) ref;
     }
   }
 
-  public static final int START_OFFSET_FIELD_NUMBER = 2;
-  private long startOffset_;
+  public static final int PAGE_NUMBER_FIELD_NUMBER = 2;
+  private int pageNumber_;
   /**
    * 
-   * Byte offset of the referenced data in the file.
+   * If the file was a PDF or TIFF, this field gives the page number within
+   * the file used to produce the image.
    * 

    *
-   * int64 start_offset = 2;
+   * int32 page_number = 2;
    */
-  public long getStartOffset() {
-    return startOffset_;
+  public int getPageNumber() {
+    return pageNumber_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -157,11 +159,11 @@ public final boolean isInitialized() {
 
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (!getFilePathBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, filePath_);
+    if (!getUriBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, uri_);
     }
-    if (startOffset_ != 0L) {
-      output.writeInt64(2, startOffset_);
+    if (pageNumber_ != 0) {
+      output.writeInt32(2, pageNumber_);
     }
     unknownFields.writeTo(output);
   }
@@ -171,12 +173,12 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getFilePathBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, filePath_);
+    if (!getUriBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, uri_);
     }
-    if (startOffset_ != 0L) {
+    if (pageNumber_ != 0) {
       size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(2, startOffset_);
+        .computeInt32Size(2, pageNumber_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -188,16 +190,16 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.CloudStorageKey)) {
+    if (!(obj instanceof com.google.cloud.vision.v1.ImageAnnotationContext)) {
       return super.equals(obj);
     }
-    com.google.privacy.dlp.v2beta1.CloudStorageKey other = (com.google.privacy.dlp.v2beta1.CloudStorageKey) obj;
+    com.google.cloud.vision.v1.ImageAnnotationContext other = (com.google.cloud.vision.v1.ImageAnnotationContext) obj;
 
     boolean result = true;
-    result = result && getFilePath()
-        .equals(other.getFilePath());
-    result = result && (getStartOffset()
-        == other.getStartOffset());
+    result = result && getUri()
+        .equals(other.getUri());
+    result = result && (getPageNumber()
+        == other.getPageNumber());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -209,79 +211,78 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + FILE_PATH_FIELD_NUMBER;
-    hash = (53 * hash) + getFilePath().hashCode();
-    hash = (37 * hash) + START_OFFSET_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getStartOffset());
+    hash = (37 * hash) + URI_FIELD_NUMBER;
+    hash = (53 * hash) + getUri().hashCode();
+    hash = (37 * hash) + PAGE_NUMBER_FIELD_NUMBER;
+    hash = (53 * hash) + getPageNumber();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
 
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseFrom(
+  public static com.google.cloud.vision.v1.ImageAnnotationContext parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseFrom(
+  public static com.google.cloud.vision.v1.ImageAnnotationContext parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseFrom(
+  public static com.google.cloud.vision.v1.ImageAnnotationContext parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseFrom(
+  public static com.google.cloud.vision.v1.ImageAnnotationContext parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseFrom(byte[] data)
+  public static com.google.cloud.vision.v1.ImageAnnotationContext parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseFrom(
+  public static com.google.cloud.vision.v1.ImageAnnotationContext parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseFrom(java.io.InputStream input)
+  public static com.google.cloud.vision.v1.ImageAnnotationContext parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseFrom(
+  public static com.google.cloud.vision.v1.ImageAnnotationContext parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseDelimitedFrom(java.io.InputStream input)
+  public static com.google.cloud.vision.v1.ImageAnnotationContext parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseDelimitedFrom(
+  public static com.google.cloud.vision.v1.ImageAnnotationContext parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseFrom(
+  public static com.google.cloud.vision.v1.ImageAnnotationContext parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseFrom(
+  public static com.google.cloud.vision.v1.ImageAnnotationContext parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -293,7 +294,7 @@ public static com.google.privacy.dlp.v2beta1.CloudStorageKey parseFrom(
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.CloudStorageKey prototype) {
+  public static Builder newBuilder(com.google.cloud.vision.v1.ImageAnnotationContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   public Builder toBuilder() {
@@ -309,28 +310,29 @@ protected Builder newBuilderForType(
   }
   /**
    * 
-   * Record key for a finding in a Cloud Storage file.
+   * If an image was produced from a file (e.g. a PDF), this message gives
+   * information about the source of that image.
    * 

    *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.CloudStorageKey}
+   * Protobuf type {@code google.cloud.vision.v1.ImageAnnotationContext}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.CloudStorageKey)
-      com.google.privacy.dlp.v2beta1.CloudStorageKeyOrBuilder {
+      // @@protoc_insertion_point(builder_implements:google.cloud.vision.v1.ImageAnnotationContext)
+      com.google.cloud.vision.v1.ImageAnnotationContextOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageKey_descriptor;
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageAnnotationContext_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageKey_fieldAccessorTable
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageAnnotationContext_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.CloudStorageKey.class, com.google.privacy.dlp.v2beta1.CloudStorageKey.Builder.class);
+              com.google.cloud.vision.v1.ImageAnnotationContext.class, com.google.cloud.vision.v1.ImageAnnotationContext.Builder.class);
     }
 
-    // Construct using com.google.privacy.dlp.v2beta1.CloudStorageKey.newBuilder()
+    // Construct using com.google.cloud.vision.v1.ImageAnnotationContext.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -347,34 +349,34 @@ private void maybeForceBuilderInitialization() {
     }
     public Builder clear() {
       super.clear();
-      filePath_ = "";
+      uri_ = "";
 
-      startOffset_ = 0L;
+      pageNumber_ = 0;
 
       return this;
     }
 
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpStorage.internal_static_google_privacy_dlp_v2beta1_CloudStorageKey_descriptor;
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageAnnotationContext_descriptor;
     }
 
-    public com.google.privacy.dlp.v2beta1.CloudStorageKey getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.CloudStorageKey.getDefaultInstance();
+    public com.google.cloud.vision.v1.ImageAnnotationContext getDefaultInstanceForType() {
+      return com.google.cloud.vision.v1.ImageAnnotationContext.getDefaultInstance();
     }
 
-    public com.google.privacy.dlp.v2beta1.CloudStorageKey build() {
-      com.google.privacy.dlp.v2beta1.CloudStorageKey result = buildPartial();
+    public com.google.cloud.vision.v1.ImageAnnotationContext build() {
+      com.google.cloud.vision.v1.ImageAnnotationContext result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.google.privacy.dlp.v2beta1.CloudStorageKey buildPartial() {
-      com.google.privacy.dlp.v2beta1.CloudStorageKey result = new com.google.privacy.dlp.v2beta1.CloudStorageKey(this);
-      result.filePath_ = filePath_;
-      result.startOffset_ = startOffset_;
+    public com.google.cloud.vision.v1.ImageAnnotationContext buildPartial() {
+      com.google.cloud.vision.v1.ImageAnnotationContext result = new com.google.cloud.vision.v1.ImageAnnotationContext(this);
+      result.uri_ = uri_;
+      result.pageNumber_ = pageNumber_;
       onBuilt();
       return result;
     }
@@ -406,22 +408,22 @@ public Builder addRepeatedField(
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.CloudStorageKey) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.CloudStorageKey)other);
+      if (other instanceof com.google.cloud.vision.v1.ImageAnnotationContext) {
+        return mergeFrom((com.google.cloud.vision.v1.ImageAnnotationContext)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.CloudStorageKey other) {
-      if (other == com.google.privacy.dlp.v2beta1.CloudStorageKey.getDefaultInstance()) return this;
-      if (!other.getFilePath().isEmpty()) {
-        filePath_ = other.filePath_;
+    public Builder mergeFrom(com.google.cloud.vision.v1.ImageAnnotationContext other) {
+      if (other == com.google.cloud.vision.v1.ImageAnnotationContext.getDefaultInstance()) return this;
+      if (!other.getUri().isEmpty()) {
+        uri_ = other.uri_;
         onChanged();
       }
-      if (other.getStartOffset() != 0L) {
-        setStartOffset(other.getStartOffset());
+      if (other.getPageNumber() != 0) {
+        setPageNumber(other.getPageNumber());
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -436,11 +438,11 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.CloudStorageKey parsedMessage = null;
+      com.google.cloud.vision.v1.ImageAnnotationContext parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.CloudStorageKey) e.getUnfinishedMessage();
+        parsedMessage = (com.google.cloud.vision.v1.ImageAnnotationContext) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -450,21 +452,21 @@ public Builder mergeFrom(
       return this;
     }
 
-    private java.lang.Object filePath_ = "";
+    private java.lang.Object uri_ = "";
     /**
      * 
-     * Path to the file.
+     * The URI of the file used to produce the image.
      * 

      *
-     * string file_path = 1;
+     * string uri = 1;
      */
-    public java.lang.String getFilePath() {
-      java.lang.Object ref = filePath_;
+    public java.lang.String getUri() {
+      java.lang.Object ref = uri_;
       if (!(ref instanceof java.lang.String)) {
         com.google.protobuf.ByteString bs =
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        filePath_ = s;
+        uri_ = s;
         return s;
       } else {
         return (java.lang.String) ref;
@@ -472,19 +474,19 @@ public java.lang.String getFilePath() {
     }
     /**
      * 
-     * Path to the file.
+     * The URI of the file used to produce the image.
      * 

      *
-     * string file_path = 1;
+     * string uri = 1;
      */
     public com.google.protobuf.ByteString
-        getFilePathBytes() {
-      java.lang.Object ref = filePath_;
+        getUriBytes() {
+      java.lang.Object ref = uri_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        filePath_ = b;
+        uri_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
@@ -492,87 +494,90 @@ public java.lang.String getFilePath() {
     }
     /**
      * 
-     * Path to the file.
+     * The URI of the file used to produce the image.
      * 

      *
-     * string file_path = 1;
+     * string uri = 1;
      */
-    public Builder setFilePath(
+    public Builder setUri(
         java.lang.String value) {
       if (value == null) {
     throw new NullPointerException();
   }
   
-      filePath_ = value;
+      uri_ = value;
       onChanged();
       return this;
     }
     /**
      * 
-     * Path to the file.
+     * The URI of the file used to produce the image.
      * 

      *
-     * string file_path = 1;
+     * string uri = 1;
      */
-    public Builder clearFilePath() {
+    public Builder clearUri() {
       
-      filePath_ = getDefaultInstance().getFilePath();
+      uri_ = getDefaultInstance().getUri();
       onChanged();
       return this;
     }
     /**
      * 
-     * Path to the file.
+     * The URI of the file used to produce the image.
      * 

      *
-     * string file_path = 1;
+     * string uri = 1;
      */
-    public Builder setFilePathBytes(
+    public Builder setUriBytes(
         com.google.protobuf.ByteString value) {
       if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
       
-      filePath_ = value;
+      uri_ = value;
       onChanged();
       return this;
     }
 
-    private long startOffset_ ;
+    private int pageNumber_ ;
     /**
      * 
-     * Byte offset of the referenced data in the file.
+     * If the file was a PDF or TIFF, this field gives the page number within
+     * the file used to produce the image.
      * 

      *
-     * int64 start_offset = 2;
+     * int32 page_number = 2;
      */
-    public long getStartOffset() {
-      return startOffset_;
+    public int getPageNumber() {
+      return pageNumber_;
     }
     /**
      * 
-     * Byte offset of the referenced data in the file.
+     * If the file was a PDF or TIFF, this field gives the page number within
+     * the file used to produce the image.
      * 

      *
-     * int64 start_offset = 2;
+     * int32 page_number = 2;
      */
-    public Builder setStartOffset(long value) {
+    public Builder setPageNumber(int value) {
       
-      startOffset_ = value;
+      pageNumber_ = value;
       onChanged();
       return this;
     }
     /**
      * 
-     * Byte offset of the referenced data in the file.
+     * If the file was a PDF or TIFF, this field gives the page number within
+     * the file used to produce the image.
      * 

      *
-     * int64 start_offset = 2;
+     * int32 page_number = 2;
      */
-    public Builder clearStartOffset() {
+    public Builder clearPageNumber() {
       
-      startOffset_ = 0L;
+      pageNumber_ = 0;
       onChanged();
       return this;
     }
@@ -587,39 +592,39 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.CloudStorageKey)
+    // @@protoc_insertion_point(builder_scope:google.cloud.vision.v1.ImageAnnotationContext)
   }
 
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.CloudStorageKey)
-  private static final com.google.privacy.dlp.v2beta1.CloudStorageKey DEFAULT_INSTANCE;
+  // @@protoc_insertion_point(class_scope:google.cloud.vision.v1.ImageAnnotationContext)
+  private static final com.google.cloud.vision.v1.ImageAnnotationContext DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.CloudStorageKey();
+    DEFAULT_INSTANCE = new com.google.cloud.vision.v1.ImageAnnotationContext();
   }
 
-  public static com.google.privacy.dlp.v2beta1.CloudStorageKey getDefaultInstance() {
+  public static com.google.cloud.vision.v1.ImageAnnotationContext getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public CloudStorageKey parsePartialFrom(
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ImageAnnotationContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CloudStorageKey(input, extensionRegistry);
+      return new ImageAnnotationContext(input, extensionRegistry);
     }
   };
 
-  public static com.google.protobuf.Parser parser() {
+  public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
   @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
+  public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  public com.google.privacy.dlp.v2beta1.CloudStorageKey getDefaultInstanceForType() {
+  public com.google.cloud.vision.v1.ImageAnnotationContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotationContextOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotationContextOrBuilder.java
new file mode 100644
index 000000000000..1012c84d9e4e
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotationContextOrBuilder.java
@@ -0,0 +1,37 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+public interface ImageAnnotationContextOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.vision.v1.ImageAnnotationContext)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The URI of the file used to produce the image.
+   * 

+   *
+   * string uri = 1;
+   */
+  java.lang.String getUri();
+  /**
+   * 
+   * The URI of the file used to produce the image.
+   * 

+   *
+   * string uri = 1;
+   */
+  com.google.protobuf.ByteString
+      getUriBytes();
+
+  /**
+   * 
+   * If the file was a PDF or TIFF, this field gives the page number within
+   * the file used to produce the image.
+   * 

+   *
+   * int32 page_number = 2;
+   */
+  int getPageNumber();
+}
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorProto.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorProto.java
index 6e083af6e416..5ca7f37d3d83 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorProto.java
@@ -109,11 +109,21 @@ public static void registerAllExtensions(
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_cloud_vision_v1_AnnotateImageRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_vision_v1_ImageAnnotationContext_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_vision_v1_ImageAnnotationContext_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
     internal_static_google_cloud_vision_v1_AnnotateImageResponse_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_cloud_vision_v1_AnnotateImageResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_vision_v1_AnnotateFileResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_vision_v1_AnnotateFileResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
     internal_static_google_cloud_vision_v1_BatchAnnotateImagesRequest_descriptor;
   static final 
@@ -124,6 +134,51 @@ public static void registerAllExtensions(
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_cloud_vision_v1_BatchAnnotateImagesResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_vision_v1_AsyncAnnotateFileRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_vision_v1_AsyncAnnotateFileRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_vision_v1_AsyncAnnotateFileResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_vision_v1_AsyncAnnotateFileResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_vision_v1_InputConfig_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_vision_v1_InputConfig_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_vision_v1_OutputConfig_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_vision_v1_OutputConfig_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_vision_v1_GcsSource_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_vision_v1_GcsSource_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_vision_v1_GcsDestination_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_vision_v1_GcsDestination_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_vision_v1_OperationMetadata_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_vision_v1_OperationMetadata_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -138,143 +193,183 @@ public static void registerAllExtensions(
       "pi/annotations.proto\032%google/cloud/visio" +
       "n/v1/geometry.proto\032,google/cloud/vision" +
       "/v1/text_annotation.proto\032*google/cloud/" +
-      "vision/v1/web_detection.proto\032\027google/rp" +
-      "c/status.proto\032\027google/type/color.proto\032" +
-      "\030google/type/latlng.proto\"\332\002\n\007Feature\0222\n" +
-      "\004type\030\001 \001(\0162$.google.cloud.vision.v1.Fea" +
-      "ture.Type\022\023\n\013max_results\030\002 \001(\005\022\r\n\005model\030" +
-      "\003 \001(\t\"\366\001\n\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\022\n\016" +
-      "FACE_DETECTION\020\001\022\026\n\022LANDMARK_DETECTION\020\002" +
-      "\022\022\n\016LOGO_DETECTION\020\003\022\023\n\017LABEL_DETECTION\020" +
-      "\004\022\022\n\016TEXT_DETECTION\020\005\022\033\n\027DOCUMENT_TEXT_D" +
-      "ETECTION\020\013\022\031\n\025SAFE_SEARCH_DETECTION\020\006\022\024\n" +
-      "\020IMAGE_PROPERTIES\020\007\022\016\n\nCROP_HINTS\020\t\022\021\n\rW" +
-      "EB_DETECTION\020\n\"7\n\013ImageSource\022\025\n\rgcs_ima" +
-      "ge_uri\030\001 \001(\t\022\021\n\timage_uri\030\002 \001(\t\"M\n\005Image" +
-      "\022\017\n\007content\030\001 \001(\014\0223\n\006source\030\002 \001(\0132#.goog" +
-      "le.cloud.vision.v1.ImageSource\"\307\r\n\016FaceA" +
-      "nnotation\022;\n\rbounding_poly\030\001 \001(\0132$.googl" +
-      "e.cloud.vision.v1.BoundingPoly\022>\n\020fd_bou" +
-      "nding_poly\030\002 \001(\0132$.google.cloud.vision.v" +
-      "1.BoundingPoly\022B\n\tlandmarks\030\003 \003(\0132/.goog" +
-      "le.cloud.vision.v1.FaceAnnotation.Landma" +
-      "rk\022\022\n\nroll_angle\030\004 \001(\002\022\021\n\tpan_angle\030\005 \001(" +
-      "\002\022\022\n\ntilt_angle\030\006 \001(\002\022\034\n\024detection_confi" +
-      "dence\030\007 \001(\002\022\036\n\026landmarking_confidence\030\010 " +
-      "\001(\002\022:\n\016joy_likelihood\030\t \001(\0162\".google.clo" +
-      "ud.vision.v1.Likelihood\022=\n\021sorrow_likeli" +
-      "hood\030\n \001(\0162\".google.cloud.vision.v1.Like" +
-      "lihood\022<\n\020anger_likelihood\030\013 \001(\0162\".googl" +
-      "e.cloud.vision.v1.Likelihood\022?\n\023surprise" +
-      "_likelihood\030\014 \001(\0162\".google.cloud.vision." +
-      "v1.Likelihood\022D\n\030under_exposed_likelihoo" +
-      "d\030\r \001(\0162\".google.cloud.vision.v1.Likelih" +
-      "ood\022>\n\022blurred_likelihood\030\016 \001(\0162\".google" +
-      ".cloud.vision.v1.Likelihood\022?\n\023headwear_" +
-      "likelihood\030\017 \001(\0162\".google.cloud.vision.v" +
-      "1.Likelihood\032\271\007\n\010Landmark\022B\n\004type\030\003 \001(\0162" +
-      "4.google.cloud.vision.v1.FaceAnnotation." +
-      "Landmark.Type\0222\n\010position\030\004 \001(\0132 .google" +
-      ".cloud.vision.v1.Position\"\264\006\n\004Type\022\024\n\020UN" +
-      "KNOWN_LANDMARK\020\000\022\014\n\010LEFT_EYE\020\001\022\r\n\tRIGHT_" +
-      "EYE\020\002\022\030\n\024LEFT_OF_LEFT_EYEBROW\020\003\022\031\n\025RIGHT" +
-      "_OF_LEFT_EYEBROW\020\004\022\031\n\025LEFT_OF_RIGHT_EYEB" +
-      "ROW\020\005\022\032\n\026RIGHT_OF_RIGHT_EYEBROW\020\006\022\031\n\025MID" +
-      "POINT_BETWEEN_EYES\020\007\022\014\n\010NOSE_TIP\020\010\022\r\n\tUP" +
-      "PER_LIP\020\t\022\r\n\tLOWER_LIP\020\n\022\016\n\nMOUTH_LEFT\020\013" +
-      "\022\017\n\013MOUTH_RIGHT\020\014\022\020\n\014MOUTH_CENTER\020\r\022\025\n\021N" +
-      "OSE_BOTTOM_RIGHT\020\016\022\024\n\020NOSE_BOTTOM_LEFT\020\017" +
-      "\022\026\n\022NOSE_BOTTOM_CENTER\020\020\022\031\n\025LEFT_EYE_TOP" +
-      "_BOUNDARY\020\021\022\031\n\025LEFT_EYE_RIGHT_CORNER\020\022\022\034" +
-      "\n\030LEFT_EYE_BOTTOM_BOUNDARY\020\023\022\030\n\024LEFT_EYE" +
-      "_LEFT_CORNER\020\024\022\032\n\026RIGHT_EYE_TOP_BOUNDARY" +
-      "\020\025\022\032\n\026RIGHT_EYE_RIGHT_CORNER\020\026\022\035\n\031RIGHT_" +
-      "EYE_BOTTOM_BOUNDARY\020\027\022\031\n\025RIGHT_EYE_LEFT_" +
-      "CORNER\020\030\022\037\n\033LEFT_EYEBROW_UPPER_MIDPOINT\020" +
-      "\031\022 \n\034RIGHT_EYEBROW_UPPER_MIDPOINT\020\032\022\024\n\020L" +
-      "EFT_EAR_TRAGION\020\033\022\025\n\021RIGHT_EAR_TRAGION\020\034" +
-      "\022\022\n\016LEFT_EYE_PUPIL\020\035\022\023\n\017RIGHT_EYE_PUPIL\020" +
-      "\036\022\025\n\021FOREHEAD_GLABELLA\020\037\022\021\n\rCHIN_GNATHIO" +
-      "N\020 \022\024\n\020CHIN_LEFT_GONION\020!\022\025\n\021CHIN_RIGHT_" +
-      "GONION\020\"\"4\n\014LocationInfo\022$\n\007lat_lng\030\001 \001(" +
-      "\0132\023.google.type.LatLng\"=\n\010Property\022\014\n\004na" +
-      "me\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022\024\n\014uint64_value\030" +
-      "\003 \001(\004\"\247\002\n\020EntityAnnotation\022\013\n\003mid\030\001 \001(\t\022" +
-      "\016\n\006locale\030\002 \001(\t\022\023\n\013description\030\003 \001(\t\022\r\n\005" +
-      "score\030\004 \001(\002\022\022\n\nconfidence\030\005 \001(\002\022\022\n\ntopic" +
-      "ality\030\006 \001(\002\022;\n\rbounding_poly\030\007 \001(\0132$.goo" +
-      "gle.cloud.vision.v1.BoundingPoly\0227\n\tloca" +
-      "tions\030\010 \003(\0132$.google.cloud.vision.v1.Loc" +
-      "ationInfo\0224\n\nproperties\030\t \003(\0132 .google.c" +
-      "loud.vision.v1.Property\"\231\002\n\024SafeSearchAn" +
-      "notation\0221\n\005adult\030\001 \001(\0162\".google.cloud.v" +
-      "ision.v1.Likelihood\0221\n\005spoof\030\002 \001(\0162\".goo" +
-      "gle.cloud.vision.v1.Likelihood\0223\n\007medica" +
-      "l\030\003 \001(\0162\".google.cloud.vision.v1.Likelih" +
-      "ood\0224\n\010violence\030\004 \001(\0162\".google.cloud.vis" +
-      "ion.v1.Likelihood\0220\n\004racy\030\t \001(\0162\".google" +
-      ".cloud.vision.v1.Likelihood\"a\n\013LatLongRe" +
-      "ct\022(\n\013min_lat_lng\030\001 \001(\0132\023.google.type.La" +
-      "tLng\022(\n\013max_lat_lng\030\002 \001(\0132\023.google.type." +
-      "LatLng\"U\n\tColorInfo\022!\n\005color\030\001 \001(\0132\022.goo" +
-      "gle.type.Color\022\r\n\005score\030\002 \001(\002\022\026\n\016pixel_f" +
-      "raction\030\003 \001(\002\"M\n\030DominantColorsAnnotatio" +
-      "n\0221\n\006colors\030\001 \003(\0132!.google.cloud.vision." +
-      "v1.ColorInfo\"\\\n\017ImageProperties\022I\n\017domin" +
-      "ant_colors\030\001 \001(\01320.google.cloud.vision.v" +
-      "1.DominantColorsAnnotation\"x\n\010CropHint\022;" +
-      "\n\rbounding_poly\030\001 \001(\0132$.google.cloud.vis" +
-      "ion.v1.BoundingPoly\022\022\n\nconfidence\030\002 \001(\002\022" +
-      "\033\n\023importance_fraction\030\003 \001(\002\"K\n\023CropHint" +
-      "sAnnotation\0224\n\ncrop_hints\030\001 \003(\0132 .google" +
-      ".cloud.vision.v1.CropHint\"(\n\017CropHintsPa" +
-      "rams\022\025\n\raspect_ratios\030\001 \003(\002\"1\n\022WebDetect" +
-      "ionParams\022\033\n\023include_geo_results\030\002 \001(\010\"\360" +
-      "\001\n\014ImageContext\022:\n\rlat_long_rect\030\001 \001(\0132#" +
-      ".google.cloud.vision.v1.LatLongRect\022\026\n\016l" +
-      "anguage_hints\030\002 \003(\t\022B\n\021crop_hints_params" +
-      "\030\004 \001(\0132\'.google.cloud.vision.v1.CropHint" +
-      "sParams\022H\n\024web_detection_params\030\006 \001(\0132*." +
-      "google.cloud.vision.v1.WebDetectionParam" +
-      "s\"\264\001\n\024AnnotateImageRequest\022,\n\005image\030\001 \001(" +
-      "\0132\035.google.cloud.vision.v1.Image\0221\n\010feat" +
-      "ures\030\002 \003(\0132\037.google.cloud.vision.v1.Feat" +
-      "ure\022;\n\rimage_context\030\003 \001(\0132$.google.clou" +
-      "d.vision.v1.ImageContext\"\374\005\n\025AnnotateIma" +
-      "geResponse\022@\n\020face_annotations\030\001 \003(\0132&.g" +
-      "oogle.cloud.vision.v1.FaceAnnotation\022F\n\024" +
-      "landmark_annotations\030\002 \003(\0132(.google.clou" +
-      "d.vision.v1.EntityAnnotation\022B\n\020logo_ann" +
-      "otations\030\003 \003(\0132(.google.cloud.vision.v1." +
-      "EntityAnnotation\022C\n\021label_annotations\030\004 " +
-      "\003(\0132(.google.cloud.vision.v1.EntityAnnot" +
-      "ation\022B\n\020text_annotations\030\005 \003(\0132(.google" +
-      ".cloud.vision.v1.EntityAnnotation\022D\n\024ful" +
-      "l_text_annotation\030\014 \001(\0132&.google.cloud.v" +
-      "ision.v1.TextAnnotation\022L\n\026safe_search_a" +
-      "nnotation\030\006 \001(\0132,.google.cloud.vision.v1" +
-      ".SafeSearchAnnotation\022L\n\033image_propertie" +
-      "s_annotation\030\010 \001(\0132\'.google.cloud.vision" +
-      ".v1.ImageProperties\022J\n\025crop_hints_annota" +
-      "tion\030\013 \001(\0132+.google.cloud.vision.v1.Crop" +
-      "HintsAnnotation\022;\n\rweb_detection\030\r \001(\0132$" +
-      ".google.cloud.vision.v1.WebDetection\022!\n\005" +
-      "error\030\t \001(\0132\022.google.rpc.Status\"\\\n\032Batch" +
-      "AnnotateImagesRequest\022>\n\010requests\030\001 \003(\0132" +
-      ",.google.cloud.vision.v1.AnnotateImageRe" +
-      "quest\"_\n\033BatchAnnotateImagesResponse\022@\n\t" +
-      "responses\030\001 \003(\0132-.google.cloud.vision.v1" +
-      ".AnnotateImageResponse*e\n\nLikelihood\022\013\n\007" +
-      "UNKNOWN\020\000\022\021\n\rVERY_UNLIKELY\020\001\022\014\n\010UNLIKELY" +
-      "\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIKELY\020\004\022\017\n\013VERY_LIK" +
-      "ELY\020\0052\261\001\n\016ImageAnnotator\022\236\001\n\023BatchAnnota" +
-      "teImages\0222.google.cloud.vision.v1.BatchA" +
-      "nnotateImagesRequest\0323.google.cloud.visi" +
-      "on.v1.BatchAnnotateImagesResponse\"\036\202\323\344\223\002" +
-      "\030\"\023/v1/images:annotate:\001*Bt\n\032com.google." +
-      "cloud.vision.v1B\023ImageAnnotatorProtoP\001Z<" +
-      "google.golang.org/genproto/googleapis/cl" +
-      "oud/vision/v1;vision\370\001\001b\006proto3"
+      "vision/v1/web_detection.proto\032#google/lo" +
+      "ngrunning/operations.proto\032\037google/proto" +
+      "buf/timestamp.proto\032\027google/rpc/status.p" +
+      "roto\032\027google/type/color.proto\032\030google/ty" +
+      "pe/latlng.proto\"\332\002\n\007Feature\0222\n\004type\030\001 \001(" +
+      "\0162$.google.cloud.vision.v1.Feature.Type\022" +
+      "\023\n\013max_results\030\002 \001(\005\022\r\n\005model\030\003 \001(\t\"\366\001\n\004" +
+      "Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\022\n\016FACE_DETEC" +
+      "TION\020\001\022\026\n\022LANDMARK_DETECTION\020\002\022\022\n\016LOGO_D" +
+      "ETECTION\020\003\022\023\n\017LABEL_DETECTION\020\004\022\022\n\016TEXT_" +
+      "DETECTION\020\005\022\033\n\027DOCUMENT_TEXT_DETECTION\020\013" +
+      "\022\031\n\025SAFE_SEARCH_DETECTION\020\006\022\024\n\020IMAGE_PRO" +
+      "PERTIES\020\007\022\016\n\nCROP_HINTS\020\t\022\021\n\rWEB_DETECTI" +
+      "ON\020\n\"7\n\013ImageSource\022\025\n\rgcs_image_uri\030\001 \001" +
+      "(\t\022\021\n\timage_uri\030\002 \001(\t\"M\n\005Image\022\017\n\007conten" +
+      "t\030\001 \001(\014\0223\n\006source\030\002 \001(\0132#.google.cloud.v" +
+      "ision.v1.ImageSource\"\307\r\n\016FaceAnnotation\022" +
+      ";\n\rbounding_poly\030\001 \001(\0132$.google.cloud.vi" +
+      "sion.v1.BoundingPoly\022>\n\020fd_bounding_poly" +
+      "\030\002 \001(\0132$.google.cloud.vision.v1.Bounding" +
+      "Poly\022B\n\tlandmarks\030\003 \003(\0132/.google.cloud.v" +
+      "ision.v1.FaceAnnotation.Landmark\022\022\n\nroll" +
+      "_angle\030\004 \001(\002\022\021\n\tpan_angle\030\005 \001(\002\022\022\n\ntilt_" +
+      "angle\030\006 \001(\002\022\034\n\024detection_confidence\030\007 \001(" +
+      "\002\022\036\n\026landmarking_confidence\030\010 \001(\002\022:\n\016joy" +
+      "_likelihood\030\t \001(\0162\".google.cloud.vision." +
+      "v1.Likelihood\022=\n\021sorrow_likelihood\030\n \001(\016" +
+      "2\".google.cloud.vision.v1.Likelihood\022<\n\020" +
+      "anger_likelihood\030\013 \001(\0162\".google.cloud.vi" +
+      "sion.v1.Likelihood\022?\n\023surprise_likelihoo" +
+      "d\030\014 \001(\0162\".google.cloud.vision.v1.Likelih" +
+      "ood\022D\n\030under_exposed_likelihood\030\r \001(\0162\"." +
+      "google.cloud.vision.v1.Likelihood\022>\n\022blu" +
+      "rred_likelihood\030\016 \001(\0162\".google.cloud.vis" +
+      "ion.v1.Likelihood\022?\n\023headwear_likelihood" +
+      "\030\017 \001(\0162\".google.cloud.vision.v1.Likeliho" +
+      "od\032\271\007\n\010Landmark\022B\n\004type\030\003 \001(\01624.google.c" +
+      "loud.vision.v1.FaceAnnotation.Landmark.T" +
+      "ype\0222\n\010position\030\004 \001(\0132 .google.cloud.vis" +
+      "ion.v1.Position\"\264\006\n\004Type\022\024\n\020UNKNOWN_LAND" +
+      "MARK\020\000\022\014\n\010LEFT_EYE\020\001\022\r\n\tRIGHT_EYE\020\002\022\030\n\024L" +
+      "EFT_OF_LEFT_EYEBROW\020\003\022\031\n\025RIGHT_OF_LEFT_E" +
+      "YEBROW\020\004\022\031\n\025LEFT_OF_RIGHT_EYEBROW\020\005\022\032\n\026R" +
+      "IGHT_OF_RIGHT_EYEBROW\020\006\022\031\n\025MIDPOINT_BETW" +
+      "EEN_EYES\020\007\022\014\n\010NOSE_TIP\020\010\022\r\n\tUPPER_LIP\020\t\022" +
+      "\r\n\tLOWER_LIP\020\n\022\016\n\nMOUTH_LEFT\020\013\022\017\n\013MOUTH_" +
+      "RIGHT\020\014\022\020\n\014MOUTH_CENTER\020\r\022\025\n\021NOSE_BOTTOM" +
+      "_RIGHT\020\016\022\024\n\020NOSE_BOTTOM_LEFT\020\017\022\026\n\022NOSE_B" +
+      "OTTOM_CENTER\020\020\022\031\n\025LEFT_EYE_TOP_BOUNDARY\020" +
+      "\021\022\031\n\025LEFT_EYE_RIGHT_CORNER\020\022\022\034\n\030LEFT_EYE" +
+      "_BOTTOM_BOUNDARY\020\023\022\030\n\024LEFT_EYE_LEFT_CORN" +
+      "ER\020\024\022\032\n\026RIGHT_EYE_TOP_BOUNDARY\020\025\022\032\n\026RIGH" +
+      "T_EYE_RIGHT_CORNER\020\026\022\035\n\031RIGHT_EYE_BOTTOM" +
+      "_BOUNDARY\020\027\022\031\n\025RIGHT_EYE_LEFT_CORNER\020\030\022\037" +
+      "\n\033LEFT_EYEBROW_UPPER_MIDPOINT\020\031\022 \n\034RIGHT" +
+      "_EYEBROW_UPPER_MIDPOINT\020\032\022\024\n\020LEFT_EAR_TR" +
+      "AGION\020\033\022\025\n\021RIGHT_EAR_TRAGION\020\034\022\022\n\016LEFT_E" +
+      "YE_PUPIL\020\035\022\023\n\017RIGHT_EYE_PUPIL\020\036\022\025\n\021FOREH" +
+      "EAD_GLABELLA\020\037\022\021\n\rCHIN_GNATHION\020 \022\024\n\020CHI" +
+      "N_LEFT_GONION\020!\022\025\n\021CHIN_RIGHT_GONION\020\"\"4" +
+      "\n\014LocationInfo\022$\n\007lat_lng\030\001 \001(\0132\023.google" +
+      ".type.LatLng\"=\n\010Property\022\014\n\004name\030\001 \001(\t\022\r" +
+      "\n\005value\030\002 \001(\t\022\024\n\014uint64_value\030\003 \001(\004\"\247\002\n\020" +
+      "EntityAnnotation\022\013\n\003mid\030\001 \001(\t\022\016\n\006locale\030" +
+      "\002 \001(\t\022\023\n\013description\030\003 \001(\t\022\r\n\005score\030\004 \001(" +
+      "\002\022\022\n\nconfidence\030\005 \001(\002\022\022\n\ntopicality\030\006 \001(" +
+      "\002\022;\n\rbounding_poly\030\007 \001(\0132$.google.cloud." +
+      "vision.v1.BoundingPoly\0227\n\tlocations\030\010 \003(" +
+      "\0132$.google.cloud.vision.v1.LocationInfo\022" +
+      "4\n\nproperties\030\t \003(\0132 .google.cloud.visio" +
+      "n.v1.Property\"\231\002\n\024SafeSearchAnnotation\0221" +
+      "\n\005adult\030\001 \001(\0162\".google.cloud.vision.v1.L" +
+      "ikelihood\0221\n\005spoof\030\002 \001(\0162\".google.cloud." +
+      "vision.v1.Likelihood\0223\n\007medical\030\003 \001(\0162\"." +
+      "google.cloud.vision.v1.Likelihood\0224\n\010vio" +
+      "lence\030\004 \001(\0162\".google.cloud.vision.v1.Lik" +
+      "elihood\0220\n\004racy\030\t \001(\0162\".google.cloud.vis" +
+      "ion.v1.Likelihood\"a\n\013LatLongRect\022(\n\013min_" +
+      "lat_lng\030\001 \001(\0132\023.google.type.LatLng\022(\n\013ma" +
+      "x_lat_lng\030\002 \001(\0132\023.google.type.LatLng\"U\n\t" +
+      "ColorInfo\022!\n\005color\030\001 \001(\0132\022.google.type.C" +
+      "olor\022\r\n\005score\030\002 \001(\002\022\026\n\016pixel_fraction\030\003 " +
+      "\001(\002\"M\n\030DominantColorsAnnotation\0221\n\006color" +
+      "s\030\001 \003(\0132!.google.cloud.vision.v1.ColorIn" +
+      "fo\"\\\n\017ImageProperties\022I\n\017dominant_colors" +
+      "\030\001 \001(\01320.google.cloud.vision.v1.Dominant" +
+      "ColorsAnnotation\"x\n\010CropHint\022;\n\rbounding" +
+      "_poly\030\001 \001(\0132$.google.cloud.vision.v1.Bou" +
+      "ndingPoly\022\022\n\nconfidence\030\002 \001(\002\022\033\n\023importa" +
+      "nce_fraction\030\003 \001(\002\"K\n\023CropHintsAnnotatio" +
+      "n\0224\n\ncrop_hints\030\001 \003(\0132 .google.cloud.vis" +
+      "ion.v1.CropHint\"(\n\017CropHintsParams\022\025\n\ras" +
+      "pect_ratios\030\001 \003(\002\"1\n\022WebDetectionParams\022" +
+      "\033\n\023include_geo_results\030\002 \001(\010\"\360\001\n\014ImageCo" +
+      "ntext\022:\n\rlat_long_rect\030\001 \001(\0132#.google.cl" +
+      "oud.vision.v1.LatLongRect\022\026\n\016language_hi" +
+      "nts\030\002 \003(\t\022B\n\021crop_hints_params\030\004 \001(\0132\'.g" +
+      "oogle.cloud.vision.v1.CropHintsParams\022H\n" +
+      "\024web_detection_params\030\006 \001(\0132*.google.clo" +
+      "ud.vision.v1.WebDetectionParams\"\264\001\n\024Anno" +
+      "tateImageRequest\022,\n\005image\030\001 \001(\0132\035.google" +
+      ".cloud.vision.v1.Image\0221\n\010features\030\002 \003(\013" +
+      "2\037.google.cloud.vision.v1.Feature\022;\n\rima" +
+      "ge_context\030\003 \001(\0132$.google.cloud.vision.v" +
+      "1.ImageContext\":\n\026ImageAnnotationContext" +
+      "\022\013\n\003uri\030\001 \001(\t\022\023\n\013page_number\030\002 \001(\005\"\275\006\n\025A" +
+      "nnotateImageResponse\022@\n\020face_annotations" +
+      "\030\001 \003(\0132&.google.cloud.vision.v1.FaceAnno" +
+      "tation\022F\n\024landmark_annotations\030\002 \003(\0132(.g" +
+      "oogle.cloud.vision.v1.EntityAnnotation\022B" +
+      "\n\020logo_annotations\030\003 \003(\0132(.google.cloud." +
+      "vision.v1.EntityAnnotation\022C\n\021label_anno" +
+      "tations\030\004 \003(\0132(.google.cloud.vision.v1.E" +
+      "ntityAnnotation\022B\n\020text_annotations\030\005 \003(" +
+      "\0132(.google.cloud.vision.v1.EntityAnnotat" +
+      "ion\022D\n\024full_text_annotation\030\014 \001(\0132&.goog" +
+      "le.cloud.vision.v1.TextAnnotation\022L\n\026saf" +
+      "e_search_annotation\030\006 \001(\0132,.google.cloud" +
+      ".vision.v1.SafeSearchAnnotation\022L\n\033image" +
+      "_properties_annotation\030\010 \001(\0132\'.google.cl" +
+      "oud.vision.v1.ImageProperties\022J\n\025crop_hi" +
+      "nts_annotation\030\013 \001(\0132+.google.cloud.visi" +
+      "on.v1.CropHintsAnnotation\022;\n\rweb_detecti" +
+      "on\030\r \001(\0132$.google.cloud.vision.v1.WebDet" +
+      "ection\022!\n\005error\030\t \001(\0132\022.google.rpc.Statu" +
+      "s\022?\n\007context\030\025 \001(\0132..google.cloud.vision" +
+      ".v1.ImageAnnotationContext\"\223\001\n\024AnnotateF" +
+      "ileResponse\0229\n\014input_config\030\001 \001(\0132#.goog" +
+      "le.cloud.vision.v1.InputConfig\022@\n\trespon" +
+      "ses\030\002 \003(\0132-.google.cloud.vision.v1.Annot" +
+      "ateImageResponse\"\\\n\032BatchAnnotateImagesR" +
+      "equest\022>\n\010requests\030\001 \003(\0132,.google.cloud." +
+      "vision.v1.AnnotateImageRequest\"_\n\033BatchA" +
+      "nnotateImagesResponse\022@\n\tresponses\030\001 \003(\013" +
+      "2-.google.cloud.vision.v1.AnnotateImageR" +
+      "esponse\"\202\002\n\030AsyncAnnotateFileRequest\0229\n\014" +
+      "input_config\030\001 \001(\0132#.google.cloud.vision" +
+      ".v1.InputConfig\0221\n\010features\030\002 \003(\0132\037.goog" +
+      "le.cloud.vision.v1.Feature\022;\n\rimage_cont" +
+      "ext\030\003 \001(\0132$.google.cloud.vision.v1.Image" +
+      "Context\022;\n\routput_config\030\004 \001(\0132$.google." +
+      "cloud.vision.v1.OutputConfig\"X\n\031AsyncAnn" +
+      "otateFileResponse\022;\n\routput_config\030\001 \001(\013" +
+      "2$.google.cloud.vision.v1.OutputConfig\"d" +
+      "\n\036AsyncBatchAnnotateFilesRequest\022B\n\010requ" +
+      "ests\030\001 \003(\01320.google.cloud.vision.v1.Asyn" +
+      "cAnnotateFileRequest\"g\n\037AsyncBatchAnnota" +
+      "teFilesResponse\022D\n\tresponses\030\001 \003(\01321.goo" +
+      "gle.cloud.vision.v1.AsyncAnnotateFileRes" +
+      "ponse\"W\n\013InputConfig\0225\n\ngcs_source\030\001 \001(\013" +
+      "2!.google.cloud.vision.v1.GcsSource\022\021\n\tm" +
+      "ime_type\030\002 \001(\t\"c\n\014OutputConfig\022?\n\017gcs_de" +
+      "stination\030\001 \001(\0132&.google.cloud.vision.v1" +
+      ".GcsDestination\022\022\n\nbatch_size\030\002 \001(\005\"\030\n\tG" +
+      "csSource\022\013\n\003uri\030\001 \001(\t\"\035\n\016GcsDestination\022" +
+      "\013\n\003uri\030\001 \001(\t\"\210\002\n\021OperationMetadata\022>\n\005st" +
+      "ate\030\001 \001(\0162/.google.cloud.vision.v1.Opera" +
+      "tionMetadata.State\022/\n\013create_time\030\005 \001(\0132" +
+      "\032.google.protobuf.Timestamp\022/\n\013update_ti" +
+      "me\030\006 \001(\0132\032.google.protobuf.Timestamp\"Q\n\005" +
+      "State\022\025\n\021STATE_UNSPECIFIED\020\000\022\013\n\007CREATED\020" +
+      "\001\022\013\n\007RUNNING\020\002\022\010\n\004DONE\020\003\022\r\n\tCANCELLED\020\004*" +
+      "e\n\nLikelihood\022\013\n\007UNKNOWN\020\000\022\021\n\rVERY_UNLIK" +
+      "ELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIK" +
+      "ELY\020\004\022\017\n\013VERY_LIKELY\020\0052\315\002\n\016ImageAnnotato" +
+      "r\022\236\001\n\023BatchAnnotateImages\0222.google.cloud" +
+      ".vision.v1.BatchAnnotateImagesRequest\0323." +
+      "google.cloud.vision.v1.BatchAnnotateImag" +
+      "esResponse\"\036\202\323\344\223\002\030\"\023/v1/images:annotate:" +
+      "\001*\022\231\001\n\027AsyncBatchAnnotateFiles\0226.google." +
+      "cloud.vision.v1.AsyncBatchAnnotateFilesR" +
+      "equest\032\035.google.longrunning.Operation\"\'\202" +
+      "\323\344\223\002!\"\034/v1/files:asyncBatchAnnotate:\001*Bt" +
+      "\n\032com.google.cloud.vision.v1B\023ImageAnnot" +
+      "atorProtoP\001Z
-   * lat/long rectangle that specifies the location of the image.
+   * Not used.
    * 
    *
    * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -144,7 +144,7 @@ public boolean hasLatLongRect() {
   }
   /**
    * 
-   * lat/long rectangle that specifies the location of the image.
+   * Not used.
    * 

    *
    * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -154,7 +154,7 @@ public com.google.cloud.vision.v1.LatLongRect getLatLongRect() {
   }
   /**
    * 
-   * lat/long rectangle that specifies the location of the image.
+   * Not used.
    * 

    *
    * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -705,7 +705,7 @@ public Builder mergeFrom(
         com.google.cloud.vision.v1.LatLongRect, com.google.cloud.vision.v1.LatLongRect.Builder, com.google.cloud.vision.v1.LatLongRectOrBuilder> latLongRectBuilder_;
     /**
      * 
-     * lat/long rectangle that specifies the location of the image.
+     * Not used.
      * 

      *
      * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -715,7 +715,7 @@ public boolean hasLatLongRect() {
     }
     /**
      * 
-     * lat/long rectangle that specifies the location of the image.
+     * Not used.
      * 

      *
      * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -729,7 +729,7 @@ public com.google.cloud.vision.v1.LatLongRect getLatLongRect() {
     }
     /**
      * 
-     * lat/long rectangle that specifies the location of the image.
+     * Not used.
      * 

      *
      * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -749,7 +749,7 @@ public Builder setLatLongRect(com.google.cloud.vision.v1.LatLongRect value) {
     }
     /**
      * 
-     * lat/long rectangle that specifies the location of the image.
+     * Not used.
      * 

      *
      * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -767,7 +767,7 @@ public Builder setLatLongRect(
     }
     /**
      * 
-     * lat/long rectangle that specifies the location of the image.
+     * Not used.
      * 

      *
      * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -789,7 +789,7 @@ public Builder mergeLatLongRect(com.google.cloud.vision.v1.LatLongRect value) {
     }
     /**
      * 
-     * lat/long rectangle that specifies the location of the image.
+     * Not used.
      * 

      *
      * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -807,7 +807,7 @@ public Builder clearLatLongRect() {
     }
     /**
      * 
-     * lat/long rectangle that specifies the location of the image.
+     * Not used.
      * 

      *
      * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -819,7 +819,7 @@ public com.google.cloud.vision.v1.LatLongRect.Builder getLatLongRectBuilder() {
     }
     /**
      * 
-     * lat/long rectangle that specifies the location of the image.
+     * Not used.
      * 

      *
      * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -834,7 +834,7 @@ public com.google.cloud.vision.v1.LatLongRectOrBuilder getLatLongRectOrBuilder()
     }
     /**
      * 
-     * lat/long rectangle that specifies the location of the image.
+     * Not used.
      * 

      *
      * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageContextOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageContextOrBuilder.java
index c8dff92c7b04..8d9c20f89b4b 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageContextOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageContextOrBuilder.java
@@ -9,7 +9,7 @@ public interface ImageContextOrBuilder extends
 
   /**
    * 
-   * lat/long rectangle that specifies the location of the image.
+   * Not used.
    * 

    *
    * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -17,7 +17,7 @@ public interface ImageContextOrBuilder extends
   boolean hasLatLongRect();
   /**
    * 
-   * lat/long rectangle that specifies the location of the image.
+   * Not used.
    * 

    *
    * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
@@ -25,7 +25,7 @@ public interface ImageContextOrBuilder extends
   com.google.cloud.vision.v1.LatLongRect getLatLongRect();
   /**
    * 
-   * lat/long rectangle that specifies the location of the image.
+   * Not used.
    * 

    *
    * .google.cloud.vision.v1.LatLongRect lat_long_rect = 1;
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/InputConfig.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/InputConfig.java
new file mode 100644
index 000000000000..89522f830730
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/InputConfig.java
@@ -0,0 +1,788 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+/**
+ * 
+ * The desired input location and metadata.
+ * 

+ *
+ * Protobuf type {@code google.cloud.vision.v1.InputConfig}
+ */
+public  final class InputConfig extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.vision.v1.InputConfig)
+    InputConfigOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use InputConfig.newBuilder() to construct.
+  private InputConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private InputConfig() {
+    mimeType_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private InputConfig(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            com.google.cloud.vision.v1.GcsSource.Builder subBuilder = null;
+            if (gcsSource_ != null) {
+              subBuilder = gcsSource_.toBuilder();
+            }
+            gcsSource_ = input.readMessage(com.google.cloud.vision.v1.GcsSource.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(gcsSource_);
+              gcsSource_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            mimeType_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_InputConfig_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_InputConfig_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.vision.v1.InputConfig.class, com.google.cloud.vision.v1.InputConfig.Builder.class);
+  }
+
+  public static final int GCS_SOURCE_FIELD_NUMBER = 1;
+  private com.google.cloud.vision.v1.GcsSource gcsSource_;
+  /**
+   * 
+   * The Google Cloud Storage location to read the input from.
+   * 

+   *
+   * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+   */
+  public boolean hasGcsSource() {
+    return gcsSource_ != null;
+  }
+  /**
+   * 
+   * The Google Cloud Storage location to read the input from.
+   * 

+   *
+   * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+   */
+  public com.google.cloud.vision.v1.GcsSource getGcsSource() {
+    return gcsSource_ == null ? com.google.cloud.vision.v1.GcsSource.getDefaultInstance() : gcsSource_;
+  }
+  /**
+   * 
+   * The Google Cloud Storage location to read the input from.
+   * 

+   *
+   * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+   */
+  public com.google.cloud.vision.v1.GcsSourceOrBuilder getGcsSourceOrBuilder() {
+    return getGcsSource();
+  }
+
+  public static final int MIME_TYPE_FIELD_NUMBER = 2;
+  private volatile java.lang.Object mimeType_;
+  /**
+   * 
+   * The type of the file. Currently only "application/pdf" and "image/tiff"
+   * are supported. Wildcards are not supported.
+   * 

+   *
+   * string mime_type = 2;
+   */
+  public java.lang.String getMimeType() {
+    java.lang.Object ref = mimeType_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      mimeType_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * The type of the file. Currently only "application/pdf" and "image/tiff"
+   * are supported. Wildcards are not supported.
+   * 

+   *
+   * string mime_type = 2;
+   */
+  public com.google.protobuf.ByteString
+      getMimeTypeBytes() {
+    java.lang.Object ref = mimeType_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      mimeType_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (gcsSource_ != null) {
+      output.writeMessage(1, getGcsSource());
+    }
+    if (!getMimeTypeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, mimeType_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (gcsSource_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getGcsSource());
+    }
+    if (!getMimeTypeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, mimeType_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.vision.v1.InputConfig)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.vision.v1.InputConfig other = (com.google.cloud.vision.v1.InputConfig) obj;
+
+    boolean result = true;
+    result = result && (hasGcsSource() == other.hasGcsSource());
+    if (hasGcsSource()) {
+      result = result && getGcsSource()
+          .equals(other.getGcsSource());
+    }
+    result = result && getMimeType()
+        .equals(other.getMimeType());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasGcsSource()) {
+      hash = (37 * hash) + GCS_SOURCE_FIELD_NUMBER;
+      hash = (53 * hash) + getGcsSource().hashCode();
+    }
+    hash = (37 * hash) + MIME_TYPE_FIELD_NUMBER;
+    hash = (53 * hash) + getMimeType().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.vision.v1.InputConfig parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.InputConfig parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.InputConfig parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.InputConfig parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.InputConfig parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.InputConfig parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.InputConfig parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.InputConfig parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.InputConfig parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.InputConfig parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.InputConfig parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.InputConfig parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.vision.v1.InputConfig prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * The desired input location and metadata.
+   * 

+   *
+   * Protobuf type {@code google.cloud.vision.v1.InputConfig}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.vision.v1.InputConfig)
+      com.google.cloud.vision.v1.InputConfigOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_InputConfig_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_InputConfig_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.vision.v1.InputConfig.class, com.google.cloud.vision.v1.InputConfig.Builder.class);
+    }
+
+    // Construct using com.google.cloud.vision.v1.InputConfig.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (gcsSourceBuilder_ == null) {
+        gcsSource_ = null;
+      } else {
+        gcsSource_ = null;
+        gcsSourceBuilder_ = null;
+      }
+      mimeType_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_InputConfig_descriptor;
+    }
+
+    public com.google.cloud.vision.v1.InputConfig getDefaultInstanceForType() {
+      return com.google.cloud.vision.v1.InputConfig.getDefaultInstance();
+    }
+
+    public com.google.cloud.vision.v1.InputConfig build() {
+      com.google.cloud.vision.v1.InputConfig result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.vision.v1.InputConfig buildPartial() {
+      com.google.cloud.vision.v1.InputConfig result = new com.google.cloud.vision.v1.InputConfig(this);
+      if (gcsSourceBuilder_ == null) {
+        result.gcsSource_ = gcsSource_;
+      } else {
+        result.gcsSource_ = gcsSourceBuilder_.build();
+      }
+      result.mimeType_ = mimeType_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.vision.v1.InputConfig) {
+        return mergeFrom((com.google.cloud.vision.v1.InputConfig)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.vision.v1.InputConfig other) {
+      if (other == com.google.cloud.vision.v1.InputConfig.getDefaultInstance()) return this;
+      if (other.hasGcsSource()) {
+        mergeGcsSource(other.getGcsSource());
+      }
+      if (!other.getMimeType().isEmpty()) {
+        mimeType_ = other.mimeType_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.vision.v1.InputConfig parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.vision.v1.InputConfig) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.cloud.vision.v1.GcsSource gcsSource_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.GcsSource, com.google.cloud.vision.v1.GcsSource.Builder, com.google.cloud.vision.v1.GcsSourceOrBuilder> gcsSourceBuilder_;
+    /**
+     * 
+     * The Google Cloud Storage location to read the input from.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+     */
+    public boolean hasGcsSource() {
+      return gcsSourceBuilder_ != null || gcsSource_ != null;
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to read the input from.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+     */
+    public com.google.cloud.vision.v1.GcsSource getGcsSource() {
+      if (gcsSourceBuilder_ == null) {
+        return gcsSource_ == null ? com.google.cloud.vision.v1.GcsSource.getDefaultInstance() : gcsSource_;
+      } else {
+        return gcsSourceBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to read the input from.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+     */
+    public Builder setGcsSource(com.google.cloud.vision.v1.GcsSource value) {
+      if (gcsSourceBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        gcsSource_ = value;
+        onChanged();
+      } else {
+        gcsSourceBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to read the input from.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+     */
+    public Builder setGcsSource(
+        com.google.cloud.vision.v1.GcsSource.Builder builderForValue) {
+      if (gcsSourceBuilder_ == null) {
+        gcsSource_ = builderForValue.build();
+        onChanged();
+      } else {
+        gcsSourceBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to read the input from.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+     */
+    public Builder mergeGcsSource(com.google.cloud.vision.v1.GcsSource value) {
+      if (gcsSourceBuilder_ == null) {
+        if (gcsSource_ != null) {
+          gcsSource_ =
+            com.google.cloud.vision.v1.GcsSource.newBuilder(gcsSource_).mergeFrom(value).buildPartial();
+        } else {
+          gcsSource_ = value;
+        }
+        onChanged();
+      } else {
+        gcsSourceBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to read the input from.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+     */
+    public Builder clearGcsSource() {
+      if (gcsSourceBuilder_ == null) {
+        gcsSource_ = null;
+        onChanged();
+      } else {
+        gcsSource_ = null;
+        gcsSourceBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to read the input from.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+     */
+    public com.google.cloud.vision.v1.GcsSource.Builder getGcsSourceBuilder() {
+      
+      onChanged();
+      return getGcsSourceFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to read the input from.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+     */
+    public com.google.cloud.vision.v1.GcsSourceOrBuilder getGcsSourceOrBuilder() {
+      if (gcsSourceBuilder_ != null) {
+        return gcsSourceBuilder_.getMessageOrBuilder();
+      } else {
+        return gcsSource_ == null ?
+            com.google.cloud.vision.v1.GcsSource.getDefaultInstance() : gcsSource_;
+      }
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to read the input from.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.GcsSource, com.google.cloud.vision.v1.GcsSource.Builder, com.google.cloud.vision.v1.GcsSourceOrBuilder> 
+        getGcsSourceFieldBuilder() {
+      if (gcsSourceBuilder_ == null) {
+        gcsSourceBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.vision.v1.GcsSource, com.google.cloud.vision.v1.GcsSource.Builder, com.google.cloud.vision.v1.GcsSourceOrBuilder>(
+                getGcsSource(),
+                getParentForChildren(),
+                isClean());
+        gcsSource_ = null;
+      }
+      return gcsSourceBuilder_;
+    }
+
+    private java.lang.Object mimeType_ = "";
+    /**
+     * 
+     * The type of the file. Currently only "application/pdf" and "image/tiff"
+     * are supported. Wildcards are not supported.
+     * 

+     *
+     * string mime_type = 2;
+     */
+    public java.lang.String getMimeType() {
+      java.lang.Object ref = mimeType_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        mimeType_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * The type of the file. Currently only "application/pdf" and "image/tiff"
+     * are supported. Wildcards are not supported.
+     * 

+     *
+     * string mime_type = 2;
+     */
+    public com.google.protobuf.ByteString
+        getMimeTypeBytes() {
+      java.lang.Object ref = mimeType_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        mimeType_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * The type of the file. Currently only "application/pdf" and "image/tiff"
+     * are supported. Wildcards are not supported.
+     * 

+     *
+     * string mime_type = 2;
+     */
+    public Builder setMimeType(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      mimeType_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The type of the file. Currently only "application/pdf" and "image/tiff"
+     * are supported. Wildcards are not supported.
+     * 

+     *
+     * string mime_type = 2;
+     */
+    public Builder clearMimeType() {
+      
+      mimeType_ = getDefaultInstance().getMimeType();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The type of the file. Currently only "application/pdf" and "image/tiff"
+     * are supported. Wildcards are not supported.
+     * 

+     *
+     * string mime_type = 2;
+     */
+    public Builder setMimeTypeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      mimeType_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.vision.v1.InputConfig)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.vision.v1.InputConfig)
+  private static final com.google.cloud.vision.v1.InputConfig DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.vision.v1.InputConfig();
+  }
+
+  public static com.google.cloud.vision.v1.InputConfig getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public InputConfig parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new InputConfig(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.vision.v1.InputConfig getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/InputConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/InputConfigOrBuilder.java
new file mode 100644
index 000000000000..7521ddb3d636
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/InputConfigOrBuilder.java
@@ -0,0 +1,54 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+public interface InputConfigOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.vision.v1.InputConfig)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The Google Cloud Storage location to read the input from.
+   * 

+   *
+   * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+   */
+  boolean hasGcsSource();
+  /**
+   * 
+   * The Google Cloud Storage location to read the input from.
+   * 

+   *
+   * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+   */
+  com.google.cloud.vision.v1.GcsSource getGcsSource();
+  /**
+   * 
+   * The Google Cloud Storage location to read the input from.
+   * 

+   *
+   * .google.cloud.vision.v1.GcsSource gcs_source = 1;
+   */
+  com.google.cloud.vision.v1.GcsSourceOrBuilder getGcsSourceOrBuilder();
+
+  /**
+   * 
+   * The type of the file. Currently only "application/pdf" and "image/tiff"
+   * are supported. Wildcards are not supported.
+   * 

+   *
+   * string mime_type = 2;
+   */
+  java.lang.String getMimeType();
+  /**
+   * 
+   * The type of the file. Currently only "application/pdf" and "image/tiff"
+   * are supported. Wildcards are not supported.
+   * 

+   *
+   * string mime_type = 2;
+   */
+  com.google.protobuf.ByteString
+      getMimeTypeBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Range.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/NormalizedVertex.java
similarity index 59%
rename from google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Range.java
rename to google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/NormalizedVertex.java
index 188895244717..c0b59403d655 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2beta1/src/main/java/com/google/privacy/dlp/v2beta1/Range.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/NormalizedVertex.java
@@ -1,27 +1,29 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/privacy/dlp/v2beta1/dlp.proto
+// source: google/cloud/vision/v1/geometry.proto
 
-package com.google.privacy.dlp.v2beta1;
+package com.google.cloud.vision.v1;
 
 /**
  * 
- * Generic half-open interval [start, end)
+ * A vertex represents a 2D point in the image.
+ * NOTE: the normalized vertex coordinates are relative to the original image
+ * and range from 0 to 1.
  * 

  *
- * Protobuf type {@code google.privacy.dlp.v2beta1.Range}
+ * Protobuf type {@code google.cloud.vision.v1.NormalizedVertex}
  */
-public  final class Range extends
+public  final class NormalizedVertex extends
     com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2beta1.Range)
-    RangeOrBuilder {
+    // @@protoc_insertion_point(message_implements:google.cloud.vision.v1.NormalizedVertex)
+    NormalizedVertexOrBuilder {
 private static final long serialVersionUID = 0L;
-  // Use Range.newBuilder() to construct.
-  private Range(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+  // Use NormalizedVertex.newBuilder() to construct.
+  private NormalizedVertex(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-  private Range() {
-    start_ = 0L;
-    end_ = 0L;
+  private NormalizedVertex() {
+    x_ = 0F;
+    y_ = 0F;
   }
 
   @java.lang.Override
@@ -29,7 +31,7 @@ private Range() {
   getUnknownFields() {
     return this.unknownFields;
   }
-  private Range(
+  private NormalizedVertex(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
@@ -55,14 +57,14 @@ private Range(
             }
             break;
           }
-          case 8: {
+          case 13: {
 
-            start_ = input.readInt64();
+            x_ = input.readFloat();
             break;
           }
-          case 16: {
+          case 21: {
 
-            end_ = input.readInt64();
+            y_ = input.readFloat();
             break;
           }
         }
@@ -79,40 +81,40 @@ private Range(
   }
   public static final com.google.protobuf.Descriptors.Descriptor
       getDescriptor() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Range_descriptor;
+    return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_NormalizedVertex_descriptor;
   }
 
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Range_fieldAccessorTable
+    return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_NormalizedVertex_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.privacy.dlp.v2beta1.Range.class, com.google.privacy.dlp.v2beta1.Range.Builder.class);
+            com.google.cloud.vision.v1.NormalizedVertex.class, com.google.cloud.vision.v1.NormalizedVertex.Builder.class);
   }
 
-  public static final int START_FIELD_NUMBER = 1;
-  private long start_;
+  public static final int X_FIELD_NUMBER = 1;
+  private float x_;
   /**
    * 
-   * Index of the first character of the range (inclusive).
+   * X coordinate.
    * 

    *
-   * int64 start = 1;
+   * float x = 1;
    */
-  public long getStart() {
-    return start_;
+  public float getX() {
+    return x_;
   }
 
-  public static final int END_FIELD_NUMBER = 2;
-  private long end_;
+  public static final int Y_FIELD_NUMBER = 2;
+  private float y_;
   /**
    * 
-   * Index of the last character of the range (exclusive).
+   * Y coordinate.
    * 

    *
-   * int64 end = 2;
+   * float y = 2;
    */
-  public long getEnd() {
-    return end_;
+  public float getY() {
+    return y_;
   }
 
   private byte memoizedIsInitialized = -1;
@@ -127,11 +129,11 @@ public final boolean isInitialized() {
 
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (start_ != 0L) {
-      output.writeInt64(1, start_);
+    if (x_ != 0F) {
+      output.writeFloat(1, x_);
     }
-    if (end_ != 0L) {
-      output.writeInt64(2, end_);
+    if (y_ != 0F) {
+      output.writeFloat(2, y_);
     }
     unknownFields.writeTo(output);
   }
@@ -141,13 +143,13 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (start_ != 0L) {
+    if (x_ != 0F) {
       size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(1, start_);
+        .computeFloatSize(1, x_);
     }
-    if (end_ != 0L) {
+    if (y_ != 0F) {
       size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(2, end_);
+        .computeFloatSize(2, y_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -159,16 +161,20 @@ public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
      return true;
     }
-    if (!(obj instanceof com.google.privacy.dlp.v2beta1.Range)) {
+    if (!(obj instanceof com.google.cloud.vision.v1.NormalizedVertex)) {
       return super.equals(obj);
     }
-    com.google.privacy.dlp.v2beta1.Range other = (com.google.privacy.dlp.v2beta1.Range) obj;
+    com.google.cloud.vision.v1.NormalizedVertex other = (com.google.cloud.vision.v1.NormalizedVertex) obj;
 
     boolean result = true;
-    result = result && (getStart()
-        == other.getStart());
-    result = result && (getEnd()
-        == other.getEnd());
+    result = result && (
+        java.lang.Float.floatToIntBits(getX())
+        == java.lang.Float.floatToIntBits(
+            other.getX()));
+    result = result && (
+        java.lang.Float.floatToIntBits(getY())
+        == java.lang.Float.floatToIntBits(
+            other.getY()));
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -180,80 +186,80 @@ public int hashCode() {
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + START_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getStart());
-    hash = (37 * hash) + END_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-        getEnd());
+    hash = (37 * hash) + X_FIELD_NUMBER;
+    hash = (53 * hash) + java.lang.Float.floatToIntBits(
+        getX());
+    hash = (37 * hash) + Y_FIELD_NUMBER;
+    hash = (53 * hash) + java.lang.Float.floatToIntBits(
+        getY());
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
 
-  public static com.google.privacy.dlp.v2beta1.Range parseFrom(
+  public static com.google.cloud.vision.v1.NormalizedVertex parseFrom(
       java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.privacy.dlp.v2beta1.Range parseFrom(
+  public static com.google.cloud.vision.v1.NormalizedVertex parseFrom(
       java.nio.ByteBuffer data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.Range parseFrom(
+  public static com.google.cloud.vision.v1.NormalizedVertex parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.privacy.dlp.v2beta1.Range parseFrom(
+  public static com.google.cloud.vision.v1.NormalizedVertex parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.Range parseFrom(byte[] data)
+  public static com.google.cloud.vision.v1.NormalizedVertex parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-  public static com.google.privacy.dlp.v2beta1.Range parseFrom(
+  public static com.google.cloud.vision.v1.NormalizedVertex parseFrom(
       byte[] data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.Range parseFrom(java.io.InputStream input)
+  public static com.google.cloud.vision.v1.NormalizedVertex parseFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.google.privacy.dlp.v2beta1.Range parseFrom(
+  public static com.google.cloud.vision.v1.NormalizedVertex parseFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.Range parseDelimitedFrom(java.io.InputStream input)
+  public static com.google.cloud.vision.v1.NormalizedVertex parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input);
   }
-  public static com.google.privacy.dlp.v2beta1.Range parseDelimitedFrom(
+  public static com.google.cloud.vision.v1.NormalizedVertex parseDelimitedFrom(
       java.io.InputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-  public static com.google.privacy.dlp.v2beta1.Range parseFrom(
+  public static com.google.cloud.vision.v1.NormalizedVertex parseFrom(
       com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
     return com.google.protobuf.GeneratedMessageV3
         .parseWithIOException(PARSER, input);
   }
-  public static com.google.privacy.dlp.v2beta1.Range parseFrom(
+  public static com.google.cloud.vision.v1.NormalizedVertex parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
@@ -265,7 +271,7 @@ public static com.google.privacy.dlp.v2beta1.Range parseFrom(
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-  public static Builder newBuilder(com.google.privacy.dlp.v2beta1.Range prototype) {
+  public static Builder newBuilder(com.google.cloud.vision.v1.NormalizedVertex prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
   public Builder toBuilder() {
@@ -281,28 +287,30 @@ protected Builder newBuilderForType(
   }
   /**
    * 
-   * Generic half-open interval [start, end)
+   * A vertex represents a 2D point in the image.
+   * NOTE: the normalized vertex coordinates are relative to the original image
+   * and range from 0 to 1.
    * 

    *
-   * Protobuf type {@code google.privacy.dlp.v2beta1.Range}
+   * Protobuf type {@code google.cloud.vision.v1.NormalizedVertex}
    */
   public static final class Builder extends
       com.google.protobuf.GeneratedMessageV3.Builder implements
-      // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2beta1.Range)
-      com.google.privacy.dlp.v2beta1.RangeOrBuilder {
+      // @@protoc_insertion_point(builder_implements:google.cloud.vision.v1.NormalizedVertex)
+      com.google.cloud.vision.v1.NormalizedVertexOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Range_descriptor;
+      return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_NormalizedVertex_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Range_fieldAccessorTable
+      return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_NormalizedVertex_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.privacy.dlp.v2beta1.Range.class, com.google.privacy.dlp.v2beta1.Range.Builder.class);
+              com.google.cloud.vision.v1.NormalizedVertex.class, com.google.cloud.vision.v1.NormalizedVertex.Builder.class);
     }
 
-    // Construct using com.google.privacy.dlp.v2beta1.Range.newBuilder()
+    // Construct using com.google.cloud.vision.v1.NormalizedVertex.newBuilder()
     private Builder() {
       maybeForceBuilderInitialization();
     }
@@ -319,34 +327,34 @@ private void maybeForceBuilderInitialization() {
     }
     public Builder clear() {
       super.clear();
-      start_ = 0L;
+      x_ = 0F;
 
-      end_ = 0L;
+      y_ = 0F;
 
       return this;
     }
 
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
-      return com.google.privacy.dlp.v2beta1.DlpProto.internal_static_google_privacy_dlp_v2beta1_Range_descriptor;
+      return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_NormalizedVertex_descriptor;
     }
 
-    public com.google.privacy.dlp.v2beta1.Range getDefaultInstanceForType() {
-      return com.google.privacy.dlp.v2beta1.Range.getDefaultInstance();
+    public com.google.cloud.vision.v1.NormalizedVertex getDefaultInstanceForType() {
+      return com.google.cloud.vision.v1.NormalizedVertex.getDefaultInstance();
     }
 
-    public com.google.privacy.dlp.v2beta1.Range build() {
-      com.google.privacy.dlp.v2beta1.Range result = buildPartial();
+    public com.google.cloud.vision.v1.NormalizedVertex build() {
+      com.google.cloud.vision.v1.NormalizedVertex result = buildPartial();
       if (!result.isInitialized()) {
         throw newUninitializedMessageException(result);
       }
       return result;
     }
 
-    public com.google.privacy.dlp.v2beta1.Range buildPartial() {
-      com.google.privacy.dlp.v2beta1.Range result = new com.google.privacy.dlp.v2beta1.Range(this);
-      result.start_ = start_;
-      result.end_ = end_;
+    public com.google.cloud.vision.v1.NormalizedVertex buildPartial() {
+      com.google.cloud.vision.v1.NormalizedVertex result = new com.google.cloud.vision.v1.NormalizedVertex(this);
+      result.x_ = x_;
+      result.y_ = y_;
       onBuilt();
       return result;
     }
@@ -378,21 +386,21 @@ public Builder addRepeatedField(
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof com.google.privacy.dlp.v2beta1.Range) {
-        return mergeFrom((com.google.privacy.dlp.v2beta1.Range)other);
+      if (other instanceof com.google.cloud.vision.v1.NormalizedVertex) {
+        return mergeFrom((com.google.cloud.vision.v1.NormalizedVertex)other);
       } else {
         super.mergeFrom(other);
         return this;
       }
     }
 
-    public Builder mergeFrom(com.google.privacy.dlp.v2beta1.Range other) {
-      if (other == com.google.privacy.dlp.v2beta1.Range.getDefaultInstance()) return this;
-      if (other.getStart() != 0L) {
-        setStart(other.getStart());
+    public Builder mergeFrom(com.google.cloud.vision.v1.NormalizedVertex other) {
+      if (other == com.google.cloud.vision.v1.NormalizedVertex.getDefaultInstance()) return this;
+      if (other.getX() != 0F) {
+        setX(other.getX());
       }
-      if (other.getEnd() != 0L) {
-        setEnd(other.getEnd());
+      if (other.getY() != 0F) {
+        setY(other.getY());
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -407,11 +415,11 @@ public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      com.google.privacy.dlp.v2beta1.Range parsedMessage = null;
+      com.google.cloud.vision.v1.NormalizedVertex parsedMessage = null;
       try {
         parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (com.google.privacy.dlp.v2beta1.Range) e.getUnfinishedMessage();
+        parsedMessage = (com.google.cloud.vision.v1.NormalizedVertex) e.getUnfinishedMessage();
         throw e.unwrapIOException();
       } finally {
         if (parsedMessage != null) {
@@ -421,78 +429,78 @@ public Builder mergeFrom(
       return this;
     }
 
-    private long start_ ;
+    private float x_ ;
     /**
      * 
-     * Index of the first character of the range (inclusive).
+     * X coordinate.
      * 

      *
-     * int64 start = 1;
+     * float x = 1;
      */
-    public long getStart() {
-      return start_;
+    public float getX() {
+      return x_;
     }
     /**
      * 
-     * Index of the first character of the range (inclusive).
+     * X coordinate.
      * 

      *
-     * int64 start = 1;
+     * float x = 1;
      */
-    public Builder setStart(long value) {
+    public Builder setX(float value) {
       
-      start_ = value;
+      x_ = value;
       onChanged();
       return this;
     }
     /**
      * 
-     * Index of the first character of the range (inclusive).
+     * X coordinate.
      * 

      *
-     * int64 start = 1;
+     * float x = 1;
      */
-    public Builder clearStart() {
+    public Builder clearX() {
       
-      start_ = 0L;
+      x_ = 0F;
       onChanged();
       return this;
     }
 
-    private long end_ ;
+    private float y_ ;
     /**
      * 
-     * Index of the last character of the range (exclusive).
+     * Y coordinate.
      * 

      *
-     * int64 end = 2;
+     * float y = 2;
      */
-    public long getEnd() {
-      return end_;
+    public float getY() {
+      return y_;
     }
     /**
      * 
-     * Index of the last character of the range (exclusive).
+     * Y coordinate.
      * 

      *
-     * int64 end = 2;
+     * float y = 2;
      */
-    public Builder setEnd(long value) {
+    public Builder setY(float value) {
       
-      end_ = value;
+      y_ = value;
       onChanged();
       return this;
     }
     /**
      * 
-     * Index of the last character of the range (exclusive).
+     * Y coordinate.
      * 

      *
-     * int64 end = 2;
+     * float y = 2;
      */
-    public Builder clearEnd() {
+    public Builder clearY() {
       
-      end_ = 0L;
+      y_ = 0F;
       onChanged();
       return this;
     }
@@ -507,39 +515,39 @@ public final Builder mergeUnknownFields(
     }
 
 
-    // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2beta1.Range)
+    // @@protoc_insertion_point(builder_scope:google.cloud.vision.v1.NormalizedVertex)
   }
 
-  // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2beta1.Range)
-  private static final com.google.privacy.dlp.v2beta1.Range DEFAULT_INSTANCE;
+  // @@protoc_insertion_point(class_scope:google.cloud.vision.v1.NormalizedVertex)
+  private static final com.google.cloud.vision.v1.NormalizedVertex DEFAULT_INSTANCE;
   static {
-    DEFAULT_INSTANCE = new com.google.privacy.dlp.v2beta1.Range();
+    DEFAULT_INSTANCE = new com.google.cloud.vision.v1.NormalizedVertex();
   }
 
-  public static com.google.privacy.dlp.v2beta1.Range getDefaultInstance() {
+  public static com.google.cloud.vision.v1.NormalizedVertex getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
-    public Range parsePartialFrom(
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public NormalizedVertex parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Range(input, extensionRegistry);
+      return new NormalizedVertex(input, extensionRegistry);
     }
   };
 
-  public static com.google.protobuf.Parser parser() {
+  public static com.google.protobuf.Parser parser() {
     return PARSER;
   }
 
   @java.lang.Override
-  public com.google.protobuf.Parser getParserForType() {
+  public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  public com.google.privacy.dlp.v2beta1.Range getDefaultInstanceForType() {
+  public com.google.cloud.vision.v1.NormalizedVertex getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/NormalizedVertexOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/NormalizedVertexOrBuilder.java
new file mode 100644
index 000000000000..14d7ed4008be
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/NormalizedVertexOrBuilder.java
@@ -0,0 +1,27 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/geometry.proto
+
+package com.google.cloud.vision.v1;
+
+public interface NormalizedVertexOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.vision.v1.NormalizedVertex)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * X coordinate.
+   * 

+   *
+   * float x = 1;
+   */
+  float getX();
+
+  /**
+   * 
+   * Y coordinate.
+   * 

+   *
+   * float y = 2;
+   */
+  float getY();
+}
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OperationMetadata.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OperationMetadata.java
new file mode 100644
index 000000000000..51c7344925a5
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OperationMetadata.java
@@ -0,0 +1,1135 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+/**
+ * 
+ * Contains metadata for the BatchAnnotateImages operation.
+ * 

+ *
+ * Protobuf type {@code google.cloud.vision.v1.OperationMetadata}
+ */
+public  final class OperationMetadata extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.vision.v1.OperationMetadata)
+    OperationMetadataOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use OperationMetadata.newBuilder() to construct.
+  private OperationMetadata(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private OperationMetadata() {
+    state_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private OperationMetadata(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            state_ = rawValue;
+            break;
+          }
+          case 42: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (createTime_ != null) {
+              subBuilder = createTime_.toBuilder();
+            }
+            createTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(createTime_);
+              createTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 50: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (updateTime_ != null) {
+              subBuilder = updateTime_.toBuilder();
+            }
+            updateTime_ = input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(updateTime_);
+              updateTime_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OperationMetadata_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OperationMetadata_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.vision.v1.OperationMetadata.class, com.google.cloud.vision.v1.OperationMetadata.Builder.class);
+  }
+
+  /**
+   * 
+   * Batch operation states.
+   * 

+   *
+   * Protobuf enum {@code google.cloud.vision.v1.OperationMetadata.State}
+   */
+  public enum State
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * 
+     * Invalid.
+     * 

+     *
+     * STATE_UNSPECIFIED = 0;
+     */
+    STATE_UNSPECIFIED(0),
+    /**
+     * 
+     * Request is received.
+     * 

+     *
+     * CREATED = 1;
+     */
+    CREATED(1),
+    /**
+     * 
+     * Request is actively being processed.
+     * 

+     *
+     * RUNNING = 2;
+     */
+    RUNNING(2),
+    /**
+     * 
+     * The batch processing is done.
+     * 

+     *
+     * DONE = 3;
+     */
+    DONE(3),
+    /**
+     * 
+     * The batch processing was cancelled.
+     * 

+     *
+     * CANCELLED = 4;
+     */
+    CANCELLED(4),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * 
+     * Invalid.
+     * 

+     *
+     * STATE_UNSPECIFIED = 0;
+     */
+    public static final int STATE_UNSPECIFIED_VALUE = 0;
+    /**
+     * 
+     * Request is received.
+     * 

+     *
+     * CREATED = 1;
+     */
+    public static final int CREATED_VALUE = 1;
+    /**
+     * 
+     * Request is actively being processed.
+     * 

+     *
+     * RUNNING = 2;
+     */
+    public static final int RUNNING_VALUE = 2;
+    /**
+     * 
+     * The batch processing is done.
+     * 

+     *
+     * DONE = 3;
+     */
+    public static final int DONE_VALUE = 3;
+    /**
+     * 
+     * The batch processing was cancelled.
+     * 

+     *
+     * CANCELLED = 4;
+     */
+    public static final int CANCELLED_VALUE = 4;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static State valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static State forNumber(int value) {
+      switch (value) {
+        case 0: return STATE_UNSPECIFIED;
+        case 1: return CREATED;
+        case 2: return RUNNING;
+        case 3: return DONE;
+        case 4: return CANCELLED;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        State> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public State findValueByNumber(int number) {
+              return State.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return com.google.cloud.vision.v1.OperationMetadata.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final State[] VALUES = values();
+
+    public static State valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private State(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.cloud.vision.v1.OperationMetadata.State)
+  }
+
+  public static final int STATE_FIELD_NUMBER = 1;
+  private int state_;
+  /**
+   * 
+   * Current state of the batch operation.
+   * 

+   *
+   * .google.cloud.vision.v1.OperationMetadata.State state = 1;
+   */
+  public int getStateValue() {
+    return state_;
+  }
+  /**
+   * 
+   * Current state of the batch operation.
+   * 

+   *
+   * .google.cloud.vision.v1.OperationMetadata.State state = 1;
+   */
+  public com.google.cloud.vision.v1.OperationMetadata.State getState() {
+    com.google.cloud.vision.v1.OperationMetadata.State result = com.google.cloud.vision.v1.OperationMetadata.State.valueOf(state_);
+    return result == null ? com.google.cloud.vision.v1.OperationMetadata.State.UNRECOGNIZED : result;
+  }
+
+  public static final int CREATE_TIME_FIELD_NUMBER = 5;
+  private com.google.protobuf.Timestamp createTime_;
+  /**
+   * 
+   * The time when the batch request was received.
+   * 

+   *
+   * .google.protobuf.Timestamp create_time = 5;
+   */
+  public boolean hasCreateTime() {
+    return createTime_ != null;
+  }
+  /**
+   * 
+   * The time when the batch request was received.
+   * 

+   *
+   * .google.protobuf.Timestamp create_time = 5;
+   */
+  public com.google.protobuf.Timestamp getCreateTime() {
+    return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+  }
+  /**
+   * 
+   * The time when the batch request was received.
+   * 

+   *
+   * .google.protobuf.Timestamp create_time = 5;
+   */
+  public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
+    return getCreateTime();
+  }
+
+  public static final int UPDATE_TIME_FIELD_NUMBER = 6;
+  private com.google.protobuf.Timestamp updateTime_;
+  /**
+   * 
+   * The time when the operation result was last updated.
+   * 

+   *
+   * .google.protobuf.Timestamp update_time = 6;
+   */
+  public boolean hasUpdateTime() {
+    return updateTime_ != null;
+  }
+  /**
+   * 
+   * The time when the operation result was last updated.
+   * 

+   *
+   * .google.protobuf.Timestamp update_time = 6;
+   */
+  public com.google.protobuf.Timestamp getUpdateTime() {
+    return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+  }
+  /**
+   * 
+   * The time when the operation result was last updated.
+   * 

+   *
+   * .google.protobuf.Timestamp update_time = 6;
+   */
+  public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
+    return getUpdateTime();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (state_ != com.google.cloud.vision.v1.OperationMetadata.State.STATE_UNSPECIFIED.getNumber()) {
+      output.writeEnum(1, state_);
+    }
+    if (createTime_ != null) {
+      output.writeMessage(5, getCreateTime());
+    }
+    if (updateTime_ != null) {
+      output.writeMessage(6, getUpdateTime());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (state_ != com.google.cloud.vision.v1.OperationMetadata.State.STATE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(1, state_);
+    }
+    if (createTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(5, getCreateTime());
+    }
+    if (updateTime_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(6, getUpdateTime());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.vision.v1.OperationMetadata)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.vision.v1.OperationMetadata other = (com.google.cloud.vision.v1.OperationMetadata) obj;
+
+    boolean result = true;
+    result = result && state_ == other.state_;
+    result = result && (hasCreateTime() == other.hasCreateTime());
+    if (hasCreateTime()) {
+      result = result && getCreateTime()
+          .equals(other.getCreateTime());
+    }
+    result = result && (hasUpdateTime() == other.hasUpdateTime());
+    if (hasUpdateTime()) {
+      result = result && getUpdateTime()
+          .equals(other.getUpdateTime());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + STATE_FIELD_NUMBER;
+    hash = (53 * hash) + state_;
+    if (hasCreateTime()) {
+      hash = (37 * hash) + CREATE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getCreateTime().hashCode();
+    }
+    if (hasUpdateTime()) {
+      hash = (37 * hash) + UPDATE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getUpdateTime().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.vision.v1.OperationMetadata parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.OperationMetadata parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.OperationMetadata parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.OperationMetadata parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.OperationMetadata parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.OperationMetadata parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.OperationMetadata parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.OperationMetadata parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.OperationMetadata parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.OperationMetadata parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.OperationMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.OperationMetadata parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.vision.v1.OperationMetadata prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * Contains metadata for the BatchAnnotateImages operation.
+   * 

+   *
+   * Protobuf type {@code google.cloud.vision.v1.OperationMetadata}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.vision.v1.OperationMetadata)
+      com.google.cloud.vision.v1.OperationMetadataOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OperationMetadata_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OperationMetadata_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.vision.v1.OperationMetadata.class, com.google.cloud.vision.v1.OperationMetadata.Builder.class);
+    }
+
+    // Construct using com.google.cloud.vision.v1.OperationMetadata.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      state_ = 0;
+
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+      } else {
+        createTime_ = null;
+        createTimeBuilder_ = null;
+      }
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+      } else {
+        updateTime_ = null;
+        updateTimeBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OperationMetadata_descriptor;
+    }
+
+    public com.google.cloud.vision.v1.OperationMetadata getDefaultInstanceForType() {
+      return com.google.cloud.vision.v1.OperationMetadata.getDefaultInstance();
+    }
+
+    public com.google.cloud.vision.v1.OperationMetadata build() {
+      com.google.cloud.vision.v1.OperationMetadata result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.vision.v1.OperationMetadata buildPartial() {
+      com.google.cloud.vision.v1.OperationMetadata result = new com.google.cloud.vision.v1.OperationMetadata(this);
+      result.state_ = state_;
+      if (createTimeBuilder_ == null) {
+        result.createTime_ = createTime_;
+      } else {
+        result.createTime_ = createTimeBuilder_.build();
+      }
+      if (updateTimeBuilder_ == null) {
+        result.updateTime_ = updateTime_;
+      } else {
+        result.updateTime_ = updateTimeBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.vision.v1.OperationMetadata) {
+        return mergeFrom((com.google.cloud.vision.v1.OperationMetadata)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.vision.v1.OperationMetadata other) {
+      if (other == com.google.cloud.vision.v1.OperationMetadata.getDefaultInstance()) return this;
+      if (other.state_ != 0) {
+        setStateValue(other.getStateValue());
+      }
+      if (other.hasCreateTime()) {
+        mergeCreateTime(other.getCreateTime());
+      }
+      if (other.hasUpdateTime()) {
+        mergeUpdateTime(other.getUpdateTime());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.vision.v1.OperationMetadata parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.vision.v1.OperationMetadata) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int state_ = 0;
+    /**
+     * 
+     * Current state of the batch operation.
+     * 

+     *
+     * .google.cloud.vision.v1.OperationMetadata.State state = 1;
+     */
+    public int getStateValue() {
+      return state_;
+    }
+    /**
+     * 
+     * Current state of the batch operation.
+     * 

+     *
+     * .google.cloud.vision.v1.OperationMetadata.State state = 1;
+     */
+    public Builder setStateValue(int value) {
+      state_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Current state of the batch operation.
+     * 

+     *
+     * .google.cloud.vision.v1.OperationMetadata.State state = 1;
+     */
+    public com.google.cloud.vision.v1.OperationMetadata.State getState() {
+      com.google.cloud.vision.v1.OperationMetadata.State result = com.google.cloud.vision.v1.OperationMetadata.State.valueOf(state_);
+      return result == null ? com.google.cloud.vision.v1.OperationMetadata.State.UNRECOGNIZED : result;
+    }
+    /**
+     * 
+     * Current state of the batch operation.
+     * 

+     *
+     * .google.cloud.vision.v1.OperationMetadata.State state = 1;
+     */
+    public Builder setState(com.google.cloud.vision.v1.OperationMetadata.State value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      state_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * Current state of the batch operation.
+     * 

+     *
+     * .google.cloud.vision.v1.OperationMetadata.State state = 1;
+     */
+    public Builder clearState() {
+      
+      state_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.Timestamp createTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> createTimeBuilder_;
+    /**
+     * 
+     * The time when the batch request was received.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 5;
+     */
+    public boolean hasCreateTime() {
+      return createTimeBuilder_ != null || createTime_ != null;
+    }
+    /**
+     * 
+     * The time when the batch request was received.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 5;
+     */
+    public com.google.protobuf.Timestamp getCreateTime() {
+      if (createTimeBuilder_ == null) {
+        return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+      } else {
+        return createTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The time when the batch request was received.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 5;
+     */
+    public Builder setCreateTime(com.google.protobuf.Timestamp value) {
+      if (createTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        createTime_ = value;
+        onChanged();
+      } else {
+        createTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time when the batch request was received.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 5;
+     */
+    public Builder setCreateTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (createTimeBuilder_ == null) {
+        createTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        createTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time when the batch request was received.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 5;
+     */
+    public Builder mergeCreateTime(com.google.protobuf.Timestamp value) {
+      if (createTimeBuilder_ == null) {
+        if (createTime_ != null) {
+          createTime_ =
+            com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial();
+        } else {
+          createTime_ = value;
+        }
+        onChanged();
+      } else {
+        createTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time when the batch request was received.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 5;
+     */
+    public Builder clearCreateTime() {
+      if (createTimeBuilder_ == null) {
+        createTime_ = null;
+        onChanged();
+      } else {
+        createTime_ = null;
+        createTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time when the batch request was received.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 5;
+     */
+    public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() {
+      
+      onChanged();
+      return getCreateTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The time when the batch request was received.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 5;
+     */
+    public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
+      if (createTimeBuilder_ != null) {
+        return createTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return createTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : createTime_;
+      }
+    }
+    /**
+     * 
+     * The time when the batch request was received.
+     * 

+     *
+     * .google.protobuf.Timestamp create_time = 5;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getCreateTimeFieldBuilder() {
+      if (createTimeBuilder_ == null) {
+        createTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getCreateTime(),
+                getParentForChildren(),
+                isClean());
+        createTime_ = null;
+      }
+      return createTimeBuilder_;
+    }
+
+    private com.google.protobuf.Timestamp updateTime_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> updateTimeBuilder_;
+    /**
+     * 
+     * The time when the operation result was last updated.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public boolean hasUpdateTime() {
+      return updateTimeBuilder_ != null || updateTime_ != null;
+    }
+    /**
+     * 
+     * The time when the operation result was last updated.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public com.google.protobuf.Timestamp getUpdateTime() {
+      if (updateTimeBuilder_ == null) {
+        return updateTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+      } else {
+        return updateTimeBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The time when the operation result was last updated.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
+      if (updateTimeBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        updateTime_ = value;
+        onChanged();
+      } else {
+        updateTimeBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time when the operation result was last updated.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public Builder setUpdateTime(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = builderForValue.build();
+        onChanged();
+      } else {
+        updateTimeBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time when the operation result was last updated.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
+      if (updateTimeBuilder_ == null) {
+        if (updateTime_ != null) {
+          updateTime_ =
+            com.google.protobuf.Timestamp.newBuilder(updateTime_).mergeFrom(value).buildPartial();
+        } else {
+          updateTime_ = value;
+        }
+        onChanged();
+      } else {
+        updateTimeBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time when the operation result was last updated.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public Builder clearUpdateTime() {
+      if (updateTimeBuilder_ == null) {
+        updateTime_ = null;
+        onChanged();
+      } else {
+        updateTime_ = null;
+        updateTimeBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The time when the operation result was last updated.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
+      
+      onChanged();
+      return getUpdateTimeFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The time when the operation result was last updated.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
+      if (updateTimeBuilder_ != null) {
+        return updateTimeBuilder_.getMessageOrBuilder();
+      } else {
+        return updateTime_ == null ?
+            com.google.protobuf.Timestamp.getDefaultInstance() : updateTime_;
+      }
+    }
+    /**
+     * 
+     * The time when the operation result was last updated.
+     * 

+     *
+     * .google.protobuf.Timestamp update_time = 6;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
+        getUpdateTimeFieldBuilder() {
+      if (updateTimeBuilder_ == null) {
+        updateTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                getUpdateTime(),
+                getParentForChildren(),
+                isClean());
+        updateTime_ = null;
+      }
+      return updateTimeBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.vision.v1.OperationMetadata)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.vision.v1.OperationMetadata)
+  private static final com.google.cloud.vision.v1.OperationMetadata DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.vision.v1.OperationMetadata();
+  }
+
+  public static com.google.cloud.vision.v1.OperationMetadata getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public OperationMetadata parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new OperationMetadata(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.vision.v1.OperationMetadata getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OperationMetadataOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OperationMetadataOrBuilder.java
new file mode 100644
index 000000000000..a3bbf7700ff5
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OperationMetadataOrBuilder.java
@@ -0,0 +1,76 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+public interface OperationMetadataOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.vision.v1.OperationMetadata)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * Current state of the batch operation.
+   * 

+   *
+   * .google.cloud.vision.v1.OperationMetadata.State state = 1;
+   */
+  int getStateValue();
+  /**
+   * 
+   * Current state of the batch operation.
+   * 

+   *
+   * .google.cloud.vision.v1.OperationMetadata.State state = 1;
+   */
+  com.google.cloud.vision.v1.OperationMetadata.State getState();
+
+  /**
+   * 
+   * The time when the batch request was received.
+   * 

+   *
+   * .google.protobuf.Timestamp create_time = 5;
+   */
+  boolean hasCreateTime();
+  /**
+   * 
+   * The time when the batch request was received.
+   * 

+   *
+   * .google.protobuf.Timestamp create_time = 5;
+   */
+  com.google.protobuf.Timestamp getCreateTime();
+  /**
+   * 
+   * The time when the batch request was received.
+   * 

+   *
+   * .google.protobuf.Timestamp create_time = 5;
+   */
+  com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder();
+
+  /**
+   * 
+   * The time when the operation result was last updated.
+   * 

+   *
+   * .google.protobuf.Timestamp update_time = 6;
+   */
+  boolean hasUpdateTime();
+  /**
+   * 
+   * The time when the operation result was last updated.
+   * 

+   *
+   * .google.protobuf.Timestamp update_time = 6;
+   */
+  com.google.protobuf.Timestamp getUpdateTime();
+  /**
+   * 
+   * The time when the operation result was last updated.
+   * 

+   *
+   * .google.protobuf.Timestamp update_time = 6;
+   */
+  com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OutputConfig.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OutputConfig.java
new file mode 100644
index 000000000000..f6ace2e26a61
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OutputConfig.java
@@ -0,0 +1,732 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+/**
+ * 
+ * The desired output location and metadata.
+ * 

+ *
+ * Protobuf type {@code google.cloud.vision.v1.OutputConfig}
+ */
+public  final class OutputConfig extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.vision.v1.OutputConfig)
+    OutputConfigOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use OutputConfig.newBuilder() to construct.
+  private OutputConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private OutputConfig() {
+    batchSize_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private OutputConfig(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            com.google.cloud.vision.v1.GcsDestination.Builder subBuilder = null;
+            if (gcsDestination_ != null) {
+              subBuilder = gcsDestination_.toBuilder();
+            }
+            gcsDestination_ = input.readMessage(com.google.cloud.vision.v1.GcsDestination.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(gcsDestination_);
+              gcsDestination_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 16: {
+
+            batchSize_ = input.readInt32();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OutputConfig_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OutputConfig_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.vision.v1.OutputConfig.class, com.google.cloud.vision.v1.OutputConfig.Builder.class);
+  }
+
+  public static final int GCS_DESTINATION_FIELD_NUMBER = 1;
+  private com.google.cloud.vision.v1.GcsDestination gcsDestination_;
+  /**
+   * 
+   * The Google Cloud Storage location to write the output(s) to.
+   * 

+   *
+   * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+   */
+  public boolean hasGcsDestination() {
+    return gcsDestination_ != null;
+  }
+  /**
+   * 
+   * The Google Cloud Storage location to write the output(s) to.
+   * 

+   *
+   * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+   */
+  public com.google.cloud.vision.v1.GcsDestination getGcsDestination() {
+    return gcsDestination_ == null ? com.google.cloud.vision.v1.GcsDestination.getDefaultInstance() : gcsDestination_;
+  }
+  /**
+   * 
+   * The Google Cloud Storage location to write the output(s) to.
+   * 

+   *
+   * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+   */
+  public com.google.cloud.vision.v1.GcsDestinationOrBuilder getGcsDestinationOrBuilder() {
+    return getGcsDestination();
+  }
+
+  public static final int BATCH_SIZE_FIELD_NUMBER = 2;
+  private int batchSize_;
+  /**
+   * 
+   * The max number of response protos to put into each output JSON file on
+   * Google Cloud Storage.
+   * The valid range is [1, 100]. If not specified, the default value is 20.
+   * For example, for one pdf file with 100 pages, 100 response protos will
+   * be generated. If `batch_size` = 20, then 5 json files each
+   * containing 20 response protos will be written under the prefix
+   * `gcs_destination`.`uri`.
+   * Currently, batch_size only applies to GcsDestination, with potential future
+   * support for other output configurations.
+   * 

+   *
+   * int32 batch_size = 2;
+   */
+  public int getBatchSize() {
+    return batchSize_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (gcsDestination_ != null) {
+      output.writeMessage(1, getGcsDestination());
+    }
+    if (batchSize_ != 0) {
+      output.writeInt32(2, batchSize_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (gcsDestination_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getGcsDestination());
+    }
+    if (batchSize_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(2, batchSize_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.vision.v1.OutputConfig)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.vision.v1.OutputConfig other = (com.google.cloud.vision.v1.OutputConfig) obj;
+
+    boolean result = true;
+    result = result && (hasGcsDestination() == other.hasGcsDestination());
+    if (hasGcsDestination()) {
+      result = result && getGcsDestination()
+          .equals(other.getGcsDestination());
+    }
+    result = result && (getBatchSize()
+        == other.getBatchSize());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasGcsDestination()) {
+      hash = (37 * hash) + GCS_DESTINATION_FIELD_NUMBER;
+      hash = (53 * hash) + getGcsDestination().hashCode();
+    }
+    hash = (37 * hash) + BATCH_SIZE_FIELD_NUMBER;
+    hash = (53 * hash) + getBatchSize();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.vision.v1.OutputConfig parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.OutputConfig parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.OutputConfig parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.OutputConfig parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.OutputConfig parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.vision.v1.OutputConfig parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.OutputConfig parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.OutputConfig parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.OutputConfig parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.OutputConfig parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.vision.v1.OutputConfig parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.vision.v1.OutputConfig parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.vision.v1.OutputConfig prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
+   * The desired output location and metadata.
+   * 

+   *
+   * Protobuf type {@code google.cloud.vision.v1.OutputConfig}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.vision.v1.OutputConfig)
+      com.google.cloud.vision.v1.OutputConfigOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OutputConfig_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OutputConfig_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.vision.v1.OutputConfig.class, com.google.cloud.vision.v1.OutputConfig.Builder.class);
+    }
+
+    // Construct using com.google.cloud.vision.v1.OutputConfig.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (gcsDestinationBuilder_ == null) {
+        gcsDestination_ = null;
+      } else {
+        gcsDestination_ = null;
+        gcsDestinationBuilder_ = null;
+      }
+      batchSize_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OutputConfig_descriptor;
+    }
+
+    public com.google.cloud.vision.v1.OutputConfig getDefaultInstanceForType() {
+      return com.google.cloud.vision.v1.OutputConfig.getDefaultInstance();
+    }
+
+    public com.google.cloud.vision.v1.OutputConfig build() {
+      com.google.cloud.vision.v1.OutputConfig result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.vision.v1.OutputConfig buildPartial() {
+      com.google.cloud.vision.v1.OutputConfig result = new com.google.cloud.vision.v1.OutputConfig(this);
+      if (gcsDestinationBuilder_ == null) {
+        result.gcsDestination_ = gcsDestination_;
+      } else {
+        result.gcsDestination_ = gcsDestinationBuilder_.build();
+      }
+      result.batchSize_ = batchSize_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.vision.v1.OutputConfig) {
+        return mergeFrom((com.google.cloud.vision.v1.OutputConfig)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.vision.v1.OutputConfig other) {
+      if (other == com.google.cloud.vision.v1.OutputConfig.getDefaultInstance()) return this;
+      if (other.hasGcsDestination()) {
+        mergeGcsDestination(other.getGcsDestination());
+      }
+      if (other.getBatchSize() != 0) {
+        setBatchSize(other.getBatchSize());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.vision.v1.OutputConfig parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.vision.v1.OutputConfig) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.cloud.vision.v1.GcsDestination gcsDestination_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.GcsDestination, com.google.cloud.vision.v1.GcsDestination.Builder, com.google.cloud.vision.v1.GcsDestinationOrBuilder> gcsDestinationBuilder_;
+    /**
+     * 
+     * The Google Cloud Storage location to write the output(s) to.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+     */
+    public boolean hasGcsDestination() {
+      return gcsDestinationBuilder_ != null || gcsDestination_ != null;
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to write the output(s) to.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+     */
+    public com.google.cloud.vision.v1.GcsDestination getGcsDestination() {
+      if (gcsDestinationBuilder_ == null) {
+        return gcsDestination_ == null ? com.google.cloud.vision.v1.GcsDestination.getDefaultInstance() : gcsDestination_;
+      } else {
+        return gcsDestinationBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to write the output(s) to.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+     */
+    public Builder setGcsDestination(com.google.cloud.vision.v1.GcsDestination value) {
+      if (gcsDestinationBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        gcsDestination_ = value;
+        onChanged();
+      } else {
+        gcsDestinationBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to write the output(s) to.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+     */
+    public Builder setGcsDestination(
+        com.google.cloud.vision.v1.GcsDestination.Builder builderForValue) {
+      if (gcsDestinationBuilder_ == null) {
+        gcsDestination_ = builderForValue.build();
+        onChanged();
+      } else {
+        gcsDestinationBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to write the output(s) to.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+     */
+    public Builder mergeGcsDestination(com.google.cloud.vision.v1.GcsDestination value) {
+      if (gcsDestinationBuilder_ == null) {
+        if (gcsDestination_ != null) {
+          gcsDestination_ =
+            com.google.cloud.vision.v1.GcsDestination.newBuilder(gcsDestination_).mergeFrom(value).buildPartial();
+        } else {
+          gcsDestination_ = value;
+        }
+        onChanged();
+      } else {
+        gcsDestinationBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to write the output(s) to.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+     */
+    public Builder clearGcsDestination() {
+      if (gcsDestinationBuilder_ == null) {
+        gcsDestination_ = null;
+        onChanged();
+      } else {
+        gcsDestination_ = null;
+        gcsDestinationBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to write the output(s) to.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+     */
+    public com.google.cloud.vision.v1.GcsDestination.Builder getGcsDestinationBuilder() {
+      
+      onChanged();
+      return getGcsDestinationFieldBuilder().getBuilder();
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to write the output(s) to.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+     */
+    public com.google.cloud.vision.v1.GcsDestinationOrBuilder getGcsDestinationOrBuilder() {
+      if (gcsDestinationBuilder_ != null) {
+        return gcsDestinationBuilder_.getMessageOrBuilder();
+      } else {
+        return gcsDestination_ == null ?
+            com.google.cloud.vision.v1.GcsDestination.getDefaultInstance() : gcsDestination_;
+      }
+    }
+    /**
+     * 
+     * The Google Cloud Storage location to write the output(s) to.
+     * 

+     *
+     * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.vision.v1.GcsDestination, com.google.cloud.vision.v1.GcsDestination.Builder, com.google.cloud.vision.v1.GcsDestinationOrBuilder> 
+        getGcsDestinationFieldBuilder() {
+      if (gcsDestinationBuilder_ == null) {
+        gcsDestinationBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.vision.v1.GcsDestination, com.google.cloud.vision.v1.GcsDestination.Builder, com.google.cloud.vision.v1.GcsDestinationOrBuilder>(
+                getGcsDestination(),
+                getParentForChildren(),
+                isClean());
+        gcsDestination_ = null;
+      }
+      return gcsDestinationBuilder_;
+    }
+
+    private int batchSize_ ;
+    /**
+     * 
+     * The max number of response protos to put into each output JSON file on
+     * Google Cloud Storage.
+     * The valid range is [1, 100]. If not specified, the default value is 20.
+     * For example, for one pdf file with 100 pages, 100 response protos will
+     * be generated. If `batch_size` = 20, then 5 json files each
+     * containing 20 response protos will be written under the prefix
+     * `gcs_destination`.`uri`.
+     * Currently, batch_size only applies to GcsDestination, with potential future
+     * support for other output configurations.
+     * 

+     *
+     * int32 batch_size = 2;
+     */
+    public int getBatchSize() {
+      return batchSize_;
+    }
+    /**
+     * 
+     * The max number of response protos to put into each output JSON file on
+     * Google Cloud Storage.
+     * The valid range is [1, 100]. If not specified, the default value is 20.
+     * For example, for one pdf file with 100 pages, 100 response protos will
+     * be generated. If `batch_size` = 20, then 5 json files each
+     * containing 20 response protos will be written under the prefix
+     * `gcs_destination`.`uri`.
+     * Currently, batch_size only applies to GcsDestination, with potential future
+     * support for other output configurations.
+     * 

+     *
+     * int32 batch_size = 2;
+     */
+    public Builder setBatchSize(int value) {
+      
+      batchSize_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * The max number of response protos to put into each output JSON file on
+     * Google Cloud Storage.
+     * The valid range is [1, 100]. If not specified, the default value is 20.
+     * For example, for one pdf file with 100 pages, 100 response protos will
+     * be generated. If `batch_size` = 20, then 5 json files each
+     * containing 20 response protos will be written under the prefix
+     * `gcs_destination`.`uri`.
+     * Currently, batch_size only applies to GcsDestination, with potential future
+     * support for other output configurations.
+     * 

+     *
+     * int32 batch_size = 2;
+     */
+    public Builder clearBatchSize() {
+      
+      batchSize_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.vision.v1.OutputConfig)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.vision.v1.OutputConfig)
+  private static final com.google.cloud.vision.v1.OutputConfig DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.vision.v1.OutputConfig();
+  }
+
+  public static com.google.cloud.vision.v1.OutputConfig getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public OutputConfig parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new OutputConfig(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.vision.v1.OutputConfig getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OutputConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OutputConfigOrBuilder.java
new file mode 100644
index 000000000000..b277bf822a99
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OutputConfigOrBuilder.java
@@ -0,0 +1,51 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/vision/v1/image_annotator.proto
+
+package com.google.cloud.vision.v1;
+
+public interface OutputConfigOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.vision.v1.OutputConfig)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
+   * The Google Cloud Storage location to write the output(s) to.
+   * 

+   *
+   * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+   */
+  boolean hasGcsDestination();
+  /**
+   * 
+   * The Google Cloud Storage location to write the output(s) to.
+   * 

+   *
+   * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+   */
+  com.google.cloud.vision.v1.GcsDestination getGcsDestination();
+  /**
+   * 
+   * The Google Cloud Storage location to write the output(s) to.
+   * 

+   *
+   * .google.cloud.vision.v1.GcsDestination gcs_destination = 1;
+   */
+  com.google.cloud.vision.v1.GcsDestinationOrBuilder getGcsDestinationOrBuilder();
+
+  /**
+   * 
+   * The max number of response protos to put into each output JSON file on
+   * Google Cloud Storage.
+   * The valid range is [1, 100]. If not specified, the default value is 20.
+   * For example, for one pdf file with 100 pages, 100 response protos will
+   * be generated. If `batch_size` = 20, then 5 json files each
+   * containing 20 response protos will be written under the prefix
+   * `gcs_destination`.`uri`.
+   * Currently, batch_size only applies to GcsDestination, with potential future
+   * support for other output configurations.
+   * 

+   *
+   * int32 batch_size = 2;
+   */
+  int getBatchSize();
+}
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Page.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Page.java
index de5c7ac3c5dc..582de7e24420 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Page.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Page.java
@@ -159,7 +159,8 @@ public com.google.cloud.vision.v1.TextAnnotation.TextPropertyOrBuilder getProper
   private int width_;
   /**
    * 
-   * Page width in pixels.
+   * Page width. For PDFs the unit is points. For images (including
+   * TIFFs) the unit is pixels.
    * 

    *
    * int32 width = 2;
@@ -172,7 +173,8 @@ public int getWidth() {
   private int height_;
   /**
    * 
-   * Page height in pixels.
+   * Page height. For PDFs the unit is points. For images (including
+   * TIFFs) the unit is pixels.
    * 

    *
    * int32 height = 3;
@@ -818,7 +820,8 @@ public com.google.cloud.vision.v1.TextAnnotation.TextPropertyOrBuilder getProper
     private int width_ ;
     /**
      * 
-     * Page width in pixels.
+     * Page width. For PDFs the unit is points. For images (including
+     * TIFFs) the unit is pixels.
      * 

      *
      * int32 width = 2;
@@ -828,7 +831,8 @@ public int getWidth() {
     }
     /**
      * 
-     * Page width in pixels.
+     * Page width. For PDFs the unit is points. For images (including
+     * TIFFs) the unit is pixels.
      * 

      *
      * int32 width = 2;
@@ -841,7 +845,8 @@ public Builder setWidth(int value) {
     }
     /**
      * 
-     * Page width in pixels.
+     * Page width. For PDFs the unit is points. For images (including
+     * TIFFs) the unit is pixels.
      * 

      *
      * int32 width = 2;
@@ -856,7 +861,8 @@ public Builder clearWidth() {
     private int height_ ;
     /**
      * 
-     * Page height in pixels.
+     * Page height. For PDFs the unit is points. For images (including
+     * TIFFs) the unit is pixels.
      * 

      *
      * int32 height = 3;
@@ -866,7 +872,8 @@ public int getHeight() {
     }
     /**
      * 
-     * Page height in pixels.
+     * Page height. For PDFs the unit is points. For images (including
+     * TIFFs) the unit is pixels.
      * 

      *
      * int32 height = 3;
@@ -879,7 +886,8 @@ public Builder setHeight(int value) {
     }
     /**
      * 
-     * Page height in pixels.
+     * Page height. For PDFs the unit is points. For images (including
+     * TIFFs) the unit is pixels.
      * 

      *
      * int32 height = 3;
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/PageOrBuilder.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/PageOrBuilder.java
index b81ac9d3c65e..47b44e264bd9 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/PageOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/PageOrBuilder.java
@@ -34,7 +34,8 @@ public interface PageOrBuilder extends
 
   /**
    * 
-   * Page width in pixels.
+   * Page width. For PDFs the unit is points. For images (including
+   * TIFFs) the unit is pixels.
    * 

    *
    * int32 width = 2;
@@ -43,7 +44,8 @@ public interface PageOrBuilder extends
 
   /**
    * 
-   * Page height in pixels.
+   * Page height. For PDFs the unit is points. For images (including
+   * TIFFs) the unit is pixels.
    * 

    *
    * int32 height = 3;
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/geometry.proto b/google-api-grpc/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/geometry.proto
index c1b35a940133..8470002875c3 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/geometry.proto
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/geometry.proto
@@ -33,10 +33,24 @@ message Vertex {
   int32 y = 2;
 }
 
+// A vertex represents a 2D point in the image.
+// NOTE: the normalized vertex coordinates are relative to the original image
+// and range from 0 to 1.
+message NormalizedVertex {
+  // X coordinate.
+  float x = 1;
+
+  // Y coordinate.
+  float y = 2;
+};
+
 // A bounding polygon for the detected image annotation.
 message BoundingPoly {
   // The bounding polygon vertices.
   repeated Vertex vertices = 1;
+
+  // The bounding polygon normalized vertices.
+  repeated NormalizedVertex normalized_vertices = 2;
 }
 
 // A 3D position in the image, used primarily for Face detection landmarks.
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/image_annotator.proto b/google-api-grpc/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/image_annotator.proto
index 3978db04ebee..21db4c41e897 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/image_annotator.proto
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/image_annotator.proto
@@ -20,6 +20,8 @@ import "google/api/annotations.proto";
 import "google/cloud/vision/v1/geometry.proto";
 import "google/cloud/vision/v1/text_annotation.proto";
 import "google/cloud/vision/v1/web_detection.proto";
+import "google/longrunning/operations.proto";
+import "google/protobuf/timestamp.proto";
 import "google/rpc/status.proto";
 import "google/type/color.proto";
 import "google/type/latlng.proto";
@@ -37,7 +39,24 @@ option java_package = "com.google.cloud.vision.v1";
 service ImageAnnotator {
   // Run image detection and annotation for a batch of images.
   rpc BatchAnnotateImages(BatchAnnotateImagesRequest) returns (BatchAnnotateImagesResponse) {
-    option (google.api.http) = { post: "/v1/images:annotate" body: "*" };
+    option (google.api.http) = {
+      post: "/v1/images:annotate"
+      body: "*"
+    };
+  }
+
+  // Run asynchronous image detection and annotation for a list of generic
+  // files, such as PDF files, which may contain multiple pages and multiple
+  // images per page. Progress and results can be retrieved through the
+  // `google.longrunning.Operations` interface.
+  // `Operation.metadata` contains `OperationMetadata` (metadata).
+  // `Operation.response` contains `AsyncBatchAnnotateFilesResponse` (results).
+  rpc AsyncBatchAnnotateFiles(AsyncBatchAnnotateFilesRequest)
+      returns (google.longrunning.Operation) {
+    option (google.api.http) = {
+      post: "/v1/files:asyncBatchAnnotate"
+      body: "*"
+    };
   }
 }
 
@@ -492,7 +511,7 @@ message WebDetectionParams {
 
 // Image context and/or feature-specific parameters.
 message ImageContext {
-  // lat/long rectangle that specifies the location of the image.
+  // Not used.
   LatLongRect lat_long_rect = 1;
 
   // List of languages to use for TEXT_DETECTION. In most cases, an empty value
@@ -525,6 +544,17 @@ message AnnotateImageRequest {
   ImageContext image_context = 3;
 }
 
+// If an image was produced from a file (e.g. a PDF), this message gives
+// information about the source of that image.
+message ImageAnnotationContext {
+  // The URI of the file used to produce the image.
+  string uri = 1;
+
+  // If the file was a PDF or TIFF, this field gives the page number within
+  // the file used to produce the image.
+  int32 page_number = 2;
+}
+
 // Response to an image annotation request.
 message AnnotateImageResponse {
   // If present, face detection has completed successfully.
@@ -564,6 +594,20 @@ message AnnotateImageResponse {
   // Note that filled-in image annotations are guaranteed to be
   // correct, even when `error` is set.
   google.rpc.Status error = 9;
+
+  // If present, contextual information is needed to understand where this image
+  // comes from.
+  ImageAnnotationContext context = 21;
+}
+
+// Response to a single file annotation request. A file may contain one or more
+// images, which individually have their own responses.
+message AnnotateFileResponse {
+  // Information about the file for which this response is generated.
+  InputConfig input_config = 1;
+
+  // Individual responses to images found within the file.
+  repeated AnnotateImageResponse responses = 2;
 }
 
 // Multiple image annotation requests are batched into a single service call.
@@ -578,6 +622,127 @@ message BatchAnnotateImagesResponse {
   repeated AnnotateImageResponse responses = 1;
 }
 
+// An offline file annotation request.
+message AsyncAnnotateFileRequest {
+  // Required. Information about the input file.
+  InputConfig input_config = 1;
+
+  // Required. Requested features.
+  repeated Feature features = 2;
+
+  // Additional context that may accompany the image(s) in the file.
+  ImageContext image_context = 3;
+
+  // Required. The desired output location and metadata (e.g. format).
+  OutputConfig output_config = 4;
+}
+
+// The response for a single offline file annotation request.
+message AsyncAnnotateFileResponse {
+  // The output location and metadata from AsyncAnnotateFileRequest.
+  OutputConfig output_config = 1;
+}
+
+// Multiple async file annotation requests are batched into a single service
+// call.
+message AsyncBatchAnnotateFilesRequest {
+  // Individual async file annotation requests for this batch.
+  repeated AsyncAnnotateFileRequest requests = 1;
+}
+
+// Response to an async batch file annotation request.
+message AsyncBatchAnnotateFilesResponse {
+  // The list of file annotation responses, one for each request in
+  // AsyncBatchAnnotateFilesRequest.
+  repeated AsyncAnnotateFileResponse responses = 1;
+}
+
+// The desired input location and metadata.
+message InputConfig {
+  // The Google Cloud Storage location to read the input from.
+  GcsSource gcs_source = 1;
+
+  // The type of the file. Currently only "application/pdf" and "image/tiff"
+  // are supported. Wildcards are not supported.
+  string mime_type = 2;
+}
+
+// The desired output location and metadata.
+message OutputConfig {
+  // The Google Cloud Storage location to write the output(s) to.
+  GcsDestination gcs_destination = 1;
+
+  // The max number of response protos to put into each output JSON file on
+  // Google Cloud Storage.
+  // The valid range is [1, 100]. If not specified, the default value is 20.
+  //
+  // For example, for one pdf file with 100 pages, 100 response protos will
+  // be generated. If `batch_size` = 20, then 5 json files each
+  // containing 20 response protos will be written under the prefix
+  // `gcs_destination`.`uri`.
+  //
+  // Currently, batch_size only applies to GcsDestination, with potential future
+  // support for other output configurations.
+  int32 batch_size = 2;
+}
+
+// The Google Cloud Storage location where the input will be read from.
+message GcsSource {
+  // Google Cloud Storage URI for the input file. This must only be a
+  // Google Cloud Storage object. Wildcards are not currently supported.
+  string uri = 1;
+}
+
+// The Google Cloud Storage location where the output will be written to.
+message GcsDestination {
+  // Google Cloud Storage URI where the results will be stored. Results will
+  // be in JSON format and preceded by its corresponding input URI. This field
+  // can either represent a single file, or a prefix for multiple outputs.
+  // Prefixes must end in a `/`.
+  //
+  // Examples:
+  //
+  // *    File: gs://bucket-name/filename.json
+  // *    Prefix: gs://bucket-name/prefix/here/
+  // *    File: gs://bucket-name/prefix/here
+  //
+  // If multiple outputs, each response is still AnnotateFileResponse, each of
+  // which contains some subset of the full list of AnnotateImageResponse.
+  // Multiple outputs can happen if, for example, the output JSON is too large
+  // and overflows into multiple sharded files.
+  string uri = 1;
+}
+
+// Contains metadata for the BatchAnnotateImages operation.
+message OperationMetadata {
+  // Batch operation states.
+  enum State {
+    // Invalid.
+    STATE_UNSPECIFIED = 0;
+
+    // Request is received.
+    CREATED = 1;
+
+    // Request is actively being processed.
+    RUNNING = 2;
+
+    // The batch processing is done.
+    DONE = 3;
+
+    // The batch processing was cancelled.
+    CANCELLED = 4;
+  }
+
+  // Current state of the batch operation.
+  State state = 1;
+
+  // The time when the batch request was received.
+  google.protobuf.Timestamp create_time = 5;
+
+  // The time when the operation result was last updated.
+  google.protobuf.Timestamp update_time = 6;
+}
+
 // A bucketized representation of likelihood, which is intended to give clients
 // highly stable results across model upgrades.
 enum Likelihood {
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/text_annotation.proto b/google-api-grpc/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/text_annotation.proto
index bf825d59b5ad..714b57e17125 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/text_annotation.proto
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/text_annotation.proto
@@ -97,10 +97,12 @@ message Page {
   // Additional information detected on the page.
   TextAnnotation.TextProperty property = 1;
 
-  // Page width in pixels.
+  // Page width. For PDFs the unit is points. For images (including
+  // TIFFs) the unit is pixels.
   int32 width = 2;
 
-  // Page height in pixels.
+  // Page height. For PDFs the unit is points. For images (including
+  // TIFFs) the unit is pixels.
   int32 height = 3;
 
   // List of blocks of text, images etc on this page.
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
index 6d21909cbe79..14661ebff117 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
@@ -28,4 +28,4 @@
       compile
     
   
-
+
\ No newline at end of file
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index 619d9479698e..b469435083c6 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -394,16 +394,6 @@
         0.47.1-beta-SNAPSHOT
         test-jar
       
-      
-        com.google.api.grpc
-        proto-google-cloud-dlp-v2beta1
-        0.12.1-SNAPSHOT
-      
-      
-        com.google.api.grpc
-        grpc-google-cloud-dlp-v2beta1
-        0.12.1-SNAPSHOT
-      
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2
@@ -901,13 +891,13 @@
       
       
         com.google.api.grpc
-        proto-google-cloud-cloudiot-v1
-        0.12.1-SNAPSHOT
+        proto-google-cloud-iot-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
-        grpc-google-cloud-cloudiot-v1
-        0.12.1-SNAPSHOT
+        grpc-google-cloud-iot-v1
+        0.12.1-SNAPSHOT
       
       
         com.google.api.grpc
diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceCallableFactory.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceCallableFactory.java
index d1df3a741bfc..279f20a71d4f 100644
--- a/google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/main/java/com/google/cloud/bigquery/datatransfer/v1/stub/GrpcDataTransferServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
index 4c4b3c400999..e50a09b1c0be 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
@@ -203,6 +203,8 @@ public BigtableInstanceAdminStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -234,6 +236,8 @@ public final OperationsClient getOperationsClient() {
    *     must be left blank. Currently exactly one cluster must be specified.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createInstanceAsync(
       ProjectName parent, String instanceId, Instance instance, Map clusters) {
 
@@ -274,6 +278,8 @@ public final OperationFuture createInstanceAsy
    *     must be left blank. Currently exactly one cluster must be specified.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createInstanceAsync(
       String parent, String instanceId, Instance instance, Map clusters) {
 
@@ -312,6 +318,8 @@ public final OperationFuture createInstanceAsy
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createInstanceAsync(
       CreateInstanceRequest request) {
     return createInstanceOperationCallable().futureCall(request);
@@ -341,6 +349,7 @@ public final OperationFuture createInstanceAsy
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       createInstanceOperationCallable() {
     return stub.createInstanceOperationCallable();
@@ -579,6 +588,8 @@ public final UnaryCallable listInst
    *     set.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture partialUpdateInstanceAsync(
       Instance instance, FieldMask updateMask) {
 
@@ -611,6 +622,8 @@ public final OperationFuture partialUpdateInst
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture partialUpdateInstanceAsync(
       PartialUpdateInstanceRequest request) {
     return partialUpdateInstanceOperationCallable().futureCall(request);
@@ -636,6 +649,7 @@ public final OperationFuture partialUpdateInst
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       partialUpdateInstanceOperationCallable() {
     return stub.partialUpdateInstanceOperationCallable();
@@ -780,6 +794,8 @@ public final UnaryCallable deleteInstanceCallable(
    * @param cluster The cluster to be created. Fields marked `OutputOnly` must be left blank.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createClusterAsync(
       InstanceName parent, String clusterId, Cluster cluster) {
 
@@ -814,6 +830,8 @@ public final OperationFuture createClusterAsync(
    * @param cluster The cluster to be created. Fields marked `OutputOnly` must be left blank.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createClusterAsync(
       String parent, String clusterId, Cluster cluster) {
 
@@ -849,6 +867,8 @@ public final OperationFuture createClusterAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createClusterAsync(
       CreateClusterRequest request) {
     return createClusterOperationCallable().futureCall(request);
@@ -876,6 +896,7 @@ public final OperationFuture createClusterAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       createClusterOperationCallable() {
     return stub.createClusterOperationCallable();
@@ -1120,6 +1141,8 @@ public final UnaryCallable listCluste
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture updateClusterAsync(Cluster request) {
     return updateClusterOperationCallable().futureCall(request);
   }
@@ -1146,6 +1169,7 @@ public final OperationFuture updateClusterAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       updateClusterOperationCallable() {
     return stub.updateClusterOperationCallable();
@@ -1706,6 +1730,8 @@ public final ListAppProfilesPagedResponse listAppProfiles(ListAppProfilesRequest
    *     fields will be replaced.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture updateAppProfileAsync(
       AppProfile appProfile, FieldMask updateMask) {
 
@@ -1743,6 +1769,8 @@ public final OperationFuture updateAppProf
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture updateAppProfileAsync(
       UpdateAppProfileRequest request) {
     return updateAppProfileOperationCallable().futureCall(request);
@@ -1773,6 +1801,7 @@ public final OperationFuture updateAppProf
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       updateAppProfileOperationCallable() {
     return stub.updateAppProfileOperationCallable();
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java
index 54463a4ecafd..be3c9e201fc9 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java
@@ -101,6 +101,8 @@ public UnaryCallSettings createInstanceSetting
   }
 
   /** Returns the object with the settings used for calls to createInstance. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       createInstanceOperationSettings() {
     return ((BigtableInstanceAdminStubSettings) getStubSettings())
@@ -124,6 +126,8 @@ public UnaryCallSettings listInstan
   }
 
   /** Returns the object with the settings used for calls to partialUpdateInstance. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       partialUpdateInstanceOperationSettings() {
     return ((BigtableInstanceAdminStubSettings) getStubSettings())
@@ -141,6 +145,8 @@ public UnaryCallSettings createClusterSettings(
   }
 
   /** Returns the object with the settings used for calls to createCluster. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       createClusterOperationSettings() {
     return ((BigtableInstanceAdminStubSettings) getStubSettings()).createClusterOperationSettings();
@@ -162,6 +168,8 @@ public UnaryCallSettings updateClusterSettings() {
   }
 
   /** Returns the object with the settings used for calls to updateCluster. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       updateClusterOperationSettings() {
     return ((BigtableInstanceAdminStubSettings) getStubSettings()).updateClusterOperationSettings();
@@ -195,6 +203,8 @@ public UnaryCallSettings updateAppProfileSet
   }
 
   /** Returns the object with the settings used for calls to updateAppProfile. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       updateAppProfileOperationSettings() {
     return ((BigtableInstanceAdminStubSettings) getStubSettings())
@@ -326,6 +336,8 @@ public UnaryCallSettings.Builder createInstanc
     }
 
     /** Returns the builder for the settings used for calls to createInstance. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createInstanceOperationSettings() {
       return getStubSettingsBuilder().createInstanceOperationSettings();
@@ -349,6 +361,8 @@ public UnaryCallSettings.Builder getInstanceSettin
     }
 
     /** Returns the builder for the settings used for calls to partialUpdateInstance. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             PartialUpdateInstanceRequest, Instance, UpdateInstanceMetadata>
         partialUpdateInstanceOperationSettings() {
@@ -366,6 +380,8 @@ public UnaryCallSettings.Builder createClusterS
     }
 
     /** Returns the builder for the settings used for calls to createCluster. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createClusterOperationSettings() {
       return getStubSettingsBuilder().createClusterOperationSettings();
@@ -388,6 +404,8 @@ public UnaryCallSettings.Builder updateClusterSettings() {
     }
 
     /** Returns the builder for the settings used for calls to updateCluster. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         updateClusterOperationSettings() {
       return getStubSettingsBuilder().updateClusterOperationSettings();
@@ -423,6 +441,8 @@ public UnaryCallSettings.Builder getAppProfile
     }
 
     /** Returns the builder for the settings used for calls to updateAppProfile. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             UpdateAppProfileRequest, AppProfile, UpdateAppProfileMetadata>
         updateAppProfileOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
index 13723c290e5c..07fac64c4f88 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
@@ -195,6 +195,8 @@ public BigtableTableAdminStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -352,6 +354,8 @@ public final UnaryCallable createTableCallable() {
    *     `projects/<project>/instances/<instance>/clusters/<cluster>/snapshots/<snapshot>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createTableFromSnapshotAsync(
       InstanceName parent, String tableId, SnapshotName sourceSnapshot) {
 
@@ -394,6 +398,8 @@ public final OperationFuture createTable
    *     `projects/<project>/instances/<instance>/clusters/<cluster>/snapshots/<snapshot>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createTableFromSnapshotAsync(
       String parent, String tableId, String sourceSnapshot) {
 
@@ -435,6 +441,8 @@ public final OperationFuture createTable
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createTableFromSnapshotAsync(
       CreateTableFromSnapshotRequest request) {
     return createTableFromSnapshotOperationCallable().futureCall(request);
@@ -468,6 +476,7 @@ public final OperationFuture createTable
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable<
           CreateTableFromSnapshotRequest, Table, CreateTableFromSnapshotMetadata>
       createTableFromSnapshotOperationCallable() {
@@ -1277,6 +1286,8 @@ public final CheckConsistencyResponse checkConsistency(CheckConsistencyRequest r
    * @param description Description of the snapshot.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture snapshotTableAsync(
       TableName name, ClusterName cluster, SnapshotName snapshotId, String description) {
 
@@ -1322,6 +1333,8 @@ public final OperationFuture snapshotTableAsync
    * @param description Description of the snapshot.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture snapshotTableAsync(
       String name, String cluster, String snapshotId, String description) {
 
@@ -1366,6 +1379,8 @@ public final OperationFuture snapshotTableAsync
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture snapshotTableAsync(
       SnapshotTableRequest request) {
     return snapshotTableOperationCallable().futureCall(request);
@@ -1401,6 +1416,7 @@ public final OperationFuture snapshotTableAsync
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       snapshotTableOperationCallable() {
     return stub.snapshotTableOperationCallable();
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
index 549efc4fd9a4..ef3e2f867530 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
@@ -99,6 +99,8 @@ public UnaryCallSettings createTableSettings() {
   }
 
   /** Returns the object with the settings used for calls to createTableFromSnapshot. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings<
           CreateTableFromSnapshotRequest, Table, CreateTableFromSnapshotMetadata>
       createTableFromSnapshotOperationSettings() {
@@ -150,6 +152,8 @@ public UnaryCallSettings snapshotTableSettings(
   }
 
   /** Returns the object with the settings used for calls to snapshotTable. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       snapshotTableOperationSettings() {
     return ((BigtableTableAdminStubSettings) getStubSettings()).snapshotTableOperationSettings();
@@ -280,6 +284,8 @@ public UnaryCallSettings.Builder createTableSettings(
     }
 
     /** Returns the builder for the settings used for calls to createTableFromSnapshot. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             CreateTableFromSnapshotRequest, Table, CreateTableFromSnapshotMetadata>
         createTableFromSnapshotOperationSettings() {
@@ -332,6 +338,8 @@ public UnaryCallSettings.Builder snapshotTableS
     }
 
     /** Returns the builder for the settings used for calls to snapshotTable. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         snapshotTableOperationSettings() {
       return getStubSettingsBuilder().snapshotTableOperationSettings();
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java
index 473c4624e22d..aaccdb4d5045 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java
@@ -66,10 +66,12 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class BigtableInstanceAdminStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       createInstanceOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: createInstanceOperationCallable()");
@@ -87,6 +89,7 @@ public UnaryCallable listInstancesC
     throw new UnsupportedOperationException("Not implemented: listInstancesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       partialUpdateInstanceOperationCallable() {
     throw new UnsupportedOperationException(
@@ -101,6 +104,7 @@ public UnaryCallable deleteInstanceCallable() {
     throw new UnsupportedOperationException("Not implemented: deleteInstanceCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       createClusterOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: createClusterOperationCallable()");
@@ -118,6 +122,7 @@ public UnaryCallable listClustersCall
     throw new UnsupportedOperationException("Not implemented: listClustersCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       updateClusterOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: updateClusterOperationCallable()");
@@ -148,6 +153,7 @@ public UnaryCallable listAppPro
     throw new UnsupportedOperationException("Not implemented: listAppProfilesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       updateAppProfileOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: updateAppProfileOperationCallable()");
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
index 91970f6cf56b..c24aa6a73ea8 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStubSettings.java
@@ -169,6 +169,7 @@ public UnaryCallSettings createInstanceSetting
   }
 
   /** Returns the object with the settings used for calls to createInstance. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       createInstanceOperationSettings() {
     return createInstanceOperationSettings;
@@ -191,6 +192,7 @@ public UnaryCallSettings listInstan
   }
 
   /** Returns the object with the settings used for calls to partialUpdateInstance. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       partialUpdateInstanceOperationSettings() {
     return partialUpdateInstanceOperationSettings;
@@ -207,6 +209,7 @@ public UnaryCallSettings createClusterSettings(
   }
 
   /** Returns the object with the settings used for calls to createCluster. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       createClusterOperationSettings() {
     return createClusterOperationSettings;
@@ -228,6 +231,7 @@ public UnaryCallSettings updateClusterSettings() {
   }
 
   /** Returns the object with the settings used for calls to updateCluster. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       updateClusterOperationSettings() {
     return updateClusterOperationSettings;
@@ -261,6 +265,7 @@ public UnaryCallSettings updateAppProfileSet
   }
 
   /** Returns the object with the settings used for calls to updateAppProfile. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       updateAppProfileOperationSettings() {
     return updateAppProfileOperationSettings;
@@ -888,6 +893,8 @@ public UnaryCallSettings.Builder createInstanc
     }
 
     /** Returns the builder for the settings used for calls to createInstance. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createInstanceOperationSettings() {
       return createInstanceOperationSettings;
@@ -911,6 +918,8 @@ public UnaryCallSettings.Builder getInstanceSettin
     }
 
     /** Returns the builder for the settings used for calls to partialUpdateInstance. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             PartialUpdateInstanceRequest, Instance, UpdateInstanceMetadata>
         partialUpdateInstanceOperationSettings() {
@@ -928,6 +937,8 @@ public UnaryCallSettings.Builder createClusterS
     }
 
     /** Returns the builder for the settings used for calls to createCluster. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createClusterOperationSettings() {
       return createClusterOperationSettings;
@@ -950,6 +961,8 @@ public UnaryCallSettings.Builder updateClusterSettings() {
     }
 
     /** Returns the builder for the settings used for calls to updateCluster. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         updateClusterOperationSettings() {
       return updateClusterOperationSettings;
@@ -985,6 +998,8 @@ public UnaryCallSettings.Builder getAppProfile
     }
 
     /** Returns the builder for the settings used for calls to updateAppProfile. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             UpdateAppProfileRequest, AppProfile, UpdateAppProfileMetadata>
         updateAppProfileOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
index fb77fa19a55f..f1a4d26078e4 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java
@@ -58,6 +58,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class BigtableTableAdminStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -66,6 +67,7 @@ public UnaryCallable createTableCallable() {
     throw new UnsupportedOperationException("Not implemented: createTableCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       createTableFromSnapshotOperationCallable() {
     throw new UnsupportedOperationException(
@@ -111,6 +113,7 @@ public UnaryCallable dropRowRangeCallable() {
     throw new UnsupportedOperationException("Not implemented: checkConsistencyCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       snapshotTableOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: snapshotTableOperationCallable()");
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
index b8450494aa27..1713def0773c 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java
@@ -156,6 +156,7 @@ public UnaryCallSettings createTableSettings() {
   }
 
   /** Returns the object with the settings used for calls to createTableFromSnapshot. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings<
           CreateTableFromSnapshotRequest, Table, CreateTableFromSnapshotMetadata>
       createTableFromSnapshotOperationSettings() {
@@ -206,6 +207,7 @@ public UnaryCallSettings snapshotTableSettings(
   }
 
   /** Returns the object with the settings used for calls to snapshotTable. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       snapshotTableOperationSettings() {
     return snapshotTableOperationSettings;
@@ -754,6 +756,8 @@ public UnaryCallSettings.Builder createTableSettings(
     }
 
     /** Returns the builder for the settings used for calls to createTableFromSnapshot. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             CreateTableFromSnapshotRequest, Table, CreateTableFromSnapshotMetadata>
         createTableFromSnapshotOperationSettings() {
@@ -806,6 +810,8 @@ public UnaryCallSettings.Builder snapshotTableS
     }
 
     /** Returns the builder for the settings used for calls to snapshotTable. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         snapshotTableOperationSettings() {
       return snapshotTableOperationSettings;
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java
index 6ab24bfc5469..db114a739fdf 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
index d522df2fff3f..82c29c13b08e 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java
@@ -647,10 +647,12 @@ public Map extract(TestIamPermissionsRequest request) {
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       createInstanceOperationCallable() {
     return createInstanceOperationCallable;
@@ -668,6 +670,7 @@ public UnaryCallable listInstancesC
     return listInstancesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       partialUpdateInstanceOperationCallable() {
     return partialUpdateInstanceOperationCallable;
@@ -681,6 +684,7 @@ public UnaryCallable deleteInstanceCallable() {
     return deleteInstanceCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       createClusterOperationCallable() {
     return createClusterOperationCallable;
@@ -698,6 +702,7 @@ public UnaryCallable listClustersCall
     return listClustersCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       updateClusterOperationCallable() {
     return updateClusterOperationCallable;
@@ -728,6 +733,7 @@ public UnaryCallable listAppPro
     return listAppProfilesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       updateAppProfileOperationCallable() {
     return updateAppProfileOperationCallable;
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java
index 95f4eb2ff199..909ef138a617 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
index 233c7d453aea..8313842143d6 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java
@@ -494,6 +494,7 @@ public Map extract(DeleteSnapshotRequest request) {
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -502,6 +503,7 @@ public UnaryCallable createTableCallable() {
     return createTableCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       createTableFromSnapshotOperationCallable() {
     return createTableFromSnapshotOperationCallable;
@@ -546,6 +548,7 @@ public UnaryCallable dropRowRangeCallable() {
     return checkConsistencyCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       snapshotTableOperationCallable() {
     return snapshotTableOperationCallable;
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableCallableFactory.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableCallableFactory.java
index 1940ec35ae00..3ca32d14cb25 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableCallableFactory.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java
index 24408ba65a92..8196e08725cc 100644
--- a/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java
+++ b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java
index a4a59275800a..6557032e4c05 100644
--- a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java
+++ b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java
@@ -168,6 +168,8 @@ public ClusterControllerStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -193,6 +195,8 @@ public final OperationsClient getOperationsClient() {
    * @param cluster Required. The cluster to create.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createClusterAsync(
       String projectId, String region, Cluster cluster) {
 
@@ -228,6 +232,8 @@ public final OperationFuture createClusterAsy
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createClusterAsync(
       CreateClusterRequest request) {
     return createClusterOperationCallable().futureCall(request);
@@ -255,6 +261,7 @@ public final OperationFuture createClusterAsy
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       createClusterOperationCallable() {
     return stub.createClusterOperationCallable();
@@ -313,6 +320,8 @@ public final UnaryCallable createClusterCallabl
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture updateClusterAsync(
       UpdateClusterRequest request) {
     return updateClusterOperationCallable().futureCall(request);
@@ -344,6 +353,7 @@ public final OperationFuture updateClusterAsy
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       updateClusterOperationCallable() {
     return stub.updateClusterOperationCallable();
@@ -400,6 +410,8 @@ public final UnaryCallable updateClusterCallabl
    * @param clusterName Required. The cluster name.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture deleteClusterAsync(
       String projectId, String region, String clusterName) {
 
@@ -435,6 +447,8 @@ public final OperationFuture deleteClusterAsync
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture deleteClusterAsync(
       DeleteClusterRequest request) {
     return deleteClusterOperationCallable().futureCall(request);
@@ -462,6 +476,7 @@ public final OperationFuture deleteClusterAsync
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       deleteClusterOperationCallable() {
     return stub.deleteClusterOperationCallable();
@@ -714,6 +729,8 @@ public final UnaryCallable listCluste
    * @param clusterName Required. The cluster name.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture diagnoseClusterAsync(
       String projectId, String region, String clusterName) {
 
@@ -750,6 +767,8 @@ public final OperationFuture diagnoseClusterAsync
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture diagnoseClusterAsync(
       DiagnoseClusterRequest request) {
     return diagnoseClusterOperationCallable().futureCall(request);
@@ -778,6 +797,7 @@ public final OperationFuture diagnoseClusterAsync
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       diagnoseClusterOperationCallable() {
     return stub.diagnoseClusterOperationCallable();
diff --git a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java
index 3b6e7ec6cce8..da346afa0a14 100644
--- a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java
+++ b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerSettings.java
@@ -71,6 +71,8 @@ public UnaryCallSettings createClusterSettings(
   }
 
   /** Returns the object with the settings used for calls to createCluster. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       createClusterOperationSettings() {
     return ((ClusterControllerStubSettings) getStubSettings()).createClusterOperationSettings();
@@ -82,6 +84,8 @@ public UnaryCallSettings updateClusterSettings(
   }
 
   /** Returns the object with the settings used for calls to updateCluster. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       updateClusterOperationSettings() {
     return ((ClusterControllerStubSettings) getStubSettings()).updateClusterOperationSettings();
@@ -93,6 +97,8 @@ public UnaryCallSettings deleteClusterSettings(
   }
 
   /** Returns the object with the settings used for calls to deleteCluster. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       deleteClusterOperationSettings() {
     return ((ClusterControllerStubSettings) getStubSettings()).deleteClusterOperationSettings();
@@ -115,6 +121,8 @@ public UnaryCallSettings diagnoseClusterSetti
   }
 
   /** Returns the object with the settings used for calls to diagnoseCluster. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       diagnoseClusterOperationSettings() {
     return ((ClusterControllerStubSettings) getStubSettings()).diagnoseClusterOperationSettings();
@@ -223,6 +231,8 @@ public UnaryCallSettings.Builder createClusterS
     }
 
     /** Returns the builder for the settings used for calls to createCluster. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createClusterOperationSettings() {
       return getStubSettingsBuilder().createClusterOperationSettings();
@@ -234,6 +244,8 @@ public UnaryCallSettings.Builder updateClusterS
     }
 
     /** Returns the builder for the settings used for calls to updateCluster. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         updateClusterOperationSettings() {
       return getStubSettingsBuilder().updateClusterOperationSettings();
@@ -245,6 +257,8 @@ public UnaryCallSettings.Builder deleteClusterS
     }
 
     /** Returns the builder for the settings used for calls to deleteCluster. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         deleteClusterOperationSettings() {
       return getStubSettingsBuilder().deleteClusterOperationSettings();
@@ -268,6 +282,8 @@ public UnaryCallSettings.Builder diagnoseClus
     }
 
     /** Returns the builder for the settings used for calls to diagnoseCluster. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         diagnoseClusterOperationSettings() {
       return getStubSettingsBuilder().diagnoseClusterOperationSettings();
diff --git a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStub.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStub.java
index 59e3c9f72187..b50c37666113 100644
--- a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStub.java
+++ b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStub.java
@@ -46,10 +46,12 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class ClusterControllerStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       createClusterOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: createClusterOperationCallable()");
@@ -59,6 +61,7 @@ public UnaryCallable createClusterCallable() {
     throw new UnsupportedOperationException("Not implemented: createClusterCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       updateClusterOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: updateClusterOperationCallable()");
@@ -68,6 +71,7 @@ public UnaryCallable updateClusterCallable() {
     throw new UnsupportedOperationException("Not implemented: updateClusterCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       deleteClusterOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: deleteClusterOperationCallable()");
@@ -89,6 +93,7 @@ public UnaryCallable listClustersCall
     throw new UnsupportedOperationException("Not implemented: listClustersCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       diagnoseClusterOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: diagnoseClusterOperationCallable()");
diff --git a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
index 1a67a5c9dfbe..85b2d5e65b39 100644
--- a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
+++ b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
@@ -120,6 +120,7 @@ public UnaryCallSettings createClusterSettings(
   }
 
   /** Returns the object with the settings used for calls to createCluster. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       createClusterOperationSettings() {
     return createClusterOperationSettings;
@@ -131,6 +132,7 @@ public UnaryCallSettings updateClusterSettings(
   }
 
   /** Returns the object with the settings used for calls to updateCluster. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       updateClusterOperationSettings() {
     return updateClusterOperationSettings;
@@ -142,6 +144,7 @@ public UnaryCallSettings deleteClusterSettings(
   }
 
   /** Returns the object with the settings used for calls to deleteCluster. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       deleteClusterOperationSettings() {
     return deleteClusterOperationSettings;
@@ -164,6 +167,7 @@ public UnaryCallSettings diagnoseClusterSetti
   }
 
   /** Returns the object with the settings used for calls to diagnoseCluster. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       diagnoseClusterOperationSettings() {
     return diagnoseClusterOperationSettings;
@@ -581,6 +585,8 @@ public UnaryCallSettings.Builder createClusterS
     }
 
     /** Returns the builder for the settings used for calls to createCluster. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createClusterOperationSettings() {
       return createClusterOperationSettings;
@@ -592,6 +598,8 @@ public UnaryCallSettings.Builder updateClusterS
     }
 
     /** Returns the builder for the settings used for calls to updateCluster. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         updateClusterOperationSettings() {
       return updateClusterOperationSettings;
@@ -603,6 +611,8 @@ public UnaryCallSettings.Builder deleteClusterS
     }
 
     /** Returns the builder for the settings used for calls to deleteCluster. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         deleteClusterOperationSettings() {
       return deleteClusterOperationSettings;
@@ -626,6 +636,8 @@ public UnaryCallSettings.Builder diagnoseClus
     }
 
     /** Returns the builder for the settings used for calls to diagnoseCluster. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         diagnoseClusterOperationSettings() {
       return diagnoseClusterOperationSettings;
diff --git a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerCallableFactory.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerCallableFactory.java
index 083602d293db..7f395b7574bf 100644
--- a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java
index 3776d2a67920..8096ad9d00c4 100644
--- a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java
+++ b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcClusterControllerStub.java
@@ -243,10 +243,12 @@ protected GrpcClusterControllerStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       createClusterOperationCallable() {
     return createClusterOperationCallable;
@@ -256,6 +258,7 @@ public UnaryCallable createClusterCallable() {
     return createClusterCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       updateClusterOperationCallable() {
     return updateClusterOperationCallable;
@@ -265,6 +268,7 @@ public UnaryCallable updateClusterCallable() {
     return updateClusterCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       deleteClusterOperationCallable() {
     return deleteClusterOperationCallable;
@@ -286,6 +290,7 @@ public UnaryCallable listClustersCall
     return listClustersCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       diagnoseClusterOperationCallable() {
     return diagnoseClusterOperationCallable;
diff --git a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerCallableFactory.java b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerCallableFactory.java
index d3de83649fb8..824370dc9aaf 100644
--- a/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/GrpcJobControllerCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java
index 81f30e7a0999..a4b7270dbfe9 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java
@@ -185,6 +185,8 @@ public AgentsStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -458,6 +460,8 @@ public final UnaryCallable searchAgen
    *     `projects/<Project ID>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture trainAgentAsync(ProjectName parent) {
 
     TrainAgentRequest request =
@@ -485,6 +489,8 @@ public final OperationFuture trainAgentAsync(ProjectName parent)
    *     `projects/<Project ID>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture trainAgentAsync(String parent) {
 
     TrainAgentRequest request = TrainAgentRequest.newBuilder().setParent(parent).build();
@@ -513,6 +519,8 @@ public final OperationFuture trainAgentAsync(String parent) {
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   private final OperationFuture trainAgentAsync(TrainAgentRequest request) {
     return trainAgentOperationCallable().futureCall(request);
   }
@@ -538,6 +546,7 @@ private final OperationFuture trainAgentAsync(TrainAgentRequest r
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable trainAgentOperationCallable() {
     return stub.trainAgentOperationCallable();
   }
@@ -588,6 +597,8 @@ public final UnaryCallable trainAgentCallable() {
    *     `projects/<Project ID>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture exportAgentAsync(ProjectName parent) {
 
     ExportAgentRequest request =
@@ -618,6 +629,8 @@ public final OperationFuture exportAgentAsync(Proje
    *     `projects/<Project ID>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture exportAgentAsync(String parent) {
 
     ExportAgentRequest request = ExportAgentRequest.newBuilder().setParent(parent).build();
@@ -647,6 +660,8 @@ public final OperationFuture exportAgentAsync(Strin
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture exportAgentAsync(
       ExportAgentRequest request) {
     return exportAgentOperationCallable().futureCall(request);
@@ -674,6 +689,7 @@ public final OperationFuture exportAgentAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       exportAgentOperationCallable() {
     return stub.exportAgentOperationCallable();
@@ -730,6 +746,8 @@ public final UnaryCallable exportAgentCallable()
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture importAgentAsync(ImportAgentRequest request) {
     return importAgentOperationCallable().futureCall(request);
   }
@@ -758,6 +776,7 @@ public final OperationFuture importAgentAsync(ImportAgentRequest
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable importAgentOperationCallable() {
     return stub.importAgentOperationCallable();
   }
@@ -815,6 +834,8 @@ public final UnaryCallable importAgentCallable()
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture restoreAgentAsync(RestoreAgentRequest request) {
     return restoreAgentOperationCallable().futureCall(request);
   }
@@ -843,6 +864,7 @@ public final OperationFuture restoreAgentAsync(RestoreAgentReques
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       restoreAgentOperationCallable() {
     return stub.restoreAgentOperationCallable();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java
index e8bbd8545218..fbcaedbdf6d8 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java
@@ -83,6 +83,8 @@ public UnaryCallSettings trainAgentSettings() {
   }
 
   /** Returns the object with the settings used for calls to trainAgent. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings trainAgentOperationSettings() {
     return ((AgentsStubSettings) getStubSettings()).trainAgentOperationSettings();
   }
@@ -93,6 +95,8 @@ public UnaryCallSettings exportAgentSettings() {
   }
 
   /** Returns the object with the settings used for calls to exportAgent. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       exportAgentOperationSettings() {
     return ((AgentsStubSettings) getStubSettings()).exportAgentOperationSettings();
@@ -104,6 +108,8 @@ public UnaryCallSettings importAgentSettings() {
   }
 
   /** Returns the object with the settings used for calls to importAgent. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings importAgentOperationSettings() {
     return ((AgentsStubSettings) getStubSettings()).importAgentOperationSettings();
   }
@@ -114,6 +120,8 @@ public UnaryCallSettings restoreAgentSettings()
   }
 
   /** Returns the object with the settings used for calls to restoreAgent. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings restoreAgentOperationSettings() {
     return ((AgentsStubSettings) getStubSettings()).restoreAgentOperationSettings();
   }
@@ -232,6 +240,8 @@ public UnaryCallSettings.Builder trainAgentSetting
     }
 
     /** Returns the builder for the settings used for calls to trainAgent. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         trainAgentOperationSettings() {
       return getStubSettingsBuilder().trainAgentOperationSettings();
@@ -243,6 +253,8 @@ public UnaryCallSettings.Builder exportAgentSetti
     }
 
     /** Returns the builder for the settings used for calls to exportAgent. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         exportAgentOperationSettings() {
       return getStubSettingsBuilder().exportAgentOperationSettings();
@@ -254,6 +266,8 @@ public UnaryCallSettings.Builder importAgentSetti
     }
 
     /** Returns the builder for the settings used for calls to importAgent. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         importAgentOperationSettings() {
       return getStubSettingsBuilder().importAgentOperationSettings();
@@ -265,6 +279,8 @@ public UnaryCallSettings.Builder restoreAgentSet
     }
 
     /** Returns the builder for the settings used for calls to restoreAgent. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         restoreAgentOperationSettings() {
       return getStubSettingsBuilder().restoreAgentOperationSettings();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java
index 3e8fa7eccf62..68359602ee1f 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java
@@ -189,6 +189,8 @@ public EntityTypesStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -935,6 +937,8 @@ public final UnaryCallable deleteEntityTypeCalla
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateEntityTypesAsync(
       BatchUpdateEntityTypesRequest request) {
     return batchUpdateEntityTypesOperationCallable().futureCall(request);
@@ -962,6 +966,7 @@ public final OperationFuture batchUpdate
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable<
           BatchUpdateEntityTypesRequest, BatchUpdateEntityTypesResponse, Struct>
       batchUpdateEntityTypesOperationCallable() {
@@ -1018,6 +1023,8 @@ public final OperationFuture batchUpdate
    *     same agent as `parent`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntityTypesAsync(
       ProjectAgentName parent, List entityTypeNames) {
 
@@ -1052,6 +1059,8 @@ public final OperationFuture batchDeleteEntityTypesAsync(
    *     same agent as `parent`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntityTypesAsync(
       String parent, List entityTypeNames) {
 
@@ -1087,6 +1096,8 @@ public final OperationFuture batchDeleteEntityTypesAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntityTypesAsync(
       BatchDeleteEntityTypesRequest request) {
     return batchDeleteEntityTypesOperationCallable().futureCall(request);
@@ -1115,6 +1126,7 @@ public final OperationFuture batchDeleteEntityTypesAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       batchDeleteEntityTypesOperationCallable() {
     return stub.batchDeleteEntityTypesOperationCallable();
@@ -1170,6 +1182,8 @@ public final OperationFuture batchDeleteEntityTypesAsync(
    * @param entities Required. The collection of entities to create.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchCreateEntitiesAsync(
       EntityTypeName parent, List entities) {
 
@@ -1203,6 +1217,8 @@ public final OperationFuture batchCreateEntitiesAsync(
    * @param entities Required. The collection of entities to create.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchCreateEntitiesAsync(
       String parent, List entities) {
 
@@ -1238,6 +1254,8 @@ public final OperationFuture batchCreateEntitiesAsync(
    *     must be enabled in the agent, before they can be used.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchCreateEntitiesAsync(
       EntityTypeName parent, List entities, String languageCode) {
 
@@ -1277,6 +1295,8 @@ public final OperationFuture batchCreateEntitiesAsync(
    *     must be enabled in the agent, before they can be used.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchCreateEntitiesAsync(
       String parent, List entities, String languageCode) {
 
@@ -1313,6 +1333,8 @@ public final OperationFuture batchCreateEntitiesAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchCreateEntitiesAsync(
       BatchCreateEntitiesRequest request) {
     return batchCreateEntitiesOperationCallable().futureCall(request);
@@ -1341,6 +1363,7 @@ public final OperationFuture batchCreateEntitiesAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       batchCreateEntitiesOperationCallable() {
     return stub.batchCreateEntitiesOperationCallable();
@@ -1395,6 +1418,8 @@ public final UnaryCallable batchCreateEnt
    * @param entities Required. The collection of new entities to replace the existing entities.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateEntitiesAsync(
       EntityTypeName parent, List entities) {
 
@@ -1428,6 +1453,8 @@ public final OperationFuture batchUpdateEntitiesAsync(
    * @param entities Required. The collection of new entities to replace the existing entities.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateEntitiesAsync(
       String parent, List entities) {
 
@@ -1463,6 +1490,8 @@ public final OperationFuture batchUpdateEntitiesAsync(
    *     must be enabled in the agent, before they can be used.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateEntitiesAsync(
       EntityTypeName parent, List entities, String languageCode) {
 
@@ -1502,6 +1531,8 @@ public final OperationFuture batchUpdateEntitiesAsync(
    *     must be enabled in the agent, before they can be used.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateEntitiesAsync(
       String parent, List entities, String languageCode) {
 
@@ -1538,6 +1569,8 @@ public final OperationFuture batchUpdateEntitiesAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateEntitiesAsync(
       BatchUpdateEntitiesRequest request) {
     return batchUpdateEntitiesOperationCallable().futureCall(request);
@@ -1566,6 +1599,7 @@ public final OperationFuture batchUpdateEntitiesAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       batchUpdateEntitiesOperationCallable() {
     return stub.batchUpdateEntitiesOperationCallable();
@@ -1621,6 +1655,8 @@ public final UnaryCallable batchUpdateEnt
    *     are not fully-qualified names, i.e. they don't start with `projects/<Project ID>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntitiesAsync(
       EntityTypeName parent, List entityValues) {
 
@@ -1655,6 +1691,8 @@ public final OperationFuture batchDeleteEntitiesAsync(
    *     are not fully-qualified names, i.e. they don't start with `projects/<Project ID>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntitiesAsync(
       String parent, List entityValues) {
 
@@ -1694,6 +1732,8 @@ public final OperationFuture batchDeleteEntitiesAsync(
    *     must be enabled in the agent, before they can be used.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntitiesAsync(
       EntityTypeName parent, List entityValues, String languageCode) {
 
@@ -1734,6 +1774,8 @@ public final OperationFuture batchDeleteEntitiesAsync(
    *     must be enabled in the agent, before they can be used.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntitiesAsync(
       String parent, List entityValues, String languageCode) {
 
@@ -1770,6 +1812,8 @@ public final OperationFuture batchDeleteEntitiesAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntitiesAsync(
       BatchDeleteEntitiesRequest request) {
     return batchDeleteEntitiesOperationCallable().futureCall(request);
@@ -1798,6 +1842,7 @@ public final OperationFuture batchDeleteEntitiesAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       batchDeleteEntitiesOperationCallable() {
     return stub.batchDeleteEntitiesOperationCallable();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesSettings.java
index cb15281745c8..b4a1b64dc267 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesSettings.java
@@ -100,6 +100,8 @@ public UnaryCallSettings deleteEntityTypeSetting
   }
 
   /** Returns the object with the settings used for calls to batchUpdateEntityTypes. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings<
           BatchUpdateEntityTypesRequest, BatchUpdateEntityTypesResponse, Struct>
       batchUpdateEntityTypesOperationSettings() {
@@ -113,6 +115,8 @@ public UnaryCallSettings deleteEntityTypeSetting
   }
 
   /** Returns the object with the settings used for calls to batchDeleteEntityTypes. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       batchDeleteEntityTypesOperationSettings() {
     return ((EntityTypesStubSettings) getStubSettings()).batchDeleteEntityTypesOperationSettings();
@@ -124,6 +128,8 @@ public UnaryCallSettings batchCreateEntit
   }
 
   /** Returns the object with the settings used for calls to batchCreateEntities. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       batchCreateEntitiesOperationSettings() {
     return ((EntityTypesStubSettings) getStubSettings()).batchCreateEntitiesOperationSettings();
@@ -135,6 +141,8 @@ public UnaryCallSettings batchUpdateEntit
   }
 
   /** Returns the object with the settings used for calls to batchUpdateEntities. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       batchUpdateEntitiesOperationSettings() {
     return ((EntityTypesStubSettings) getStubSettings()).batchUpdateEntitiesOperationSettings();
@@ -146,6 +154,8 @@ public UnaryCallSettings batchDeleteEntit
   }
 
   /** Returns the object with the settings used for calls to batchDeleteEntities. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       batchDeleteEntitiesOperationSettings() {
     return ((EntityTypesStubSettings) getStubSettings()).batchDeleteEntitiesOperationSettings();
@@ -283,6 +293,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchUpdateEntityTypes. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             BatchUpdateEntityTypesRequest, BatchUpdateEntityTypesResponse, Struct>
         batchUpdateEntityTypesOperationSettings() {
@@ -296,6 +308,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchDeleteEntityTypes. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchDeleteEntityTypesOperationSettings() {
       return getStubSettingsBuilder().batchDeleteEntityTypesOperationSettings();
@@ -308,6 +322,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchCreateEntities. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchCreateEntitiesOperationSettings() {
       return getStubSettingsBuilder().batchCreateEntitiesOperationSettings();
@@ -320,6 +336,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchUpdateEntities. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchUpdateEntitiesOperationSettings() {
       return getStubSettingsBuilder().batchUpdateEntitiesOperationSettings();
@@ -332,6 +350,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchDeleteEntities. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchDeleteEntitiesOperationSettings() {
       return getStubSettingsBuilder().batchDeleteEntitiesOperationSettings();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java
index 4236f07e4b52..d9d5f7e62fdf 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java
@@ -190,6 +190,8 @@ public IntentsStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -945,6 +947,8 @@ public final UnaryCallable deleteIntentCallable() {
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateIntentsAsync(
       BatchUpdateIntentsRequest request) {
     return batchUpdateIntentsOperationCallable().futureCall(request);
@@ -973,6 +977,7 @@ public final OperationFuture batchUpdateInte
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       batchUpdateIntentsOperationCallable() {
     return stub.batchUpdateIntentsOperationCallable();
@@ -1027,6 +1032,8 @@ public final UnaryCallable batchUpdateInte
    *     in.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteIntentsAsync(
       ProjectAgentName parent, List intents) {
 
@@ -1060,6 +1067,8 @@ public final OperationFuture batchDeleteIntentsAsync(
    *     in.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteIntentsAsync(
       String parent, List intents) {
 
@@ -1091,6 +1100,8 @@ public final OperationFuture batchDeleteIntentsAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteIntentsAsync(
       BatchDeleteIntentsRequest request) {
     return batchDeleteIntentsOperationCallable().futureCall(request);
@@ -1118,6 +1129,7 @@ public final OperationFuture batchDeleteIntentsAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       batchDeleteIntentsOperationCallable() {
     return stub.batchDeleteIntentsOperationCallable();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsSettings.java
index 9aaec3c7295d..19503dbc022d 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsSettings.java
@@ -98,6 +98,8 @@ public UnaryCallSettings batchUpdateIntent
   }
 
   /** Returns the object with the settings used for calls to batchUpdateIntents. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       batchUpdateIntentsOperationSettings() {
     return ((IntentsStubSettings) getStubSettings()).batchUpdateIntentsOperationSettings();
@@ -109,6 +111,8 @@ public UnaryCallSettings batchDeleteIntent
   }
 
   /** Returns the object with the settings used for calls to batchDeleteIntents. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       batchDeleteIntentsOperationSettings() {
     return ((IntentsStubSettings) getStubSettings()).batchDeleteIntentsOperationSettings();
@@ -244,6 +248,8 @@ public UnaryCallSettings.Builder deleteIntentSetting
     }
 
     /** Returns the builder for the settings used for calls to batchUpdateIntents. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             BatchUpdateIntentsRequest, BatchUpdateIntentsResponse, Struct>
         batchUpdateIntentsOperationSettings() {
@@ -257,6 +263,8 @@ public UnaryCallSettings.Builder deleteIntentSetting
     }
 
     /** Returns the builder for the settings used for calls to batchDeleteIntents. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchDeleteIntentsOperationSettings() {
       return getStubSettingsBuilder().batchDeleteIntentsOperationSettings();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java
index e74de468836b..2590b644249d 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java
@@ -46,6 +46,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class AgentsStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -62,6 +63,7 @@ public UnaryCallable searchAgentsCall
     throw new UnsupportedOperationException("Not implemented: searchAgentsCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable trainAgentOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: trainAgentOperationCallable()");
   }
@@ -70,6 +72,7 @@ public UnaryCallable trainAgentCallable() {
     throw new UnsupportedOperationException("Not implemented: trainAgentCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       exportAgentOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: exportAgentOperationCallable()");
@@ -79,6 +82,7 @@ public UnaryCallable exportAgentCallable() {
     throw new UnsupportedOperationException("Not implemented: exportAgentCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable importAgentOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: importAgentOperationCallable()");
   }
@@ -87,6 +91,7 @@ public UnaryCallable importAgentCallable() {
     throw new UnsupportedOperationException("Not implemented: importAgentCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable restoreAgentOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: restoreAgentOperationCallable()");
   }
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java
index 7d6d7911b17a..0a2c3699c540 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java
@@ -130,6 +130,7 @@ public UnaryCallSettings trainAgentSettings() {
   }
 
   /** Returns the object with the settings used for calls to trainAgent. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings trainAgentOperationSettings() {
     return trainAgentOperationSettings;
   }
@@ -140,6 +141,7 @@ public UnaryCallSettings exportAgentSettings() {
   }
 
   /** Returns the object with the settings used for calls to exportAgent. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       exportAgentOperationSettings() {
     return exportAgentOperationSettings;
@@ -151,6 +153,7 @@ public UnaryCallSettings importAgentSettings() {
   }
 
   /** Returns the object with the settings used for calls to importAgent. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings importAgentOperationSettings() {
     return importAgentOperationSettings;
   }
@@ -161,6 +164,7 @@ public UnaryCallSettings restoreAgentSettings()
   }
 
   /** Returns the object with the settings used for calls to restoreAgent. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings restoreAgentOperationSettings() {
     return restoreAgentOperationSettings;
   }
@@ -580,6 +584,8 @@ public UnaryCallSettings.Builder trainAgentSetting
     }
 
     /** Returns the builder for the settings used for calls to trainAgent. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         trainAgentOperationSettings() {
       return trainAgentOperationSettings;
@@ -591,6 +597,8 @@ public UnaryCallSettings.Builder exportAgentSetti
     }
 
     /** Returns the builder for the settings used for calls to exportAgent. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         exportAgentOperationSettings() {
       return exportAgentOperationSettings;
@@ -602,6 +610,8 @@ public UnaryCallSettings.Builder importAgentSetti
     }
 
     /** Returns the builder for the settings used for calls to importAgent. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         importAgentOperationSettings() {
       return importAgentOperationSettings;
@@ -613,6 +623,8 @@ public UnaryCallSettings.Builder restoreAgentSet
     }
 
     /** Returns the builder for the settings used for calls to restoreAgent. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         restoreAgentOperationSettings() {
       return restoreAgentOperationSettings;
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStub.java
index bd9aaf796880..b3e26e770a59 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStub.java
@@ -50,6 +50,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class EntityTypesStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -79,6 +80,7 @@ public UnaryCallable deleteEntityTypeCallable()
     throw new UnsupportedOperationException("Not implemented: deleteEntityTypeCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchUpdateEntityTypesOperationCallable() {
     throw new UnsupportedOperationException(
@@ -89,6 +91,7 @@ public UnaryCallable batchUpdateEntity
     throw new UnsupportedOperationException("Not implemented: batchUpdateEntityTypesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchDeleteEntityTypesOperationCallable() {
     throw new UnsupportedOperationException(
@@ -99,6 +102,7 @@ public UnaryCallable batchDeleteEntity
     throw new UnsupportedOperationException("Not implemented: batchDeleteEntityTypesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchCreateEntitiesOperationCallable() {
     throw new UnsupportedOperationException(
@@ -109,6 +113,7 @@ public UnaryCallable batchCreateEntitiesC
     throw new UnsupportedOperationException("Not implemented: batchCreateEntitiesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchUpdateEntitiesOperationCallable() {
     throw new UnsupportedOperationException(
@@ -119,6 +124,7 @@ public UnaryCallable batchUpdateEntitiesC
     throw new UnsupportedOperationException("Not implemented: batchUpdateEntitiesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchDeleteEntitiesOperationCallable() {
     throw new UnsupportedOperationException(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java
index 63eab4ab18cd..894cae3c3d8a 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/EntityTypesStubSettings.java
@@ -164,6 +164,7 @@ public UnaryCallSettings deleteEntityTypeSetting
   }
 
   /** Returns the object with the settings used for calls to batchUpdateEntityTypes. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings<
           BatchUpdateEntityTypesRequest, BatchUpdateEntityTypesResponse, Struct>
       batchUpdateEntityTypesOperationSettings() {
@@ -177,6 +178,7 @@ public UnaryCallSettings deleteEntityTypeSetting
   }
 
   /** Returns the object with the settings used for calls to batchDeleteEntityTypes. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       batchDeleteEntityTypesOperationSettings() {
     return batchDeleteEntityTypesOperationSettings;
@@ -188,6 +190,7 @@ public UnaryCallSettings batchCreateEntit
   }
 
   /** Returns the object with the settings used for calls to batchCreateEntities. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       batchCreateEntitiesOperationSettings() {
     return batchCreateEntitiesOperationSettings;
@@ -199,6 +202,7 @@ public UnaryCallSettings batchUpdateEntit
   }
 
   /** Returns the object with the settings used for calls to batchUpdateEntities. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       batchUpdateEntitiesOperationSettings() {
     return batchUpdateEntitiesOperationSettings;
@@ -210,6 +214,7 @@ public UnaryCallSettings batchDeleteEntit
   }
 
   /** Returns the object with the settings used for calls to batchDeleteEntities. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       batchDeleteEntitiesOperationSettings() {
     return batchDeleteEntitiesOperationSettings;
@@ -752,6 +757,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchUpdateEntityTypes. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             BatchUpdateEntityTypesRequest, BatchUpdateEntityTypesResponse, Struct>
         batchUpdateEntityTypesOperationSettings() {
@@ -765,6 +772,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchDeleteEntityTypes. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchDeleteEntityTypesOperationSettings() {
       return batchDeleteEntityTypesOperationSettings;
@@ -777,6 +786,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchCreateEntities. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchCreateEntitiesOperationSettings() {
       return batchCreateEntitiesOperationSettings;
@@ -789,6 +800,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchUpdateEntities. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchUpdateEntitiesOperationSettings() {
       return batchUpdateEntitiesOperationSettings;
@@ -801,6 +814,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchDeleteEntities. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchDeleteEntitiesOperationSettings() {
       return batchDeleteEntitiesOperationSettings;
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsCallableFactory.java
index 746ef93d2b01..1abd43d88db3 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java
index d8e1a330b344..2370136ec49e 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java
@@ -228,6 +228,7 @@ protected GrpcAgentsStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -244,6 +245,7 @@ public UnaryCallable searchAgentsCall
     return searchAgentsCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable trainAgentOperationCallable() {
     return trainAgentOperationCallable;
   }
@@ -252,6 +254,7 @@ public UnaryCallable trainAgentCallable() {
     return trainAgentCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       exportAgentOperationCallable() {
     return exportAgentOperationCallable;
@@ -261,6 +264,7 @@ public UnaryCallable exportAgentCallable() {
     return exportAgentCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable importAgentOperationCallable() {
     return importAgentOperationCallable;
   }
@@ -269,6 +273,7 @@ public UnaryCallable importAgentCallable() {
     return importAgentCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable restoreAgentOperationCallable() {
     return restoreAgentOperationCallable;
   }
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsCallableFactory.java
index 36652044b421..7e106cdbe48a 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcContextsCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesCallableFactory.java
index 90b69220ef49..f21c1414fb7e 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesStub.java
index 3b3d666cdecf..3b4f8aaa8893 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcEntityTypesStub.java
@@ -341,6 +341,7 @@ protected GrpcEntityTypesStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -370,6 +371,7 @@ public UnaryCallable deleteEntityTypeCallable()
     return deleteEntityTypeCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchUpdateEntityTypesOperationCallable() {
     return batchUpdateEntityTypesOperationCallable;
@@ -379,6 +381,7 @@ public UnaryCallable batchUpdateEntity
     return batchUpdateEntityTypesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchDeleteEntityTypesOperationCallable() {
     return batchDeleteEntityTypesOperationCallable;
@@ -388,6 +391,7 @@ public UnaryCallable batchDeleteEntity
     return batchDeleteEntityTypesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchCreateEntitiesOperationCallable() {
     return batchCreateEntitiesOperationCallable;
@@ -397,6 +401,7 @@ public UnaryCallable batchCreateEntitiesC
     return batchCreateEntitiesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchUpdateEntitiesOperationCallable() {
     return batchUpdateEntitiesOperationCallable;
@@ -406,6 +411,7 @@ public UnaryCallable batchUpdateEntitiesC
     return batchUpdateEntitiesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchDeleteEntitiesOperationCallable() {
     return batchDeleteEntitiesOperationCallable;
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsCallableFactory.java
index 172ff0e0b32c..eb4cf23f5fac 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsStub.java
index 124e63e676ba..63e843b6d59a 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcIntentsStub.java
@@ -238,6 +238,7 @@ protected GrpcIntentsStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -266,6 +267,7 @@ public UnaryCallable deleteIntentCallable() {
     return deleteIntentCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchUpdateIntentsOperationCallable() {
     return batchUpdateIntentsOperationCallable;
@@ -275,6 +277,7 @@ public UnaryCallable batchUpdateIntentsCal
     return batchUpdateIntentsCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchDeleteIntentsOperationCallable() {
     return batchDeleteIntentsOperationCallable;
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesCallableFactory.java
index 0cb5ba7889ba..dc16a421fc7b 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionEntityTypesCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsCallableFactory.java
index e8441107fdd5..134072196528 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcSessionsCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStub.java
index 8552affb6d43..3952a17ffdc5 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStub.java
@@ -47,6 +47,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class IntentsStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -75,6 +76,7 @@ public UnaryCallable deleteIntentCallable() {
     throw new UnsupportedOperationException("Not implemented: deleteIntentCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchUpdateIntentsOperationCallable() {
     throw new UnsupportedOperationException(
@@ -85,6 +87,7 @@ public UnaryCallable batchUpdateIntentsCal
     throw new UnsupportedOperationException("Not implemented: batchUpdateIntentsCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchDeleteIntentsOperationCallable() {
     throw new UnsupportedOperationException(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java
index d92a01838600..d5b02b07e881 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/IntentsStubSettings.java
@@ -143,6 +143,7 @@ public UnaryCallSettings batchUpdateIntent
   }
 
   /** Returns the object with the settings used for calls to batchUpdateIntents. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       batchUpdateIntentsOperationSettings() {
     return batchUpdateIntentsOperationSettings;
@@ -154,6 +155,7 @@ public UnaryCallSettings batchDeleteIntent
   }
 
   /** Returns the object with the settings used for calls to batchDeleteIntents. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       batchDeleteIntentsOperationSettings() {
     return batchDeleteIntentsOperationSettings;
@@ -555,6 +557,8 @@ public UnaryCallSettings.Builder deleteIntentSetting
     }
 
     /** Returns the builder for the settings used for calls to batchUpdateIntents. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             BatchUpdateIntentsRequest, BatchUpdateIntentsResponse, Struct>
         batchUpdateIntentsOperationSettings() {
@@ -568,6 +572,8 @@ public UnaryCallSettings.Builder deleteIntentSetting
     }
 
     /** Returns the builder for the settings used for calls to batchDeleteIntents. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchDeleteIntentsOperationSettings() {
       return batchDeleteIntentsOperationSettings;
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java
index 7de000e5b96a..f8735431acb8 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java
@@ -185,6 +185,8 @@ public AgentsStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -458,6 +460,8 @@ public final UnaryCallable searchAgen
    *     `projects/<Project ID>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture trainAgentAsync(ProjectName parent) {
 
     TrainAgentRequest request =
@@ -485,6 +489,8 @@ public final OperationFuture trainAgentAsync(ProjectName parent)
    *     `projects/<Project ID>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture trainAgentAsync(String parent) {
 
     TrainAgentRequest request = TrainAgentRequest.newBuilder().setParent(parent).build();
@@ -513,6 +519,8 @@ public final OperationFuture trainAgentAsync(String parent) {
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   private final OperationFuture trainAgentAsync(TrainAgentRequest request) {
     return trainAgentOperationCallable().futureCall(request);
   }
@@ -538,6 +546,7 @@ private final OperationFuture trainAgentAsync(TrainAgentRequest r
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable trainAgentOperationCallable() {
     return stub.trainAgentOperationCallable();
   }
@@ -588,6 +597,8 @@ public final UnaryCallable trainAgentCallable() {
    *     `projects/<Project ID>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture exportAgentAsync(ProjectName parent) {
 
     ExportAgentRequest request =
@@ -618,6 +629,8 @@ public final OperationFuture exportAgentAsync(Proje
    *     `projects/<Project ID>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture exportAgentAsync(String parent) {
 
     ExportAgentRequest request = ExportAgentRequest.newBuilder().setParent(parent).build();
@@ -647,6 +660,8 @@ public final OperationFuture exportAgentAsync(Strin
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture exportAgentAsync(
       ExportAgentRequest request) {
     return exportAgentOperationCallable().futureCall(request);
@@ -674,6 +689,7 @@ public final OperationFuture exportAgentAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       exportAgentOperationCallable() {
     return stub.exportAgentOperationCallable();
@@ -730,6 +746,8 @@ public final UnaryCallable exportAgentCallable()
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture importAgentAsync(ImportAgentRequest request) {
     return importAgentOperationCallable().futureCall(request);
   }
@@ -758,6 +776,7 @@ public final OperationFuture importAgentAsync(ImportAgentRequest
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable importAgentOperationCallable() {
     return stub.importAgentOperationCallable();
   }
@@ -815,6 +834,8 @@ public final UnaryCallable importAgentCallable()
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture restoreAgentAsync(RestoreAgentRequest request) {
     return restoreAgentOperationCallable().futureCall(request);
   }
@@ -843,6 +864,7 @@ public final OperationFuture restoreAgentAsync(RestoreAgentReques
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       restoreAgentOperationCallable() {
     return stub.restoreAgentOperationCallable();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java
index 3e75caa65a4d..a4a34c7fc860 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java
@@ -83,6 +83,8 @@ public UnaryCallSettings trainAgentSettings() {
   }
 
   /** Returns the object with the settings used for calls to trainAgent. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings trainAgentOperationSettings() {
     return ((AgentsStubSettings) getStubSettings()).trainAgentOperationSettings();
   }
@@ -93,6 +95,8 @@ public UnaryCallSettings exportAgentSettings() {
   }
 
   /** Returns the object with the settings used for calls to exportAgent. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       exportAgentOperationSettings() {
     return ((AgentsStubSettings) getStubSettings()).exportAgentOperationSettings();
@@ -104,6 +108,8 @@ public UnaryCallSettings importAgentSettings() {
   }
 
   /** Returns the object with the settings used for calls to importAgent. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings importAgentOperationSettings() {
     return ((AgentsStubSettings) getStubSettings()).importAgentOperationSettings();
   }
@@ -114,6 +120,8 @@ public UnaryCallSettings restoreAgentSettings()
   }
 
   /** Returns the object with the settings used for calls to restoreAgent. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings restoreAgentOperationSettings() {
     return ((AgentsStubSettings) getStubSettings()).restoreAgentOperationSettings();
   }
@@ -232,6 +240,8 @@ public UnaryCallSettings.Builder trainAgentSetting
     }
 
     /** Returns the builder for the settings used for calls to trainAgent. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         trainAgentOperationSettings() {
       return getStubSettingsBuilder().trainAgentOperationSettings();
@@ -243,6 +253,8 @@ public UnaryCallSettings.Builder exportAgentSetti
     }
 
     /** Returns the builder for the settings used for calls to exportAgent. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         exportAgentOperationSettings() {
       return getStubSettingsBuilder().exportAgentOperationSettings();
@@ -254,6 +266,8 @@ public UnaryCallSettings.Builder importAgentSetti
     }
 
     /** Returns the builder for the settings used for calls to importAgent. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         importAgentOperationSettings() {
       return getStubSettingsBuilder().importAgentOperationSettings();
@@ -265,6 +279,8 @@ public UnaryCallSettings.Builder restoreAgentSet
     }
 
     /** Returns the builder for the settings used for calls to restoreAgent. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         restoreAgentOperationSettings() {
       return getStubSettingsBuilder().restoreAgentOperationSettings();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java
index 7cfa0fd4c924..4f2be73334fd 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java
@@ -189,6 +189,8 @@ public EntityTypesStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -935,6 +937,8 @@ public final UnaryCallable deleteEntityTypeCalla
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateEntityTypesAsync(
       BatchUpdateEntityTypesRequest request) {
     return batchUpdateEntityTypesOperationCallable().futureCall(request);
@@ -962,6 +966,7 @@ public final OperationFuture batchUpdate
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable<
           BatchUpdateEntityTypesRequest, BatchUpdateEntityTypesResponse, Struct>
       batchUpdateEntityTypesOperationCallable() {
@@ -1018,6 +1023,8 @@ public final OperationFuture batchUpdate
    *     same agent as `parent`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntityTypesAsync(
       ProjectAgentName parent, List entityTypeNames) {
 
@@ -1052,6 +1059,8 @@ public final OperationFuture batchDeleteEntityTypesAsync(
    *     same agent as `parent`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntityTypesAsync(
       String parent, List entityTypeNames) {
 
@@ -1087,6 +1096,8 @@ public final OperationFuture batchDeleteEntityTypesAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntityTypesAsync(
       BatchDeleteEntityTypesRequest request) {
     return batchDeleteEntityTypesOperationCallable().futureCall(request);
@@ -1115,6 +1126,7 @@ public final OperationFuture batchDeleteEntityTypesAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       batchDeleteEntityTypesOperationCallable() {
     return stub.batchDeleteEntityTypesOperationCallable();
@@ -1170,6 +1182,8 @@ public final OperationFuture batchDeleteEntityTypesAsync(
    * @param entities Required. The collection of entities to create.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchCreateEntitiesAsync(
       EntityTypeName parent, List entities) {
 
@@ -1203,6 +1217,8 @@ public final OperationFuture batchCreateEntitiesAsync(
    * @param entities Required. The collection of entities to create.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchCreateEntitiesAsync(
       String parent, List entities) {
 
@@ -1238,6 +1254,8 @@ public final OperationFuture batchCreateEntitiesAsync(
    *     must be enabled in the agent, before they can be used.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchCreateEntitiesAsync(
       EntityTypeName parent, List entities, String languageCode) {
 
@@ -1277,6 +1295,8 @@ public final OperationFuture batchCreateEntitiesAsync(
    *     must be enabled in the agent, before they can be used.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchCreateEntitiesAsync(
       String parent, List entities, String languageCode) {
 
@@ -1313,6 +1333,8 @@ public final OperationFuture batchCreateEntitiesAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchCreateEntitiesAsync(
       BatchCreateEntitiesRequest request) {
     return batchCreateEntitiesOperationCallable().futureCall(request);
@@ -1341,6 +1363,7 @@ public final OperationFuture batchCreateEntitiesAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       batchCreateEntitiesOperationCallable() {
     return stub.batchCreateEntitiesOperationCallable();
@@ -1395,6 +1418,8 @@ public final UnaryCallable batchCreateEnt
    * @param entities Required. The collection of new entities to replace the existing entities.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateEntitiesAsync(
       EntityTypeName parent, List entities) {
 
@@ -1428,6 +1453,8 @@ public final OperationFuture batchUpdateEntitiesAsync(
    * @param entities Required. The collection of new entities to replace the existing entities.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateEntitiesAsync(
       String parent, List entities) {
 
@@ -1463,6 +1490,8 @@ public final OperationFuture batchUpdateEntitiesAsync(
    *     must be enabled in the agent, before they can be used.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateEntitiesAsync(
       EntityTypeName parent, List entities, String languageCode) {
 
@@ -1502,6 +1531,8 @@ public final OperationFuture batchUpdateEntitiesAsync(
    *     must be enabled in the agent, before they can be used.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateEntitiesAsync(
       String parent, List entities, String languageCode) {
 
@@ -1538,6 +1569,8 @@ public final OperationFuture batchUpdateEntitiesAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateEntitiesAsync(
       BatchUpdateEntitiesRequest request) {
     return batchUpdateEntitiesOperationCallable().futureCall(request);
@@ -1566,6 +1599,7 @@ public final OperationFuture batchUpdateEntitiesAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       batchUpdateEntitiesOperationCallable() {
     return stub.batchUpdateEntitiesOperationCallable();
@@ -1621,6 +1655,8 @@ public final UnaryCallable batchUpdateEnt
    *     are not fully-qualified names, i.e. they don't start with `projects/<Project ID>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntitiesAsync(
       EntityTypeName parent, List entityValues) {
 
@@ -1655,6 +1691,8 @@ public final OperationFuture batchDeleteEntitiesAsync(
    *     are not fully-qualified names, i.e. they don't start with `projects/<Project ID>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntitiesAsync(
       String parent, List entityValues) {
 
@@ -1694,6 +1732,8 @@ public final OperationFuture batchDeleteEntitiesAsync(
    *     must be enabled in the agent, before they can be used.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntitiesAsync(
       EntityTypeName parent, List entityValues, String languageCode) {
 
@@ -1734,6 +1774,8 @@ public final OperationFuture batchDeleteEntitiesAsync(
    *     must be enabled in the agent, before they can be used.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntitiesAsync(
       String parent, List entityValues, String languageCode) {
 
@@ -1770,6 +1812,8 @@ public final OperationFuture batchDeleteEntitiesAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteEntitiesAsync(
       BatchDeleteEntitiesRequest request) {
     return batchDeleteEntitiesOperationCallable().futureCall(request);
@@ -1798,6 +1842,7 @@ public final OperationFuture batchDeleteEntitiesAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       batchDeleteEntitiesOperationCallable() {
     return stub.batchDeleteEntitiesOperationCallable();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesSettings.java
index a33e64d84f38..1e913fd08769 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesSettings.java
@@ -100,6 +100,8 @@ public UnaryCallSettings deleteEntityTypeSetting
   }
 
   /** Returns the object with the settings used for calls to batchUpdateEntityTypes. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings<
           BatchUpdateEntityTypesRequest, BatchUpdateEntityTypesResponse, Struct>
       batchUpdateEntityTypesOperationSettings() {
@@ -113,6 +115,8 @@ public UnaryCallSettings deleteEntityTypeSetting
   }
 
   /** Returns the object with the settings used for calls to batchDeleteEntityTypes. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       batchDeleteEntityTypesOperationSettings() {
     return ((EntityTypesStubSettings) getStubSettings()).batchDeleteEntityTypesOperationSettings();
@@ -124,6 +128,8 @@ public UnaryCallSettings batchCreateEntit
   }
 
   /** Returns the object with the settings used for calls to batchCreateEntities. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       batchCreateEntitiesOperationSettings() {
     return ((EntityTypesStubSettings) getStubSettings()).batchCreateEntitiesOperationSettings();
@@ -135,6 +141,8 @@ public UnaryCallSettings batchUpdateEntit
   }
 
   /** Returns the object with the settings used for calls to batchUpdateEntities. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       batchUpdateEntitiesOperationSettings() {
     return ((EntityTypesStubSettings) getStubSettings()).batchUpdateEntitiesOperationSettings();
@@ -146,6 +154,8 @@ public UnaryCallSettings batchDeleteEntit
   }
 
   /** Returns the object with the settings used for calls to batchDeleteEntities. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       batchDeleteEntitiesOperationSettings() {
     return ((EntityTypesStubSettings) getStubSettings()).batchDeleteEntitiesOperationSettings();
@@ -283,6 +293,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchUpdateEntityTypes. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             BatchUpdateEntityTypesRequest, BatchUpdateEntityTypesResponse, Struct>
         batchUpdateEntityTypesOperationSettings() {
@@ -296,6 +308,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchDeleteEntityTypes. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchDeleteEntityTypesOperationSettings() {
       return getStubSettingsBuilder().batchDeleteEntityTypesOperationSettings();
@@ -308,6 +322,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchCreateEntities. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchCreateEntitiesOperationSettings() {
       return getStubSettingsBuilder().batchCreateEntitiesOperationSettings();
@@ -320,6 +336,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchUpdateEntities. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchUpdateEntitiesOperationSettings() {
       return getStubSettingsBuilder().batchUpdateEntitiesOperationSettings();
@@ -332,6 +350,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchDeleteEntities. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchDeleteEntitiesOperationSettings() {
       return getStubSettingsBuilder().batchDeleteEntitiesOperationSettings();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java
index 3387221b7ade..785a832af714 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java
@@ -190,6 +190,8 @@ public IntentsStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -945,6 +947,8 @@ public final UnaryCallable deleteIntentCallable() {
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchUpdateIntentsAsync(
       BatchUpdateIntentsRequest request) {
     return batchUpdateIntentsOperationCallable().futureCall(request);
@@ -973,6 +977,7 @@ public final OperationFuture batchUpdateInte
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       batchUpdateIntentsOperationCallable() {
     return stub.batchUpdateIntentsOperationCallable();
@@ -1027,6 +1032,8 @@ public final UnaryCallable batchUpdateInte
    *     in.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteIntentsAsync(
       ProjectName parent, List intents) {
 
@@ -1060,6 +1067,8 @@ public final OperationFuture batchDeleteIntentsAsync(
    *     in.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteIntentsAsync(
       String parent, List intents) {
 
@@ -1091,6 +1100,8 @@ public final OperationFuture batchDeleteIntentsAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture batchDeleteIntentsAsync(
       BatchDeleteIntentsRequest request) {
     return batchDeleteIntentsOperationCallable().futureCall(request);
@@ -1118,6 +1129,7 @@ public final OperationFuture batchDeleteIntentsAsync(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       batchDeleteIntentsOperationCallable() {
     return stub.batchDeleteIntentsOperationCallable();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsSettings.java
index 91a160b4a677..7fcfd322053b 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsSettings.java
@@ -98,6 +98,8 @@ public UnaryCallSettings batchUpdateIntent
   }
 
   /** Returns the object with the settings used for calls to batchUpdateIntents. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       batchUpdateIntentsOperationSettings() {
     return ((IntentsStubSettings) getStubSettings()).batchUpdateIntentsOperationSettings();
@@ -109,6 +111,8 @@ public UnaryCallSettings batchDeleteIntent
   }
 
   /** Returns the object with the settings used for calls to batchDeleteIntents. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       batchDeleteIntentsOperationSettings() {
     return ((IntentsStubSettings) getStubSettings()).batchDeleteIntentsOperationSettings();
@@ -244,6 +248,8 @@ public UnaryCallSettings.Builder deleteIntentSetting
     }
 
     /** Returns the builder for the settings used for calls to batchUpdateIntents. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             BatchUpdateIntentsRequest, BatchUpdateIntentsResponse, Struct>
         batchUpdateIntentsOperationSettings() {
@@ -257,6 +263,8 @@ public UnaryCallSettings.Builder deleteIntentSetting
     }
 
     /** Returns the builder for the settings used for calls to batchDeleteIntents. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchDeleteIntentsOperationSettings() {
       return getStubSettingsBuilder().batchDeleteIntentsOperationSettings();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java
index 3109c2aa9d29..b499a09d9363 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java
@@ -46,6 +46,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class AgentsStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -62,6 +63,7 @@ public UnaryCallable searchAgentsCall
     throw new UnsupportedOperationException("Not implemented: searchAgentsCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable trainAgentOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: trainAgentOperationCallable()");
   }
@@ -70,6 +72,7 @@ public UnaryCallable trainAgentCallable() {
     throw new UnsupportedOperationException("Not implemented: trainAgentCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       exportAgentOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: exportAgentOperationCallable()");
@@ -79,6 +82,7 @@ public UnaryCallable exportAgentCallable() {
     throw new UnsupportedOperationException("Not implemented: exportAgentCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable importAgentOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: importAgentOperationCallable()");
   }
@@ -87,6 +91,7 @@ public UnaryCallable importAgentCallable() {
     throw new UnsupportedOperationException("Not implemented: importAgentCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable restoreAgentOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: restoreAgentOperationCallable()");
   }
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
index b96ea8a99afc..903679697993 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
@@ -130,6 +130,7 @@ public UnaryCallSettings trainAgentSettings() {
   }
 
   /** Returns the object with the settings used for calls to trainAgent. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings trainAgentOperationSettings() {
     return trainAgentOperationSettings;
   }
@@ -140,6 +141,7 @@ public UnaryCallSettings exportAgentSettings() {
   }
 
   /** Returns the object with the settings used for calls to exportAgent. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       exportAgentOperationSettings() {
     return exportAgentOperationSettings;
@@ -151,6 +153,7 @@ public UnaryCallSettings importAgentSettings() {
   }
 
   /** Returns the object with the settings used for calls to importAgent. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings importAgentOperationSettings() {
     return importAgentOperationSettings;
   }
@@ -161,6 +164,7 @@ public UnaryCallSettings restoreAgentSettings()
   }
 
   /** Returns the object with the settings used for calls to restoreAgent. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings restoreAgentOperationSettings() {
     return restoreAgentOperationSettings;
   }
@@ -580,6 +584,8 @@ public UnaryCallSettings.Builder trainAgentSetting
     }
 
     /** Returns the builder for the settings used for calls to trainAgent. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         trainAgentOperationSettings() {
       return trainAgentOperationSettings;
@@ -591,6 +597,8 @@ public UnaryCallSettings.Builder exportAgentSetti
     }
 
     /** Returns the builder for the settings used for calls to exportAgent. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         exportAgentOperationSettings() {
       return exportAgentOperationSettings;
@@ -602,6 +610,8 @@ public UnaryCallSettings.Builder importAgentSetti
     }
 
     /** Returns the builder for the settings used for calls to importAgent. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         importAgentOperationSettings() {
       return importAgentOperationSettings;
@@ -613,6 +623,8 @@ public UnaryCallSettings.Builder restoreAgentSet
     }
 
     /** Returns the builder for the settings used for calls to restoreAgent. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         restoreAgentOperationSettings() {
       return restoreAgentOperationSettings;
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStub.java
index 1584bcc405a9..e6df8fb988ea 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStub.java
@@ -50,6 +50,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class EntityTypesStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -79,6 +80,7 @@ public UnaryCallable deleteEntityTypeCallable()
     throw new UnsupportedOperationException("Not implemented: deleteEntityTypeCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchUpdateEntityTypesOperationCallable() {
     throw new UnsupportedOperationException(
@@ -89,6 +91,7 @@ public UnaryCallable batchUpdateEntity
     throw new UnsupportedOperationException("Not implemented: batchUpdateEntityTypesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchDeleteEntityTypesOperationCallable() {
     throw new UnsupportedOperationException(
@@ -99,6 +102,7 @@ public UnaryCallable batchDeleteEntity
     throw new UnsupportedOperationException("Not implemented: batchDeleteEntityTypesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchCreateEntitiesOperationCallable() {
     throw new UnsupportedOperationException(
@@ -109,6 +113,7 @@ public UnaryCallable batchCreateEntitiesC
     throw new UnsupportedOperationException("Not implemented: batchCreateEntitiesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchUpdateEntitiesOperationCallable() {
     throw new UnsupportedOperationException(
@@ -119,6 +124,7 @@ public UnaryCallable batchUpdateEntitiesC
     throw new UnsupportedOperationException("Not implemented: batchUpdateEntitiesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchDeleteEntitiesOperationCallable() {
     throw new UnsupportedOperationException(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java
index 52bd4343aec6..b89de7ad6286 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java
@@ -164,6 +164,7 @@ public UnaryCallSettings deleteEntityTypeSetting
   }
 
   /** Returns the object with the settings used for calls to batchUpdateEntityTypes. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings<
           BatchUpdateEntityTypesRequest, BatchUpdateEntityTypesResponse, Struct>
       batchUpdateEntityTypesOperationSettings() {
@@ -177,6 +178,7 @@ public UnaryCallSettings deleteEntityTypeSetting
   }
 
   /** Returns the object with the settings used for calls to batchDeleteEntityTypes. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       batchDeleteEntityTypesOperationSettings() {
     return batchDeleteEntityTypesOperationSettings;
@@ -188,6 +190,7 @@ public UnaryCallSettings batchCreateEntit
   }
 
   /** Returns the object with the settings used for calls to batchCreateEntities. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       batchCreateEntitiesOperationSettings() {
     return batchCreateEntitiesOperationSettings;
@@ -199,6 +202,7 @@ public UnaryCallSettings batchUpdateEntit
   }
 
   /** Returns the object with the settings used for calls to batchUpdateEntities. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       batchUpdateEntitiesOperationSettings() {
     return batchUpdateEntitiesOperationSettings;
@@ -210,6 +214,7 @@ public UnaryCallSettings batchDeleteEntit
   }
 
   /** Returns the object with the settings used for calls to batchDeleteEntities. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       batchDeleteEntitiesOperationSettings() {
     return batchDeleteEntitiesOperationSettings;
@@ -752,6 +757,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchUpdateEntityTypes. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             BatchUpdateEntityTypesRequest, BatchUpdateEntityTypesResponse, Struct>
         batchUpdateEntityTypesOperationSettings() {
@@ -765,6 +772,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchDeleteEntityTypes. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchDeleteEntityTypesOperationSettings() {
       return batchDeleteEntityTypesOperationSettings;
@@ -777,6 +786,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchCreateEntities. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchCreateEntitiesOperationSettings() {
       return batchCreateEntitiesOperationSettings;
@@ -789,6 +800,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchUpdateEntities. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchUpdateEntitiesOperationSettings() {
       return batchUpdateEntitiesOperationSettings;
@@ -801,6 +814,8 @@ public UnaryCallSettings.Builder deleteEntityTyp
     }
 
     /** Returns the builder for the settings used for calls to batchDeleteEntities. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchDeleteEntitiesOperationSettings() {
       return batchDeleteEntitiesOperationSettings;
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsCallableFactory.java
index 3d5c58c1508b..a499e26d2a17 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java
index c0815b35ebf8..8b4aebda7287 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java
@@ -228,6 +228,7 @@ protected GrpcAgentsStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -244,6 +245,7 @@ public UnaryCallable searchAgentsCall
     return searchAgentsCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable trainAgentOperationCallable() {
     return trainAgentOperationCallable;
   }
@@ -252,6 +254,7 @@ public UnaryCallable trainAgentCallable() {
     return trainAgentCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       exportAgentOperationCallable() {
     return exportAgentOperationCallable;
@@ -261,6 +264,7 @@ public UnaryCallable exportAgentCallable() {
     return exportAgentCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable importAgentOperationCallable() {
     return importAgentOperationCallable;
   }
@@ -269,6 +273,7 @@ public UnaryCallable importAgentCallable() {
     return importAgentCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable restoreAgentOperationCallable() {
     return restoreAgentOperationCallable;
   }
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsCallableFactory.java
index cae4940ca102..d1cfdaec0f4d 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcContextsCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesCallableFactory.java
index dba62989a9d8..f56b84a9168d 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesStub.java
index a005eee6844a..e099720d4fce 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcEntityTypesStub.java
@@ -343,6 +343,7 @@ protected GrpcEntityTypesStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -372,6 +373,7 @@ public UnaryCallable deleteEntityTypeCallable()
     return deleteEntityTypeCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchUpdateEntityTypesOperationCallable() {
     return batchUpdateEntityTypesOperationCallable;
@@ -381,6 +383,7 @@ public UnaryCallable batchUpdateEntity
     return batchUpdateEntityTypesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchDeleteEntityTypesOperationCallable() {
     return batchDeleteEntityTypesOperationCallable;
@@ -390,6 +393,7 @@ public UnaryCallable batchDeleteEntity
     return batchDeleteEntityTypesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchCreateEntitiesOperationCallable() {
     return batchCreateEntitiesOperationCallable;
@@ -399,6 +403,7 @@ public UnaryCallable batchCreateEntitiesC
     return batchCreateEntitiesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchUpdateEntitiesOperationCallable() {
     return batchUpdateEntitiesOperationCallable;
@@ -408,6 +413,7 @@ public UnaryCallable batchUpdateEntitiesC
     return batchUpdateEntitiesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchDeleteEntitiesOperationCallable() {
     return batchDeleteEntitiesOperationCallable;
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsCallableFactory.java
index 4f7be6caac2a..470dca03db22 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsStub.java
index 40fc70bb01bd..57a2e1e84b19 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcIntentsStub.java
@@ -238,6 +238,7 @@ protected GrpcIntentsStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -266,6 +267,7 @@ public UnaryCallable deleteIntentCallable() {
     return deleteIntentCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchUpdateIntentsOperationCallable() {
     return batchUpdateIntentsOperationCallable;
@@ -275,6 +277,7 @@ public UnaryCallable batchUpdateIntentsCal
     return batchUpdateIntentsCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchDeleteIntentsOperationCallable() {
     return batchDeleteIntentsOperationCallable;
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesCallableFactory.java
index aaab39641e88..a3eec682dc83 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionEntityTypesCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsCallableFactory.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsCallableFactory.java
index 106c97a78eb1..c727d45085d5 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcSessionsCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStub.java
index 985e43b96edb..6d68ef3b3a2b 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStub.java
@@ -47,6 +47,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class IntentsStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -75,6 +76,7 @@ public UnaryCallable deleteIntentCallable() {
     throw new UnsupportedOperationException("Not implemented: deleteIntentCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchUpdateIntentsOperationCallable() {
     throw new UnsupportedOperationException(
@@ -85,6 +87,7 @@ public UnaryCallable batchUpdateIntentsCal
     throw new UnsupportedOperationException("Not implemented: batchUpdateIntentsCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       batchDeleteIntentsOperationCallable() {
     throw new UnsupportedOperationException(
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java
index 53ae7ff297e7..e0f9267bd893 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java
@@ -143,6 +143,7 @@ public UnaryCallSettings batchUpdateIntent
   }
 
   /** Returns the object with the settings used for calls to batchUpdateIntents. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       batchUpdateIntentsOperationSettings() {
     return batchUpdateIntentsOperationSettings;
@@ -154,6 +155,7 @@ public UnaryCallSettings batchDeleteIntent
   }
 
   /** Returns the object with the settings used for calls to batchDeleteIntents. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       batchDeleteIntentsOperationSettings() {
     return batchDeleteIntentsOperationSettings;
@@ -555,6 +557,8 @@ public UnaryCallSettings.Builder deleteIntentSetting
     }
 
     /** Returns the builder for the settings used for calls to batchUpdateIntents. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             BatchUpdateIntentsRequest, BatchUpdateIntentsResponse, Struct>
         batchUpdateIntentsOperationSettings() {
@@ -568,6 +572,8 @@ public UnaryCallSettings.Builder deleteIntentSetting
     }
 
     /** Returns the builder for the settings used for calls to batchDeleteIntents. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         batchDeleteIntentsOperationSettings() {
       return batchDeleteIntentsOperationSettings;
diff --git a/google-cloud-clients/google-cloud-dlp/pom.xml b/google-cloud-clients/google-cloud-dlp/pom.xml
index a744eabf8848..8d2d4f981c99 100644
--- a/google-cloud-clients/google-cloud-dlp/pom.xml
+++ b/google-cloud-clients/google-cloud-dlp/pom.xml
@@ -15,7 +15,7 @@
     0.47.1-alpha-SNAPSHOT
   
   
-    google-cloud-dlp-v2beta1
+    google-cloud-dlp
   
   
     
@@ -26,10 +26,6 @@
       ${project.groupId}
       google-cloud-core-grpc
     
-    
-      com.google.api.grpc
-      proto-google-cloud-dlp-v2beta1
-    
     
       com.google.api.grpc
       proto-google-cloud-dlp-v2
@@ -67,11 +63,6 @@
       objenesis
       test
     
-    
-      com.google.api.grpc
-      grpc-google-cloud-dlp-v2beta1
-      test
-    
     
       com.google.api.grpc
       grpc-google-cloud-dlp-v2
diff --git a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceCallableFactory.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceCallableFactory.java
index 130b3fe2da24..58b835b1514b 100644
--- a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/GrpcDlpServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java
deleted file mode 100644
index 1ec834cf27d1..000000000000
--- a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-package com.google.cloud.dlp.v2beta1;
-
-import com.google.privacy.dlp.v2beta1.Color;
-
-public class Colors {
-
-  private Colors() {}
-
-  public static final Color asDlpColor(java.awt.Color c) {
-    return Color.newBuilder()
-        .setBlue(c.getBlue())
-        .setGreen(c.getGreen())
-        .setRed(c.getRed())
-        .build();
-  }
-
-  public static final java.awt.Color asAwtColor(Color c) {
-    return new java.awt.Color(c.getRed() / 255, c.getGreen() / 255, c.getBlue() / 255);
-  }
-}
diff --git a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceClient.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceClient.java
deleted file mode 100644
index 0f0beed6d943..000000000000
--- a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceClient.java
+++ /dev/null
@@ -1,1080 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-package com.google.cloud.dlp.v2beta1;
-
-import com.google.api.core.BetaApi;
-import com.google.api.gax.core.BackgroundResource;
-import com.google.api.gax.longrunning.OperationFuture;
-import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.UnaryCallable;
-import com.google.cloud.dlp.v2beta1.stub.DlpServiceStub;
-import com.google.cloud.dlp.v2beta1.stub.DlpServiceStubSettings;
-import com.google.longrunning.Operation;
-import com.google.longrunning.OperationsClient;
-import com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest;
-import com.google.privacy.dlp.v2beta1.BigQueryTable;
-import com.google.privacy.dlp.v2beta1.ContentItem;
-import com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyConfig;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentResponse;
-import com.google.privacy.dlp.v2beta1.InspectConfig;
-import com.google.privacy.dlp.v2beta1.InspectContentRequest;
-import com.google.privacy.dlp.v2beta1.InspectContentResponse;
-import com.google.privacy.dlp.v2beta1.InspectOperationMetadata;
-import com.google.privacy.dlp.v2beta1.InspectOperationResult;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesRequest;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesResponse;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse;
-import com.google.privacy.dlp.v2beta1.OutputStorageConfig;
-import com.google.privacy.dlp.v2beta1.PrivacyMetric;
-import com.google.privacy.dlp.v2beta1.RedactContentRequest;
-import com.google.privacy.dlp.v2beta1.RedactContentResponse;
-import com.google.privacy.dlp.v2beta1.ResultName;
-import com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata;
-import com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult;
-import com.google.privacy.dlp.v2beta1.StorageConfig;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.Generated;
-
-// AUTO-GENERATED DOCUMENTATION AND SERVICE
-/**
- * Service Description: The DLP API is a service that allows clients to detect the presence of
- * Personally Identifiable Information (PII) and other privacy-sensitive data in user-supplied,
- * unstructured data streams, like text blocks or images. The service also includes methods for
- * sensitive data redaction and scheduling of data scans on Google Cloud Platform based data sets.
- *
- * 
This class provides the ability to make remote calls to the backing service through method
- * calls that map to API methods. Sample code to get started:
- *
- * 
- * 
- * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
- *   String name = "EMAIL_ADDRESS";
- *   InfoType infoTypesElement = InfoType.newBuilder()
- *     .setName(name)
- *     .build();
- *   List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
- *   InspectConfig inspectConfig = InspectConfig.newBuilder()
- *     .addAllInfoTypes(infoTypes)
- *     .build();
- *   String type = "text/plain";
- *   String value = "My email is example{@literal @}example.com.";
- *   ContentItem itemsElement = ContentItem.newBuilder()
- *     .setType(type)
- *     .setValue(value)
- *     .build();
- *   List<ContentItem> items = Arrays.asList(itemsElement);
- *   InspectContentResponse response = dlpServiceClient.inspectContent(inspectConfig, items);
- * }
- * 
- * 

- *
- * 
Note: close() needs to be called on the dlpServiceClient object to clean up resources such as
- * threads. In the example above, try-with-resources is used, which automatically calls close().
- *
- * 
The surface of this class includes several types of Java methods for each of the API's
- * methods:
- *
- * 
    
- *   
  1.  A "flattened" method. With this type of method, the fields of the request type have been
- *       converted into function parameters. It may be the case that not all fields are available as
- *       parameters, and not every API method will have a flattened method entry point.
- *   
  2.  A "request object" method. This type of method only takes one parameter, a request object,
- *       which must be constructed before the call. Not every API method will have a request object
- *       method.
- *   
  3.  A "callable" method. This type of method takes no parameters and returns an immutable API
- *       callable object, which can be used to initiate calls to the service.
- * 

- *
- * 
See the individual methods for example code.
- *
- * 
Many parameters require resource names to be formatted in a particular way. To assist with
- * these names, this class includes a format method for each type of name, and additionally a parse
- * method to extract the individual identifiers contained within names that are returned.
- *
- * 
This class can be customized by passing in a custom instance of DlpServiceSettings to
- * create(). For example:
- *
- * 
To customize credentials:
- *
- * 
- * 
- * DlpServiceSettings dlpServiceSettings =
- *     DlpServiceSettings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
- *         .build();
- * DlpServiceClient dlpServiceClient =
- *     DlpServiceClient.create(dlpServiceSettings);
- * 
- * 

- *
- * To customize the endpoint:
- *
- * 
- * 
- * DlpServiceSettings dlpServiceSettings =
- *     DlpServiceSettings.newBuilder().setEndpoint(myEndpoint).build();
- * DlpServiceClient dlpServiceClient =
- *     DlpServiceClient.create(dlpServiceSettings);
- * 
- * 

- */
-@Generated("by gapic-generator")
-@BetaApi
-public class DlpServiceClient implements BackgroundResource {
-  private final DlpServiceSettings settings;
-  private final DlpServiceStub stub;
-  private final OperationsClient operationsClient;
-
-  /** Constructs an instance of DlpServiceClient with default settings. */
-  public static final DlpServiceClient create() throws IOException {
-    return create(DlpServiceSettings.newBuilder().build());
-  }
-
-  /**
-   * Constructs an instance of DlpServiceClient, using the given settings. The channels are created
-   * based on the settings passed in, or defaults for any settings that are not set.
-   */
-  public static final DlpServiceClient create(DlpServiceSettings settings) throws IOException {
-    return new DlpServiceClient(settings);
-  }
-
-  /**
-   * Constructs an instance of DlpServiceClient, using the given stub for making calls. This is for
-   * advanced usage - prefer to use DlpServiceSettings}.
-   */
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
-  public static final DlpServiceClient create(DlpServiceStub stub) {
-    return new DlpServiceClient(stub);
-  }
-
-  /**
-   * Constructs an instance of DlpServiceClient, using the given settings. This is protected so that
-   * it is easy to make a subclass, but otherwise, the static factory methods should be preferred.
-   */
-  protected DlpServiceClient(DlpServiceSettings settings) throws IOException {
-    this.settings = settings;
-    this.stub = ((DlpServiceStubSettings) settings.getStubSettings()).createStub();
-    this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
-  }
-
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
-  protected DlpServiceClient(DlpServiceStub stub) {
-    this.settings = null;
-    this.stub = stub;
-    this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
-  }
-
-  public final DlpServiceSettings getSettings() {
-    return settings;
-  }
-
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
-  public DlpServiceStub getStub() {
-    return stub;
-  }
-
-  /**
-   * Returns the OperationsClient that can be used to query the status of a long-running operation
-   * returned by another API method call.
-   */
-  public final OperationsClient getOperationsClient() {
-    return operationsClient;
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Finds potentially sensitive info in a list of strings. This method has limits on input size,
-   * processing time, and output size.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String name = "EMAIL_ADDRESS";
-   *   InfoType infoTypesElement = InfoType.newBuilder()
-   *     .setName(name)
-   *     .build();
-   *   List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
-   *   InspectConfig inspectConfig = InspectConfig.newBuilder()
-   *     .addAllInfoTypes(infoTypes)
-   *     .build();
-   *   String type = "text/plain";
-   *   String value = "My email is example{@literal @}example.com.";
-   *   ContentItem itemsElement = ContentItem.newBuilder()
-   *     .setType(type)
-   *     .setValue(value)
-   *     .build();
-   *   List<ContentItem> items = Arrays.asList(itemsElement);
-   *   InspectContentResponse response = dlpServiceClient.inspectContent(inspectConfig, items);
-   * }
-   * 

-   *
-   * @param inspectConfig Configuration for the inspector.
-   * @param items The list of items to inspect. Items in a single request are considered "related"
-   *     unless inspect_config.independent_inputs is true. Up to 100 are allowed per request.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final InspectContentResponse inspectContent(
-      InspectConfig inspectConfig, List items) {
-
-    InspectContentRequest request =
-        InspectContentRequest.newBuilder()
-            .setInspectConfig(inspectConfig)
-            .addAllItems(items)
-            .build();
-    return inspectContent(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Finds potentially sensitive info in a list of strings. This method has limits on input size,
-   * processing time, and output size.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String name = "EMAIL_ADDRESS";
-   *   InfoType infoTypesElement = InfoType.newBuilder()
-   *     .setName(name)
-   *     .build();
-   *   List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
-   *   InspectConfig inspectConfig = InspectConfig.newBuilder()
-   *     .addAllInfoTypes(infoTypes)
-   *     .build();
-   *   String type = "text/plain";
-   *   String value = "My email is example{@literal @}example.com.";
-   *   ContentItem itemsElement = ContentItem.newBuilder()
-   *     .setType(type)
-   *     .setValue(value)
-   *     .build();
-   *   List<ContentItem> items = Arrays.asList(itemsElement);
-   *   InspectContentRequest request = InspectContentRequest.newBuilder()
-   *     .setInspectConfig(inspectConfig)
-   *     .addAllItems(items)
-   *     .build();
-   *   InspectContentResponse response = dlpServiceClient.inspectContent(request);
-   * }
-   * 

-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final InspectContentResponse inspectContent(InspectContentRequest request) {
-    return inspectContentCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Finds potentially sensitive info in a list of strings. This method has limits on input size,
-   * processing time, and output size.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String name = "EMAIL_ADDRESS";
-   *   InfoType infoTypesElement = InfoType.newBuilder()
-   *     .setName(name)
-   *     .build();
-   *   List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
-   *   InspectConfig inspectConfig = InspectConfig.newBuilder()
-   *     .addAllInfoTypes(infoTypes)
-   *     .build();
-   *   String type = "text/plain";
-   *   String value = "My email is example{@literal @}example.com.";
-   *   ContentItem itemsElement = ContentItem.newBuilder()
-   *     .setType(type)
-   *     .setValue(value)
-   *     .build();
-   *   List<ContentItem> items = Arrays.asList(itemsElement);
-   *   InspectContentRequest request = InspectContentRequest.newBuilder()
-   *     .setInspectConfig(inspectConfig)
-   *     .addAllItems(items)
-   *     .build();
-   *   ApiFuture<InspectContentResponse> future = dlpServiceClient.inspectContentCallable().futureCall(request);
-   *   // Do something
-   *   InspectContentResponse response = future.get();
-   * }
-   * 

-   */
-  public final UnaryCallable
-      inspectContentCallable() {
-    return stub.inspectContentCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Redacts potentially sensitive info from a list of strings. This method has limits on input
-   * size, processing time, and output size.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String name = "EMAIL_ADDRESS";
-   *   InfoType infoTypesElement = InfoType.newBuilder()
-   *     .setName(name)
-   *     .build();
-   *   List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
-   *   InspectConfig inspectConfig = InspectConfig.newBuilder()
-   *     .addAllInfoTypes(infoTypes)
-   *     .build();
-   *   String type = "text/plain";
-   *   String value = "My email is example{@literal @}example.com.";
-   *   ContentItem itemsElement = ContentItem.newBuilder()
-   *     .setType(type)
-   *     .setValue(value)
-   *     .build();
-   *   List<ContentItem> items = Arrays.asList(itemsElement);
-   *   String name2 = "EMAIL_ADDRESS";
-   *   InfoType infoType = InfoType.newBuilder()
-   *     .setName(name2)
-   *     .build();
-   *   String replaceWith = "REDACTED";
-   *   RedactContentRequest.ReplaceConfig replaceConfigsElement = RedactContentRequest.ReplaceConfig.newBuilder()
-   *     .setInfoType(infoType)
-   *     .setReplaceWith(replaceWith)
-   *     .build();
-   *   List<RedactContentRequest.ReplaceConfig> replaceConfigs = Arrays.asList(replaceConfigsElement);
-   *   RedactContentRequest request = RedactContentRequest.newBuilder()
-   *     .setInspectConfig(inspectConfig)
-   *     .addAllItems(items)
-   *     .addAllReplaceConfigs(replaceConfigs)
-   *     .build();
-   *   RedactContentResponse response = dlpServiceClient.redactContent(request);
-   * }
-   * 

-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final RedactContentResponse redactContent(RedactContentRequest request) {
-    return redactContentCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Redacts potentially sensitive info from a list of strings. This method has limits on input
-   * size, processing time, and output size.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String name = "EMAIL_ADDRESS";
-   *   InfoType infoTypesElement = InfoType.newBuilder()
-   *     .setName(name)
-   *     .build();
-   *   List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
-   *   InspectConfig inspectConfig = InspectConfig.newBuilder()
-   *     .addAllInfoTypes(infoTypes)
-   *     .build();
-   *   String type = "text/plain";
-   *   String value = "My email is example{@literal @}example.com.";
-   *   ContentItem itemsElement = ContentItem.newBuilder()
-   *     .setType(type)
-   *     .setValue(value)
-   *     .build();
-   *   List<ContentItem> items = Arrays.asList(itemsElement);
-   *   String name2 = "EMAIL_ADDRESS";
-   *   InfoType infoType = InfoType.newBuilder()
-   *     .setName(name2)
-   *     .build();
-   *   String replaceWith = "REDACTED";
-   *   RedactContentRequest.ReplaceConfig replaceConfigsElement = RedactContentRequest.ReplaceConfig.newBuilder()
-   *     .setInfoType(infoType)
-   *     .setReplaceWith(replaceWith)
-   *     .build();
-   *   List<RedactContentRequest.ReplaceConfig> replaceConfigs = Arrays.asList(replaceConfigsElement);
-   *   RedactContentRequest request = RedactContentRequest.newBuilder()
-   *     .setInspectConfig(inspectConfig)
-   *     .addAllItems(items)
-   *     .addAllReplaceConfigs(replaceConfigs)
-   *     .build();
-   *   ApiFuture<RedactContentResponse> future = dlpServiceClient.redactContentCallable().futureCall(request);
-   *   // Do something
-   *   RedactContentResponse response = future.get();
-   * }
-   * 

-   */
-  public final UnaryCallable redactContentCallable() {
-    return stub.redactContentCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * De-identifies potentially sensitive info from a list of strings. This method has limits on
-   * input size and output size.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   DeidentifyConfig deidentifyConfig = DeidentifyConfig.newBuilder().build();
-   *   InspectConfig inspectConfig = InspectConfig.newBuilder().build();
-   *   List<ContentItem> items = new ArrayList<>();
-   *   DeidentifyContentResponse response = dlpServiceClient.deidentifyContent(deidentifyConfig, inspectConfig, items);
-   * }
-   * 

-   *
-   * @param deidentifyConfig Configuration for the de-identification of the list of content items.
-   * @param inspectConfig Configuration for the inspector.
-   * @param items The list of items to inspect. Up to 100 are allowed per request. All items will be
-   *     treated as text/*.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final DeidentifyContentResponse deidentifyContent(
-      DeidentifyConfig deidentifyConfig, InspectConfig inspectConfig, List items) {
-
-    DeidentifyContentRequest request =
-        DeidentifyContentRequest.newBuilder()
-            .setDeidentifyConfig(deidentifyConfig)
-            .setInspectConfig(inspectConfig)
-            .addAllItems(items)
-            .build();
-    return deidentifyContent(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * De-identifies potentially sensitive info from a list of strings. This method has limits on
-   * input size and output size.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   DeidentifyConfig deidentifyConfig = DeidentifyConfig.newBuilder().build();
-   *   InspectConfig inspectConfig = InspectConfig.newBuilder().build();
-   *   List<ContentItem> items = new ArrayList<>();
-   *   DeidentifyContentRequest request = DeidentifyContentRequest.newBuilder()
-   *     .setDeidentifyConfig(deidentifyConfig)
-   *     .setInspectConfig(inspectConfig)
-   *     .addAllItems(items)
-   *     .build();
-   *   DeidentifyContentResponse response = dlpServiceClient.deidentifyContent(request);
-   * }
-   * 

-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final DeidentifyContentResponse deidentifyContent(DeidentifyContentRequest request) {
-    return deidentifyContentCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * De-identifies potentially sensitive info from a list of strings. This method has limits on
-   * input size and output size.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   DeidentifyConfig deidentifyConfig = DeidentifyConfig.newBuilder().build();
-   *   InspectConfig inspectConfig = InspectConfig.newBuilder().build();
-   *   List<ContentItem> items = new ArrayList<>();
-   *   DeidentifyContentRequest request = DeidentifyContentRequest.newBuilder()
-   *     .setDeidentifyConfig(deidentifyConfig)
-   *     .setInspectConfig(inspectConfig)
-   *     .addAllItems(items)
-   *     .build();
-   *   ApiFuture<DeidentifyContentResponse> future = dlpServiceClient.deidentifyContentCallable().futureCall(request);
-   *   // Do something
-   *   DeidentifyContentResponse response = future.get();
-   * }
-   * 

-   */
-  public final UnaryCallable
-      deidentifyContentCallable() {
-    return stub.deidentifyContentCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Schedules a job to compute risk analysis metrics over content in a Google Cloud Platform
-   * repository.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   PrivacyMetric privacyMetric = PrivacyMetric.newBuilder().build();
-   *   BigQueryTable sourceTable = BigQueryTable.newBuilder().build();
-   *   RiskAnalysisOperationResult response = dlpServiceClient.analyzeDataSourceRiskAsync(privacyMetric, sourceTable).get();
-   * }
-   * 

-   *
-   * @param privacyMetric Privacy metric to compute.
-   * @param sourceTable Input dataset to compute metrics over.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final OperationFuture
-      analyzeDataSourceRiskAsync(PrivacyMetric privacyMetric, BigQueryTable sourceTable) {
-
-    AnalyzeDataSourceRiskRequest request =
-        AnalyzeDataSourceRiskRequest.newBuilder()
-            .setPrivacyMetric(privacyMetric)
-            .setSourceTable(sourceTable)
-            .build();
-    return analyzeDataSourceRiskAsync(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Schedules a job to compute risk analysis metrics over content in a Google Cloud Platform
-   * repository.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   PrivacyMetric privacyMetric = PrivacyMetric.newBuilder().build();
-   *   BigQueryTable sourceTable = BigQueryTable.newBuilder().build();
-   *   AnalyzeDataSourceRiskRequest request = AnalyzeDataSourceRiskRequest.newBuilder()
-   *     .setPrivacyMetric(privacyMetric)
-   *     .setSourceTable(sourceTable)
-   *     .build();
-   *   RiskAnalysisOperationResult response = dlpServiceClient.analyzeDataSourceRiskAsync(request).get();
-   * }
-   * 

-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final OperationFuture
-      analyzeDataSourceRiskAsync(AnalyzeDataSourceRiskRequest request) {
-    return analyzeDataSourceRiskOperationCallable().futureCall(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Schedules a job to compute risk analysis metrics over content in a Google Cloud Platform
-   * repository.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   PrivacyMetric privacyMetric = PrivacyMetric.newBuilder().build();
-   *   BigQueryTable sourceTable = BigQueryTable.newBuilder().build();
-   *   AnalyzeDataSourceRiskRequest request = AnalyzeDataSourceRiskRequest.newBuilder()
-   *     .setPrivacyMetric(privacyMetric)
-   *     .setSourceTable(sourceTable)
-   *     .build();
-   *   OperationFuture<Operation> future = dlpServiceClient.analyzeDataSourceRiskOperationCallable().futureCall(request);
-   *   // Do something
-   *   RiskAnalysisOperationResult response = future.get();
-   * }
-   * 

-   */
-  public final OperationCallable<
-          AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
-      analyzeDataSourceRiskOperationCallable() {
-    return stub.analyzeDataSourceRiskOperationCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Schedules a job to compute risk analysis metrics over content in a Google Cloud Platform
-   * repository.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   PrivacyMetric privacyMetric = PrivacyMetric.newBuilder().build();
-   *   BigQueryTable sourceTable = BigQueryTable.newBuilder().build();
-   *   AnalyzeDataSourceRiskRequest request = AnalyzeDataSourceRiskRequest.newBuilder()
-   *     .setPrivacyMetric(privacyMetric)
-   *     .setSourceTable(sourceTable)
-   *     .build();
-   *   ApiFuture<Operation> future = dlpServiceClient.analyzeDataSourceRiskCallable().futureCall(request);
-   *   // Do something
-   *   Operation response = future.get();
-   * }
-   * 

-   */
-  public final UnaryCallable
-      analyzeDataSourceRiskCallable() {
-    return stub.analyzeDataSourceRiskCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Schedules a job scanning content in a Google Cloud Platform data repository.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String name = "EMAIL_ADDRESS";
-   *   InfoType infoTypesElement = InfoType.newBuilder()
-   *     .setName(name)
-   *     .build();
-   *   List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
-   *   InspectConfig inspectConfig = InspectConfig.newBuilder()
-   *     .addAllInfoTypes(infoTypes)
-   *     .build();
-   *   String url = "gs://example_bucket/example_file.png";
-   *   CloudStorageOptions.FileSet fileSet = CloudStorageOptions.FileSet.newBuilder()
-   *     .setUrl(url)
-   *     .build();
-   *   CloudStorageOptions cloudStorageOptions = CloudStorageOptions.newBuilder()
-   *     .setFileSet(fileSet)
-   *     .build();
-   *   StorageConfig storageConfig = StorageConfig.newBuilder()
-   *     .setCloudStorageOptions(cloudStorageOptions)
-   *     .build();
-   *   OutputStorageConfig outputConfig = OutputStorageConfig.newBuilder().build();
-   *   InspectOperationResult response = dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig).get();
-   * }
-   * 

-   *
-   * @param inspectConfig Configuration for the inspector.
-   * @param storageConfig Specification of the data set to process.
-   * @param outputConfig Optional location to store findings.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final OperationFuture
-      createInspectOperationAsync(
-          InspectConfig inspectConfig,
-          StorageConfig storageConfig,
-          OutputStorageConfig outputConfig) {
-
-    CreateInspectOperationRequest request =
-        CreateInspectOperationRequest.newBuilder()
-            .setInspectConfig(inspectConfig)
-            .setStorageConfig(storageConfig)
-            .setOutputConfig(outputConfig)
-            .build();
-    return createInspectOperationAsync(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Schedules a job scanning content in a Google Cloud Platform data repository.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String name = "EMAIL_ADDRESS";
-   *   InfoType infoTypesElement = InfoType.newBuilder()
-   *     .setName(name)
-   *     .build();
-   *   List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
-   *   InspectConfig inspectConfig = InspectConfig.newBuilder()
-   *     .addAllInfoTypes(infoTypes)
-   *     .build();
-   *   String url = "gs://example_bucket/example_file.png";
-   *   CloudStorageOptions.FileSet fileSet = CloudStorageOptions.FileSet.newBuilder()
-   *     .setUrl(url)
-   *     .build();
-   *   CloudStorageOptions cloudStorageOptions = CloudStorageOptions.newBuilder()
-   *     .setFileSet(fileSet)
-   *     .build();
-   *   StorageConfig storageConfig = StorageConfig.newBuilder()
-   *     .setCloudStorageOptions(cloudStorageOptions)
-   *     .build();
-   *   OutputStorageConfig outputConfig = OutputStorageConfig.newBuilder().build();
-   *   CreateInspectOperationRequest request = CreateInspectOperationRequest.newBuilder()
-   *     .setInspectConfig(inspectConfig)
-   *     .setStorageConfig(storageConfig)
-   *     .setOutputConfig(outputConfig)
-   *     .build();
-   *   InspectOperationResult response = dlpServiceClient.createInspectOperationAsync(request).get();
-   * }
-   * 

-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final OperationFuture
-      createInspectOperationAsync(CreateInspectOperationRequest request) {
-    return createInspectOperationOperationCallable().futureCall(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Schedules a job scanning content in a Google Cloud Platform data repository.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String name = "EMAIL_ADDRESS";
-   *   InfoType infoTypesElement = InfoType.newBuilder()
-   *     .setName(name)
-   *     .build();
-   *   List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
-   *   InspectConfig inspectConfig = InspectConfig.newBuilder()
-   *     .addAllInfoTypes(infoTypes)
-   *     .build();
-   *   String url = "gs://example_bucket/example_file.png";
-   *   CloudStorageOptions.FileSet fileSet = CloudStorageOptions.FileSet.newBuilder()
-   *     .setUrl(url)
-   *     .build();
-   *   CloudStorageOptions cloudStorageOptions = CloudStorageOptions.newBuilder()
-   *     .setFileSet(fileSet)
-   *     .build();
-   *   StorageConfig storageConfig = StorageConfig.newBuilder()
-   *     .setCloudStorageOptions(cloudStorageOptions)
-   *     .build();
-   *   OutputStorageConfig outputConfig = OutputStorageConfig.newBuilder().build();
-   *   CreateInspectOperationRequest request = CreateInspectOperationRequest.newBuilder()
-   *     .setInspectConfig(inspectConfig)
-   *     .setStorageConfig(storageConfig)
-   *     .setOutputConfig(outputConfig)
-   *     .build();
-   *   OperationFuture<Operation> future = dlpServiceClient.createInspectOperationOperationCallable().futureCall(request);
-   *   // Do something
-   *   InspectOperationResult response = future.get();
-   * }
-   * 

-   */
-  public final OperationCallable<
-          CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
-      createInspectOperationOperationCallable() {
-    return stub.createInspectOperationOperationCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Schedules a job scanning content in a Google Cloud Platform data repository.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String name = "EMAIL_ADDRESS";
-   *   InfoType infoTypesElement = InfoType.newBuilder()
-   *     .setName(name)
-   *     .build();
-   *   List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
-   *   InspectConfig inspectConfig = InspectConfig.newBuilder()
-   *     .addAllInfoTypes(infoTypes)
-   *     .build();
-   *   String url = "gs://example_bucket/example_file.png";
-   *   CloudStorageOptions.FileSet fileSet = CloudStorageOptions.FileSet.newBuilder()
-   *     .setUrl(url)
-   *     .build();
-   *   CloudStorageOptions cloudStorageOptions = CloudStorageOptions.newBuilder()
-   *     .setFileSet(fileSet)
-   *     .build();
-   *   StorageConfig storageConfig = StorageConfig.newBuilder()
-   *     .setCloudStorageOptions(cloudStorageOptions)
-   *     .build();
-   *   OutputStorageConfig outputConfig = OutputStorageConfig.newBuilder().build();
-   *   CreateInspectOperationRequest request = CreateInspectOperationRequest.newBuilder()
-   *     .setInspectConfig(inspectConfig)
-   *     .setStorageConfig(storageConfig)
-   *     .setOutputConfig(outputConfig)
-   *     .build();
-   *   ApiFuture<Operation> future = dlpServiceClient.createInspectOperationCallable().futureCall(request);
-   *   // Do something
-   *   Operation response = future.get();
-   * }
-   * 

-   */
-  public final UnaryCallable
-      createInspectOperationCallable() {
-    return stub.createInspectOperationCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Returns list of results for given inspect operation result set id.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   ResultName name = ResultName.of("[RESULT]");
-   *   ListInspectFindingsResponse response = dlpServiceClient.listInspectFindings(name);
-   * }
-   * 

-   *
-   * @param name Identifier of the results set returned as metadata of the longrunning operation
-   *     created by a call to InspectDataSource. Should be in the format of `inspect/results/{id}`.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final ListInspectFindingsResponse listInspectFindings(ResultName name) {
-
-    ListInspectFindingsRequest request =
-        ListInspectFindingsRequest.newBuilder()
-            .setName(name == null ? null : name.toString())
-            .build();
-    return listInspectFindings(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Returns list of results for given inspect operation result set id.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   ResultName name = ResultName.of("[RESULT]");
-   *   ListInspectFindingsResponse response = dlpServiceClient.listInspectFindings(name.toString());
-   * }
-   * 

-   *
-   * @param name Identifier of the results set returned as metadata of the longrunning operation
-   *     created by a call to InspectDataSource. Should be in the format of `inspect/results/{id}`.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final ListInspectFindingsResponse listInspectFindings(String name) {
-
-    ListInspectFindingsRequest request =
-        ListInspectFindingsRequest.newBuilder().setName(name).build();
-    return listInspectFindings(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Returns list of results for given inspect operation result set id.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   ResultName name = ResultName.of("[RESULT]");
-   *   ListInspectFindingsRequest request = ListInspectFindingsRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   ListInspectFindingsResponse response = dlpServiceClient.listInspectFindings(request);
-   * }
-   * 

-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final ListInspectFindingsResponse listInspectFindings(ListInspectFindingsRequest request) {
-    return listInspectFindingsCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Returns list of results for given inspect operation result set id.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   ResultName name = ResultName.of("[RESULT]");
-   *   ListInspectFindingsRequest request = ListInspectFindingsRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   ApiFuture<ListInspectFindingsResponse> future = dlpServiceClient.listInspectFindingsCallable().futureCall(request);
-   *   // Do something
-   *   ListInspectFindingsResponse response = future.get();
-   * }
-   * 

-   */
-  public final UnaryCallable
-      listInspectFindingsCallable() {
-    return stub.listInspectFindingsCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Returns sensitive information types for given category.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String category = "PII";
-   *   String languageCode = "en";
-   *   ListInfoTypesResponse response = dlpServiceClient.listInfoTypes(category, languageCode);
-   * }
-   * 

-   *
-   * @param category Category name as returned by ListRootCategories.
-   * @param languageCode Optional BCP-47 language code for localized info type friendly names. If
-   *     omitted, or if localized strings are not available, en-US strings will be returned.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final ListInfoTypesResponse listInfoTypes(String category, String languageCode) {
-
-    ListInfoTypesRequest request =
-        ListInfoTypesRequest.newBuilder()
-            .setCategory(category)
-            .setLanguageCode(languageCode)
-            .build();
-    return listInfoTypes(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Returns sensitive information types for given category.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String category = "PII";
-   *   String languageCode = "en";
-   *   ListInfoTypesRequest request = ListInfoTypesRequest.newBuilder()
-   *     .setCategory(category)
-   *     .setLanguageCode(languageCode)
-   *     .build();
-   *   ListInfoTypesResponse response = dlpServiceClient.listInfoTypes(request);
-   * }
-   * 

-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final ListInfoTypesResponse listInfoTypes(ListInfoTypesRequest request) {
-    return listInfoTypesCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Returns sensitive information types for given category.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String category = "PII";
-   *   String languageCode = "en";
-   *   ListInfoTypesRequest request = ListInfoTypesRequest.newBuilder()
-   *     .setCategory(category)
-   *     .setLanguageCode(languageCode)
-   *     .build();
-   *   ApiFuture<ListInfoTypesResponse> future = dlpServiceClient.listInfoTypesCallable().futureCall(request);
-   *   // Do something
-   *   ListInfoTypesResponse response = future.get();
-   * }
-   * 

-   */
-  public final UnaryCallable listInfoTypesCallable() {
-    return stub.listInfoTypesCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Returns the list of root categories of sensitive information.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String languageCode = "en";
-   *   ListRootCategoriesResponse response = dlpServiceClient.listRootCategories(languageCode);
-   * }
-   * 

-   *
-   * @param languageCode Optional language code for localized friendly category names. If omitted or
-   *     if localized strings are not available, en-US strings will be returned.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final ListRootCategoriesResponse listRootCategories(String languageCode) {
-
-    ListRootCategoriesRequest request =
-        ListRootCategoriesRequest.newBuilder().setLanguageCode(languageCode).build();
-    return listRootCategories(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Returns the list of root categories of sensitive information.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String languageCode = "en";
-   *   ListRootCategoriesRequest request = ListRootCategoriesRequest.newBuilder()
-   *     .setLanguageCode(languageCode)
-   *     .build();
-   *   ListRootCategoriesResponse response = dlpServiceClient.listRootCategories(request);
-   * }
-   * 

-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  private final ListRootCategoriesResponse listRootCategories(ListRootCategoriesRequest request) {
-    return listRootCategoriesCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Returns the list of root categories of sensitive information.
-   *
-   * 
Sample code:
-   *
-   * 

-   * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
-   *   String languageCode = "en";
-   *   ListRootCategoriesRequest request = ListRootCategoriesRequest.newBuilder()
-   *     .setLanguageCode(languageCode)
-   *     .build();
-   *   ApiFuture<ListRootCategoriesResponse> future = dlpServiceClient.listRootCategoriesCallable().futureCall(request);
-   *   // Do something
-   *   ListRootCategoriesResponse response = future.get();
-   * }
-   * 

-   */
-  public final UnaryCallable
-      listRootCategoriesCallable() {
-    return stub.listRootCategoriesCallable();
-  }
-
-  @Override
-  public final void close() {
-    stub.close();
-  }
-
-  @Override
-  public void shutdown() {
-    stub.shutdown();
-  }
-
-  @Override
-  public boolean isShutdown() {
-    return stub.isShutdown();
-  }
-
-  @Override
-  public boolean isTerminated() {
-    return stub.isTerminated();
-  }
-
-  @Override
-  public void shutdownNow() {
-    stub.shutdownNow();
-  }
-
-  @Override
-  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
-    return stub.awaitTermination(duration, unit);
-  }
-}
diff --git a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceSettings.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceSettings.java
deleted file mode 100644
index d05cae011268..000000000000
--- a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceSettings.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-package com.google.cloud.dlp.v2beta1;
-
-import com.google.api.core.ApiFunction;
-import com.google.api.core.BetaApi;
-import com.google.api.gax.core.GoogleCredentialsProvider;
-import com.google.api.gax.core.InstantiatingExecutorProvider;
-import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
-import com.google.api.gax.rpc.ApiClientHeaderProvider;
-import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.ClientSettings;
-import com.google.api.gax.rpc.OperationCallSettings;
-import com.google.api.gax.rpc.TransportChannelProvider;
-import com.google.api.gax.rpc.UnaryCallSettings;
-import com.google.cloud.dlp.v2beta1.stub.DlpServiceStubSettings;
-import com.google.longrunning.Operation;
-import com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest;
-import com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentResponse;
-import com.google.privacy.dlp.v2beta1.InspectContentRequest;
-import com.google.privacy.dlp.v2beta1.InspectContentResponse;
-import com.google.privacy.dlp.v2beta1.InspectOperationMetadata;
-import com.google.privacy.dlp.v2beta1.InspectOperationResult;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesRequest;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesResponse;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse;
-import com.google.privacy.dlp.v2beta1.RedactContentRequest;
-import com.google.privacy.dlp.v2beta1.RedactContentResponse;
-import com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata;
-import com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult;
-import java.io.IOException;
-import java.util.List;
-import javax.annotation.Generated;
-
-// AUTO-GENERATED DOCUMENTATION AND CLASS
-/**
- * Settings class to configure an instance of {@link DlpServiceClient}.
- *
- * 
The default instance has everything set to sensible defaults:
- *
- * 
    
- *   
  • The default service address (dlp.googleapis.com) and default port (443) are used.
- *   
  • Credentials are acquired automatically through Application Default Credentials.
- *   
  • Retries are configured for idempotent methods but not for non-idempotent methods.
- * 

- *
- * 
The builder of this class is recursive, so contained classes are themselves builders. When
- * build() is called, the tree of builders is called to create the complete settings object. For
- * example, to set the total timeout of inspectContent to 30 seconds:
- *
- * 
- * 
- * DlpServiceSettings.Builder dlpServiceSettingsBuilder =
- *     DlpServiceSettings.newBuilder();
- * dlpServiceSettingsBuilder.inspectContentSettings().getRetrySettings().toBuilder()
- *     .setTotalTimeout(Duration.ofSeconds(30));
- * DlpServiceSettings dlpServiceSettings = dlpServiceSettingsBuilder.build();
- * 
- * 

- */
-@Generated("by gapic-generator")
-@BetaApi
-public class DlpServiceSettings extends ClientSettings {
-  /** Returns the object with the settings used for calls to inspectContent. */
-  public UnaryCallSettings inspectContentSettings() {
-    return ((DlpServiceStubSettings) getStubSettings()).inspectContentSettings();
-  }
-
-  /** Returns the object with the settings used for calls to redactContent. */
-  public UnaryCallSettings redactContentSettings() {
-    return ((DlpServiceStubSettings) getStubSettings()).redactContentSettings();
-  }
-
-  /** Returns the object with the settings used for calls to deidentifyContent. */
-  public UnaryCallSettings
-      deidentifyContentSettings() {
-    return ((DlpServiceStubSettings) getStubSettings()).deidentifyContentSettings();
-  }
-
-  /** Returns the object with the settings used for calls to analyzeDataSourceRisk. */
-  public UnaryCallSettings
-      analyzeDataSourceRiskSettings() {
-    return ((DlpServiceStubSettings) getStubSettings()).analyzeDataSourceRiskSettings();
-  }
-
-  /** Returns the object with the settings used for calls to analyzeDataSourceRisk. */
-  public OperationCallSettings<
-          AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
-      analyzeDataSourceRiskOperationSettings() {
-    return ((DlpServiceStubSettings) getStubSettings()).analyzeDataSourceRiskOperationSettings();
-  }
-
-  /** Returns the object with the settings used for calls to createInspectOperation. */
-  public UnaryCallSettings
-      createInspectOperationSettings() {
-    return ((DlpServiceStubSettings) getStubSettings()).createInspectOperationSettings();
-  }
-
-  /** Returns the object with the settings used for calls to createInspectOperation. */
-  public OperationCallSettings<
-          CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
-      createInspectOperationOperationSettings() {
-    return ((DlpServiceStubSettings) getStubSettings()).createInspectOperationOperationSettings();
-  }
-
-  /** Returns the object with the settings used for calls to listInspectFindings. */
-  public UnaryCallSettings
-      listInspectFindingsSettings() {
-    return ((DlpServiceStubSettings) getStubSettings()).listInspectFindingsSettings();
-  }
-
-  /** Returns the object with the settings used for calls to listInfoTypes. */
-  public UnaryCallSettings listInfoTypesSettings() {
-    return ((DlpServiceStubSettings) getStubSettings()).listInfoTypesSettings();
-  }
-
-  /** Returns the object with the settings used for calls to listRootCategories. */
-  public UnaryCallSettings
-      listRootCategoriesSettings() {
-    return ((DlpServiceStubSettings) getStubSettings()).listRootCategoriesSettings();
-  }
-
-  public static final DlpServiceSettings create(DlpServiceStubSettings stub) throws IOException {
-    return new DlpServiceSettings.Builder(stub.toBuilder()).build();
-  }
-
-  /** Returns a builder for the default ExecutorProvider for this service. */
-  public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
-    return DlpServiceStubSettings.defaultExecutorProviderBuilder();
-  }
-
-  /** Returns the default service endpoint. */
-  public static String getDefaultEndpoint() {
-    return DlpServiceStubSettings.getDefaultEndpoint();
-  }
-
-  /** Returns the default service scopes. */
-  public static List getDefaultServiceScopes() {
-    return DlpServiceStubSettings.getDefaultServiceScopes();
-  }
-
-  /** Returns a builder for the default credentials for this service. */
-  public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
-    return DlpServiceStubSettings.defaultCredentialsProviderBuilder();
-  }
-
-  /** Returns a builder for the default ChannelProvider for this service. */
-  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    return DlpServiceStubSettings.defaultGrpcTransportProviderBuilder();
-  }
-
-  public static TransportChannelProvider defaultTransportChannelProvider() {
-    return DlpServiceStubSettings.defaultTransportChannelProvider();
-  }
-
-  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
-  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
-    return DlpServiceStubSettings.defaultApiClientHeaderProviderBuilder();
-  }
-
-  /** Returns a new builder for this class. */
-  public static Builder newBuilder() {
-    return Builder.createDefault();
-  }
-
-  /** Returns a new builder for this class. */
-  public static Builder newBuilder(ClientContext clientContext) {
-    return new Builder(clientContext);
-  }
-
-  /** Returns a builder containing all the values of this settings class. */
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  protected DlpServiceSettings(Builder settingsBuilder) throws IOException {
-    super(settingsBuilder);
-  }
-
-  /** Builder for DlpServiceSettings. */
-  public static class Builder extends ClientSettings.Builder {
-    protected Builder() throws IOException {
-      this((ClientContext) null);
-    }
-
-    protected Builder(ClientContext clientContext) {
-      super(DlpServiceStubSettings.newBuilder(clientContext));
-    }
-
-    private static Builder createDefault() {
-      return new Builder(DlpServiceStubSettings.newBuilder());
-    }
-
-    protected Builder(DlpServiceSettings settings) {
-      super(settings.getStubSettings().toBuilder());
-    }
-
-    protected Builder(DlpServiceStubSettings.Builder stubSettings) {
-      super(stubSettings);
-    }
-
-    public DlpServiceStubSettings.Builder getStubSettingsBuilder() {
-      return ((DlpServiceStubSettings.Builder) getStubSettings());
-    }
-
-    // NEXT_MAJOR_VER: remove 'throws Exception'
-    /**
-     * Applies the given settings updater function to all of the unary API methods in this service.
-     *
-     * 
Note: This method does not support applying settings to streaming methods.
-     */
-    public Builder applyToAllUnaryMethods(
-        ApiFunction, Void> settingsUpdater) throws Exception {
-      super.applyToAllUnaryMethods(
-          getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
-      return this;
-    }
-
-    /** Returns the builder for the settings used for calls to inspectContent. */
-    public UnaryCallSettings.Builder
-        inspectContentSettings() {
-      return getStubSettingsBuilder().inspectContentSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to redactContent. */
-    public UnaryCallSettings.Builder
-        redactContentSettings() {
-      return getStubSettingsBuilder().redactContentSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to deidentifyContent. */
-    public UnaryCallSettings.Builder
-        deidentifyContentSettings() {
-      return getStubSettingsBuilder().deidentifyContentSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to analyzeDataSourceRisk. */
-    public UnaryCallSettings.Builder
-        analyzeDataSourceRiskSettings() {
-      return getStubSettingsBuilder().analyzeDataSourceRiskSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to analyzeDataSourceRisk. */
-    public OperationCallSettings.Builder<
-            AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult,
-            RiskAnalysisOperationMetadata>
-        analyzeDataSourceRiskOperationSettings() {
-      return getStubSettingsBuilder().analyzeDataSourceRiskOperationSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to createInspectOperation. */
-    public UnaryCallSettings.Builder
-        createInspectOperationSettings() {
-      return getStubSettingsBuilder().createInspectOperationSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to createInspectOperation. */
-    public OperationCallSettings.Builder<
-            CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
-        createInspectOperationOperationSettings() {
-      return getStubSettingsBuilder().createInspectOperationOperationSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to listInspectFindings. */
-    public UnaryCallSettings.Builder
-        listInspectFindingsSettings() {
-      return getStubSettingsBuilder().listInspectFindingsSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to listInfoTypes. */
-    public UnaryCallSettings.Builder
-        listInfoTypesSettings() {
-      return getStubSettingsBuilder().listInfoTypesSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to listRootCategories. */
-    public UnaryCallSettings.Builder
-        listRootCategoriesSettings() {
-      return getStubSettingsBuilder().listRootCategoriesSettings();
-    }
-
-    @Override
-    public DlpServiceSettings build() throws IOException {
-      return new DlpServiceSettings(this);
-    }
-  }
-}
diff --git a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/package-info.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/package-info.java
deleted file mode 100644
index f96190535ddd..000000000000
--- a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/package-info.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
-/**
- * A client to DLP API.
- *
- * 
The interfaces provided are listed below, along with usage samples.
- *
- * 
================ DlpServiceClient ================
- *
- * 
Service Description: The DLP API is a service that allows clients to detect the presence of
- * Personally Identifiable Information (PII) and other privacy-sensitive data in user-supplied,
- * unstructured data streams, like text blocks or images. The service also includes methods for
- * sensitive data redaction and scheduling of data scans on Google Cloud Platform based data sets.
- *
- * 
Sample for DlpServiceClient:
- *
- * 
- * 
- * try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
- *   String name = "EMAIL_ADDRESS";
- *   InfoType infoTypesElement = InfoType.newBuilder()
- *     .setName(name)
- *     .build();
- *   List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
- *   InspectConfig inspectConfig = InspectConfig.newBuilder()
- *     .addAllInfoTypes(infoTypes)
- *     .build();
- *   String type = "text/plain";
- *   String value = "My email is example{@literal @}example.com.";
- *   ContentItem itemsElement = ContentItem.newBuilder()
- *     .setType(type)
- *     .setValue(value)
- *     .build();
- *   List<ContentItem> items = Arrays.asList(itemsElement);
- *   InspectContentResponse response = dlpServiceClient.inspectContent(inspectConfig, items);
- * }
- * 
- * 

- */
-package com.google.cloud.dlp.v2beta1;
diff --git a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStub.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStub.java
deleted file mode 100644
index 9db574d0e575..000000000000
--- a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStub.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-package com.google.cloud.dlp.v2beta1.stub;
-
-import com.google.api.core.BetaApi;
-import com.google.api.gax.core.BackgroundResource;
-import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.UnaryCallable;
-import com.google.longrunning.Operation;
-import com.google.longrunning.stub.OperationsStub;
-import com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest;
-import com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentResponse;
-import com.google.privacy.dlp.v2beta1.InspectContentRequest;
-import com.google.privacy.dlp.v2beta1.InspectContentResponse;
-import com.google.privacy.dlp.v2beta1.InspectOperationMetadata;
-import com.google.privacy.dlp.v2beta1.InspectOperationResult;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesRequest;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesResponse;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse;
-import com.google.privacy.dlp.v2beta1.RedactContentRequest;
-import com.google.privacy.dlp.v2beta1.RedactContentResponse;
-import com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata;
-import com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult;
-import javax.annotation.Generated;
-
-// AUTO-GENERATED DOCUMENTATION AND CLASS
-/**
- * Base stub class for DLP API.
- *
- * 
This class is for advanced usage and reflects the underlying API directly.
- */
-@Generated("by gapic-generator")
-@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
-public abstract class DlpServiceStub implements BackgroundResource {
-
-  public OperationsStub getOperationsStub() {
-    throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
-  }
-
-  public UnaryCallable inspectContentCallable() {
-    throw new UnsupportedOperationException("Not implemented: inspectContentCallable()");
-  }
-
-  public UnaryCallable redactContentCallable() {
-    throw new UnsupportedOperationException("Not implemented: redactContentCallable()");
-  }
-
-  public UnaryCallable
-      deidentifyContentCallable() {
-    throw new UnsupportedOperationException("Not implemented: deidentifyContentCallable()");
-  }
-
-  public OperationCallable<
-          AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
-      analyzeDataSourceRiskOperationCallable() {
-    throw new UnsupportedOperationException(
-        "Not implemented: analyzeDataSourceRiskOperationCallable()");
-  }
-
-  public UnaryCallable analyzeDataSourceRiskCallable() {
-    throw new UnsupportedOperationException("Not implemented: analyzeDataSourceRiskCallable()");
-  }
-
-  public OperationCallable<
-          CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
-      createInspectOperationOperationCallable() {
-    throw new UnsupportedOperationException(
-        "Not implemented: createInspectOperationOperationCallable()");
-  }
-
-  public UnaryCallable createInspectOperationCallable() {
-    throw new UnsupportedOperationException("Not implemented: createInspectOperationCallable()");
-  }
-
-  public UnaryCallable
-      listInspectFindingsCallable() {
-    throw new UnsupportedOperationException("Not implemented: listInspectFindingsCallable()");
-  }
-
-  public UnaryCallable listInfoTypesCallable() {
-    throw new UnsupportedOperationException("Not implemented: listInfoTypesCallable()");
-  }
-
-  public UnaryCallable
-      listRootCategoriesCallable() {
-    throw new UnsupportedOperationException("Not implemented: listRootCategoriesCallable()");
-  }
-
-  @Override
-  public abstract void close();
-}
diff --git a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStubSettings.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStubSettings.java
deleted file mode 100644
index b2ae514a205c..000000000000
--- a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/DlpServiceStubSettings.java
+++ /dev/null
@@ -1,579 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-package com.google.cloud.dlp.v2beta1.stub;
-
-import com.google.api.core.ApiFunction;
-import com.google.api.core.BetaApi;
-import com.google.api.gax.core.GaxProperties;
-import com.google.api.gax.core.GoogleCredentialsProvider;
-import com.google.api.gax.core.InstantiatingExecutorProvider;
-import com.google.api.gax.grpc.GaxGrpcProperties;
-import com.google.api.gax.grpc.GrpcTransportChannel;
-import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
-import com.google.api.gax.grpc.ProtoOperationTransformers;
-import com.google.api.gax.longrunning.OperationSnapshot;
-import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
-import com.google.api.gax.retrying.RetrySettings;
-import com.google.api.gax.rpc.ApiClientHeaderProvider;
-import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.OperationCallSettings;
-import com.google.api.gax.rpc.StatusCode;
-import com.google.api.gax.rpc.StubSettings;
-import com.google.api.gax.rpc.TransportChannelProvider;
-import com.google.api.gax.rpc.UnaryCallSettings;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.longrunning.Operation;
-import com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest;
-import com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentResponse;
-import com.google.privacy.dlp.v2beta1.InspectContentRequest;
-import com.google.privacy.dlp.v2beta1.InspectContentResponse;
-import com.google.privacy.dlp.v2beta1.InspectOperationMetadata;
-import com.google.privacy.dlp.v2beta1.InspectOperationResult;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesRequest;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesResponse;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse;
-import com.google.privacy.dlp.v2beta1.RedactContentRequest;
-import com.google.privacy.dlp.v2beta1.RedactContentResponse;
-import com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata;
-import com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult;
-import java.io.IOException;
-import java.util.List;
-import javax.annotation.Generated;
-import org.threeten.bp.Duration;
-
-// AUTO-GENERATED DOCUMENTATION AND CLASS
-/**
- * Settings class to configure an instance of {@link DlpServiceStub}.
- *
- * 
The default instance has everything set to sensible defaults:
- *
- * 
    
- *   
  • The default service address (dlp.googleapis.com) and default port (443) are used.
- *   
  • Credentials are acquired automatically through Application Default Credentials.
- *   
  • Retries are configured for idempotent methods but not for non-idempotent methods.
- * 

- *
- * 
The builder of this class is recursive, so contained classes are themselves builders. When
- * build() is called, the tree of builders is called to create the complete settings object. For
- * example, to set the total timeout of inspectContent to 30 seconds:
- *
- * 
- * 
- * DlpServiceStubSettings.Builder dlpServiceSettingsBuilder =
- *     DlpServiceStubSettings.newBuilder();
- * dlpServiceSettingsBuilder.inspectContentSettings().getRetrySettings().toBuilder()
- *     .setTotalTimeout(Duration.ofSeconds(30));
- * DlpServiceStubSettings dlpServiceSettings = dlpServiceSettingsBuilder.build();
- * 
- * 

- */
-@Generated("by gapic-generator")
-@BetaApi
-public class DlpServiceStubSettings extends StubSettings {
-  /** The default scopes of the service. */
-  private static final ImmutableList DEFAULT_SERVICE_SCOPES =
-      ImmutableList.builder().add("https://www.googleapis.com/auth/cloud-platform").build();
-
-  private final UnaryCallSettings
-      inspectContentSettings;
-  private final UnaryCallSettings
-      redactContentSettings;
-  private final UnaryCallSettings
-      deidentifyContentSettings;
-  private final UnaryCallSettings
-      analyzeDataSourceRiskSettings;
-  private final OperationCallSettings<
-          AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
-      analyzeDataSourceRiskOperationSettings;
-  private final UnaryCallSettings
-      createInspectOperationSettings;
-  private final OperationCallSettings<
-          CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
-      createInspectOperationOperationSettings;
-  private final UnaryCallSettings
-      listInspectFindingsSettings;
-  private final UnaryCallSettings
-      listInfoTypesSettings;
-  private final UnaryCallSettings
-      listRootCategoriesSettings;
-
-  /** Returns the object with the settings used for calls to inspectContent. */
-  public UnaryCallSettings inspectContentSettings() {
-    return inspectContentSettings;
-  }
-
-  /** Returns the object with the settings used for calls to redactContent. */
-  public UnaryCallSettings redactContentSettings() {
-    return redactContentSettings;
-  }
-
-  /** Returns the object with the settings used for calls to deidentifyContent. */
-  public UnaryCallSettings
-      deidentifyContentSettings() {
-    return deidentifyContentSettings;
-  }
-
-  /** Returns the object with the settings used for calls to analyzeDataSourceRisk. */
-  public UnaryCallSettings
-      analyzeDataSourceRiskSettings() {
-    return analyzeDataSourceRiskSettings;
-  }
-
-  /** Returns the object with the settings used for calls to analyzeDataSourceRisk. */
-  public OperationCallSettings<
-          AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
-      analyzeDataSourceRiskOperationSettings() {
-    return analyzeDataSourceRiskOperationSettings;
-  }
-
-  /** Returns the object with the settings used for calls to createInspectOperation. */
-  public UnaryCallSettings
-      createInspectOperationSettings() {
-    return createInspectOperationSettings;
-  }
-
-  /** Returns the object with the settings used for calls to createInspectOperation. */
-  public OperationCallSettings<
-          CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
-      createInspectOperationOperationSettings() {
-    return createInspectOperationOperationSettings;
-  }
-
-  /** Returns the object with the settings used for calls to listInspectFindings. */
-  public UnaryCallSettings
-      listInspectFindingsSettings() {
-    return listInspectFindingsSettings;
-  }
-
-  /** Returns the object with the settings used for calls to listInfoTypes. */
-  public UnaryCallSettings listInfoTypesSettings() {
-    return listInfoTypesSettings;
-  }
-
-  /** Returns the object with the settings used for calls to listRootCategories. */
-  public UnaryCallSettings
-      listRootCategoriesSettings() {
-    return listRootCategoriesSettings;
-  }
-
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
-  public DlpServiceStub createStub() throws IOException {
-    if (getTransportChannelProvider()
-        .getTransportName()
-        .equals(GrpcTransportChannel.getGrpcTransportName())) {
-      return GrpcDlpServiceStub.create(this);
-    } else {
-      throw new UnsupportedOperationException(
-          "Transport not supported: " + getTransportChannelProvider().getTransportName());
-    }
-  }
-
-  /** Returns a builder for the default ExecutorProvider for this service. */
-  public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
-    return InstantiatingExecutorProvider.newBuilder();
-  }
-
-  /** Returns the default service endpoint. */
-  public static String getDefaultEndpoint() {
-    return "dlp.googleapis.com:443";
-  }
-
-  /** Returns the default service scopes. */
-  public static List getDefaultServiceScopes() {
-    return DEFAULT_SERVICE_SCOPES;
-  }
-
-  /** Returns a builder for the default credentials for this service. */
-  public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
-    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
-  }
-
-  /** Returns a builder for the default ChannelProvider for this service. */
-  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
-    return InstantiatingGrpcChannelProvider.newBuilder();
-  }
-
-  public static TransportChannelProvider defaultTransportChannelProvider() {
-    return defaultGrpcTransportProviderBuilder().build();
-  }
-
-  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
-  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
-    return ApiClientHeaderProvider.newBuilder()
-        .setGeneratedLibToken(
-            "gapic", GaxProperties.getLibraryVersion(DlpServiceStubSettings.class))
-        .setTransportToken(
-            GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
-  }
-
-  /** Returns a new builder for this class. */
-  public static Builder newBuilder() {
-    return Builder.createDefault();
-  }
-
-  /** Returns a new builder for this class. */
-  public static Builder newBuilder(ClientContext clientContext) {
-    return new Builder(clientContext);
-  }
-
-  /** Returns a builder containing all the values of this settings class. */
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  protected DlpServiceStubSettings(Builder settingsBuilder) throws IOException {
-    super(settingsBuilder);
-
-    inspectContentSettings = settingsBuilder.inspectContentSettings().build();
-    redactContentSettings = settingsBuilder.redactContentSettings().build();
-    deidentifyContentSettings = settingsBuilder.deidentifyContentSettings().build();
-    analyzeDataSourceRiskSettings = settingsBuilder.analyzeDataSourceRiskSettings().build();
-    analyzeDataSourceRiskOperationSettings =
-        settingsBuilder.analyzeDataSourceRiskOperationSettings().build();
-    createInspectOperationSettings = settingsBuilder.createInspectOperationSettings().build();
-    createInspectOperationOperationSettings =
-        settingsBuilder.createInspectOperationOperationSettings().build();
-    listInspectFindingsSettings = settingsBuilder.listInspectFindingsSettings().build();
-    listInfoTypesSettings = settingsBuilder.listInfoTypesSettings().build();
-    listRootCategoriesSettings = settingsBuilder.listRootCategoriesSettings().build();
-  }
-
-  /** Builder for DlpServiceStubSettings. */
-  public static class Builder extends StubSettings.Builder {
-    private final ImmutableList> unaryMethodSettingsBuilders;
-
-    private final UnaryCallSettings.Builder
-        inspectContentSettings;
-    private final UnaryCallSettings.Builder
-        redactContentSettings;
-    private final UnaryCallSettings.Builder
-        deidentifyContentSettings;
-    private final UnaryCallSettings.Builder
-        analyzeDataSourceRiskSettings;
-    private final OperationCallSettings.Builder<
-            AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult,
-            RiskAnalysisOperationMetadata>
-        analyzeDataSourceRiskOperationSettings;
-    private final UnaryCallSettings.Builder
-        createInspectOperationSettings;
-    private final OperationCallSettings.Builder<
-            CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
-        createInspectOperationOperationSettings;
-    private final UnaryCallSettings.Builder
-        listInspectFindingsSettings;
-    private final UnaryCallSettings.Builder
-        listInfoTypesSettings;
-    private final UnaryCallSettings.Builder
-        listRootCategoriesSettings;
-
-    private static final ImmutableMap>
-        RETRYABLE_CODE_DEFINITIONS;
-
-    static {
-      ImmutableMap.Builder> definitions =
-          ImmutableMap.builder();
-      definitions.put(
-          "idempotent",
-          ImmutableSet.copyOf(
-              Lists.newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList()));
-      RETRYABLE_CODE_DEFINITIONS = definitions.build();
-    }
-
-    private static final ImmutableMap RETRY_PARAM_DEFINITIONS;
-
-    static {
-      ImmutableMap.Builder definitions = ImmutableMap.builder();
-      RetrySettings settings = null;
-      settings =
-          RetrySettings.newBuilder()
-              .setInitialRetryDelay(Duration.ofMillis(100L))
-              .setRetryDelayMultiplier(1.3)
-              .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
-              .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
-              .build();
-      definitions.put("default", settings);
-      RETRY_PARAM_DEFINITIONS = definitions.build();
-    }
-
-    protected Builder() {
-      this((ClientContext) null);
-    }
-
-    protected Builder(ClientContext clientContext) {
-      super(clientContext);
-
-      inspectContentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      redactContentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      deidentifyContentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      analyzeDataSourceRiskSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      analyzeDataSourceRiskOperationSettings = OperationCallSettings.newBuilder();
-
-      createInspectOperationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      createInspectOperationOperationSettings = OperationCallSettings.newBuilder();
-
-      listInspectFindingsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      listInfoTypesSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      listRootCategoriesSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      unaryMethodSettingsBuilders =
-          ImmutableList.>of(
-              inspectContentSettings,
-              redactContentSettings,
-              deidentifyContentSettings,
-              analyzeDataSourceRiskSettings,
-              createInspectOperationSettings,
-              listInspectFindingsSettings,
-              listInfoTypesSettings,
-              listRootCategoriesSettings);
-
-      initDefaults(this);
-    }
-
-    private static Builder createDefault() {
-      Builder builder = new Builder((ClientContext) null);
-      builder.setTransportChannelProvider(defaultTransportChannelProvider());
-      builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
-      builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
-      builder.setEndpoint(getDefaultEndpoint());
-      return initDefaults(builder);
-    }
-
-    private static Builder initDefaults(Builder builder) {
-
-      builder
-          .inspectContentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .redactContentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .deidentifyContentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .analyzeDataSourceRiskSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .createInspectOperationSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .listInspectFindingsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .listInfoTypesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      builder
-          .listRootCategoriesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-      builder
-          .analyzeDataSourceRiskOperationSettings()
-          .setInitialCallSettings(
-              UnaryCallSettings
-                  .newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
-                  .build())
-          .setResponseTransformer(
-              ProtoOperationTransformers.ResponseTransformer.create(
-                  RiskAnalysisOperationResult.class))
-          .setMetadataTransformer(
-              ProtoOperationTransformers.MetadataTransformer.create(
-                  RiskAnalysisOperationMetadata.class))
-          .setPollingAlgorithm(
-              OperationTimedPollAlgorithm.create(
-                  RetrySettings.newBuilder()
-                      .setInitialRetryDelay(Duration.ofMillis(20000L))
-                      .setRetryDelayMultiplier(1.5)
-                      .setMaxRetryDelay(Duration.ofMillis(45000L))
-                      .setInitialRpcTimeout(Duration.ZERO) // ignored
-                      .setRpcTimeoutMultiplier(1.0) // ignored
-                      .setMaxRpcTimeout(Duration.ZERO) // ignored
-                      .setTotalTimeout(Duration.ofMillis(86400000L))
-                      .build()));
-      builder
-          .createInspectOperationOperationSettings()
-          .setInitialCallSettings(
-              UnaryCallSettings
-                  .newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
-                  .build())
-          .setResponseTransformer(
-              ProtoOperationTransformers.ResponseTransformer.create(InspectOperationResult.class))
-          .setMetadataTransformer(
-              ProtoOperationTransformers.MetadataTransformer.create(InspectOperationMetadata.class))
-          .setPollingAlgorithm(
-              OperationTimedPollAlgorithm.create(
-                  RetrySettings.newBuilder()
-                      .setInitialRetryDelay(Duration.ofMillis(20000L))
-                      .setRetryDelayMultiplier(1.5)
-                      .setMaxRetryDelay(Duration.ofMillis(45000L))
-                      .setInitialRpcTimeout(Duration.ZERO) // ignored
-                      .setRpcTimeoutMultiplier(1.0) // ignored
-                      .setMaxRpcTimeout(Duration.ZERO) // ignored
-                      .setTotalTimeout(Duration.ofMillis(86400000L))
-                      .build()));
-
-      return builder;
-    }
-
-    protected Builder(DlpServiceStubSettings settings) {
-      super(settings);
-
-      inspectContentSettings = settings.inspectContentSettings.toBuilder();
-      redactContentSettings = settings.redactContentSettings.toBuilder();
-      deidentifyContentSettings = settings.deidentifyContentSettings.toBuilder();
-      analyzeDataSourceRiskSettings = settings.analyzeDataSourceRiskSettings.toBuilder();
-      analyzeDataSourceRiskOperationSettings =
-          settings.analyzeDataSourceRiskOperationSettings.toBuilder();
-      createInspectOperationSettings = settings.createInspectOperationSettings.toBuilder();
-      createInspectOperationOperationSettings =
-          settings.createInspectOperationOperationSettings.toBuilder();
-      listInspectFindingsSettings = settings.listInspectFindingsSettings.toBuilder();
-      listInfoTypesSettings = settings.listInfoTypesSettings.toBuilder();
-      listRootCategoriesSettings = settings.listRootCategoriesSettings.toBuilder();
-
-      unaryMethodSettingsBuilders =
-          ImmutableList.>of(
-              inspectContentSettings,
-              redactContentSettings,
-              deidentifyContentSettings,
-              analyzeDataSourceRiskSettings,
-              createInspectOperationSettings,
-              listInspectFindingsSettings,
-              listInfoTypesSettings,
-              listRootCategoriesSettings);
-    }
-
-    // NEXT_MAJOR_VER: remove 'throws Exception'
-    /**
-     * Applies the given settings updater function to all of the unary API methods in this service.
-     *
-     * 
Note: This method does not support applying settings to streaming methods.
-     */
-    public Builder applyToAllUnaryMethods(
-        ApiFunction, Void> settingsUpdater) throws Exception {
-      super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
-      return this;
-    }
-
-    public ImmutableList> unaryMethodSettingsBuilders() {
-      return unaryMethodSettingsBuilders;
-    }
-
-    /** Returns the builder for the settings used for calls to inspectContent. */
-    public UnaryCallSettings.Builder
-        inspectContentSettings() {
-      return inspectContentSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to redactContent. */
-    public UnaryCallSettings.Builder
-        redactContentSettings() {
-      return redactContentSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to deidentifyContent. */
-    public UnaryCallSettings.Builder
-        deidentifyContentSettings() {
-      return deidentifyContentSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to analyzeDataSourceRisk. */
-    public UnaryCallSettings.Builder
-        analyzeDataSourceRiskSettings() {
-      return analyzeDataSourceRiskSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to analyzeDataSourceRisk. */
-    public OperationCallSettings.Builder<
-            AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult,
-            RiskAnalysisOperationMetadata>
-        analyzeDataSourceRiskOperationSettings() {
-      return analyzeDataSourceRiskOperationSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to createInspectOperation. */
-    public UnaryCallSettings.Builder
-        createInspectOperationSettings() {
-      return createInspectOperationSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to createInspectOperation. */
-    public OperationCallSettings.Builder<
-            CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
-        createInspectOperationOperationSettings() {
-      return createInspectOperationOperationSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to listInspectFindings. */
-    public UnaryCallSettings.Builder
-        listInspectFindingsSettings() {
-      return listInspectFindingsSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to listInfoTypes. */
-    public UnaryCallSettings.Builder
-        listInfoTypesSettings() {
-      return listInfoTypesSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to listRootCategories. */
-    public UnaryCallSettings.Builder
-        listRootCategoriesSettings() {
-      return listRootCategoriesSettings;
-    }
-
-    @Override
-    public DlpServiceStubSettings build() throws IOException {
-      return new DlpServiceStubSettings(this);
-    }
-  }
-}
diff --git a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceStub.java b/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceStub.java
deleted file mode 100644
index 779035a7e2f5..000000000000
--- a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceStub.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-package com.google.cloud.dlp.v2beta1.stub;
-
-import com.google.api.core.BetaApi;
-import com.google.api.gax.core.BackgroundResource;
-import com.google.api.gax.core.BackgroundResourceAggregation;
-import com.google.api.gax.grpc.GrpcCallSettings;
-import com.google.api.gax.grpc.GrpcStubCallableFactory;
-import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.UnaryCallable;
-import com.google.longrunning.Operation;
-import com.google.longrunning.stub.GrpcOperationsStub;
-import com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest;
-import com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentResponse;
-import com.google.privacy.dlp.v2beta1.InspectContentRequest;
-import com.google.privacy.dlp.v2beta1.InspectContentResponse;
-import com.google.privacy.dlp.v2beta1.InspectOperationMetadata;
-import com.google.privacy.dlp.v2beta1.InspectOperationResult;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesRequest;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesResponse;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse;
-import com.google.privacy.dlp.v2beta1.RedactContentRequest;
-import com.google.privacy.dlp.v2beta1.RedactContentResponse;
-import com.google.privacy.dlp.v2beta1.RiskAnalysisOperationMetadata;
-import com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult;
-import io.grpc.MethodDescriptor;
-import io.grpc.protobuf.ProtoUtils;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.Generated;
-
-// AUTO-GENERATED DOCUMENTATION AND CLASS
-/**
- * gRPC stub implementation for DLP API.
- *
- * 
This class is for advanced usage and reflects the underlying API directly.
- */
-@Generated("by gapic-generator")
-@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
-public class GrpcDlpServiceStub extends DlpServiceStub {
-
-  private static final MethodDescriptor
-      inspectContentMethodDescriptor =
-          MethodDescriptor.newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.privacy.dlp.v2beta1.DlpService/InspectContent")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(InspectContentRequest.getDefaultInstance()))
-              .setResponseMarshaller(
-                  ProtoUtils.marshaller(InspectContentResponse.getDefaultInstance()))
-              .build();
-  private static final MethodDescriptor
-      redactContentMethodDescriptor =
-          MethodDescriptor.newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.privacy.dlp.v2beta1.DlpService/RedactContent")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(RedactContentRequest.getDefaultInstance()))
-              .setResponseMarshaller(
-                  ProtoUtils.marshaller(RedactContentResponse.getDefaultInstance()))
-              .build();
-  private static final MethodDescriptor
-      deidentifyContentMethodDescriptor =
-          MethodDescriptor.newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.privacy.dlp.v2beta1.DlpService/DeidentifyContent")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(DeidentifyContentRequest.getDefaultInstance()))
-              .setResponseMarshaller(
-                  ProtoUtils.marshaller(DeidentifyContentResponse.getDefaultInstance()))
-              .build();
-  private static final MethodDescriptor
-      analyzeDataSourceRiskMethodDescriptor =
-          MethodDescriptor.newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.privacy.dlp.v2beta1.DlpService/AnalyzeDataSourceRisk")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(AnalyzeDataSourceRiskRequest.getDefaultInstance()))
-              .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
-              .build();
-  private static final MethodDescriptor
-      createInspectOperationMethodDescriptor =
-          MethodDescriptor.newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.privacy.dlp.v2beta1.DlpService/CreateInspectOperation")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(CreateInspectOperationRequest.getDefaultInstance()))
-              .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
-              .build();
-  private static final MethodDescriptor
-      listInspectFindingsMethodDescriptor =
-          MethodDescriptor.newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.privacy.dlp.v2beta1.DlpService/ListInspectFindings")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(ListInspectFindingsRequest.getDefaultInstance()))
-              .setResponseMarshaller(
-                  ProtoUtils.marshaller(ListInspectFindingsResponse.getDefaultInstance()))
-              .build();
-  private static final MethodDescriptor
-      listInfoTypesMethodDescriptor =
-          MethodDescriptor.newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.privacy.dlp.v2beta1.DlpService/ListInfoTypes")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(ListInfoTypesRequest.getDefaultInstance()))
-              .setResponseMarshaller(
-                  ProtoUtils.marshaller(ListInfoTypesResponse.getDefaultInstance()))
-              .build();
-  private static final MethodDescriptor
-      listRootCategoriesMethodDescriptor =
-          MethodDescriptor.newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.privacy.dlp.v2beta1.DlpService/ListRootCategories")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(ListRootCategoriesRequest.getDefaultInstance()))
-              .setResponseMarshaller(
-                  ProtoUtils.marshaller(ListRootCategoriesResponse.getDefaultInstance()))
-              .build();
-
-  private final BackgroundResource backgroundResources;
-  private final GrpcOperationsStub operationsStub;
-
-  private final UnaryCallable inspectContentCallable;
-  private final UnaryCallable redactContentCallable;
-  private final UnaryCallable
-      deidentifyContentCallable;
-  private final UnaryCallable
-      analyzeDataSourceRiskCallable;
-  private final OperationCallable<
-          AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
-      analyzeDataSourceRiskOperationCallable;
-  private final UnaryCallable
-      createInspectOperationCallable;
-  private final OperationCallable<
-          CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
-      createInspectOperationOperationCallable;
-  private final UnaryCallable
-      listInspectFindingsCallable;
-  private final UnaryCallable listInfoTypesCallable;
-  private final UnaryCallable
-      listRootCategoriesCallable;
-
-  private final GrpcStubCallableFactory callableFactory;
-
-  public static final GrpcDlpServiceStub create(DlpServiceStubSettings settings)
-      throws IOException {
-    return new GrpcDlpServiceStub(settings, ClientContext.create(settings));
-  }
-
-  public static final GrpcDlpServiceStub create(ClientContext clientContext) throws IOException {
-    return new GrpcDlpServiceStub(DlpServiceStubSettings.newBuilder().build(), clientContext);
-  }
-
-  public static final GrpcDlpServiceStub create(
-      ClientContext clientContext, GrpcStubCallableFactory callableFactory) throws IOException {
-    return new GrpcDlpServiceStub(
-        DlpServiceStubSettings.newBuilder().build(), clientContext, callableFactory);
-  }
-
-  /**
-   * Constructs an instance of GrpcDlpServiceStub, using the given settings. This is protected so
-   * that it is easy to make a subclass, but otherwise, the static factory methods should be
-   * preferred.
-   */
-  protected GrpcDlpServiceStub(DlpServiceStubSettings settings, ClientContext clientContext)
-      throws IOException {
-    this(settings, clientContext, new GrpcDlpServiceCallableFactory());
-  }
-
-  /**
-   * Constructs an instance of GrpcDlpServiceStub, using the given settings. This is protected so
-   * that it is easy to make a subclass, but otherwise, the static factory methods should be
-   * preferred.
-   */
-  protected GrpcDlpServiceStub(
-      DlpServiceStubSettings settings,
-      ClientContext clientContext,
-      GrpcStubCallableFactory callableFactory)
-      throws IOException {
-    this.callableFactory = callableFactory;
-    this.operationsStub = GrpcOperationsStub.create(clientContext, callableFactory);
-
-    GrpcCallSettings
-        inspectContentTransportSettings =
-            GrpcCallSettings.newBuilder()
-                .setMethodDescriptor(inspectContentMethodDescriptor)
-                .build();
-    GrpcCallSettings redactContentTransportSettings =
-        GrpcCallSettings.newBuilder()
-            .setMethodDescriptor(redactContentMethodDescriptor)
-            .build();
-    GrpcCallSettings
-        deidentifyContentTransportSettings =
-            GrpcCallSettings.newBuilder()
-                .setMethodDescriptor(deidentifyContentMethodDescriptor)
-                .build();
-    GrpcCallSettings
-        analyzeDataSourceRiskTransportSettings =
-            GrpcCallSettings.newBuilder()
-                .setMethodDescriptor(analyzeDataSourceRiskMethodDescriptor)
-                .build();
-    GrpcCallSettings
-        createInspectOperationTransportSettings =
-            GrpcCallSettings.newBuilder()
-                .setMethodDescriptor(createInspectOperationMethodDescriptor)
-                .build();
-    GrpcCallSettings
-        listInspectFindingsTransportSettings =
-            GrpcCallSettings.newBuilder()
-                .setMethodDescriptor(listInspectFindingsMethodDescriptor)
-                .build();
-    GrpcCallSettings listInfoTypesTransportSettings =
-        GrpcCallSettings.newBuilder()
-            .setMethodDescriptor(listInfoTypesMethodDescriptor)
-            .build();
-    GrpcCallSettings
-        listRootCategoriesTransportSettings =
-            GrpcCallSettings.newBuilder()
-                .setMethodDescriptor(listRootCategoriesMethodDescriptor)
-                .build();
-
-    this.inspectContentCallable =
-        callableFactory.createUnaryCallable(
-            inspectContentTransportSettings, settings.inspectContentSettings(), clientContext);
-    this.redactContentCallable =
-        callableFactory.createUnaryCallable(
-            redactContentTransportSettings, settings.redactContentSettings(), clientContext);
-    this.deidentifyContentCallable =
-        callableFactory.createUnaryCallable(
-            deidentifyContentTransportSettings,
-            settings.deidentifyContentSettings(),
-            clientContext);
-    this.analyzeDataSourceRiskCallable =
-        callableFactory.createUnaryCallable(
-            analyzeDataSourceRiskTransportSettings,
-            settings.analyzeDataSourceRiskSettings(),
-            clientContext);
-    this.analyzeDataSourceRiskOperationCallable =
-        callableFactory.createOperationCallable(
-            analyzeDataSourceRiskTransportSettings,
-            settings.analyzeDataSourceRiskOperationSettings(),
-            clientContext,
-            this.operationsStub);
-    this.createInspectOperationCallable =
-        callableFactory.createUnaryCallable(
-            createInspectOperationTransportSettings,
-            settings.createInspectOperationSettings(),
-            clientContext);
-    this.createInspectOperationOperationCallable =
-        callableFactory.createOperationCallable(
-            createInspectOperationTransportSettings,
-            settings.createInspectOperationOperationSettings(),
-            clientContext,
-            this.operationsStub);
-    this.listInspectFindingsCallable =
-        callableFactory.createUnaryCallable(
-            listInspectFindingsTransportSettings,
-            settings.listInspectFindingsSettings(),
-            clientContext);
-    this.listInfoTypesCallable =
-        callableFactory.createUnaryCallable(
-            listInfoTypesTransportSettings, settings.listInfoTypesSettings(), clientContext);
-    this.listRootCategoriesCallable =
-        callableFactory.createUnaryCallable(
-            listRootCategoriesTransportSettings,
-            settings.listRootCategoriesSettings(),
-            clientContext);
-
-    backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
-  }
-
-  public GrpcOperationsStub getOperationsStub() {
-    return operationsStub;
-  }
-
-  public UnaryCallable inspectContentCallable() {
-    return inspectContentCallable;
-  }
-
-  public UnaryCallable redactContentCallable() {
-    return redactContentCallable;
-  }
-
-  public UnaryCallable
-      deidentifyContentCallable() {
-    return deidentifyContentCallable;
-  }
-
-  public OperationCallable<
-          AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
-      analyzeDataSourceRiskOperationCallable() {
-    return analyzeDataSourceRiskOperationCallable;
-  }
-
-  public UnaryCallable analyzeDataSourceRiskCallable() {
-    return analyzeDataSourceRiskCallable;
-  }
-
-  public OperationCallable<
-          CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
-      createInspectOperationOperationCallable() {
-    return createInspectOperationOperationCallable;
-  }
-
-  public UnaryCallable createInspectOperationCallable() {
-    return createInspectOperationCallable;
-  }
-
-  public UnaryCallable
-      listInspectFindingsCallable() {
-    return listInspectFindingsCallable;
-  }
-
-  public UnaryCallable listInfoTypesCallable() {
-    return listInfoTypesCallable;
-  }
-
-  public UnaryCallable
-      listRootCategoriesCallable() {
-    return listRootCategoriesCallable;
-  }
-
-  @Override
-  public final void close() {
-    shutdown();
-  }
-
-  @Override
-  public void shutdown() {
-    backgroundResources.shutdown();
-  }
-
-  @Override
-  public boolean isShutdown() {
-    return backgroundResources.isShutdown();
-  }
-
-  @Override
-  public boolean isTerminated() {
-    return backgroundResources.isTerminated();
-  }
-
-  @Override
-  public void shutdownNow() {
-    backgroundResources.shutdownNow();
-  }
-
-  @Override
-  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
-    return backgroundResources.awaitTermination(duration, unit);
-  }
-}
diff --git a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java
deleted file mode 100644
index dce909ca675d..000000000000
--- a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.google.cloud.dlp.v2beta1;
-
-import com.google.privacy.dlp.v2beta1.Color;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ColorTest {
-
-  @Test
-  public void asDlpColorTest() {
-    Color got = Colors.asDlpColor(new java.awt.Color(1, 2, 3));
-    Assert.assertEquals(got.getBlue(), 3, 0);
-    Assert.assertEquals(got.getGreen(), 2, 0);
-    Assert.assertEquals(got.getRed(), 1, 0);
-  }
-
-  @Test
-  public void asAwtColorTest() {
-    java.awt.Color got =
-        Colors.asAwtColor(Color.newBuilder().setRed(1).setGreen(2).setBlue(3).build());
-
-    Assert.assertEquals(got.getBlue(), 3, 0);
-    Assert.assertEquals(got.getGreen(), 2, 0);
-    Assert.assertEquals(got.getRed(), 1, 0);
-  }
-}
diff --git a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceClientTest.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceClientTest.java
deleted file mode 100644
index a086d7321caa..000000000000
--- a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceClientTest.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-package com.google.cloud.dlp.v2beta1;
-
-import com.google.api.gax.core.NoCredentialsProvider;
-import com.google.api.gax.grpc.GaxGrpcProperties;
-import com.google.api.gax.grpc.testing.LocalChannelProvider;
-import com.google.api.gax.grpc.testing.MockGrpcService;
-import com.google.api.gax.grpc.testing.MockServiceHelper;
-import com.google.api.gax.rpc.ApiClientHeaderProvider;
-import com.google.api.gax.rpc.InvalidArgumentException;
-import com.google.api.gax.rpc.StatusCode;
-import com.google.longrunning.Operation;
-import com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest;
-import com.google.privacy.dlp.v2beta1.BigQueryTable;
-import com.google.privacy.dlp.v2beta1.CloudStorageOptions;
-import com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet;
-import com.google.privacy.dlp.v2beta1.ContentItem;
-import com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyConfig;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentResponse;
-import com.google.privacy.dlp.v2beta1.InfoType;
-import com.google.privacy.dlp.v2beta1.InspectConfig;
-import com.google.privacy.dlp.v2beta1.InspectContentRequest;
-import com.google.privacy.dlp.v2beta1.InspectContentResponse;
-import com.google.privacy.dlp.v2beta1.InspectOperationResult;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesRequest;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesResponse;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse;
-import com.google.privacy.dlp.v2beta1.OutputStorageConfig;
-import com.google.privacy.dlp.v2beta1.PrivacyMetric;
-import com.google.privacy.dlp.v2beta1.ResultName;
-import com.google.privacy.dlp.v2beta1.RiskAnalysisOperationResult;
-import com.google.privacy.dlp.v2beta1.StorageConfig;
-import com.google.protobuf.Any;
-import com.google.protobuf.GeneratedMessageV3;
-import io.grpc.Status;
-import io.grpc.StatusRuntimeException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-@javax.annotation.Generated("by GAPIC")
-public class DlpServiceClientTest {
-  private static MockDlpService mockDlpService;
-  private static MockServiceHelper serviceHelper;
-  private DlpServiceClient client;
-  private LocalChannelProvider channelProvider;
-
-  @BeforeClass
-  public static void startStaticServer() {
-    mockDlpService = new MockDlpService();
-    serviceHelper =
-        new MockServiceHelper("in-process-1", Arrays.asList(mockDlpService));
-    serviceHelper.start();
-  }
-
-  @AfterClass
-  public static void stopServer() {
-    serviceHelper.stop();
-  }
-
-  @Before
-  public void setUp() throws IOException {
-    serviceHelper.reset();
-    channelProvider = serviceHelper.createChannelProvider();
-    DlpServiceSettings settings =
-        DlpServiceSettings.newBuilder()
-            .setTransportChannelProvider(channelProvider)
-            .setCredentialsProvider(NoCredentialsProvider.create())
-            .build();
-    client = DlpServiceClient.create(settings);
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    client.close();
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void inspectContentTest() {
-    InspectContentResponse expectedResponse = InspectContentResponse.newBuilder().build();
-    mockDlpService.addResponse(expectedResponse);
-
-    String name = "EMAIL_ADDRESS";
-    InfoType infoTypesElement = InfoType.newBuilder().setName(name).build();
-    List infoTypes = Arrays.asList(infoTypesElement);
-    InspectConfig inspectConfig = InspectConfig.newBuilder().addAllInfoTypes(infoTypes).build();
-    String type = "text/plain";
-    String value = "My email is example@example.com.";
-    ContentItem itemsElement = ContentItem.newBuilder().setType(type).setValue(value).build();
-    List items = Arrays.asList(itemsElement);
-
-    InspectContentResponse actualResponse = client.inspectContent(inspectConfig, items);
-    Assert.assertEquals(expectedResponse, actualResponse);
-
-    List actualRequests = mockDlpService.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    InspectContentRequest actualRequest = (InspectContentRequest) actualRequests.get(0);
-
-    Assert.assertEquals(inspectConfig, actualRequest.getInspectConfig());
-    Assert.assertEquals(items, actualRequest.getItemsList());
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void inspectContentExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockDlpService.addException(exception);
-
-    try {
-      String name = "EMAIL_ADDRESS";
-      InfoType infoTypesElement = InfoType.newBuilder().setName(name).build();
-      List infoTypes = Arrays.asList(infoTypesElement);
-      InspectConfig inspectConfig = InspectConfig.newBuilder().addAllInfoTypes(infoTypes).build();
-      String type = "text/plain";
-      String value = "My email is example@example.com.";
-      ContentItem itemsElement = ContentItem.newBuilder().setType(type).setValue(value).build();
-      List items = Arrays.asList(itemsElement);
-
-      client.inspectContent(inspectConfig, items);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deidentifyContentTest() {
-    DeidentifyContentResponse expectedResponse = DeidentifyContentResponse.newBuilder().build();
-    mockDlpService.addResponse(expectedResponse);
-
-    DeidentifyConfig deidentifyConfig = DeidentifyConfig.newBuilder().build();
-    InspectConfig inspectConfig = InspectConfig.newBuilder().build();
-    List items = new ArrayList<>();
-
-    DeidentifyContentResponse actualResponse =
-        client.deidentifyContent(deidentifyConfig, inspectConfig, items);
-    Assert.assertEquals(expectedResponse, actualResponse);
-
-    List actualRequests = mockDlpService.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    DeidentifyContentRequest actualRequest = (DeidentifyContentRequest) actualRequests.get(0);
-
-    Assert.assertEquals(deidentifyConfig, actualRequest.getDeidentifyConfig());
-    Assert.assertEquals(inspectConfig, actualRequest.getInspectConfig());
-    Assert.assertEquals(items, actualRequest.getItemsList());
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deidentifyContentExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockDlpService.addException(exception);
-
-    try {
-      DeidentifyConfig deidentifyConfig = DeidentifyConfig.newBuilder().build();
-      InspectConfig inspectConfig = InspectConfig.newBuilder().build();
-      List items = new ArrayList<>();
-
-      client.deidentifyContent(deidentifyConfig, inspectConfig, items);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void analyzeDataSourceRiskTest() throws Exception {
-    RiskAnalysisOperationResult expectedResponse = RiskAnalysisOperationResult.newBuilder().build();
-    Operation resultOperation =
-        Operation.newBuilder()
-            .setName("analyzeDataSourceRiskTest")
-            .setDone(true)
-            .setResponse(Any.pack(expectedResponse))
-            .build();
-    mockDlpService.addResponse(resultOperation);
-
-    PrivacyMetric privacyMetric = PrivacyMetric.newBuilder().build();
-    BigQueryTable sourceTable = BigQueryTable.newBuilder().build();
-
-    RiskAnalysisOperationResult actualResponse =
-        client.analyzeDataSourceRiskAsync(privacyMetric, sourceTable).get();
-    Assert.assertEquals(expectedResponse, actualResponse);
-
-    List actualRequests = mockDlpService.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    AnalyzeDataSourceRiskRequest actualRequest =
-        (AnalyzeDataSourceRiskRequest) actualRequests.get(0);
-
-    Assert.assertEquals(privacyMetric, actualRequest.getPrivacyMetric());
-    Assert.assertEquals(sourceTable, actualRequest.getSourceTable());
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void analyzeDataSourceRiskExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockDlpService.addException(exception);
-
-    try {
-      PrivacyMetric privacyMetric = PrivacyMetric.newBuilder().build();
-      BigQueryTable sourceTable = BigQueryTable.newBuilder().build();
-
-      client.analyzeDataSourceRiskAsync(privacyMetric, sourceTable).get();
-      Assert.fail("No exception raised");
-    } catch (ExecutionException e) {
-      Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());
-      InvalidArgumentException apiException = (InvalidArgumentException) e.getCause();
-      Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode());
-    }
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void createInspectOperationTest() throws Exception {
-    ResultName name2 = ResultName.of("[RESULT]");
-    InspectOperationResult expectedResponse =
-        InspectOperationResult.newBuilder().setName(name2.toString()).build();
-    Operation resultOperation =
-        Operation.newBuilder()
-            .setName("createInspectOperationTest")
-            .setDone(true)
-            .setResponse(Any.pack(expectedResponse))
-            .build();
-    mockDlpService.addResponse(resultOperation);
-
-    String name = "EMAIL_ADDRESS";
-    InfoType infoTypesElement = InfoType.newBuilder().setName(name).build();
-    List infoTypes = Arrays.asList(infoTypesElement);
-    InspectConfig inspectConfig = InspectConfig.newBuilder().addAllInfoTypes(infoTypes).build();
-    String url = "gs://example_bucket/example_file.png";
-    CloudStorageOptions.FileSet fileSet =
-        CloudStorageOptions.FileSet.newBuilder().setUrl(url).build();
-    CloudStorageOptions cloudStorageOptions =
-        CloudStorageOptions.newBuilder().setFileSet(fileSet).build();
-    StorageConfig storageConfig =
-        StorageConfig.newBuilder().setCloudStorageOptions(cloudStorageOptions).build();
-    OutputStorageConfig outputConfig = OutputStorageConfig.newBuilder().build();
-
-    InspectOperationResult actualResponse =
-        client.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig).get();
-    Assert.assertEquals(expectedResponse, actualResponse);
-
-    List actualRequests = mockDlpService.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    CreateInspectOperationRequest actualRequest =
-        (CreateInspectOperationRequest) actualRequests.get(0);
-
-    Assert.assertEquals(inspectConfig, actualRequest.getInspectConfig());
-    Assert.assertEquals(storageConfig, actualRequest.getStorageConfig());
-    Assert.assertEquals(outputConfig, actualRequest.getOutputConfig());
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void createInspectOperationExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockDlpService.addException(exception);
-
-    try {
-      String name = "EMAIL_ADDRESS";
-      InfoType infoTypesElement = InfoType.newBuilder().setName(name).build();
-      List infoTypes = Arrays.asList(infoTypesElement);
-      InspectConfig inspectConfig = InspectConfig.newBuilder().addAllInfoTypes(infoTypes).build();
-      String url = "gs://example_bucket/example_file.png";
-      CloudStorageOptions.FileSet fileSet =
-          CloudStorageOptions.FileSet.newBuilder().setUrl(url).build();
-      CloudStorageOptions cloudStorageOptions =
-          CloudStorageOptions.newBuilder().setFileSet(fileSet).build();
-      StorageConfig storageConfig =
-          StorageConfig.newBuilder().setCloudStorageOptions(cloudStorageOptions).build();
-      OutputStorageConfig outputConfig = OutputStorageConfig.newBuilder().build();
-
-      client.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig).get();
-      Assert.fail("No exception raised");
-    } catch (ExecutionException e) {
-      Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());
-      InvalidArgumentException apiException = (InvalidArgumentException) e.getCause();
-      Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode());
-    }
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void listInspectFindingsTest() {
-    String nextPageToken = "nextPageToken-1530815211";
-    ListInspectFindingsResponse expectedResponse =
-        ListInspectFindingsResponse.newBuilder().setNextPageToken(nextPageToken).build();
-    mockDlpService.addResponse(expectedResponse);
-
-    ResultName name = ResultName.of("[RESULT]");
-
-    ListInspectFindingsResponse actualResponse = client.listInspectFindings(name);
-    Assert.assertEquals(expectedResponse, actualResponse);
-
-    List actualRequests = mockDlpService.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    ListInspectFindingsRequest actualRequest = (ListInspectFindingsRequest) actualRequests.get(0);
-
-    Assert.assertEquals(name, ResultName.parse(actualRequest.getName()));
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void listInspectFindingsExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockDlpService.addException(exception);
-
-    try {
-      ResultName name = ResultName.of("[RESULT]");
-
-      client.listInspectFindings(name);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void listInfoTypesTest() {
-    ListInfoTypesResponse expectedResponse = ListInfoTypesResponse.newBuilder().build();
-    mockDlpService.addResponse(expectedResponse);
-
-    String category = "PII";
-    String languageCode = "en";
-
-    ListInfoTypesResponse actualResponse = client.listInfoTypes(category, languageCode);
-    Assert.assertEquals(expectedResponse, actualResponse);
-
-    List actualRequests = mockDlpService.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    ListInfoTypesRequest actualRequest = (ListInfoTypesRequest) actualRequests.get(0);
-
-    Assert.assertEquals(category, actualRequest.getCategory());
-    Assert.assertEquals(languageCode, actualRequest.getLanguageCode());
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void listInfoTypesExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockDlpService.addException(exception);
-
-    try {
-      String category = "PII";
-      String languageCode = "en";
-
-      client.listInfoTypes(category, languageCode);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void listRootCategoriesTest() {
-    ListRootCategoriesResponse expectedResponse = ListRootCategoriesResponse.newBuilder().build();
-    mockDlpService.addResponse(expectedResponse);
-
-    String languageCode = "en";
-
-    ListRootCategoriesResponse actualResponse = client.listRootCategories(languageCode);
-    Assert.assertEquals(expectedResponse, actualResponse);
-
-    List actualRequests = mockDlpService.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    ListRootCategoriesRequest actualRequest = (ListRootCategoriesRequest) actualRequests.get(0);
-
-    Assert.assertEquals(languageCode, actualRequest.getLanguageCode());
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void listRootCategoriesExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockDlpService.addException(exception);
-
-    try {
-      String languageCode = "en";
-
-      client.listRootCategories(languageCode);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-}
diff --git a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpServiceImpl.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpServiceImpl.java
deleted file mode 100644
index d9de978719da..000000000000
--- a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpServiceImpl.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright 2018 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-package com.google.cloud.dlp.v2beta1;
-
-import com.google.api.core.BetaApi;
-import com.google.longrunning.Operation;
-import com.google.privacy.dlp.v2beta1.AnalyzeDataSourceRiskRequest;
-import com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentRequest;
-import com.google.privacy.dlp.v2beta1.DeidentifyContentResponse;
-import com.google.privacy.dlp.v2beta1.DlpServiceGrpc.DlpServiceImplBase;
-import com.google.privacy.dlp.v2beta1.InspectContentRequest;
-import com.google.privacy.dlp.v2beta1.InspectContentResponse;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesRequest;
-import com.google.privacy.dlp.v2beta1.ListInfoTypesResponse;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsRequest;
-import com.google.privacy.dlp.v2beta1.ListInspectFindingsResponse;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesRequest;
-import com.google.privacy.dlp.v2beta1.ListRootCategoriesResponse;
-import com.google.privacy.dlp.v2beta1.RedactContentRequest;
-import com.google.privacy.dlp.v2beta1.RedactContentResponse;
-import com.google.protobuf.GeneratedMessageV3;
-import io.grpc.stub.StreamObserver;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-
-@javax.annotation.Generated("by GAPIC")
-@BetaApi
-public class MockDlpServiceImpl extends DlpServiceImplBase {
-  private ArrayList requests;
-  private Queue responses;
-
-  public MockDlpServiceImpl() {
-    requests = new ArrayList<>();
-    responses = new LinkedList<>();
-  }
-
-  public List getRequests() {
-    return requests;
-  }
-
-  public void addResponse(GeneratedMessageV3 response) {
-    responses.add(response);
-  }
-
-  public void setResponses(List responses) {
-    this.responses = new LinkedList(responses);
-  }
-
-  public void addException(Exception exception) {
-    responses.add(exception);
-  }
-
-  public void reset() {
-    requests = new ArrayList<>();
-    responses = new LinkedList<>();
-  }
-
-  @Override
-  public void inspectContent(
-      InspectContentRequest request, StreamObserver responseObserver) {
-    Object response = responses.remove();
-    if (response instanceof InspectContentResponse) {
-      requests.add(request);
-      responseObserver.onNext((InspectContentResponse) response);
-      responseObserver.onCompleted();
-    } else if (response instanceof Exception) {
-      responseObserver.onError((Exception) response);
-    } else {
-      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
-    }
-  }
-
-  @Override
-  public void redactContent(
-      RedactContentRequest request, StreamObserver responseObserver) {
-    Object response = responses.remove();
-    if (response instanceof RedactContentResponse) {
-      requests.add(request);
-      responseObserver.onNext((RedactContentResponse) response);
-      responseObserver.onCompleted();
-    } else if (response instanceof Exception) {
-      responseObserver.onError((Exception) response);
-    } else {
-      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
-    }
-  }
-
-  @Override
-  public void deidentifyContent(
-      DeidentifyContentRequest request,
-      StreamObserver responseObserver) {
-    Object response = responses.remove();
-    if (response instanceof DeidentifyContentResponse) {
-      requests.add(request);
-      responseObserver.onNext((DeidentifyContentResponse) response);
-      responseObserver.onCompleted();
-    } else if (response instanceof Exception) {
-      responseObserver.onError((Exception) response);
-    } else {
-      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
-    }
-  }
-
-  @Override
-  public void createInspectOperation(
-      CreateInspectOperationRequest request, StreamObserver responseObserver) {
-    Object response = responses.remove();
-    if (response instanceof Operation) {
-      requests.add(request);
-      responseObserver.onNext((Operation) response);
-      responseObserver.onCompleted();
-    } else if (response instanceof Exception) {
-      responseObserver.onError((Exception) response);
-    } else {
-      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
-    }
-  }
-
-  @Override
-  public void analyzeDataSourceRisk(
-      AnalyzeDataSourceRiskRequest request, StreamObserver responseObserver) {
-    Object response = responses.remove();
-    if (response instanceof Operation) {
-      requests.add(request);
-      responseObserver.onNext((Operation) response);
-      responseObserver.onCompleted();
-    } else if (response instanceof Exception) {
-      responseObserver.onError((Exception) response);
-    } else {
-      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
-    }
-  }
-
-  @Override
-  public void listInspectFindings(
-      ListInspectFindingsRequest request,
-      StreamObserver responseObserver) {
-    Object response = responses.remove();
-    if (response instanceof ListInspectFindingsResponse) {
-      requests.add(request);
-      responseObserver.onNext((ListInspectFindingsResponse) response);
-      responseObserver.onCompleted();
-    } else if (response instanceof Exception) {
-      responseObserver.onError((Exception) response);
-    } else {
-      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
-    }
-  }
-
-  @Override
-  public void listInfoTypes(
-      ListInfoTypesRequest request, StreamObserver responseObserver) {
-    Object response = responses.remove();
-    if (response instanceof ListInfoTypesResponse) {
-      requests.add(request);
-      responseObserver.onNext((ListInfoTypesResponse) response);
-      responseObserver.onCompleted();
-    } else if (response instanceof Exception) {
-      responseObserver.onError((Exception) response);
-    } else {
-      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
-    }
-  }
-
-  @Override
-  public void listRootCategories(
-      ListRootCategoriesRequest request,
-      StreamObserver responseObserver) {
-    Object response = responses.remove();
-    if (response instanceof ListRootCategoriesResponse) {
-      requests.add(request);
-      responseObserver.onNext((ListRootCategoriesResponse) response);
-      responseObserver.onCompleted();
-    } else if (response instanceof Exception) {
-      responseObserver.onError((Exception) response);
-    } else {
-      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
-    }
-  }
-}
diff --git a/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceCallableFactory.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceCallableFactory.java
index 6797c594c42f..6eddacea1f2e 100644
--- a/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorGroupServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceCallableFactory.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceCallableFactory.java
index 3bd051320c66..891fbad42b39 100644
--- a/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcErrorStatsServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceCallableFactory.java b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceCallableFactory.java
index 9b2b32c0ccf2..db1c4b9c5497 100644
--- a/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/stub/GrpcReportErrorsServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java
index cd6ce3f09efd..00816fb388db 100644
--- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java
+++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-iot/README.md b/google-cloud-clients/google-cloud-iot/README.md
new file mode 100644
index 000000000000..ebdf0adbaa5a
--- /dev/null
+++ b/google-cloud-clients/google-cloud-iot/README.md
@@ -0,0 +1,102 @@
+Google Cloud Java Client for IoT Core
+======================================
+
+Java idiomatic client for [IoT Core][cloud-iot].
+
+[![CircleCI](https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java/tree/master.svg?style=shield)](https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java/tree/master)
+[![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/google-cloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/google-cloud-java?branch=master)
+[![Maven](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-iot.svg)](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-iot.svg)
+[![Codacy Badge](https://api.codacy.com/project/badge/grade/9da006ad7c3a4fe1abd142e77c003917)](https://www.codacy.com/app/mziccard/google-cloud-java)
+[![Dependency Status](https://www.versioneye.com/user/projects/58fe4c8d6ac171426c414772/badge.svg?style=flat)](https://www.versioneye.com/user/projects/58fe4c8d6ac171426c414772)
+
+- [Product Documentation][iot-product-docs]
+- [Client Library Documentation][iot-client-lib-docs]
+
+> Note: This client is a work-in-progress, and may occasionally
+> make backwards-incompatible changes.
+
+Quickstart
+----------
+
+[//]: # ({x-version-update-start:google-cloud-iot:released})
+If you are using Maven, add this to your pom.xml file
+```xml
+
+  com.google.cloud
+  google-cloud-iot
+  0.47.0-beta
+
+```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.cloud:google-cloud-iot:0.47.0-beta'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.cloud" % "google-cloud-iot" % "0.47.0-beta"
+```
+[//]: # ({x-version-update-end})
+
+Authentication
+--------------
+
+See the [Authentication](https://github.com/GoogleCloudPlatform/google-cloud-java#authentication) section in the base directory's README.
+
+About Google Cloud IoT Core
+----------------------------
+
+Google Cloud [IoT Core][cloud-iot]  is a fully managed service that allows you to easily and securely connect, manage, and ingest data from millions of globally dispersed devices.
+
+See the [IoT Core client library docs][iot-client-lib-docs] to learn how to use this IoT Core Client Library.
+
+Getting Started
+---------------
+#### Prerequisites
+You will need a [Google Developers Console](https://console.developers.google.com/) project with the IoT Core API enabled. [Follow these instructions](https://cloud.google.com/docs/authentication#preparation) to get your project set up. You will also need to set up the local development environment by [installing the Google Cloud SDK](https://cloud.google.com/sdk/) and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`.
+
+#### Installation and setup
+You'll need to obtain the `google-cloud-iot` library.  See the [Quickstart](#quickstart) section to add `google-cloud-iot` as a dependency in your code.
+
+Troubleshooting
+---------------
+
+To get help, follow the instructions in the [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/troubleshooting/readme.md#troubleshooting).
+
+Transport
+---------
+IoT Core uses gRPC for the transport layer.
+
+Java Versions
+-------------
+
+Java 7 or above is required for using this client.
+
+Versioning
+----------
+
+This library follows [Semantic Versioning](http://semver.org/).
+
+It is currently in major version zero (``0.y.z``), which means that anything may change at any time and the public API should not be considered stable.
+
+Contributing
+------------
+
+Contributions to this library are always welcome and highly encouraged.
+
+See `google-cloud`'s [CONTRIBUTING] documentation and the [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started.
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
+
+License
+-------
+
+Apache 2.0 - See [LICENSE] for more information.
+
+
+[CONTRIBUTING]:https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/CONTRIBUTING.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
+[LICENSE]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/LICENSE
+[cloud-platform]: https://cloud.google.com/
+[cloud-iot]: https://cloud.google.com/iot-core
+[iot-product-docs]: https://cloud.google.com/iot-core/docs
+[iot-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/iot/v1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-iot/pom.xml b/google-cloud-clients/google-cloud-iot/pom.xml
new file mode 100644
index 000000000000..b0dfc08ac7b7
--- /dev/null
+++ b/google-cloud-clients/google-cloud-iot/pom.xml
@@ -0,0 +1,68 @@
+
+
+  4.0.0
+  google-cloud-iot
+  0.47.1-beta-SNAPSHOT
+  jar
+  Google Cloud IoT
+  https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-iot
+  
+    Java idiomatic client for Google Cloud IoT Core
+  
+  
+    com.google.cloud
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
+  
+  
+    google-cloud-iot
+  
+  
+    
+      ${project.groupId}
+      google-cloud-core
+    
+    
+      ${project.groupId}
+      google-cloud-core-grpc
+    
+    
+      com.google.api.grpc
+      proto-google-cloud-iot-v1
+    
+    
+      io.grpc
+      grpc-netty-shaded
+    
+    
+      io.grpc
+      grpc-stub
+    
+    
+      io.grpc
+      grpc-auth
+    
+    
+      ${project.groupId}
+      google-cloud-core
+      test-jar
+      test
+    
+    
+      junit
+      junit
+      test
+    
+    
+      com.google.api.grpc
+      grpc-google-cloud-iot-v1
+      test
+    
+    
+      com.google.api
+      gax-grpc
+      testlib
+      test
+    
+  
+
diff --git a/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/DeviceManagerClient.java b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/DeviceManagerClient.java
new file mode 100644
index 000000000000..de0a3cd88c6c
--- /dev/null
+++ b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/DeviceManagerClient.java
@@ -0,0 +1,2013 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.iot.v1;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.ApiFuture;
+import com.google.api.core.ApiFutures;
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.paging.AbstractFixedSizeCollection;
+import com.google.api.gax.paging.AbstractPage;
+import com.google.api.gax.paging.AbstractPagedListResponse;
+import com.google.api.gax.rpc.PageContext;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.iot.v1.stub.DeviceManagerStub;
+import com.google.cloud.iot.v1.stub.DeviceManagerStubSettings;
+import com.google.iam.v1.GetIamPolicyRequest;
+import com.google.iam.v1.Policy;
+import com.google.iam.v1.SetIamPolicyRequest;
+import com.google.iam.v1.TestIamPermissionsRequest;
+import com.google.iam.v1.TestIamPermissionsResponse;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND SERVICE
+/**
+ * Service Description: Internet of things (IoT) service. Allows to manipulate device registry
+ * instances and the registration of devices (Things) to the cloud.
+ *
+ * 
This class provides the ability to make remote calls to the backing service through method
+ * calls that map to API methods. Sample code to get started:
+ *
+ * 
+ * 
+ * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+ *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+ *   DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+ *   DeviceRegistry response = deviceManagerClient.createDeviceRegistry(parent, deviceRegistry);
+ * }
+ * 
+ * 

+ *
+ * 
Note: close() needs to be called on the deviceManagerClient object to clean up resources such
+ * as threads. In the example above, try-with-resources is used, which automatically calls close().
+ *
+ * 
The surface of this class includes several types of Java methods for each of the API's
+ * methods:
+ *
+ * 
    
+ *   
  1.  A "flattened" method. With this type of method, the fields of the request type have been
+ *       converted into function parameters. It may be the case that not all fields are available as
+ *       parameters, and not every API method will have a flattened method entry point.
+ *   
  2.  A "request object" method. This type of method only takes one parameter, a request object,
+ *       which must be constructed before the call. Not every API method will have a request object
+ *       method.
+ *   
  3.  A "callable" method. This type of method takes no parameters and returns an immutable API
+ *       callable object, which can be used to initiate calls to the service.
+ * 

+ *
+ * 
See the individual methods for example code.
+ *
+ * 
Many parameters require resource names to be formatted in a particular way. To assist with
+ * these names, this class includes a format method for each type of name, and additionally a parse
+ * method to extract the individual identifiers contained within names that are returned.
+ *
+ * 
This class can be customized by passing in a custom instance of DeviceManagerSettings to
+ * create(). For example:
+ *
+ * 
To customize credentials:
+ *
+ * 
+ * 
+ * DeviceManagerSettings deviceManagerSettings =
+ *     DeviceManagerSettings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .build();
+ * DeviceManagerClient deviceManagerClient =
+ *     DeviceManagerClient.create(deviceManagerSettings);
+ * 
+ * 

+ *
+ * To customize the endpoint:
+ *
+ * 
+ * 
+ * DeviceManagerSettings deviceManagerSettings =
+ *     DeviceManagerSettings.newBuilder().setEndpoint(myEndpoint).build();
+ * DeviceManagerClient deviceManagerClient =
+ *     DeviceManagerClient.create(deviceManagerSettings);
+ * 
+ * 

+ */
+@Generated("by gapic-generator")
+@BetaApi
+public class DeviceManagerClient implements BackgroundResource {
+  private final DeviceManagerSettings settings;
+  private final DeviceManagerStub stub;
+
+  /** Constructs an instance of DeviceManagerClient with default settings. */
+  public static final DeviceManagerClient create() throws IOException {
+    return create(DeviceManagerSettings.newBuilder().build());
+  }
+
+  /**
+   * Constructs an instance of DeviceManagerClient, using the given settings. The channels are
+   * created based on the settings passed in, or defaults for any settings that are not set.
+   */
+  public static final DeviceManagerClient create(DeviceManagerSettings settings)
+      throws IOException {
+    return new DeviceManagerClient(settings);
+  }
+
+  /**
+   * Constructs an instance of DeviceManagerClient, using the given stub for making calls. This is
+   * for advanced usage - prefer to use DeviceManagerSettings}.
+   */
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  public static final DeviceManagerClient create(DeviceManagerStub stub) {
+    return new DeviceManagerClient(stub);
+  }
+
+  /**
+   * Constructs an instance of DeviceManagerClient, using the given settings. This is protected so
+   * that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected DeviceManagerClient(DeviceManagerSettings settings) throws IOException {
+    this.settings = settings;
+    this.stub = ((DeviceManagerStubSettings) settings.getStubSettings()).createStub();
+  }
+
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  protected DeviceManagerClient(DeviceManagerStub stub) {
+    this.settings = null;
+    this.stub = stub;
+  }
+
+  public final DeviceManagerSettings getSettings() {
+    return settings;
+  }
+
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  public DeviceManagerStub getStub() {
+    return stub;
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a device registry that contains devices.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+   *   DeviceRegistry response = deviceManagerClient.createDeviceRegistry(parent, deviceRegistry);
+   * }
+   * 

+   *
+   * @param parent The project and cloud region where this device registry must be created. For
+   *     example, `projects/example-project/locations/us-central1`.
+   * @param deviceRegistry The device registry. The field `name` must be empty. The server will
+   *     generate that field from the device registry `id` provided and the `parent` field.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final DeviceRegistry createDeviceRegistry(
+      LocationName parent, DeviceRegistry deviceRegistry) {
+
+    CreateDeviceRegistryRequest request =
+        CreateDeviceRegistryRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .setDeviceRegistry(deviceRegistry)
+            .build();
+    return createDeviceRegistry(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a device registry that contains devices.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+   *   DeviceRegistry response = deviceManagerClient.createDeviceRegistry(parent.toString(), deviceRegistry);
+   * }
+   * 

+   *
+   * @param parent The project and cloud region where this device registry must be created. For
+   *     example, `projects/example-project/locations/us-central1`.
+   * @param deviceRegistry The device registry. The field `name` must be empty. The server will
+   *     generate that field from the device registry `id` provided and the `parent` field.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final DeviceRegistry createDeviceRegistry(String parent, DeviceRegistry deviceRegistry) {
+
+    CreateDeviceRegistryRequest request =
+        CreateDeviceRegistryRequest.newBuilder()
+            .setParent(parent)
+            .setDeviceRegistry(deviceRegistry)
+            .build();
+    return createDeviceRegistry(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a device registry that contains devices.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+   *   CreateDeviceRegistryRequest request = CreateDeviceRegistryRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setDeviceRegistry(deviceRegistry)
+   *     .build();
+   *   DeviceRegistry response = deviceManagerClient.createDeviceRegistry(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final DeviceRegistry createDeviceRegistry(CreateDeviceRegistryRequest request) {
+    return createDeviceRegistryCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a device registry that contains devices.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+   *   CreateDeviceRegistryRequest request = CreateDeviceRegistryRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setDeviceRegistry(deviceRegistry)
+   *     .build();
+   *   ApiFuture<DeviceRegistry> future = deviceManagerClient.createDeviceRegistryCallable().futureCall(request);
+   *   // Do something
+   *   DeviceRegistry response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable
+      createDeviceRegistryCallable() {
+    return stub.createDeviceRegistryCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a device registry configuration.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   DeviceRegistry response = deviceManagerClient.getDeviceRegistry(name);
+   * }
+   * 

+   *
+   * @param name The name of the device registry. For example,
+   *     `projects/example-project/locations/us-central1/registries/my-registry`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final DeviceRegistry getDeviceRegistry(RegistryName name) {
+
+    GetDeviceRegistryRequest request =
+        GetDeviceRegistryRequest.newBuilder()
+            .setName(name == null ? null : name.toString())
+            .build();
+    return getDeviceRegistry(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a device registry configuration.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   DeviceRegistry response = deviceManagerClient.getDeviceRegistry(name.toString());
+   * }
+   * 

+   *
+   * @param name The name of the device registry. For example,
+   *     `projects/example-project/locations/us-central1/registries/my-registry`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final DeviceRegistry getDeviceRegistry(String name) {
+
+    GetDeviceRegistryRequest request = GetDeviceRegistryRequest.newBuilder().setName(name).build();
+    return getDeviceRegistry(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a device registry configuration.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   GetDeviceRegistryRequest request = GetDeviceRegistryRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   DeviceRegistry response = deviceManagerClient.getDeviceRegistry(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  private final DeviceRegistry getDeviceRegistry(GetDeviceRegistryRequest request) {
+    return getDeviceRegistryCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a device registry configuration.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   GetDeviceRegistryRequest request = GetDeviceRegistryRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture<DeviceRegistry> future = deviceManagerClient.getDeviceRegistryCallable().futureCall(request);
+   *   // Do something
+   *   DeviceRegistry response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable getDeviceRegistryCallable() {
+    return stub.getDeviceRegistryCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a device registry configuration.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   DeviceRegistry response = deviceManagerClient.updateDeviceRegistry(deviceRegistry, updateMask);
+   * }
+   * 

+   *
+   * @param deviceRegistry The new values for the device registry. The `id` field must be empty, and
+   *     the `name` field must indicate the path of the resource. For example,
+   *     `projects/example-project/locations/us-central1/registries/my-registry`.
+   * @param updateMask Only updates the `device_registry` fields indicated by this mask. The field
+   *     mask must not be empty, and it must not contain fields that are immutable or only set by
+   *     the server. Mutable top-level fields: `event_notification_config`, `http_config`,
+   *     `mqtt_config`, and `state_notification_config`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final DeviceRegistry updateDeviceRegistry(
+      DeviceRegistry deviceRegistry, FieldMask updateMask) {
+
+    UpdateDeviceRegistryRequest request =
+        UpdateDeviceRegistryRequest.newBuilder()
+            .setDeviceRegistry(deviceRegistry)
+            .setUpdateMask(updateMask)
+            .build();
+    return updateDeviceRegistry(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a device registry configuration.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   UpdateDeviceRegistryRequest request = UpdateDeviceRegistryRequest.newBuilder()
+   *     .setDeviceRegistry(deviceRegistry)
+   *     .setUpdateMask(updateMask)
+   *     .build();
+   *   DeviceRegistry response = deviceManagerClient.updateDeviceRegistry(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final DeviceRegistry updateDeviceRegistry(UpdateDeviceRegistryRequest request) {
+    return updateDeviceRegistryCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a device registry configuration.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   UpdateDeviceRegistryRequest request = UpdateDeviceRegistryRequest.newBuilder()
+   *     .setDeviceRegistry(deviceRegistry)
+   *     .setUpdateMask(updateMask)
+   *     .build();
+   *   ApiFuture<DeviceRegistry> future = deviceManagerClient.updateDeviceRegistryCallable().futureCall(request);
+   *   // Do something
+   *   DeviceRegistry response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable
+      updateDeviceRegistryCallable() {
+    return stub.updateDeviceRegistryCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a device registry configuration.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   deviceManagerClient.deleteDeviceRegistry(name);
+   * }
+   * 

+   *
+   * @param name The name of the device registry. For example,
+   *     `projects/example-project/locations/us-central1/registries/my-registry`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteDeviceRegistry(RegistryName name) {
+
+    DeleteDeviceRegistryRequest request =
+        DeleteDeviceRegistryRequest.newBuilder()
+            .setName(name == null ? null : name.toString())
+            .build();
+    deleteDeviceRegistry(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a device registry configuration.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   deviceManagerClient.deleteDeviceRegistry(name.toString());
+   * }
+   * 

+   *
+   * @param name The name of the device registry. For example,
+   *     `projects/example-project/locations/us-central1/registries/my-registry`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteDeviceRegistry(String name) {
+
+    DeleteDeviceRegistryRequest request =
+        DeleteDeviceRegistryRequest.newBuilder().setName(name).build();
+    deleteDeviceRegistry(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a device registry configuration.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   DeleteDeviceRegistryRequest request = DeleteDeviceRegistryRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   deviceManagerClient.deleteDeviceRegistry(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  private final void deleteDeviceRegistry(DeleteDeviceRegistryRequest request) {
+    deleteDeviceRegistryCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a device registry configuration.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   DeleteDeviceRegistryRequest request = DeleteDeviceRegistryRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture<Void> future = deviceManagerClient.deleteDeviceRegistryCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable deleteDeviceRegistryCallable() {
+    return stub.deleteDeviceRegistryCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists device registries.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   for (DeviceRegistry element : deviceManagerClient.listDeviceRegistries(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param parent The project and cloud region path. For example,
+   *     `projects/example-project/locations/us-central1`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListDeviceRegistriesPagedResponse listDeviceRegistries(LocationName parent) {
+    ListDeviceRegistriesRequest request =
+        ListDeviceRegistriesRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .build();
+    return listDeviceRegistries(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists device registries.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   for (DeviceRegistry element : deviceManagerClient.listDeviceRegistries(parent.toString()).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param parent The project and cloud region path. For example,
+   *     `projects/example-project/locations/us-central1`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListDeviceRegistriesPagedResponse listDeviceRegistries(String parent) {
+    ListDeviceRegistriesRequest request =
+        ListDeviceRegistriesRequest.newBuilder().setParent(parent).build();
+    return listDeviceRegistries(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists device registries.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ListDeviceRegistriesRequest request = ListDeviceRegistriesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   for (DeviceRegistry element : deviceManagerClient.listDeviceRegistries(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListDeviceRegistriesPagedResponse listDeviceRegistries(
+      ListDeviceRegistriesRequest request) {
+    return listDeviceRegistriesPagedCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists device registries.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ListDeviceRegistriesRequest request = ListDeviceRegistriesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   ApiFuture<ListDeviceRegistriesPagedResponse> future = deviceManagerClient.listDeviceRegistriesPagedCallable().futureCall(request);
+   *   // Do something
+   *   for (DeviceRegistry element : future.get().iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   */
+  public final UnaryCallable
+      listDeviceRegistriesPagedCallable() {
+    return stub.listDeviceRegistriesPagedCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists device registries.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ListDeviceRegistriesRequest request = ListDeviceRegistriesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   while (true) {
+   *     ListDeviceRegistriesResponse response = deviceManagerClient.listDeviceRegistriesCallable().call(request);
+   *     for (DeviceRegistry element : response.getDeviceRegistriesList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
+   * }
+   * 

+   */
+  public final UnaryCallable
+      listDeviceRegistriesCallable() {
+    return stub.listDeviceRegistriesCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a device in a device registry.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   Device device = Device.newBuilder().build();
+   *   Device response = deviceManagerClient.createDevice(parent, device);
+   * }
+   * 

+   *
+   * @param parent The name of the device registry where this device should be created. For example,
+   *     `projects/example-project/locations/us-central1/registries/my-registry`.
+   * @param device The device registration details. The field `name` must be empty. The server will
+   *     generate that field from the device registry `id` provided and the `parent` field.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Device createDevice(RegistryName parent, Device device) {
+
+    CreateDeviceRequest request =
+        CreateDeviceRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .setDevice(device)
+            .build();
+    return createDevice(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a device in a device registry.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   Device device = Device.newBuilder().build();
+   *   Device response = deviceManagerClient.createDevice(parent.toString(), device);
+   * }
+   * 

+   *
+   * @param parent The name of the device registry where this device should be created. For example,
+   *     `projects/example-project/locations/us-central1/registries/my-registry`.
+   * @param device The device registration details. The field `name` must be empty. The server will
+   *     generate that field from the device registry `id` provided and the `parent` field.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Device createDevice(String parent, Device device) {
+
+    CreateDeviceRequest request =
+        CreateDeviceRequest.newBuilder().setParent(parent).setDevice(device).build();
+    return createDevice(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a device in a device registry.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   Device device = Device.newBuilder().build();
+   *   CreateDeviceRequest request = CreateDeviceRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setDevice(device)
+   *     .build();
+   *   Device response = deviceManagerClient.createDevice(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Device createDevice(CreateDeviceRequest request) {
+    return createDeviceCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a device in a device registry.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   Device device = Device.newBuilder().build();
+   *   CreateDeviceRequest request = CreateDeviceRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setDevice(device)
+   *     .build();
+   *   ApiFuture<Device> future = deviceManagerClient.createDeviceCallable().futureCall(request);
+   *   // Do something
+   *   Device response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable createDeviceCallable() {
+    return stub.createDeviceCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets details about a device.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   Device response = deviceManagerClient.getDevice(name);
+   * }
+   * 

+   *
+   * @param name The name of the device. For example,
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Device getDevice(DeviceName name) {
+
+    GetDeviceRequest request =
+        GetDeviceRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    return getDevice(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets details about a device.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   Device response = deviceManagerClient.getDevice(name.toString());
+   * }
+   * 

+   *
+   * @param name The name of the device. For example,
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Device getDevice(String name) {
+
+    GetDeviceRequest request = GetDeviceRequest.newBuilder().setName(name).build();
+    return getDevice(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets details about a device.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   GetDeviceRequest request = GetDeviceRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   Device response = deviceManagerClient.getDevice(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Device getDevice(GetDeviceRequest request) {
+    return getDeviceCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets details about a device.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   GetDeviceRequest request = GetDeviceRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture<Device> future = deviceManagerClient.getDeviceCallable().futureCall(request);
+   *   // Do something
+   *   Device response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable getDeviceCallable() {
+    return stub.getDeviceCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a device.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   Device device = Device.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   Device response = deviceManagerClient.updateDevice(device, updateMask);
+   * }
+   * 

+   *
+   * @param device The new values for the device registry. The `id` and `num_id` fields must be
+   *     empty, and the field `name` must specify the name path. For example,
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/device0`or
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * @param updateMask Only updates the `device` fields indicated by this mask. The field mask must
+   *     not be empty, and it must not contain fields that are immutable or only set by the server.
+   *     Mutable top-level fields: `credentials`, `blocked`, and `metadata`
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Device updateDevice(Device device, FieldMask updateMask) {
+
+    UpdateDeviceRequest request =
+        UpdateDeviceRequest.newBuilder().setDevice(device).setUpdateMask(updateMask).build();
+    return updateDevice(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a device.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   Device device = Device.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   UpdateDeviceRequest request = UpdateDeviceRequest.newBuilder()
+   *     .setDevice(device)
+   *     .setUpdateMask(updateMask)
+   *     .build();
+   *   Device response = deviceManagerClient.updateDevice(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Device updateDevice(UpdateDeviceRequest request) {
+    return updateDeviceCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a device.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   Device device = Device.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   UpdateDeviceRequest request = UpdateDeviceRequest.newBuilder()
+   *     .setDevice(device)
+   *     .setUpdateMask(updateMask)
+   *     .build();
+   *   ApiFuture<Device> future = deviceManagerClient.updateDeviceCallable().futureCall(request);
+   *   // Do something
+   *   Device response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable updateDeviceCallable() {
+    return stub.updateDeviceCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a device.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   deviceManagerClient.deleteDevice(name);
+   * }
+   * 

+   *
+   * @param name The name of the device. For example,
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteDevice(DeviceName name) {
+
+    DeleteDeviceRequest request =
+        DeleteDeviceRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    deleteDevice(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a device.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   deviceManagerClient.deleteDevice(name.toString());
+   * }
+   * 

+   *
+   * @param name The name of the device. For example,
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteDevice(String name) {
+
+    DeleteDeviceRequest request = DeleteDeviceRequest.newBuilder().setName(name).build();
+    deleteDevice(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a device.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   DeleteDeviceRequest request = DeleteDeviceRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   deviceManagerClient.deleteDevice(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  private final void deleteDevice(DeleteDeviceRequest request) {
+    deleteDeviceCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes a device.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   DeleteDeviceRequest request = DeleteDeviceRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture<Void> future = deviceManagerClient.deleteDeviceCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable deleteDeviceCallable() {
+    return stub.deleteDeviceCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List devices in a device registry.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   for (Device element : deviceManagerClient.listDevices(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param parent The device registry path. Required. For example,
+   *     `projects/my-project/locations/us-central1/registries/my-registry`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListDevicesPagedResponse listDevices(RegistryName parent) {
+    ListDevicesRequest request =
+        ListDevicesRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .build();
+    return listDevices(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List devices in a device registry.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   for (Device element : deviceManagerClient.listDevices(parent.toString()).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param parent The device registry path. Required. For example,
+   *     `projects/my-project/locations/us-central1/registries/my-registry`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListDevicesPagedResponse listDevices(String parent) {
+    ListDevicesRequest request = ListDevicesRequest.newBuilder().setParent(parent).build();
+    return listDevices(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List devices in a device registry.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   ListDevicesRequest request = ListDevicesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   for (Device element : deviceManagerClient.listDevices(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListDevicesPagedResponse listDevices(ListDevicesRequest request) {
+    return listDevicesPagedCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List devices in a device registry.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   ListDevicesRequest request = ListDevicesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   ApiFuture<ListDevicesPagedResponse> future = deviceManagerClient.listDevicesPagedCallable().futureCall(request);
+   *   // Do something
+   *   for (Device element : future.get().iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   */
+  public final UnaryCallable
+      listDevicesPagedCallable() {
+    return stub.listDevicesPagedCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List devices in a device registry.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   ListDevicesRequest request = ListDevicesRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   while (true) {
+   *     ListDevicesResponse response = deviceManagerClient.listDevicesCallable().call(request);
+   *     for (Device element : response.getDevicesList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
+   * }
+   * 

+   */
+  public final UnaryCallable listDevicesCallable() {
+    return stub.listDevicesCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Modifies the configuration for the device, which is eventually sent from the Cloud IoT Core
+   * servers. Returns the modified configuration version and its metadata.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   ByteString binaryData = ByteString.copyFromUtf8("");
+   *   DeviceConfig response = deviceManagerClient.modifyCloudToDeviceConfig(name, binaryData);
+   * }
+   * 

+   *
+   * @param name The name of the device. For example,
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * @param binaryData The configuration data for the device.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final DeviceConfig modifyCloudToDeviceConfig(DeviceName name, ByteString binaryData) {
+
+    ModifyCloudToDeviceConfigRequest request =
+        ModifyCloudToDeviceConfigRequest.newBuilder()
+            .setName(name == null ? null : name.toString())
+            .setBinaryData(binaryData)
+            .build();
+    return modifyCloudToDeviceConfig(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Modifies the configuration for the device, which is eventually sent from the Cloud IoT Core
+   * servers. Returns the modified configuration version and its metadata.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   ByteString binaryData = ByteString.copyFromUtf8("");
+   *   DeviceConfig response = deviceManagerClient.modifyCloudToDeviceConfig(name.toString(), binaryData);
+   * }
+   * 

+   *
+   * @param name The name of the device. For example,
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * @param binaryData The configuration data for the device.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final DeviceConfig modifyCloudToDeviceConfig(String name, ByteString binaryData) {
+
+    ModifyCloudToDeviceConfigRequest request =
+        ModifyCloudToDeviceConfigRequest.newBuilder()
+            .setName(name)
+            .setBinaryData(binaryData)
+            .build();
+    return modifyCloudToDeviceConfig(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Modifies the configuration for the device, which is eventually sent from the Cloud IoT Core
+   * servers. Returns the modified configuration version and its metadata.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   ByteString binaryData = ByteString.copyFromUtf8("");
+   *   ModifyCloudToDeviceConfigRequest request = ModifyCloudToDeviceConfigRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .setBinaryData(binaryData)
+   *     .build();
+   *   DeviceConfig response = deviceManagerClient.modifyCloudToDeviceConfig(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final DeviceConfig modifyCloudToDeviceConfig(ModifyCloudToDeviceConfigRequest request) {
+    return modifyCloudToDeviceConfigCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Modifies the configuration for the device, which is eventually sent from the Cloud IoT Core
+   * servers. Returns the modified configuration version and its metadata.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   ByteString binaryData = ByteString.copyFromUtf8("");
+   *   ModifyCloudToDeviceConfigRequest request = ModifyCloudToDeviceConfigRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .setBinaryData(binaryData)
+   *     .build();
+   *   ApiFuture<DeviceConfig> future = deviceManagerClient.modifyCloudToDeviceConfigCallable().futureCall(request);
+   *   // Do something
+   *   DeviceConfig response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable
+      modifyCloudToDeviceConfigCallable() {
+    return stub.modifyCloudToDeviceConfigCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists the last few versions of the device configuration in descending order (i.e.: newest
+   * first).
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   ListDeviceConfigVersionsResponse response = deviceManagerClient.listDeviceConfigVersions(name);
+   * }
+   * 

+   *
+   * @param name The name of the device. For example,
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListDeviceConfigVersionsResponse listDeviceConfigVersions(DeviceName name) {
+
+    ListDeviceConfigVersionsRequest request =
+        ListDeviceConfigVersionsRequest.newBuilder()
+            .setName(name == null ? null : name.toString())
+            .build();
+    return listDeviceConfigVersions(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists the last few versions of the device configuration in descending order (i.e.: newest
+   * first).
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   ListDeviceConfigVersionsResponse response = deviceManagerClient.listDeviceConfigVersions(name.toString());
+   * }
+   * 

+   *
+   * @param name The name of the device. For example,
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListDeviceConfigVersionsResponse listDeviceConfigVersions(String name) {
+
+    ListDeviceConfigVersionsRequest request =
+        ListDeviceConfigVersionsRequest.newBuilder().setName(name).build();
+    return listDeviceConfigVersions(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists the last few versions of the device configuration in descending order (i.e.: newest
+   * first).
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   ListDeviceConfigVersionsRequest request = ListDeviceConfigVersionsRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ListDeviceConfigVersionsResponse response = deviceManagerClient.listDeviceConfigVersions(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListDeviceConfigVersionsResponse listDeviceConfigVersions(
+      ListDeviceConfigVersionsRequest request) {
+    return listDeviceConfigVersionsCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists the last few versions of the device configuration in descending order (i.e.: newest
+   * first).
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   ListDeviceConfigVersionsRequest request = ListDeviceConfigVersionsRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture<ListDeviceConfigVersionsResponse> future = deviceManagerClient.listDeviceConfigVersionsCallable().futureCall(request);
+   *   // Do something
+   *   ListDeviceConfigVersionsResponse response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable
+      listDeviceConfigVersionsCallable() {
+    return stub.listDeviceConfigVersionsCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists the last few versions of the device state in descending order (i.e.: newest first).
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   ListDeviceStatesResponse response = deviceManagerClient.listDeviceStates(name);
+   * }
+   * 

+   *
+   * @param name The name of the device. For example,
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListDeviceStatesResponse listDeviceStates(DeviceName name) {
+
+    ListDeviceStatesRequest request =
+        ListDeviceStatesRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    return listDeviceStates(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists the last few versions of the device state in descending order (i.e.: newest first).
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   ListDeviceStatesResponse response = deviceManagerClient.listDeviceStates(name.toString());
+   * }
+   * 

+   *
+   * @param name The name of the device. For example,
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/device0` or
+   *     `projects/p0/locations/us-central1/registries/registry0/devices/{num_id}`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListDeviceStatesResponse listDeviceStates(String name) {
+
+    ListDeviceStatesRequest request = ListDeviceStatesRequest.newBuilder().setName(name).build();
+    return listDeviceStates(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists the last few versions of the device state in descending order (i.e.: newest first).
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   ListDeviceStatesRequest request = ListDeviceStatesRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ListDeviceStatesResponse response = deviceManagerClient.listDeviceStates(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListDeviceStatesResponse listDeviceStates(ListDeviceStatesRequest request) {
+    return listDeviceStatesCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists the last few versions of the device state in descending order (i.e.: newest first).
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+   *   ListDeviceStatesRequest request = ListDeviceStatesRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture<ListDeviceStatesResponse> future = deviceManagerClient.listDeviceStatesCallable().futureCall(request);
+   *   // Do something
+   *   ListDeviceStatesResponse response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable
+      listDeviceStatesCallable() {
+    return stub.listDeviceStatesCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Sets the access control policy on the specified resource. Replaces any existing policy.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   Policy policy = Policy.newBuilder().build();
+   *   Policy response = deviceManagerClient.setIamPolicy(resource, policy);
+   * }
+   * 

+   *
+   * @param resource REQUIRED: The resource for which the policy is being specified. `resource` is
+   *     usually specified as a path. For example, a Project resource is specified as
+   *     `projects/{project}`.
+   * @param policy REQUIRED: The complete policy to be applied to the `resource`. The size of the
+   *     policy is limited to a few 10s of KB. An empty policy is a valid policy but certain Cloud
+   *     Platform services (such as Projects) might reject them.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Policy setIamPolicy(RegistryName resource, Policy policy) {
+
+    SetIamPolicyRequest request =
+        SetIamPolicyRequest.newBuilder()
+            .setResource(resource == null ? null : resource.toString())
+            .setPolicy(policy)
+            .build();
+    return setIamPolicy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Sets the access control policy on the specified resource. Replaces any existing policy.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   Policy policy = Policy.newBuilder().build();
+   *   Policy response = deviceManagerClient.setIamPolicy(resource.toString(), policy);
+   * }
+   * 

+   *
+   * @param resource REQUIRED: The resource for which the policy is being specified. `resource` is
+   *     usually specified as a path. For example, a Project resource is specified as
+   *     `projects/{project}`.
+   * @param policy REQUIRED: The complete policy to be applied to the `resource`. The size of the
+   *     policy is limited to a few 10s of KB. An empty policy is a valid policy but certain Cloud
+   *     Platform services (such as Projects) might reject them.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Policy setIamPolicy(String resource, Policy policy) {
+
+    SetIamPolicyRequest request =
+        SetIamPolicyRequest.newBuilder().setResource(resource).setPolicy(policy).build();
+    return setIamPolicy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Sets the access control policy on the specified resource. Replaces any existing policy.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   ResourceName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   Policy policy = Policy.newBuilder().build();
+   *   SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .setPolicy(policy)
+   *     .build();
+   *   Policy response = deviceManagerClient.setIamPolicy(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Policy setIamPolicy(SetIamPolicyRequest request) {
+    return setIamPolicyCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Sets the access control policy on the specified resource. Replaces any existing policy.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   ResourceName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   Policy policy = Policy.newBuilder().build();
+   *   SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .setPolicy(policy)
+   *     .build();
+   *   ApiFuture<Policy> future = deviceManagerClient.setIamPolicyCallable().futureCall(request);
+   *   // Do something
+   *   Policy response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable setIamPolicyCallable() {
+    return stub.setIamPolicyCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets the access control policy for a resource. Returns an empty policy if the resource exists
+   * and does not have a policy set.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   Policy response = deviceManagerClient.getIamPolicy(resource);
+   * }
+   * 

+   *
+   * @param resource REQUIRED: The resource for which the policy is being requested. `resource` is
+   *     usually specified as a path. For example, a Project resource is specified as
+   *     `projects/{project}`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Policy getIamPolicy(RegistryName resource) {
+
+    GetIamPolicyRequest request =
+        GetIamPolicyRequest.newBuilder()
+            .setResource(resource == null ? null : resource.toString())
+            .build();
+    return getIamPolicy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets the access control policy for a resource. Returns an empty policy if the resource exists
+   * and does not have a policy set.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   Policy response = deviceManagerClient.getIamPolicy(resource.toString());
+   * }
+   * 

+   *
+   * @param resource REQUIRED: The resource for which the policy is being requested. `resource` is
+   *     usually specified as a path. For example, a Project resource is specified as
+   *     `projects/{project}`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Policy getIamPolicy(String resource) {
+
+    GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder().setResource(resource).build();
+    return getIamPolicy(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets the access control policy for a resource. Returns an empty policy if the resource exists
+   * and does not have a policy set.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   ResourceName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .build();
+   *   Policy response = deviceManagerClient.getIamPolicy(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  private final Policy getIamPolicy(GetIamPolicyRequest request) {
+    return getIamPolicyCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets the access control policy for a resource. Returns an empty policy if the resource exists
+   * and does not have a policy set.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   ResourceName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .build();
+   *   ApiFuture<Policy> future = deviceManagerClient.getIamPolicyCallable().futureCall(request);
+   *   // Do something
+   *   Policy response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable getIamPolicyCallable() {
+    return stub.getIamPolicyCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Returns permissions that a caller has on the specified resource. If the resource does not
+   * exist, this will return an empty set of permissions, not a NOT_FOUND error.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   List<String> permissions = new ArrayList<>();
+   *   TestIamPermissionsResponse response = deviceManagerClient.testIamPermissions(resource, permissions);
+   * }
+   * 

+   *
+   * @param resource REQUIRED: The resource for which the policy detail is being requested.
+   *     `resource` is usually specified as a path. For example, a Project resource is specified as
+   *     `projects/{project}`.
+   * @param permissions The set of permissions to check for the `resource`. Permissions with
+   *     wildcards (such as '*' or 'storage.*') are not allowed. For more information see
+   *     [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions).
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final TestIamPermissionsResponse testIamPermissions(
+      RegistryName resource, List permissions) {
+
+    TestIamPermissionsRequest request =
+        TestIamPermissionsRequest.newBuilder()
+            .setResource(resource == null ? null : resource.toString())
+            .addAllPermissions(permissions)
+            .build();
+    return testIamPermissions(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Returns permissions that a caller has on the specified resource. If the resource does not
+   * exist, this will return an empty set of permissions, not a NOT_FOUND error.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   RegistryName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   List<String> permissions = new ArrayList<>();
+   *   TestIamPermissionsResponse response = deviceManagerClient.testIamPermissions(resource.toString(), permissions);
+   * }
+   * 

+   *
+   * @param resource REQUIRED: The resource for which the policy detail is being requested.
+   *     `resource` is usually specified as a path. For example, a Project resource is specified as
+   *     `projects/{project}`.
+   * @param permissions The set of permissions to check for the `resource`. Permissions with
+   *     wildcards (such as '*' or 'storage.*') are not allowed. For more information see
+   *     [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions).
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final TestIamPermissionsResponse testIamPermissions(
+      String resource, List permissions) {
+
+    TestIamPermissionsRequest request =
+        TestIamPermissionsRequest.newBuilder()
+            .setResource(resource)
+            .addAllPermissions(permissions)
+            .build();
+    return testIamPermissions(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Returns permissions that a caller has on the specified resource. If the resource does not
+   * exist, this will return an empty set of permissions, not a NOT_FOUND error.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   ResourceName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   List<String> permissions = new ArrayList<>();
+   *   TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .addAllPermissions(permissions)
+   *     .build();
+   *   TestIamPermissionsResponse response = deviceManagerClient.testIamPermissions(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsRequest request) {
+    return testIamPermissionsCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Returns permissions that a caller has on the specified resource. If the resource does not
+   * exist, this will return an empty set of permissions, not a NOT_FOUND error.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+   *   ResourceName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+   *   List<String> permissions = new ArrayList<>();
+   *   TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder()
+   *     .setResource(resource.toString())
+   *     .addAllPermissions(permissions)
+   *     .build();
+   *   ApiFuture<TestIamPermissionsResponse> future = deviceManagerClient.testIamPermissionsCallable().futureCall(request);
+   *   // Do something
+   *   TestIamPermissionsResponse response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable
+      testIamPermissionsCallable() {
+    return stub.testIamPermissionsCallable();
+  }
+
+  @Override
+  public final void close() {
+    stub.close();
+  }
+
+  @Override
+  public void shutdown() {
+    stub.shutdown();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return stub.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return stub.isTerminated();
+  }
+
+  @Override
+  public void shutdownNow() {
+    stub.shutdownNow();
+  }
+
+  @Override
+  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
+    return stub.awaitTermination(duration, unit);
+  }
+
+  public static class ListDeviceRegistriesPagedResponse
+      extends AbstractPagedListResponse<
+          ListDeviceRegistriesRequest, ListDeviceRegistriesResponse, DeviceRegistry,
+          ListDeviceRegistriesPage, ListDeviceRegistriesFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext
+            context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListDeviceRegistriesPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListDeviceRegistriesPagedResponse apply(ListDeviceRegistriesPage input) {
+              return new ListDeviceRegistriesPagedResponse(input);
+            }
+          });
+    }
+
+    private ListDeviceRegistriesPagedResponse(ListDeviceRegistriesPage page) {
+      super(page, ListDeviceRegistriesFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListDeviceRegistriesPage
+      extends AbstractPage<
+          ListDeviceRegistriesRequest, ListDeviceRegistriesResponse, DeviceRegistry,
+          ListDeviceRegistriesPage> {
+
+    private ListDeviceRegistriesPage(
+        PageContext
+            context,
+        ListDeviceRegistriesResponse response) {
+      super(context, response);
+    }
+
+    private static ListDeviceRegistriesPage createEmptyPage() {
+      return new ListDeviceRegistriesPage(null, null);
+    }
+
+    @Override
+    protected ListDeviceRegistriesPage createPage(
+        PageContext
+            context,
+        ListDeviceRegistriesResponse response) {
+      return new ListDeviceRegistriesPage(context, response);
+    }
+
+    @Override
+    public ApiFuture createPageAsync(
+        PageContext
+            context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListDeviceRegistriesFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListDeviceRegistriesRequest, ListDeviceRegistriesResponse, DeviceRegistry,
+          ListDeviceRegistriesPage, ListDeviceRegistriesFixedSizeCollection> {
+
+    private ListDeviceRegistriesFixedSizeCollection(
+        List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListDeviceRegistriesFixedSizeCollection createEmptyCollection() {
+      return new ListDeviceRegistriesFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListDeviceRegistriesFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListDeviceRegistriesFixedSizeCollection(pages, collectionSize);
+    }
+  }
+
+  public static class ListDevicesPagedResponse
+      extends AbstractPagedListResponse<
+          ListDevicesRequest, ListDevicesResponse, Device, ListDevicesPage,
+          ListDevicesFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListDevicesPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListDevicesPagedResponse apply(ListDevicesPage input) {
+              return new ListDevicesPagedResponse(input);
+            }
+          });
+    }
+
+    private ListDevicesPagedResponse(ListDevicesPage page) {
+      super(page, ListDevicesFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListDevicesPage
+      extends AbstractPage {
+
+    private ListDevicesPage(
+        PageContext context,
+        ListDevicesResponse response) {
+      super(context, response);
+    }
+
+    private static ListDevicesPage createEmptyPage() {
+      return new ListDevicesPage(null, null);
+    }
+
+    @Override
+    protected ListDevicesPage createPage(
+        PageContext context,
+        ListDevicesResponse response) {
+      return new ListDevicesPage(context, response);
+    }
+
+    @Override
+    public ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListDevicesFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListDevicesRequest, ListDevicesResponse, Device, ListDevicesPage,
+          ListDevicesFixedSizeCollection> {
+
+    private ListDevicesFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListDevicesFixedSizeCollection createEmptyCollection() {
+      return new ListDevicesFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListDevicesFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListDevicesFixedSizeCollection(pages, collectionSize);
+    }
+  }
+}
diff --git a/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/DeviceManagerSettings.java b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/DeviceManagerSettings.java
new file mode 100644
index 000000000000..889b4419b819
--- /dev/null
+++ b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/DeviceManagerSettings.java
@@ -0,0 +1,358 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.iot.v1;
+
+import static com.google.cloud.iot.v1.DeviceManagerClient.ListDeviceRegistriesPagedResponse;
+import static com.google.cloud.iot.v1.DeviceManagerClient.ListDevicesPagedResponse;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.GoogleCredentialsProvider;
+import com.google.api.gax.core.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.ClientSettings;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.cloud.iot.v1.stub.DeviceManagerStubSettings;
+import com.google.iam.v1.GetIamPolicyRequest;
+import com.google.iam.v1.Policy;
+import com.google.iam.v1.SetIamPolicyRequest;
+import com.google.iam.v1.TestIamPermissionsRequest;
+import com.google.iam.v1.TestIamPermissionsResponse;
+import com.google.protobuf.Empty;
+import java.io.IOException;
+import java.util.List;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * Settings class to configure an instance of {@link DeviceManagerClient}.
+ *
+ * 
The default instance has everything set to sensible defaults:
+ *
+ * 
    
+ *   
  • The default service address (cloudiot.googleapis.com) and default port (443) are used.
+ *   
  • Credentials are acquired automatically through Application Default Credentials.
+ *   
  • Retries are configured for idempotent methods but not for non-idempotent methods.
+ * 

+ *
+ * 
The builder of this class is recursive, so contained classes are themselves builders. When
+ * build() is called, the tree of builders is called to create the complete settings object. For
+ * example, to set the total timeout of createDeviceRegistry to 30 seconds:
+ *
+ * 
+ * 
+ * DeviceManagerSettings.Builder deviceManagerSettingsBuilder =
+ *     DeviceManagerSettings.newBuilder();
+ * deviceManagerSettingsBuilder.createDeviceRegistrySettings().getRetrySettings().toBuilder()
+ *     .setTotalTimeout(Duration.ofSeconds(30));
+ * DeviceManagerSettings deviceManagerSettings = deviceManagerSettingsBuilder.build();
+ * 
+ * 

+ */
+@Generated("by gapic-generator")
+@BetaApi
+public class DeviceManagerSettings extends ClientSettings {
+  /** Returns the object with the settings used for calls to createDeviceRegistry. */
+  public UnaryCallSettings
+      createDeviceRegistrySettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).createDeviceRegistrySettings();
+  }
+
+  /** Returns the object with the settings used for calls to getDeviceRegistry. */
+  public UnaryCallSettings getDeviceRegistrySettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).getDeviceRegistrySettings();
+  }
+
+  /** Returns the object with the settings used for calls to updateDeviceRegistry. */
+  public UnaryCallSettings
+      updateDeviceRegistrySettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).updateDeviceRegistrySettings();
+  }
+
+  /** Returns the object with the settings used for calls to deleteDeviceRegistry. */
+  public UnaryCallSettings deleteDeviceRegistrySettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).deleteDeviceRegistrySettings();
+  }
+
+  /** Returns the object with the settings used for calls to listDeviceRegistries. */
+  public PagedCallSettings<
+          ListDeviceRegistriesRequest, ListDeviceRegistriesResponse,
+          ListDeviceRegistriesPagedResponse>
+      listDeviceRegistriesSettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).listDeviceRegistriesSettings();
+  }
+
+  /** Returns the object with the settings used for calls to createDevice. */
+  public UnaryCallSettings createDeviceSettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).createDeviceSettings();
+  }
+
+  /** Returns the object with the settings used for calls to getDevice. */
+  public UnaryCallSettings getDeviceSettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).getDeviceSettings();
+  }
+
+  /** Returns the object with the settings used for calls to updateDevice. */
+  public UnaryCallSettings updateDeviceSettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).updateDeviceSettings();
+  }
+
+  /** Returns the object with the settings used for calls to deleteDevice. */
+  public UnaryCallSettings deleteDeviceSettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).deleteDeviceSettings();
+  }
+
+  /** Returns the object with the settings used for calls to listDevices. */
+  public PagedCallSettings
+      listDevicesSettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).listDevicesSettings();
+  }
+
+  /** Returns the object with the settings used for calls to modifyCloudToDeviceConfig. */
+  public UnaryCallSettings
+      modifyCloudToDeviceConfigSettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).modifyCloudToDeviceConfigSettings();
+  }
+
+  /** Returns the object with the settings used for calls to listDeviceConfigVersions. */
+  public UnaryCallSettings
+      listDeviceConfigVersionsSettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).listDeviceConfigVersionsSettings();
+  }
+
+  /** Returns the object with the settings used for calls to listDeviceStates. */
+  public UnaryCallSettings
+      listDeviceStatesSettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).listDeviceStatesSettings();
+  }
+
+  /** Returns the object with the settings used for calls to setIamPolicy. */
+  public UnaryCallSettings setIamPolicySettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).setIamPolicySettings();
+  }
+
+  /** Returns the object with the settings used for calls to getIamPolicy. */
+  public UnaryCallSettings getIamPolicySettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).getIamPolicySettings();
+  }
+
+  /** Returns the object with the settings used for calls to testIamPermissions. */
+  public UnaryCallSettings
+      testIamPermissionsSettings() {
+    return ((DeviceManagerStubSettings) getStubSettings()).testIamPermissionsSettings();
+  }
+
+  public static final DeviceManagerSettings create(DeviceManagerStubSettings stub)
+      throws IOException {
+    return new DeviceManagerSettings.Builder(stub.toBuilder()).build();
+  }
+
+  /** Returns a builder for the default ExecutorProvider for this service. */
+  public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
+    return DeviceManagerStubSettings.defaultExecutorProviderBuilder();
+  }
+
+  /** Returns the default service endpoint. */
+  public static String getDefaultEndpoint() {
+    return DeviceManagerStubSettings.getDefaultEndpoint();
+  }
+
+  /** Returns the default service scopes. */
+  public static List getDefaultServiceScopes() {
+    return DeviceManagerStubSettings.getDefaultServiceScopes();
+  }
+
+  /** Returns a builder for the default credentials for this service. */
+  public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
+    return DeviceManagerStubSettings.defaultCredentialsProviderBuilder();
+  }
+
+  /** Returns a builder for the default ChannelProvider for this service. */
+  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
+    return DeviceManagerStubSettings.defaultGrpcTransportProviderBuilder();
+  }
+
+  public static TransportChannelProvider defaultTransportChannelProvider() {
+    return DeviceManagerStubSettings.defaultTransportChannelProvider();
+  }
+
+  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
+  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+    return DeviceManagerStubSettings.defaultApiClientHeaderProviderBuilder();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder() {
+    return Builder.createDefault();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder(ClientContext clientContext) {
+    return new Builder(clientContext);
+  }
+
+  /** Returns a builder containing all the values of this settings class. */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  protected DeviceManagerSettings(Builder settingsBuilder) throws IOException {
+    super(settingsBuilder);
+  }
+
+  /** Builder for DeviceManagerSettings. */
+  public static class Builder extends ClientSettings.Builder {
+    protected Builder() throws IOException {
+      this((ClientContext) null);
+    }
+
+    protected Builder(ClientContext clientContext) {
+      super(DeviceManagerStubSettings.newBuilder(clientContext));
+    }
+
+    private static Builder createDefault() {
+      return new Builder(DeviceManagerStubSettings.newBuilder());
+    }
+
+    protected Builder(DeviceManagerSettings settings) {
+      super(settings.getStubSettings().toBuilder());
+    }
+
+    protected Builder(DeviceManagerStubSettings.Builder stubSettings) {
+      super(stubSettings);
+    }
+
+    public DeviceManagerStubSettings.Builder getStubSettingsBuilder() {
+      return ((DeviceManagerStubSettings.Builder) getStubSettings());
+    }
+
+    // NEXT_MAJOR_VER: remove 'throws Exception'
+    /**
+     * Applies the given settings updater function to all of the unary API methods in this service.
+     *
+     * 
Note: This method does not support applying settings to streaming methods.
+     */
+    public Builder applyToAllUnaryMethods(
+        ApiFunction, Void> settingsUpdater) throws Exception {
+      super.applyToAllUnaryMethods(
+          getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
+      return this;
+    }
+
+    /** Returns the builder for the settings used for calls to createDeviceRegistry. */
+    public UnaryCallSettings.Builder
+        createDeviceRegistrySettings() {
+      return getStubSettingsBuilder().createDeviceRegistrySettings();
+    }
+
+    /** Returns the builder for the settings used for calls to getDeviceRegistry. */
+    public UnaryCallSettings.Builder
+        getDeviceRegistrySettings() {
+      return getStubSettingsBuilder().getDeviceRegistrySettings();
+    }
+
+    /** Returns the builder for the settings used for calls to updateDeviceRegistry. */
+    public UnaryCallSettings.Builder
+        updateDeviceRegistrySettings() {
+      return getStubSettingsBuilder().updateDeviceRegistrySettings();
+    }
+
+    /** Returns the builder for the settings used for calls to deleteDeviceRegistry. */
+    public UnaryCallSettings.Builder
+        deleteDeviceRegistrySettings() {
+      return getStubSettingsBuilder().deleteDeviceRegistrySettings();
+    }
+
+    /** Returns the builder for the settings used for calls to listDeviceRegistries. */
+    public PagedCallSettings.Builder<
+            ListDeviceRegistriesRequest, ListDeviceRegistriesResponse,
+            ListDeviceRegistriesPagedResponse>
+        listDeviceRegistriesSettings() {
+      return getStubSettingsBuilder().listDeviceRegistriesSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to createDevice. */
+    public UnaryCallSettings.Builder createDeviceSettings() {
+      return getStubSettingsBuilder().createDeviceSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to getDevice. */
+    public UnaryCallSettings.Builder getDeviceSettings() {
+      return getStubSettingsBuilder().getDeviceSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to updateDevice. */
+    public UnaryCallSettings.Builder updateDeviceSettings() {
+      return getStubSettingsBuilder().updateDeviceSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to deleteDevice. */
+    public UnaryCallSettings.Builder deleteDeviceSettings() {
+      return getStubSettingsBuilder().deleteDeviceSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to listDevices. */
+    public PagedCallSettings.Builder<
+            ListDevicesRequest, ListDevicesResponse, ListDevicesPagedResponse>
+        listDevicesSettings() {
+      return getStubSettingsBuilder().listDevicesSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to modifyCloudToDeviceConfig. */
+    public UnaryCallSettings.Builder
+        modifyCloudToDeviceConfigSettings() {
+      return getStubSettingsBuilder().modifyCloudToDeviceConfigSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to listDeviceConfigVersions. */
+    public UnaryCallSettings.Builder<
+            ListDeviceConfigVersionsRequest, ListDeviceConfigVersionsResponse>
+        listDeviceConfigVersionsSettings() {
+      return getStubSettingsBuilder().listDeviceConfigVersionsSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to listDeviceStates. */
+    public UnaryCallSettings.Builder
+        listDeviceStatesSettings() {
+      return getStubSettingsBuilder().listDeviceStatesSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to setIamPolicy. */
+    public UnaryCallSettings.Builder setIamPolicySettings() {
+      return getStubSettingsBuilder().setIamPolicySettings();
+    }
+
+    /** Returns the builder for the settings used for calls to getIamPolicy. */
+    public UnaryCallSettings.Builder getIamPolicySettings() {
+      return getStubSettingsBuilder().getIamPolicySettings();
+    }
+
+    /** Returns the builder for the settings used for calls to testIamPermissions. */
+    public UnaryCallSettings.Builder
+        testIamPermissionsSettings() {
+      return getStubSettingsBuilder().testIamPermissionsSettings();
+    }
+
+    @Override
+    public DeviceManagerSettings build() throws IOException {
+      return new DeviceManagerSettings(this);
+    }
+  }
+}
diff --git a/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/package-info.java b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/package-info.java
new file mode 100644
index 000000000000..9534a559c886
--- /dev/null
+++ b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/package-info.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+/**
+ * A client to Cloud IoT API.
+ *
+ * 
The interfaces provided are listed below, along with usage samples.
+ *
+ * 
=================== DeviceManagerClient ===================
+ *
+ * 
Service Description: Internet of things (IoT) service. Allows to manipulate device registry
+ * instances and the registration of devices (Things) to the cloud.
+ *
+ * 
Sample for DeviceManagerClient:
+ *
+ * 
+ * 
+ * try (DeviceManagerClient deviceManagerClient = DeviceManagerClient.create()) {
+ *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+ *   DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+ *   DeviceRegistry response = deviceManagerClient.createDeviceRegistry(parent, deviceRegistry);
+ * }
+ * 
+ * 

+ */
+package com.google.cloud.iot.v1;
diff --git a/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/DeviceManagerStub.java b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/DeviceManagerStub.java
new file mode 100644
index 000000000000..7ac5ab4de6f5
--- /dev/null
+++ b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/DeviceManagerStub.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.iot.v1.stub;
+
+import static com.google.cloud.iot.v1.DeviceManagerClient.ListDeviceRegistriesPagedResponse;
+import static com.google.cloud.iot.v1.DeviceManagerClient.ListDevicesPagedResponse;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.iot.v1.CreateDeviceRegistryRequest;
+import com.google.cloud.iot.v1.CreateDeviceRequest;
+import com.google.cloud.iot.v1.DeleteDeviceRegistryRequest;
+import com.google.cloud.iot.v1.DeleteDeviceRequest;
+import com.google.cloud.iot.v1.Device;
+import com.google.cloud.iot.v1.DeviceConfig;
+import com.google.cloud.iot.v1.DeviceRegistry;
+import com.google.cloud.iot.v1.GetDeviceRegistryRequest;
+import com.google.cloud.iot.v1.GetDeviceRequest;
+import com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest;
+import com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse;
+import com.google.cloud.iot.v1.ListDeviceRegistriesRequest;
+import com.google.cloud.iot.v1.ListDeviceRegistriesResponse;
+import com.google.cloud.iot.v1.ListDeviceStatesRequest;
+import com.google.cloud.iot.v1.ListDeviceStatesResponse;
+import com.google.cloud.iot.v1.ListDevicesRequest;
+import com.google.cloud.iot.v1.ListDevicesResponse;
+import com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest;
+import com.google.cloud.iot.v1.UpdateDeviceRegistryRequest;
+import com.google.cloud.iot.v1.UpdateDeviceRequest;
+import com.google.iam.v1.GetIamPolicyRequest;
+import com.google.iam.v1.Policy;
+import com.google.iam.v1.SetIamPolicyRequest;
+import com.google.iam.v1.TestIamPermissionsRequest;
+import com.google.iam.v1.TestIamPermissionsResponse;
+import com.google.protobuf.Empty;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * Base stub class for Cloud IoT API.
+ *
+ * 
This class is for advanced usage and reflects the underlying API directly.
+ */
+@Generated("by gapic-generator")
+@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+public abstract class DeviceManagerStub implements BackgroundResource {
+
+  public UnaryCallable createDeviceRegistryCallable() {
+    throw new UnsupportedOperationException("Not implemented: createDeviceRegistryCallable()");
+  }
+
+  public UnaryCallable getDeviceRegistryCallable() {
+    throw new UnsupportedOperationException("Not implemented: getDeviceRegistryCallable()");
+  }
+
+  public UnaryCallable updateDeviceRegistryCallable() {
+    throw new UnsupportedOperationException("Not implemented: updateDeviceRegistryCallable()");
+  }
+
+  public UnaryCallable deleteDeviceRegistryCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteDeviceRegistryCallable()");
+  }
+
+  public UnaryCallable
+      listDeviceRegistriesPagedCallable() {
+    throw new UnsupportedOperationException("Not implemented: listDeviceRegistriesPagedCallable()");
+  }
+
+  public UnaryCallable
+      listDeviceRegistriesCallable() {
+    throw new UnsupportedOperationException("Not implemented: listDeviceRegistriesCallable()");
+  }
+
+  public UnaryCallable createDeviceCallable() {
+    throw new UnsupportedOperationException("Not implemented: createDeviceCallable()");
+  }
+
+  public UnaryCallable getDeviceCallable() {
+    throw new UnsupportedOperationException("Not implemented: getDeviceCallable()");
+  }
+
+  public UnaryCallable updateDeviceCallable() {
+    throw new UnsupportedOperationException("Not implemented: updateDeviceCallable()");
+  }
+
+  public UnaryCallable deleteDeviceCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteDeviceCallable()");
+  }
+
+  public UnaryCallable listDevicesPagedCallable() {
+    throw new UnsupportedOperationException("Not implemented: listDevicesPagedCallable()");
+  }
+
+  public UnaryCallable listDevicesCallable() {
+    throw new UnsupportedOperationException("Not implemented: listDevicesCallable()");
+  }
+
+  public UnaryCallable
+      modifyCloudToDeviceConfigCallable() {
+    throw new UnsupportedOperationException("Not implemented: modifyCloudToDeviceConfigCallable()");
+  }
+
+  public UnaryCallable
+      listDeviceConfigVersionsCallable() {
+    throw new UnsupportedOperationException("Not implemented: listDeviceConfigVersionsCallable()");
+  }
+
+  public UnaryCallable
+      listDeviceStatesCallable() {
+    throw new UnsupportedOperationException("Not implemented: listDeviceStatesCallable()");
+  }
+
+  public UnaryCallable setIamPolicyCallable() {
+    throw new UnsupportedOperationException("Not implemented: setIamPolicyCallable()");
+  }
+
+  public UnaryCallable getIamPolicyCallable() {
+    throw new UnsupportedOperationException("Not implemented: getIamPolicyCallable()");
+  }
+
+  public UnaryCallable
+      testIamPermissionsCallable() {
+    throw new UnsupportedOperationException("Not implemented: testIamPermissionsCallable()");
+  }
+
+  @Override
+  public abstract void close();
+}
diff --git a/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/DeviceManagerStubSettings.java b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/DeviceManagerStubSettings.java
new file mode 100644
index 000000000000..0e93c14c2a09
--- /dev/null
+++ b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/DeviceManagerStubSettings.java
@@ -0,0 +1,826 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.iot.v1.stub;
+
+import static com.google.cloud.iot.v1.DeviceManagerClient.ListDeviceRegistriesPagedResponse;
+import static com.google.cloud.iot.v1.DeviceManagerClient.ListDevicesPagedResponse;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.ApiFuture;
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.GaxProperties;
+import com.google.api.gax.core.GoogleCredentialsProvider;
+import com.google.api.gax.core.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.GaxGrpcProperties;
+import com.google.api.gax.grpc.GrpcTransportChannel;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.rpc.ApiCallContext;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.PageContext;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.PagedListDescriptor;
+import com.google.api.gax.rpc.PagedListResponseFactory;
+import com.google.api.gax.rpc.StatusCode;
+import com.google.api.gax.rpc.StubSettings;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.iot.v1.CreateDeviceRegistryRequest;
+import com.google.cloud.iot.v1.CreateDeviceRequest;
+import com.google.cloud.iot.v1.DeleteDeviceRegistryRequest;
+import com.google.cloud.iot.v1.DeleteDeviceRequest;
+import com.google.cloud.iot.v1.Device;
+import com.google.cloud.iot.v1.DeviceConfig;
+import com.google.cloud.iot.v1.DeviceRegistry;
+import com.google.cloud.iot.v1.GetDeviceRegistryRequest;
+import com.google.cloud.iot.v1.GetDeviceRequest;
+import com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest;
+import com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse;
+import com.google.cloud.iot.v1.ListDeviceRegistriesRequest;
+import com.google.cloud.iot.v1.ListDeviceRegistriesResponse;
+import com.google.cloud.iot.v1.ListDeviceStatesRequest;
+import com.google.cloud.iot.v1.ListDeviceStatesResponse;
+import com.google.cloud.iot.v1.ListDevicesRequest;
+import com.google.cloud.iot.v1.ListDevicesResponse;
+import com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest;
+import com.google.cloud.iot.v1.UpdateDeviceRegistryRequest;
+import com.google.cloud.iot.v1.UpdateDeviceRequest;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.iam.v1.GetIamPolicyRequest;
+import com.google.iam.v1.Policy;
+import com.google.iam.v1.SetIamPolicyRequest;
+import com.google.iam.v1.TestIamPermissionsRequest;
+import com.google.iam.v1.TestIamPermissionsResponse;
+import com.google.protobuf.Empty;
+import java.io.IOException;
+import java.util.List;
+import javax.annotation.Generated;
+import org.threeten.bp.Duration;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * Settings class to configure an instance of {@link DeviceManagerStub}.
+ *
+ * 
The default instance has everything set to sensible defaults:
+ *
+ * 
    
+ *   
  • The default service address (cloudiot.googleapis.com) and default port (443) are used.
+ *   
  • Credentials are acquired automatically through Application Default Credentials.
+ *   
  • Retries are configured for idempotent methods but not for non-idempotent methods.
+ * 

+ *
+ * 
The builder of this class is recursive, so contained classes are themselves builders. When
+ * build() is called, the tree of builders is called to create the complete settings object. For
+ * example, to set the total timeout of createDeviceRegistry to 30 seconds:
+ *
+ * 
+ * 
+ * DeviceManagerStubSettings.Builder deviceManagerSettingsBuilder =
+ *     DeviceManagerStubSettings.newBuilder();
+ * deviceManagerSettingsBuilder.createDeviceRegistrySettings().getRetrySettings().toBuilder()
+ *     .setTotalTimeout(Duration.ofSeconds(30));
+ * DeviceManagerStubSettings deviceManagerSettings = deviceManagerSettingsBuilder.build();
+ * 
+ * 

+ */
+@Generated("by gapic-generator")
+@BetaApi
+public class DeviceManagerStubSettings extends StubSettings {
+  /** The default scopes of the service. */
+  private static final ImmutableList DEFAULT_SERVICE_SCOPES =
+      ImmutableList.builder()
+          .add("https://www.googleapis.com/auth/cloud-platform")
+          .add("https://www.googleapis.com/auth/cloudiot")
+          .build();
+
+  private final UnaryCallSettings
+      createDeviceRegistrySettings;
+  private final UnaryCallSettings
+      getDeviceRegistrySettings;
+  private final UnaryCallSettings
+      updateDeviceRegistrySettings;
+  private final UnaryCallSettings deleteDeviceRegistrySettings;
+  private final PagedCallSettings<
+          ListDeviceRegistriesRequest, ListDeviceRegistriesResponse,
+          ListDeviceRegistriesPagedResponse>
+      listDeviceRegistriesSettings;
+  private final UnaryCallSettings createDeviceSettings;
+  private final UnaryCallSettings getDeviceSettings;
+  private final UnaryCallSettings updateDeviceSettings;
+  private final UnaryCallSettings deleteDeviceSettings;
+  private final PagedCallSettings
+      listDevicesSettings;
+  private final UnaryCallSettings
+      modifyCloudToDeviceConfigSettings;
+  private final UnaryCallSettings
+      listDeviceConfigVersionsSettings;
+  private final UnaryCallSettings
+      listDeviceStatesSettings;
+  private final UnaryCallSettings setIamPolicySettings;
+  private final UnaryCallSettings getIamPolicySettings;
+  private final UnaryCallSettings
+      testIamPermissionsSettings;
+
+  /** Returns the object with the settings used for calls to createDeviceRegistry. */
+  public UnaryCallSettings
+      createDeviceRegistrySettings() {
+    return createDeviceRegistrySettings;
+  }
+
+  /** Returns the object with the settings used for calls to getDeviceRegistry. */
+  public UnaryCallSettings getDeviceRegistrySettings() {
+    return getDeviceRegistrySettings;
+  }
+
+  /** Returns the object with the settings used for calls to updateDeviceRegistry. */
+  public UnaryCallSettings
+      updateDeviceRegistrySettings() {
+    return updateDeviceRegistrySettings;
+  }
+
+  /** Returns the object with the settings used for calls to deleteDeviceRegistry. */
+  public UnaryCallSettings deleteDeviceRegistrySettings() {
+    return deleteDeviceRegistrySettings;
+  }
+
+  /** Returns the object with the settings used for calls to listDeviceRegistries. */
+  public PagedCallSettings<
+          ListDeviceRegistriesRequest, ListDeviceRegistriesResponse,
+          ListDeviceRegistriesPagedResponse>
+      listDeviceRegistriesSettings() {
+    return listDeviceRegistriesSettings;
+  }
+
+  /** Returns the object with the settings used for calls to createDevice. */
+  public UnaryCallSettings createDeviceSettings() {
+    return createDeviceSettings;
+  }
+
+  /** Returns the object with the settings used for calls to getDevice. */
+  public UnaryCallSettings getDeviceSettings() {
+    return getDeviceSettings;
+  }
+
+  /** Returns the object with the settings used for calls to updateDevice. */
+  public UnaryCallSettings updateDeviceSettings() {
+    return updateDeviceSettings;
+  }
+
+  /** Returns the object with the settings used for calls to deleteDevice. */
+  public UnaryCallSettings deleteDeviceSettings() {
+    return deleteDeviceSettings;
+  }
+
+  /** Returns the object with the settings used for calls to listDevices. */
+  public PagedCallSettings
+      listDevicesSettings() {
+    return listDevicesSettings;
+  }
+
+  /** Returns the object with the settings used for calls to modifyCloudToDeviceConfig. */
+  public UnaryCallSettings
+      modifyCloudToDeviceConfigSettings() {
+    return modifyCloudToDeviceConfigSettings;
+  }
+
+  /** Returns the object with the settings used for calls to listDeviceConfigVersions. */
+  public UnaryCallSettings
+      listDeviceConfigVersionsSettings() {
+    return listDeviceConfigVersionsSettings;
+  }
+
+  /** Returns the object with the settings used for calls to listDeviceStates. */
+  public UnaryCallSettings
+      listDeviceStatesSettings() {
+    return listDeviceStatesSettings;
+  }
+
+  /** Returns the object with the settings used for calls to setIamPolicy. */
+  public UnaryCallSettings setIamPolicySettings() {
+    return setIamPolicySettings;
+  }
+
+  /** Returns the object with the settings used for calls to getIamPolicy. */
+  public UnaryCallSettings getIamPolicySettings() {
+    return getIamPolicySettings;
+  }
+
+  /** Returns the object with the settings used for calls to testIamPermissions. */
+  public UnaryCallSettings
+      testIamPermissionsSettings() {
+    return testIamPermissionsSettings;
+  }
+
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  public DeviceManagerStub createStub() throws IOException {
+    if (getTransportChannelProvider()
+        .getTransportName()
+        .equals(GrpcTransportChannel.getGrpcTransportName())) {
+      return GrpcDeviceManagerStub.create(this);
+    } else {
+      throw new UnsupportedOperationException(
+          "Transport not supported: " + getTransportChannelProvider().getTransportName());
+    }
+  }
+
+  /** Returns a builder for the default ExecutorProvider for this service. */
+  public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
+    return InstantiatingExecutorProvider.newBuilder();
+  }
+
+  /** Returns the default service endpoint. */
+  public static String getDefaultEndpoint() {
+    return "cloudiot.googleapis.com:443";
+  }
+
+  /** Returns the default service scopes. */
+  public static List getDefaultServiceScopes() {
+    return DEFAULT_SERVICE_SCOPES;
+  }
+
+  /** Returns a builder for the default credentials for this service. */
+  public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
+    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+  }
+
+  /** Returns a builder for the default ChannelProvider for this service. */
+  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
+    return InstantiatingGrpcChannelProvider.newBuilder();
+  }
+
+  public static TransportChannelProvider defaultTransportChannelProvider() {
+    return defaultGrpcTransportProviderBuilder().build();
+  }
+
+  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
+  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+    return ApiClientHeaderProvider.newBuilder()
+        .setGeneratedLibToken(
+            "gapic", GaxProperties.getLibraryVersion(DeviceManagerStubSettings.class))
+        .setTransportToken(
+            GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder() {
+    return Builder.createDefault();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder(ClientContext clientContext) {
+    return new Builder(clientContext);
+  }
+
+  /** Returns a builder containing all the values of this settings class. */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  protected DeviceManagerStubSettings(Builder settingsBuilder) throws IOException {
+    super(settingsBuilder);
+
+    createDeviceRegistrySettings = settingsBuilder.createDeviceRegistrySettings().build();
+    getDeviceRegistrySettings = settingsBuilder.getDeviceRegistrySettings().build();
+    updateDeviceRegistrySettings = settingsBuilder.updateDeviceRegistrySettings().build();
+    deleteDeviceRegistrySettings = settingsBuilder.deleteDeviceRegistrySettings().build();
+    listDeviceRegistriesSettings = settingsBuilder.listDeviceRegistriesSettings().build();
+    createDeviceSettings = settingsBuilder.createDeviceSettings().build();
+    getDeviceSettings = settingsBuilder.getDeviceSettings().build();
+    updateDeviceSettings = settingsBuilder.updateDeviceSettings().build();
+    deleteDeviceSettings = settingsBuilder.deleteDeviceSettings().build();
+    listDevicesSettings = settingsBuilder.listDevicesSettings().build();
+    modifyCloudToDeviceConfigSettings = settingsBuilder.modifyCloudToDeviceConfigSettings().build();
+    listDeviceConfigVersionsSettings = settingsBuilder.listDeviceConfigVersionsSettings().build();
+    listDeviceStatesSettings = settingsBuilder.listDeviceStatesSettings().build();
+    setIamPolicySettings = settingsBuilder.setIamPolicySettings().build();
+    getIamPolicySettings = settingsBuilder.getIamPolicySettings().build();
+    testIamPermissionsSettings = settingsBuilder.testIamPermissionsSettings().build();
+  }
+
+  private static final PagedListDescriptor<
+          ListDeviceRegistriesRequest, ListDeviceRegistriesResponse, DeviceRegistry>
+      LIST_DEVICE_REGISTRIES_PAGE_STR_DESC =
+          new PagedListDescriptor<
+              ListDeviceRegistriesRequest, ListDeviceRegistriesResponse, DeviceRegistry>() {
+            @Override
+            public String emptyToken() {
+              return "";
+            }
+
+            @Override
+            public ListDeviceRegistriesRequest injectToken(
+                ListDeviceRegistriesRequest payload, String token) {
+              return ListDeviceRegistriesRequest.newBuilder(payload).setPageToken(token).build();
+            }
+
+            @Override
+            public ListDeviceRegistriesRequest injectPageSize(
+                ListDeviceRegistriesRequest payload, int pageSize) {
+              return ListDeviceRegistriesRequest.newBuilder(payload).setPageSize(pageSize).build();
+            }
+
+            @Override
+            public Integer extractPageSize(ListDeviceRegistriesRequest payload) {
+              return payload.getPageSize();
+            }
+
+            @Override
+            public String extractNextToken(ListDeviceRegistriesResponse payload) {
+              return payload.getNextPageToken();
+            }
+
+            @Override
+            public Iterable extractResources(ListDeviceRegistriesResponse payload) {
+              return payload.getDeviceRegistriesList();
+            }
+          };
+
+  private static final PagedListDescriptor
+      LIST_DEVICES_PAGE_STR_DESC =
+          new PagedListDescriptor() {
+            @Override
+            public String emptyToken() {
+              return "";
+            }
+
+            @Override
+            public ListDevicesRequest injectToken(ListDevicesRequest payload, String token) {
+              return ListDevicesRequest.newBuilder(payload).setPageToken(token).build();
+            }
+
+            @Override
+            public ListDevicesRequest injectPageSize(ListDevicesRequest payload, int pageSize) {
+              return ListDevicesRequest.newBuilder(payload).setPageSize(pageSize).build();
+            }
+
+            @Override
+            public Integer extractPageSize(ListDevicesRequest payload) {
+              return payload.getPageSize();
+            }
+
+            @Override
+            public String extractNextToken(ListDevicesResponse payload) {
+              return payload.getNextPageToken();
+            }
+
+            @Override
+            public Iterable extractResources(ListDevicesResponse payload) {
+              return payload.getDevicesList();
+            }
+          };
+
+  private static final PagedListResponseFactory<
+          ListDeviceRegistriesRequest, ListDeviceRegistriesResponse,
+          ListDeviceRegistriesPagedResponse>
+      LIST_DEVICE_REGISTRIES_PAGE_STR_FACT =
+          new PagedListResponseFactory<
+              ListDeviceRegistriesRequest, ListDeviceRegistriesResponse,
+              ListDeviceRegistriesPagedResponse>() {
+            @Override
+            public ApiFuture getFuturePagedResponse(
+                UnaryCallable callable,
+                ListDeviceRegistriesRequest request,
+                ApiCallContext context,
+                ApiFuture futureResponse) {
+              PageContext
+                  pageContext =
+                      PageContext.create(
+                          callable, LIST_DEVICE_REGISTRIES_PAGE_STR_DESC, request, context);
+              return ListDeviceRegistriesPagedResponse.createAsync(pageContext, futureResponse);
+            }
+          };
+
+  private static final PagedListResponseFactory<
+          ListDevicesRequest, ListDevicesResponse, ListDevicesPagedResponse>
+      LIST_DEVICES_PAGE_STR_FACT =
+          new PagedListResponseFactory<
+              ListDevicesRequest, ListDevicesResponse, ListDevicesPagedResponse>() {
+            @Override
+            public ApiFuture getFuturePagedResponse(
+                UnaryCallable callable,
+                ListDevicesRequest request,
+                ApiCallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_DEVICES_PAGE_STR_DESC, request, context);
+              return ListDevicesPagedResponse.createAsync(pageContext, futureResponse);
+            }
+          };
+
+  /** Builder for DeviceManagerStubSettings. */
+  public static class Builder extends StubSettings.Builder {
+    private final ImmutableList> unaryMethodSettingsBuilders;
+
+    private final UnaryCallSettings.Builder
+        createDeviceRegistrySettings;
+    private final UnaryCallSettings.Builder
+        getDeviceRegistrySettings;
+    private final UnaryCallSettings.Builder
+        updateDeviceRegistrySettings;
+    private final UnaryCallSettings.Builder
+        deleteDeviceRegistrySettings;
+    private final PagedCallSettings.Builder<
+            ListDeviceRegistriesRequest, ListDeviceRegistriesResponse,
+            ListDeviceRegistriesPagedResponse>
+        listDeviceRegistriesSettings;
+    private final UnaryCallSettings.Builder createDeviceSettings;
+    private final UnaryCallSettings.Builder getDeviceSettings;
+    private final UnaryCallSettings.Builder updateDeviceSettings;
+    private final UnaryCallSettings.Builder deleteDeviceSettings;
+    private final PagedCallSettings.Builder<
+            ListDevicesRequest, ListDevicesResponse, ListDevicesPagedResponse>
+        listDevicesSettings;
+    private final UnaryCallSettings.Builder
+        modifyCloudToDeviceConfigSettings;
+    private final UnaryCallSettings.Builder<
+            ListDeviceConfigVersionsRequest, ListDeviceConfigVersionsResponse>
+        listDeviceConfigVersionsSettings;
+    private final UnaryCallSettings.Builder
+        listDeviceStatesSettings;
+    private final UnaryCallSettings.Builder setIamPolicySettings;
+    private final UnaryCallSettings.Builder getIamPolicySettings;
+    private final UnaryCallSettings.Builder
+        testIamPermissionsSettings;
+
+    private static final ImmutableMap>
+        RETRYABLE_CODE_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder> definitions =
+          ImmutableMap.builder();
+      definitions.put(
+          "idempotent",
+          ImmutableSet.copyOf(
+              Lists.newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList()));
+      definitions.put(
+          "rate_limited_aware",
+          ImmutableSet.copyOf(
+              Lists.newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED,
+                  StatusCode.Code.RESOURCE_EXHAUSTED,
+                  StatusCode.Code.UNAVAILABLE)));
+      RETRYABLE_CODE_DEFINITIONS = definitions.build();
+    }
+
+    private static final ImmutableMap RETRY_PARAM_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder definitions = ImmutableMap.builder();
+      RetrySettings settings = null;
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(20000L))
+              .setTotalTimeout(Duration.ofMillis(120000L))
+              .build();
+      definitions.put("default", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(1000L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(20000L))
+              .setTotalTimeout(Duration.ofMillis(120000L))
+              .build();
+      definitions.put("rate_limited_aware", settings);
+      RETRY_PARAM_DEFINITIONS = definitions.build();
+    }
+
+    protected Builder() {
+      this((ClientContext) null);
+    }
+
+    protected Builder(ClientContext clientContext) {
+      super(clientContext);
+
+      createDeviceRegistrySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      getDeviceRegistrySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      updateDeviceRegistrySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      deleteDeviceRegistrySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      listDeviceRegistriesSettings =
+          PagedCallSettings.newBuilder(LIST_DEVICE_REGISTRIES_PAGE_STR_FACT);
+
+      createDeviceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      getDeviceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      updateDeviceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      deleteDeviceSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      listDevicesSettings = PagedCallSettings.newBuilder(LIST_DEVICES_PAGE_STR_FACT);
+
+      modifyCloudToDeviceConfigSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      listDeviceConfigVersionsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      listDeviceStatesSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      setIamPolicySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      getIamPolicySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      testIamPermissionsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      unaryMethodSettingsBuilders =
+          ImmutableList.>of(
+              createDeviceRegistrySettings,
+              getDeviceRegistrySettings,
+              updateDeviceRegistrySettings,
+              deleteDeviceRegistrySettings,
+              listDeviceRegistriesSettings,
+              createDeviceSettings,
+              getDeviceSettings,
+              updateDeviceSettings,
+              deleteDeviceSettings,
+              listDevicesSettings,
+              modifyCloudToDeviceConfigSettings,
+              listDeviceConfigVersionsSettings,
+              listDeviceStatesSettings,
+              setIamPolicySettings,
+              getIamPolicySettings,
+              testIamPermissionsSettings);
+
+      initDefaults(this);
+    }
+
+    private static Builder createDefault() {
+      Builder builder = new Builder((ClientContext) null);
+      builder.setTransportChannelProvider(defaultTransportChannelProvider());
+      builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
+      builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
+      builder.setEndpoint(getDefaultEndpoint());
+      return initDefaults(builder);
+    }
+
+    private static Builder initDefaults(Builder builder) {
+
+      builder
+          .createDeviceRegistrySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .getDeviceRegistrySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .updateDeviceRegistrySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .deleteDeviceRegistrySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .listDeviceRegistriesSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .createDeviceSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .getDeviceSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .updateDeviceSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .deleteDeviceSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .listDevicesSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .modifyCloudToDeviceConfigSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("rate_limited_aware"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("rate_limited_aware"));
+
+      builder
+          .listDeviceConfigVersionsSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .listDeviceStatesSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .setIamPolicySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .getIamPolicySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .testIamPermissionsSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      return builder;
+    }
+
+    protected Builder(DeviceManagerStubSettings settings) {
+      super(settings);
+
+      createDeviceRegistrySettings = settings.createDeviceRegistrySettings.toBuilder();
+      getDeviceRegistrySettings = settings.getDeviceRegistrySettings.toBuilder();
+      updateDeviceRegistrySettings = settings.updateDeviceRegistrySettings.toBuilder();
+      deleteDeviceRegistrySettings = settings.deleteDeviceRegistrySettings.toBuilder();
+      listDeviceRegistriesSettings = settings.listDeviceRegistriesSettings.toBuilder();
+      createDeviceSettings = settings.createDeviceSettings.toBuilder();
+      getDeviceSettings = settings.getDeviceSettings.toBuilder();
+      updateDeviceSettings = settings.updateDeviceSettings.toBuilder();
+      deleteDeviceSettings = settings.deleteDeviceSettings.toBuilder();
+      listDevicesSettings = settings.listDevicesSettings.toBuilder();
+      modifyCloudToDeviceConfigSettings = settings.modifyCloudToDeviceConfigSettings.toBuilder();
+      listDeviceConfigVersionsSettings = settings.listDeviceConfigVersionsSettings.toBuilder();
+      listDeviceStatesSettings = settings.listDeviceStatesSettings.toBuilder();
+      setIamPolicySettings = settings.setIamPolicySettings.toBuilder();
+      getIamPolicySettings = settings.getIamPolicySettings.toBuilder();
+      testIamPermissionsSettings = settings.testIamPermissionsSettings.toBuilder();
+
+      unaryMethodSettingsBuilders =
+          ImmutableList.>of(
+              createDeviceRegistrySettings,
+              getDeviceRegistrySettings,
+              updateDeviceRegistrySettings,
+              deleteDeviceRegistrySettings,
+              listDeviceRegistriesSettings,
+              createDeviceSettings,
+              getDeviceSettings,
+              updateDeviceSettings,
+              deleteDeviceSettings,
+              listDevicesSettings,
+              modifyCloudToDeviceConfigSettings,
+              listDeviceConfigVersionsSettings,
+              listDeviceStatesSettings,
+              setIamPolicySettings,
+              getIamPolicySettings,
+              testIamPermissionsSettings);
+    }
+
+    // NEXT_MAJOR_VER: remove 'throws Exception'
+    /**
+     * Applies the given settings updater function to all of the unary API methods in this service.
+     *
+     * 
Note: This method does not support applying settings to streaming methods.
+     */
+    public Builder applyToAllUnaryMethods(
+        ApiFunction, Void> settingsUpdater) throws Exception {
+      super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
+      return this;
+    }
+
+    public ImmutableList> unaryMethodSettingsBuilders() {
+      return unaryMethodSettingsBuilders;
+    }
+
+    /** Returns the builder for the settings used for calls to createDeviceRegistry. */
+    public UnaryCallSettings.Builder
+        createDeviceRegistrySettings() {
+      return createDeviceRegistrySettings;
+    }
+
+    /** Returns the builder for the settings used for calls to getDeviceRegistry. */
+    public UnaryCallSettings.Builder
+        getDeviceRegistrySettings() {
+      return getDeviceRegistrySettings;
+    }
+
+    /** Returns the builder for the settings used for calls to updateDeviceRegistry. */
+    public UnaryCallSettings.Builder
+        updateDeviceRegistrySettings() {
+      return updateDeviceRegistrySettings;
+    }
+
+    /** Returns the builder for the settings used for calls to deleteDeviceRegistry. */
+    public UnaryCallSettings.Builder
+        deleteDeviceRegistrySettings() {
+      return deleteDeviceRegistrySettings;
+    }
+
+    /** Returns the builder for the settings used for calls to listDeviceRegistries. */
+    public PagedCallSettings.Builder<
+            ListDeviceRegistriesRequest, ListDeviceRegistriesResponse,
+            ListDeviceRegistriesPagedResponse>
+        listDeviceRegistriesSettings() {
+      return listDeviceRegistriesSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to createDevice. */
+    public UnaryCallSettings.Builder createDeviceSettings() {
+      return createDeviceSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to getDevice. */
+    public UnaryCallSettings.Builder getDeviceSettings() {
+      return getDeviceSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to updateDevice. */
+    public UnaryCallSettings.Builder updateDeviceSettings() {
+      return updateDeviceSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to deleteDevice. */
+    public UnaryCallSettings.Builder deleteDeviceSettings() {
+      return deleteDeviceSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to listDevices. */
+    public PagedCallSettings.Builder<
+            ListDevicesRequest, ListDevicesResponse, ListDevicesPagedResponse>
+        listDevicesSettings() {
+      return listDevicesSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to modifyCloudToDeviceConfig. */
+    public UnaryCallSettings.Builder
+        modifyCloudToDeviceConfigSettings() {
+      return modifyCloudToDeviceConfigSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to listDeviceConfigVersions. */
+    public UnaryCallSettings.Builder<
+            ListDeviceConfigVersionsRequest, ListDeviceConfigVersionsResponse>
+        listDeviceConfigVersionsSettings() {
+      return listDeviceConfigVersionsSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to listDeviceStates. */
+    public UnaryCallSettings.Builder
+        listDeviceStatesSettings() {
+      return listDeviceStatesSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to setIamPolicy. */
+    public UnaryCallSettings.Builder setIamPolicySettings() {
+      return setIamPolicySettings;
+    }
+
+    /** Returns the builder for the settings used for calls to getIamPolicy. */
+    public UnaryCallSettings.Builder getIamPolicySettings() {
+      return getIamPolicySettings;
+    }
+
+    /** Returns the builder for the settings used for calls to testIamPermissions. */
+    public UnaryCallSettings.Builder
+        testIamPermissionsSettings() {
+      return testIamPermissionsSettings;
+    }
+
+    @Override
+    public DeviceManagerStubSettings build() throws IOException {
+      return new DeviceManagerStubSettings(this);
+    }
+  }
+}
diff --git a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceCallableFactory.java b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/GrpcDeviceManagerCallableFactory.java
similarity index 94%
rename from google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceCallableFactory.java
rename to google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/GrpcDeviceManagerCallableFactory.java
index cc4a21dfe501..85481f99f7ea 100644
--- a/google-cloud-clients/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/GrpcDeviceManagerCallableFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.dlp.v2beta1.stub;
+package com.google.cloud.iot.v1.stub;
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.grpc.GrpcCallSettings;
@@ -37,13 +37,13 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * gRPC callable factory implementation for DLP API.
+ * gRPC callable factory implementation for Cloud IoT API.
  *
  * 
This class is for advanced usage.
  */
 @Generated("by gapic-generator")
 @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
-public class GrpcDlpServiceCallableFactory implements GrpcStubCallableFactory {
+public class GrpcDeviceManagerCallableFactory implements GrpcStubCallableFactory {
   @Override
   public  UnaryCallable createUnaryCallable(
       GrpcCallSettings grpcCallSettings,
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/GrpcDeviceManagerStub.java b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/GrpcDeviceManagerStub.java
new file mode 100644
index 000000000000..4bedbca02ef5
--- /dev/null
+++ b/google-cloud-clients/google-cloud-iot/src/main/java/com/google/cloud/iot/v1/stub/GrpcDeviceManagerStub.java
@@ -0,0 +1,683 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.iot.v1.stub;
+
+import static com.google.cloud.iot.v1.DeviceManagerClient.ListDeviceRegistriesPagedResponse;
+import static com.google.cloud.iot.v1.DeviceManagerClient.ListDevicesPagedResponse;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.core.BackgroundResourceAggregation;
+import com.google.api.gax.grpc.GrpcCallSettings;
+import com.google.api.gax.grpc.GrpcStubCallableFactory;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.RequestParamsExtractor;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.iot.v1.CreateDeviceRegistryRequest;
+import com.google.cloud.iot.v1.CreateDeviceRequest;
+import com.google.cloud.iot.v1.DeleteDeviceRegistryRequest;
+import com.google.cloud.iot.v1.DeleteDeviceRequest;
+import com.google.cloud.iot.v1.Device;
+import com.google.cloud.iot.v1.DeviceConfig;
+import com.google.cloud.iot.v1.DeviceRegistry;
+import com.google.cloud.iot.v1.GetDeviceRegistryRequest;
+import com.google.cloud.iot.v1.GetDeviceRequest;
+import com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest;
+import com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse;
+import com.google.cloud.iot.v1.ListDeviceRegistriesRequest;
+import com.google.cloud.iot.v1.ListDeviceRegistriesResponse;
+import com.google.cloud.iot.v1.ListDeviceStatesRequest;
+import com.google.cloud.iot.v1.ListDeviceStatesResponse;
+import com.google.cloud.iot.v1.ListDevicesRequest;
+import com.google.cloud.iot.v1.ListDevicesResponse;
+import com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest;
+import com.google.cloud.iot.v1.UpdateDeviceRegistryRequest;
+import com.google.cloud.iot.v1.UpdateDeviceRequest;
+import com.google.common.collect.ImmutableMap;
+import com.google.iam.v1.GetIamPolicyRequest;
+import com.google.iam.v1.Policy;
+import com.google.iam.v1.SetIamPolicyRequest;
+import com.google.iam.v1.TestIamPermissionsRequest;
+import com.google.iam.v1.TestIamPermissionsResponse;
+import com.google.protobuf.Empty;
+import io.grpc.MethodDescriptor;
+import io.grpc.protobuf.ProtoUtils;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * gRPC stub implementation for Cloud IoT API.
+ *
+ * 
This class is for advanced usage and reflects the underlying API directly.
+ */
+@Generated("by gapic-generator")
+@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+public class GrpcDeviceManagerStub extends DeviceManagerStub {
+
+  private static final MethodDescriptor
+      createDeviceRegistryMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.iot.v1.DeviceManager/CreateDeviceRegistry")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(CreateDeviceRegistryRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(DeviceRegistry.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      getDeviceRegistryMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.iot.v1.DeviceManager/GetDeviceRegistry")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(GetDeviceRegistryRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(DeviceRegistry.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      updateDeviceRegistryMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.iot.v1.DeviceManager/UpdateDeviceRegistry")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(UpdateDeviceRegistryRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(DeviceRegistry.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      deleteDeviceRegistryMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.iot.v1.DeviceManager/DeleteDeviceRegistry")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(DeleteDeviceRegistryRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      listDeviceRegistriesMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.iot.v1.DeviceManager/ListDeviceRegistries")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(ListDeviceRegistriesRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(ListDeviceRegistriesResponse.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor createDeviceMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.iot.v1.DeviceManager/CreateDevice")
+          .setRequestMarshaller(ProtoUtils.marshaller(CreateDeviceRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Device.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor getDeviceMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.iot.v1.DeviceManager/GetDevice")
+          .setRequestMarshaller(ProtoUtils.marshaller(GetDeviceRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Device.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor updateDeviceMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.iot.v1.DeviceManager/UpdateDevice")
+          .setRequestMarshaller(ProtoUtils.marshaller(UpdateDeviceRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Device.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor deleteDeviceMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.iot.v1.DeviceManager/DeleteDevice")
+          .setRequestMarshaller(ProtoUtils.marshaller(DeleteDeviceRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor
+      listDevicesMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.iot.v1.DeviceManager/ListDevices")
+              .setRequestMarshaller(ProtoUtils.marshaller(ListDevicesRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(ListDevicesResponse.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      modifyCloudToDeviceConfigMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.iot.v1.DeviceManager/ModifyCloudToDeviceConfig")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(ModifyCloudToDeviceConfigRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(DeviceConfig.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor<
+          ListDeviceConfigVersionsRequest, ListDeviceConfigVersionsResponse>
+      listDeviceConfigVersionsMethodDescriptor =
+          MethodDescriptor
+              .newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.iot.v1.DeviceManager/ListDeviceConfigVersions")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(ListDeviceConfigVersionsRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(ListDeviceConfigVersionsResponse.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      listDeviceStatesMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.iot.v1.DeviceManager/ListDeviceStates")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(ListDeviceStatesRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(ListDeviceStatesResponse.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor setIamPolicyMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.iot.v1.DeviceManager/SetIamPolicy")
+          .setRequestMarshaller(ProtoUtils.marshaller(SetIamPolicyRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor getIamPolicyMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.iot.v1.DeviceManager/GetIamPolicy")
+          .setRequestMarshaller(ProtoUtils.marshaller(GetIamPolicyRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Policy.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor
+      testIamPermissionsMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.iot.v1.DeviceManager/TestIamPermissions")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(TestIamPermissionsRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance()))
+              .build();
+
+  private final BackgroundResource backgroundResources;
+
+  private final UnaryCallable
+      createDeviceRegistryCallable;
+  private final UnaryCallable getDeviceRegistryCallable;
+  private final UnaryCallable
+      updateDeviceRegistryCallable;
+  private final UnaryCallable deleteDeviceRegistryCallable;
+  private final UnaryCallable
+      listDeviceRegistriesCallable;
+  private final UnaryCallable
+      listDeviceRegistriesPagedCallable;
+  private final UnaryCallable createDeviceCallable;
+  private final UnaryCallable getDeviceCallable;
+  private final UnaryCallable updateDeviceCallable;
+  private final UnaryCallable deleteDeviceCallable;
+  private final UnaryCallable listDevicesCallable;
+  private final UnaryCallable
+      listDevicesPagedCallable;
+  private final UnaryCallable
+      modifyCloudToDeviceConfigCallable;
+  private final UnaryCallable
+      listDeviceConfigVersionsCallable;
+  private final UnaryCallable
+      listDeviceStatesCallable;
+  private final UnaryCallable setIamPolicyCallable;
+  private final UnaryCallable getIamPolicyCallable;
+  private final UnaryCallable
+      testIamPermissionsCallable;
+
+  private final GrpcStubCallableFactory callableFactory;
+
+  public static final GrpcDeviceManagerStub create(DeviceManagerStubSettings settings)
+      throws IOException {
+    return new GrpcDeviceManagerStub(settings, ClientContext.create(settings));
+  }
+
+  public static final GrpcDeviceManagerStub create(ClientContext clientContext) throws IOException {
+    return new GrpcDeviceManagerStub(DeviceManagerStubSettings.newBuilder().build(), clientContext);
+  }
+
+  public static final GrpcDeviceManagerStub create(
+      ClientContext clientContext, GrpcStubCallableFactory callableFactory) throws IOException {
+    return new GrpcDeviceManagerStub(
+        DeviceManagerStubSettings.newBuilder().build(), clientContext, callableFactory);
+  }
+
+  /**
+   * Constructs an instance of GrpcDeviceManagerStub, using the given settings. This is protected so
+   * that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected GrpcDeviceManagerStub(DeviceManagerStubSettings settings, ClientContext clientContext)
+      throws IOException {
+    this(settings, clientContext, new GrpcDeviceManagerCallableFactory());
+  }
+
+  /**
+   * Constructs an instance of GrpcDeviceManagerStub, using the given settings. This is protected so
+   * that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected GrpcDeviceManagerStub(
+      DeviceManagerStubSettings settings,
+      ClientContext clientContext,
+      GrpcStubCallableFactory callableFactory)
+      throws IOException {
+    this.callableFactory = callableFactory;
+
+    GrpcCallSettings
+        createDeviceRegistryTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(createDeviceRegistryMethodDescriptor)
+                .setParamsExtractor(
+                    new RequestParamsExtractor() {
+                      @Override
+                      public Map extract(CreateDeviceRegistryRequest request) {
+                        ImmutableMap.Builder params = ImmutableMap.builder();
+                        params.put("parent", String.valueOf(request.getParent()));
+                        return params.build();
+                      }
+                    })
+                .build();
+    GrpcCallSettings getDeviceRegistryTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(getDeviceRegistryMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(GetDeviceRegistryRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings
+        updateDeviceRegistryTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(updateDeviceRegistryMethodDescriptor)
+                .setParamsExtractor(
+                    new RequestParamsExtractor() {
+                      @Override
+                      public Map extract(UpdateDeviceRegistryRequest request) {
+                        ImmutableMap.Builder params = ImmutableMap.builder();
+                        params.put(
+                            "device_registry.name",
+                            String.valueOf(request.getDeviceRegistry().getName()));
+                        return params.build();
+                      }
+                    })
+                .build();
+    GrpcCallSettings deleteDeviceRegistryTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(deleteDeviceRegistryMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(DeleteDeviceRegistryRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings
+        listDeviceRegistriesTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(listDeviceRegistriesMethodDescriptor)
+                .setParamsExtractor(
+                    new RequestParamsExtractor() {
+                      @Override
+                      public Map extract(ListDeviceRegistriesRequest request) {
+                        ImmutableMap.Builder params = ImmutableMap.builder();
+                        params.put("parent", String.valueOf(request.getParent()));
+                        return params.build();
+                      }
+                    })
+                .build();
+    GrpcCallSettings createDeviceTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(createDeviceMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(CreateDeviceRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("parent", String.valueOf(request.getParent()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings getDeviceTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(getDeviceMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(GetDeviceRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings updateDeviceTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(updateDeviceMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(UpdateDeviceRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("device.name", String.valueOf(request.getDevice().getName()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings deleteDeviceTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(deleteDeviceMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(DeleteDeviceRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings listDevicesTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(listDevicesMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(ListDevicesRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("parent", String.valueOf(request.getParent()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings
+        modifyCloudToDeviceConfigTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(modifyCloudToDeviceConfigMethodDescriptor)
+                .setParamsExtractor(
+                    new RequestParamsExtractor() {
+                      @Override
+                      public Map extract(ModifyCloudToDeviceConfigRequest request) {
+                        ImmutableMap.Builder params = ImmutableMap.builder();
+                        params.put("name", String.valueOf(request.getName()));
+                        return params.build();
+                      }
+                    })
+                .build();
+    GrpcCallSettings
+        listDeviceConfigVersionsTransportSettings =
+            GrpcCallSettings
+                .newBuilder()
+                .setMethodDescriptor(listDeviceConfigVersionsMethodDescriptor)
+                .setParamsExtractor(
+                    new RequestParamsExtractor() {
+                      @Override
+                      public Map extract(ListDeviceConfigVersionsRequest request) {
+                        ImmutableMap.Builder params = ImmutableMap.builder();
+                        params.put("name", String.valueOf(request.getName()));
+                        return params.build();
+                      }
+                    })
+                .build();
+    GrpcCallSettings
+        listDeviceStatesTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(listDeviceStatesMethodDescriptor)
+                .setParamsExtractor(
+                    new RequestParamsExtractor() {
+                      @Override
+                      public Map extract(ListDeviceStatesRequest request) {
+                        ImmutableMap.Builder params = ImmutableMap.builder();
+                        params.put("name", String.valueOf(request.getName()));
+                        return params.build();
+                      }
+                    })
+                .build();
+    GrpcCallSettings setIamPolicyTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(setIamPolicyMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(SetIamPolicyRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("resource", String.valueOf(request.getResource()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings getIamPolicyTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(getIamPolicyMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor() {
+                  @Override
+                  public Map extract(GetIamPolicyRequest request) {
+                    ImmutableMap.Builder params = ImmutableMap.builder();
+                    params.put("resource", String.valueOf(request.getResource()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings
+        testIamPermissionsTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(testIamPermissionsMethodDescriptor)
+                .setParamsExtractor(
+                    new RequestParamsExtractor() {
+                      @Override
+                      public Map extract(TestIamPermissionsRequest request) {
+                        ImmutableMap.Builder params = ImmutableMap.builder();
+                        params.put("resource", String.valueOf(request.getResource()));
+                        return params.build();
+                      }
+                    })
+                .build();
+
+    this.createDeviceRegistryCallable =
+        callableFactory.createUnaryCallable(
+            createDeviceRegistryTransportSettings,
+            settings.createDeviceRegistrySettings(),
+            clientContext);
+    this.getDeviceRegistryCallable =
+        callableFactory.createUnaryCallable(
+            getDeviceRegistryTransportSettings,
+            settings.getDeviceRegistrySettings(),
+            clientContext);
+    this.updateDeviceRegistryCallable =
+        callableFactory.createUnaryCallable(
+            updateDeviceRegistryTransportSettings,
+            settings.updateDeviceRegistrySettings(),
+            clientContext);
+    this.deleteDeviceRegistryCallable =
+        callableFactory.createUnaryCallable(
+            deleteDeviceRegistryTransportSettings,
+            settings.deleteDeviceRegistrySettings(),
+            clientContext);
+    this.listDeviceRegistriesCallable =
+        callableFactory.createUnaryCallable(
+            listDeviceRegistriesTransportSettings,
+            settings.listDeviceRegistriesSettings(),
+            clientContext);
+    this.listDeviceRegistriesPagedCallable =
+        callableFactory.createPagedCallable(
+            listDeviceRegistriesTransportSettings,
+            settings.listDeviceRegistriesSettings(),
+            clientContext);
+    this.createDeviceCallable =
+        callableFactory.createUnaryCallable(
+            createDeviceTransportSettings, settings.createDeviceSettings(), clientContext);
+    this.getDeviceCallable =
+        callableFactory.createUnaryCallable(
+            getDeviceTransportSettings, settings.getDeviceSettings(), clientContext);
+    this.updateDeviceCallable =
+        callableFactory.createUnaryCallable(
+            updateDeviceTransportSettings, settings.updateDeviceSettings(), clientContext);
+    this.deleteDeviceCallable =
+        callableFactory.createUnaryCallable(
+            deleteDeviceTransportSettings, settings.deleteDeviceSettings(), clientContext);
+    this.listDevicesCallable =
+        callableFactory.createUnaryCallable(
+            listDevicesTransportSettings, settings.listDevicesSettings(), clientContext);
+    this.listDevicesPagedCallable =
+        callableFactory.createPagedCallable(
+            listDevicesTransportSettings, settings.listDevicesSettings(), clientContext);
+    this.modifyCloudToDeviceConfigCallable =
+        callableFactory.createUnaryCallable(
+            modifyCloudToDeviceConfigTransportSettings,
+            settings.modifyCloudToDeviceConfigSettings(),
+            clientContext);
+    this.listDeviceConfigVersionsCallable =
+        callableFactory.createUnaryCallable(
+            listDeviceConfigVersionsTransportSettings,
+            settings.listDeviceConfigVersionsSettings(),
+            clientContext);
+    this.listDeviceStatesCallable =
+        callableFactory.createUnaryCallable(
+            listDeviceStatesTransportSettings, settings.listDeviceStatesSettings(), clientContext);
+    this.setIamPolicyCallable =
+        callableFactory.createUnaryCallable(
+            setIamPolicyTransportSettings, settings.setIamPolicySettings(), clientContext);
+    this.getIamPolicyCallable =
+        callableFactory.createUnaryCallable(
+            getIamPolicyTransportSettings, settings.getIamPolicySettings(), clientContext);
+    this.testIamPermissionsCallable =
+        callableFactory.createUnaryCallable(
+            testIamPermissionsTransportSettings,
+            settings.testIamPermissionsSettings(),
+            clientContext);
+
+    backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
+  }
+
+  public UnaryCallable createDeviceRegistryCallable() {
+    return createDeviceRegistryCallable;
+  }
+
+  public UnaryCallable getDeviceRegistryCallable() {
+    return getDeviceRegistryCallable;
+  }
+
+  public UnaryCallable updateDeviceRegistryCallable() {
+    return updateDeviceRegistryCallable;
+  }
+
+  public UnaryCallable deleteDeviceRegistryCallable() {
+    return deleteDeviceRegistryCallable;
+  }
+
+  public UnaryCallable
+      listDeviceRegistriesPagedCallable() {
+    return listDeviceRegistriesPagedCallable;
+  }
+
+  public UnaryCallable
+      listDeviceRegistriesCallable() {
+    return listDeviceRegistriesCallable;
+  }
+
+  public UnaryCallable createDeviceCallable() {
+    return createDeviceCallable;
+  }
+
+  public UnaryCallable getDeviceCallable() {
+    return getDeviceCallable;
+  }
+
+  public UnaryCallable updateDeviceCallable() {
+    return updateDeviceCallable;
+  }
+
+  public UnaryCallable deleteDeviceCallable() {
+    return deleteDeviceCallable;
+  }
+
+  public UnaryCallable listDevicesPagedCallable() {
+    return listDevicesPagedCallable;
+  }
+
+  public UnaryCallable listDevicesCallable() {
+    return listDevicesCallable;
+  }
+
+  public UnaryCallable
+      modifyCloudToDeviceConfigCallable() {
+    return modifyCloudToDeviceConfigCallable;
+  }
+
+  public UnaryCallable
+      listDeviceConfigVersionsCallable() {
+    return listDeviceConfigVersionsCallable;
+  }
+
+  public UnaryCallable
+      listDeviceStatesCallable() {
+    return listDeviceStatesCallable;
+  }
+
+  public UnaryCallable setIamPolicyCallable() {
+    return setIamPolicyCallable;
+  }
+
+  public UnaryCallable getIamPolicyCallable() {
+    return getIamPolicyCallable;
+  }
+
+  public UnaryCallable
+      testIamPermissionsCallable() {
+    return testIamPermissionsCallable;
+  }
+
+  @Override
+  public final void close() {
+    shutdown();
+  }
+
+  @Override
+  public void shutdown() {
+    backgroundResources.shutdown();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return backgroundResources.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return backgroundResources.isTerminated();
+  }
+
+  @Override
+  public void shutdownNow() {
+    backgroundResources.shutdownNow();
+  }
+
+  @Override
+  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
+    return backgroundResources.awaitTermination(duration, unit);
+  }
+}
diff --git a/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/DeviceManagerClientTest.java b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/DeviceManagerClientTest.java
new file mode 100644
index 000000000000..2e29a774afa9
--- /dev/null
+++ b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/DeviceManagerClientTest.java
@@ -0,0 +1,784 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.iot.v1;
+
+import static com.google.cloud.iot.v1.DeviceManagerClient.ListDeviceRegistriesPagedResponse;
+import static com.google.cloud.iot.v1.DeviceManagerClient.ListDevicesPagedResponse;
+
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.grpc.GaxGrpcProperties;
+import com.google.api.gax.grpc.testing.LocalChannelProvider;
+import com.google.api.gax.grpc.testing.MockGrpcService;
+import com.google.api.gax.grpc.testing.MockServiceHelper;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.InvalidArgumentException;
+import com.google.common.collect.Lists;
+import com.google.iam.v1.GetIamPolicyRequest;
+import com.google.iam.v1.Policy;
+import com.google.iam.v1.SetIamPolicyRequest;
+import com.google.iam.v1.TestIamPermissionsRequest;
+import com.google.iam.v1.TestIamPermissionsResponse;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
+import com.google.protobuf.GeneratedMessageV3;
+import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+@javax.annotation.Generated("by GAPIC")
+public class DeviceManagerClientTest {
+  private static MockDeviceManager mockDeviceManager;
+  private static MockServiceHelper serviceHelper;
+  private DeviceManagerClient client;
+  private LocalChannelProvider channelProvider;
+
+  @BeforeClass
+  public static void startStaticServer() {
+    mockDeviceManager = new MockDeviceManager();
+    serviceHelper =
+        new MockServiceHelper("in-process-1", Arrays.asList(mockDeviceManager));
+    serviceHelper.start();
+  }
+
+  @AfterClass
+  public static void stopServer() {
+    serviceHelper.stop();
+  }
+
+  @Before
+  public void setUp() throws IOException {
+    serviceHelper.reset();
+    channelProvider = serviceHelper.createChannelProvider();
+    DeviceManagerSettings settings =
+        DeviceManagerSettings.newBuilder()
+            .setTransportChannelProvider(channelProvider)
+            .setCredentialsProvider(NoCredentialsProvider.create())
+            .build();
+    client = DeviceManagerClient.create(settings);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    client.close();
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void createDeviceRegistryTest() {
+    String id = "id3355";
+    RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+    DeviceRegistry expectedResponse =
+        DeviceRegistry.newBuilder().setId(id).setName(name.toString()).build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+    DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+
+    DeviceRegistry actualResponse = client.createDeviceRegistry(parent, deviceRegistry);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    CreateDeviceRegistryRequest actualRequest = (CreateDeviceRegistryRequest) actualRequests.get(0);
+
+    Assert.assertEquals(parent, LocationName.parse(actualRequest.getParent()));
+    Assert.assertEquals(deviceRegistry, actualRequest.getDeviceRegistry());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void createDeviceRegistryExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+      DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+
+      client.createDeviceRegistry(parent, deviceRegistry);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getDeviceRegistryTest() {
+    String id = "id3355";
+    RegistryName name2 = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+    DeviceRegistry expectedResponse =
+        DeviceRegistry.newBuilder().setId(id).setName(name2.toString()).build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+
+    DeviceRegistry actualResponse = client.getDeviceRegistry(name);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    GetDeviceRegistryRequest actualRequest = (GetDeviceRegistryRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, RegistryName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getDeviceRegistryExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+
+      client.getDeviceRegistry(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateDeviceRegistryTest() {
+    String id = "id3355";
+    RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+    DeviceRegistry expectedResponse =
+        DeviceRegistry.newBuilder().setId(id).setName(name.toString()).build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
+
+    DeviceRegistry actualResponse = client.updateDeviceRegistry(deviceRegistry, updateMask);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    UpdateDeviceRegistryRequest actualRequest = (UpdateDeviceRegistryRequest) actualRequests.get(0);
+
+    Assert.assertEquals(deviceRegistry, actualRequest.getDeviceRegistry());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateDeviceRegistryExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      DeviceRegistry deviceRegistry = DeviceRegistry.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
+
+      client.updateDeviceRegistry(deviceRegistry, updateMask);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteDeviceRegistryTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+
+    client.deleteDeviceRegistry(name);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteDeviceRegistryRequest actualRequest = (DeleteDeviceRegistryRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, RegistryName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteDeviceRegistryExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      RegistryName name = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+
+      client.deleteDeviceRegistry(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listDeviceRegistriesTest() {
+    String nextPageToken = "";
+    DeviceRegistry deviceRegistriesElement = DeviceRegistry.newBuilder().build();
+    List deviceRegistries = Arrays.asList(deviceRegistriesElement);
+    ListDeviceRegistriesResponse expectedResponse =
+        ListDeviceRegistriesResponse.newBuilder()
+            .setNextPageToken(nextPageToken)
+            .addAllDeviceRegistries(deviceRegistries)
+            .build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+
+    ListDeviceRegistriesPagedResponse pagedListResponse = client.listDeviceRegistries(parent);
+
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getDeviceRegistriesList().get(0), resources.get(0));
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListDeviceRegistriesRequest actualRequest = (ListDeviceRegistriesRequest) actualRequests.get(0);
+
+    Assert.assertEquals(parent, LocationName.parse(actualRequest.getParent()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listDeviceRegistriesExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+
+      client.listDeviceRegistries(parent);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void createDeviceTest() {
+    String id = "id3355";
+    DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+    long numId = 1034366860L;
+    boolean blocked = true;
+    Device expectedResponse =
+        Device.newBuilder()
+            .setId(id)
+            .setName(name.toString())
+            .setNumId(numId)
+            .setBlocked(blocked)
+            .build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+    Device device = Device.newBuilder().build();
+
+    Device actualResponse = client.createDevice(parent, device);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    CreateDeviceRequest actualRequest = (CreateDeviceRequest) actualRequests.get(0);
+
+    Assert.assertEquals(parent, RegistryName.parse(actualRequest.getParent()));
+    Assert.assertEquals(device, actualRequest.getDevice());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void createDeviceExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+      Device device = Device.newBuilder().build();
+
+      client.createDevice(parent, device);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getDeviceTest() {
+    String id = "id3355";
+    DeviceName name2 = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+    long numId = 1034366860L;
+    boolean blocked = true;
+    Device expectedResponse =
+        Device.newBuilder()
+            .setId(id)
+            .setName(name2.toString())
+            .setNumId(numId)
+            .setBlocked(blocked)
+            .build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+
+    Device actualResponse = client.getDevice(name);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    GetDeviceRequest actualRequest = (GetDeviceRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, DeviceName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getDeviceExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+
+      client.getDevice(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateDeviceTest() {
+    String id = "id3355";
+    DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+    long numId = 1034366860L;
+    boolean blocked = true;
+    Device expectedResponse =
+        Device.newBuilder()
+            .setId(id)
+            .setName(name.toString())
+            .setNumId(numId)
+            .setBlocked(blocked)
+            .build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    Device device = Device.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
+
+    Device actualResponse = client.updateDevice(device, updateMask);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    UpdateDeviceRequest actualRequest = (UpdateDeviceRequest) actualRequests.get(0);
+
+    Assert.assertEquals(device, actualRequest.getDevice());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateDeviceExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      Device device = Device.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
+
+      client.updateDevice(device, updateMask);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteDeviceTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+
+    client.deleteDevice(name);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteDeviceRequest actualRequest = (DeleteDeviceRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, DeviceName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteDeviceExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+
+      client.deleteDevice(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listDevicesTest() {
+    String nextPageToken = "";
+    Device devicesElement = Device.newBuilder().build();
+    List devices = Arrays.asList(devicesElement);
+    ListDevicesResponse expectedResponse =
+        ListDevicesResponse.newBuilder()
+            .setNextPageToken(nextPageToken)
+            .addAllDevices(devices)
+            .build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+
+    ListDevicesPagedResponse pagedListResponse = client.listDevices(parent);
+
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getDevicesList().get(0), resources.get(0));
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListDevicesRequest actualRequest = (ListDevicesRequest) actualRequests.get(0);
+
+    Assert.assertEquals(parent, RegistryName.parse(actualRequest.getParent()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listDevicesExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      RegistryName parent = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+
+      client.listDevices(parent);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void modifyCloudToDeviceConfigTest() {
+    long version = 351608024L;
+    ByteString binaryData2 = ByteString.copyFromUtf8("-37");
+    DeviceConfig expectedResponse =
+        DeviceConfig.newBuilder().setVersion(version).setBinaryData(binaryData2).build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+    ByteString binaryData = ByteString.copyFromUtf8("40");
+
+    DeviceConfig actualResponse = client.modifyCloudToDeviceConfig(name, binaryData);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ModifyCloudToDeviceConfigRequest actualRequest =
+        (ModifyCloudToDeviceConfigRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, DeviceName.parse(actualRequest.getName()));
+    Assert.assertEquals(binaryData, actualRequest.getBinaryData());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void modifyCloudToDeviceConfigExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+      ByteString binaryData = ByteString.copyFromUtf8("40");
+
+      client.modifyCloudToDeviceConfig(name, binaryData);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listDeviceConfigVersionsTest() {
+    ListDeviceConfigVersionsResponse expectedResponse =
+        ListDeviceConfigVersionsResponse.newBuilder().build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+
+    ListDeviceConfigVersionsResponse actualResponse = client.listDeviceConfigVersions(name);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListDeviceConfigVersionsRequest actualRequest =
+        (ListDeviceConfigVersionsRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, DeviceName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listDeviceConfigVersionsExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+
+      client.listDeviceConfigVersions(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listDeviceStatesTest() {
+    ListDeviceStatesResponse expectedResponse = ListDeviceStatesResponse.newBuilder().build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+
+    ListDeviceStatesResponse actualResponse = client.listDeviceStates(name);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListDeviceStatesRequest actualRequest = (ListDeviceStatesRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, DeviceName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listDeviceStatesExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      DeviceName name = DeviceName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]", "[DEVICE]");
+
+      client.listDeviceStates(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void setIamPolicyTest() {
+    int version = 351608024;
+    ByteString etag = ByteString.copyFromUtf8("21");
+    Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    RegistryName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+    Policy policy = Policy.newBuilder().build();
+
+    Policy actualResponse = client.setIamPolicy(resource, policy);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0);
+
+    Assert.assertEquals(Objects.toString(resource), Objects.toString(actualRequest.getResource()));
+    Assert.assertEquals(policy, actualRequest.getPolicy());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void setIamPolicyExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      RegistryName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+      Policy policy = Policy.newBuilder().build();
+
+      client.setIamPolicy(resource, policy);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getIamPolicyTest() {
+    int version = 351608024;
+    ByteString etag = ByteString.copyFromUtf8("21");
+    Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    RegistryName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+
+    Policy actualResponse = client.getIamPolicy(resource);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0);
+
+    Assert.assertEquals(Objects.toString(resource), Objects.toString(actualRequest.getResource()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getIamPolicyExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      RegistryName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+
+      client.getIamPolicy(resource);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void testIamPermissionsTest() {
+    TestIamPermissionsResponse expectedResponse = TestIamPermissionsResponse.newBuilder().build();
+    mockDeviceManager.addResponse(expectedResponse);
+
+    RegistryName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+    List permissions = new ArrayList<>();
+
+    TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockDeviceManager.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0);
+
+    Assert.assertEquals(Objects.toString(resource), Objects.toString(actualRequest.getResource()));
+    Assert.assertEquals(permissions, actualRequest.getPermissionsList());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void testIamPermissionsExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDeviceManager.addException(exception);
+
+    try {
+      RegistryName resource = RegistryName.of("[PROJECT]", "[LOCATION]", "[REGISTRY]");
+      List permissions = new ArrayList<>();
+
+      client.testIamPermissions(resource, permissions);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+}
diff --git a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceSmokeTest.java b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/DeviceManagerSmokeTest.java
similarity index 62%
rename from google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceSmokeTest.java
rename to google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/DeviceManagerSmokeTest.java
index 69d078aeac26..507896c73c3c 100644
--- a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceSmokeTest.java
+++ b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/DeviceManagerSmokeTest.java
@@ -13,21 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.dlp.v2beta1;
+package com.google.cloud.iot.v1;
+
+import static com.google.cloud.iot.v1.DeviceManagerClient.ListDeviceRegistriesPagedResponse;
 
 import com.google.common.base.Preconditions;
-import com.google.privacy.dlp.v2beta1.ContentItem;
-import com.google.privacy.dlp.v2beta1.InspectConfig;
-import com.google.privacy.dlp.v2beta1.InspectContentResponse;
-import com.google.privacy.dlp.v2beta1.Likelihood;
-import java.util.Arrays;
-import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.junit.Test;
 
 @javax.annotation.Generated("by GAPIC")
-public class DlpServiceSmokeTest {
+public class DeviceManagerSmokeTest {
   private static final String PROJECT_ENV_NAME = "GOOGLE_CLOUD_PROJECT";
   private static final String LEGACY_PROJECT_ENV_NAME = "GCLOUD_PROJECT";
 
@@ -39,7 +35,7 @@ public void run() {
   public static void main(String args[]) {
     Logger.getLogger("").setLevel(Level.WARNING);
     try {
-      executeNoCatch();
+      executeNoCatch(getProjectId());
       System.out.println("OK");
     } catch (Exception e) {
       System.err.println("Failed with exception:");
@@ -48,17 +44,11 @@ public static void main(String args[]) {
     }
   }
 
-  public static void executeNoCatch() throws Exception {
-    try (DlpServiceClient client = DlpServiceClient.create()) {
-      Likelihood minLikelihood = Likelihood.POSSIBLE;
-      InspectConfig inspectConfig =
-          InspectConfig.newBuilder().setMinLikelihood(minLikelihood).build();
-      String type = "text/plain";
-      String value = "my phone number is 215-512-1212";
-      ContentItem itemsElement = ContentItem.newBuilder().setType(type).setValue(value).build();
-      List items = Arrays.asList(itemsElement);
+  public static void executeNoCatch(String projectId) throws Exception {
+    try (DeviceManagerClient client = DeviceManagerClient.create()) {
+      LocationName parent = LocationName.of(projectId, "us-central1");
 
-      InspectContentResponse response = client.inspectContent(inspectConfig, items);
+      ListDeviceRegistriesPagedResponse pagedResponse = client.listDeviceRegistries(parent);
     }
   }
 
diff --git a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpService.java b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManager.java
similarity index 85%
rename from google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpService.java
rename to google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManager.java
index 94c7ae6eca87..aaa8f7a936bb 100644
--- a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/MockDlpService.java
+++ b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.dlp.v2beta1;
+package com.google.cloud.iot.v1;
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.grpc.testing.MockGrpcService;
@@ -23,11 +23,11 @@
 
 @javax.annotation.Generated("by GAPIC")
 @BetaApi
-public class MockDlpService implements MockGrpcService {
-  private final MockDlpServiceImpl serviceImpl;
+public class MockDeviceManager implements MockGrpcService {
+  private final MockDeviceManagerImpl serviceImpl;
 
-  public MockDlpService() {
-    serviceImpl = new MockDlpServiceImpl();
+  public MockDeviceManager() {
+    serviceImpl = new MockDeviceManagerImpl();
   }
 
   @Override
diff --git a/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManagerImpl.java b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManagerImpl.java
new file mode 100644
index 000000000000..0fc8486ddf96
--- /dev/null
+++ b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManagerImpl.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.iot.v1;
+
+import com.google.api.core.BetaApi;
+import com.google.cloud.iot.v1.DeviceManagerGrpc.DeviceManagerImplBase;
+import com.google.iam.v1.GetIamPolicyRequest;
+import com.google.iam.v1.Policy;
+import com.google.iam.v1.SetIamPolicyRequest;
+import com.google.iam.v1.TestIamPermissionsRequest;
+import com.google.iam.v1.TestIamPermissionsResponse;
+import com.google.protobuf.Empty;
+import com.google.protobuf.GeneratedMessageV3;
+import io.grpc.stub.StreamObserver;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+
+@javax.annotation.Generated("by GAPIC")
+@BetaApi
+public class MockDeviceManagerImpl extends DeviceManagerImplBase {
+  private ArrayList requests;
+  private Queue responses;
+
+  public MockDeviceManagerImpl() {
+    requests = new ArrayList<>();
+    responses = new LinkedList<>();
+  }
+
+  public List getRequests() {
+    return requests;
+  }
+
+  public void addResponse(GeneratedMessageV3 response) {
+    responses.add(response);
+  }
+
+  public void setResponses(List responses) {
+    this.responses = new LinkedList(responses);
+  }
+
+  public void addException(Exception exception) {
+    responses.add(exception);
+  }
+
+  public void reset() {
+    requests = new ArrayList<>();
+    responses = new LinkedList<>();
+  }
+
+  @Override
+  public void createDeviceRegistry(
+      CreateDeviceRegistryRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof DeviceRegistry) {
+      requests.add(request);
+      responseObserver.onNext((DeviceRegistry) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void getDeviceRegistry(
+      GetDeviceRegistryRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof DeviceRegistry) {
+      requests.add(request);
+      responseObserver.onNext((DeviceRegistry) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void updateDeviceRegistry(
+      UpdateDeviceRegistryRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof DeviceRegistry) {
+      requests.add(request);
+      responseObserver.onNext((DeviceRegistry) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void deleteDeviceRegistry(
+      DeleteDeviceRegistryRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof Empty) {
+      requests.add(request);
+      responseObserver.onNext((Empty) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void listDeviceRegistries(
+      ListDeviceRegistriesRequest request,
+      StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ListDeviceRegistriesResponse) {
+      requests.add(request);
+      responseObserver.onNext((ListDeviceRegistriesResponse) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void createDevice(CreateDeviceRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof Device) {
+      requests.add(request);
+      responseObserver.onNext((Device) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void getDevice(GetDeviceRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof Device) {
+      requests.add(request);
+      responseObserver.onNext((Device) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void updateDevice(UpdateDeviceRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof Device) {
+      requests.add(request);
+      responseObserver.onNext((Device) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void deleteDevice(DeleteDeviceRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof Empty) {
+      requests.add(request);
+      responseObserver.onNext((Empty) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void listDevices(
+      ListDevicesRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ListDevicesResponse) {
+      requests.add(request);
+      responseObserver.onNext((ListDevicesResponse) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void modifyCloudToDeviceConfig(
+      ModifyCloudToDeviceConfigRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof DeviceConfig) {
+      requests.add(request);
+      responseObserver.onNext((DeviceConfig) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void listDeviceConfigVersions(
+      ListDeviceConfigVersionsRequest request,
+      StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ListDeviceConfigVersionsResponse) {
+      requests.add(request);
+      responseObserver.onNext((ListDeviceConfigVersionsResponse) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void listDeviceStates(
+      ListDeviceStatesRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ListDeviceStatesResponse) {
+      requests.add(request);
+      responseObserver.onNext((ListDeviceStatesResponse) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void setIamPolicy(SetIamPolicyRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof Policy) {
+      requests.add(request);
+      responseObserver.onNext((Policy) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void getIamPolicy(GetIamPolicyRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof Policy) {
+      requests.add(request);
+      responseObserver.onNext((Policy) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void testIamPermissions(
+      TestIamPermissionsRequest request,
+      StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof TestIamPermissionsResponse) {
+      requests.add(request);
+      responseObserver.onNext((TestIamPermissionsResponse) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+}
diff --git a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java
index ff709f485c8d..bf7bac9c0e5a 100644
--- a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceCallableFactory.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceCallableFactory.java
index 90cc45033308..509df86e672e 100644
--- a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/stub/GrpcLanguageServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2CallableFactory.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2CallableFactory.java
index 1ce15a039d11..74133c4bac91 100644
--- a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2CallableFactory.java
+++ b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2CallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2CallableFactory.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2CallableFactory.java
index 48e637617be2..b0fc3c91a1dd 100644
--- a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2CallableFactory.java
+++ b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2CallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2CallableFactory.java b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2CallableFactory.java
index fb0addfff429..4d39270c8923 100644
--- a/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2CallableFactory.java
+++ b/google-cloud-clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2CallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceCallableFactory.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceCallableFactory.java
index 1b1bff7eba03..62a328dee3f2 100644
--- a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcAlertPolicyServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceCallableFactory.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceCallableFactory.java
index 6dc5f768ab42..ab7a40b4fe25 100644
--- a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcGroupServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceCallableFactory.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceCallableFactory.java
index 90a93c0157ee..4cd40409b8f9 100644
--- a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcMetricServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceCallableFactory.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceCallableFactory.java
index d6e86817bb02..be47e609a463 100644
--- a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcNotificationChannelServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceCallableFactory.java b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceCallableFactory.java
index bfa3975e0f61..a1a9ad827144 100644
--- a/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/stub/GrpcUptimeCheckServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceCallableFactory.java b/google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceCallableFactory.java
index 7a1603168665..c0f7fec11648 100644
--- a/google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-os-login/src/main/java/com/google/cloud/oslogin/v1/stub/GrpcOsLoginServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherCallableFactory.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherCallableFactory.java
index d5782487f5cd..12e3350069cd 100644
--- a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherCallableFactory.java
+++ b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcPublisherCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberCallableFactory.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberCallableFactory.java
index 34a596101833..22f77732138d 100644
--- a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberCallableFactory.java
+++ b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/GrpcSubscriberCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java
index c12db4788193..3a6a581520cb 100644
--- a/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java
+++ b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java
@@ -176,6 +176,8 @@ public CloudRedisStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -482,6 +484,8 @@ public final UnaryCallable getInstanceCallable() {
    * @param instance Required. A Redis [Instance] resource
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createInstanceAsync(
       LocationName parent, String instanceId, Instance instance) {
 
@@ -535,6 +539,8 @@ public final OperationFuture createInstanceAsync(
    * @param instance Required. A Redis [Instance] resource
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createInstanceAsync(
       String parent, String instanceId, Instance instance) {
 
@@ -586,6 +592,8 @@ public final OperationFuture createInstanceAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createInstanceAsync(CreateInstanceRequest request) {
     return createInstanceOperationCallable().futureCall(request);
   }
@@ -628,6 +636,7 @@ public final OperationFuture createInstanceAsync(CreateInstanceRe
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       createInstanceOperationCallable() {
     return stub.createInstanceOperationCallable();
@@ -710,6 +719,8 @@ public final UnaryCallable createInstanceCalla
    * @param instance Required. Update description. Only fields specified in update_mask are updated.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture updateInstanceAsync(
       FieldMask updateMask, Instance instance) {
 
@@ -753,6 +764,8 @@ public final OperationFuture updateInstanceAsync(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture updateInstanceAsync(UpdateInstanceRequest request) {
     return updateInstanceOperationCallable().futureCall(request);
   }
@@ -791,6 +804,7 @@ public final OperationFuture updateInstanceAsync(UpdateInstanceRe
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       updateInstanceOperationCallable() {
     return stub.updateInstanceOperationCallable();
@@ -852,6 +866,8 @@ public final UnaryCallable updateInstanceCalla
    *     refers to a GCP region
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture deleteInstanceAsync(InstanceName name) {
 
     DeleteInstanceRequest request =
@@ -877,6 +893,8 @@ public final OperationFuture deleteInstanceAsync(InstanceName name)
    *     refers to a GCP region
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture deleteInstanceAsync(String name) {
 
     DeleteInstanceRequest request = DeleteInstanceRequest.newBuilder().setName(name).build();
@@ -902,6 +920,8 @@ public final OperationFuture deleteInstanceAsync(String name) {
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   private final OperationFuture deleteInstanceAsync(DeleteInstanceRequest request) {
     return deleteInstanceOperationCallable().futureCall(request);
   }
@@ -924,6 +944,7 @@ private final OperationFuture deleteInstanceAsync(DeleteInstanceRequ
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       deleteInstanceOperationCallable() {
     return stub.deleteInstanceOperationCallable();
diff --git a/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java
index 1d853addbaa8..fe99bd458794 100644
--- a/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java
+++ b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisSettings.java
@@ -83,6 +83,8 @@ public UnaryCallSettings createInstanceSetting
   }
 
   /** Returns the object with the settings used for calls to createInstance. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       createInstanceOperationSettings() {
     return ((CloudRedisStubSettings) getStubSettings()).createInstanceOperationSettings();
@@ -94,6 +96,8 @@ public UnaryCallSettings updateInstanceSetting
   }
 
   /** Returns the object with the settings used for calls to updateInstance. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       updateInstanceOperationSettings() {
     return ((CloudRedisStubSettings) getStubSettings()).updateInstanceOperationSettings();
@@ -105,6 +109,8 @@ public UnaryCallSettings deleteInstanceSetting
   }
 
   /** Returns the object with the settings used for calls to deleteInstance. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       deleteInstanceOperationSettings() {
     return ((CloudRedisStubSettings) getStubSettings()).deleteInstanceOperationSettings();
@@ -224,6 +230,8 @@ public UnaryCallSettings.Builder createInstanc
     }
 
     /** Returns the builder for the settings used for calls to createInstance. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createInstanceOperationSettings() {
       return getStubSettingsBuilder().createInstanceOperationSettings();
@@ -235,6 +243,8 @@ public UnaryCallSettings.Builder updateInstanc
     }
 
     /** Returns the builder for the settings used for calls to updateInstance. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         updateInstanceOperationSettings() {
       return getStubSettingsBuilder().updateInstanceOperationSettings();
@@ -246,6 +256,8 @@ public UnaryCallSettings.Builder deleteInstanc
     }
 
     /** Returns the builder for the settings used for calls to deleteInstance. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         deleteInstanceOperationSettings() {
       return getStubSettingsBuilder().deleteInstanceOperationSettings();
diff --git a/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java
index 4043840bf60c..174cc7370cc0 100644
--- a/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java
+++ b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStub.java
@@ -44,6 +44,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class CloudRedisStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -61,6 +62,7 @@ public UnaryCallable getInstanceCallable() {
     throw new UnsupportedOperationException("Not implemented: getInstanceCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable createInstanceOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: createInstanceOperationCallable()");
   }
@@ -69,6 +71,7 @@ public UnaryCallable createInstanceCallable()
     throw new UnsupportedOperationException("Not implemented: createInstanceCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable updateInstanceOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: updateInstanceOperationCallable()");
   }
@@ -77,6 +80,7 @@ public UnaryCallable updateInstanceCallable()
     throw new UnsupportedOperationException("Not implemented: updateInstanceCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable deleteInstanceOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: deleteInstanceOperationCallable()");
   }
diff --git a/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
index 3b9b51a26deb..9b7dffae786d 100644
--- a/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
+++ b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
@@ -126,6 +126,7 @@ public UnaryCallSettings createInstanceSetting
   }
 
   /** Returns the object with the settings used for calls to createInstance. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       createInstanceOperationSettings() {
     return createInstanceOperationSettings;
@@ -137,6 +138,7 @@ public UnaryCallSettings updateInstanceSetting
   }
 
   /** Returns the object with the settings used for calls to updateInstance. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       updateInstanceOperationSettings() {
     return updateInstanceOperationSettings;
@@ -148,6 +150,7 @@ public UnaryCallSettings deleteInstanceSetting
   }
 
   /** Returns the object with the settings used for calls to deleteInstance. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       deleteInstanceOperationSettings() {
     return deleteInstanceOperationSettings;
@@ -531,6 +534,8 @@ public UnaryCallSettings.Builder createInstanc
     }
 
     /** Returns the builder for the settings used for calls to createInstance. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createInstanceOperationSettings() {
       return createInstanceOperationSettings;
@@ -542,6 +547,8 @@ public UnaryCallSettings.Builder updateInstanc
     }
 
     /** Returns the builder for the settings used for calls to updateInstance. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         updateInstanceOperationSettings() {
       return updateInstanceOperationSettings;
@@ -553,6 +560,8 @@ public UnaryCallSettings.Builder deleteInstanc
     }
 
     /** Returns the builder for the settings used for calls to deleteInstance. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         deleteInstanceOperationSettings() {
       return deleteInstanceOperationSettings;
diff --git a/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java
index 0e35704c894a..c6859a8dedbf 100644
--- a/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java
+++ b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java
index 37e23a4e5990..e30fb6d02de9 100644
--- a/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java
+++ b/google-cloud-clients/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/stub/GrpcCloudRedisStub.java
@@ -215,6 +215,7 @@ protected GrpcCloudRedisStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -232,6 +233,7 @@ public UnaryCallable getInstanceCallable() {
     return getInstanceCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable createInstanceOperationCallable() {
     return createInstanceOperationCallable;
   }
@@ -240,6 +242,7 @@ public UnaryCallable createInstanceCallable()
     return createInstanceCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable updateInstanceOperationCallable() {
     return updateInstanceOperationCallable;
   }
@@ -248,6 +251,7 @@ public UnaryCallable updateInstanceCallable()
     return updateInstanceCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable deleteInstanceOperationCallable() {
     return deleteInstanceOperationCallable;
   }
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java
index 5bfeadaffa97..d91b43e7dedd 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java
@@ -185,6 +185,8 @@ public DatabaseAdminStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -350,6 +352,8 @@ public final UnaryCallable listData
    *     in backticks (`` ` ``).
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createDatabaseAsync(
       InstanceName parent, String createStatement) {
 
@@ -390,6 +394,8 @@ public final OperationFuture createDatabaseAsy
    *     in backticks (`` ` ``).
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createDatabaseAsync(
       String parent, String createStatement) {
 
@@ -428,6 +434,8 @@ public final OperationFuture createDatabaseAsy
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createDatabaseAsync(
       CreateDatabaseRequest request) {
     return createDatabaseOperationCallable().futureCall(request);
@@ -459,6 +467,7 @@ public final OperationFuture createDatabaseAsy
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       createDatabaseOperationCallable() {
     return stub.createDatabaseOperationCallable();
@@ -610,6 +619,8 @@ public final UnaryCallable getDatabaseCallable() {
    * @param statements DDL statements to be applied to the database.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture updateDatabaseDdlAsync(
       DatabaseName database, List statements) {
 
@@ -645,6 +656,8 @@ public final OperationFuture updateDatabaseDdl
    * @param statements DDL statements to be applied to the database.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture updateDatabaseDdlAsync(
       String database, List statements) {
 
@@ -683,6 +696,8 @@ public final OperationFuture updateDatabaseDdl
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture updateDatabaseDdlAsync(
       UpdateDatabaseDdlRequest request) {
     return updateDatabaseDdlOperationCallable().futureCall(request);
@@ -714,6 +729,7 @@ public final OperationFuture updateDatabaseDdl
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       updateDatabaseDdlOperationCallable() {
     return stub.updateDatabaseDdlOperationCallable();
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java
index c24e93757ef8..61d4c18ca854 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java
@@ -93,6 +93,8 @@ public UnaryCallSettings createDatabaseSetting
   }
 
   /** Returns the object with the settings used for calls to createDatabase. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       createDatabaseOperationSettings() {
     return ((DatabaseAdminStubSettings) getStubSettings()).createDatabaseOperationSettings();
@@ -109,6 +111,8 @@ public UnaryCallSettings updateDatabaseDdlS
   }
 
   /** Returns the object with the settings used for calls to updateDatabaseDdl. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       updateDatabaseDdlOperationSettings() {
     return ((DatabaseAdminStubSettings) getStubSettings()).updateDatabaseDdlOperationSettings();
@@ -250,6 +254,8 @@ public UnaryCallSettings.Builder createDatabas
     }
 
     /** Returns the builder for the settings used for calls to createDatabase. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createDatabaseOperationSettings() {
       return getStubSettingsBuilder().createDatabaseOperationSettings();
@@ -267,6 +273,8 @@ public UnaryCallSettings.Builder getDatabaseSettin
     }
 
     /** Returns the builder for the settings used for calls to updateDatabaseDdl. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         updateDatabaseDdlOperationSettings() {
       return getStubSettingsBuilder().updateDatabaseDdlOperationSettings();
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java
index a00d3d2729eb..27c9a863812c 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java
@@ -52,6 +52,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class DatabaseAdminStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -65,6 +66,7 @@ public UnaryCallable listDatabasesC
     throw new UnsupportedOperationException("Not implemented: listDatabasesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       createDatabaseOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: createDatabaseOperationCallable()");
@@ -78,6 +80,7 @@ public UnaryCallable getDatabaseCallable() {
     throw new UnsupportedOperationException("Not implemented: getDatabaseCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       updateDatabaseDdlOperationCallable() {
     throw new UnsupportedOperationException(
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
index e3a456885565..b0bac76fc0a1 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
@@ -136,6 +136,7 @@ public UnaryCallSettings createDatabaseSetting
   }
 
   /** Returns the object with the settings used for calls to createDatabase. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       createDatabaseOperationSettings() {
     return createDatabaseOperationSettings;
@@ -152,6 +153,7 @@ public UnaryCallSettings updateDatabaseDdlS
   }
 
   /** Returns the object with the settings used for calls to updateDatabaseDdl. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       updateDatabaseDdlOperationSettings() {
     return updateDatabaseDdlOperationSettings;
@@ -583,6 +585,8 @@ public UnaryCallSettings.Builder createDatabas
     }
 
     /** Returns the builder for the settings used for calls to createDatabase. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createDatabaseOperationSettings() {
       return createDatabaseOperationSettings;
@@ -600,6 +604,8 @@ public UnaryCallSettings.Builder getDatabaseSettin
     }
 
     /** Returns the builder for the settings used for calls to updateDatabaseDdl. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         updateDatabaseDdlOperationSettings() {
       return updateDatabaseDdlOperationSettings;
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminCallableFactory.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminCallableFactory.java
index ccdf90a50320..2a89fd6e32c5 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminCallableFactory.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java
index 62413877570e..164a2c57e34b 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminStub.java
@@ -287,6 +287,7 @@ protected GrpcDatabaseAdminStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -300,6 +301,7 @@ public UnaryCallable listDatabasesC
     return listDatabasesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       createDatabaseOperationCallable() {
     return createDatabaseOperationCallable;
@@ -313,6 +315,7 @@ public UnaryCallable getDatabaseCallable() {
     return getDatabaseCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       updateDatabaseDdlOperationCallable() {
     return updateDatabaseDdlOperationCallable;
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java
index 8c03e371b1d6..baa270709c1e 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClient.java
@@ -202,6 +202,8 @@ public InstanceAdminStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -710,6 +712,8 @@ public final UnaryCallable getInstanceCallable() {
    *     must be `<parent>/instances/<instance_id>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createInstanceAsync(
       ProjectName parent, InstanceName instanceId, Instance instance) {
 
@@ -773,6 +777,8 @@ public final OperationFuture createInstanceAsy
    *     must be `<parent>/instances/<instance_id>`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createInstanceAsync(
       String parent, String instanceId, Instance instance) {
 
@@ -836,6 +842,8 @@ public final OperationFuture createInstanceAsy
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture createInstanceAsync(
       CreateInstanceRequest request) {
     return createInstanceOperationCallable().futureCall(request);
@@ -891,6 +899,7 @@ public final OperationFuture createInstanceAsy
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       createInstanceOperationCallable() {
     return stub.createInstanceOperationCallable();
@@ -1006,6 +1015,8 @@ public final UnaryCallable createInstanceCalla
    *     that do not know about them.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture updateInstanceAsync(
       Instance instance, FieldMask fieldMask) {
 
@@ -1067,6 +1078,8 @@ public final OperationFuture updateInstanceAsy
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture updateInstanceAsync(
       UpdateInstanceRequest request) {
     return updateInstanceOperationCallable().futureCall(request);
@@ -1124,6 +1137,7 @@ public final OperationFuture updateInstanceAsy
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       updateInstanceOperationCallable() {
     return stub.updateInstanceOperationCallable();
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java
index 151e8b7f0c89..989cd6f4ef97 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminSettings.java
@@ -113,6 +113,8 @@ public UnaryCallSettings createInstanceSetting
   }
 
   /** Returns the object with the settings used for calls to createInstance. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       createInstanceOperationSettings() {
     return ((InstanceAdminStubSettings) getStubSettings()).createInstanceOperationSettings();
@@ -124,6 +126,8 @@ public UnaryCallSettings updateInstanceSetting
   }
 
   /** Returns the object with the settings used for calls to updateInstance. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       updateInstanceOperationSettings() {
     return ((InstanceAdminStubSettings) getStubSettings()).updateInstanceOperationSettings();
@@ -279,6 +283,8 @@ public UnaryCallSettings.Builder createInstanc
     }
 
     /** Returns the builder for the settings used for calls to createInstance. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createInstanceOperationSettings() {
       return getStubSettingsBuilder().createInstanceOperationSettings();
@@ -290,6 +296,8 @@ public UnaryCallSettings.Builder updateInstanc
     }
 
     /** Returns the builder for the settings used for calls to updateInstance. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         updateInstanceOperationSettings() {
       return getStubSettingsBuilder().updateInstanceOperationSettings();
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminCallableFactory.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminCallableFactory.java
index a6693d0ded58..46442b4febc5 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminCallableFactory.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.java
index 0efe8ed7b28b..57c49ecc740f 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/GrpcInstanceAdminStub.java
@@ -320,6 +320,7 @@ protected GrpcInstanceAdminStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -351,6 +352,7 @@ public UnaryCallable getInstanceCallable() {
     return getInstanceCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       createInstanceOperationCallable() {
     return createInstanceOperationCallable;
@@ -360,6 +362,7 @@ public UnaryCallable createInstanceCallable()
     return createInstanceCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       updateInstanceOperationCallable() {
     return updateInstanceOperationCallable;
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStub.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStub.java
index 67a135315f0b..b3b37d4835c2 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStub.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStub.java
@@ -55,6 +55,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class InstanceAdminStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -86,6 +87,7 @@ public UnaryCallable getInstanceCallable() {
     throw new UnsupportedOperationException("Not implemented: getInstanceCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       createInstanceOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: createInstanceOperationCallable()");
@@ -95,6 +97,7 @@ public UnaryCallable createInstanceCallable()
     throw new UnsupportedOperationException("Not implemented: createInstanceCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       updateInstanceOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: updateInstanceOperationCallable()");
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
index 6f6406d028ba..7a33417a3bdb 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
@@ -159,6 +159,7 @@ public UnaryCallSettings createInstanceSetting
   }
 
   /** Returns the object with the settings used for calls to createInstance. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       createInstanceOperationSettings() {
     return createInstanceOperationSettings;
@@ -170,6 +171,7 @@ public UnaryCallSettings updateInstanceSetting
   }
 
   /** Returns the object with the settings used for calls to updateInstance. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       updateInstanceOperationSettings() {
     return updateInstanceOperationSettings;
@@ -687,6 +689,8 @@ public UnaryCallSettings.Builder createInstanc
     }
 
     /** Returns the builder for the settings used for calls to createInstance. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         createInstanceOperationSettings() {
       return createInstanceOperationSettings;
@@ -698,6 +702,8 @@ public UnaryCallSettings.Builder updateInstanc
     }
 
     /** Returns the builder for the settings used for calls to updateInstance. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder
         updateInstanceOperationSettings() {
       return updateInstanceOperationSettings;
diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerCallableFactory.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerCallableFactory.java
index 2a990f88338d..01f1c6f8b767 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerCallableFactory.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/GrpcSpannerCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java
index 3f6f9965f186..1949d8c01164 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java
@@ -165,6 +165,8 @@ public SpeechStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -308,6 +310,8 @@ public final UnaryCallable recognizeCallabl
    * @param audio *Required* The audio data to be recognized.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture
       longRunningRecognizeAsync(RecognitionConfig config, RecognitionAudio audio) {
 
@@ -349,6 +353,8 @@ public final UnaryCallable recognizeCallabl
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture
       longRunningRecognizeAsync(LongRunningRecognizeRequest request) {
     return longRunningRecognizeOperationCallable().futureCall(request);
@@ -386,6 +392,7 @@ public final UnaryCallable recognizeCallabl
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable<
           LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
       longRunningRecognizeOperationCallable() {
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java
index 170efa9f729d..d06cb6d23bd4 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java
@@ -73,6 +73,8 @@ public UnaryCallSettings longRunningReco
   }
 
   /** Returns the object with the settings used for calls to longRunningRecognize. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings<
           LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
       longRunningRecognizeOperationSettings() {
@@ -193,6 +195,8 @@ public UnaryCallSettings.Builder recognizeS
     }
 
     /** Returns the builder for the settings used for calls to longRunningRecognize. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
         longRunningRecognizeOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java
index 4c5d88081577..d3fdff0d4232 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java
index ae5ac1fa90c5..a64a11308004 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java
@@ -162,6 +162,7 @@ protected GrpcSpeechStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -170,6 +171,7 @@ public UnaryCallable recognizeCallable() {
     return recognizeCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable<
           LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
       longRunningRecognizeOperationCallable() {
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java
index 295357b0f9f1..93969d0dd311 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java
@@ -41,6 +41,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class SpeechStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -49,6 +50,7 @@ public UnaryCallable recognizeCallable() {
     throw new UnsupportedOperationException("Not implemented: recognizeCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable<
           LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
       longRunningRecognizeOperationCallable() {
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStubSettings.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStubSettings.java
index bcc5574b13e9..f65b6052dbd3 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStubSettings.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStubSettings.java
@@ -105,6 +105,7 @@ public UnaryCallSettings longRunningReco
   }
 
   /** Returns the object with the settings used for calls to longRunningRecognize. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings<
           LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
       longRunningRecognizeOperationSettings() {
@@ -352,6 +353,8 @@ public UnaryCallSettings.Builder recognizeS
     }
 
     /** Returns the builder for the settings used for calls to longRunningRecognize. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
         longRunningRecognizeOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechClient.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechClient.java
index 006d9db62376..2d247831316b 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechClient.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechClient.java
@@ -163,6 +163,8 @@ public SpeechStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -300,6 +302,8 @@ public final UnaryCallable syncReco
    * @param audio *Required* The audio data to be recognized.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture asyncRecognizeAsync(
       RecognitionConfig config, RecognitionAudio audio) {
 
@@ -340,6 +344,8 @@ public final OperationFuture asy
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture asyncRecognizeAsync(
       AsyncRecognizeRequest request) {
     return asyncRecognizeOperationCallable().futureCall(request);
@@ -376,6 +382,7 @@ public final OperationFuture asy
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable<
           AsyncRecognizeRequest, AsyncRecognizeResponse, AsyncRecognizeMetadata>
       asyncRecognizeOperationCallable() {
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechSettings.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechSettings.java
index 9d8666ece557..a28c15ada807 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechSettings.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechSettings.java
@@ -73,6 +73,8 @@ public UnaryCallSettings asyncRecognizeSetting
   }
 
   /** Returns the object with the settings used for calls to asyncRecognize. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings<
           AsyncRecognizeRequest, AsyncRecognizeResponse, AsyncRecognizeMetadata>
       asyncRecognizeOperationSettings() {
@@ -193,6 +195,8 @@ public UnaryCallSettings.Builder asyncRecogniz
     }
 
     /** Returns the builder for the settings used for calls to asyncRecognize. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AsyncRecognizeRequest, AsyncRecognizeResponse, AsyncRecognizeMetadata>
         asyncRecognizeOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechCallableFactory.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechCallableFactory.java
index f200b3dd2c71..cde6000ebc94 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechCallableFactory.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechStub.java
index f91b4663578c..d74143bb632d 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechStub.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/GrpcSpeechStub.java
@@ -162,6 +162,7 @@ protected GrpcSpeechStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -170,6 +171,7 @@ public UnaryCallable syncRecognizeC
     return syncRecognizeCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       asyncRecognizeOperationCallable() {
     return asyncRecognizeOperationCallable;
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStub.java
index 684aa906d91b..d1265fc0a7d4 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStub.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStub.java
@@ -41,6 +41,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class SpeechStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -49,6 +50,7 @@ public UnaryCallable syncRecognizeC
     throw new UnsupportedOperationException("Not implemented: syncRecognizeCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       asyncRecognizeOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: asyncRecognizeOperationCallable()");
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStubSettings.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStubSettings.java
index c495a0f1d5d9..0bcce9f98c67 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStubSettings.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/stub/SpeechStubSettings.java
@@ -105,6 +105,7 @@ public UnaryCallSettings asyncRecognizeSetting
   }
 
   /** Returns the object with the settings used for calls to asyncRecognize. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings<
           AsyncRecognizeRequest, AsyncRecognizeResponse, AsyncRecognizeMetadata>
       asyncRecognizeOperationSettings() {
@@ -349,6 +350,8 @@ public UnaryCallSettings.Builder asyncRecogniz
     }
 
     /** Returns the builder for the settings used for calls to asyncRecognize. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AsyncRecognizeRequest, AsyncRecognizeResponse, AsyncRecognizeMetadata>
         asyncRecognizeOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechClient.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechClient.java
index 68bad96b995b..57986e52395e 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechClient.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechClient.java
@@ -165,6 +165,8 @@ public SpeechStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -308,6 +310,8 @@ public final UnaryCallable recognizeCallabl
    * @param audio *Required* The audio data to be recognized.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture
       longRunningRecognizeAsync(RecognitionConfig config, RecognitionAudio audio) {
 
@@ -349,6 +353,8 @@ public final UnaryCallable recognizeCallabl
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture
       longRunningRecognizeAsync(LongRunningRecognizeRequest request) {
     return longRunningRecognizeOperationCallable().futureCall(request);
@@ -386,6 +392,7 @@ public final UnaryCallable recognizeCallabl
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable<
           LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
       longRunningRecognizeOperationCallable() {
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechSettings.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechSettings.java
index 79d0fc282efa..8fec2526d25b 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechSettings.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechSettings.java
@@ -73,6 +73,8 @@ public UnaryCallSettings longRunningReco
   }
 
   /** Returns the object with the settings used for calls to longRunningRecognize. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings<
           LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
       longRunningRecognizeOperationSettings() {
@@ -193,6 +195,8 @@ public UnaryCallSettings.Builder recognizeS
     }
 
     /** Returns the builder for the settings used for calls to longRunningRecognize. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
         longRunningRecognizeOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechCallableFactory.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechCallableFactory.java
index abb7b7f32a3e..9bc04f1a7267 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechCallableFactory.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechStub.java
index 90caae563b17..bc85f501e1cd 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechStub.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/GrpcSpeechStub.java
@@ -162,6 +162,7 @@ protected GrpcSpeechStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -170,6 +171,7 @@ public UnaryCallable recognizeCallable() {
     return recognizeCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable<
           LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
       longRunningRecognizeOperationCallable() {
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStub.java
index 39db17e3da2c..53ee455cd5b4 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStub.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStub.java
@@ -41,6 +41,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class SpeechStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -49,6 +50,7 @@ public UnaryCallable recognizeCallable() {
     throw new UnsupportedOperationException("Not implemented: recognizeCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable<
           LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
       longRunningRecognizeOperationCallable() {
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStubSettings.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStubSettings.java
index caa10897f4a9..53aef143fdc5 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStubSettings.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/stub/SpeechStubSettings.java
@@ -105,6 +105,7 @@ public UnaryCallSettings longRunningReco
   }
 
   /** Returns the object with the settings used for calls to longRunningRecognize. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings<
           LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
       longRunningRecognizeOperationSettings() {
@@ -352,6 +353,8 @@ public UnaryCallSettings.Builder recognizeS
     }
 
     /** Returns the builder for the settings used for calls to longRunningRecognize. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             LongRunningRecognizeRequest, LongRunningRecognizeResponse, LongRunningRecognizeMetadata>
         longRunningRecognizeOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechCallableFactory.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechCallableFactory.java
index 3ff2d74637af..9b7ece53433a 100644
--- a/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechCallableFactory.java
+++ b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1beta1/stub/GrpcTextToSpeechCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java
index 675ccaaf5082..57aa0b461152 100644
--- a/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/stub/GrpcTraceServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java
index 9faa25426d90..537f72e9817d 100644
--- a/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-trace/src/main/java/com/google/cloud/trace/v2/stub/GrpcTraceServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java
index 705b7b640d2d..9ec1403a7ab2 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClient.java
@@ -161,6 +161,8 @@ public VideoIntelligenceServiceStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -194,6 +196,8 @@ public final OperationsClient getOperationsClient() {
    * @param features Requested video annotation features.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture annotateVideoAsync(
       String inputUri, List features) {
 
@@ -227,6 +231,8 @@ public final OperationFuture annot
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture annotateVideoAsync(
       AnnotateVideoRequest request) {
     return annotateVideoOperationCallable().futureCall(request);
@@ -256,6 +262,7 @@ public final OperationFuture annot
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       annotateVideoOperationCallable() {
     return stub.annotateVideoOperationCallable();
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java
index 15d2a94c1c13..ebc1c0bed5fc 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceSettings.java
@@ -69,6 +69,8 @@ public UnaryCallSettings annotateVideoSettings(
   }
 
   /** Returns the object with the settings used for calls to annotateVideo. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       annotateVideoOperationSettings() {
     return ((VideoIntelligenceServiceStubSettings) getStubSettings())
@@ -179,6 +181,8 @@ public UnaryCallSettings.Builder annotateVideoS
     }
 
     /** Returns the builder for the settings used for calls to annotateVideo. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AnnotateVideoRequest, AnnotateVideoResponse, AnnotateVideoProgress>
         annotateVideoOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceCallableFactory.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
index bcba3c74d8ae..7031984d43ee 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java
index 83025e2bf4ab..b38e5e30c4cd 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/GrpcVideoIntelligenceServiceStub.java
@@ -124,10 +124,12 @@ protected GrpcVideoIntelligenceServiceStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       annotateVideoOperationCallable() {
     return annotateVideoOperationCallable;
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java
index 994ccf5070ec..1ac51d0d92a3 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStub.java
@@ -36,10 +36,12 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class VideoIntelligenceServiceStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       annotateVideoOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: annotateVideoOperationCallable()");
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java
index d45acd297d22..965703c13061 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1/stub/VideoIntelligenceServiceStubSettings.java
@@ -93,6 +93,7 @@ public UnaryCallSettings annotateVideoSettings(
   }
 
   /** Returns the object with the settings used for calls to annotateVideo. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       annotateVideoOperationSettings() {
     return annotateVideoOperationSettings;
@@ -305,6 +306,8 @@ public UnaryCallSettings.Builder annotateVideoS
     }
 
     /** Returns the builder for the settings used for calls to annotateVideo. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AnnotateVideoRequest, AnnotateVideoResponse, AnnotateVideoProgress>
         annotateVideoOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java
index 2d9ace74611d..94f41871c956 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java
@@ -161,6 +161,8 @@ public VideoIntelligenceServiceStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -194,6 +196,8 @@ public final OperationsClient getOperationsClient() {
    * @param features Requested video annotation features.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture annotateVideoAsync(
       String inputUri, List features) {
 
@@ -227,6 +231,8 @@ public final OperationFuture annot
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture annotateVideoAsync(
       AnnotateVideoRequest request) {
     return annotateVideoOperationCallable().futureCall(request);
@@ -256,6 +262,7 @@ public final OperationFuture annot
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       annotateVideoOperationCallable() {
     return stub.annotateVideoOperationCallable();
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java
index 67c21431e690..51a6780e006b 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java
@@ -69,6 +69,8 @@ public UnaryCallSettings annotateVideoSettings(
   }
 
   /** Returns the object with the settings used for calls to annotateVideo. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       annotateVideoOperationSettings() {
     return ((VideoIntelligenceServiceStubSettings) getStubSettings())
@@ -179,6 +181,8 @@ public UnaryCallSettings.Builder annotateVideoS
     }
 
     /** Returns the builder for the settings used for calls to annotateVideo. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AnnotateVideoRequest, AnnotateVideoResponse, AnnotateVideoProgress>
         annotateVideoOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
index 06d5a3d1f4b9..aa52195d6493 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java
index e2963585ffce..8acff716734b 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/GrpcVideoIntelligenceServiceStub.java
@@ -124,10 +124,12 @@ protected GrpcVideoIntelligenceServiceStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       annotateVideoOperationCallable() {
     return annotateVideoOperationCallable;
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java
index 2c7387e4ec3e..eae1c558a752 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStub.java
@@ -36,10 +36,12 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class VideoIntelligenceServiceStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       annotateVideoOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: annotateVideoOperationCallable()");
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java
index 2365ec31d782..ddcf849d83c3 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/stub/VideoIntelligenceServiceStubSettings.java
@@ -93,6 +93,7 @@ public UnaryCallSettings annotateVideoSettings(
   }
 
   /** Returns the object with the settings used for calls to annotateVideo. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       annotateVideoOperationSettings() {
     return annotateVideoOperationSettings;
@@ -305,6 +306,8 @@ public UnaryCallSettings.Builder annotateVideoS
     }
 
     /** Returns the builder for the settings used for calls to annotateVideo. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AnnotateVideoRequest, AnnotateVideoResponse, AnnotateVideoProgress>
         annotateVideoOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java
index b701926d1b64..48f3c349f192 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClient.java
@@ -161,6 +161,8 @@ public VideoIntelligenceServiceStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -194,6 +196,8 @@ public final OperationsClient getOperationsClient() {
    * @param features Requested video annotation features.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture annotateVideoAsync(
       String inputUri, List features) {
 
@@ -227,6 +231,8 @@ public final OperationFuture annot
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture annotateVideoAsync(
       AnnotateVideoRequest request) {
     return annotateVideoOperationCallable().futureCall(request);
@@ -256,6 +262,7 @@ public final OperationFuture annot
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       annotateVideoOperationCallable() {
     return stub.annotateVideoOperationCallable();
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java
index e786c7d42d45..4e9425bf7790 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceSettings.java
@@ -69,6 +69,8 @@ public UnaryCallSettings annotateVideoSettings(
   }
 
   /** Returns the object with the settings used for calls to annotateVideo. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       annotateVideoOperationSettings() {
     return ((VideoIntelligenceServiceStubSettings) getStubSettings())
@@ -179,6 +181,8 @@ public UnaryCallSettings.Builder annotateVideoS
     }
 
     /** Returns the builder for the settings used for calls to annotateVideo. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AnnotateVideoRequest, AnnotateVideoResponse, AnnotateVideoProgress>
         annotateVideoOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceCallableFactory.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceCallableFactory.java
index 7706572943eb..c4ac7183edbe 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java
index 8fd0d6a66213..1bc30620fcaa 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/GrpcVideoIntelligenceServiceStub.java
@@ -124,10 +124,12 @@ protected GrpcVideoIntelligenceServiceStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       annotateVideoOperationCallable() {
     return annotateVideoOperationCallable;
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java
index 276d8e7b5525..a6b782c35a50 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStub.java
@@ -36,10 +36,12 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class VideoIntelligenceServiceStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       annotateVideoOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: annotateVideoOperationCallable()");
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java
index 63278e78c9cc..e129032e2ee5 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta2/stub/VideoIntelligenceServiceStubSettings.java
@@ -93,6 +93,7 @@ public UnaryCallSettings annotateVideoSettings(
   }
 
   /** Returns the object with the settings used for calls to annotateVideo. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       annotateVideoOperationSettings() {
     return annotateVideoOperationSettings;
@@ -305,6 +306,8 @@ public UnaryCallSettings.Builder annotateVideoS
     }
 
     /** Returns the builder for the settings used for calls to annotateVideo. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AnnotateVideoRequest, AnnotateVideoResponse, AnnotateVideoProgress>
         annotateVideoOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClient.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClient.java
index f51fe5aa05af..e158e3a28f76 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClient.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClient.java
@@ -161,6 +161,8 @@ public VideoIntelligenceServiceStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -194,6 +196,8 @@ public final OperationsClient getOperationsClient() {
    * @param features Requested video annotation features.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture annotateVideoAsync(
       String inputUri, List features) {
 
@@ -227,6 +231,8 @@ public final OperationFuture annot
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture annotateVideoAsync(
       AnnotateVideoRequest request) {
     return annotateVideoOperationCallable().futureCall(request);
@@ -256,6 +262,7 @@ public final OperationFuture annot
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable
       annotateVideoOperationCallable() {
     return stub.annotateVideoOperationCallable();
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSettings.java
index bb017ebf3b2a..8ca0eb34de7e 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSettings.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceSettings.java
@@ -69,6 +69,8 @@ public UnaryCallSettings annotateVideoSettings(
   }
 
   /** Returns the object with the settings used for calls to annotateVideo. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public OperationCallSettings
       annotateVideoOperationSettings() {
     return ((VideoIntelligenceServiceStubSettings) getStubSettings())
@@ -179,6 +181,8 @@ public UnaryCallSettings.Builder annotateVideoS
     }
 
     /** Returns the builder for the settings used for calls to annotateVideo. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AnnotateVideoRequest, AnnotateVideoResponse, AnnotateVideoProgress>
         annotateVideoOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
index 86fc145e9b4b..28aa4bc618e7 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceStub.java
index a6d705d1a7de..41b814ad68b8 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceStub.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/GrpcVideoIntelligenceServiceStub.java
@@ -124,10 +124,12 @@ protected GrpcVideoIntelligenceServiceStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       annotateVideoOperationCallable() {
     return annotateVideoOperationCallable;
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStub.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStub.java
index 3d0f9a6d5856..0555e4b09a99 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStub.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStub.java
@@ -36,10 +36,12 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class VideoIntelligenceServiceStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable
       annotateVideoOperationCallable() {
     throw new UnsupportedOperationException("Not implemented: annotateVideoOperationCallable()");
diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStubSettings.java b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStubSettings.java
index b499325f8467..66302b973cd7 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStubSettings.java
+++ b/google-cloud-clients/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1p1beta1/stub/VideoIntelligenceServiceStubSettings.java
@@ -93,6 +93,7 @@ public UnaryCallSettings annotateVideoSettings(
   }
 
   /** Returns the object with the settings used for calls to annotateVideo. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallSettings
       annotateVideoOperationSettings() {
     return annotateVideoOperationSettings;
@@ -305,6 +306,8 @@ public UnaryCallSettings.Builder annotateVideoS
     }
 
     /** Returns the builder for the settings used for calls to annotateVideo. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AnnotateVideoRequest, AnnotateVideoResponse, AnnotateVideoProgress>
         annotateVideoOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java
index 6dbfa667266a..98ff358e287f 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java
@@ -17,9 +17,13 @@
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.longrunning.OperationFuture;
+import com.google.api.gax.rpc.OperationCallable;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.vision.v1.stub.ImageAnnotatorStub;
 import com.google.cloud.vision.v1.stub.ImageAnnotatorStubSettings;
+import com.google.longrunning.Operation;
+import com.google.longrunning.OperationsClient;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -97,6 +101,7 @@
 public class ImageAnnotatorClient implements BackgroundResource {
   private final ImageAnnotatorSettings settings;
   private final ImageAnnotatorStub stub;
+  private final OperationsClient operationsClient;
 
   /** Constructs an instance of ImageAnnotatorClient with default settings. */
   public static final ImageAnnotatorClient create() throws IOException {
@@ -129,12 +134,14 @@ public static final ImageAnnotatorClient create(ImageAnnotatorStub stub) {
   protected ImageAnnotatorClient(ImageAnnotatorSettings settings) throws IOException {
     this.settings = settings;
     this.stub = ((ImageAnnotatorStubSettings) settings.getStubSettings()).createStub();
+    this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
   }
 
   @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   protected ImageAnnotatorClient(ImageAnnotatorStub stub) {
     this.settings = null;
     this.stub = stub;
+    this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
   }
 
   public final ImageAnnotatorSettings getSettings() {
@@ -146,6 +153,16 @@ public ImageAnnotatorStub getStub() {
     return stub;
   }
 
+  /**
+   * Returns the OperationsClient that can be used to query the status of a long-running operation
+   * returned by another API method call.
+   */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
+  public final OperationsClient getOperationsClient() {
+    return operationsClient;
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Run image detection and annotation for a batch of images.
@@ -217,6 +234,122 @@ private final BatchAnnotateImagesResponse batchAnnotateImages(
     return stub.batchAnnotateImagesCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Run asynchronous image detection and annotation for a list of generic files, such as PDF files,
+   * which may contain multiple pages and multiple images per page. Progress and results can be
+   * retrieved through the `google.longrunning.Operations` interface. `Operation.metadata` contains
+   * `OperationMetadata` (metadata). `Operation.response` contains `AsyncBatchAnnotateFilesResponse`
+   * (results).
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (ImageAnnotatorClient imageAnnotatorClient = ImageAnnotatorClient.create()) {
+   *   List<AsyncAnnotateFileRequest> requests = new ArrayList<>();
+   *   AsyncBatchAnnotateFilesResponse response = imageAnnotatorClient.asyncBatchAnnotateFilesAsync(requests).get();
+   * }
+   * 

+   *
+   * @param requests Individual async file annotation requests for this batch.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
+  public final OperationFuture
+      asyncBatchAnnotateFilesAsync(List requests) {
+
+    AsyncBatchAnnotateFilesRequest request =
+        AsyncBatchAnnotateFilesRequest.newBuilder().addAllRequests(requests).build();
+    return asyncBatchAnnotateFilesAsync(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Run asynchronous image detection and annotation for a list of generic files, such as PDF files,
+   * which may contain multiple pages and multiple images per page. Progress and results can be
+   * retrieved through the `google.longrunning.Operations` interface. `Operation.metadata` contains
+   * `OperationMetadata` (metadata). `Operation.response` contains `AsyncBatchAnnotateFilesResponse`
+   * (results).
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (ImageAnnotatorClient imageAnnotatorClient = ImageAnnotatorClient.create()) {
+   *   List<AsyncAnnotateFileRequest> requests = new ArrayList<>();
+   *   AsyncBatchAnnotateFilesRequest request = AsyncBatchAnnotateFilesRequest.newBuilder()
+   *     .addAllRequests(requests)
+   *     .build();
+   *   AsyncBatchAnnotateFilesResponse response = imageAnnotatorClient.asyncBatchAnnotateFilesAsync(request).get();
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
+  private final OperationFuture
+      asyncBatchAnnotateFilesAsync(AsyncBatchAnnotateFilesRequest request) {
+    return asyncBatchAnnotateFilesOperationCallable().futureCall(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Run asynchronous image detection and annotation for a list of generic files, such as PDF files,
+   * which may contain multiple pages and multiple images per page. Progress and results can be
+   * retrieved through the `google.longrunning.Operations` interface. `Operation.metadata` contains
+   * `OperationMetadata` (metadata). `Operation.response` contains `AsyncBatchAnnotateFilesResponse`
+   * (results).
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (ImageAnnotatorClient imageAnnotatorClient = ImageAnnotatorClient.create()) {
+   *   List<AsyncAnnotateFileRequest> requests = new ArrayList<>();
+   *   AsyncBatchAnnotateFilesRequest request = AsyncBatchAnnotateFilesRequest.newBuilder()
+   *     .addAllRequests(requests)
+   *     .build();
+   *   OperationFuture<Operation> future = imageAnnotatorClient.asyncBatchAnnotateFilesOperationCallable().futureCall(request);
+   *   // Do something
+   *   AsyncBatchAnnotateFilesResponse response = future.get();
+   * }
+   * 

+   */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+  public final OperationCallable<
+          AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
+      asyncBatchAnnotateFilesOperationCallable() {
+    return stub.asyncBatchAnnotateFilesOperationCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Run asynchronous image detection and annotation for a list of generic files, such as PDF files,
+   * which may contain multiple pages and multiple images per page. Progress and results can be
+   * retrieved through the `google.longrunning.Operations` interface. `Operation.metadata` contains
+   * `OperationMetadata` (metadata). `Operation.response` contains `AsyncBatchAnnotateFilesResponse`
+   * (results).
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (ImageAnnotatorClient imageAnnotatorClient = ImageAnnotatorClient.create()) {
+   *   List<AsyncAnnotateFileRequest> requests = new ArrayList<>();
+   *   AsyncBatchAnnotateFilesRequest request = AsyncBatchAnnotateFilesRequest.newBuilder()
+   *     .addAllRequests(requests)
+   *     .build();
+   *   ApiFuture<Operation> future = imageAnnotatorClient.asyncBatchAnnotateFilesCallable().futureCall(request);
+   *   // Do something
+   *   Operation response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable
+      asyncBatchAnnotateFilesCallable() {
+    return stub.asyncBatchAnnotateFilesCallable();
+  }
+
   @Override
   public final void close() {
     stub.close();
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java
index 18d0b63bb9db..b287d0b6200d 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java
@@ -23,9 +23,11 @@
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.ClientSettings;
+import com.google.api.gax.rpc.OperationCallSettings;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.api.gax.rpc.UnaryCallSettings;
 import com.google.cloud.vision.v1.stub.ImageAnnotatorStubSettings;
+import com.google.longrunning.Operation;
 import java.io.IOException;
 import java.util.List;
 import javax.annotation.Generated;
@@ -64,6 +66,22 @@ public class ImageAnnotatorSettings extends ClientSettings
+      asyncBatchAnnotateFilesSettings() {
+    return ((ImageAnnotatorStubSettings) getStubSettings()).asyncBatchAnnotateFilesSettings();
+  }
+
+  /** Returns the object with the settings used for calls to asyncBatchAnnotateFiles. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
+  public OperationCallSettings<
+          AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
+      asyncBatchAnnotateFilesOperationSettings() {
+    return ((ImageAnnotatorStubSettings) getStubSettings())
+        .asyncBatchAnnotateFilesOperationSettings();
+  }
+
   public static final ImageAnnotatorSettings create(ImageAnnotatorStubSettings stub)
       throws IOException {
     return new ImageAnnotatorSettings.Builder(stub.toBuilder()).build();
@@ -167,6 +185,21 @@ public Builder applyToAllUnaryMethods(
       return getStubSettingsBuilder().batchAnnotateImagesSettings();
     }
 
+    /** Returns the builder for the settings used for calls to asyncBatchAnnotateFiles. */
+    public UnaryCallSettings.Builder
+        asyncBatchAnnotateFilesSettings() {
+      return getStubSettingsBuilder().asyncBatchAnnotateFilesSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to asyncBatchAnnotateFiles. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
+    public OperationCallSettings.Builder<
+            AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
+        asyncBatchAnnotateFilesOperationSettings() {
+      return getStubSettingsBuilder().asyncBatchAnnotateFilesOperationSettings();
+    }
+
     @Override
     public ImageAnnotatorSettings build() throws IOException {
       return new ImageAnnotatorSettings(this);
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/package-info.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/package-info.java
index 7aed0839971d..d51bd17ad6a5 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/package-info.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * A client to Google Cloud Vision API.
+ * A client to Cloud Vision API.
  *
  * 
The interfaces provided are listed below, along with usage samples.
  *
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorCallableFactory.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorCallableFactory.java
index 95be3a6d1ff7..f478951a78a5 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorCallableFactory.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorCallableFactory.java
@@ -37,7 +37,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * gRPC callable factory implementation for Google Cloud Vision API.
+ * gRPC callable factory implementation for Cloud Vision API.
  *
  * 
This class is for advanced usage.
  */
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java
index 1d60a4972683..919f77ec4899 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java
@@ -21,9 +21,15 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.OperationCallable;
 import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest;
+import com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse;
 import com.google.cloud.vision.v1.BatchAnnotateImagesRequest;
 import com.google.cloud.vision.v1.BatchAnnotateImagesResponse;
+import com.google.cloud.vision.v1.OperationMetadata;
+import com.google.longrunning.Operation;
+import com.google.longrunning.stub.GrpcOperationsStub;
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
@@ -32,7 +38,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * gRPC stub implementation for Google Cloud Vision API.
+ * gRPC stub implementation for Cloud Vision API.
  *
  * 
This class is for advanced usage and reflects the underlying API directly.
  */
@@ -50,11 +56,26 @@ public class GrpcImageAnnotatorStub extends ImageAnnotatorStub {
               .setResponseMarshaller(
                   ProtoUtils.marshaller(BatchAnnotateImagesResponse.getDefaultInstance()))
               .build();
+  private static final MethodDescriptor
+      asyncBatchAnnotateFilesMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.vision.v1.ImageAnnotator/AsyncBatchAnnotateFiles")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(AsyncBatchAnnotateFilesRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
+              .build();
 
   private final BackgroundResource backgroundResources;
+  private final GrpcOperationsStub operationsStub;
 
   private final UnaryCallable
       batchAnnotateImagesCallable;
+  private final UnaryCallable
+      asyncBatchAnnotateFilesCallable;
+  private final OperationCallable<
+          AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
+      asyncBatchAnnotateFilesOperationCallable;
 
   private final GrpcStubCallableFactory callableFactory;
 
@@ -96,27 +117,61 @@ protected GrpcImageAnnotatorStub(
       GrpcStubCallableFactory callableFactory)
       throws IOException {
     this.callableFactory = callableFactory;
+    this.operationsStub = GrpcOperationsStub.create(clientContext, callableFactory);
 
     GrpcCallSettings
         batchAnnotateImagesTransportSettings =
             GrpcCallSettings.newBuilder()
                 .setMethodDescriptor(batchAnnotateImagesMethodDescriptor)
                 .build();
+    GrpcCallSettings
+        asyncBatchAnnotateFilesTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(asyncBatchAnnotateFilesMethodDescriptor)
+                .build();
 
     this.batchAnnotateImagesCallable =
         callableFactory.createUnaryCallable(
             batchAnnotateImagesTransportSettings,
             settings.batchAnnotateImagesSettings(),
             clientContext);
+    this.asyncBatchAnnotateFilesCallable =
+        callableFactory.createUnaryCallable(
+            asyncBatchAnnotateFilesTransportSettings,
+            settings.asyncBatchAnnotateFilesSettings(),
+            clientContext);
+    this.asyncBatchAnnotateFilesOperationCallable =
+        callableFactory.createOperationCallable(
+            asyncBatchAnnotateFilesTransportSettings,
+            settings.asyncBatchAnnotateFilesOperationSettings(),
+            clientContext,
+            this.operationsStub);
 
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+  public GrpcOperationsStub getOperationsStub() {
+    return operationsStub;
+  }
+
   public UnaryCallable
       batchAnnotateImagesCallable() {
     return batchAnnotateImagesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+  public OperationCallable<
+          AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
+      asyncBatchAnnotateFilesOperationCallable() {
+    return asyncBatchAnnotateFilesOperationCallable;
+  }
+
+  public UnaryCallable
+      asyncBatchAnnotateFilesCallable() {
+    return asyncBatchAnnotateFilesCallable;
+  }
+
   @Override
   public final void close() {
     shutdown();
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStub.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStub.java
index a5e2a4672e26..4f35c899338a 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStub.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStub.java
@@ -17,14 +17,20 @@
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.rpc.OperationCallable;
 import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest;
+import com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse;
 import com.google.cloud.vision.v1.BatchAnnotateImagesRequest;
 import com.google.cloud.vision.v1.BatchAnnotateImagesResponse;
+import com.google.cloud.vision.v1.OperationMetadata;
+import com.google.longrunning.Operation;
+import com.google.longrunning.stub.OperationsStub;
 import javax.annotation.Generated;
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * Base stub class for Google Cloud Vision API.
+ * Base stub class for Cloud Vision API.
  *
  * 
This class is for advanced usage and reflects the underlying API directly.
  */
@@ -32,11 +38,29 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class ImageAnnotatorStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+  public OperationsStub getOperationsStub() {
+    throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
+  }
+
   public UnaryCallable
       batchAnnotateImagesCallable() {
     throw new UnsupportedOperationException("Not implemented: batchAnnotateImagesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+  public OperationCallable<
+          AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
+      asyncBatchAnnotateFilesOperationCallable() {
+    throw new UnsupportedOperationException(
+        "Not implemented: asyncBatchAnnotateFilesOperationCallable()");
+  }
+
+  public UnaryCallable
+      asyncBatchAnnotateFilesCallable() {
+    throw new UnsupportedOperationException("Not implemented: asyncBatchAnnotateFilesCallable()");
+  }
+
   @Override
   public abstract void close();
 }
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java
index bf77097ebb28..f1d303347cf8 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java
@@ -23,19 +23,27 @@
 import com.google.api.gax.grpc.GaxGrpcProperties;
 import com.google.api.gax.grpc.GrpcTransportChannel;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.grpc.ProtoOperationTransformers;
+import com.google.api.gax.longrunning.OperationSnapshot;
+import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.OperationCallSettings;
 import com.google.api.gax.rpc.StatusCode;
 import com.google.api.gax.rpc.StubSettings;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest;
+import com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse;
 import com.google.cloud.vision.v1.BatchAnnotateImagesRequest;
 import com.google.cloud.vision.v1.BatchAnnotateImagesResponse;
+import com.google.cloud.vision.v1.OperationMetadata;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
+import com.google.longrunning.Operation;
 import java.io.IOException;
 import java.util.List;
 import javax.annotation.Generated;
@@ -78,6 +86,11 @@ public class ImageAnnotatorStubSettings extends StubSettings
       batchAnnotateImagesSettings;
+  private final UnaryCallSettings
+      asyncBatchAnnotateFilesSettings;
+  private final OperationCallSettings<
+          AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
+      asyncBatchAnnotateFilesOperationSettings;
 
   /** Returns the object with the settings used for calls to batchAnnotateImages. */
   public UnaryCallSettings
@@ -85,6 +98,20 @@ public class ImageAnnotatorStubSettings extends StubSettings
+      asyncBatchAnnotateFilesSettings() {
+    return asyncBatchAnnotateFilesSettings;
+  }
+
+  /** Returns the object with the settings used for calls to asyncBatchAnnotateFiles. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+  public OperationCallSettings<
+          AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
+      asyncBatchAnnotateFilesOperationSettings() {
+    return asyncBatchAnnotateFilesOperationSettings;
+  }
+
   @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ImageAnnotatorStub createStub() throws IOException {
     if (getTransportChannelProvider()
@@ -154,6 +181,9 @@ protected ImageAnnotatorStubSettings(Builder settingsBuilder) throws IOException
     super(settingsBuilder);
 
     batchAnnotateImagesSettings = settingsBuilder.batchAnnotateImagesSettings().build();
+    asyncBatchAnnotateFilesSettings = settingsBuilder.asyncBatchAnnotateFilesSettings().build();
+    asyncBatchAnnotateFilesOperationSettings =
+        settingsBuilder.asyncBatchAnnotateFilesOperationSettings().build();
   }
 
   /** Builder for ImageAnnotatorStubSettings. */
@@ -162,6 +192,11 @@ public static class Builder extends StubSettings.Builder
         batchAnnotateImagesSettings;
+    private final UnaryCallSettings.Builder
+        asyncBatchAnnotateFilesSettings;
+    private final OperationCallSettings.Builder<
+            AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
+        asyncBatchAnnotateFilesOperationSettings;
 
     private static final ImmutableMap>
         RETRYABLE_CODE_DEFINITIONS;
@@ -206,8 +241,13 @@ protected Builder(ClientContext clientContext) {
 
       batchAnnotateImagesSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
+      asyncBatchAnnotateFilesSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      asyncBatchAnnotateFilesOperationSettings = OperationCallSettings.newBuilder();
+
       unaryMethodSettingsBuilders =
-          ImmutableList.>of(batchAnnotateImagesSettings);
+          ImmutableList.>of(
+              batchAnnotateImagesSettings, asyncBatchAnnotateFilesSettings);
 
       initDefaults(this);
     }
@@ -228,6 +268,35 @@ private static Builder initDefaults(Builder builder) {
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
+      builder
+          .asyncBatchAnnotateFilesSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+      builder
+          .asyncBatchAnnotateFilesOperationSettings()
+          .setInitialCallSettings(
+              UnaryCallSettings
+                  .newUnaryCallSettingsBuilder()
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .build())
+          .setResponseTransformer(
+              ProtoOperationTransformers.ResponseTransformer.create(
+                  AsyncBatchAnnotateFilesResponse.class))
+          .setMetadataTransformer(
+              ProtoOperationTransformers.MetadataTransformer.create(OperationMetadata.class))
+          .setPollingAlgorithm(
+              OperationTimedPollAlgorithm.create(
+                  RetrySettings.newBuilder()
+                      .setInitialRetryDelay(Duration.ofMillis(20000L))
+                      .setRetryDelayMultiplier(1.5)
+                      .setMaxRetryDelay(Duration.ofMillis(45000L))
+                      .setInitialRpcTimeout(Duration.ZERO) // ignored
+                      .setRpcTimeoutMultiplier(1.0) // ignored
+                      .setMaxRpcTimeout(Duration.ZERO) // ignored
+                      .setTotalTimeout(Duration.ofMillis(86400000L))
+                      .build()));
+
       return builder;
     }
 
@@ -235,9 +304,13 @@ protected Builder(ImageAnnotatorStubSettings settings) {
       super(settings);
 
       batchAnnotateImagesSettings = settings.batchAnnotateImagesSettings.toBuilder();
+      asyncBatchAnnotateFilesSettings = settings.asyncBatchAnnotateFilesSettings.toBuilder();
+      asyncBatchAnnotateFilesOperationSettings =
+          settings.asyncBatchAnnotateFilesOperationSettings.toBuilder();
 
       unaryMethodSettingsBuilders =
-          ImmutableList.>of(batchAnnotateImagesSettings);
+          ImmutableList.>of(
+              batchAnnotateImagesSettings, asyncBatchAnnotateFilesSettings);
     }
 
     // NEXT_MAJOR_VER: remove 'throws Exception'
@@ -262,6 +335,21 @@ public Builder applyToAllUnaryMethods(
       return batchAnnotateImagesSettings;
     }
 
+    /** Returns the builder for the settings used for calls to asyncBatchAnnotateFiles. */
+    public UnaryCallSettings.Builder
+        asyncBatchAnnotateFilesSettings() {
+      return asyncBatchAnnotateFilesSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to asyncBatchAnnotateFiles. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
+    public OperationCallSettings.Builder<
+            AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
+        asyncBatchAnnotateFilesOperationSettings() {
+      return asyncBatchAnnotateFilesOperationSettings;
+    }
+
     @Override
     public ImageAnnotatorStubSettings build() throws IOException {
       return new ImageAnnotatorStubSettings(this);
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorCallableFactory.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorCallableFactory.java
index b50dae133de3..d3988d313dbe 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorCallableFactory.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClient.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClient.java
index 3a5fc9b0f3e7..eab5ea4eda09 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClient.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClient.java
@@ -157,6 +157,8 @@ public ImageAnnotatorStub getStub() {
    * Returns the OperationsClient that can be used to query the status of a long-running operation
    * returned by another API method call.
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
@@ -252,6 +254,8 @@ private final BatchAnnotateImagesResponse batchAnnotateImages(
    * @param requests Individual async file annotation requests for this batch.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture
       asyncBatchAnnotateFilesAsync(List requests) {
 
@@ -283,6 +287,8 @@ private final BatchAnnotateImagesResponse batchAnnotateImages(
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   private final OperationFuture
       asyncBatchAnnotateFilesAsync(AsyncBatchAnnotateFilesRequest request) {
     return asyncBatchAnnotateFilesOperationCallable().futureCall(request);
@@ -310,6 +316,7 @@ private final BatchAnnotateImagesResponse batchAnnotateImages(
    * }
    * 
    */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public final OperationCallable<
           AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
       asyncBatchAnnotateFilesOperationCallable() {
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java
index 8b80c387cf39..166c63373f8e 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java
@@ -73,6 +73,8 @@ public class ImageAnnotatorSettings extends ClientSettings
       asyncBatchAnnotateFilesOperationSettings() {
@@ -190,6 +192,8 @@ public Builder applyToAllUnaryMethods(
     }
 
     /** Returns the builder for the settings used for calls to asyncBatchAnnotateFiles. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
         asyncBatchAnnotateFilesOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorCallableFactory.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorCallableFactory.java
index 61a7315bf8b4..9771d9234814 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorCallableFactory.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorCallableFactory.java
@@ -71,6 +71,8 @@ public  UnaryCallable createBatchingCa
         grpcCallSettings, batchingCallSettings, clientContext);
   }
 
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
   @Override
   public 
       OperationCallable createOperationCallable(
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java
index db17611c3aa1..54f9c4e91e0c 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java
@@ -151,6 +151,7 @@ protected GrpcImageAnnotatorStub(
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
@@ -160,6 +161,7 @@ public GrpcOperationsStub getOperationsStub() {
     return batchAnnotateImagesCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable<
           AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
       asyncBatchAnnotateFilesOperationCallable() {
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStub.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStub.java
index bba0fe909b4c..f9645aacfc07 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStub.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStub.java
@@ -38,6 +38,7 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class ImageAnnotatorStub implements BackgroundResource {
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
@@ -47,6 +48,7 @@ public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: batchAnnotateImagesCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
   public OperationCallable<
           AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
       asyncBatchAnnotateFilesOperationCallable() {
diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java
index 53e3f3f2c1b8..7bac636cb0a4 100644
--- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java
+++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java
@@ -105,6 +105,7 @@ public class ImageAnnotatorStubSettings extends StubSettings
       asyncBatchAnnotateFilesOperationSettings() {
@@ -341,6 +342,8 @@ public Builder applyToAllUnaryMethods(
     }
 
     /** Returns the builder for the settings used for calls to asyncBatchAnnotateFiles. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
     public OperationCallSettings.Builder<
             AsyncBatchAnnotateFilesRequest, AsyncBatchAnnotateFilesResponse, OperationMetadata>
         asyncBatchAnnotateFilesOperationSettings() {
diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java
index 12173de0c694..1927c5473113 100644
--- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java
+++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java
@@ -22,6 +22,9 @@
 import com.google.api.gax.grpc.testing.MockServiceHelper;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.InvalidArgumentException;
+import com.google.api.gax.rpc.StatusCode;
+import com.google.longrunning.Operation;
+import com.google.protobuf.Any;
 import com.google.protobuf.GeneratedMessageV3;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
@@ -29,6 +32,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -110,4 +114,53 @@ public void batchAnnotateImagesExceptionTest() throws Exception {
       // Expected exception
     }
   }
+
+  @Test
+  @SuppressWarnings("all")
+  public void asyncBatchAnnotateFilesTest() throws Exception {
+    AsyncBatchAnnotateFilesResponse expectedResponse =
+        AsyncBatchAnnotateFilesResponse.newBuilder().build();
+    Operation resultOperation =
+        Operation.newBuilder()
+            .setName("asyncBatchAnnotateFilesTest")
+            .setDone(true)
+            .setResponse(Any.pack(expectedResponse))
+            .build();
+    mockImageAnnotator.addResponse(resultOperation);
+
+    List requests = new ArrayList<>();
+
+    AsyncBatchAnnotateFilesResponse actualResponse =
+        client.asyncBatchAnnotateFilesAsync(requests).get();
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockImageAnnotator.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    AsyncBatchAnnotateFilesRequest actualRequest =
+        (AsyncBatchAnnotateFilesRequest) actualRequests.get(0);
+
+    Assert.assertEquals(requests, actualRequest.getRequestsList());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void asyncBatchAnnotateFilesExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockImageAnnotator.addException(exception);
+
+    try {
+      List requests = new ArrayList<>();
+
+      client.asyncBatchAnnotateFilesAsync(requests).get();
+      Assert.fail("No exception raised");
+    } catch (ExecutionException e) {
+      Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());
+      InvalidArgumentException apiException = (InvalidArgumentException) e.getCause();
+      Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode());
+    }
+  }
 }
diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java
index 833b5d06b231..dd4012f1d5f9 100644
--- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java
+++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java
@@ -17,6 +17,7 @@
 
 import com.google.api.core.BetaApi;
 import com.google.cloud.vision.v1.ImageAnnotatorGrpc.ImageAnnotatorImplBase;
+import com.google.longrunning.Operation;
 import com.google.protobuf.GeneratedMessageV3;
 import io.grpc.stub.StreamObserver;
 import java.util.ArrayList;
@@ -71,4 +72,19 @@ public void batchAnnotateImages(
       responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
     }
   }
+
+  @Override
+  public void asyncBatchAnnotateFiles(
+      AsyncBatchAnnotateFilesRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof Operation) {
+      requests.add(request);
+      responseObserver.onNext((Operation) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
 }
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/README.md b/google-cloud-clients/google-cloud-websecurityscanner/README.md
new file mode 100644
index 000000000000..9402442b7a3f
--- /dev/null
+++ b/google-cloud-clients/google-cloud-websecurityscanner/README.md
@@ -0,0 +1,102 @@
+Google Cloud Java Client for Web Security Scanner
+======================================
+
+Java idiomatic client for [Web Security Scanner][cloud-websecurityscanner].
+
+[![CircleCI](https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java/tree/master.svg?style=shield)](https://circleci.com/gh/GoogleCloudPlatform/google-cloud-java/tree/master)
+[![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/google-cloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/google-cloud-java?branch=master)
+[![Maven](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-websecurityscanner.svg)](https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-websecurityscanner.svg)
+[![Codacy Badge](https://api.codacy.com/project/badge/grade/9da006ad7c3a4fe1abd142e77c003917)](https://www.codacy.com/app/mziccard/google-cloud-java)
+[![Dependency Status](https://www.versioneye.com/user/projects/58fe4c8d6ac171426c414772/badge.svg?style=flat)](https://www.versioneye.com/user/projects/58fe4c8d6ac171426c414772)
+
+- [Product Documentation][websecurityscanner-product-docs]
+- [Client Library Documentation][websecurityscanner-client-lib-docs]
+
+> Note: This client is a work-in-progress, and may occasionally
+> make backwards-incompatible changes.
+
+Quickstart
+----------
+
+[//]: # ({x-version-update-start:google-cloud-websecurityscanner:released})
+If you are using Maven, add this to your pom.xml file
+```xml
+
+  com.google.cloud
+  google-cloud-websecurityscanner
+  0.47.0-alpha
+
+```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.cloud:google-cloud-websecurityscanner:0.47.0-alpha'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.cloud" % "google-cloud-websecurityscanner" % "0.47.0-alpha"
+```
+[//]: # ({x-version-update-end})
+
+Authentication
+--------------
+
+See the [Authentication](https://github.com/GoogleCloudPlatform/google-cloud-java#authentication) section in the base directory's README.
+
+About Google Cloud Web Security Scanner
+----------------------------
+
+Google [Cloud Web Security Scanner][cloud-websecurityscanner] is a web security scanner for common vulnerabilities in Google App Engine applications.
+
+See the [Web Security Scanner client library docs][websecurityscanner-client-lib-docs] to learn how to use this Web Security Scanner Client Library.
+
+Getting Started
+---------------
+#### Prerequisites
+You will need a [Google Developers Console](https://console.developers.google.com/) project with the Text-to-Speech API enabled. [Follow these instructions](https://cloud.google.com/docs/authentication#preparation) to get your project set up. You will also need to set up the local development environment by [installing the Google Cloud SDK](https://cloud.google.com/sdk/) and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`.
+
+#### Installation and setup
+You'll need to obtain the `google-cloud-websecurityscanner` library.  See the [Quickstart](#quickstart) section to add `google-cloud-websecurityscanner` as a dependency in your code.
+
+Troubleshooting
+---------------
+
+To get help, follow the instructions in the [shared Troubleshooting document](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/troubleshooting/readme.md#troubleshooting).
+
+Transport
+---------
+Text-to-Speech uses gRPC for the transport layer.
+
+Java Versions
+-------------
+
+Java 7 or above is required for using this client.
+
+Versioning
+----------
+
+This library follows [Semantic Versioning](http://semver.org/).
+
+It is currently in major version zero (``0.y.z``), which means that anything may change at any time and the public API should not be considered stable.
+
+Contributing
+------------
+
+Contributions to this library are always welcome and highly encouraged.
+
+See `google-cloud`'s [CONTRIBUTING] documentation and the [shared documentation](https://github.com/GoogleCloudPlatform/gcloud-common/blob/master/contributing/readme.md#how-to-contribute-to-gcloud) for more information on how to get started.
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
+
+License
+-------
+
+Apache 2.0 - See [LICENSE] for more information.
+
+
+[CONTRIBUTING]:https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/CONTRIBUTING.md
+[code-of-conduct]:https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
+[LICENSE]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/LICENSE
+[cloud-platform]: https://cloud.google.com/
+[cloud-websecurityscanner]: https://cloud.google.com/security-scanner
+[websecurityscanner-product-docs]: https://cloud.google.com/security-scanner/docs
+[websecurityscanner-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/websecurityscanner/v1alpha/package-summary.html
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
new file mode 100644
index 000000000000..73666f34dc5b
--- /dev/null
+++ b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
@@ -0,0 +1,68 @@
+
+
+  4.0.0
+  google-cloud-websecurityscanner
+  0.47.1-alpha-SNAPSHOT
+  jar
+  Google Cloud Web Security Scanner
+  https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-websecurityscanner
+  
+    Java idiomatic client for Google Cloud Web Security Scanner
+  
+  
+    com.google.cloud
+    google-cloud-clients
+    0.47.1-alpha-SNAPSHOT
+  
+  
+    google-cloud-websecurityscanner
+  
+  
+    
+      ${project.groupId}
+      google-cloud-core
+    
+    
+      ${project.groupId}
+      google-cloud-core-grpc
+    
+    
+      com.google.api.grpc
+      proto-google-cloud-websecurityscanner-v1alpha
+    
+    
+      io.grpc
+      grpc-netty-shaded
+    
+    
+      io.grpc
+      grpc-stub
+    
+    
+      io.grpc
+      grpc-auth
+    
+    
+      ${project.groupId}
+      google-cloud-core
+      test-jar
+      test
+    
+    
+      junit
+      junit
+      test
+    
+    
+      com.google.api.grpc
+      grpc-google-cloud-websecurityscanner-v1alpha
+      test
+    
+    
+      com.google.api
+      gax-grpc
+      testlib
+      test
+    
+  
+
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClient.java b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClient.java
new file mode 100644
index 000000000000..9af9c3547b2b
--- /dev/null
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClient.java
@@ -0,0 +1,1669 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.websecurityscanner.v1alpha;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.ApiFuture;
+import com.google.api.core.ApiFutures;
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.paging.AbstractFixedSizeCollection;
+import com.google.api.gax.paging.AbstractPage;
+import com.google.api.gax.paging.AbstractPagedListResponse;
+import com.google.api.gax.rpc.PageContext;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.cloud.websecurityscanner.v1alpha.stub.WebSecurityScannerStub;
+import com.google.cloud.websecurityscanner.v1alpha.stub.WebSecurityScannerStubSettings;
+import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND SERVICE
+/**
+ * Service Description: Cloud Web Security Scanner Service identifies security vulnerabilities in
+ * web applications hosted on Google Cloud Platform. It crawls your application, and attempts to
+ * exercise as many user inputs and event handlers as possible.
+ *
+ * 
This class provides the ability to make remote calls to the backing service through method
+ * calls that map to API methods. Sample code to get started:
+ *
+ * 
+ * 
+ * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+ *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+ *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
+ *   ScanConfig response = webSecurityScannerClient.createScanConfig(formattedParent, scanConfig);
+ * }
+ * 
+ * 

+ *
+ * 
Note: close() needs to be called on the webSecurityScannerClient object to clean up resources
+ * such as threads. In the example above, try-with-resources is used, which automatically calls
+ * close().
+ *
+ * 
The surface of this class includes several types of Java methods for each of the API's
+ * methods:
+ *
+ * 
    
+ *   
  1.  A "flattened" method. With this type of method, the fields of the request type have been
+ *       converted into function parameters. It may be the case that not all fields are available as
+ *       parameters, and not every API method will have a flattened method entry point.
+ *   
  2.  A "request object" method. This type of method only takes one parameter, a request object,
+ *       which must be constructed before the call. Not every API method will have a request object
+ *       method.
+ *   
  3.  A "callable" method. This type of method takes no parameters and returns an immutable API
+ *       callable object, which can be used to initiate calls to the service.
+ * 

+ *
+ * 
See the individual methods for example code.
+ *
+ * 
Many parameters require resource names to be formatted in a particular way. To assist with
+ * these names, this class includes a format method for each type of name, and additionally a parse
+ * method to extract the individual identifiers contained within names that are returned.
+ *
+ * 
This class can be customized by passing in a custom instance of WebSecurityScannerSettings to
+ * create(). For example:
+ *
+ * 
To customize credentials:
+ *
+ * 
+ * 
+ * WebSecurityScannerSettings webSecurityScannerSettings =
+ *     WebSecurityScannerSettings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .build();
+ * WebSecurityScannerClient webSecurityScannerClient =
+ *     WebSecurityScannerClient.create(webSecurityScannerSettings);
+ * 
+ * 

+ *
+ * To customize the endpoint:
+ *
+ * 
+ * 
+ * WebSecurityScannerSettings webSecurityScannerSettings =
+ *     WebSecurityScannerSettings.newBuilder().setEndpoint(myEndpoint).build();
+ * WebSecurityScannerClient webSecurityScannerClient =
+ *     WebSecurityScannerClient.create(webSecurityScannerSettings);
+ * 
+ * 

+ */
+@Generated("by gapic-generator")
+@BetaApi
+public class WebSecurityScannerClient implements BackgroundResource {
+  private final WebSecurityScannerSettings settings;
+  private final WebSecurityScannerStub stub;
+
+  private static final PathTemplate PROJECT_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}");
+
+  private static final PathTemplate SCAN_CONFIG_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/scanConfigs/{scan_config}");
+
+  private static final PathTemplate SCAN_RUN_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/scanConfigs/{scan_config}/scanRuns/{scan_run}");
+
+  private static final PathTemplate FINDING_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/scanConfigs/{scan_config}/scanRuns/{scan_run}/findings/{finding}");
+
+  /** Formats a string containing the fully-qualified path to represent a project resource. */
+  public static final String formatProjectName(String project) {
+    return PROJECT_PATH_TEMPLATE.instantiate("project", project);
+  }
+
+  /** Formats a string containing the fully-qualified path to represent a scan_config resource. */
+  public static final String formatScanConfigName(String project, String scanConfig) {
+    return SCAN_CONFIG_PATH_TEMPLATE.instantiate(
+        "project", project,
+        "scan_config", scanConfig);
+  }
+
+  /** Formats a string containing the fully-qualified path to represent a scan_run resource. */
+  public static final String formatScanRunName(String project, String scanConfig, String scanRun) {
+    return SCAN_RUN_PATH_TEMPLATE.instantiate(
+        "project", project,
+        "scan_config", scanConfig,
+        "scan_run", scanRun);
+  }
+
+  /** Formats a string containing the fully-qualified path to represent a finding resource. */
+  public static final String formatFindingName(
+      String project, String scanConfig, String scanRun, String finding) {
+    return FINDING_PATH_TEMPLATE.instantiate(
+        "project", project,
+        "scan_config", scanConfig,
+        "scan_run", scanRun,
+        "finding", finding);
+  }
+
+  /** Parses the project from the given fully-qualified path which represents a project resource. */
+  public static final String parseProjectFromProjectName(String projectName) {
+    return PROJECT_PATH_TEMPLATE.parse(projectName).get("project");
+  }
+
+  /**
+   * Parses the project from the given fully-qualified path which represents a scan_config resource.
+   */
+  public static final String parseProjectFromScanConfigName(String scanConfigName) {
+    return SCAN_CONFIG_PATH_TEMPLATE.parse(scanConfigName).get("project");
+  }
+
+  /**
+   * Parses the scan_config from the given fully-qualified path which represents a scan_config
+   * resource.
+   */
+  public static final String parseScanConfigFromScanConfigName(String scanConfigName) {
+    return SCAN_CONFIG_PATH_TEMPLATE.parse(scanConfigName).get("scan_config");
+  }
+
+  /**
+   * Parses the project from the given fully-qualified path which represents a scan_run resource.
+   */
+  public static final String parseProjectFromScanRunName(String scanRunName) {
+    return SCAN_RUN_PATH_TEMPLATE.parse(scanRunName).get("project");
+  }
+
+  /**
+   * Parses the scan_config from the given fully-qualified path which represents a scan_run
+   * resource.
+   */
+  public static final String parseScanConfigFromScanRunName(String scanRunName) {
+    return SCAN_RUN_PATH_TEMPLATE.parse(scanRunName).get("scan_config");
+  }
+
+  /**
+   * Parses the scan_run from the given fully-qualified path which represents a scan_run resource.
+   */
+  public static final String parseScanRunFromScanRunName(String scanRunName) {
+    return SCAN_RUN_PATH_TEMPLATE.parse(scanRunName).get("scan_run");
+  }
+
+  /** Parses the project from the given fully-qualified path which represents a finding resource. */
+  public static final String parseProjectFromFindingName(String findingName) {
+    return FINDING_PATH_TEMPLATE.parse(findingName).get("project");
+  }
+
+  /**
+   * Parses the scan_config from the given fully-qualified path which represents a finding resource.
+   */
+  public static final String parseScanConfigFromFindingName(String findingName) {
+    return FINDING_PATH_TEMPLATE.parse(findingName).get("scan_config");
+  }
+
+  /**
+   * Parses the scan_run from the given fully-qualified path which represents a finding resource.
+   */
+  public static final String parseScanRunFromFindingName(String findingName) {
+    return FINDING_PATH_TEMPLATE.parse(findingName).get("scan_run");
+  }
+
+  /** Parses the finding from the given fully-qualified path which represents a finding resource. */
+  public static final String parseFindingFromFindingName(String findingName) {
+    return FINDING_PATH_TEMPLATE.parse(findingName).get("finding");
+  }
+
+  /** Constructs an instance of WebSecurityScannerClient with default settings. */
+  public static final WebSecurityScannerClient create() throws IOException {
+    return create(WebSecurityScannerSettings.newBuilder().build());
+  }
+
+  /**
+   * Constructs an instance of WebSecurityScannerClient, using the given settings. The channels are
+   * created based on the settings passed in, or defaults for any settings that are not set.
+   */
+  public static final WebSecurityScannerClient create(WebSecurityScannerSettings settings)
+      throws IOException {
+    return new WebSecurityScannerClient(settings);
+  }
+
+  /**
+   * Constructs an instance of WebSecurityScannerClient, using the given stub for making calls. This
+   * is for advanced usage - prefer to use WebSecurityScannerSettings}.
+   */
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  public static final WebSecurityScannerClient create(WebSecurityScannerStub stub) {
+    return new WebSecurityScannerClient(stub);
+  }
+
+  /**
+   * Constructs an instance of WebSecurityScannerClient, using the given settings. This is protected
+   * so that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected WebSecurityScannerClient(WebSecurityScannerSettings settings) throws IOException {
+    this.settings = settings;
+    this.stub = ((WebSecurityScannerStubSettings) settings.getStubSettings()).createStub();
+  }
+
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  protected WebSecurityScannerClient(WebSecurityScannerStub stub) {
+    this.settings = null;
+    this.stub = stub;
+  }
+
+  public final WebSecurityScannerSettings getSettings() {
+    return settings;
+  }
+
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  public WebSecurityScannerStub getStub() {
+    return stub;
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a new ScanConfig.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
+   *   ScanConfig response = webSecurityScannerClient.createScanConfig(formattedParent, scanConfig);
+   * }
+   * 

+   *
+   * @param parent Required. The parent resource name where the scan is created, which should be a
+   *     project resource name in the format 'projects/{projectId}'.
+   * @param scanConfig Required. The ScanConfig to be created.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ScanConfig createScanConfig(String parent, ScanConfig scanConfig) {
+    PROJECT_PATH_TEMPLATE.validate(parent, "createScanConfig");
+    CreateScanConfigRequest request =
+        CreateScanConfigRequest.newBuilder().setParent(parent).setScanConfig(scanConfig).build();
+    return createScanConfig(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a new ScanConfig.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
+   *   CreateScanConfigRequest request = CreateScanConfigRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .setScanConfig(scanConfig)
+   *     .build();
+   *   ScanConfig response = webSecurityScannerClient.createScanConfig(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ScanConfig createScanConfig(CreateScanConfigRequest request) {
+    return createScanConfigCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates a new ScanConfig.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
+   *   CreateScanConfigRequest request = CreateScanConfigRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .setScanConfig(scanConfig)
+   *     .build();
+   *   ApiFuture<ScanConfig> future = webSecurityScannerClient.createScanConfigCallable().futureCall(request);
+   *   // Do something
+   *   ScanConfig response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable createScanConfigCallable() {
+    return stub.createScanConfigCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes an existing ScanConfig and its child resources.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   webSecurityScannerClient.deleteScanConfig(formattedName);
+   * }
+   * 

+   *
+   * @param name Required. The resource name of the ScanConfig to be deleted. The name follows the
+   *     format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteScanConfig(String name) {
+    SCAN_CONFIG_PATH_TEMPLATE.validate(name, "deleteScanConfig");
+    DeleteScanConfigRequest request = DeleteScanConfigRequest.newBuilder().setName(name).build();
+    deleteScanConfig(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes an existing ScanConfig and its child resources.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   DeleteScanConfigRequest request = DeleteScanConfigRequest.newBuilder()
+   *     .setName(formattedName)
+   *     .build();
+   *   webSecurityScannerClient.deleteScanConfig(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  private final void deleteScanConfig(DeleteScanConfigRequest request) {
+    deleteScanConfigCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes an existing ScanConfig and its child resources.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   DeleteScanConfigRequest request = DeleteScanConfigRequest.newBuilder()
+   *     .setName(formattedName)
+   *     .build();
+   *   ApiFuture<Void> future = webSecurityScannerClient.deleteScanConfigCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable deleteScanConfigCallable() {
+    return stub.deleteScanConfigCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a ScanConfig.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   ScanConfig response = webSecurityScannerClient.getScanConfig(formattedName);
+   * }
+   * 

+   *
+   * @param name Required. The resource name of the ScanConfig to be returned. The name follows the
+   *     format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ScanConfig getScanConfig(String name) {
+    SCAN_CONFIG_PATH_TEMPLATE.validate(name, "getScanConfig");
+    GetScanConfigRequest request = GetScanConfigRequest.newBuilder().setName(name).build();
+    return getScanConfig(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a ScanConfig.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   GetScanConfigRequest request = GetScanConfigRequest.newBuilder()
+   *     .setName(formattedName)
+   *     .build();
+   *   ScanConfig response = webSecurityScannerClient.getScanConfig(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  private final ScanConfig getScanConfig(GetScanConfigRequest request) {
+    return getScanConfigCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a ScanConfig.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   GetScanConfigRequest request = GetScanConfigRequest.newBuilder()
+   *     .setName(formattedName)
+   *     .build();
+   *   ApiFuture<ScanConfig> future = webSecurityScannerClient.getScanConfigCallable().futureCall(request);
+   *   // Do something
+   *   ScanConfig response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable getScanConfigCallable() {
+    return stub.getScanConfigCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists ScanConfigs under a given project.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   for (ScanConfig element : webSecurityScannerClient.listScanConfigs(formattedParent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param parent Required. The parent resource name, which should be a project resource name in
+   *     the format 'projects/{projectId}'.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListScanConfigsPagedResponse listScanConfigs(String parent) {
+    PROJECT_PATH_TEMPLATE.validate(parent, "listScanConfigs");
+    ListScanConfigsRequest request = ListScanConfigsRequest.newBuilder().setParent(parent).build();
+    return listScanConfigs(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists ScanConfigs under a given project.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   ListScanConfigsRequest request = ListScanConfigsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .build();
+   *   for (ScanConfig element : webSecurityScannerClient.listScanConfigs(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListScanConfigsPagedResponse listScanConfigs(ListScanConfigsRequest request) {
+    return listScanConfigsPagedCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists ScanConfigs under a given project.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   ListScanConfigsRequest request = ListScanConfigsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .build();
+   *   ApiFuture<ListScanConfigsPagedResponse> future = webSecurityScannerClient.listScanConfigsPagedCallable().futureCall(request);
+   *   // Do something
+   *   for (ScanConfig element : future.get().iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   */
+  public final UnaryCallable
+      listScanConfigsPagedCallable() {
+    return stub.listScanConfigsPagedCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists ScanConfigs under a given project.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   ListScanConfigsRequest request = ListScanConfigsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .build();
+   *   while (true) {
+   *     ListScanConfigsResponse response = webSecurityScannerClient.listScanConfigsCallable().call(request);
+   *     for (ScanConfig element : response.getScanConfigsList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
+   * }
+   * 

+   */
+  public final UnaryCallable
+      listScanConfigsCallable() {
+    return stub.listScanConfigsCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a ScanConfig. This method support partial update of a ScanConfig.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   ScanConfig response = webSecurityScannerClient.updateScanConfig(scanConfig, updateMask);
+   * }
+   * 

+   *
+   * @param scanConfig Required. The ScanConfig to be updated. The name field must be set to
+   *     identify the resource to be updated. The values of fields not covered by the mask will be
+   *     ignored.
+   * @param updateMask Required. The update mask applies to the resource. For the `FieldMask`
+   *     definition, see
+   *     https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ScanConfig updateScanConfig(ScanConfig scanConfig, FieldMask updateMask) {
+
+    UpdateScanConfigRequest request =
+        UpdateScanConfigRequest.newBuilder()
+            .setScanConfig(scanConfig)
+            .setUpdateMask(updateMask)
+            .build();
+    return updateScanConfig(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a ScanConfig. This method support partial update of a ScanConfig.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   UpdateScanConfigRequest request = UpdateScanConfigRequest.newBuilder()
+   *     .setScanConfig(scanConfig)
+   *     .setUpdateMask(updateMask)
+   *     .build();
+   *   ScanConfig response = webSecurityScannerClient.updateScanConfig(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ScanConfig updateScanConfig(UpdateScanConfigRequest request) {
+    return updateScanConfigCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates a ScanConfig. This method support partial update of a ScanConfig.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   UpdateScanConfigRequest request = UpdateScanConfigRequest.newBuilder()
+   *     .setScanConfig(scanConfig)
+   *     .setUpdateMask(updateMask)
+   *     .build();
+   *   ApiFuture<ScanConfig> future = webSecurityScannerClient.updateScanConfigCallable().futureCall(request);
+   *   // Do something
+   *   ScanConfig response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable updateScanConfigCallable() {
+    return stub.updateScanConfigCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Start a ScanRun according to the given ScanConfig.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   ScanRun response = webSecurityScannerClient.startScanRun(formattedName);
+   * }
+   * 

+   *
+   * @param name Required. The resource name of the ScanConfig to be used. The name follows the
+   *     format of 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ScanRun startScanRun(String name) {
+    SCAN_CONFIG_PATH_TEMPLATE.validate(name, "startScanRun");
+    StartScanRunRequest request = StartScanRunRequest.newBuilder().setName(name).build();
+    return startScanRun(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Start a ScanRun according to the given ScanConfig.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   StartScanRunRequest request = StartScanRunRequest.newBuilder()
+   *     .setName(formattedName)
+   *     .build();
+   *   ScanRun response = webSecurityScannerClient.startScanRun(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  private final ScanRun startScanRun(StartScanRunRequest request) {
+    return startScanRunCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Start a ScanRun according to the given ScanConfig.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   StartScanRunRequest request = StartScanRunRequest.newBuilder()
+   *     .setName(formattedName)
+   *     .build();
+   *   ApiFuture<ScanRun> future = webSecurityScannerClient.startScanRunCallable().futureCall(request);
+   *   // Do something
+   *   ScanRun response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable startScanRunCallable() {
+    return stub.startScanRunCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   ScanRun response = webSecurityScannerClient.getScanRun(formattedName);
+   * }
+   * 

+   *
+   * @param name Required. The resource name of the ScanRun to be returned. The name follows the
+   *     format of 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ScanRun getScanRun(String name) {
+    SCAN_RUN_PATH_TEMPLATE.validate(name, "getScanRun");
+    GetScanRunRequest request = GetScanRunRequest.newBuilder().setName(name).build();
+    return getScanRun(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   GetScanRunRequest request = GetScanRunRequest.newBuilder()
+   *     .setName(formattedName)
+   *     .build();
+   *   ScanRun response = webSecurityScannerClient.getScanRun(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  private final ScanRun getScanRun(GetScanRunRequest request) {
+    return getScanRunCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   GetScanRunRequest request = GetScanRunRequest.newBuilder()
+   *     .setName(formattedName)
+   *     .build();
+   *   ApiFuture<ScanRun> future = webSecurityScannerClient.getScanRunCallable().futureCall(request);
+   *   // Do something
+   *   ScanRun response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable getScanRunCallable() {
+    return stub.getScanRunCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists ScanRuns under a given ScanConfig, in descending order of ScanRun stop time.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   for (ScanRun element : webSecurityScannerClient.listScanRuns(formattedParent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param parent Required. The parent resource name, which should be a scan resource name in the
+   *     format 'projects/{projectId}/scanConfigs/{scanConfigId}'.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListScanRunsPagedResponse listScanRuns(String parent) {
+    SCAN_CONFIG_PATH_TEMPLATE.validate(parent, "listScanRuns");
+    ListScanRunsRequest request = ListScanRunsRequest.newBuilder().setParent(parent).build();
+    return listScanRuns(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists ScanRuns under a given ScanConfig, in descending order of ScanRun stop time.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   ListScanRunsRequest request = ListScanRunsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .build();
+   *   for (ScanRun element : webSecurityScannerClient.listScanRuns(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListScanRunsPagedResponse listScanRuns(ListScanRunsRequest request) {
+    return listScanRunsPagedCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists ScanRuns under a given ScanConfig, in descending order of ScanRun stop time.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   ListScanRunsRequest request = ListScanRunsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .build();
+   *   ApiFuture<ListScanRunsPagedResponse> future = webSecurityScannerClient.listScanRunsPagedCallable().futureCall(request);
+   *   // Do something
+   *   for (ScanRun element : future.get().iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   */
+  public final UnaryCallable
+      listScanRunsPagedCallable() {
+    return stub.listScanRunsPagedCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Lists ScanRuns under a given ScanConfig, in descending order of ScanRun stop time.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   ListScanRunsRequest request = ListScanRunsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .build();
+   *   while (true) {
+   *     ListScanRunsResponse response = webSecurityScannerClient.listScanRunsCallable().call(request);
+   *     for (ScanRun element : response.getScanRunsList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
+   * }
+   * 

+   */
+  public final UnaryCallable listScanRunsCallable() {
+    return stub.listScanRunsCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Stops a ScanRun. The stopped ScanRun is returned.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   ScanRun response = webSecurityScannerClient.stopScanRun(formattedName);
+   * }
+   * 

+   *
+   * @param name Required. The resource name of the ScanRun to be stopped. The name follows the
+   *     format of 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ScanRun stopScanRun(String name) {
+    SCAN_RUN_PATH_TEMPLATE.validate(name, "stopScanRun");
+    StopScanRunRequest request = StopScanRunRequest.newBuilder().setName(name).build();
+    return stopScanRun(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Stops a ScanRun. The stopped ScanRun is returned.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   StopScanRunRequest request = StopScanRunRequest.newBuilder()
+   *     .setName(formattedName)
+   *     .build();
+   *   ScanRun response = webSecurityScannerClient.stopScanRun(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  private final ScanRun stopScanRun(StopScanRunRequest request) {
+    return stopScanRunCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Stops a ScanRun. The stopped ScanRun is returned.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   StopScanRunRequest request = StopScanRunRequest.newBuilder()
+   *     .setName(formattedName)
+   *     .build();
+   *   ApiFuture<ScanRun> future = webSecurityScannerClient.stopScanRunCallable().futureCall(request);
+   *   // Do something
+   *   ScanRun response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable stopScanRunCallable() {
+    return stub.stopScanRunCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List CrawledUrls under a given ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   for (CrawledUrl element : webSecurityScannerClient.listCrawledUrls(formattedParent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param parent Required. The parent resource name, which should be a scan run resource name in
+   *     the format 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListCrawledUrlsPagedResponse listCrawledUrls(String parent) {
+    SCAN_RUN_PATH_TEMPLATE.validate(parent, "listCrawledUrls");
+    ListCrawledUrlsRequest request = ListCrawledUrlsRequest.newBuilder().setParent(parent).build();
+    return listCrawledUrls(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List CrawledUrls under a given ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   ListCrawledUrlsRequest request = ListCrawledUrlsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .build();
+   *   for (CrawledUrl element : webSecurityScannerClient.listCrawledUrls(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListCrawledUrlsPagedResponse listCrawledUrls(ListCrawledUrlsRequest request) {
+    return listCrawledUrlsPagedCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List CrawledUrls under a given ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   ListCrawledUrlsRequest request = ListCrawledUrlsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .build();
+   *   ApiFuture<ListCrawledUrlsPagedResponse> future = webSecurityScannerClient.listCrawledUrlsPagedCallable().futureCall(request);
+   *   // Do something
+   *   for (CrawledUrl element : future.get().iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   */
+  public final UnaryCallable
+      listCrawledUrlsPagedCallable() {
+    return stub.listCrawledUrlsPagedCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List CrawledUrls under a given ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   ListCrawledUrlsRequest request = ListCrawledUrlsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .build();
+   *   while (true) {
+   *     ListCrawledUrlsResponse response = webSecurityScannerClient.listCrawledUrlsCallable().call(request);
+   *     for (CrawledUrl element : response.getCrawledUrlsList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
+   * }
+   * 

+   */
+  public final UnaryCallable
+      listCrawledUrlsCallable() {
+    return stub.listCrawledUrlsCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a Finding.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatFindingName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
+   *   Finding response = webSecurityScannerClient.getFinding(formattedName);
+   * }
+   * 

+   *
+   * @param name Required. The resource name of the Finding to be returned. The name follows the
+   *     format of
+   *     'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}/findings/{findingId}'.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Finding getFinding(String name) {
+    FINDING_PATH_TEMPLATE.validate(name, "getFinding");
+    GetFindingRequest request = GetFindingRequest.newBuilder().setName(name).build();
+    return getFinding(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a Finding.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatFindingName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
+   *   GetFindingRequest request = GetFindingRequest.newBuilder()
+   *     .setName(formattedName)
+   *     .build();
+   *   Finding response = webSecurityScannerClient.getFinding(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  private final Finding getFinding(GetFindingRequest request) {
+    return getFindingCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Gets a Finding.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedName = WebSecurityScannerClient.formatFindingName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
+   *   GetFindingRequest request = GetFindingRequest.newBuilder()
+   *     .setName(formattedName)
+   *     .build();
+   *   ApiFuture<Finding> future = webSecurityScannerClient.getFindingCallable().futureCall(request);
+   *   // Do something
+   *   Finding response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable getFindingCallable() {
+    return stub.getFindingCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List Findings under a given ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String filter = "";
+   *   for (Finding element : webSecurityScannerClient.listFindings(formattedParent, filter).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param parent Required. The parent resource name, which should be a scan run resource name in
+   *     the format 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * @param filter The filter expression. The expression must be in the format: <field>
+   *     <operator> <value>. Supported field: 'finding_type'. Supported operator: '='.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListFindingsPagedResponse listFindings(String parent, String filter) {
+    SCAN_RUN_PATH_TEMPLATE.validate(parent, "listFindings");
+    ListFindingsRequest request =
+        ListFindingsRequest.newBuilder().setParent(parent).setFilter(filter).build();
+    return listFindings(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List Findings under a given ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String filter = "";
+   *   ListFindingsRequest request = ListFindingsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .setFilter(filter)
+   *     .build();
+   *   for (Finding element : webSecurityScannerClient.listFindings(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListFindingsPagedResponse listFindings(ListFindingsRequest request) {
+    return listFindingsPagedCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List Findings under a given ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String filter = "";
+   *   ListFindingsRequest request = ListFindingsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .setFilter(filter)
+   *     .build();
+   *   ApiFuture<ListFindingsPagedResponse> future = webSecurityScannerClient.listFindingsPagedCallable().futureCall(request);
+   *   // Do something
+   *   for (Finding element : future.get().iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
+   * }
+   * 

+   */
+  public final UnaryCallable
+      listFindingsPagedCallable() {
+    return stub.listFindingsPagedCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List Findings under a given ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String filter = "";
+   *   ListFindingsRequest request = ListFindingsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .setFilter(filter)
+   *     .build();
+   *   while (true) {
+   *     ListFindingsResponse response = webSecurityScannerClient.listFindingsCallable().call(request);
+   *     for (Finding element : response.getFindingsList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
+   * }
+   * 

+   */
+  public final UnaryCallable listFindingsCallable() {
+    return stub.listFindingsCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List all FindingTypeStats under a given ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   ListFindingTypeStatsResponse response = webSecurityScannerClient.listFindingTypeStats(formattedParent);
+   * }
+   * 

+   *
+   * @param parent Required. The parent resource name, which should be a scan run resource name in
+   *     the format 'projects/{projectId}/scanConfigs/{scanConfigId}/scanRuns/{scanRunId}'.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListFindingTypeStatsResponse listFindingTypeStats(String parent) {
+    SCAN_RUN_PATH_TEMPLATE.validate(parent, "listFindingTypeStats");
+    ListFindingTypeStatsRequest request =
+        ListFindingTypeStatsRequest.newBuilder().setParent(parent).build();
+    return listFindingTypeStats(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List all FindingTypeStats under a given ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   ListFindingTypeStatsRequest request = ListFindingTypeStatsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .build();
+   *   ListFindingTypeStatsResponse response = webSecurityScannerClient.listFindingTypeStats(request);
+   * }
+   * 

+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  private final ListFindingTypeStatsResponse listFindingTypeStats(
+      ListFindingTypeStatsRequest request) {
+    return listFindingTypeStatsCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * List all FindingTypeStats under a given ScanRun.
+   *
+   * 
Sample code:
+   *
+   * 

+   * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   ListFindingTypeStatsRequest request = ListFindingTypeStatsRequest.newBuilder()
+   *     .setParent(formattedParent)
+   *     .build();
+   *   ApiFuture<ListFindingTypeStatsResponse> future = webSecurityScannerClient.listFindingTypeStatsCallable().futureCall(request);
+   *   // Do something
+   *   ListFindingTypeStatsResponse response = future.get();
+   * }
+   * 

+   */
+  public final UnaryCallable
+      listFindingTypeStatsCallable() {
+    return stub.listFindingTypeStatsCallable();
+  }
+
+  @Override
+  public final void close() {
+    stub.close();
+  }
+
+  @Override
+  public void shutdown() {
+    stub.shutdown();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return stub.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return stub.isTerminated();
+  }
+
+  @Override
+  public void shutdownNow() {
+    stub.shutdownNow();
+  }
+
+  @Override
+  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
+    return stub.awaitTermination(duration, unit);
+  }
+
+  public static class ListScanConfigsPagedResponse
+      extends AbstractPagedListResponse<
+          ListScanConfigsRequest, ListScanConfigsResponse, ScanConfig, ListScanConfigsPage,
+          ListScanConfigsFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListScanConfigsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListScanConfigsPagedResponse apply(ListScanConfigsPage input) {
+              return new ListScanConfigsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListScanConfigsPagedResponse(ListScanConfigsPage page) {
+      super(page, ListScanConfigsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListScanConfigsPage
+      extends AbstractPage<
+          ListScanConfigsRequest, ListScanConfigsResponse, ScanConfig, ListScanConfigsPage> {
+
+    private ListScanConfigsPage(
+        PageContext context,
+        ListScanConfigsResponse response) {
+      super(context, response);
+    }
+
+    private static ListScanConfigsPage createEmptyPage() {
+      return new ListScanConfigsPage(null, null);
+    }
+
+    @Override
+    protected ListScanConfigsPage createPage(
+        PageContext context,
+        ListScanConfigsResponse response) {
+      return new ListScanConfigsPage(context, response);
+    }
+
+    @Override
+    public ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListScanConfigsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListScanConfigsRequest, ListScanConfigsResponse, ScanConfig, ListScanConfigsPage,
+          ListScanConfigsFixedSizeCollection> {
+
+    private ListScanConfigsFixedSizeCollection(
+        List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListScanConfigsFixedSizeCollection createEmptyCollection() {
+      return new ListScanConfigsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListScanConfigsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListScanConfigsFixedSizeCollection(pages, collectionSize);
+    }
+  }
+
+  public static class ListScanRunsPagedResponse
+      extends AbstractPagedListResponse<
+          ListScanRunsRequest, ListScanRunsResponse, ScanRun, ListScanRunsPage,
+          ListScanRunsFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListScanRunsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListScanRunsPagedResponse apply(ListScanRunsPage input) {
+              return new ListScanRunsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListScanRunsPagedResponse(ListScanRunsPage page) {
+      super(page, ListScanRunsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListScanRunsPage
+      extends AbstractPage {
+
+    private ListScanRunsPage(
+        PageContext context,
+        ListScanRunsResponse response) {
+      super(context, response);
+    }
+
+    private static ListScanRunsPage createEmptyPage() {
+      return new ListScanRunsPage(null, null);
+    }
+
+    @Override
+    protected ListScanRunsPage createPage(
+        PageContext context,
+        ListScanRunsResponse response) {
+      return new ListScanRunsPage(context, response);
+    }
+
+    @Override
+    public ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListScanRunsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListScanRunsRequest, ListScanRunsResponse, ScanRun, ListScanRunsPage,
+          ListScanRunsFixedSizeCollection> {
+
+    private ListScanRunsFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListScanRunsFixedSizeCollection createEmptyCollection() {
+      return new ListScanRunsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListScanRunsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListScanRunsFixedSizeCollection(pages, collectionSize);
+    }
+  }
+
+  public static class ListCrawledUrlsPagedResponse
+      extends AbstractPagedListResponse<
+          ListCrawledUrlsRequest, ListCrawledUrlsResponse, CrawledUrl, ListCrawledUrlsPage,
+          ListCrawledUrlsFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListCrawledUrlsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListCrawledUrlsPagedResponse apply(ListCrawledUrlsPage input) {
+              return new ListCrawledUrlsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListCrawledUrlsPagedResponse(ListCrawledUrlsPage page) {
+      super(page, ListCrawledUrlsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListCrawledUrlsPage
+      extends AbstractPage<
+          ListCrawledUrlsRequest, ListCrawledUrlsResponse, CrawledUrl, ListCrawledUrlsPage> {
+
+    private ListCrawledUrlsPage(
+        PageContext context,
+        ListCrawledUrlsResponse response) {
+      super(context, response);
+    }
+
+    private static ListCrawledUrlsPage createEmptyPage() {
+      return new ListCrawledUrlsPage(null, null);
+    }
+
+    @Override
+    protected ListCrawledUrlsPage createPage(
+        PageContext context,
+        ListCrawledUrlsResponse response) {
+      return new ListCrawledUrlsPage(context, response);
+    }
+
+    @Override
+    public ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListCrawledUrlsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListCrawledUrlsRequest, ListCrawledUrlsResponse, CrawledUrl, ListCrawledUrlsPage,
+          ListCrawledUrlsFixedSizeCollection> {
+
+    private ListCrawledUrlsFixedSizeCollection(
+        List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListCrawledUrlsFixedSizeCollection createEmptyCollection() {
+      return new ListCrawledUrlsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListCrawledUrlsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListCrawledUrlsFixedSizeCollection(pages, collectionSize);
+    }
+  }
+
+  public static class ListFindingsPagedResponse
+      extends AbstractPagedListResponse<
+          ListFindingsRequest, ListFindingsResponse, Finding, ListFindingsPage,
+          ListFindingsFixedSizeCollection> {
+
+    public static ApiFuture createAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      ApiFuture futurePage =
+          ListFindingsPage.createEmptyPage().createPageAsync(context, futureResponse);
+      return ApiFutures.transform(
+          futurePage,
+          new ApiFunction() {
+            @Override
+            public ListFindingsPagedResponse apply(ListFindingsPage input) {
+              return new ListFindingsPagedResponse(input);
+            }
+          });
+    }
+
+    private ListFindingsPagedResponse(ListFindingsPage page) {
+      super(page, ListFindingsFixedSizeCollection.createEmptyCollection());
+    }
+  }
+
+  public static class ListFindingsPage
+      extends AbstractPage {
+
+    private ListFindingsPage(
+        PageContext context,
+        ListFindingsResponse response) {
+      super(context, response);
+    }
+
+    private static ListFindingsPage createEmptyPage() {
+      return new ListFindingsPage(null, null);
+    }
+
+    @Override
+    protected ListFindingsPage createPage(
+        PageContext context,
+        ListFindingsResponse response) {
+      return new ListFindingsPage(context, response);
+    }
+
+    @Override
+    public ApiFuture createPageAsync(
+        PageContext context,
+        ApiFuture futureResponse) {
+      return super.createPageAsync(context, futureResponse);
+    }
+  }
+
+  public static class ListFindingsFixedSizeCollection
+      extends AbstractFixedSizeCollection<
+          ListFindingsRequest, ListFindingsResponse, Finding, ListFindingsPage,
+          ListFindingsFixedSizeCollection> {
+
+    private ListFindingsFixedSizeCollection(List pages, int collectionSize) {
+      super(pages, collectionSize);
+    }
+
+    private static ListFindingsFixedSizeCollection createEmptyCollection() {
+      return new ListFindingsFixedSizeCollection(null, 0);
+    }
+
+    @Override
+    protected ListFindingsFixedSizeCollection createCollection(
+        List pages, int collectionSize) {
+      return new ListFindingsFixedSizeCollection(pages, collectionSize);
+    }
+  }
+}
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerSettings.java b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerSettings.java
new file mode 100644
index 000000000000..dbfbf3cdd3b4
--- /dev/null
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerSettings.java
@@ -0,0 +1,320 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.websecurityscanner.v1alpha;
+
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListCrawledUrlsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListFindingsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListScanConfigsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListScanRunsPagedResponse;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.GoogleCredentialsProvider;
+import com.google.api.gax.core.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.ClientSettings;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.cloud.websecurityscanner.v1alpha.stub.WebSecurityScannerStubSettings;
+import com.google.protobuf.Empty;
+import java.io.IOException;
+import java.util.List;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * Settings class to configure an instance of {@link WebSecurityScannerClient}.
+ *
+ * 
The default instance has everything set to sensible defaults:
+ *
+ * 
    
+ *   
  • The default service address (websecurityscanner.googleapis.com) and default port (443) are
+ *       used.
+ *   
  • Credentials are acquired automatically through Application Default Credentials.
+ *   
  • Retries are configured for idempotent methods but not for non-idempotent methods.
+ * 

+ *
+ * 
The builder of this class is recursive, so contained classes are themselves builders. When
+ * build() is called, the tree of builders is called to create the complete settings object. For
+ * example, to set the total timeout of createScanConfig to 30 seconds:
+ *
+ * 
+ * 
+ * WebSecurityScannerSettings.Builder webSecurityScannerSettingsBuilder =
+ *     WebSecurityScannerSettings.newBuilder();
+ * webSecurityScannerSettingsBuilder.createScanConfigSettings().getRetrySettings().toBuilder()
+ *     .setTotalTimeout(Duration.ofSeconds(30));
+ * WebSecurityScannerSettings webSecurityScannerSettings = webSecurityScannerSettingsBuilder.build();
+ * 
+ * 

+ */
+@Generated("by gapic-generator")
+@BetaApi
+public class WebSecurityScannerSettings extends ClientSettings {
+  /** Returns the object with the settings used for calls to createScanConfig. */
+  public UnaryCallSettings createScanConfigSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).createScanConfigSettings();
+  }
+
+  /** Returns the object with the settings used for calls to deleteScanConfig. */
+  public UnaryCallSettings deleteScanConfigSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).deleteScanConfigSettings();
+  }
+
+  /** Returns the object with the settings used for calls to getScanConfig. */
+  public UnaryCallSettings getScanConfigSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).getScanConfigSettings();
+  }
+
+  /** Returns the object with the settings used for calls to listScanConfigs. */
+  public PagedCallSettings<
+          ListScanConfigsRequest, ListScanConfigsResponse, ListScanConfigsPagedResponse>
+      listScanConfigsSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).listScanConfigsSettings();
+  }
+
+  /** Returns the object with the settings used for calls to updateScanConfig. */
+  public UnaryCallSettings updateScanConfigSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).updateScanConfigSettings();
+  }
+
+  /** Returns the object with the settings used for calls to startScanRun. */
+  public UnaryCallSettings startScanRunSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).startScanRunSettings();
+  }
+
+  /** Returns the object with the settings used for calls to getScanRun. */
+  public UnaryCallSettings getScanRunSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).getScanRunSettings();
+  }
+
+  /** Returns the object with the settings used for calls to listScanRuns. */
+  public PagedCallSettings
+      listScanRunsSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).listScanRunsSettings();
+  }
+
+  /** Returns the object with the settings used for calls to stopScanRun. */
+  public UnaryCallSettings stopScanRunSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).stopScanRunSettings();
+  }
+
+  /** Returns the object with the settings used for calls to listCrawledUrls. */
+  public PagedCallSettings<
+          ListCrawledUrlsRequest, ListCrawledUrlsResponse, ListCrawledUrlsPagedResponse>
+      listCrawledUrlsSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).listCrawledUrlsSettings();
+  }
+
+  /** Returns the object with the settings used for calls to getFinding. */
+  public UnaryCallSettings getFindingSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).getFindingSettings();
+  }
+
+  /** Returns the object with the settings used for calls to listFindings. */
+  public PagedCallSettings
+      listFindingsSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).listFindingsSettings();
+  }
+
+  /** Returns the object with the settings used for calls to listFindingTypeStats. */
+  public UnaryCallSettings
+      listFindingTypeStatsSettings() {
+    return ((WebSecurityScannerStubSettings) getStubSettings()).listFindingTypeStatsSettings();
+  }
+
+  public static final WebSecurityScannerSettings create(WebSecurityScannerStubSettings stub)
+      throws IOException {
+    return new WebSecurityScannerSettings.Builder(stub.toBuilder()).build();
+  }
+
+  /** Returns a builder for the default ExecutorProvider for this service. */
+  public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
+    return WebSecurityScannerStubSettings.defaultExecutorProviderBuilder();
+  }
+
+  /** Returns the default service endpoint. */
+  public static String getDefaultEndpoint() {
+    return WebSecurityScannerStubSettings.getDefaultEndpoint();
+  }
+
+  /** Returns the default service scopes. */
+  public static List getDefaultServiceScopes() {
+    return WebSecurityScannerStubSettings.getDefaultServiceScopes();
+  }
+
+  /** Returns a builder for the default credentials for this service. */
+  public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
+    return WebSecurityScannerStubSettings.defaultCredentialsProviderBuilder();
+  }
+
+  /** Returns a builder for the default ChannelProvider for this service. */
+  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
+    return WebSecurityScannerStubSettings.defaultGrpcTransportProviderBuilder();
+  }
+
+  public static TransportChannelProvider defaultTransportChannelProvider() {
+    return WebSecurityScannerStubSettings.defaultTransportChannelProvider();
+  }
+
+  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
+  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+    return WebSecurityScannerStubSettings.defaultApiClientHeaderProviderBuilder();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder() {
+    return Builder.createDefault();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder(ClientContext clientContext) {
+    return new Builder(clientContext);
+  }
+
+  /** Returns a builder containing all the values of this settings class. */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  protected WebSecurityScannerSettings(Builder settingsBuilder) throws IOException {
+    super(settingsBuilder);
+  }
+
+  /** Builder for WebSecurityScannerSettings. */
+  public static class Builder extends ClientSettings.Builder {
+    protected Builder() throws IOException {
+      this((ClientContext) null);
+    }
+
+    protected Builder(ClientContext clientContext) {
+      super(WebSecurityScannerStubSettings.newBuilder(clientContext));
+    }
+
+    private static Builder createDefault() {
+      return new Builder(WebSecurityScannerStubSettings.newBuilder());
+    }
+
+    protected Builder(WebSecurityScannerSettings settings) {
+      super(settings.getStubSettings().toBuilder());
+    }
+
+    protected Builder(WebSecurityScannerStubSettings.Builder stubSettings) {
+      super(stubSettings);
+    }
+
+    public WebSecurityScannerStubSettings.Builder getStubSettingsBuilder() {
+      return ((WebSecurityScannerStubSettings.Builder) getStubSettings());
+    }
+
+    // NEXT_MAJOR_VER: remove 'throws Exception'
+    /**
+     * Applies the given settings updater function to all of the unary API methods in this service.
+     *
+     * 
Note: This method does not support applying settings to streaming methods.
+     */
+    public Builder applyToAllUnaryMethods(
+        ApiFunction, Void> settingsUpdater) throws Exception {
+      super.applyToAllUnaryMethods(
+          getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
+      return this;
+    }
+
+    /** Returns the builder for the settings used for calls to createScanConfig. */
+    public UnaryCallSettings.Builder
+        createScanConfigSettings() {
+      return getStubSettingsBuilder().createScanConfigSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to deleteScanConfig. */
+    public UnaryCallSettings.Builder deleteScanConfigSettings() {
+      return getStubSettingsBuilder().deleteScanConfigSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to getScanConfig. */
+    public UnaryCallSettings.Builder getScanConfigSettings() {
+      return getStubSettingsBuilder().getScanConfigSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to listScanConfigs. */
+    public PagedCallSettings.Builder<
+            ListScanConfigsRequest, ListScanConfigsResponse, ListScanConfigsPagedResponse>
+        listScanConfigsSettings() {
+      return getStubSettingsBuilder().listScanConfigsSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to updateScanConfig. */
+    public UnaryCallSettings.Builder
+        updateScanConfigSettings() {
+      return getStubSettingsBuilder().updateScanConfigSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to startScanRun. */
+    public UnaryCallSettings.Builder startScanRunSettings() {
+      return getStubSettingsBuilder().startScanRunSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to getScanRun. */
+    public UnaryCallSettings.Builder getScanRunSettings() {
+      return getStubSettingsBuilder().getScanRunSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to listScanRuns. */
+    public PagedCallSettings.Builder<
+            ListScanRunsRequest, ListScanRunsResponse, ListScanRunsPagedResponse>
+        listScanRunsSettings() {
+      return getStubSettingsBuilder().listScanRunsSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to stopScanRun. */
+    public UnaryCallSettings.Builder stopScanRunSettings() {
+      return getStubSettingsBuilder().stopScanRunSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to listCrawledUrls. */
+    public PagedCallSettings.Builder<
+            ListCrawledUrlsRequest, ListCrawledUrlsResponse, ListCrawledUrlsPagedResponse>
+        listCrawledUrlsSettings() {
+      return getStubSettingsBuilder().listCrawledUrlsSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to getFinding. */
+    public UnaryCallSettings.Builder getFindingSettings() {
+      return getStubSettingsBuilder().getFindingSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to listFindings. */
+    public PagedCallSettings.Builder<
+            ListFindingsRequest, ListFindingsResponse, ListFindingsPagedResponse>
+        listFindingsSettings() {
+      return getStubSettingsBuilder().listFindingsSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to listFindingTypeStats. */
+    public UnaryCallSettings.Builder
+        listFindingTypeStatsSettings() {
+      return getStubSettingsBuilder().listFindingTypeStatsSettings();
+    }
+
+    @Override
+    public WebSecurityScannerSettings build() throws IOException {
+      return new WebSecurityScannerSettings(this);
+    }
+  }
+}
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/package-info.java b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/package-info.java
new file mode 100644
index 000000000000..2597fbba4bd3
--- /dev/null
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/package-info.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+/**
+ * A client to Web Security Scanner API.
+ *
+ * 
The interfaces provided are listed below, along with usage samples.
+ *
+ * 
======================== WebSecurityScannerClient ========================
+ *
+ * 
Service Description: Cloud Web Security Scanner Service identifies security vulnerabilities in
+ * web applications hosted on Google Cloud Platform. It crawls your application, and attempts to
+ * exercise as many user inputs and event handlers as possible.
+ *
+ * 
Sample for WebSecurityScannerClient:
+ *
+ * 
+ * 
+ * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
+ *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+ *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
+ *   ScanConfig response = webSecurityScannerClient.createScanConfig(formattedParent, scanConfig);
+ * }
+ * 
+ * 

+ */
+package com.google.cloud.websecurityscanner.v1alpha;
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/GrpcWebSecurityScannerCallableFactory.java b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/GrpcWebSecurityScannerCallableFactory.java
new file mode 100644
index 000000000000..2c1b0795a70a
--- /dev/null
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/GrpcWebSecurityScannerCallableFactory.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.websecurityscanner.v1alpha.stub;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.grpc.GrpcCallSettings;
+import com.google.api.gax.grpc.GrpcCallableFactory;
+import com.google.api.gax.grpc.GrpcStubCallableFactory;
+import com.google.api.gax.rpc.BatchingCallSettings;
+import com.google.api.gax.rpc.BidiStreamingCallable;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.ClientStreamingCallable;
+import com.google.api.gax.rpc.OperationCallSettings;
+import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallable;
+import com.google.api.gax.rpc.StreamingCallSettings;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.longrunning.Operation;
+import com.google.longrunning.stub.OperationsStub;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * gRPC callable factory implementation for Web Security Scanner API.
+ *
+ * 
This class is for advanced usage.
+ */
+@Generated("by gapic-generator")
+@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+public class GrpcWebSecurityScannerCallableFactory implements GrpcStubCallableFactory {
+  @Override
+  public  UnaryCallable createUnaryCallable(
+      GrpcCallSettings grpcCallSettings,
+      UnaryCallSettings callSettings,
+      ClientContext clientContext) {
+    return GrpcCallableFactory.createUnaryCallable(grpcCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      UnaryCallable createPagedCallable(
+          GrpcCallSettings grpcCallSettings,
+          PagedCallSettings pagedCallSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createPagedCallable(
+        grpcCallSettings, pagedCallSettings, clientContext);
+  }
+
+  @Override
+  public  UnaryCallable createBatchingCallable(
+      GrpcCallSettings grpcCallSettings,
+      BatchingCallSettings batchingCallSettings,
+      ClientContext clientContext) {
+    return GrpcCallableFactory.createBatchingCallable(
+        grpcCallSettings, batchingCallSettings, clientContext);
+  }
+
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
+  @Override
+  public 
+      OperationCallable createOperationCallable(
+          GrpcCallSettings grpcCallSettings,
+          OperationCallSettings operationCallSettings,
+          ClientContext clientContext,
+          OperationsStub operationsStub) {
+    return GrpcCallableFactory.createOperationCallable(
+        grpcCallSettings, operationCallSettings, clientContext, operationsStub);
+  }
+
+  @Override
+  public 
+      BidiStreamingCallable createBidiStreamingCallable(
+          GrpcCallSettings grpcCallSettings,
+          StreamingCallSettings streamingCallSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createBidiStreamingCallable(
+        grpcCallSettings, streamingCallSettings, clientContext);
+  }
+
+  @Override
+  public 
+      ServerStreamingCallable createServerStreamingCallable(
+          GrpcCallSettings grpcCallSettings,
+          ServerStreamingCallSettings streamingCallSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createServerStreamingCallable(
+        grpcCallSettings, streamingCallSettings, clientContext);
+  }
+
+  @Override
+  public 
+      ClientStreamingCallable createClientStreamingCallable(
+          GrpcCallSettings grpcCallSettings,
+          StreamingCallSettings streamingCallSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createClientStreamingCallable(
+        grpcCallSettings, streamingCallSettings, clientContext);
+  }
+}
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/GrpcWebSecurityScannerStub.java b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/GrpcWebSecurityScannerStub.java
new file mode 100644
index 000000000000..56886f38d113
--- /dev/null
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/GrpcWebSecurityScannerStub.java
@@ -0,0 +1,475 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.websecurityscanner.v1alpha.stub;
+
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListCrawledUrlsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListFindingsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListScanConfigsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListScanRunsPagedResponse;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.core.BackgroundResourceAggregation;
+import com.google.api.gax.grpc.GrpcCallSettings;
+import com.google.api.gax.grpc.GrpcStubCallableFactory;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest;
+import com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest;
+import com.google.cloud.websecurityscanner.v1alpha.Finding;
+import com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest;
+import com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest;
+import com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ScanConfig;
+import com.google.cloud.websecurityscanner.v1alpha.ScanRun;
+import com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest;
+import com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest;
+import com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest;
+import com.google.protobuf.Empty;
+import io.grpc.MethodDescriptor;
+import io.grpc.protobuf.ProtoUtils;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * gRPC stub implementation for Web Security Scanner API.
+ *
+ * 
This class is for advanced usage and reflects the underlying API directly.
+ */
+@Generated("by gapic-generator")
+@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+public class GrpcWebSecurityScannerStub extends WebSecurityScannerStub {
+
+  private static final MethodDescriptor
+      createScanConfigMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/CreateScanConfig")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(CreateScanConfigRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(ScanConfig.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      deleteScanConfigMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/DeleteScanConfig")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(DeleteScanConfigRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      getScanConfigMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/GetScanConfig")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(GetScanConfigRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(ScanConfig.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      listScanConfigsMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListScanConfigs")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(ListScanConfigsRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(ListScanConfigsResponse.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      updateScanConfigMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/UpdateScanConfig")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(UpdateScanConfigRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(ScanConfig.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor startScanRunMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName(
+              "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/StartScanRun")
+          .setRequestMarshaller(ProtoUtils.marshaller(StartScanRunRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(ScanRun.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor getScanRunMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName(
+              "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/GetScanRun")
+          .setRequestMarshaller(ProtoUtils.marshaller(GetScanRunRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(ScanRun.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor
+      listScanRunsMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListScanRuns")
+              .setRequestMarshaller(ProtoUtils.marshaller(ListScanRunsRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(ListScanRunsResponse.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor stopScanRunMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName(
+              "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/StopScanRun")
+          .setRequestMarshaller(ProtoUtils.marshaller(StopScanRunRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(ScanRun.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor
+      listCrawledUrlsMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListCrawledUrls")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(ListCrawledUrlsRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(ListCrawledUrlsResponse.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor getFindingMethodDescriptor =
+      MethodDescriptor.newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName(
+              "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/GetFinding")
+          .setRequestMarshaller(ProtoUtils.marshaller(GetFindingRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Finding.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor
+      listFindingsMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListFindings")
+              .setRequestMarshaller(ProtoUtils.marshaller(ListFindingsRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(ListFindingsResponse.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      listFindingTypeStatsMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(
+                  "google.cloud.websecurityscanner.v1alpha.WebSecurityScanner/ListFindingTypeStats")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(ListFindingTypeStatsRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(ListFindingTypeStatsResponse.getDefaultInstance()))
+              .build();
+
+  private final BackgroundResource backgroundResources;
+
+  private final UnaryCallable createScanConfigCallable;
+  private final UnaryCallable deleteScanConfigCallable;
+  private final UnaryCallable getScanConfigCallable;
+  private final UnaryCallable
+      listScanConfigsCallable;
+  private final UnaryCallable
+      listScanConfigsPagedCallable;
+  private final UnaryCallable updateScanConfigCallable;
+  private final UnaryCallable startScanRunCallable;
+  private final UnaryCallable getScanRunCallable;
+  private final UnaryCallable listScanRunsCallable;
+  private final UnaryCallable
+      listScanRunsPagedCallable;
+  private final UnaryCallable stopScanRunCallable;
+  private final UnaryCallable
+      listCrawledUrlsCallable;
+  private final UnaryCallable
+      listCrawledUrlsPagedCallable;
+  private final UnaryCallable getFindingCallable;
+  private final UnaryCallable listFindingsCallable;
+  private final UnaryCallable
+      listFindingsPagedCallable;
+  private final UnaryCallable
+      listFindingTypeStatsCallable;
+
+  private final GrpcStubCallableFactory callableFactory;
+
+  public static final GrpcWebSecurityScannerStub create(WebSecurityScannerStubSettings settings)
+      throws IOException {
+    return new GrpcWebSecurityScannerStub(settings, ClientContext.create(settings));
+  }
+
+  public static final GrpcWebSecurityScannerStub create(ClientContext clientContext)
+      throws IOException {
+    return new GrpcWebSecurityScannerStub(
+        WebSecurityScannerStubSettings.newBuilder().build(), clientContext);
+  }
+
+  public static final GrpcWebSecurityScannerStub create(
+      ClientContext clientContext, GrpcStubCallableFactory callableFactory) throws IOException {
+    return new GrpcWebSecurityScannerStub(
+        WebSecurityScannerStubSettings.newBuilder().build(), clientContext, callableFactory);
+  }
+
+  /**
+   * Constructs an instance of GrpcWebSecurityScannerStub, using the given settings. This is
+   * protected so that it is easy to make a subclass, but otherwise, the static factory methods
+   * should be preferred.
+   */
+  protected GrpcWebSecurityScannerStub(
+      WebSecurityScannerStubSettings settings, ClientContext clientContext) throws IOException {
+    this(settings, clientContext, new GrpcWebSecurityScannerCallableFactory());
+  }
+
+  /**
+   * Constructs an instance of GrpcWebSecurityScannerStub, using the given settings. This is
+   * protected so that it is easy to make a subclass, but otherwise, the static factory methods
+   * should be preferred.
+   */
+  protected GrpcWebSecurityScannerStub(
+      WebSecurityScannerStubSettings settings,
+      ClientContext clientContext,
+      GrpcStubCallableFactory callableFactory)
+      throws IOException {
+    this.callableFactory = callableFactory;
+
+    GrpcCallSettings createScanConfigTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(createScanConfigMethodDescriptor)
+            .build();
+    GrpcCallSettings deleteScanConfigTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(deleteScanConfigMethodDescriptor)
+            .build();
+    GrpcCallSettings getScanConfigTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(getScanConfigMethodDescriptor)
+            .build();
+    GrpcCallSettings
+        listScanConfigsTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(listScanConfigsMethodDescriptor)
+                .build();
+    GrpcCallSettings updateScanConfigTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(updateScanConfigMethodDescriptor)
+            .build();
+    GrpcCallSettings startScanRunTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(startScanRunMethodDescriptor)
+            .build();
+    GrpcCallSettings getScanRunTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(getScanRunMethodDescriptor)
+            .build();
+    GrpcCallSettings listScanRunsTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(listScanRunsMethodDescriptor)
+            .build();
+    GrpcCallSettings stopScanRunTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(stopScanRunMethodDescriptor)
+            .build();
+    GrpcCallSettings
+        listCrawledUrlsTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(listCrawledUrlsMethodDescriptor)
+                .build();
+    GrpcCallSettings getFindingTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(getFindingMethodDescriptor)
+            .build();
+    GrpcCallSettings listFindingsTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(listFindingsMethodDescriptor)
+            .build();
+    GrpcCallSettings
+        listFindingTypeStatsTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(listFindingTypeStatsMethodDescriptor)
+                .build();
+
+    this.createScanConfigCallable =
+        callableFactory.createUnaryCallable(
+            createScanConfigTransportSettings, settings.createScanConfigSettings(), clientContext);
+    this.deleteScanConfigCallable =
+        callableFactory.createUnaryCallable(
+            deleteScanConfigTransportSettings, settings.deleteScanConfigSettings(), clientContext);
+    this.getScanConfigCallable =
+        callableFactory.createUnaryCallable(
+            getScanConfigTransportSettings, settings.getScanConfigSettings(), clientContext);
+    this.listScanConfigsCallable =
+        callableFactory.createUnaryCallable(
+            listScanConfigsTransportSettings, settings.listScanConfigsSettings(), clientContext);
+    this.listScanConfigsPagedCallable =
+        callableFactory.createPagedCallable(
+            listScanConfigsTransportSettings, settings.listScanConfigsSettings(), clientContext);
+    this.updateScanConfigCallable =
+        callableFactory.createUnaryCallable(
+            updateScanConfigTransportSettings, settings.updateScanConfigSettings(), clientContext);
+    this.startScanRunCallable =
+        callableFactory.createUnaryCallable(
+            startScanRunTransportSettings, settings.startScanRunSettings(), clientContext);
+    this.getScanRunCallable =
+        callableFactory.createUnaryCallable(
+            getScanRunTransportSettings, settings.getScanRunSettings(), clientContext);
+    this.listScanRunsCallable =
+        callableFactory.createUnaryCallable(
+            listScanRunsTransportSettings, settings.listScanRunsSettings(), clientContext);
+    this.listScanRunsPagedCallable =
+        callableFactory.createPagedCallable(
+            listScanRunsTransportSettings, settings.listScanRunsSettings(), clientContext);
+    this.stopScanRunCallable =
+        callableFactory.createUnaryCallable(
+            stopScanRunTransportSettings, settings.stopScanRunSettings(), clientContext);
+    this.listCrawledUrlsCallable =
+        callableFactory.createUnaryCallable(
+            listCrawledUrlsTransportSettings, settings.listCrawledUrlsSettings(), clientContext);
+    this.listCrawledUrlsPagedCallable =
+        callableFactory.createPagedCallable(
+            listCrawledUrlsTransportSettings, settings.listCrawledUrlsSettings(), clientContext);
+    this.getFindingCallable =
+        callableFactory.createUnaryCallable(
+            getFindingTransportSettings, settings.getFindingSettings(), clientContext);
+    this.listFindingsCallable =
+        callableFactory.createUnaryCallable(
+            listFindingsTransportSettings, settings.listFindingsSettings(), clientContext);
+    this.listFindingsPagedCallable =
+        callableFactory.createPagedCallable(
+            listFindingsTransportSettings, settings.listFindingsSettings(), clientContext);
+    this.listFindingTypeStatsCallable =
+        callableFactory.createUnaryCallable(
+            listFindingTypeStatsTransportSettings,
+            settings.listFindingTypeStatsSettings(),
+            clientContext);
+
+    backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
+  }
+
+  public UnaryCallable createScanConfigCallable() {
+    return createScanConfigCallable;
+  }
+
+  public UnaryCallable deleteScanConfigCallable() {
+    return deleteScanConfigCallable;
+  }
+
+  public UnaryCallable getScanConfigCallable() {
+    return getScanConfigCallable;
+  }
+
+  public UnaryCallable
+      listScanConfigsPagedCallable() {
+    return listScanConfigsPagedCallable;
+  }
+
+  public UnaryCallable listScanConfigsCallable() {
+    return listScanConfigsCallable;
+  }
+
+  public UnaryCallable updateScanConfigCallable() {
+    return updateScanConfigCallable;
+  }
+
+  public UnaryCallable startScanRunCallable() {
+    return startScanRunCallable;
+  }
+
+  public UnaryCallable getScanRunCallable() {
+    return getScanRunCallable;
+  }
+
+  public UnaryCallable listScanRunsPagedCallable() {
+    return listScanRunsPagedCallable;
+  }
+
+  public UnaryCallable listScanRunsCallable() {
+    return listScanRunsCallable;
+  }
+
+  public UnaryCallable stopScanRunCallable() {
+    return stopScanRunCallable;
+  }
+
+  public UnaryCallable
+      listCrawledUrlsPagedCallable() {
+    return listCrawledUrlsPagedCallable;
+  }
+
+  public UnaryCallable listCrawledUrlsCallable() {
+    return listCrawledUrlsCallable;
+  }
+
+  public UnaryCallable getFindingCallable() {
+    return getFindingCallable;
+  }
+
+  public UnaryCallable listFindingsPagedCallable() {
+    return listFindingsPagedCallable;
+  }
+
+  public UnaryCallable listFindingsCallable() {
+    return listFindingsCallable;
+  }
+
+  public UnaryCallable
+      listFindingTypeStatsCallable() {
+    return listFindingTypeStatsCallable;
+  }
+
+  @Override
+  public final void close() {
+    shutdown();
+  }
+
+  @Override
+  public void shutdown() {
+    backgroundResources.shutdown();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return backgroundResources.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return backgroundResources.isTerminated();
+  }
+
+  @Override
+  public void shutdownNow() {
+    backgroundResources.shutdownNow();
+  }
+
+  @Override
+  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
+    return backgroundResources.awaitTermination(duration, unit);
+  }
+}
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStub.java b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStub.java
new file mode 100644
index 000000000000..08a16023a596
--- /dev/null
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStub.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.websecurityscanner.v1alpha.stub;
+
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListCrawledUrlsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListFindingsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListScanConfigsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListScanRunsPagedResponse;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest;
+import com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest;
+import com.google.cloud.websecurityscanner.v1alpha.Finding;
+import com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest;
+import com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest;
+import com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ScanConfig;
+import com.google.cloud.websecurityscanner.v1alpha.ScanRun;
+import com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest;
+import com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest;
+import com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest;
+import com.google.protobuf.Empty;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * Base stub class for Web Security Scanner API.
+ *
+ * 
This class is for advanced usage and reflects the underlying API directly.
+ */
+@Generated("by gapic-generator")
+@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+public abstract class WebSecurityScannerStub implements BackgroundResource {
+
+  public UnaryCallable createScanConfigCallable() {
+    throw new UnsupportedOperationException("Not implemented: createScanConfigCallable()");
+  }
+
+  public UnaryCallable deleteScanConfigCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteScanConfigCallable()");
+  }
+
+  public UnaryCallable getScanConfigCallable() {
+    throw new UnsupportedOperationException("Not implemented: getScanConfigCallable()");
+  }
+
+  public UnaryCallable
+      listScanConfigsPagedCallable() {
+    throw new UnsupportedOperationException("Not implemented: listScanConfigsPagedCallable()");
+  }
+
+  public UnaryCallable listScanConfigsCallable() {
+    throw new UnsupportedOperationException("Not implemented: listScanConfigsCallable()");
+  }
+
+  public UnaryCallable updateScanConfigCallable() {
+    throw new UnsupportedOperationException("Not implemented: updateScanConfigCallable()");
+  }
+
+  public UnaryCallable startScanRunCallable() {
+    throw new UnsupportedOperationException("Not implemented: startScanRunCallable()");
+  }
+
+  public UnaryCallable getScanRunCallable() {
+    throw new UnsupportedOperationException("Not implemented: getScanRunCallable()");
+  }
+
+  public UnaryCallable listScanRunsPagedCallable() {
+    throw new UnsupportedOperationException("Not implemented: listScanRunsPagedCallable()");
+  }
+
+  public UnaryCallable listScanRunsCallable() {
+    throw new UnsupportedOperationException("Not implemented: listScanRunsCallable()");
+  }
+
+  public UnaryCallable stopScanRunCallable() {
+    throw new UnsupportedOperationException("Not implemented: stopScanRunCallable()");
+  }
+
+  public UnaryCallable
+      listCrawledUrlsPagedCallable() {
+    throw new UnsupportedOperationException("Not implemented: listCrawledUrlsPagedCallable()");
+  }
+
+  public UnaryCallable listCrawledUrlsCallable() {
+    throw new UnsupportedOperationException("Not implemented: listCrawledUrlsCallable()");
+  }
+
+  public UnaryCallable getFindingCallable() {
+    throw new UnsupportedOperationException("Not implemented: getFindingCallable()");
+  }
+
+  public UnaryCallable listFindingsPagedCallable() {
+    throw new UnsupportedOperationException("Not implemented: listFindingsPagedCallable()");
+  }
+
+  public UnaryCallable listFindingsCallable() {
+    throw new UnsupportedOperationException("Not implemented: listFindingsCallable()");
+  }
+
+  public UnaryCallable
+      listFindingTypeStatsCallable() {
+    throw new UnsupportedOperationException("Not implemented: listFindingTypeStatsCallable()");
+  }
+
+  @Override
+  public abstract void close();
+}
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStubSettings.java b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStubSettings.java
new file mode 100644
index 000000000000..0b25d16dd829
--- /dev/null
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStubSettings.java
@@ -0,0 +1,827 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.websecurityscanner.v1alpha.stub;
+
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListCrawledUrlsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListFindingsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListScanConfigsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListScanRunsPagedResponse;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.ApiFuture;
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.GaxProperties;
+import com.google.api.gax.core.GoogleCredentialsProvider;
+import com.google.api.gax.core.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.GaxGrpcProperties;
+import com.google.api.gax.grpc.GrpcTransportChannel;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.rpc.ApiCallContext;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.PageContext;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.PagedListDescriptor;
+import com.google.api.gax.rpc.PagedListResponseFactory;
+import com.google.api.gax.rpc.StatusCode;
+import com.google.api.gax.rpc.StubSettings;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.websecurityscanner.v1alpha.CrawledUrl;
+import com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest;
+import com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest;
+import com.google.cloud.websecurityscanner.v1alpha.Finding;
+import com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest;
+import com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest;
+import com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest;
+import com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse;
+import com.google.cloud.websecurityscanner.v1alpha.ScanConfig;
+import com.google.cloud.websecurityscanner.v1alpha.ScanRun;
+import com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest;
+import com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest;
+import com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.protobuf.Empty;
+import java.io.IOException;
+import java.util.List;
+import javax.annotation.Generated;
+import org.threeten.bp.Duration;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * Settings class to configure an instance of {@link WebSecurityScannerStub}.
+ *
+ * 
The default instance has everything set to sensible defaults:
+ *
+ * 
    
+ *   
  • The default service address (websecurityscanner.googleapis.com) and default port (443) are
+ *       used.
+ *   
  • Credentials are acquired automatically through Application Default Credentials.
+ *   
  • Retries are configured for idempotent methods but not for non-idempotent methods.
+ * 

+ *
+ * 
The builder of this class is recursive, so contained classes are themselves builders. When
+ * build() is called, the tree of builders is called to create the complete settings object. For
+ * example, to set the total timeout of createScanConfig to 30 seconds:
+ *
+ * 
+ * 
+ * WebSecurityScannerStubSettings.Builder webSecurityScannerSettingsBuilder =
+ *     WebSecurityScannerStubSettings.newBuilder();
+ * webSecurityScannerSettingsBuilder.createScanConfigSettings().getRetrySettings().toBuilder()
+ *     .setTotalTimeout(Duration.ofSeconds(30));
+ * WebSecurityScannerStubSettings webSecurityScannerSettings = webSecurityScannerSettingsBuilder.build();
+ * 
+ * 

+ */
+@Generated("by gapic-generator")
+@BetaApi
+public class WebSecurityScannerStubSettings extends StubSettings {
+  /** The default scopes of the service. */
+  private static final ImmutableList DEFAULT_SERVICE_SCOPES =
+      ImmutableList.builder().add("https://www.googleapis.com/auth/cloud-platform").build();
+
+  private final UnaryCallSettings createScanConfigSettings;
+  private final UnaryCallSettings deleteScanConfigSettings;
+  private final UnaryCallSettings getScanConfigSettings;
+  private final PagedCallSettings<
+          ListScanConfigsRequest, ListScanConfigsResponse, ListScanConfigsPagedResponse>
+      listScanConfigsSettings;
+  private final UnaryCallSettings updateScanConfigSettings;
+  private final UnaryCallSettings startScanRunSettings;
+  private final UnaryCallSettings getScanRunSettings;
+  private final PagedCallSettings<
+          ListScanRunsRequest, ListScanRunsResponse, ListScanRunsPagedResponse>
+      listScanRunsSettings;
+  private final UnaryCallSettings stopScanRunSettings;
+  private final PagedCallSettings<
+          ListCrawledUrlsRequest, ListCrawledUrlsResponse, ListCrawledUrlsPagedResponse>
+      listCrawledUrlsSettings;
+  private final UnaryCallSettings getFindingSettings;
+  private final PagedCallSettings<
+          ListFindingsRequest, ListFindingsResponse, ListFindingsPagedResponse>
+      listFindingsSettings;
+  private final UnaryCallSettings
+      listFindingTypeStatsSettings;
+
+  /** Returns the object with the settings used for calls to createScanConfig. */
+  public UnaryCallSettings createScanConfigSettings() {
+    return createScanConfigSettings;
+  }
+
+  /** Returns the object with the settings used for calls to deleteScanConfig. */
+  public UnaryCallSettings deleteScanConfigSettings() {
+    return deleteScanConfigSettings;
+  }
+
+  /** Returns the object with the settings used for calls to getScanConfig. */
+  public UnaryCallSettings getScanConfigSettings() {
+    return getScanConfigSettings;
+  }
+
+  /** Returns the object with the settings used for calls to listScanConfigs. */
+  public PagedCallSettings<
+          ListScanConfigsRequest, ListScanConfigsResponse, ListScanConfigsPagedResponse>
+      listScanConfigsSettings() {
+    return listScanConfigsSettings;
+  }
+
+  /** Returns the object with the settings used for calls to updateScanConfig. */
+  public UnaryCallSettings updateScanConfigSettings() {
+    return updateScanConfigSettings;
+  }
+
+  /** Returns the object with the settings used for calls to startScanRun. */
+  public UnaryCallSettings startScanRunSettings() {
+    return startScanRunSettings;
+  }
+
+  /** Returns the object with the settings used for calls to getScanRun. */
+  public UnaryCallSettings getScanRunSettings() {
+    return getScanRunSettings;
+  }
+
+  /** Returns the object with the settings used for calls to listScanRuns. */
+  public PagedCallSettings
+      listScanRunsSettings() {
+    return listScanRunsSettings;
+  }
+
+  /** Returns the object with the settings used for calls to stopScanRun. */
+  public UnaryCallSettings stopScanRunSettings() {
+    return stopScanRunSettings;
+  }
+
+  /** Returns the object with the settings used for calls to listCrawledUrls. */
+  public PagedCallSettings<
+          ListCrawledUrlsRequest, ListCrawledUrlsResponse, ListCrawledUrlsPagedResponse>
+      listCrawledUrlsSettings() {
+    return listCrawledUrlsSettings;
+  }
+
+  /** Returns the object with the settings used for calls to getFinding. */
+  public UnaryCallSettings getFindingSettings() {
+    return getFindingSettings;
+  }
+
+  /** Returns the object with the settings used for calls to listFindings. */
+  public PagedCallSettings
+      listFindingsSettings() {
+    return listFindingsSettings;
+  }
+
+  /** Returns the object with the settings used for calls to listFindingTypeStats. */
+  public UnaryCallSettings
+      listFindingTypeStatsSettings() {
+    return listFindingTypeStatsSettings;
+  }
+
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  public WebSecurityScannerStub createStub() throws IOException {
+    if (getTransportChannelProvider()
+        .getTransportName()
+        .equals(GrpcTransportChannel.getGrpcTransportName())) {
+      return GrpcWebSecurityScannerStub.create(this);
+    } else {
+      throw new UnsupportedOperationException(
+          "Transport not supported: " + getTransportChannelProvider().getTransportName());
+    }
+  }
+
+  /** Returns a builder for the default ExecutorProvider for this service. */
+  public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
+    return InstantiatingExecutorProvider.newBuilder();
+  }
+
+  /** Returns the default service endpoint. */
+  public static String getDefaultEndpoint() {
+    return "websecurityscanner.googleapis.com:443";
+  }
+
+  /** Returns the default service scopes. */
+  public static List getDefaultServiceScopes() {
+    return DEFAULT_SERVICE_SCOPES;
+  }
+
+  /** Returns a builder for the default credentials for this service. */
+  public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
+    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+  }
+
+  /** Returns a builder for the default ChannelProvider for this service. */
+  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
+    return InstantiatingGrpcChannelProvider.newBuilder();
+  }
+
+  public static TransportChannelProvider defaultTransportChannelProvider() {
+    return defaultGrpcTransportProviderBuilder().build();
+  }
+
+  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
+  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+    return ApiClientHeaderProvider.newBuilder()
+        .setGeneratedLibToken(
+            "gapic", GaxProperties.getLibraryVersion(WebSecurityScannerStubSettings.class))
+        .setTransportToken(
+            GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder() {
+    return Builder.createDefault();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder(ClientContext clientContext) {
+    return new Builder(clientContext);
+  }
+
+  /** Returns a builder containing all the values of this settings class. */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  protected WebSecurityScannerStubSettings(Builder settingsBuilder) throws IOException {
+    super(settingsBuilder);
+
+    createScanConfigSettings = settingsBuilder.createScanConfigSettings().build();
+    deleteScanConfigSettings = settingsBuilder.deleteScanConfigSettings().build();
+    getScanConfigSettings = settingsBuilder.getScanConfigSettings().build();
+    listScanConfigsSettings = settingsBuilder.listScanConfigsSettings().build();
+    updateScanConfigSettings = settingsBuilder.updateScanConfigSettings().build();
+    startScanRunSettings = settingsBuilder.startScanRunSettings().build();
+    getScanRunSettings = settingsBuilder.getScanRunSettings().build();
+    listScanRunsSettings = settingsBuilder.listScanRunsSettings().build();
+    stopScanRunSettings = settingsBuilder.stopScanRunSettings().build();
+    listCrawledUrlsSettings = settingsBuilder.listCrawledUrlsSettings().build();
+    getFindingSettings = settingsBuilder.getFindingSettings().build();
+    listFindingsSettings = settingsBuilder.listFindingsSettings().build();
+    listFindingTypeStatsSettings = settingsBuilder.listFindingTypeStatsSettings().build();
+  }
+
+  private static final PagedListDescriptor<
+          ListScanConfigsRequest, ListScanConfigsResponse, ScanConfig>
+      LIST_SCAN_CONFIGS_PAGE_STR_DESC =
+          new PagedListDescriptor() {
+            @Override
+            public String emptyToken() {
+              return "";
+            }
+
+            @Override
+            public ListScanConfigsRequest injectToken(
+                ListScanConfigsRequest payload, String token) {
+              return ListScanConfigsRequest.newBuilder(payload).setPageToken(token).build();
+            }
+
+            @Override
+            public ListScanConfigsRequest injectPageSize(
+                ListScanConfigsRequest payload, int pageSize) {
+              return ListScanConfigsRequest.newBuilder(payload).setPageSize(pageSize).build();
+            }
+
+            @Override
+            public Integer extractPageSize(ListScanConfigsRequest payload) {
+              return payload.getPageSize();
+            }
+
+            @Override
+            public String extractNextToken(ListScanConfigsResponse payload) {
+              return payload.getNextPageToken();
+            }
+
+            @Override
+            public Iterable extractResources(ListScanConfigsResponse payload) {
+              return payload.getScanConfigsList();
+            }
+          };
+
+  private static final PagedListDescriptor
+      LIST_SCAN_RUNS_PAGE_STR_DESC =
+          new PagedListDescriptor() {
+            @Override
+            public String emptyToken() {
+              return "";
+            }
+
+            @Override
+            public ListScanRunsRequest injectToken(ListScanRunsRequest payload, String token) {
+              return ListScanRunsRequest.newBuilder(payload).setPageToken(token).build();
+            }
+
+            @Override
+            public ListScanRunsRequest injectPageSize(ListScanRunsRequest payload, int pageSize) {
+              return ListScanRunsRequest.newBuilder(payload).setPageSize(pageSize).build();
+            }
+
+            @Override
+            public Integer extractPageSize(ListScanRunsRequest payload) {
+              return payload.getPageSize();
+            }
+
+            @Override
+            public String extractNextToken(ListScanRunsResponse payload) {
+              return payload.getNextPageToken();
+            }
+
+            @Override
+            public Iterable extractResources(ListScanRunsResponse payload) {
+              return payload.getScanRunsList();
+            }
+          };
+
+  private static final PagedListDescriptor<
+          ListCrawledUrlsRequest, ListCrawledUrlsResponse, CrawledUrl>
+      LIST_CRAWLED_URLS_PAGE_STR_DESC =
+          new PagedListDescriptor() {
+            @Override
+            public String emptyToken() {
+              return "";
+            }
+
+            @Override
+            public ListCrawledUrlsRequest injectToken(
+                ListCrawledUrlsRequest payload, String token) {
+              return ListCrawledUrlsRequest.newBuilder(payload).setPageToken(token).build();
+            }
+
+            @Override
+            public ListCrawledUrlsRequest injectPageSize(
+                ListCrawledUrlsRequest payload, int pageSize) {
+              return ListCrawledUrlsRequest.newBuilder(payload).setPageSize(pageSize).build();
+            }
+
+            @Override
+            public Integer extractPageSize(ListCrawledUrlsRequest payload) {
+              return payload.getPageSize();
+            }
+
+            @Override
+            public String extractNextToken(ListCrawledUrlsResponse payload) {
+              return payload.getNextPageToken();
+            }
+
+            @Override
+            public Iterable extractResources(ListCrawledUrlsResponse payload) {
+              return payload.getCrawledUrlsList();
+            }
+          };
+
+  private static final PagedListDescriptor
+      LIST_FINDINGS_PAGE_STR_DESC =
+          new PagedListDescriptor() {
+            @Override
+            public String emptyToken() {
+              return "";
+            }
+
+            @Override
+            public ListFindingsRequest injectToken(ListFindingsRequest payload, String token) {
+              return ListFindingsRequest.newBuilder(payload).setPageToken(token).build();
+            }
+
+            @Override
+            public ListFindingsRequest injectPageSize(ListFindingsRequest payload, int pageSize) {
+              return ListFindingsRequest.newBuilder(payload).setPageSize(pageSize).build();
+            }
+
+            @Override
+            public Integer extractPageSize(ListFindingsRequest payload) {
+              return payload.getPageSize();
+            }
+
+            @Override
+            public String extractNextToken(ListFindingsResponse payload) {
+              return payload.getNextPageToken();
+            }
+
+            @Override
+            public Iterable extractResources(ListFindingsResponse payload) {
+              return payload.getFindingsList();
+            }
+          };
+
+  private static final PagedListResponseFactory<
+          ListScanConfigsRequest, ListScanConfigsResponse, ListScanConfigsPagedResponse>
+      LIST_SCAN_CONFIGS_PAGE_STR_FACT =
+          new PagedListResponseFactory<
+              ListScanConfigsRequest, ListScanConfigsResponse, ListScanConfigsPagedResponse>() {
+            @Override
+            public ApiFuture getFuturePagedResponse(
+                UnaryCallable callable,
+                ListScanConfigsRequest request,
+                ApiCallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_SCAN_CONFIGS_PAGE_STR_DESC, request, context);
+              return ListScanConfigsPagedResponse.createAsync(pageContext, futureResponse);
+            }
+          };
+
+  private static final PagedListResponseFactory<
+          ListScanRunsRequest, ListScanRunsResponse, ListScanRunsPagedResponse>
+      LIST_SCAN_RUNS_PAGE_STR_FACT =
+          new PagedListResponseFactory<
+              ListScanRunsRequest, ListScanRunsResponse, ListScanRunsPagedResponse>() {
+            @Override
+            public ApiFuture getFuturePagedResponse(
+                UnaryCallable callable,
+                ListScanRunsRequest request,
+                ApiCallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_SCAN_RUNS_PAGE_STR_DESC, request, context);
+              return ListScanRunsPagedResponse.createAsync(pageContext, futureResponse);
+            }
+          };
+
+  private static final PagedListResponseFactory<
+          ListCrawledUrlsRequest, ListCrawledUrlsResponse, ListCrawledUrlsPagedResponse>
+      LIST_CRAWLED_URLS_PAGE_STR_FACT =
+          new PagedListResponseFactory<
+              ListCrawledUrlsRequest, ListCrawledUrlsResponse, ListCrawledUrlsPagedResponse>() {
+            @Override
+            public ApiFuture getFuturePagedResponse(
+                UnaryCallable callable,
+                ListCrawledUrlsRequest request,
+                ApiCallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_CRAWLED_URLS_PAGE_STR_DESC, request, context);
+              return ListCrawledUrlsPagedResponse.createAsync(pageContext, futureResponse);
+            }
+          };
+
+  private static final PagedListResponseFactory<
+          ListFindingsRequest, ListFindingsResponse, ListFindingsPagedResponse>
+      LIST_FINDINGS_PAGE_STR_FACT =
+          new PagedListResponseFactory<
+              ListFindingsRequest, ListFindingsResponse, ListFindingsPagedResponse>() {
+            @Override
+            public ApiFuture getFuturePagedResponse(
+                UnaryCallable callable,
+                ListFindingsRequest request,
+                ApiCallContext context,
+                ApiFuture futureResponse) {
+              PageContext pageContext =
+                  PageContext.create(callable, LIST_FINDINGS_PAGE_STR_DESC, request, context);
+              return ListFindingsPagedResponse.createAsync(pageContext, futureResponse);
+            }
+          };
+
+  /** Builder for WebSecurityScannerStubSettings. */
+  public static class Builder
+      extends StubSettings.Builder {
+    private final ImmutableList> unaryMethodSettingsBuilders;
+
+    private final UnaryCallSettings.Builder
+        createScanConfigSettings;
+    private final UnaryCallSettings.Builder
+        deleteScanConfigSettings;
+    private final UnaryCallSettings.Builder getScanConfigSettings;
+    private final PagedCallSettings.Builder<
+            ListScanConfigsRequest, ListScanConfigsResponse, ListScanConfigsPagedResponse>
+        listScanConfigsSettings;
+    private final UnaryCallSettings.Builder
+        updateScanConfigSettings;
+    private final UnaryCallSettings.Builder startScanRunSettings;
+    private final UnaryCallSettings.Builder getScanRunSettings;
+    private final PagedCallSettings.Builder<
+            ListScanRunsRequest, ListScanRunsResponse, ListScanRunsPagedResponse>
+        listScanRunsSettings;
+    private final UnaryCallSettings.Builder stopScanRunSettings;
+    private final PagedCallSettings.Builder<
+            ListCrawledUrlsRequest, ListCrawledUrlsResponse, ListCrawledUrlsPagedResponse>
+        listCrawledUrlsSettings;
+    private final UnaryCallSettings.Builder getFindingSettings;
+    private final PagedCallSettings.Builder<
+            ListFindingsRequest, ListFindingsResponse, ListFindingsPagedResponse>
+        listFindingsSettings;
+    private final UnaryCallSettings.Builder<
+            ListFindingTypeStatsRequest, ListFindingTypeStatsResponse>
+        listFindingTypeStatsSettings;
+
+    private static final ImmutableMap>
+        RETRYABLE_CODE_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder> definitions =
+          ImmutableMap.builder();
+      definitions.put(
+          "idempotent",
+          ImmutableSet.copyOf(
+              Lists.newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList()));
+      RETRYABLE_CODE_DEFINITIONS = definitions.build();
+    }
+
+    private static final ImmutableMap RETRY_PARAM_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder definitions = ImmutableMap.builder();
+      RetrySettings settings = null;
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(20000L))
+              .setTotalTimeout(Duration.ofMillis(600000L))
+              .build();
+      definitions.put("default", settings);
+      RETRY_PARAM_DEFINITIONS = definitions.build();
+    }
+
+    protected Builder() {
+      this((ClientContext) null);
+    }
+
+    protected Builder(ClientContext clientContext) {
+      super(clientContext);
+
+      createScanConfigSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      deleteScanConfigSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      getScanConfigSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      listScanConfigsSettings = PagedCallSettings.newBuilder(LIST_SCAN_CONFIGS_PAGE_STR_FACT);
+
+      updateScanConfigSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      startScanRunSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      getScanRunSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      listScanRunsSettings = PagedCallSettings.newBuilder(LIST_SCAN_RUNS_PAGE_STR_FACT);
+
+      stopScanRunSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      listCrawledUrlsSettings = PagedCallSettings.newBuilder(LIST_CRAWLED_URLS_PAGE_STR_FACT);
+
+      getFindingSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      listFindingsSettings = PagedCallSettings.newBuilder(LIST_FINDINGS_PAGE_STR_FACT);
+
+      listFindingTypeStatsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      unaryMethodSettingsBuilders =
+          ImmutableList.>of(
+              createScanConfigSettings,
+              deleteScanConfigSettings,
+              getScanConfigSettings,
+              listScanConfigsSettings,
+              updateScanConfigSettings,
+              startScanRunSettings,
+              getScanRunSettings,
+              listScanRunsSettings,
+              stopScanRunSettings,
+              listCrawledUrlsSettings,
+              getFindingSettings,
+              listFindingsSettings,
+              listFindingTypeStatsSettings);
+
+      initDefaults(this);
+    }
+
+    private static Builder createDefault() {
+      Builder builder = new Builder((ClientContext) null);
+      builder.setTransportChannelProvider(defaultTransportChannelProvider());
+      builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
+      builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
+      builder.setEndpoint(getDefaultEndpoint());
+      return initDefaults(builder);
+    }
+
+    private static Builder initDefaults(Builder builder) {
+
+      builder
+          .createScanConfigSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .deleteScanConfigSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .getScanConfigSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .listScanConfigsSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .updateScanConfigSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .startScanRunSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .getScanRunSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .listScanRunsSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .stopScanRunSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .listCrawledUrlsSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .getFindingSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .listFindingsSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .listFindingTypeStatsSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      return builder;
+    }
+
+    protected Builder(WebSecurityScannerStubSettings settings) {
+      super(settings);
+
+      createScanConfigSettings = settings.createScanConfigSettings.toBuilder();
+      deleteScanConfigSettings = settings.deleteScanConfigSettings.toBuilder();
+      getScanConfigSettings = settings.getScanConfigSettings.toBuilder();
+      listScanConfigsSettings = settings.listScanConfigsSettings.toBuilder();
+      updateScanConfigSettings = settings.updateScanConfigSettings.toBuilder();
+      startScanRunSettings = settings.startScanRunSettings.toBuilder();
+      getScanRunSettings = settings.getScanRunSettings.toBuilder();
+      listScanRunsSettings = settings.listScanRunsSettings.toBuilder();
+      stopScanRunSettings = settings.stopScanRunSettings.toBuilder();
+      listCrawledUrlsSettings = settings.listCrawledUrlsSettings.toBuilder();
+      getFindingSettings = settings.getFindingSettings.toBuilder();
+      listFindingsSettings = settings.listFindingsSettings.toBuilder();
+      listFindingTypeStatsSettings = settings.listFindingTypeStatsSettings.toBuilder();
+
+      unaryMethodSettingsBuilders =
+          ImmutableList.>of(
+              createScanConfigSettings,
+              deleteScanConfigSettings,
+              getScanConfigSettings,
+              listScanConfigsSettings,
+              updateScanConfigSettings,
+              startScanRunSettings,
+              getScanRunSettings,
+              listScanRunsSettings,
+              stopScanRunSettings,
+              listCrawledUrlsSettings,
+              getFindingSettings,
+              listFindingsSettings,
+              listFindingTypeStatsSettings);
+    }
+
+    // NEXT_MAJOR_VER: remove 'throws Exception'
+    /**
+     * Applies the given settings updater function to all of the unary API methods in this service.
+     *
+     * 
Note: This method does not support applying settings to streaming methods.
+     */
+    public Builder applyToAllUnaryMethods(
+        ApiFunction, Void> settingsUpdater) throws Exception {
+      super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
+      return this;
+    }
+
+    public ImmutableList> unaryMethodSettingsBuilders() {
+      return unaryMethodSettingsBuilders;
+    }
+
+    /** Returns the builder for the settings used for calls to createScanConfig. */
+    public UnaryCallSettings.Builder
+        createScanConfigSettings() {
+      return createScanConfigSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to deleteScanConfig. */
+    public UnaryCallSettings.Builder deleteScanConfigSettings() {
+      return deleteScanConfigSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to getScanConfig. */
+    public UnaryCallSettings.Builder getScanConfigSettings() {
+      return getScanConfigSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to listScanConfigs. */
+    public PagedCallSettings.Builder<
+            ListScanConfigsRequest, ListScanConfigsResponse, ListScanConfigsPagedResponse>
+        listScanConfigsSettings() {
+      return listScanConfigsSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to updateScanConfig. */
+    public UnaryCallSettings.Builder
+        updateScanConfigSettings() {
+      return updateScanConfigSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to startScanRun. */
+    public UnaryCallSettings.Builder startScanRunSettings() {
+      return startScanRunSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to getScanRun. */
+    public UnaryCallSettings.Builder getScanRunSettings() {
+      return getScanRunSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to listScanRuns. */
+    public PagedCallSettings.Builder<
+            ListScanRunsRequest, ListScanRunsResponse, ListScanRunsPagedResponse>
+        listScanRunsSettings() {
+      return listScanRunsSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to stopScanRun. */
+    public UnaryCallSettings.Builder stopScanRunSettings() {
+      return stopScanRunSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to listCrawledUrls. */
+    public PagedCallSettings.Builder<
+            ListCrawledUrlsRequest, ListCrawledUrlsResponse, ListCrawledUrlsPagedResponse>
+        listCrawledUrlsSettings() {
+      return listCrawledUrlsSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to getFinding. */
+    public UnaryCallSettings.Builder getFindingSettings() {
+      return getFindingSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to listFindings. */
+    public PagedCallSettings.Builder<
+            ListFindingsRequest, ListFindingsResponse, ListFindingsPagedResponse>
+        listFindingsSettings() {
+      return listFindingsSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to listFindingTypeStats. */
+    public UnaryCallSettings.Builder
+        listFindingTypeStatsSettings() {
+      return listFindingTypeStatsSettings;
+    }
+
+    @Override
+    public WebSecurityScannerStubSettings build() throws IOException {
+      return new WebSecurityScannerStubSettings(this);
+    }
+  }
+}
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScanner.java b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScanner.java
new file mode 100644
index 000000000000..88323eb229b1
--- /dev/null
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScanner.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.websecurityscanner.v1alpha;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.grpc.testing.MockGrpcService;
+import com.google.protobuf.GeneratedMessageV3;
+import io.grpc.ServerServiceDefinition;
+import java.util.List;
+
+@javax.annotation.Generated("by GAPIC")
+@BetaApi
+public class MockWebSecurityScanner implements MockGrpcService {
+  private final MockWebSecurityScannerImpl serviceImpl;
+
+  public MockWebSecurityScanner() {
+    serviceImpl = new MockWebSecurityScannerImpl();
+  }
+
+  @Override
+  public List getRequests() {
+    return serviceImpl.getRequests();
+  }
+
+  @Override
+  public void addResponse(GeneratedMessageV3 response) {
+    serviceImpl.addResponse(response);
+  }
+
+  @Override
+  public void addException(Exception exception) {
+    serviceImpl.addException(exception);
+  }
+
+  @Override
+  public ServerServiceDefinition getServiceDefinition() {
+    return serviceImpl.bindService();
+  }
+
+  @Override
+  public void reset() {
+    serviceImpl.reset();
+  }
+}
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScannerImpl.java b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScannerImpl.java
new file mode 100644
index 000000000000..e58371ef43dc
--- /dev/null
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScannerImpl.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.websecurityscanner.v1alpha;
+
+import com.google.api.core.BetaApi;
+import com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerGrpc.WebSecurityScannerImplBase;
+import com.google.protobuf.Empty;
+import com.google.protobuf.GeneratedMessageV3;
+import io.grpc.stub.StreamObserver;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+
+@javax.annotation.Generated("by GAPIC")
+@BetaApi
+public class MockWebSecurityScannerImpl extends WebSecurityScannerImplBase {
+  private ArrayList requests;
+  private Queue responses;
+
+  public MockWebSecurityScannerImpl() {
+    requests = new ArrayList<>();
+    responses = new LinkedList<>();
+  }
+
+  public List getRequests() {
+    return requests;
+  }
+
+  public void addResponse(GeneratedMessageV3 response) {
+    responses.add(response);
+  }
+
+  public void setResponses(List responses) {
+    this.responses = new LinkedList(responses);
+  }
+
+  public void addException(Exception exception) {
+    responses.add(exception);
+  }
+
+  public void reset() {
+    requests = new ArrayList<>();
+    responses = new LinkedList<>();
+  }
+
+  @Override
+  public void createScanConfig(
+      CreateScanConfigRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ScanConfig) {
+      requests.add(request);
+      responseObserver.onNext((ScanConfig) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void deleteScanConfig(
+      DeleteScanConfigRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof Empty) {
+      requests.add(request);
+      responseObserver.onNext((Empty) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void getScanConfig(
+      GetScanConfigRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ScanConfig) {
+      requests.add(request);
+      responseObserver.onNext((ScanConfig) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void listScanConfigs(
+      ListScanConfigsRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ListScanConfigsResponse) {
+      requests.add(request);
+      responseObserver.onNext((ListScanConfigsResponse) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void updateScanConfig(
+      UpdateScanConfigRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ScanConfig) {
+      requests.add(request);
+      responseObserver.onNext((ScanConfig) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void startScanRun(StartScanRunRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ScanRun) {
+      requests.add(request);
+      responseObserver.onNext((ScanRun) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void getScanRun(GetScanRunRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ScanRun) {
+      requests.add(request);
+      responseObserver.onNext((ScanRun) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void listScanRuns(
+      ListScanRunsRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ListScanRunsResponse) {
+      requests.add(request);
+      responseObserver.onNext((ListScanRunsResponse) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void stopScanRun(StopScanRunRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ScanRun) {
+      requests.add(request);
+      responseObserver.onNext((ScanRun) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void listCrawledUrls(
+      ListCrawledUrlsRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ListCrawledUrlsResponse) {
+      requests.add(request);
+      responseObserver.onNext((ListCrawledUrlsResponse) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void getFinding(GetFindingRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof Finding) {
+      requests.add(request);
+      responseObserver.onNext((Finding) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void listFindings(
+      ListFindingsRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ListFindingsResponse) {
+      requests.add(request);
+      responseObserver.onNext((ListFindingsResponse) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void listFindingTypeStats(
+      ListFindingTypeStatsRequest request,
+      StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ListFindingTypeStatsResponse) {
+      requests.add(request);
+      responseObserver.onNext((ListFindingTypeStatsResponse) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+}
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java
new file mode 100644
index 000000000000..1cf61bfa3e6b
--- /dev/null
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java
@@ -0,0 +1,720 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.websecurityscanner.v1alpha;
+
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListCrawledUrlsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListFindingsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListScanConfigsPagedResponse;
+import static com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClient.ListScanRunsPagedResponse;
+
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.grpc.GaxGrpcProperties;
+import com.google.api.gax.grpc.testing.LocalChannelProvider;
+import com.google.api.gax.grpc.testing.MockGrpcService;
+import com.google.api.gax.grpc.testing.MockServiceHelper;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.InvalidArgumentException;
+import com.google.common.collect.Lists;
+import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
+import com.google.protobuf.GeneratedMessageV3;
+import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+@javax.annotation.Generated("by GAPIC")
+public class WebSecurityScannerClientTest {
+  private static MockWebSecurityScanner mockWebSecurityScanner;
+  private static MockServiceHelper serviceHelper;
+  private WebSecurityScannerClient client;
+  private LocalChannelProvider channelProvider;
+
+  @BeforeClass
+  public static void startStaticServer() {
+    mockWebSecurityScanner = new MockWebSecurityScanner();
+    serviceHelper =
+        new MockServiceHelper(
+            "in-process-1", Arrays.asList(mockWebSecurityScanner));
+    serviceHelper.start();
+  }
+
+  @AfterClass
+  public static void stopServer() {
+    serviceHelper.stop();
+  }
+
+  @Before
+  public void setUp() throws IOException {
+    serviceHelper.reset();
+    channelProvider = serviceHelper.createChannelProvider();
+    WebSecurityScannerSettings settings =
+        WebSecurityScannerSettings.newBuilder()
+            .setTransportChannelProvider(channelProvider)
+            .setCredentialsProvider(NoCredentialsProvider.create())
+            .build();
+    client = WebSecurityScannerClient.create(settings);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    client.close();
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void createScanConfigTest() {
+    String name = "name3373707";
+    String displayName = "displayName1615086568";
+    int maxQps = 844445913;
+    ScanConfig expectedResponse =
+        ScanConfig.newBuilder().setName(name).setDisplayName(displayName).setMaxQps(maxQps).build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+    ScanConfig scanConfig = ScanConfig.newBuilder().build();
+
+    ScanConfig actualResponse = client.createScanConfig(formattedParent, scanConfig);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    CreateScanConfigRequest actualRequest = (CreateScanConfigRequest) actualRequests.get(0);
+
+    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertEquals(scanConfig, actualRequest.getScanConfig());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void createScanConfigExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+      ScanConfig scanConfig = ScanConfig.newBuilder().build();
+
+      client.createScanConfig(formattedParent, scanConfig);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteScanConfigTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    String formattedName =
+        WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+
+    client.deleteScanConfig(formattedName);
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteScanConfigRequest actualRequest = (DeleteScanConfigRequest) actualRequests.get(0);
+
+    Assert.assertEquals(formattedName, actualRequest.getName());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteScanConfigExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      String formattedName =
+          WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+
+      client.deleteScanConfig(formattedName);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getScanConfigTest() {
+    String name2 = "name2-1052831874";
+    String displayName = "displayName1615086568";
+    int maxQps = 844445913;
+    ScanConfig expectedResponse =
+        ScanConfig.newBuilder()
+            .setName(name2)
+            .setDisplayName(displayName)
+            .setMaxQps(maxQps)
+            .build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    String formattedName =
+        WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+
+    ScanConfig actualResponse = client.getScanConfig(formattedName);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    GetScanConfigRequest actualRequest = (GetScanConfigRequest) actualRequests.get(0);
+
+    Assert.assertEquals(formattedName, actualRequest.getName());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getScanConfigExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      String formattedName =
+          WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+
+      client.getScanConfig(formattedName);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listScanConfigsTest() {
+    String nextPageToken = "";
+    ScanConfig scanConfigsElement = ScanConfig.newBuilder().build();
+    List scanConfigs = Arrays.asList(scanConfigsElement);
+    ListScanConfigsResponse expectedResponse =
+        ListScanConfigsResponse.newBuilder()
+            .setNextPageToken(nextPageToken)
+            .addAllScanConfigs(scanConfigs)
+            .build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+
+    ListScanConfigsPagedResponse pagedListResponse = client.listScanConfigs(formattedParent);
+
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getScanConfigsList().get(0), resources.get(0));
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListScanConfigsRequest actualRequest = (ListScanConfigsRequest) actualRequests.get(0);
+
+    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listScanConfigsExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+
+      client.listScanConfigs(formattedParent);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateScanConfigTest() {
+    String name = "name3373707";
+    String displayName = "displayName1615086568";
+    int maxQps = 844445913;
+    ScanConfig expectedResponse =
+        ScanConfig.newBuilder().setName(name).setDisplayName(displayName).setMaxQps(maxQps).build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    ScanConfig scanConfig = ScanConfig.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
+
+    ScanConfig actualResponse = client.updateScanConfig(scanConfig, updateMask);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    UpdateScanConfigRequest actualRequest = (UpdateScanConfigRequest) actualRequests.get(0);
+
+    Assert.assertEquals(scanConfig, actualRequest.getScanConfig());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateScanConfigExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      ScanConfig scanConfig = ScanConfig.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
+
+      client.updateScanConfig(scanConfig, updateMask);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void startScanRunTest() {
+    String name2 = "name2-1052831874";
+    long urlsCrawledCount = 1749797253L;
+    long urlsTestedCount = 1498664068L;
+    boolean hasVulnerabilities = false;
+    int progressPercent = 2137894861;
+    ScanRun expectedResponse =
+        ScanRun.newBuilder()
+            .setName(name2)
+            .setUrlsCrawledCount(urlsCrawledCount)
+            .setUrlsTestedCount(urlsTestedCount)
+            .setHasVulnerabilities(hasVulnerabilities)
+            .setProgressPercent(progressPercent)
+            .build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    String formattedName =
+        WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+
+    ScanRun actualResponse = client.startScanRun(formattedName);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    StartScanRunRequest actualRequest = (StartScanRunRequest) actualRequests.get(0);
+
+    Assert.assertEquals(formattedName, actualRequest.getName());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void startScanRunExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      String formattedName =
+          WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+
+      client.startScanRun(formattedName);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getScanRunTest() {
+    String name2 = "name2-1052831874";
+    long urlsCrawledCount = 1749797253L;
+    long urlsTestedCount = 1498664068L;
+    boolean hasVulnerabilities = false;
+    int progressPercent = 2137894861;
+    ScanRun expectedResponse =
+        ScanRun.newBuilder()
+            .setName(name2)
+            .setUrlsCrawledCount(urlsCrawledCount)
+            .setUrlsTestedCount(urlsTestedCount)
+            .setHasVulnerabilities(hasVulnerabilities)
+            .setProgressPercent(progressPercent)
+            .build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    String formattedName =
+        WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+
+    ScanRun actualResponse = client.getScanRun(formattedName);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    GetScanRunRequest actualRequest = (GetScanRunRequest) actualRequests.get(0);
+
+    Assert.assertEquals(formattedName, actualRequest.getName());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getScanRunExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      String formattedName =
+          WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+
+      client.getScanRun(formattedName);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listScanRunsTest() {
+    String nextPageToken = "";
+    ScanRun scanRunsElement = ScanRun.newBuilder().build();
+    List scanRuns = Arrays.asList(scanRunsElement);
+    ListScanRunsResponse expectedResponse =
+        ListScanRunsResponse.newBuilder()
+            .setNextPageToken(nextPageToken)
+            .addAllScanRuns(scanRuns)
+            .build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    String formattedParent =
+        WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+
+    ListScanRunsPagedResponse pagedListResponse = client.listScanRuns(formattedParent);
+
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getScanRunsList().get(0), resources.get(0));
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListScanRunsRequest actualRequest = (ListScanRunsRequest) actualRequests.get(0);
+
+    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listScanRunsExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      String formattedParent =
+          WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+
+      client.listScanRuns(formattedParent);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void stopScanRunTest() {
+    String name2 = "name2-1052831874";
+    long urlsCrawledCount = 1749797253L;
+    long urlsTestedCount = 1498664068L;
+    boolean hasVulnerabilities = false;
+    int progressPercent = 2137894861;
+    ScanRun expectedResponse =
+        ScanRun.newBuilder()
+            .setName(name2)
+            .setUrlsCrawledCount(urlsCrawledCount)
+            .setUrlsTestedCount(urlsTestedCount)
+            .setHasVulnerabilities(hasVulnerabilities)
+            .setProgressPercent(progressPercent)
+            .build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    String formattedName =
+        WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+
+    ScanRun actualResponse = client.stopScanRun(formattedName);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    StopScanRunRequest actualRequest = (StopScanRunRequest) actualRequests.get(0);
+
+    Assert.assertEquals(formattedName, actualRequest.getName());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void stopScanRunExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      String formattedName =
+          WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+
+      client.stopScanRun(formattedName);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listCrawledUrlsTest() {
+    String nextPageToken = "";
+    CrawledUrl crawledUrlsElement = CrawledUrl.newBuilder().build();
+    List crawledUrls = Arrays.asList(crawledUrlsElement);
+    ListCrawledUrlsResponse expectedResponse =
+        ListCrawledUrlsResponse.newBuilder()
+            .setNextPageToken(nextPageToken)
+            .addAllCrawledUrls(crawledUrls)
+            .build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    String formattedParent =
+        WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+
+    ListCrawledUrlsPagedResponse pagedListResponse = client.listCrawledUrls(formattedParent);
+
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getCrawledUrlsList().get(0), resources.get(0));
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListCrawledUrlsRequest actualRequest = (ListCrawledUrlsRequest) actualRequests.get(0);
+
+    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listCrawledUrlsExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      String formattedParent =
+          WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+
+      client.listCrawledUrls(formattedParent);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getFindingTest() {
+    String name2 = "name2-1052831874";
+    String httpMethod = "httpMethod820747384";
+    String fuzzedUrl = "fuzzedUrl-2120677666";
+    String body = "body3029410";
+    String description = "description-1724546052";
+    String reproductionUrl = "reproductionUrl-244934180";
+    String frameUrl = "frameUrl545464221";
+    String finalUrl = "finalUrl355601190";
+    String trackingId = "trackingId1878901667";
+    Finding expectedResponse =
+        Finding.newBuilder()
+            .setName(name2)
+            .setHttpMethod(httpMethod)
+            .setFuzzedUrl(fuzzedUrl)
+            .setBody(body)
+            .setDescription(description)
+            .setReproductionUrl(reproductionUrl)
+            .setFrameUrl(frameUrl)
+            .setFinalUrl(finalUrl)
+            .setTrackingId(trackingId)
+            .build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    String formattedName =
+        WebSecurityScannerClient.formatFindingName(
+            "[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
+
+    Finding actualResponse = client.getFinding(formattedName);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    GetFindingRequest actualRequest = (GetFindingRequest) actualRequests.get(0);
+
+    Assert.assertEquals(formattedName, actualRequest.getName());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void getFindingExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      String formattedName =
+          WebSecurityScannerClient.formatFindingName(
+              "[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
+
+      client.getFinding(formattedName);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listFindingsTest() {
+    String nextPageToken = "";
+    Finding findingsElement = Finding.newBuilder().build();
+    List findings = Arrays.asList(findingsElement);
+    ListFindingsResponse expectedResponse =
+        ListFindingsResponse.newBuilder()
+            .setNextPageToken(nextPageToken)
+            .addAllFindings(findings)
+            .build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    String formattedParent =
+        WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+    String filter = "filter-1274492040";
+
+    ListFindingsPagedResponse pagedListResponse = client.listFindings(formattedParent, filter);
+
+    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
+    Assert.assertEquals(1, resources.size());
+    Assert.assertEquals(expectedResponse.getFindingsList().get(0), resources.get(0));
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListFindingsRequest actualRequest = (ListFindingsRequest) actualRequests.get(0);
+
+    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertEquals(filter, actualRequest.getFilter());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listFindingsExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      String formattedParent =
+          WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+      String filter = "filter-1274492040";
+
+      client.listFindings(formattedParent, filter);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listFindingTypeStatsTest() {
+    ListFindingTypeStatsResponse expectedResponse =
+        ListFindingTypeStatsResponse.newBuilder().build();
+    mockWebSecurityScanner.addResponse(expectedResponse);
+
+    String formattedParent =
+        WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+
+    ListFindingTypeStatsResponse actualResponse = client.listFindingTypeStats(formattedParent);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockWebSecurityScanner.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListFindingTypeStatsRequest actualRequest = (ListFindingTypeStatsRequest) actualRequests.get(0);
+
+    Assert.assertEquals(formattedParent, actualRequest.getParent());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listFindingTypeStatsExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockWebSecurityScanner.addException(exception);
+
+    try {
+      String formattedParent =
+          WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+
+      client.listFindingTypeStats(formattedParent);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+}
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 4c4d2edd4eaa..65fef5322496 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -428,6 +428,7 @@
     google-cloud-dns
     google-cloud-errorreporting
     google-cloud-firestore
+    google-cloud-iot
     google-cloud-language
     google-cloud-logging
     google-cloud-monitoring
@@ -444,6 +445,7 @@
     google-cloud-translate
     google-cloud-vision
     google-cloud-video-intelligence
+    google-cloud-websecurityscanner
   
   
     
diff --git a/versions.txt b/versions.txt
index 18d5f232c70c..6108422da5ee 100644
--- a/versions.txt
+++ b/versions.txt
@@ -16,7 +16,6 @@ grpc-google-cloud-dataproc-v1:0.12.0:0.12.1-SNAPSHOT
 grpc-google-cloud-dialogflow-v2:0.12.0:0.12.1-SNAPSHOT
 grpc-google-cloud-dialogflow-v2beta1:0.12.0:0.12.1-SNAPSHOT
 grpc-google-cloud-dlp-v2:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-dlp-v2beta1:0.12.0:0.12.1-SNAPSHOT
 grpc-google-cloud-error-reporting-v1beta1:0.12.0:0.12.1-SNAPSHOT
 grpc-google-cloud-firestore-v1beta1:0.12.0:0.12.1-SNAPSHOT
 grpc-google-cloud-language-v1:1.11.0:1.11.1-SNAPSHOT
@@ -41,7 +40,7 @@ grpc-google-cloud-video-intelligence-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
 grpc-google-cloud-vision-v1:1.11.0:1.11.1-SNAPSHOT
 grpc-google-cloud-vision-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
 grpc-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT
-grpc-google-cloud-cloudiot-v1:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-iot-v1:0.12.0:0.12.1-SNAPSHOT
 grpc-google-cloud-redis-v1beta1:0.12.0:0.12.1-SNAPSHOT
 grpc-google-cloud-websecurityscanner-v1alpha:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-bigquerydatatransfer-v1:0.12.0:0.12.1-SNAPSHOT
@@ -53,7 +52,6 @@ proto-google-cloud-datastore-v1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-dialogflow-v2:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-dialogflow-v2beta1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-dlp-v2:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-dlp-v2beta1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-error-reporting-v1beta1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-firestore-v1beta1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-language-v1:1.11.0:1.11.1-SNAPSHOT
@@ -78,7 +76,7 @@ proto-google-cloud-video-intelligence-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-vision-v1:1.11.0:1.11.1-SNAPSHOT
 proto-google-cloud-vision-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT
-proto-google-cloud-cloudiot-v1:0.12.0:0.12.1-SNAPSHOT
+proto-google-cloud-iot-v1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-redis-v1beta1:0.12.0:0.12.1-SNAPSHOT
 proto-google-cloud-websecurityscanner-v1alpha:0.12.0:0.12.1-SNAPSHOT
 
@@ -134,3 +132,5 @@ google-cloud-translate:1.29.0:1.29.1-SNAPSHOT
 google-cloud-util:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
 google-cloud-video-intelligence:0.47.0-beta:0.47.1-beta-SNAPSHOT
 google-cloud-vision:1.29.0:1.29.1-SNAPSHOT
+google-cloud-iot:0.47.0-beta:0.47.1-beta-SNAPSHOT
+google-cloud-websecurityscanner:0.47.0-alpha:0.47.1-alpha-SNAPSHOT

From b63843538c4b5796bdba925efef562b4d63f5843 Mon Sep 17 00:00:00 2001
From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com>
Date: Fri, 18 May 2018 10:01:00 -0700
Subject: [PATCH 40/65] Bump version to 0.48.0 release (#3288)

---
 README.md                                     |   8 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-bigtable-v2/pom.xml     |   4 +-
 .../grpc-google-cloud-container-v1/pom.xml    |   4 +-
 .../grpc-google-cloud-dataproc-v1/pom.xml     |   4 +-
 .../grpc-google-cloud-dialogflow-v2/pom.xml   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-dlp-v2/pom.xml          |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-iot-v1/pom.xml          |   4 +-
 .../grpc-google-cloud-language-v1/pom.xml     |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-logging-v2/pom.xml      |   4 +-
 .../grpc-google-cloud-monitoring-v3/pom.xml   |   4 +-
 .../grpc-google-cloud-os-login-v1/pom.xml     |   4 +-
 .../grpc-google-cloud-pubsub-v1/pom.xml       |   4 +-
 .../grpc-google-cloud-redis-v1beta1/pom.xml   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-spanner-v1/pom.xml      |   4 +-
 .../grpc-google-cloud-speech-v1/pom.xml       |   4 +-
 .../grpc-google-cloud-speech-v1beta1/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-trace-v1/pom.xml        |   4 +-
 .../grpc-google-cloud-trace-v2/pom.xml        |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-vision-v1/pom.xml       |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 google-api-grpc/pom.xml                       | 144 ++++-----
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-bigtable-v2/pom.xml    |   4 +-
 .../proto-google-cloud-container-v1/pom.xml   |   4 +-
 .../proto-google-cloud-dataproc-v1/pom.xml    |   4 +-
 .../proto-google-cloud-datastore-v1/pom.xml   |   4 +-
 .../proto-google-cloud-dialogflow-v2/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-dlp-v2/pom.xml         |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-iot-v1/pom.xml         |   4 +-
 .../proto-google-cloud-language-v1/pom.xml    |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-logging-v2/pom.xml     |   4 +-
 .../proto-google-cloud-monitoring-v3/pom.xml  |   4 +-
 .../proto-google-cloud-os-login-v1/pom.xml    |   4 +-
 .../proto-google-cloud-pubsub-v1/pom.xml      |   4 +-
 .../proto-google-cloud-redis-v1beta1/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-spanner-v1/pom.xml     |   4 +-
 .../proto-google-cloud-speech-v1/pom.xml      |   4 +-
 .../proto-google-cloud-speech-v1beta1/pom.xml |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-trace-v1/pom.xml       |   4 +-
 .../proto-google-cloud-trace-v2/pom.xml       |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-vision-v1/pom.xml      |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 google-cloud-bom/README.md                    |   2 +-
 google-cloud-bom/pom.xml                      | 274 +++++++++---------
 .../google-cloud-bigquery/README.md           |   6 +-
 .../google-cloud-bigquery/pom.xml             |   4 +-
 .../README.md                                 |   6 +-
 .../google-cloud-bigquerydatatransfer/pom.xml |   4 +-
 .../google-cloud-bigtable/README.md           |   6 +-
 .../google-cloud-bigtable/pom.xml             |   4 +-
 .../google-cloud-compute/README.md            |   6 +-
 .../google-cloud-compute/pom.xml              |   4 +-
 .../google-cloud-container/README.md          |   6 +-
 .../google-cloud-container/pom.xml            |   4 +-
 .../google-cloud-contrib/README.md            |   6 +-
 .../google-cloud-logging-logback/README.md    |   6 +-
 .../google-cloud-logging-logback/pom.xml      |   4 +-
 .../google-cloud-nio-examples/README.md       |   4 +-
 .../google-cloud-nio-examples/pom.xml         |   4 +-
 .../google-cloud-nio/README.md                |   6 +-
 .../google-cloud-nio/pom.xml                  |   4 +-
 .../google-cloud-contrib/pom.xml              |   4 +-
 .../google-cloud-core-grpc/pom.xml            |   4 +-
 .../google-cloud-core-http/pom.xml            |   4 +-
 .../google-cloud-core/README.md               |   6 +-
 .../google-cloud-core/pom.xml                 |   4 +-
 .../google-cloud-dataproc/README.md           |   6 +-
 .../google-cloud-dataproc/pom.xml             |   4 +-
 .../google-cloud-datastore/README.md          |   6 +-
 .../google-cloud-datastore/pom.xml            |   4 +-
 .../google-cloud-dialogflow/README.md         |   6 +-
 .../google-cloud-dialogflow/pom.xml           |   4 +-
 .../google-cloud-dlp/README.md                |   6 +-
 google-cloud-clients/google-cloud-dlp/pom.xml |   4 +-
 .../google-cloud-dns/README.md                |   6 +-
 google-cloud-clients/google-cloud-dns/pom.xml |   4 +-
 .../google-cloud-errorreporting/README.md     |   6 +-
 .../google-cloud-errorreporting/pom.xml       |   4 +-
 .../google-cloud-firestore/README.md          |   6 +-
 .../google-cloud-firestore/pom.xml            |   4 +-
 .../google-cloud-iot/README.md                |   6 +-
 google-cloud-clients/google-cloud-iot/pom.xml |   4 +-
 .../google-cloud-language/README.md           |   6 +-
 .../google-cloud-language/pom.xml             |   4 +-
 .../google-cloud-logging/README.md            |   6 +-
 .../google-cloud-logging/pom.xml              |   4 +-
 .../google-cloud-monitoring/README.md         |   6 +-
 .../google-cloud-monitoring/pom.xml           |   4 +-
 .../google-cloud-notification/README.md       |   6 +-
 .../google-cloud-notification/pom.xml         |   4 +-
 .../google-cloud-os-login/README.md           |   6 +-
 .../google-cloud-os-login/pom.xml             |   4 +-
 .../google-cloud-pubsub/README.md             |   6 +-
 .../google-cloud-pubsub/pom.xml               |   4 +-
 .../google-cloud-redis/README.md              |   6 +-
 .../google-cloud-redis/pom.xml                |   4 +-
 .../google-cloud-resourcemanager/README.md    |   6 +-
 .../google-cloud-resourcemanager/pom.xml      |   4 +-
 .../google-cloud-spanner/README.md            |   6 +-
 .../google-cloud-spanner/pom.xml              |   4 +-
 .../google-cloud-speech/README.md             |   6 +-
 .../google-cloud-speech/pom.xml               |   4 +-
 .../google-cloud-storage/README.md            |   6 +-
 .../google-cloud-storage/pom.xml              |   4 +-
 .../google-cloud-texttospeech/README.md       |   6 +-
 .../google-cloud-texttospeech/pom.xml         |   4 +-
 .../google-cloud-trace/README.md              |   6 +-
 .../google-cloud-trace/pom.xml                |   4 +-
 .../google-cloud-translate/README.md          |   6 +-
 .../google-cloud-translate/pom.xml            |   4 +-
 .../google-cloud-video-intelligence/README.md |   6 +-
 .../google-cloud-video-intelligence/pom.xml   |   4 +-
 .../google-cloud-vision/README.md             |   6 +-
 .../google-cloud-vision/pom.xml               |   4 +-
 .../google-cloud-websecurityscanner/README.md |   6 +-
 .../google-cloud-websecurityscanner/pom.xml   |   4 +-
 google-cloud-clients/pom.xml                  |   4 +-
 google-cloud-examples/README.md               |   6 +-
 google-cloud-examples/pom.xml                 |   4 +-
 .../google-cloud-appengineflexcompat/pom.xml  |   4 +-
 .../google-cloud-appengineflexcustom/pom.xml  |   4 +-
 .../google-cloud-appengineflexjava/pom.xml    |   4 +-
 .../google-cloud-appenginejava8/pom.xml       |   4 +-
 .../google-cloud-managedtest/pom.xml          |   4 +-
 google-cloud-testing/pom.xml                  |   4 +-
 .../google-cloud-compat-checker/pom.xml       |   4 +-
 google-cloud-util/pom.xml                     |   2 +-
 versions.txt                                  | 242 ++++++++--------
 159 files changed, 677 insertions(+), 677 deletions(-)

diff --git a/README.md b/README.md
index 493810735da9..0a930de8e134 100644
--- a/README.md
+++ b/README.md
@@ -61,16 +61,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
@@ -294,7 +294,7 @@ The easiest way to solve version conflicts is to use google-cloud's BOM. In Mave
       
         com.google.cloud
         google-cloud-bom
-        0.47.0-alpha
+        0.48.0-alpha
         pom
         import
       
diff --git a/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml b/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
index 1142e6bbfdd7..9416c680ae2f 100644
--- a/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigquerydatatransfer-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-bigquerydatatransfer-v1
   GRPC library for grpc-google-cloud-bigquerydatatransfer-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
index c97d11c58f86..533c4e9f50aa 100644
--- a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigtable-admin-v2
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-bigtable-admin-v2
   GRPC library for grpc-google-cloud-bigtable-admin-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml b/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
index cacb8d3a48b4..15cc76abbdba 100644
--- a/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigtable-v2
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-bigtable-v2
   GRPC library for grpc-google-cloud-bigtable-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-container-v1/pom.xml b/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
index 7f87f75e1434..99bec13c5b28 100644
--- a/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-container-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-container-v1
   GRPC library for grpc-google-cloud-container-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml b/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
index 8202cd600ec6..897cccabb0cb 100644
--- a/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dataproc-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-dataproc-v1
   GRPC library for grpc-google-cloud-dataproc-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml b/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
index 669a6fcd94a3..dcd42023e6f0 100644
--- a/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dialogflow-v2
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-dialogflow-v2
   GRPC library for grpc-google-cloud-dialogflow-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
index f46bac9d841a..07fbfc11d731 100644
--- a/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dialogflow-v2beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-dialogflow-v2beta1
   GRPC library for grpc-google-cloud-dialogflow-v2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml b/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
index f8e96658fa02..11705da3e1a3 100644
--- a/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dlp-v2
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-dlp-v2
   GRPC library for grpc-google-cloud-dlp-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
index 33d136008180..764a838dbedb 100644
--- a/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-error-reporting-v1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-error-reporting-v1beta1
   GRPC library for grpc-google-cloud-error-reporting-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
index 6f14092bd6f3..152d8057a73c 100644
--- a/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-firestore-v1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-firestore-v1beta1
   GRPC library for grpc-google-cloud-firestore-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml b/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
index 562c1df967c3..9fb5ca1d11e3 100644
--- a/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-iot-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-iot-v1
   GRPC library for grpc-google-cloud-iot-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-language-v1/pom.xml b/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
index d7c28cb01ef3..04fe04805bff 100644
--- a/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-language-v1
-  1.11.1-SNAPSHOT
+  1.12.0
   grpc-google-cloud-language-v1
   GRPC library for grpc-google-cloud-language-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml b/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
index bb743ac126fc..1b706440b967 100644
--- a/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-language-v1beta2
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-language-v1beta2
   GRPC library for grpc-google-cloud-language-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml b/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
index 60d659911329..a8d4885d1c30 100644
--- a/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-logging-v2
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-logging-v2
   GRPC library for grpc-google-cloud-logging-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml b/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
index d4dc516d79bb..f073a7f756c7 100644
--- a/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-monitoring-v3
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-monitoring-v3
   GRPC library for grpc-google-cloud-monitoring-v3
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml b/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
index 194d396f2b90..a9a9dab6fd66 100644
--- a/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-os-login-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-os-login-v1
   GRPC library for grpc-google-cloud-os-login-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml b/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
index 6f254b8449a7..ce83a36c8d8b 100644
--- a/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-pubsub-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-pubsub-v1
   GRPC library for grpc-google-cloud-pubsub-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
index dd0d57031dfb..ff53b2367475 100644
--- a/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-redis-v1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-redis-v1beta1
   GRPC library for grpc-google-cloud-redis-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
index 301472655f92..14593aecd0b9 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-admin-database-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-spanner-admin-database-v1
   GRPC library for grpc-google-cloud-spanner-admin-database-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
index c2662d3e06e3..4c29210513e0 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-admin-instance-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-spanner-admin-instance-v1
   GRPC library for grpc-google-cloud-spanner-admin-instance-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
index ae8356cd46b4..e9041d1aaaac 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-spanner-v1
   GRPC library for grpc-google-cloud-spanner-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
index 5985b132e431..af710270b8d3 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-speech-v1
   GRPC library for grpc-google-cloud-speech-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
index 1338f0204704..3df6cae497ca 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-speech-v1beta1
   GRPC library for grpc-google-cloud-speech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
index 49e31e564a69..91e474dbf0e2 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1p1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-speech-v1p1beta1
   GRPC library for grpc-google-cloud-speech-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
index 04c66b3f6f3c..2acf1e53d601 100644
--- a/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-texttospeech-v1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-texttospeech-v1beta1
   GRPC library for grpc-google-cloud-texttospeech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml b/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
index 46fbca1959cf..2e11f44afb62 100644
--- a/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-trace-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-trace-v1
   GRPC library for grpc-google-cloud-trace-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml b/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
index c6141da933d8..d43a590db88a 100644
--- a/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-trace-v2
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-trace-v2
   GRPC library for grpc-google-cloud-trace-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
index c61994262dda..6ef53d702b27 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-video-intelligence-v1
   GRPC library for grpc-google-cloud-video-intelligence-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
index 71f3f55c173c..9c56bd6fb618 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-video-intelligence-v1beta1
   GRPC library for grpc-google-cloud-video-intelligence-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
index 8ddc4833c953..54d0153bccde 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1beta2
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-video-intelligence-v1beta2
   GRPC library for grpc-google-cloud-video-intelligence-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
index eab707aee544..93a57a7162ff 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1p1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-video-intelligence-v1p1beta1
   GRPC library for grpc-google-cloud-video-intelligence-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
index 62c4be57e4c8..0e3045d598e7 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1
-  1.11.1-SNAPSHOT
+  1.12.0
   grpc-google-cloud-vision-v1
   GRPC library for grpc-google-cloud-vision-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
index 82796bb843b8..49bf1b688f6c 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1p1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-vision-v1p1beta1
   GRPC library for grpc-google-cloud-vision-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
index c4b7c7166842..7509df0877a5 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1p2beta1
-  1.11.1-SNAPSHOT
+  1.12.0
   grpc-google-cloud-vision-v1p2beta1
   GRPC library for grpc-google-cloud-vision-v1p2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
index 09074c71393d..04807d96aef4 100644
--- a/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-websecurityscanner-v1alpha
-  0.12.1-SNAPSHOT
+  0.13.0
   grpc-google-cloud-websecurityscanner-v1alpha
   GRPC library for grpc-google-cloud-websecurityscanner-v1alpha
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index cee1b7c5f9f8..109f3373f8ff 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -4,7 +4,7 @@
   com.google.api.grpc
   google-api-grpc
   pom
-  0.12.1-SNAPSHOT
+  0.13.0
   Google Cloud API gRPC
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-api-grpc
   
@@ -134,357 +134,357 @@
       
         com.google.api.grpc
         proto-google-cloud-bigtable-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-admin-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-admin-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-bigquerydatatransfer-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-bigquerydatatransfer-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-container-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-container-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-dataproc-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dataproc-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dlp-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-error-reporting-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-error-reporting-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-firestore-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-firestore-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1
-        1.11.1-SNAPSHOT
+        1.12.0
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1
-        1.11.1-SNAPSHOT
+        1.12.0
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1beta2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1beta2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-logging-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-logging-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-monitoring-v3
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-monitoring-v3
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-os-login-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-os-login-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-pubsub-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-pubsub-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-database-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-database-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-instance-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-instance-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1p1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1p1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-texttospeech-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-texttospeech-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1
-        1.11.1-SNAPSHOT
+        1.12.0
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1
-        1.11.1-SNAPSHOT
+        1.12.0
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p2beta1
-        1.11.1-SNAPSHOT
+        1.12.0
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p2beta1
-        1.11.1-SNAPSHOT
+        1.12.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1p1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1p1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-iot-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-iot-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-redis-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-redis-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-websecurityscanner-v1alpha
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-websecurityscanner-v1alpha
-        0.12.1-SNAPSHOT
+        0.13.0
       
     
   
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
index 881f98356bd2..766af996f248 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigquerydatatransfer-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-bigquerydatatransfer-v1
   PROTO library for proto-google-cloud-bigquerydatatransfer-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
index ac4842c20f66..2cef643c6bd3 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigtable-admin-v2
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-bigtable-admin-v2
   PROTO library for proto-google-cloud-bigtable-admin-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml b/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
index 2f6042617651..af2b10b7bf55 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigtable-v2
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-bigtable-v2
   PROTO library for proto-google-cloud-bigtable-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-container-v1/pom.xml b/google-api-grpc/proto-google-cloud-container-v1/pom.xml
index 6a168a03ff40..efd1ec34c4f8 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-container-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-container-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-container-v1
   PROTO library for proto-google-cloud-container-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml b/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
index 30207e6576d3..82ddfc8b9e4a 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dataproc-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-dataproc-v1
   PROTO library for proto-google-cloud-dataproc-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml b/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
index d3003828dcb4..6ec0ad67682b 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml b/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
index 726553bedd6e..42ab7fb05449 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dialogflow-v2
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-dialogflow-v2
   PROTO library for proto-google-cloud-dialogflow-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
index db10af6e65bf..7248356c7473 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dialogflow-v2beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-dialogflow-v2beta1
   PROTO library for proto-google-cloud-dialogflow-v2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml b/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
index 7a306f05edac..dc044c3c3da1 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dlp-v2
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-dlp-v2
   PROTO library for proto-google-cloud-dlp-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
index ba2145581adf..226ee7574873 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-error-reporting-v1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-error-reporting-v1beta1
   PROTO library for proto-google-cloud-error-reporting-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
index 7f879ad81285..cf76dc99643e 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-firestore-v1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-firestore-v1beta1
   PROTO library for proto-google-cloud-firestore-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/pom.xml b/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
index aeafe2c2d214..305c811b9cd5 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-iot-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-iot-v1
   PROTO library for proto-google-cloud-iot-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-language-v1/pom.xml b/google-api-grpc/proto-google-cloud-language-v1/pom.xml
index 48accf8a5dda..835433dcf3c5 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-language-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-language-v1
-  1.11.1-SNAPSHOT
+  1.12.0
   proto-google-cloud-language-v1
   PROTO library for proto-google-cloud-language-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml b/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
index 9e0b26af3b64..bdce17be8feb 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-language-v1beta2
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-language-v1beta2
   PROTO library for proto-google-cloud-language-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/pom.xml b/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
index 90d9aa9fa392..7bdc664de8ae 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-logging-v2
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-logging-v2
   PROTO library for proto-google-cloud-logging-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml b/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
index 65b6e010bf4c..c1a24e9123de 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-monitoring-v3
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-monitoring-v3
   PROTO library for proto-google-cloud-monitoring-v3
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml b/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
index 5756dfee6669..c377dd48f3af 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-os-login-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-os-login-v1
   PROTO library for proto-google-cloud-os-login-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml b/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
index 33ee59ca88b9..71215fd2dd36 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-pubsub-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-pubsub-v1
   PROTO library for proto-google-cloud-pubsub-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
index b58969b67cbb..37077d94f1bc 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-redis-v1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-redis-v1beta1
   PROTO library for proto-google-cloud-redis-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
index ea26dd2619f7..1118359e6454 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-admin-database-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-spanner-admin-database-v1
   PROTO library for proto-google-cloud-spanner-admin-database-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
index 7b70a60a1b22..43950a1579fc 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-admin-instance-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-spanner-admin-instance-v1
   PROTO library for proto-google-cloud-spanner-admin-instance-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
index a0b811ae3d21..4f6f16115daf 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-spanner-v1
   PROTO library for proto-google-cloud-spanner-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
index 824ae047ba64..ede6fea6b271 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-speech-v1
   PROTO library for proto-google-cloud-speech-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
index 5392806261bd..e94914b08f28 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-speech-v1beta1
   PROTO library for proto-google-cloud-speech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
index d9ed66ea23ef..52e1a7d826f7 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1p1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-speech-v1p1beta1
   PROTO library for proto-google-cloud-speech-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
index 220a105b8b15..aaf99bfffd37 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-texttospeech-v1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-texttospeech-v1beta1
   PROTO library for proto-google-cloud-texttospeech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/pom.xml b/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
index 43df0caa55de..d3d514406875 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-trace-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-trace-v1
   PROTO library for proto-google-cloud-trace-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/pom.xml b/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
index 1ac6e773a21d..8f425686778a 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-trace-v2
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-trace-v2
   PROTO library for proto-google-cloud-trace-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
index 4610c55f5c05..dc9cb8763c31 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-video-intelligence-v1
   PROTO library for proto-google-cloud-video-intelligence-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
index 165fc4ea1db7..31fbf4cb47ce 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-video-intelligence-v1beta1
   PROTO library for proto-google-cloud-video-intelligence-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
index 6631aacf22d5..bb9133859f21 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1beta2
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-video-intelligence-v1beta2
   PROTO library for proto-google-cloud-video-intelligence-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
index fbeee0b2263a..67e993d55c9a 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1p1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-video-intelligence-v1p1beta1
   PROTO library for proto-google-cloud-video-intelligence-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
index 9df1b531af60..6faa68689678 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1
-  1.11.1-SNAPSHOT
+  1.12.0
   proto-google-cloud-vision-v1
   PROTO library for proto-google-cloud-vision-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
index a247af4a5480..491c7069df3f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1p1beta1
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-vision-v1p1beta1
   PROTO library for proto-google-cloud-vision-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
index f8b099faf0b5..5416b66ff72d 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1p2beta1
-  1.11.1-SNAPSHOT
+  1.12.0
   proto-google-cloud-vision-v1p2beta1
   PROTO library for proto-google-cloud-vision-v1p2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
index 14661ebff117..72fd93b68685 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-websecurityscanner-v1alpha
-  0.12.1-SNAPSHOT
+  0.13.0
   proto-google-cloud-websecurityscanner-v1alpha
   PROTO library for proto-google-cloud-websecurityscanner-v1alpha
   
     com.google.api.grpc
     google-api-grpc
-    0.12.1-SNAPSHOT
+    0.13.0
   
   
     
diff --git a/google-cloud-bom/README.md b/google-cloud-bom/README.md
index 502c2b80f990..6e65e946aa43 100644
--- a/google-cloud-bom/README.md
+++ b/google-cloud-bom/README.md
@@ -13,7 +13,7 @@ To use it in Maven, add the following to your POM:
       
         com.google.cloud
         google-cloud-bom
-        0.47.0-alpha
+        0.48.0-alpha
         pom
         import
       
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index b469435083c6..35b2d2d21b44 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-bom
   pom
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   Google Cloud Java BOM
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bom
   
@@ -199,715 +199,715 @@
       
         com.google.cloud
         google-cloud-bigtable
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
       
       
         com.google.cloud
         google-cloud-bigtable
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-admin-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-admin-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-bigquery
-        1.29.1-SNAPSHOT
+        1.30.0
       
       
         com.google.cloud
         google-cloud-bigquery
-        1.29.1-SNAPSHOT
+        1.30.0
         test-jar
       
       
         com.google.cloud
         google-cloud-bigquerydatatransfer
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
       
       
         com.google.cloud
         google-cloud-bigquerydatatransfer
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-bigquerydatatransfer-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-bigquerydatatransfer-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-compute
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
       
       
         com.google.cloud
         google-cloud-compute
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         test-jar
       
       
         com.google.cloud
         google-cloud-container
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
       
       
         com.google.cloud
         google-cloud-container
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-container-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-container-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-contrib
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
       
       
         com.google.cloud
         google-cloud-contrib
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         test-jar
       
       
         com.google.cloud
         google-cloud-nio
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
       
       
         com.google.cloud
         google-cloud-nio
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         test-jar
       
       
         com.google.cloud
         google-cloud-core
-        1.29.1-SNAPSHOT
+        1.30.0
       
       
         com.google.cloud
         google-cloud-core
-        1.29.1-SNAPSHOT
+        1.30.0
         test-jar
       
       
         com.google.cloud
         google-cloud-core-grpc
-        1.29.1-SNAPSHOT
+        1.30.0
       
       
         com.google.cloud
         google-cloud-core-grpc
-        1.29.1-SNAPSHOT
+        1.30.0
         test-jar
       
       
         com.google.cloud
         google-cloud-core-http
-        1.29.1-SNAPSHOT
+        1.30.0
       
       
         com.google.cloud
         google-cloud-core-http
-        1.29.1-SNAPSHOT
+        1.30.0
         test-jar
       
       
         com.google.cloud
         google-cloud-dataproc
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
       
       
         com.google.cloud
         google-cloud-dataproc
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dataproc-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dataproc-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-datastore
-        1.29.1-SNAPSHOT
+        1.30.0
       
       
         com.google.cloud
         google-cloud-datastore
-        1.29.1-SNAPSHOT
+        1.30.0
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-dlp
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
       
       
         com.google.cloud
         google-cloud-dlp
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dlp-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-dialogflow
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
       
       
         com.google.cloud
         google-cloud-dialogflow
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-dns
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
       
       
         com.google.cloud
         google-cloud-dns
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         test-jar
       
       
         com.google.cloud
         google-cloud-errorreporting
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
       
       
         com.google.cloud
         google-cloud-errorreporting
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-error-reporting-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-error-reporting-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-firestore
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
       
       
         com.google.cloud
         google-cloud-firestore
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-firestore-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-firestore-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-language
-        1.29.1-SNAPSHOT
+        1.30.0
       
       
         com.google.cloud
         google-cloud-language
-        1.29.1-SNAPSHOT
+        1.30.0
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1
-        1.11.1-SNAPSHOT
+        1.12.0
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1
-        1.11.1-SNAPSHOT
+        1.12.0
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1beta2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1beta2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-logging
-        1.29.1-SNAPSHOT
+        1.30.0
       
       
         com.google.cloud
         google-cloud-logging
-        1.29.1-SNAPSHOT
+        1.30.0
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-logging-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-logging-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-logging-logback
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
       
 
       
         com.google.cloud
         google-cloud-monitoring
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
       
       
         com.google.cloud
         google-cloud-monitoring
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-monitoring-v3
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-monitoring-v3
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-os-login
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
       
       
         com.google.cloud
         google-cloud-os-login
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-os-login-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-os-login-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-pubsub
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
       
       
         com.google.cloud
         google-cloud-pubsub
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-pubsub-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-pubsub-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-redis
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
       
       
         com.google.cloud
         google-cloud-redis
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-redis-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-redis-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-resourcemanager
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
       
       
         com.google.cloud
         google-cloud-resourcemanager
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         test-jar
       
       
         com.google.cloud
         google-cloud-spanner
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
       
       
         com.google.cloud
         google-cloud-spanner
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-database-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-database-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-instance-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-instance-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-speech
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
       
       
         com.google.cloud
         google-cloud-speech
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1p1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1p1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-storage
-        1.29.1-SNAPSHOT
+        1.30.0
       
       
         com.google.cloud
         google-cloud-storage
-        1.29.1-SNAPSHOT
+        1.30.0
         test-jar
       
       
         com.google.cloud
         google-cloud-texttospeech
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
       
       
         com.google.cloud
         google-cloud-texttospeech
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-texttospeech-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-texttospeech-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-trace
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
       
       
         com.google.cloud
         google-cloud-trace
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.cloud
         google-cloud-translate
-        1.29.1-SNAPSHOT
+        1.30.0
       
       
         com.google.cloud
         google-cloud-translate
-        1.29.1-SNAPSHOT
+        1.30.0
         test-jar
       
       
         com.google.cloud
         google-cloud-vision
-        1.29.1-SNAPSHOT
+        1.30.0
       
       
         com.google.cloud
         google-cloud-vision
-        1.29.1-SNAPSHOT
+        1.30.0
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1
-        1.11.1-SNAPSHOT
+        1.12.0
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1
-        1.11.1-SNAPSHOT
+        1.12.0
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p2beta1
-        1.11.1-SNAPSHOT
+        1.12.0
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p2beta1
-        1.11.1-SNAPSHOT
+        1.12.0
       
       
         com.google.cloud
         google-cloud-video-intelligence
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
       
       
         com.google.cloud
         google-cloud-video-intelligence
-        0.47.1-beta-SNAPSHOT
+        0.48.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta2
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1p1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1p1beta1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-iot-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-iot-v1
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-websecurityscanner-v1alpha
-        0.12.1-SNAPSHOT
+        0.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-websecurityscanner-v1alpha
-        0.12.1-SNAPSHOT
+        0.13.0
       
     
   
diff --git a/google-cloud-clients/google-cloud-bigquery/README.md b/google-cloud-clients/google-cloud-bigquery/README.md
index 075ea091617a..a7cdb356daa9 100644
--- a/google-cloud-clients/google-cloud-bigquery/README.md
+++ b/google-cloud-clients/google-cloud-bigquery/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-bigquery
-  1.29.0
+  1.30.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-bigquery:1.29.0'
+compile 'com.google.cloud:google-cloud-bigquery:1.30.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "1.29.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "1.30.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-bigquery/pom.xml b/google-cloud-clients/google-cloud-bigquery/pom.xml
index 1e5dfc09434b..f909752c476f 100644
--- a/google-cloud-clients/google-cloud-bigquery/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquery/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigquery
-  1.29.1-SNAPSHOT
+  1.30.0
   jar
   Google Cloud BigQuery
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquery
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-bigquery
diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md b/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md
index ebdf732a4151..a3a407f38ab0 100644
--- a/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md
+++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md
@@ -25,16 +25,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-bigquerydatatransfer
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-bigquerydatatransfer:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-bigquerydatatransfer:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigquerydatatransfer" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigquerydatatransfer" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
index 33fed2d92a66..fb1ec36bde90 100644
--- a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigquerydatatransfer
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud Bigquery Data Transfer
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquerydatatransfer
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-bigquerydatatransfer
diff --git a/google-cloud-clients/google-cloud-bigtable/README.md b/google-cloud-clients/google-cloud-bigtable/README.md
index 5361b7bd1bb0..f39b00a2fc73 100644
--- a/google-cloud-clients/google-cloud-bigtable/README.md
+++ b/google-cloud-clients/google-cloud-bigtable/README.md
@@ -23,16 +23,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-bigtable
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-bigtable:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-bigtable:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index cd86f1108dd9..496a3699c271 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigtable
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud Bigtable
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigtable
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-bigtable
diff --git a/google-cloud-clients/google-cloud-compute/README.md b/google-cloud-clients/google-cloud-compute/README.md
index 6966d5959415..75ad65bd7775 100644
--- a/google-cloud-clients/google-cloud-compute/README.md
+++ b/google-cloud-clients/google-cloud-compute/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-compute
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-compute:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-compute:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-compute/pom.xml b/google-cloud-clients/google-cloud-compute/pom.xml
index e9de3d618212..2e8c0245751f 100644
--- a/google-cloud-clients/google-cloud-compute/pom.xml
+++ b/google-cloud-clients/google-cloud-compute/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-compute
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud Compute
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-compute
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-compute
diff --git a/google-cloud-clients/google-cloud-container/README.md b/google-cloud-clients/google-cloud-container/README.md
index abd4f8e15d03..2cc80d379b2b 100644
--- a/google-cloud-clients/google-cloud-container/README.md
+++ b/google-cloud-clients/google-cloud-container/README.md
@@ -24,16 +24,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-container
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-container:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-container:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-container" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-container" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-container/pom.xml b/google-cloud-clients/google-cloud-container/pom.xml
index 9764aaa3afbe..2e1eb67e645d 100644
--- a/google-cloud-clients/google-cloud-container/pom.xml
+++ b/google-cloud-clients/google-cloud-container/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-container
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud Container
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-container
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-container
diff --git a/google-cloud-clients/google-cloud-contrib/README.md b/google-cloud-clients/google-cloud-contrib/README.md
index 52997e476460..92d29ac1d372 100644
--- a/google-cloud-clients/google-cloud-contrib/README.md
+++ b/google-cloud-clients/google-cloud-contrib/README.md
@@ -26,16 +26,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-contrib
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-contrib:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-contrib:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-contrib" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-contrib" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md
index 08d19e8885fe..d9d74a1cffbb 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-logging-logback
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-logging-logback:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-logging-logback:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
index aedd1459a507..486671219c3d 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
@@ -5,7 +5,7 @@
   4.0.0
 
   google-cloud-logging-logback
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud Logging Logback Appender
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-logging-logback
@@ -20,7 +20,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
index f545bfb2b405..0103187927bd 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
@@ -23,12 +23,12 @@ To run this example:
 
 [//]: # ({x-version-update-start:google-cloud-nio:current})
     ```
-    java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.47.1-alpha-SNAPSHOT.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.47.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
+    java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.48.0-alpha.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.48.0-alpha.jar com.google.cloud.nio.examples.ListFilesystems
     ```
 
     Notice that it lists Google Cloud Storage, which it wouldn't if you ran it without the NIO jar:
     ```
-    java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.47.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
+    java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.48.0-alpha.jar com.google.cloud.nio.examples.ListFilesystems
     ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
index 4316725b2fe8..7437ec841f5f 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-nio-examples
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud NIO Examples
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio-examples
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-nio-examples
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md
index d6318612c79e..fb3e9e3c86c0 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md
@@ -28,16 +28,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-nio
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-nio:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-nio:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-nio" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-nio" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
index 9fd6307835d4..b3d556fcf7f9 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-nio
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud NIO
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-nio
diff --git a/google-cloud-clients/google-cloud-contrib/pom.xml b/google-cloud-clients/google-cloud-contrib/pom.xml
index 4bf5d6e32332..7aa324c0b41b 100644
--- a/google-cloud-clients/google-cloud-contrib/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-contrib
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   pom
   Google Cloud Contributions
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-contrib
diff --git a/google-cloud-clients/google-cloud-core-grpc/pom.xml b/google-cloud-clients/google-cloud-core-grpc/pom.xml
index dfbbbf5b0d0e..e7c75118c571 100644
--- a/google-cloud-clients/google-cloud-core-grpc/pom.xml
+++ b/google-cloud-clients/google-cloud-core-grpc/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-core-grpc
-  1.29.1-SNAPSHOT
+  1.30.0
   jar
   Google Cloud Core gRPC
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-core-grpc
diff --git a/google-cloud-clients/google-cloud-core-http/pom.xml b/google-cloud-clients/google-cloud-core-http/pom.xml
index 46149f6639c5..593092dc8f20 100644
--- a/google-cloud-clients/google-cloud-core-http/pom.xml
+++ b/google-cloud-clients/google-cloud-core-http/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-core-http
-  1.29.1-SNAPSHOT
+  1.30.0
   jar
   Google Cloud Core HTTP
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-core-http
diff --git a/google-cloud-clients/google-cloud-core/README.md b/google-cloud-clients/google-cloud-core/README.md
index 45e4450e1795..efaa15277877 100644
--- a/google-cloud-clients/google-cloud-core/README.md
+++ b/google-cloud-clients/google-cloud-core/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-core
-  1.29.0
+  1.30.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-core:1.29.0'
+compile 'com.google.cloud:google-cloud-core:1.30.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-core" % "1.29.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-core" % "1.30.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-core/pom.xml b/google-cloud-clients/google-cloud-core/pom.xml
index e8930bf751c0..58b0f4a4c56b 100644
--- a/google-cloud-clients/google-cloud-core/pom.xml
+++ b/google-cloud-clients/google-cloud-core/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-core
-  1.29.1-SNAPSHOT
+  1.30.0
   jar
   Google Cloud Core
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-core
diff --git a/google-cloud-clients/google-cloud-dataproc/README.md b/google-cloud-clients/google-cloud-dataproc/README.md
index 64f7588325f4..ee0896697c7c 100644
--- a/google-cloud-clients/google-cloud-dataproc/README.md
+++ b/google-cloud-clients/google-cloud-dataproc/README.md
@@ -24,16 +24,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-dataproc
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-dataproc:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-dataproc:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-dataproc" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-dataproc" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-dataproc/pom.xml b/google-cloud-clients/google-cloud-dataproc/pom.xml
index c06748864142..84a26e77ea44 100644
--- a/google-cloud-clients/google-cloud-dataproc/pom.xml
+++ b/google-cloud-clients/google-cloud-dataproc/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-dataproc
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud Dataproc
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dataproc
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-dataproc
diff --git a/google-cloud-clients/google-cloud-datastore/README.md b/google-cloud-clients/google-cloud-datastore/README.md
index 9ef5db4378fa..1fc8af4e9b5b 100644
--- a/google-cloud-clients/google-cloud-datastore/README.md
+++ b/google-cloud-clients/google-cloud-datastore/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.29.0
+  1.30.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.29.0'
+compile 'com.google.cloud:google-cloud-datastore:1.30.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.29.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.30.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-datastore/pom.xml b/google-cloud-clients/google-cloud-datastore/pom.xml
index 1b9d8dde869c..6d4ba33544ea 100644
--- a/google-cloud-clients/google-cloud-datastore/pom.xml
+++ b/google-cloud-clients/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.29.1-SNAPSHOT
+  1.30.0
   jar
   Google Cloud Datastore
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-datastore
diff --git a/google-cloud-clients/google-cloud-dialogflow/README.md b/google-cloud-clients/google-cloud-dialogflow/README.md
index 13ea8e47777e..c5f642d494a0 100644
--- a/google-cloud-clients/google-cloud-dialogflow/README.md
+++ b/google-cloud-clients/google-cloud-dialogflow/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-dialogflow
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-dialogflow:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-dialogflow:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/pom.xml b/google-cloud-clients/google-cloud-dialogflow/pom.xml
index 013b6c9c78bb..289e28ba1a4d 100644
--- a/google-cloud-clients/google-cloud-dialogflow/pom.xml
+++ b/google-cloud-clients/google-cloud-dialogflow/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-dialogflow
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud Dialog Flow API
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dialogflow
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-dialogflow
diff --git a/google-cloud-clients/google-cloud-dlp/README.md b/google-cloud-clients/google-cloud-dlp/README.md
index 04b83735457b..37263a698809 100644
--- a/google-cloud-clients/google-cloud-dlp/README.md
+++ b/google-cloud-clients/google-cloud-dlp/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-dlp
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-dlp:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-dlp:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-dlp" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-dlp" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-dlp/pom.xml b/google-cloud-clients/google-cloud-dlp/pom.xml
index 8d2d4f981c99..4066840c0e48 100644
--- a/google-cloud-clients/google-cloud-dlp/pom.xml
+++ b/google-cloud-clients/google-cloud-dlp/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-dlp
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud Data Loss Prevention API
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dlp
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-dlp
diff --git a/google-cloud-clients/google-cloud-dns/README.md b/google-cloud-clients/google-cloud-dns/README.md
index d69aa1485ce9..d0967dc8b099 100644
--- a/google-cloud-clients/google-cloud-dns/README.md
+++ b/google-cloud-clients/google-cloud-dns/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-dns
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-dns:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-dns:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-dns" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-dns" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-dns/pom.xml b/google-cloud-clients/google-cloud-dns/pom.xml
index a83aaf030ada..cc972d8f2bff 100644
--- a/google-cloud-clients/google-cloud-dns/pom.xml
+++ b/google-cloud-clients/google-cloud-dns/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-dns
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud DNS
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dns
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-dns
diff --git a/google-cloud-clients/google-cloud-errorreporting/README.md b/google-cloud-clients/google-cloud-errorreporting/README.md
index a339b80fa6bf..f03b85d04023 100644
--- a/google-cloud-clients/google-cloud-errorreporting/README.md
+++ b/google-cloud-clients/google-cloud-errorreporting/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-errorreporting
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-errorreporting:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-errorreporting:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-errorreporting/pom.xml b/google-cloud-clients/google-cloud-errorreporting/pom.xml
index d1de3a366afa..6a863e025d8d 100644
--- a/google-cloud-clients/google-cloud-errorreporting/pom.xml
+++ b/google-cloud-clients/google-cloud-errorreporting/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-errorreporting
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud Error Reporting
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-errorreporting
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-errorreporting
diff --git a/google-cloud-clients/google-cloud-firestore/README.md b/google-cloud-clients/google-cloud-firestore/README.md
index 6d06c59d671e..dbccad4bc8ee 100644
--- a/google-cloud-clients/google-cloud-firestore/README.md
+++ b/google-cloud-clients/google-cloud-firestore/README.md
@@ -14,16 +14,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-firestore
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-firestore:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-firestore:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-firestore/pom.xml b/google-cloud-clients/google-cloud-firestore/pom.xml
index 483793af9460..2f42ce6a6ca0 100644
--- a/google-cloud-clients/google-cloud-firestore/pom.xml
+++ b/google-cloud-clients/google-cloud-firestore/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-firestore
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud Firestore
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-firestore
@@ -15,7 +15,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-firestore
diff --git a/google-cloud-clients/google-cloud-iot/README.md b/google-cloud-clients/google-cloud-iot/README.md
index ebdf0adbaa5a..a8f934369ca9 100644
--- a/google-cloud-clients/google-cloud-iot/README.md
+++ b/google-cloud-clients/google-cloud-iot/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-iot
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-iot:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-iot:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-iot" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-iot" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-iot/pom.xml b/google-cloud-clients/google-cloud-iot/pom.xml
index b0dfc08ac7b7..610360bd6d05 100644
--- a/google-cloud-clients/google-cloud-iot/pom.xml
+++ b/google-cloud-clients/google-cloud-iot/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-iot
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud IoT
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-iot
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-iot
diff --git a/google-cloud-clients/google-cloud-language/README.md b/google-cloud-clients/google-cloud-language/README.md
index fd8289bdaac6..447c86968a39 100644
--- a/google-cloud-clients/google-cloud-language/README.md
+++ b/google-cloud-clients/google-cloud-language/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-language
-  1.29.0
+  1.30.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-language:1.29.0'
+compile 'com.google.cloud:google-cloud-language:1.30.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-language" % "1.29.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-language" % "1.30.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-language/pom.xml b/google-cloud-clients/google-cloud-language/pom.xml
index edc53cf52067..0d5f887ba5e2 100644
--- a/google-cloud-clients/google-cloud-language/pom.xml
+++ b/google-cloud-clients/google-cloud-language/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-language
-  1.29.1-SNAPSHOT
+  1.30.0
   jar
   Google Cloud Natural Language
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-language
@@ -15,7 +15,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-language
diff --git a/google-cloud-clients/google-cloud-logging/README.md b/google-cloud-clients/google-cloud-logging/README.md
index 7de8bf97c1c4..3aaeb33f3fb8 100644
--- a/google-cloud-clients/google-cloud-logging/README.md
+++ b/google-cloud-clients/google-cloud-logging/README.md
@@ -21,16 +21,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-logging
-  1.29.0
+  1.30.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-logging:1.29.0'
+compile 'com.google.cloud:google-cloud-logging:1.30.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "1.29.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "1.30.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
index 23bd35c606f1..17509fcf3bac 100644
--- a/google-cloud-clients/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-logging
-  1.29.1-SNAPSHOT
+  1.30.0
   jar
   Google Cloud Logging
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-logging
diff --git a/google-cloud-clients/google-cloud-monitoring/README.md b/google-cloud-clients/google-cloud-monitoring/README.md
index 970abea33a77..b82b6723a192 100644
--- a/google-cloud-clients/google-cloud-monitoring/README.md
+++ b/google-cloud-clients/google-cloud-monitoring/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-monitoring
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-monitoring:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-monitoring:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-monitoring" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-monitoring" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-monitoring/pom.xml b/google-cloud-clients/google-cloud-monitoring/pom.xml
index c9b563ed871e..1cfb9d00b987 100644
--- a/google-cloud-clients/google-cloud-monitoring/pom.xml
+++ b/google-cloud-clients/google-cloud-monitoring/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-monitoring
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud Monitoring
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-monitoring
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-monitoring
diff --git a/google-cloud-clients/google-cloud-notification/README.md b/google-cloud-clients/google-cloud-notification/README.md
index 5022ae6b24f9..d84c605fa585 100644
--- a/google-cloud-clients/google-cloud-notification/README.md
+++ b/google-cloud-clients/google-cloud-notification/README.md
@@ -14,16 +14,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-notification
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-notification:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-notification:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-notification" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-notification" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-notification/pom.xml b/google-cloud-clients/google-cloud-notification/pom.xml
index 1380c4c3f576..173ec5a094f1 100644
--- a/google-cloud-clients/google-cloud-notification/pom.xml
+++ b/google-cloud-clients/google-cloud-notification/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-notification
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud Pub/Sub Notifications for GCS
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-notification
@@ -15,7 +15,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-notification
diff --git a/google-cloud-clients/google-cloud-os-login/README.md b/google-cloud-clients/google-cloud-os-login/README.md
index 8b257905526d..4bda056bdac2 100644
--- a/google-cloud-clients/google-cloud-os-login/README.md
+++ b/google-cloud-clients/google-cloud-os-login/README.md
@@ -24,16 +24,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-os-login
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-os-login:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-os-login:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-os-login" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-os-login" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-os-login/pom.xml b/google-cloud-clients/google-cloud-os-login/pom.xml
index 0c9c569552e4..4df9ff2c1773 100644
--- a/google-cloud-clients/google-cloud-os-login/pom.xml
+++ b/google-cloud-clients/google-cloud-os-login/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-os-login
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud OS Login
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-os-login
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-os-login
diff --git a/google-cloud-clients/google-cloud-pubsub/README.md b/google-cloud-clients/google-cloud-pubsub/README.md
index e17b587ebd87..3bcba6446be5 100644
--- a/google-cloud-clients/google-cloud-pubsub/README.md
+++ b/google-cloud-clients/google-cloud-pubsub/README.md
@@ -24,16 +24,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-pubsub
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-pubsub:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-pubsub:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-pubsub/pom.xml b/google-cloud-clients/google-cloud-pubsub/pom.xml
index 9df6d8835a7f..c4ffd8cf512c 100644
--- a/google-cloud-clients/google-cloud-pubsub/pom.xml
+++ b/google-cloud-clients/google-cloud-pubsub/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-pubsub
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud Pub/Sub
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-pubsub
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-pubsub
diff --git a/google-cloud-clients/google-cloud-redis/README.md b/google-cloud-clients/google-cloud-redis/README.md
index 7121136fb7e1..0cbddd55343c 100644
--- a/google-cloud-clients/google-cloud-redis/README.md
+++ b/google-cloud-clients/google-cloud-redis/README.md
@@ -24,16 +24,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-redis
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-redis:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-redis:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-redis" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-redis" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-redis/pom.xml b/google-cloud-clients/google-cloud-redis/pom.xml
index 83b2b9fde886..241a1949c743 100644
--- a/google-cloud-clients/google-cloud-redis/pom.xml
+++ b/google-cloud-clients/google-cloud-redis/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-redis
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud Redis
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-redis
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-redis
diff --git a/google-cloud-clients/google-cloud-resourcemanager/README.md b/google-cloud-clients/google-cloud-resourcemanager/README.md
index 6fb8de503522..98db58a59853 100644
--- a/google-cloud-clients/google-cloud-resourcemanager/README.md
+++ b/google-cloud-clients/google-cloud-resourcemanager/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-resourcemanager
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-resourcemanager:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-resourcemanager:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-resourcemanager" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-resourcemanager" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-resourcemanager/pom.xml b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
index d74f7d931845..6916418a0a41 100644
--- a/google-cloud-clients/google-cloud-resourcemanager/pom.xml
+++ b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-resourcemanager
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud Resource Manager
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-resourcemanager
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-resourcemanager
diff --git a/google-cloud-clients/google-cloud-spanner/README.md b/google-cloud-clients/google-cloud-spanner/README.md
index ec6305b47c2b..96f890a43b0a 100644
--- a/google-cloud-clients/google-cloud-spanner/README.md
+++ b/google-cloud-clients/google-cloud-spanner/README.md
@@ -22,16 +22,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-spanner
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-spanner:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-spanner:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
index 2fb1454fbb39..fd3363d358db 100644
--- a/google-cloud-clients/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -4,7 +4,7 @@
                               http://maven.apache.org/maven-v4_0_0.xsd">
   4.0.0
   google-cloud-spanner
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud Spanner
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-spanner
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-spanner
diff --git a/google-cloud-clients/google-cloud-speech/README.md b/google-cloud-clients/google-cloud-speech/README.md
index a72232aa441c..c28d69ce85ae 100644
--- a/google-cloud-clients/google-cloud-speech/README.md
+++ b/google-cloud-clients/google-cloud-speech/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-speech
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-speech:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-speech:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-speech" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-speech" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-speech/pom.xml b/google-cloud-clients/google-cloud-speech/pom.xml
index ff0b98680418..3cd03f3ed406 100644
--- a/google-cloud-clients/google-cloud-speech/pom.xml
+++ b/google-cloud-clients/google-cloud-speech/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-speech
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud Speech
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-speech
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-speech
diff --git a/google-cloud-clients/google-cloud-storage/README.md b/google-cloud-clients/google-cloud-storage/README.md
index 532ed9b9cacc..42a0c161b212 100644
--- a/google-cloud-clients/google-cloud-storage/README.md
+++ b/google-cloud-clients/google-cloud-storage/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-storage
-  1.29.0
+  1.30.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-storage:1.29.0'
+compile 'com.google.cloud:google-cloud-storage:1.30.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.29.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.30.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-storage/pom.xml b/google-cloud-clients/google-cloud-storage/pom.xml
index 46a3b1a625a6..a0977ff40ed3 100644
--- a/google-cloud-clients/google-cloud-storage/pom.xml
+++ b/google-cloud-clients/google-cloud-storage/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-storage
-  1.29.1-SNAPSHOT
+  1.30.0
   jar
   Google Cloud Storage
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-storage
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-storage
diff --git a/google-cloud-clients/google-cloud-texttospeech/README.md b/google-cloud-clients/google-cloud-texttospeech/README.md
index 69a80b0a11e9..a536652a000c 100644
--- a/google-cloud-clients/google-cloud-texttospeech/README.md
+++ b/google-cloud-clients/google-cloud-texttospeech/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-texttospeech
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-texttospeech:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-texttospeech:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-texttospeech" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-texttospeech" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-texttospeech/pom.xml b/google-cloud-clients/google-cloud-texttospeech/pom.xml
index 0aea822163ca..c36c7b689830 100644
--- a/google-cloud-clients/google-cloud-texttospeech/pom.xml
+++ b/google-cloud-clients/google-cloud-texttospeech/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-texttospeech
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud Text-to-Speech
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-texttospeech
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-texttospeech-v1beta1
diff --git a/google-cloud-clients/google-cloud-trace/README.md b/google-cloud-clients/google-cloud-trace/README.md
index 77868b9be635..4be7497b5682 100644
--- a/google-cloud-clients/google-cloud-trace/README.md
+++ b/google-cloud-clients/google-cloud-trace/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-trace
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-trace:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-trace:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-trace" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-trace" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-trace/pom.xml b/google-cloud-clients/google-cloud-trace/pom.xml
index 6989b96094cd..f0724ebb883b 100644
--- a/google-cloud-clients/google-cloud-trace/pom.xml
+++ b/google-cloud-clients/google-cloud-trace/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-trace
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud Trace
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-trace
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-trace
diff --git a/google-cloud-clients/google-cloud-translate/README.md b/google-cloud-clients/google-cloud-translate/README.md
index eff5c713e3ea..81960b2b12f5 100644
--- a/google-cloud-clients/google-cloud-translate/README.md
+++ b/google-cloud-clients/google-cloud-translate/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-translate
-  1.29.0
+  1.30.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-translate:1.29.0'
+compile 'com.google.cloud:google-cloud-translate:1.30.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-translate" % "1.29.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-translate" % "1.30.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-translate/pom.xml b/google-cloud-clients/google-cloud-translate/pom.xml
index 350080b7979c..2213cc574121 100644
--- a/google-cloud-clients/google-cloud-translate/pom.xml
+++ b/google-cloud-clients/google-cloud-translate/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-translate
-  1.29.1-SNAPSHOT
+  1.30.0
   jar
   Google Cloud Translation
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-translate
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-translate
diff --git a/google-cloud-clients/google-cloud-video-intelligence/README.md b/google-cloud-clients/google-cloud-video-intelligence/README.md
index 3affa412863b..01f2bccebc74 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/README.md
+++ b/google-cloud-clients/google-cloud-video-intelligence/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-video-intelligence
-  0.47.0-beta
+  0.48.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-video-intelligence:0.47.0-beta'
+compile 'com.google.cloud:google-cloud-video-intelligence:0.48.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-video-intelligence" % "0.47.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-video-intelligence" % "0.48.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-video-intelligence/pom.xml b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
index 7c706a1f9021..36c4dcb5cca7 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/pom.xml
+++ b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-video-intelligence
-  0.47.1-beta-SNAPSHOT
+  0.48.0-beta
   jar
   Google Cloud Video Intelligence
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-video-intelligence
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-video-intelligence
diff --git a/google-cloud-clients/google-cloud-vision/README.md b/google-cloud-clients/google-cloud-vision/README.md
index 8585256e639f..0b6280b87f2e 100644
--- a/google-cloud-clients/google-cloud-vision/README.md
+++ b/google-cloud-clients/google-cloud-vision/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-vision
-  1.29.0
+  1.30.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-vision:1.29.0'
+compile 'com.google.cloud:google-cloud-vision:1.30.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-vision" % "1.29.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-vision" % "1.30.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-vision/pom.xml b/google-cloud-clients/google-cloud-vision/pom.xml
index 54e7ba1358e8..3d7c8d4441c4 100644
--- a/google-cloud-clients/google-cloud-vision/pom.xml
+++ b/google-cloud-clients/google-cloud-vision/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-vision
-  1.29.1-SNAPSHOT
+  1.30.0
   jar
   Google Cloud Vision
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-vision
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-vision
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/README.md b/google-cloud-clients/google-cloud-websecurityscanner/README.md
index 9402442b7a3f..9779678a22d6 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/README.md
+++ b/google-cloud-clients/google-cloud-websecurityscanner/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-websecurityscanner
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-websecurityscanner:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-websecurityscanner:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-websecurityscanner" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-websecurityscanner" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
index 73666f34dc5b..ef7bf71fa251 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
+++ b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-websecurityscanner
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud Web Security Scanner
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-websecurityscanner
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-websecurityscanner
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 65fef5322496..d33a07e6cfc3 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -6,7 +6,7 @@
   com.google.cloud
   google-cloud-clients
   pom
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   Google Cloud
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients
   
@@ -154,7 +154,7 @@
     UTF-8
     github
     google-cloud-clients
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
     1.23.0
     1.25.0
     0.9.1
diff --git a/google-cloud-examples/README.md b/google-cloud-examples/README.md
index 89650c1a3d84..687ccb13e7c4 100644
--- a/google-cloud-examples/README.md
+++ b/google-cloud-examples/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-examples
-  0.47.0-alpha
+  0.48.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-examples:0.47.0-alpha'
+compile 'com.google.cloud:google-cloud-examples:0.48.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-examples" % "0.47.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-examples" % "0.48.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
index 56d7ea09f3eb..6680368f7d65 100644
--- a/google-cloud-examples/pom.xml
+++ b/google-cloud-examples/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   com.google.cloud
   google-cloud-examples
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud Examples
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-examples
@@ -18,7 +18,7 @@
       
         com.google.cloud
         google-cloud-bom
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         pom
         import
       
diff --git a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
index d9fc20c4e505..b2bcb7c5d694 100644
--- a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
+++ b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appengineflexcompat
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
 
   
diff --git a/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml b/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml
index aaf75038c8a8..17b18508e7ff 100644
--- a/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml
+++ b/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appengineflexcustom
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
 
   
diff --git a/google-cloud-testing/google-cloud-appengineflexjava/pom.xml b/google-cloud-testing/google-cloud-appengineflexjava/pom.xml
index 33c71a555a1b..9d89a79cf9c2 100644
--- a/google-cloud-testing/google-cloud-appengineflexjava/pom.xml
+++ b/google-cloud-testing/google-cloud-appengineflexjava/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appengineflexjava
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
 
   
diff --git a/google-cloud-testing/google-cloud-appenginejava8/pom.xml b/google-cloud-testing/google-cloud-appenginejava8/pom.xml
index fc507b820b75..cbe17d3ea265 100644
--- a/google-cloud-testing/google-cloud-appenginejava8/pom.xml
+++ b/google-cloud-testing/google-cloud-appenginejava8/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appenginejava8
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
 
   
diff --git a/google-cloud-testing/google-cloud-managedtest/pom.xml b/google-cloud-testing/google-cloud-managedtest/pom.xml
index 97d490172194..8368c4f72696 100644
--- a/google-cloud-testing/google-cloud-managedtest/pom.xml
+++ b/google-cloud-testing/google-cloud-managedtest/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-managedtest
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
 
   
     google-cloud-testing
     com.google.cloud
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
 
   
diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml
index 561fe7c3437e..00b757dadcf4 100644
--- a/google-cloud-testing/pom.xml
+++ b/google-cloud-testing/pom.xml
@@ -5,7 +5,7 @@
   4.0.0
   com.google.cloud
   google-cloud-testing
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   pom
 
   Google Cloud Testing
@@ -30,7 +30,7 @@
       
         com.google.cloud
         google-cloud-bom
-        0.47.1-alpha-SNAPSHOT
+        0.48.0-alpha
         pom
         import
       
diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml
index 348764adf9cf..cb9918696f85 100644
--- a/google-cloud-util/google-cloud-compat-checker/pom.xml
+++ b/google-cloud-util/google-cloud-compat-checker/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-compat-checker
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   jar
   Google Cloud Java Compatibility Checker
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util/google-cloud-compat-checker
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-util
-    0.47.1-alpha-SNAPSHOT
+    0.48.0-alpha
   
   
     google-cloud-compat-checker
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index 85575a68c3b9..76322bdc2e73 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   com.google.cloud
   google-cloud-util
-  0.47.1-alpha-SNAPSHOT
+  0.48.0-alpha
   pom
   Google Cloud Util
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util
diff --git a/versions.txt b/versions.txt
index 6108422da5ee..6929406101eb 100644
--- a/versions.txt
+++ b/versions.txt
@@ -5,132 +5,132 @@
 # google-api-grpc versions
 #
 # parent
-google-api-grpc:0.12.0:0.12.1-SNAPSHOT
+google-api-grpc:0.13.0:0.13.0
 # children
 #grpc-google-cloud-datastore-v1
-grpc-google-cloud-bigquerydatatransfer-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-bigtable-admin-v2:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-bigtable-v2:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-container-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-dataproc-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-dialogflow-v2:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-dialogflow-v2beta1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-dlp-v2:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-error-reporting-v1beta1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-firestore-v1beta1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-language-v1:1.11.0:1.11.1-SNAPSHOT
-grpc-google-cloud-language-v1beta2:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-logging-v2:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-monitoring-v3:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-os-login-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-pubsub-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-spanner-admin-database-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-spanner-admin-instance-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-spanner-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-speech-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-speech-v1beta1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-speech-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-texttospeech-v1beta1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-trace-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-trace-v2:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-video-intelligence-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-video-intelligence-v1beta1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-video-intelligence-v1beta2:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-video-intelligence-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-vision-v1:1.11.0:1.11.1-SNAPSHOT
-grpc-google-cloud-vision-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT
-grpc-google-cloud-iot-v1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-redis-v1beta1:0.12.0:0.12.1-SNAPSHOT
-grpc-google-cloud-websecurityscanner-v1alpha:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-bigquerydatatransfer-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-bigtable-admin-v2:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-bigtable-v2:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-container-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-dataproc-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-dialogflow-v2:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-dialogflow-v2beta1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-dlp-v2:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-error-reporting-v1beta1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-firestore-v1beta1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-language-v1:1.11.0:1.11.1-SNAPSHOT
-proto-google-cloud-language-v1beta2:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-logging-v2:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-monitoring-v3:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-os-login-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-pubsub-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-spanner-admin-database-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-spanner-admin-instance-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-spanner-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-speech-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-speech-v1beta1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-speech-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-texttospeech-v1beta1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-trace-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-trace-v2:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-video-intelligence-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-video-intelligence-v1beta1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-video-intelligence-v1beta2:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-video-intelligence-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-vision-v1:1.11.0:1.11.1-SNAPSHOT
-proto-google-cloud-vision-v1p1beta1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-vision-v1p2beta1:1.11.0:1.11.1-SNAPSHOT
-proto-google-cloud-iot-v1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-redis-v1beta1:0.12.0:0.12.1-SNAPSHOT
-proto-google-cloud-websecurityscanner-v1alpha:0.12.0:0.12.1-SNAPSHOT
+grpc-google-cloud-bigquerydatatransfer-v1:0.13.0:0.13.0
+grpc-google-cloud-bigtable-admin-v2:0.13.0:0.13.0
+grpc-google-cloud-bigtable-v2:0.13.0:0.13.0
+grpc-google-cloud-container-v1:0.13.0:0.13.0
+grpc-google-cloud-dataproc-v1:0.13.0:0.13.0
+grpc-google-cloud-dialogflow-v2:0.13.0:0.13.0
+grpc-google-cloud-dialogflow-v2beta1:0.13.0:0.13.0
+grpc-google-cloud-dlp-v2:0.13.0:0.13.0
+grpc-google-cloud-error-reporting-v1beta1:0.13.0:0.13.0
+grpc-google-cloud-firestore-v1beta1:0.13.0:0.13.0
+grpc-google-cloud-language-v1:1.12.0:1.12.0
+grpc-google-cloud-language-v1beta2:0.13.0:0.13.0
+grpc-google-cloud-logging-v2:0.13.0:0.13.0
+grpc-google-cloud-monitoring-v3:0.13.0:0.13.0
+grpc-google-cloud-os-login-v1:0.13.0:0.13.0
+grpc-google-cloud-pubsub-v1:0.13.0:0.13.0
+grpc-google-cloud-spanner-admin-database-v1:0.13.0:0.13.0
+grpc-google-cloud-spanner-admin-instance-v1:0.13.0:0.13.0
+grpc-google-cloud-spanner-v1:0.13.0:0.13.0
+grpc-google-cloud-speech-v1:0.13.0:0.13.0
+grpc-google-cloud-speech-v1beta1:0.13.0:0.13.0
+grpc-google-cloud-speech-v1p1beta1:0.13.0:0.13.0
+grpc-google-cloud-texttospeech-v1beta1:0.13.0:0.13.0
+grpc-google-cloud-trace-v1:0.13.0:0.13.0
+grpc-google-cloud-trace-v2:0.13.0:0.13.0
+grpc-google-cloud-video-intelligence-v1:0.13.0:0.13.0
+grpc-google-cloud-video-intelligence-v1beta1:0.13.0:0.13.0
+grpc-google-cloud-video-intelligence-v1beta2:0.13.0:0.13.0
+grpc-google-cloud-video-intelligence-v1p1beta1:0.13.0:0.13.0
+grpc-google-cloud-vision-v1:1.12.0:1.12.0
+grpc-google-cloud-vision-v1p1beta1:0.13.0:0.13.0
+grpc-google-cloud-vision-v1p2beta1:1.12.0:1.12.0
+grpc-google-cloud-iot-v1:0.13.0:0.13.0
+grpc-google-cloud-redis-v1beta1:0.13.0:0.13.0
+grpc-google-cloud-websecurityscanner-v1alpha:0.13.0:0.13.0
+proto-google-cloud-bigquerydatatransfer-v1:0.13.0:0.13.0
+proto-google-cloud-bigtable-admin-v2:0.13.0:0.13.0
+proto-google-cloud-bigtable-v2:0.13.0:0.13.0
+proto-google-cloud-container-v1:0.13.0:0.13.0
+proto-google-cloud-dataproc-v1:0.13.0:0.13.0
+proto-google-cloud-datastore-v1:0.13.0:0.13.0
+proto-google-cloud-dialogflow-v2:0.13.0:0.13.0
+proto-google-cloud-dialogflow-v2beta1:0.13.0:0.13.0
+proto-google-cloud-dlp-v2:0.13.0:0.13.0
+proto-google-cloud-error-reporting-v1beta1:0.13.0:0.13.0
+proto-google-cloud-firestore-v1beta1:0.13.0:0.13.0
+proto-google-cloud-language-v1:1.12.0:1.12.0
+proto-google-cloud-language-v1beta2:0.13.0:0.13.0
+proto-google-cloud-logging-v2:0.13.0:0.13.0
+proto-google-cloud-monitoring-v3:0.13.0:0.13.0
+proto-google-cloud-os-login-v1:0.13.0:0.13.0
+proto-google-cloud-pubsub-v1:0.13.0:0.13.0
+proto-google-cloud-spanner-admin-database-v1:0.13.0:0.13.0
+proto-google-cloud-spanner-admin-instance-v1:0.13.0:0.13.0
+proto-google-cloud-spanner-v1:0.13.0:0.13.0
+proto-google-cloud-speech-v1:0.13.0:0.13.0
+proto-google-cloud-speech-v1beta1:0.13.0:0.13.0
+proto-google-cloud-speech-v1p1beta1:0.13.0:0.13.0
+proto-google-cloud-texttospeech-v1beta1:0.13.0:0.13.0
+proto-google-cloud-trace-v1:0.13.0:0.13.0
+proto-google-cloud-trace-v2:0.13.0:0.13.0
+proto-google-cloud-video-intelligence-v1:0.13.0:0.13.0
+proto-google-cloud-video-intelligence-v1beta1:0.13.0:0.13.0
+proto-google-cloud-video-intelligence-v1beta2:0.13.0:0.13.0
+proto-google-cloud-video-intelligence-v1p1beta1:0.13.0:0.13.0
+proto-google-cloud-vision-v1:1.12.0:1.12.0
+proto-google-cloud-vision-v1p1beta1:0.13.0:0.13.0
+proto-google-cloud-vision-v1p2beta1:1.12.0:1.12.0
+proto-google-cloud-iot-v1:0.13.0:0.13.0
+proto-google-cloud-redis-v1beta1:0.13.0:0.13.0
+proto-google-cloud-websecurityscanner-v1alpha:0.13.0:0.13.0
 
 #
 # google-cloud-clients versions
 #
 # parent
-google-cloud-clients:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
+google-cloud-clients:0.48.0-alpha:0.48.0-alpha
 # children
-google-cloud-appengineflexcompat:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-appengineflexcustom:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-appengineflexjava:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-appenginejava8:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-bigquery:1.29.0:1.29.1-SNAPSHOT
-google-cloud-bigquerydatatransfer:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-bigtable:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-bom:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-compat-checker:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-compute:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-container:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-contrib:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-core:1.29.0:1.29.1-SNAPSHOT
-google-cloud-core-grpc:1.29.0:1.29.1-SNAPSHOT
-google-cloud-core-http:1.29.0:1.29.1-SNAPSHOT
-google-cloud-dataproc:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-datastore:1.29.0:1.29.1-SNAPSHOT
-google-cloud-dialogflow:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-dlp:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-dns:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-errorreporting:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-examples:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-firestore:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-language:1.29.0:1.29.1-SNAPSHOT
-google-cloud-logging:1.29.0:1.29.1-SNAPSHOT
-google-cloud-logging-logback:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-managedtest:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-monitoring:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-nio:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-nio-examples:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-notification:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-os-login:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-pubsub:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-redis:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-resourcemanager:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-spanner:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-speech:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-storage:1.29.0:1.29.1-SNAPSHOT
-google-cloud-texttospeech:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-testing:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-trace:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-translate:1.29.0:1.29.1-SNAPSHOT
-google-cloud-util:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
-google-cloud-video-intelligence:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-vision:1.29.0:1.29.1-SNAPSHOT
-google-cloud-iot:0.47.0-beta:0.47.1-beta-SNAPSHOT
-google-cloud-websecurityscanner:0.47.0-alpha:0.47.1-alpha-SNAPSHOT
+google-cloud-appengineflexcompat:0.48.0-alpha:0.48.0-alpha
+google-cloud-appengineflexcustom:0.48.0-alpha:0.48.0-alpha
+google-cloud-appengineflexjava:0.48.0-alpha:0.48.0-alpha
+google-cloud-appenginejava8:0.48.0-alpha:0.48.0-alpha
+google-cloud:0.48.0-alpha:0.48.0-alpha
+google-cloud-bigquery:1.30.0:1.30.0
+google-cloud-bigquerydatatransfer:0.48.0-beta:0.48.0-beta
+google-cloud-bigtable:0.48.0-alpha:0.48.0-alpha
+google-cloud-bom:0.48.0-alpha:0.48.0-alpha
+google-cloud-compat-checker:0.48.0-alpha:0.48.0-alpha
+google-cloud-compute:0.48.0-alpha:0.48.0-alpha
+google-cloud-container:0.48.0-beta:0.48.0-beta
+google-cloud-contrib:0.48.0-alpha:0.48.0-alpha
+google-cloud-core:1.30.0:1.30.0
+google-cloud-core-grpc:1.30.0:1.30.0
+google-cloud-core-http:1.30.0:1.30.0
+google-cloud-dataproc:0.48.0-alpha:0.48.0-alpha
+google-cloud-datastore:1.30.0:1.30.0
+google-cloud-dialogflow:0.48.0-alpha:0.48.0-alpha
+google-cloud-dlp:0.48.0-beta:0.48.0-beta
+google-cloud-dns:0.48.0-alpha:0.48.0-alpha
+google-cloud-errorreporting:0.48.0-beta:0.48.0-beta
+google-cloud-examples:0.48.0-alpha:0.48.0-alpha
+google-cloud-firestore:0.48.0-beta:0.48.0-beta
+google-cloud-language:1.30.0:1.30.0
+google-cloud-logging:1.30.0:1.30.0
+google-cloud-logging-logback:0.48.0-alpha:0.48.0-alpha
+google-cloud-managedtest:0.48.0-alpha:0.48.0-alpha
+google-cloud-monitoring:0.48.0-beta:0.48.0-beta
+google-cloud-nio:0.48.0-alpha:0.48.0-alpha
+google-cloud-nio-examples:0.48.0-alpha:0.48.0-alpha
+google-cloud-notification:0.48.0-beta:0.48.0-beta
+google-cloud-os-login:0.48.0-alpha:0.48.0-alpha
+google-cloud-pubsub:0.48.0-beta:0.48.0-beta
+google-cloud-redis:0.48.0-alpha:0.48.0-alpha
+google-cloud-resourcemanager:0.48.0-alpha:0.48.0-alpha
+google-cloud-spanner:0.48.0-beta:0.48.0-beta
+google-cloud-speech:0.48.0-alpha:0.48.0-alpha
+google-cloud-storage:1.30.0:1.30.0
+google-cloud-texttospeech:0.48.0-beta:0.48.0-beta
+google-cloud-testing:0.48.0-alpha:0.48.0-alpha
+google-cloud-trace:0.48.0-beta:0.48.0-beta
+google-cloud-translate:1.30.0:1.30.0
+google-cloud-util:0.48.0-alpha:0.48.0-alpha
+google-cloud-video-intelligence:0.48.0-beta:0.48.0-beta
+google-cloud-vision:1.30.0:1.30.0
+google-cloud-iot:0.48.0-beta:0.48.0-beta
+google-cloud-websecurityscanner:0.48.0-alpha:0.48.0-alpha

From 28476093f357cb4b46dc65ddb3d6d7e8bb4cc02b Mon Sep 17 00:00:00 2001
From: Frank Natividad 
Date: Mon, 21 May 2018 12:23:56 -0700
Subject: [PATCH 41/65] Update storage api client library version

---
 google-cloud-clients/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index d33a07e6cfc3..0c81c971a006 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -213,7 +213,7 @@
       
         com.google.apis
         google-api-services-storage
-        v1-rev114-1.23.0
+        v1-rev131-1.23.0
       
       
         com.google.apis

From 94a4b5648607953030555908d301c57e79c5afca Mon Sep 17 00:00:00 2001
From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com>
Date: Mon, 21 May 2018 14:01:41 -0700
Subject: [PATCH 42/65] Post-release cleanup and fixes (specific to recent
 repository restructure) (#3290)

1) Fix poms deployment config.
2) Fix documentaiton links in readmes.
3) Update main README (remove `goolge-cloud` metapackage reference).
4) Update `RELEASING.md` to reflect changes. The instructions try to avoid having mysterious scripts running in the release process and also ensures that all disruptive operations (actual release/push) are done explicitly and not somewhere in the middle of a mysterious script.
5) Remove `deploy.sh` and `finalize_release.sh` scripts.
6) Fix few previously broken links (bigquerydatatransfer and compute apidocs links)
---
 README.md                                     | 21 +++++++---------
 RELEASING.md                                  | 22 ++++++++--------
 google-api-grpc/pom.xml                       | 13 ++++++++++
 .../google-cloud-bigquery/README.md           |  2 +-
 .../README.md                                 |  2 +-
 .../google-cloud-bigtable/README.md           |  2 +-
 .../google-cloud-compute/README.md            |  2 +-
 .../google-cloud-container/README.md          |  2 +-
 .../google-cloud-logging-logback/README.md    |  2 +-
 .../google-cloud-dataproc/README.md           |  2 +-
 .../google-cloud-datastore/README.md          |  4 +--
 .../google-cloud-dialogflow/README.md         |  2 +-
 .../google-cloud-dlp/README.md                |  2 +-
 .../google-cloud-dns/README.md                |  2 +-
 .../google-cloud-errorreporting/README.md     |  2 +-
 .../google-cloud-firestore/README.md          |  2 +-
 .../google-cloud-iot/README.md                |  2 +-
 .../google-cloud-language/README.md           |  2 +-
 .../google-cloud-logging/README.md            |  2 +-
 .../google-cloud-monitoring/README.md         |  2 +-
 .../google-cloud-notification/README.md       |  2 +-
 .../google-cloud-os-login/README.md           |  2 +-
 .../google-cloud-pubsub/README.md             |  2 +-
 .../google-cloud-redis/README.md              |  2 +-
 .../google-cloud-spanner/README.md            |  2 +-
 .../google-cloud-speech/README.md             |  2 +-
 .../google-cloud-storage/README.md            |  4 +--
 .../google-cloud-texttospeech/README.md       |  2 +-
 .../google-cloud-trace/README.md              |  2 +-
 .../google-cloud-translate/README.md          |  2 +-
 .../google-cloud-video-intelligence/README.md |  2 +-
 .../google-cloud-vision/README.md             |  2 +-
 .../google-cloud-websecurityscanner/README.md |  2 +-
 google-cloud-examples/pom.xml                 |  8 ++++++
 google-cloud-testing/pom.xml                  |  8 ++++++
 .../google-cloud-compat-checker/pom.xml       |  8 ++++++
 google-cloud-util/pom.xml                     |  8 ++++++
 pom.xml                                       | 20 +++++++++++++++
 utilities/deploy.sh                           | 25 -------------------
 utilities/finalize_release.sh                 | 16 ------------
 utilities/stage_sites.py                      |  2 +-
 41 files changed, 118 insertions(+), 97 deletions(-)
 delete mode 100755 utilities/deploy.sh
 delete mode 100755 utilities/finalize_release.sh

diff --git a/README.md b/README.md
index 0a930de8e134..8792fba1fd37 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ This library supports the following Google Cloud Platform services with clients
 -  [Cloud Video Intelligence](google-cloud-clients/google-cloud-video-intelligence) (Beta)
 -  [Stackdriver Trace](google-cloud-clients/google-cloud-trace) (Beta)
 -  [Text-to-Speech](google-cloud-clients/google-cloud-texttospeech) (Beta)
+-  [IoT](google-cloud-clients/google-cloud-iot) (Beta)
 
 This library supports the following Google Cloud Platform services with clients at an [Alpha](#versioning) quality level:
 
@@ -43,6 +44,7 @@ This library supports the following Google Cloud Platform services with clients
 -  [Cloud Resource Manager](google-cloud-clients/google-cloud-resourcemanager) (Alpha)
 -  [Cloud Speech](google-cloud-clients/google-cloud-speech) (Alpha)
 -  [Dialogflow](google-cloud-clients/google-cloud-dialogflow) (Alpha)
+-  [Web Security Scanner](google-cloud-clients/google-cloud-websecurityscanner) (Alpha)
 
 These libraries are deprecated and no longer receive updates:
 
@@ -51,32 +53,27 @@ These libraries are deprecated and no longer receive updates:
 Quickstart
 ----------
 
-The easy way to get started is to add the umbrella package which pulls in all of the supported clients as
-dependencies. Note that even though the version of the umbrella package is Alpha, the individual clients are
-at different support levels (Alpha, Beta, and GA).
+To call any of the supported Google Cloud Services simply add a corresponding client library artifact as a dependency to your project. The following instructions use `google-cloud-storage` as an example (specific instructions can be found in the README of each client).
 
-[//]: # ({x-version-update-start:google-cloud:released})
+[//]: # ({x-version-update-start:google-cloud-storage:released})
 If you are using Maven, add this to your pom.xml file
 ```xml
 
   com.google.cloud
-  google-cloud
-  0.48.0-alpha
+  google-cloud-storage
+  1.30.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-storage:1.30.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.30.0"
 ```
 [//]: # ({x-version-update-end})
 
-It also works just as well to declare a dependency only on the specific clients that you need. See the README of
-each client for instructions.
-
 If you're using IntelliJ or Eclipse, you can add client libraries to your project using these IDE plugins: 
 * [Cloud Tools for IntelliJ](https://cloud.google.com/tools/intellij/docs/client-libraries)
 * [Cloud Tools for Eclipse](https://cloud.google.com/eclipse/docs/libraries)
@@ -361,4 +358,4 @@ Apache 2.0 - See [LICENSE] for more information.
 
 [cloud-platform]: https://cloud.google.com/
 [cloud-platform-docs]: https://cloud.google.com/docs/
-[client-lib-docs]: http://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/
+[client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html
diff --git a/RELEASING.md b/RELEASING.md
index 84c850162c1d..044fc12ce298 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -91,27 +91,27 @@ To push a release version
 
 7. To ensure a clean build, remove *all* Maven targets (including subdirectories not handled by `mvn clean`) by running `rm -rf target */target`.
 
-8. Run `utilities/stage_release.sh`.
-This script builds and stages the release artifact on the Maven Central Repository, updates the README.md files with the release version + commits them locally, and finally generates a new site version for the gh-pages branch under a temporary directory named `tmp_gh-pages`. If you haven't run the release process before, it's worth verifying everything; check the staged release on the Sonatype website, and verify that the local commits have the right version updates.
+8. Run `python utilities/stage_sites.py`.
+This script checks out `gh-pages` branch of the repository, builds the documentation site and javadocs, copies them to the branch and commits it. This script does not push the docs and it must be done manually on the later step. The script assumes that there is no directory called `tmp_gh-pages` in the repository root, remove that directory, if exists, before running the script.
 
-If you experience failures, you may need to:
-- repeat the clean step above
-- remove the temporary directory created to store docs by running `rm -rf tmp_gh-pages`
-- remove staged repositories from Sonatype (to prevent them from being released in subsequent steps): if a staged repository appears [here](https://oss.sonatype.org/#nexus-search;quick~com.google.cloud), remove it by running `mvn nexus-staging:drop`.
+9. Check that you are not trying to release a SNAPSHOT build (the artifacts versions do not have "-SNAPSHOT" suffix) and then run `mvn clean deploy -DskipTests=true --settings ~/.m2/settings.xml -P release` command. It will build and deploy artifacts to the staging repository. 
 
-9. Run `utilities/finalize_release.sh`.
-This script will release the staged artifact on the Maven Central Repository and push the README.md and gh-pages updates to github.
+10. Run `mvn nexus-staging:release` to release the artifacts. 
 
-10. Publish a release on Github manually.
+11. Run `cd tmp_gh-pages && git push && cd ..` to push the previously generated docs (step 8).
+
+12. Run `rm -rf tmp_gh-pages` to remove the generated docs directory from your local machine. 
+
+13. Publish a release on Github manually.
 Go to the [releases page](https://github.com/GoogleCloudPlatform/google-cloud-java/releases) and open the appropriate release draft. Make sure the "Tag Version" is `vX.Y.Z` and the "Release Title" is `X.Y.Z`, where `X.Y.Z` is the release version as listed in the `pom.xml` files. 
   
   Add the commits since the last release into the release draft. Try to group them into sections with related changes. Anything that is a breaking change needs to be marked with `*breaking change*`. Such changes are only allowed for alpha/beta modules and `@BetaApi` features.
 
   Ensure that the format is consistent with previous releases (for an example, see the [0.1.0 release](https://github.com/GoogleCloudPlatform/google-cloud-java/releases/tag/v0.1.0)).  After adding any missing updates and reformatting as necessary, publish the draft.
 
-11. Run `python utilities/bump_versions.py next_snapshot patch` to include "-SNAPSHOT" in the current project version (Alternatively, update the versions in `versions.txt` to the correct versions for the next release.). Then, run `python utilities/replace_versions.py` to update the `pom.xml` files. (If you see updates in `README.md` files at this step, you probably did something wrong.)
+14. Run `python utilities/bump_versions.py next_snapshot patch` to include "-SNAPSHOT" in the current project version (Alternatively, update the versions in `versions.txt` to the correct versions for the next release.). Then, run `python utilities/replace_versions.py` to update the `pom.xml` files. (If you see updates in `README.md` files at this step, you probably did something wrong.)
 
-13. Create and merge in another PR to reflect the updated project version.
+15. Create and merge in another PR to reflect the updated project version.
 
 Improvements
 ============
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 109f3373f8ff..5fb7eb0e0bf9 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -686,6 +686,19 @@
               
             
           
+          
+            org.apache.maven.plugins
+            maven-javadoc-plugin
+            2.10.3
+            
+              
+                attach-javadocs
+                
+                  jar
+                
+              
+            
+          
         
       
     
diff --git a/google-cloud-clients/google-cloud-bigquery/README.md b/google-cloud-clients/google-cloud-bigquery/README.md
index a7cdb356daa9..cd07059f3449 100644
--- a/google-cloud-clients/google-cloud-bigquery/README.md
+++ b/google-cloud-clients/google-cloud-bigquery/README.md
@@ -245,4 +245,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-bigquery]: https://cloud.google.com/bigquery/
 [cloud-storage]: https://cloud.google.com/storage/
 [bigquery-product-docs]: https://cloud.google.com/bigquery/docs/
-[bigquery-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/bigquery/package-summary.html
+[bigquery-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/bigquery/package-summary.html
diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md b/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md
index a3a407f38ab0..f94c5053a3d6 100644
--- a/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md
+++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md
@@ -115,4 +115,4 @@ Apache 2.0 - See [LICENSE] for more information.
 
 [cloud-bigquerydatatransfer]: https://cloud.google.com/bigquery/docs/transfer-service-overview
 [bigquerydatatransfer-product-docs]: https://cloud.google.com/bigquery/docs/transfer-service-overview
-[bigquerydatatransfer-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/bigquerydatatransfer/v1/package-summary.html
+[bigquerydatatransfer-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/bigquery/datatransfer/v1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-bigtable/README.md b/google-cloud-clients/google-cloud-bigtable/README.md
index f39b00a2fc73..fe8d8b30d608 100644
--- a/google-cloud-clients/google-cloud-bigtable/README.md
+++ b/google-cloud-clients/google-cloud-bigtable/README.md
@@ -171,4 +171,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [cloud-bigtable]: https://cloud.google.com/bigtable/
 [bigtable-product-docs]: https://cloud.google.com/bigtable/docs/
-[bigtable-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/bigtable/package-summary.html
+[bigtable-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/bigtable/package-summary.html
diff --git a/google-cloud-clients/google-cloud-compute/README.md b/google-cloud-clients/google-cloud-compute/README.md
index 75ad65bd7775..52bdc19fbc89 100644
--- a/google-cloud-clients/google-cloud-compute/README.md
+++ b/google-cloud-clients/google-cloud-compute/README.md
@@ -276,4 +276,4 @@ Apache 2.0 - See [LICENSE] for more information.
 
 [cloud-compute]: https://cloud.google.com/compute/
 [compute-product-docs]: https://cloud.google.com/compute/docs/
-[compute-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/compute/package-summary.html
+[compute-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/compute/deprecated/package-summary.html
diff --git a/google-cloud-clients/google-cloud-container/README.md b/google-cloud-clients/google-cloud-container/README.md
index 2cc80d379b2b..2eb4b8959cbc 100644
--- a/google-cloud-clients/google-cloud-container/README.md
+++ b/google-cloud-clients/google-cloud-container/README.md
@@ -117,4 +117,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-container]: https://cloud.google.com/kubernetes-engine/
 [cloud-container-quickstart]: https://cloud.google.com/kubernetes-engine/docs/quickstart
 [container-product-docs]: https://cloud.google.com/kubernetes-engine/docs/
-[container-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/container/v1/package-summary.html
+[container-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/container/v1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md
index d9d74a1cffbb..a486a65ab458 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md
@@ -7,7 +7,7 @@ Logback appender `com.google.cloud.logging.logback.LoggingAppender` for
 This library allows you to use [Logback](https://logback.qos.ch/) configuration and the [Slf4j](https://www.slf4j.org/) interface to log via Google Cloud logging.
 
 -  [Homepage](https://googlecloudplatform.github.io/google-cloud-java/)
--  [API Documentation](https://googlecloudplatform.github.io/google-cloud-java/apidocs/index.html?com/google/cloud/logging/logback/LoggingAppender.html)
+-  [API Documentation](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/logging/logback/LoggingAppender.html)
 
 > Note: This client is a work-in-progress, and may occasionally
 > make backwards-incompatible changes.
diff --git a/google-cloud-clients/google-cloud-dataproc/README.md b/google-cloud-clients/google-cloud-dataproc/README.md
index ee0896697c7c..5a94cc74de2f 100644
--- a/google-cloud-clients/google-cloud-dataproc/README.md
+++ b/google-cloud-clients/google-cloud-dataproc/README.md
@@ -117,5 +117,5 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-dataproc]: https://cloud.google.com/dataproc/
 [cloud-dataproc-quickstart]: https://cloud.google.com/dataproc/quickstart-console#before-you-begin
 [dataproc-product-docs]: https://cloud.google.com/dataproc/docs/
-[dataproc-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/dataproc/v1/package-summary.html
+[dataproc-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/dataproc/v1/package-summary.html
 [auth]: https://cloud.google.com/docs/authentication/getting-started
diff --git a/google-cloud-clients/google-cloud-datastore/README.md b/google-cloud-clients/google-cloud-datastore/README.md
index 1fc8af4e9b5b..d087855ac7b4 100644
--- a/google-cloud-clients/google-cloud-datastore/README.md
+++ b/google-cloud-clients/google-cloud-datastore/README.md
@@ -36,7 +36,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.30.0"
 
 Example Applications
 --------------------
-- [`DatastoreExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore.  Read more about using the application on the [`DatastoreExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html).
+- [`DatastoreExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore.  Read more about using the application on the [`DatastoreExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html).
 - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
   - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
 - [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site.
@@ -226,4 +226,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-datastore-activation]: https://cloud.google.com/datastore/docs/activate
 [cloud-datastore]: https://cloud.google.com/datastore/
 [datastore-product-docs]: https://cloud.google.com/datastore/docs/
-[datastore-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/datastore/package-summary.html
+[datastore-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/datastore/package-summary.html
diff --git a/google-cloud-clients/google-cloud-dialogflow/README.md b/google-cloud-clients/google-cloud-dialogflow/README.md
index c5f642d494a0..ea699cc7d84e 100644
--- a/google-cloud-clients/google-cloud-dialogflow/README.md
+++ b/google-cloud-clients/google-cloud-dialogflow/README.md
@@ -101,4 +101,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [dialogflow]: https://dialogflow.com/
 [dialogflow-standard-product-docs]: https://dialogflow.com/docs
 [dialogflow-enterprise-product-docs]: https://cloud.google.com/dialogflow-enterprise/docs/
-[dialogflow-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/dialogflow/v2beta1/package-summary.html
+[dialogflow-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/dialogflow/v2beta1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-dlp/README.md b/google-cloud-clients/google-cloud-dlp/README.md
index 37263a698809..5fcbd57301e6 100644
--- a/google-cloud-clients/google-cloud-dlp/README.md
+++ b/google-cloud-clients/google-cloud-dlp/README.md
@@ -103,4 +103,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [cloud-dlp]: https://cloud.google.com/dlp/
 [dlp-product-docs]: https://cloud.google.com/dlp/docs/
-[dlp-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/dlp/v2beta1/package-summary.html
+[dlp-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/dlp/v2/package-summary.html
diff --git a/google-cloud-clients/google-cloud-dns/README.md b/google-cloud-clients/google-cloud-dns/README.md
index d0967dc8b099..e950cb879887 100644
--- a/google-cloud-clients/google-cloud-dns/README.md
+++ b/google-cloud-clients/google-cloud-dns/README.md
@@ -394,4 +394,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-dns]: https://cloud.google.com/dns/
 [cloud-dns-activate]: https://cloud.google.com/dns/getting-started#prerequisites
 [dns-product-docs]: https://cloud.google.com/dns/docs/
-[dns-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/dns/package-summary.html
+[dns-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/dns/package-summary.html
diff --git a/google-cloud-clients/google-cloud-errorreporting/README.md b/google-cloud-clients/google-cloud-errorreporting/README.md
index f03b85d04023..e1a8586dab1b 100644
--- a/google-cloud-clients/google-cloud-errorreporting/README.md
+++ b/google-cloud-clients/google-cloud-errorreporting/README.md
@@ -102,4 +102,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [stackdriver-error-reporting]: https://cloud.google.com/error-reporting/
 [error-reporting-product-docs]: https://cloud.google.com/error-reporting/docs/
-[error-reporting-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/errorreporting/v1beta1/package-summary.html
+[error-reporting-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/errorreporting/v1beta1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-firestore/README.md b/google-cloud-clients/google-cloud-firestore/README.md
index dbccad4bc8ee..d8679c8f1f48 100644
--- a/google-cloud-clients/google-cloud-firestore/README.md
+++ b/google-cloud-clients/google-cloud-firestore/README.md
@@ -3,7 +3,7 @@ Google Cloud Java Client for Firestore
 
 
 -  [Product Documentation](https://cloud.google.com/firestore/docs/)
--  [Client Library Documentation](https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/firestore/package-summary.html)
+-  [Client Library Documentation](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/firestore/package-summary.html)
 
 Quickstart
 ----------
diff --git a/google-cloud-clients/google-cloud-iot/README.md b/google-cloud-clients/google-cloud-iot/README.md
index a8f934369ca9..eb2fc8b008b9 100644
--- a/google-cloud-clients/google-cloud-iot/README.md
+++ b/google-cloud-clients/google-cloud-iot/README.md
@@ -99,4 +99,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [cloud-iot]: https://cloud.google.com/iot-core
 [iot-product-docs]: https://cloud.google.com/iot-core/docs
-[iot-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/iot/v1/package-summary.html
+[iot-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/iot/v1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-language/README.md b/google-cloud-clients/google-cloud-language/README.md
index 447c86968a39..1632714ab117 100644
--- a/google-cloud-clients/google-cloud-language/README.md
+++ b/google-cloud-clients/google-cloud-language/README.md
@@ -129,4 +129,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [cloud-language]: https://cloud.google.com/natural-language/
 [language-product-docs]: https://cloud.google.com/natural-language/docs/
-[language-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/language/v1beta2/package-summary.html
+[language-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/language/v1beta2/package-summary.html
diff --git a/google-cloud-clients/google-cloud-logging/README.md b/google-cloud-clients/google-cloud-logging/README.md
index 3aaeb33f3fb8..518bd62ab07e 100644
--- a/google-cloud-clients/google-cloud-logging/README.md
+++ b/google-cloud-clients/google-cloud-logging/README.md
@@ -229,4 +229,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [stackdriver-logging]: https://cloud.google.com/logging/
 [stackdriver-logging-quickstart]: https://cloud.google.com/logging/docs/quickstart-sdk
 [logging-product-docs]: https://cloud.google.com/logging/docs/
-[logging-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/logging/package-summary.html
+[logging-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/logging/package-summary.html
diff --git a/google-cloud-clients/google-cloud-monitoring/README.md b/google-cloud-clients/google-cloud-monitoring/README.md
index b82b6723a192..1ec637d80862 100644
--- a/google-cloud-clients/google-cloud-monitoring/README.md
+++ b/google-cloud-clients/google-cloud-monitoring/README.md
@@ -99,4 +99,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [stackdriver-monitoring]: https://cloud.google.com/monitoring/
 [monitoring-product-docs]: https://cloud.google.com/monitoring/docs/
-[monitoring-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/monitoring/v3/package-summary.html
+[monitoring-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/monitoring/v3/package-summary.html
diff --git a/google-cloud-clients/google-cloud-notification/README.md b/google-cloud-clients/google-cloud-notification/README.md
index d84c605fa585..d2cdb43a0a44 100644
--- a/google-cloud-clients/google-cloud-notification/README.md
+++ b/google-cloud-clients/google-cloud-notification/README.md
@@ -3,7 +3,7 @@ Google Cloud Java Client for Cloud Pub/Sub Notifications
 
 
 -  [Product Documentation](https://cloud.google.com/storage/docs/pubsub-notifications)
--  [Client Library Documentation](https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/notification/package-summary.html)
+-  [Client Library Documentation](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/notification/package-summary.html)
 
 Quickstart
 ----------
diff --git a/google-cloud-clients/google-cloud-os-login/README.md b/google-cloud-clients/google-cloud-os-login/README.md
index 4bda056bdac2..550cea3e661c 100644
--- a/google-cloud-clients/google-cloud-os-login/README.md
+++ b/google-cloud-clients/google-cloud-os-login/README.md
@@ -108,5 +108,5 @@ Apache 2.0 - See [LICENSE] for more information.
 [TESTING]: https://github.com/GoogleCloudPlatform/google-cloud-java/blob/master/TESTING.md
 
 [cloud-os-login]: https://cloud.google.com/compute/docs/oslogin/rest/
-[os-login-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/oslogin/v1/package-summary.html
+[os-login-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/oslogin/v1/package-summary.html
 [auth]: https://cloud.google.com/docs/authentication/getting-started
diff --git a/google-cloud-clients/google-cloud-pubsub/README.md b/google-cloud-clients/google-cloud-pubsub/README.md
index 3bcba6446be5..7c52f35873b5 100644
--- a/google-cloud-clients/google-cloud-pubsub/README.md
+++ b/google-cloud-clients/google-cloud-pubsub/README.md
@@ -246,4 +246,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-pubsub]: https://cloud.google.com/pubsub/
 [cloud-pubsub-quickstart]: https://cloud.google.com/pubsub/quickstart-console#before-you-begin
 [pubsub-product-docs]: https://cloud.google.com/pubsub/docs/
-[pubsub-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/pubsub/v1/package-summary.html
+[pubsub-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/pubsub/v1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-redis/README.md b/google-cloud-clients/google-cloud-redis/README.md
index 0cbddd55343c..9b92a24f97ac 100644
--- a/google-cloud-clients/google-cloud-redis/README.md
+++ b/google-cloud-clients/google-cloud-redis/README.md
@@ -114,4 +114,4 @@ Apache 2.0 - See [LICENSE] for more information.
 
 [cloud-redis]: https://cloud.google.com/memorystore/
 [redis-product-docs]: https://cloud.google.com/memorystore/docs/redis/
-[redis-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/redis/v1/package-summary.html
+[redis-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/redis/v1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-spanner/README.md b/google-cloud-clients/google-cloud-spanner/README.md
index 96f890a43b0a..bcc7d8f65eb9 100644
--- a/google-cloud-clients/google-cloud-spanner/README.md
+++ b/google-cloud-clients/google-cloud-spanner/README.md
@@ -145,4 +145,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [cloud-spanner]: https://cloud.google.com/spanner/
 [spanner-product-docs]: https://cloud.google.com/spanner/docs/
-[spanner-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/spanner/package-summary.html
+[spanner-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/spanner/package-summary.html
diff --git a/google-cloud-clients/google-cloud-speech/README.md b/google-cloud-clients/google-cloud-speech/README.md
index c28d69ce85ae..474e9f51e344 100644
--- a/google-cloud-clients/google-cloud-speech/README.md
+++ b/google-cloud-clients/google-cloud-speech/README.md
@@ -136,4 +136,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [cloud-speech]: https://cloud.google.com/speech/
 [speech-product-docs]: https://cloud.google.com/speech/docs
-[speech-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/speech/v1beta1/package-summary.html
+[speech-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/speech/v1beta1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-storage/README.md b/google-cloud-clients/google-cloud-storage/README.md
index 42a0c161b212..17e424866991 100644
--- a/google-cloud-clients/google-cloud-storage/README.md
+++ b/google-cloud-clients/google-cloud-storage/README.md
@@ -37,7 +37,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.30.0"
 Example Applications
 -------------------
 
-- [`StorageExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java) is a simple command line interface that provides some of Cloud Storage's functionality.  Read more about using the application on the [`StorageExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/?com/google/cloud/examples/storage/StorageExample.html).
+- [`StorageExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java) is a simple command line interface that provides some of Cloud Storage's functionality.  Read more about using the application on the [`StorageExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/storage/StorageExample.html).
 - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
   - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
 - [`Flexible Environment/Storage example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/cloudstorage) - An app that uploads files to a public Cloud Storage bucket on the App Engine Flexible Environment runtime.
@@ -223,4 +223,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-storage-create-bucket]: https://cloud.google.com/storage/docs/cloud-console#_creatingbuckets
 [cloud-storage-activation]:https://cloud.google.com/storage/docs/signup?hl=en
 [storage-product-docs]: https://cloud.google.com/storage/docs/
-[storage-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/storage/package-summary.html
+[storage-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/storage/package-summary.html
diff --git a/google-cloud-clients/google-cloud-texttospeech/README.md b/google-cloud-clients/google-cloud-texttospeech/README.md
index a536652a000c..feef52da2fcd 100644
--- a/google-cloud-clients/google-cloud-texttospeech/README.md
+++ b/google-cloud-clients/google-cloud-texttospeech/README.md
@@ -99,4 +99,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [cloud-texttospeech]: https://cloud.google.com/texttospeech
 [texttospeech-product-docs]: https://cloud.google.com/texttospeech/docs
-[texttospeech-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/texttospeech/v1beta1/package-summary.html
+[texttospeech-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/texttospeech/v1beta1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-trace/README.md b/google-cloud-clients/google-cloud-trace/README.md
index 4be7497b5682..9087665ca5bf 100644
--- a/google-cloud-clients/google-cloud-trace/README.md
+++ b/google-cloud-clients/google-cloud-trace/README.md
@@ -99,4 +99,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [stackdriver-trace]: https://cloud.google.com/trace/
 [trace-product-docs]: https://cloud.google.com/trace/docs/
-[trace-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/trace/v1/package-summary.html
+[trace-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/trace/v1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-translate/README.md b/google-cloud-clients/google-cloud-translate/README.md
index 81960b2b12f5..1136c1684984 100644
--- a/google-cloud-clients/google-cloud-translate/README.md
+++ b/google-cloud-clients/google-cloud-translate/README.md
@@ -204,4 +204,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-translate]: https://cloud.google.com/translate/
 [cloud-translate-quickstart]: https://cloud.google.com/translate/v2/quickstart
 [translate-product-docs]: https://cloud.google.com/translate/docs/
-[translate-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/translate/package-summary.html
+[translate-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/translate/package-summary.html
diff --git a/google-cloud-clients/google-cloud-video-intelligence/README.md b/google-cloud-clients/google-cloud-video-intelligence/README.md
index 01f2bccebc74..f5d503c41c6f 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/README.md
+++ b/google-cloud-clients/google-cloud-video-intelligence/README.md
@@ -103,4 +103,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [cloud-video-intelligence]: https://cloud.google.com/video-intelligence/
 [video-product-docs]: https://cloud.google.com/video-intelligence/docs/
-[video-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/videointelligence/v1/package-summary.html
+[video-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/videointelligence/v1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-vision/README.md b/google-cloud-clients/google-cloud-vision/README.md
index 0b6280b87f2e..ed12897c7261 100644
--- a/google-cloud-clients/google-cloud-vision/README.md
+++ b/google-cloud-clients/google-cloud-vision/README.md
@@ -102,4 +102,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [cloud-vision]: https://cloud.google.com/vision/
 [vision-product-docs]: https://cloud.google.com/vision/docs
-[vision-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/vision/v1/package-summary.html
+[vision-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/vision/v1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/README.md b/google-cloud-clients/google-cloud-websecurityscanner/README.md
index 9779678a22d6..59a8b2bb675f 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/README.md
+++ b/google-cloud-clients/google-cloud-websecurityscanner/README.md
@@ -99,4 +99,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [cloud-websecurityscanner]: https://cloud.google.com/security-scanner
 [websecurityscanner-product-docs]: https://cloud.google.com/security-scanner/docs
-[websecurityscanner-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/index.html?com/google/cloud/websecurityscanner/v1alpha/package-summary.html
+[websecurityscanner-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/websecurityscanner/v1alpha/package-summary.html
diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
index 6680368f7d65..c72fe9b368fe 100644
--- a/google-cloud-examples/pom.xml
+++ b/google-cloud-examples/pom.xml
@@ -188,6 +188,14 @@
           
         
       
+      
+        org.apache.maven.plugins
+        maven-deploy-plugin
+        2.7
+        
+          true
+        
+      
     
   
   
diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml
index 00b757dadcf4..d6cdf6595e71 100644
--- a/google-cloud-testing/pom.xml
+++ b/google-cloud-testing/pom.xml
@@ -101,6 +101,14 @@
           true
         
       
+      
+        org.apache.maven.plugins
+        maven-deploy-plugin
+        2.7
+        
+          true
+        
+      
     
   
 
diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml
index cb9918696f85..f964bbcb1b57 100644
--- a/google-cloud-util/google-cloud-compat-checker/pom.xml
+++ b/google-cloud-util/google-cloud-compat-checker/pom.xml
@@ -103,6 +103,14 @@
           
         
       
+      
+        org.apache.maven.plugins
+        maven-deploy-plugin
+        2.7
+        
+          true
+        
+      
     
   
 
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index 76322bdc2e73..587c74267bbc 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -23,6 +23,14 @@
           true
         
       
+      
+        org.apache.maven.plugins
+        maven-deploy-plugin
+        2.7
+        
+          true
+        
+      
     
   
 
diff --git a/pom.xml b/pom.xml
index d743fdb89e22..58e809ea7b55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,4 +84,24 @@
     google-cloud-testing
     google-cloud-util
   
+  
+    
+      
+        org.apache.maven.plugins
+        maven-site-plugin
+        3.4
+        
+          true
+        
+      
+      
+        org.apache.maven.plugins
+        maven-deploy-plugin
+        2.7
+        
+          true
+        
+      
+    
+  
 
diff --git a/utilities/deploy.sh b/utilities/deploy.sh
deleted file mode 100755
index a84eb0724cd2..000000000000
--- a/utilities/deploy.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SITE_VERSION=$1
-
-if [ -z $SITE_VERSION ]; then
-    echo "First arg (version) not provided, so we're exiting."
-    exit 1
-fi
-
-if [ "${SITE_VERSION##*-}" == "SNAPSHOT" ]; then
-    echo "Deploying Snapshot artifacts..."
-    mvn clean deploy --quiet -Djava.util.logging.config.file=logging.properties -DskipTests=true -Dgpg.skip=true --settings ~/.m2/settings.xml -P release
-else
-    # Deploy Maven artifacts (if they don't exist yet) and update artifact version in READMEs.
-    URL=https://oss.sonatype.org/content/repositories/releases/com/google/cloud/google-cloud/$SITE_VERSION/
-    if curl --output /dev/null --silent --head --fail "$URL"; then
-        echo "Not deploying artifacts because it seems like they already exist."
-        echo "Existence was checked using the url $URL"
-    else
-        echo "Deploying Release artifacts..."
-        mvn clean deploy --quiet -Djava.util.logging.config.file=logging.properties -DskipTests=true --settings ~/.m2/settings.xml -P release
-    fi
-fi
diff --git a/utilities/finalize_release.sh b/utilities/finalize_release.sh
deleted file mode 100755
index 73cda695bfde..000000000000
--- a/utilities/finalize_release.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mvn nexus-staging:release
-
-# Push the version and README updates
-git push
-
-# Push the gh-pages updates
-pushd tmp_gh-pages
-git push
-popd
-
-# Remove gh-pages temporary directory
-rm -rf tmp_gh-pages
diff --git a/utilities/stage_sites.py b/utilities/stage_sites.py
index ef5852926225..6bf7d9df9b6a 100644
--- a/utilities/stage_sites.py
+++ b/utilities/stage_sites.py
@@ -52,5 +52,5 @@ def _run(command, cwd=None):
 
 if __name__ == '__main__':
   stage_sites(['google-api-grpc', 'google-cloud-clients'], 'tmp_gh-pages',
-              'https://github.com/GoogleCloudPlatform/google-cloud-java',
+              'git@github.com:GoogleCloudPlatform/google-cloud-java.git',
               'https://googlecloudplatform.github.io/google-cloud-java')

From bab9b1831270dafb295136fad5cc60bca348bb14 Mon Sep 17 00:00:00 2001
From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com>
Date: Mon, 21 May 2018 14:56:28 -0700
Subject: [PATCH 43/65] Bump version to 0.48.1-SNASPHOT for development (#3294)

---
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-bigtable-v2/pom.xml     |   4 +-
 .../grpc-google-cloud-container-v1/pom.xml    |   4 +-
 .../grpc-google-cloud-dataproc-v1/pom.xml     |   4 +-
 .../grpc-google-cloud-dialogflow-v2/pom.xml   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-dlp-v2/pom.xml          |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-iot-v1/pom.xml          |   4 +-
 .../grpc-google-cloud-language-v1/pom.xml     |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-logging-v2/pom.xml      |   4 +-
 .../grpc-google-cloud-monitoring-v3/pom.xml   |   4 +-
 .../grpc-google-cloud-os-login-v1/pom.xml     |   4 +-
 .../grpc-google-cloud-pubsub-v1/pom.xml       |   4 +-
 .../grpc-google-cloud-redis-v1beta1/pom.xml   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-spanner-v1/pom.xml      |   4 +-
 .../grpc-google-cloud-speech-v1/pom.xml       |   4 +-
 .../grpc-google-cloud-speech-v1beta1/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-trace-v1/pom.xml        |   4 +-
 .../grpc-google-cloud-trace-v2/pom.xml        |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-vision-v1/pom.xml       |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 google-api-grpc/pom.xml                       | 144 ++++-----
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-bigtable-v2/pom.xml    |   4 +-
 .../proto-google-cloud-container-v1/pom.xml   |   4 +-
 .../proto-google-cloud-dataproc-v1/pom.xml    |   4 +-
 .../proto-google-cloud-datastore-v1/pom.xml   |   4 +-
 .../proto-google-cloud-dialogflow-v2/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-dlp-v2/pom.xml         |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-iot-v1/pom.xml         |   4 +-
 .../proto-google-cloud-language-v1/pom.xml    |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-logging-v2/pom.xml     |   4 +-
 .../proto-google-cloud-monitoring-v3/pom.xml  |   4 +-
 .../proto-google-cloud-os-login-v1/pom.xml    |   4 +-
 .../proto-google-cloud-pubsub-v1/pom.xml      |   4 +-
 .../proto-google-cloud-redis-v1beta1/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-spanner-v1/pom.xml     |   4 +-
 .../proto-google-cloud-speech-v1/pom.xml      |   4 +-
 .../proto-google-cloud-speech-v1beta1/pom.xml |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-trace-v1/pom.xml       |   4 +-
 .../proto-google-cloud-trace-v2/pom.xml       |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-vision-v1/pom.xml      |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 google-cloud-bom/pom.xml                      | 274 +++++++++---------
 .../google-cloud-bigquery/pom.xml             |   4 +-
 .../google-cloud-bigquerydatatransfer/pom.xml |   4 +-
 .../google-cloud-bigtable/pom.xml             |   4 +-
 .../google-cloud-compute/pom.xml              |   4 +-
 .../google-cloud-container/pom.xml            |   4 +-
 .../google-cloud-logging-logback/pom.xml      |   4 +-
 .../google-cloud-nio-examples/README.md       |   4 +-
 .../google-cloud-nio-examples/pom.xml         |   4 +-
 .../google-cloud-nio/pom.xml                  |   4 +-
 .../google-cloud-contrib/pom.xml              |   4 +-
 .../google-cloud-core-grpc/pom.xml            |   4 +-
 .../google-cloud-core-http/pom.xml            |   4 +-
 .../google-cloud-core/pom.xml                 |   4 +-
 .../google-cloud-dataproc/pom.xml             |   4 +-
 .../google-cloud-datastore/pom.xml            |   4 +-
 .../google-cloud-dialogflow/pom.xml           |   4 +-
 google-cloud-clients/google-cloud-dlp/pom.xml |   4 +-
 google-cloud-clients/google-cloud-dns/pom.xml |   4 +-
 .../google-cloud-errorreporting/pom.xml       |   4 +-
 .../google-cloud-firestore/pom.xml            |   4 +-
 google-cloud-clients/google-cloud-iot/pom.xml |   4 +-
 .../google-cloud-language/pom.xml             |   4 +-
 .../google-cloud-logging/pom.xml              |   4 +-
 .../google-cloud-monitoring/pom.xml           |   4 +-
 .../google-cloud-notification/pom.xml         |   4 +-
 .../google-cloud-os-login/pom.xml             |   4 +-
 .../google-cloud-pubsub/pom.xml               |   4 +-
 .../google-cloud-redis/pom.xml                |   4 +-
 .../google-cloud-resourcemanager/pom.xml      |   4 +-
 .../google-cloud-spanner/pom.xml              |   4 +-
 .../google-cloud-speech/pom.xml               |   4 +-
 .../google-cloud-storage/pom.xml              |   4 +-
 .../google-cloud-texttospeech/pom.xml         |   4 +-
 .../google-cloud-trace/pom.xml                |   4 +-
 .../google-cloud-translate/pom.xml            |   4 +-
 .../google-cloud-video-intelligence/pom.xml   |   4 +-
 .../google-cloud-vision/pom.xml               |   4 +-
 .../google-cloud-websecurityscanner/pom.xml   |   4 +-
 google-cloud-clients/pom.xml                  |   4 +-
 google-cloud-examples/pom.xml                 |   4 +-
 .../google-cloud-appengineflexcompat/pom.xml  |   4 +-
 .../google-cloud-appengineflexcustom/pom.xml  |   4 +-
 .../google-cloud-appengineflexjava/pom.xml    |   4 +-
 .../google-cloud-appenginejava8/pom.xml       |   4 +-
 .../google-cloud-managedtest/pom.xml          |   4 +-
 google-cloud-testing/pom.xml                  |   4 +-
 .../google-cloud-compat-checker/pom.xml       |   4 +-
 google-cloud-util/pom.xml                     |   2 +-
 versions.txt                                  | 242 ++++++++--------
 122 files changed, 567 insertions(+), 567 deletions(-)

diff --git a/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml b/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
index 9416c680ae2f..a29776ae6aab 100644
--- a/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigquerydatatransfer-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-bigquerydatatransfer-v1
   GRPC library for grpc-google-cloud-bigquerydatatransfer-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
index 533c4e9f50aa..0d90f5077ec6 100644
--- a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigtable-admin-v2
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-bigtable-admin-v2
   GRPC library for grpc-google-cloud-bigtable-admin-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml b/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
index 15cc76abbdba..549296a9c2a6 100644
--- a/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigtable-v2
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-bigtable-v2
   GRPC library for grpc-google-cloud-bigtable-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-container-v1/pom.xml b/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
index 99bec13c5b28..cd19c5be1dd2 100644
--- a/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-container-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-container-v1
   GRPC library for grpc-google-cloud-container-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml b/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
index 897cccabb0cb..74dd4809ecde 100644
--- a/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dataproc-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-dataproc-v1
   GRPC library for grpc-google-cloud-dataproc-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml b/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
index dcd42023e6f0..59325149cd60 100644
--- a/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dialogflow-v2
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-dialogflow-v2
   GRPC library for grpc-google-cloud-dialogflow-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
index 07fbfc11d731..5ee959be85fa 100644
--- a/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dialogflow-v2beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-dialogflow-v2beta1
   GRPC library for grpc-google-cloud-dialogflow-v2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml b/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
index 11705da3e1a3..d4e4416bc5dc 100644
--- a/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dlp-v2
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-dlp-v2
   GRPC library for grpc-google-cloud-dlp-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
index 764a838dbedb..e2bd26a92a6f 100644
--- a/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-error-reporting-v1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-error-reporting-v1beta1
   GRPC library for grpc-google-cloud-error-reporting-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
index 152d8057a73c..24b90022a28d 100644
--- a/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-firestore-v1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-firestore-v1beta1
   GRPC library for grpc-google-cloud-firestore-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml b/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
index 9fb5ca1d11e3..a4dc7ae803df 100644
--- a/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-iot-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-iot-v1
   GRPC library for grpc-google-cloud-iot-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-language-v1/pom.xml b/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
index 04fe04805bff..aed4213d88b3 100644
--- a/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-language-v1
-  1.12.0
+  1.12.1-SNAPSHOT
   grpc-google-cloud-language-v1
   GRPC library for grpc-google-cloud-language-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml b/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
index 1b706440b967..01d8c290d7c8 100644
--- a/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-language-v1beta2
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-language-v1beta2
   GRPC library for grpc-google-cloud-language-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml b/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
index a8d4885d1c30..88eb535215be 100644
--- a/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-logging-v2
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-logging-v2
   GRPC library for grpc-google-cloud-logging-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml b/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
index f073a7f756c7..1bb266130351 100644
--- a/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-monitoring-v3
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-monitoring-v3
   GRPC library for grpc-google-cloud-monitoring-v3
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml b/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
index a9a9dab6fd66..2d8b6aed69b1 100644
--- a/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-os-login-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-os-login-v1
   GRPC library for grpc-google-cloud-os-login-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml b/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
index ce83a36c8d8b..bd70a06b9891 100644
--- a/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-pubsub-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-pubsub-v1
   GRPC library for grpc-google-cloud-pubsub-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
index ff53b2367475..7ca2959e225c 100644
--- a/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-redis-v1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-redis-v1beta1
   GRPC library for grpc-google-cloud-redis-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
index 14593aecd0b9..2c7f046b10b2 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-admin-database-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-spanner-admin-database-v1
   GRPC library for grpc-google-cloud-spanner-admin-database-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
index 4c29210513e0..d8f217fc49bb 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-admin-instance-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-spanner-admin-instance-v1
   GRPC library for grpc-google-cloud-spanner-admin-instance-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
index e9041d1aaaac..373ee4e943b9 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-spanner-v1
   GRPC library for grpc-google-cloud-spanner-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
index af710270b8d3..5c1d492af719 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-speech-v1
   GRPC library for grpc-google-cloud-speech-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
index 3df6cae497ca..851807891661 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-speech-v1beta1
   GRPC library for grpc-google-cloud-speech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
index 91e474dbf0e2..5005ca67aa7f 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1p1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-speech-v1p1beta1
   GRPC library for grpc-google-cloud-speech-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
index 2acf1e53d601..8edd1d0e2943 100644
--- a/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-texttospeech-v1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-texttospeech-v1beta1
   GRPC library for grpc-google-cloud-texttospeech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml b/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
index 2e11f44afb62..e59fd731b9d3 100644
--- a/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-trace-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-trace-v1
   GRPC library for grpc-google-cloud-trace-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml b/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
index d43a590db88a..bec21427cf6d 100644
--- a/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-trace-v2
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-trace-v2
   GRPC library for grpc-google-cloud-trace-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
index 6ef53d702b27..45d27e62e23f 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-video-intelligence-v1
   GRPC library for grpc-google-cloud-video-intelligence-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
index 9c56bd6fb618..a83047346aff 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-video-intelligence-v1beta1
   GRPC library for grpc-google-cloud-video-intelligence-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
index 54d0153bccde..75dc02482b1a 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1beta2
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-video-intelligence-v1beta2
   GRPC library for grpc-google-cloud-video-intelligence-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
index 93a57a7162ff..6f77afb5c2ba 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1p1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-video-intelligence-v1p1beta1
   GRPC library for grpc-google-cloud-video-intelligence-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
index 0e3045d598e7..1b65af372e20 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1
-  1.12.0
+  1.12.1-SNAPSHOT
   grpc-google-cloud-vision-v1
   GRPC library for grpc-google-cloud-vision-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
index 49bf1b688f6c..60390d9cfb42 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1p1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-vision-v1p1beta1
   GRPC library for grpc-google-cloud-vision-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
index 7509df0877a5..033d9527cbe0 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1p2beta1
-  1.12.0
+  1.12.1-SNAPSHOT
   grpc-google-cloud-vision-v1p2beta1
   GRPC library for grpc-google-cloud-vision-v1p2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
index 04807d96aef4..8a4a1027a3e3 100644
--- a/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-websecurityscanner-v1alpha
-  0.13.0
+  0.13.1-SNAPSHOT
   grpc-google-cloud-websecurityscanner-v1alpha
   GRPC library for grpc-google-cloud-websecurityscanner-v1alpha
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 5fb7eb0e0bf9..a96165f3fe64 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -4,7 +4,7 @@
   com.google.api.grpc
   google-api-grpc
   pom
-  0.13.0
+  0.13.1-SNAPSHOT
   Google Cloud API gRPC
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-api-grpc
   
@@ -134,357 +134,357 @@
       
         com.google.api.grpc
         proto-google-cloud-bigtable-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-admin-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-admin-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-bigquerydatatransfer-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigquerydatatransfer-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-container-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-container-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dataproc-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dataproc-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dlp-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-error-reporting-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-error-reporting-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-firestore-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-firestore-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1
-        1.12.0
+        1.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1
-        1.12.0
+        1.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1beta2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1beta2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-logging-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-logging-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-monitoring-v3
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-monitoring-v3
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-os-login-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-os-login-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-pubsub-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-pubsub-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-database-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-database-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-instance-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-instance-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1p1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1p1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-texttospeech-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-texttospeech-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1
-        1.12.0
+        1.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1
-        1.12.0
+        1.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p2beta1
-        1.12.0
+        1.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p2beta1
-        1.12.0
+        1.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1p1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1p1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-iot-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-iot-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-redis-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-redis-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-websecurityscanner-v1alpha
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-websecurityscanner-v1alpha
-        0.13.0
+        0.13.1-SNAPSHOT
       
     
   
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
index 766af996f248..53358db8abc6 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigquerydatatransfer-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-bigquerydatatransfer-v1
   PROTO library for proto-google-cloud-bigquerydatatransfer-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
index 2cef643c6bd3..1395b0c440ee 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigtable-admin-v2
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-bigtable-admin-v2
   PROTO library for proto-google-cloud-bigtable-admin-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml b/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
index af2b10b7bf55..61da00e71abd 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigtable-v2
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-bigtable-v2
   PROTO library for proto-google-cloud-bigtable-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-container-v1/pom.xml b/google-api-grpc/proto-google-cloud-container-v1/pom.xml
index efd1ec34c4f8..60dd95aeff32 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-container-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-container-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-container-v1
   PROTO library for proto-google-cloud-container-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml b/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
index 82ddfc8b9e4a..a4a274edd245 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dataproc-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-dataproc-v1
   PROTO library for proto-google-cloud-dataproc-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml b/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
index 6ec0ad67682b..e50b29643497 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml b/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
index 42ab7fb05449..21a1361c98af 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dialogflow-v2
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-dialogflow-v2
   PROTO library for proto-google-cloud-dialogflow-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
index 7248356c7473..5f7499b0d9bc 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dialogflow-v2beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-dialogflow-v2beta1
   PROTO library for proto-google-cloud-dialogflow-v2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml b/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
index dc044c3c3da1..2f255d74049e 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dlp-v2
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-dlp-v2
   PROTO library for proto-google-cloud-dlp-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
index 226ee7574873..5886d4706d13 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-error-reporting-v1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-error-reporting-v1beta1
   PROTO library for proto-google-cloud-error-reporting-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
index cf76dc99643e..648e5a889fc8 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-firestore-v1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-firestore-v1beta1
   PROTO library for proto-google-cloud-firestore-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/pom.xml b/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
index 305c811b9cd5..21a1c0e35f54 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-iot-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-iot-v1
   PROTO library for proto-google-cloud-iot-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-language-v1/pom.xml b/google-api-grpc/proto-google-cloud-language-v1/pom.xml
index 835433dcf3c5..d656d349678f 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-language-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-language-v1
-  1.12.0
+  1.12.1-SNAPSHOT
   proto-google-cloud-language-v1
   PROTO library for proto-google-cloud-language-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml b/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
index bdce17be8feb..647b748bb147 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-language-v1beta2
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-language-v1beta2
   PROTO library for proto-google-cloud-language-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/pom.xml b/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
index 7bdc664de8ae..8a43f28b9380 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-logging-v2
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-logging-v2
   PROTO library for proto-google-cloud-logging-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml b/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
index c1a24e9123de..279551415698 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-monitoring-v3
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-monitoring-v3
   PROTO library for proto-google-cloud-monitoring-v3
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml b/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
index c377dd48f3af..d89738f6e6d1 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-os-login-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-os-login-v1
   PROTO library for proto-google-cloud-os-login-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml b/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
index 71215fd2dd36..dd04bb795525 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-pubsub-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-pubsub-v1
   PROTO library for proto-google-cloud-pubsub-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
index 37077d94f1bc..f55a7f9143d7 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-redis-v1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-redis-v1beta1
   PROTO library for proto-google-cloud-redis-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
index 1118359e6454..5e492b1d60d9 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-admin-database-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-spanner-admin-database-v1
   PROTO library for proto-google-cloud-spanner-admin-database-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
index 43950a1579fc..183efcde009a 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-admin-instance-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-spanner-admin-instance-v1
   PROTO library for proto-google-cloud-spanner-admin-instance-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
index 4f6f16115daf..3cb469312c81 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-spanner-v1
   PROTO library for proto-google-cloud-spanner-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
index ede6fea6b271..3eddbd57be97 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-speech-v1
   PROTO library for proto-google-cloud-speech-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
index e94914b08f28..950795d1e013 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-speech-v1beta1
   PROTO library for proto-google-cloud-speech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
index 52e1a7d826f7..e11a258761b0 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1p1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-speech-v1p1beta1
   PROTO library for proto-google-cloud-speech-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
index aaf99bfffd37..f974fb340eef 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-texttospeech-v1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-texttospeech-v1beta1
   PROTO library for proto-google-cloud-texttospeech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/pom.xml b/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
index d3d514406875..6d7c436e3d51 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-trace-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-trace-v1
   PROTO library for proto-google-cloud-trace-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/pom.xml b/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
index 8f425686778a..ac8aeb04cfaa 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-trace-v2
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-trace-v2
   PROTO library for proto-google-cloud-trace-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
index dc9cb8763c31..b316fdffe505 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-video-intelligence-v1
   PROTO library for proto-google-cloud-video-intelligence-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
index 31fbf4cb47ce..779557fa8053 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-video-intelligence-v1beta1
   PROTO library for proto-google-cloud-video-intelligence-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
index bb9133859f21..c560e6405074 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1beta2
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-video-intelligence-v1beta2
   PROTO library for proto-google-cloud-video-intelligence-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
index 67e993d55c9a..d065512c0a7d 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1p1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-video-intelligence-v1p1beta1
   PROTO library for proto-google-cloud-video-intelligence-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
index 6faa68689678..ef19f7be3c0e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1
-  1.12.0
+  1.12.1-SNAPSHOT
   proto-google-cloud-vision-v1
   PROTO library for proto-google-cloud-vision-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
index 491c7069df3f..b8a88f563061 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1p1beta1
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-vision-v1p1beta1
   PROTO library for proto-google-cloud-vision-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
index 5416b66ff72d..5e7201e96678 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1p2beta1
-  1.12.0
+  1.12.1-SNAPSHOT
   proto-google-cloud-vision-v1p2beta1
   PROTO library for proto-google-cloud-vision-v1p2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
index 72fd93b68685..104f7becc8e6 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-websecurityscanner-v1alpha
-  0.13.0
+  0.13.1-SNAPSHOT
   proto-google-cloud-websecurityscanner-v1alpha
   PROTO library for proto-google-cloud-websecurityscanner-v1alpha
   
     com.google.api.grpc
     google-api-grpc
-    0.13.0
+    0.13.1-SNAPSHOT
   
   
     
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index 35b2d2d21b44..b82b37d6e7e1 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-bom
   pom
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   Google Cloud Java BOM
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bom
   
@@ -199,715 +199,715 @@
       
         com.google.cloud
         google-cloud-bigtable
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-bigtable
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-admin-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-admin-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-bigquery
-        1.30.0
+        1.30.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-bigquery
-        1.30.0
+        1.30.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-bigquerydatatransfer
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-bigquerydatatransfer
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-bigquerydatatransfer-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigquerydatatransfer-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-compute
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-compute
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-container
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-container
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-container-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-container-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-contrib
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-contrib
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-nio
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-nio
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-core
-        1.30.0
+        1.30.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-core
-        1.30.0
+        1.30.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-core-grpc
-        1.30.0
+        1.30.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-core-grpc
-        1.30.0
+        1.30.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-core-http
-        1.30.0
+        1.30.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-core-http
-        1.30.0
+        1.30.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-dataproc
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dataproc
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dataproc-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dataproc-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.30.0
+        1.30.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.30.0
+        1.30.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dlp
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dlp
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dlp-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dialogflow
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dialogflow
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dns
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dns
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-errorreporting
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-errorreporting
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-error-reporting-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-error-reporting-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-firestore
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-firestore
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-firestore-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-firestore-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-language
-        1.30.0
+        1.30.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-language
-        1.30.0
+        1.30.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1
-        1.12.0
+        1.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1
-        1.12.0
+        1.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1beta2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1beta2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-logging
-        1.30.0
+        1.30.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-logging
-        1.30.0
+        1.30.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-logging-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-logging-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-logging-logback
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
       
 
       
         com.google.cloud
         google-cloud-monitoring
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-monitoring
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-monitoring-v3
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-monitoring-v3
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-os-login
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-os-login
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-os-login-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-os-login-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-pubsub
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-pubsub
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-pubsub-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-pubsub-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-redis
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-redis
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-redis-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-redis-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-resourcemanager
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-resourcemanager
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-spanner
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-spanner
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-database-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-database-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-instance-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-instance-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-speech
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-speech
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1p1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1p1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-storage
-        1.30.0
+        1.30.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-storage
-        1.30.0
+        1.30.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-texttospeech
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-texttospeech
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-texttospeech-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-texttospeech-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-trace
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-trace
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-translate
-        1.30.0
+        1.30.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-translate
-        1.30.0
+        1.30.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-vision
-        1.30.0
+        1.30.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-vision
-        1.30.0
+        1.30.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1
-        1.12.0
+        1.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1
-        1.12.0
+        1.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p2beta1
-        1.12.0
+        1.12.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p2beta1
-        1.12.0
+        1.12.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-video-intelligence
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-video-intelligence
-        0.48.0-beta
+        0.48.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta2
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1p1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1p1beta1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-iot-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-iot-v1
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-websecurityscanner-v1alpha
-        0.13.0
+        0.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-websecurityscanner-v1alpha
-        0.13.0
+        0.13.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-clients/google-cloud-bigquery/pom.xml b/google-cloud-clients/google-cloud-bigquery/pom.xml
index f909752c476f..41e8abd466dc 100644
--- a/google-cloud-clients/google-cloud-bigquery/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquery/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigquery
-  1.30.0
+  1.30.1-SNAPSHOT
   jar
   Google Cloud BigQuery
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquery
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-bigquery
diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
index fb1ec36bde90..a5ede241c7d7 100644
--- a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigquerydatatransfer
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud Bigquery Data Transfer
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquerydatatransfer
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-bigquerydatatransfer
diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index 496a3699c271..910244a5e6b2 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigtable
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud Bigtable
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigtable
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-bigtable
diff --git a/google-cloud-clients/google-cloud-compute/pom.xml b/google-cloud-clients/google-cloud-compute/pom.xml
index 2e8c0245751f..d8faab8a6303 100644
--- a/google-cloud-clients/google-cloud-compute/pom.xml
+++ b/google-cloud-clients/google-cloud-compute/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-compute
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud Compute
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-compute
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-compute
diff --git a/google-cloud-clients/google-cloud-container/pom.xml b/google-cloud-clients/google-cloud-container/pom.xml
index 2e1eb67e645d..8b5bb6d2a104 100644
--- a/google-cloud-clients/google-cloud-container/pom.xml
+++ b/google-cloud-clients/google-cloud-container/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-container
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud Container
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-container
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-container
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
index 486671219c3d..88b1806af692 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
@@ -5,7 +5,7 @@
   4.0.0
 
   google-cloud-logging-logback
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud Logging Logback Appender
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-logging-logback
@@ -20,7 +20,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
index 0103187927bd..caf4f374a63f 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
@@ -23,12 +23,12 @@ To run this example:
 
 [//]: # ({x-version-update-start:google-cloud-nio:current})
     ```
-    java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.48.0-alpha.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.48.0-alpha.jar com.google.cloud.nio.examples.ListFilesystems
+    java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.48.1-alpha-SNAPSHOT.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.48.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
     ```
 
     Notice that it lists Google Cloud Storage, which it wouldn't if you ran it without the NIO jar:
     ```
-    java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.48.0-alpha.jar com.google.cloud.nio.examples.ListFilesystems
+    java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.48.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
     ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
index 7437ec841f5f..774b7a6b8210 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-nio-examples
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud NIO Examples
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio-examples
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-nio-examples
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
index b3d556fcf7f9..7701e0c0b7e5 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-nio
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud NIO
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-nio
diff --git a/google-cloud-clients/google-cloud-contrib/pom.xml b/google-cloud-clients/google-cloud-contrib/pom.xml
index 7aa324c0b41b..af9310b47a09 100644
--- a/google-cloud-clients/google-cloud-contrib/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-contrib
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   pom
   Google Cloud Contributions
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-contrib
diff --git a/google-cloud-clients/google-cloud-core-grpc/pom.xml b/google-cloud-clients/google-cloud-core-grpc/pom.xml
index e7c75118c571..cb6dd8106c84 100644
--- a/google-cloud-clients/google-cloud-core-grpc/pom.xml
+++ b/google-cloud-clients/google-cloud-core-grpc/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-core-grpc
-  1.30.0
+  1.30.1-SNAPSHOT
   jar
   Google Cloud Core gRPC
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-core-grpc
diff --git a/google-cloud-clients/google-cloud-core-http/pom.xml b/google-cloud-clients/google-cloud-core-http/pom.xml
index 593092dc8f20..31b598d990fc 100644
--- a/google-cloud-clients/google-cloud-core-http/pom.xml
+++ b/google-cloud-clients/google-cloud-core-http/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-core-http
-  1.30.0
+  1.30.1-SNAPSHOT
   jar
   Google Cloud Core HTTP
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-core-http
diff --git a/google-cloud-clients/google-cloud-core/pom.xml b/google-cloud-clients/google-cloud-core/pom.xml
index 58b0f4a4c56b..1bfbe3f375fc 100644
--- a/google-cloud-clients/google-cloud-core/pom.xml
+++ b/google-cloud-clients/google-cloud-core/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-core
-  1.30.0
+  1.30.1-SNAPSHOT
   jar
   Google Cloud Core
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-core
diff --git a/google-cloud-clients/google-cloud-dataproc/pom.xml b/google-cloud-clients/google-cloud-dataproc/pom.xml
index 84a26e77ea44..55a186b13888 100644
--- a/google-cloud-clients/google-cloud-dataproc/pom.xml
+++ b/google-cloud-clients/google-cloud-dataproc/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-dataproc
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud Dataproc
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dataproc
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-dataproc
diff --git a/google-cloud-clients/google-cloud-datastore/pom.xml b/google-cloud-clients/google-cloud-datastore/pom.xml
index 6d4ba33544ea..02bc47fc8582 100644
--- a/google-cloud-clients/google-cloud-datastore/pom.xml
+++ b/google-cloud-clients/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.30.0
+  1.30.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/google-cloud-clients/google-cloud-dialogflow/pom.xml b/google-cloud-clients/google-cloud-dialogflow/pom.xml
index 289e28ba1a4d..1e3db817492a 100644
--- a/google-cloud-clients/google-cloud-dialogflow/pom.xml
+++ b/google-cloud-clients/google-cloud-dialogflow/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-dialogflow
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud Dialog Flow API
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dialogflow
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-dialogflow
diff --git a/google-cloud-clients/google-cloud-dlp/pom.xml b/google-cloud-clients/google-cloud-dlp/pom.xml
index 4066840c0e48..6ebcf157805b 100644
--- a/google-cloud-clients/google-cloud-dlp/pom.xml
+++ b/google-cloud-clients/google-cloud-dlp/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-dlp
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud Data Loss Prevention API
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dlp
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-dlp
diff --git a/google-cloud-clients/google-cloud-dns/pom.xml b/google-cloud-clients/google-cloud-dns/pom.xml
index cc972d8f2bff..5c862cfbd67f 100644
--- a/google-cloud-clients/google-cloud-dns/pom.xml
+++ b/google-cloud-clients/google-cloud-dns/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-dns
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud DNS
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dns
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-dns
diff --git a/google-cloud-clients/google-cloud-errorreporting/pom.xml b/google-cloud-clients/google-cloud-errorreporting/pom.xml
index 6a863e025d8d..9e33861e3ba6 100644
--- a/google-cloud-clients/google-cloud-errorreporting/pom.xml
+++ b/google-cloud-clients/google-cloud-errorreporting/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-errorreporting
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud Error Reporting
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-errorreporting
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-errorreporting
diff --git a/google-cloud-clients/google-cloud-firestore/pom.xml b/google-cloud-clients/google-cloud-firestore/pom.xml
index 2f42ce6a6ca0..c3832e1c66d5 100644
--- a/google-cloud-clients/google-cloud-firestore/pom.xml
+++ b/google-cloud-clients/google-cloud-firestore/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-firestore
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud Firestore
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-firestore
@@ -15,7 +15,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-firestore
diff --git a/google-cloud-clients/google-cloud-iot/pom.xml b/google-cloud-clients/google-cloud-iot/pom.xml
index 610360bd6d05..1e52a03ccf22 100644
--- a/google-cloud-clients/google-cloud-iot/pom.xml
+++ b/google-cloud-clients/google-cloud-iot/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-iot
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud IoT
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-iot
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-iot
diff --git a/google-cloud-clients/google-cloud-language/pom.xml b/google-cloud-clients/google-cloud-language/pom.xml
index 0d5f887ba5e2..1ec41d330696 100644
--- a/google-cloud-clients/google-cloud-language/pom.xml
+++ b/google-cloud-clients/google-cloud-language/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-language
-  1.30.0
+  1.30.1-SNAPSHOT
   jar
   Google Cloud Natural Language
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-language
@@ -15,7 +15,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-language
diff --git a/google-cloud-clients/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
index 17509fcf3bac..c5f0614a4099 100644
--- a/google-cloud-clients/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-logging
-  1.30.0
+  1.30.1-SNAPSHOT
   jar
   Google Cloud Logging
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-logging
diff --git a/google-cloud-clients/google-cloud-monitoring/pom.xml b/google-cloud-clients/google-cloud-monitoring/pom.xml
index 1cfb9d00b987..e2fbefe146be 100644
--- a/google-cloud-clients/google-cloud-monitoring/pom.xml
+++ b/google-cloud-clients/google-cloud-monitoring/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-monitoring
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud Monitoring
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-monitoring
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-monitoring
diff --git a/google-cloud-clients/google-cloud-notification/pom.xml b/google-cloud-clients/google-cloud-notification/pom.xml
index 173ec5a094f1..a3e81b6eb1a3 100644
--- a/google-cloud-clients/google-cloud-notification/pom.xml
+++ b/google-cloud-clients/google-cloud-notification/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-notification
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud Pub/Sub Notifications for GCS
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-notification
@@ -15,7 +15,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-notification
diff --git a/google-cloud-clients/google-cloud-os-login/pom.xml b/google-cloud-clients/google-cloud-os-login/pom.xml
index 4df9ff2c1773..9ee5502545f9 100644
--- a/google-cloud-clients/google-cloud-os-login/pom.xml
+++ b/google-cloud-clients/google-cloud-os-login/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-os-login
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud OS Login
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-os-login
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-os-login
diff --git a/google-cloud-clients/google-cloud-pubsub/pom.xml b/google-cloud-clients/google-cloud-pubsub/pom.xml
index c4ffd8cf512c..4fbd1cc99921 100644
--- a/google-cloud-clients/google-cloud-pubsub/pom.xml
+++ b/google-cloud-clients/google-cloud-pubsub/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-pubsub
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud Pub/Sub
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-pubsub
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-pubsub
diff --git a/google-cloud-clients/google-cloud-redis/pom.xml b/google-cloud-clients/google-cloud-redis/pom.xml
index 241a1949c743..b1d3028db72a 100644
--- a/google-cloud-clients/google-cloud-redis/pom.xml
+++ b/google-cloud-clients/google-cloud-redis/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-redis
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud Redis
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-redis
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-redis
diff --git a/google-cloud-clients/google-cloud-resourcemanager/pom.xml b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
index 6916418a0a41..51c4cade4375 100644
--- a/google-cloud-clients/google-cloud-resourcemanager/pom.xml
+++ b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-resourcemanager
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud Resource Manager
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-resourcemanager
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-resourcemanager
diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
index fd3363d358db..cfb2631ec5de 100644
--- a/google-cloud-clients/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -4,7 +4,7 @@
                               http://maven.apache.org/maven-v4_0_0.xsd">
   4.0.0
   google-cloud-spanner
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud Spanner
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-spanner
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-spanner
diff --git a/google-cloud-clients/google-cloud-speech/pom.xml b/google-cloud-clients/google-cloud-speech/pom.xml
index 3cd03f3ed406..9deef77b2520 100644
--- a/google-cloud-clients/google-cloud-speech/pom.xml
+++ b/google-cloud-clients/google-cloud-speech/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-speech
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud Speech
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-speech
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-speech
diff --git a/google-cloud-clients/google-cloud-storage/pom.xml b/google-cloud-clients/google-cloud-storage/pom.xml
index a0977ff40ed3..ca3711cee34d 100644
--- a/google-cloud-clients/google-cloud-storage/pom.xml
+++ b/google-cloud-clients/google-cloud-storage/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-storage
-  1.30.0
+  1.30.1-SNAPSHOT
   jar
   Google Cloud Storage
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-storage
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-storage
diff --git a/google-cloud-clients/google-cloud-texttospeech/pom.xml b/google-cloud-clients/google-cloud-texttospeech/pom.xml
index c36c7b689830..0cdeb1234d2f 100644
--- a/google-cloud-clients/google-cloud-texttospeech/pom.xml
+++ b/google-cloud-clients/google-cloud-texttospeech/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-texttospeech
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud Text-to-Speech
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-texttospeech
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-texttospeech-v1beta1
diff --git a/google-cloud-clients/google-cloud-trace/pom.xml b/google-cloud-clients/google-cloud-trace/pom.xml
index f0724ebb883b..906c9c6be403 100644
--- a/google-cloud-clients/google-cloud-trace/pom.xml
+++ b/google-cloud-clients/google-cloud-trace/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-trace
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud Trace
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-trace
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-trace
diff --git a/google-cloud-clients/google-cloud-translate/pom.xml b/google-cloud-clients/google-cloud-translate/pom.xml
index 2213cc574121..81433e8d566a 100644
--- a/google-cloud-clients/google-cloud-translate/pom.xml
+++ b/google-cloud-clients/google-cloud-translate/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-translate
-  1.30.0
+  1.30.1-SNAPSHOT
   jar
   Google Cloud Translation
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-translate
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-translate
diff --git a/google-cloud-clients/google-cloud-video-intelligence/pom.xml b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
index 36c4dcb5cca7..1a609a9dc428 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/pom.xml
+++ b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-video-intelligence
-  0.48.0-beta
+  0.48.1-beta-SNAPSHOT
   jar
   Google Cloud Video Intelligence
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-video-intelligence
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-video-intelligence
diff --git a/google-cloud-clients/google-cloud-vision/pom.xml b/google-cloud-clients/google-cloud-vision/pom.xml
index 3d7c8d4441c4..cf593f8050bc 100644
--- a/google-cloud-clients/google-cloud-vision/pom.xml
+++ b/google-cloud-clients/google-cloud-vision/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-vision
-  1.30.0
+  1.30.1-SNAPSHOT
   jar
   Google Cloud Vision
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-vision
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-vision
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
index ef7bf71fa251..e95226343a83 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
+++ b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-websecurityscanner
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud Web Security Scanner
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-websecurityscanner
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-websecurityscanner
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index d33a07e6cfc3..b8989eee5bf9 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -6,7 +6,7 @@
   com.google.cloud
   google-cloud-clients
   pom
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   Google Cloud
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients
   
@@ -154,7 +154,7 @@
     UTF-8
     github
     google-cloud-clients
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
     1.23.0
     1.25.0
     0.9.1
diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
index c72fe9b368fe..4a1e7d3334ca 100644
--- a/google-cloud-examples/pom.xml
+++ b/google-cloud-examples/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   com.google.cloud
   google-cloud-examples
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud Examples
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-examples
@@ -18,7 +18,7 @@
       
         com.google.cloud
         google-cloud-bom
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         pom
         import
       
diff --git a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
index b2bcb7c5d694..5f17abc352f8 100644
--- a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
+++ b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appengineflexcompat
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
 
   
diff --git a/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml b/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml
index 17b18508e7ff..76d58baa2e21 100644
--- a/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml
+++ b/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appengineflexcustom
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
 
   
diff --git a/google-cloud-testing/google-cloud-appengineflexjava/pom.xml b/google-cloud-testing/google-cloud-appengineflexjava/pom.xml
index 9d89a79cf9c2..7d043882507b 100644
--- a/google-cloud-testing/google-cloud-appengineflexjava/pom.xml
+++ b/google-cloud-testing/google-cloud-appengineflexjava/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appengineflexjava
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
 
   
diff --git a/google-cloud-testing/google-cloud-appenginejava8/pom.xml b/google-cloud-testing/google-cloud-appenginejava8/pom.xml
index cbe17d3ea265..cb65281bf52d 100644
--- a/google-cloud-testing/google-cloud-appenginejava8/pom.xml
+++ b/google-cloud-testing/google-cloud-appenginejava8/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appenginejava8
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
 
   
diff --git a/google-cloud-testing/google-cloud-managedtest/pom.xml b/google-cloud-testing/google-cloud-managedtest/pom.xml
index 8368c4f72696..528e86b253d6 100644
--- a/google-cloud-testing/google-cloud-managedtest/pom.xml
+++ b/google-cloud-testing/google-cloud-managedtest/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-managedtest
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
 
   
     google-cloud-testing
     com.google.cloud
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
 
   
diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml
index d6cdf6595e71..54bb9394227c 100644
--- a/google-cloud-testing/pom.xml
+++ b/google-cloud-testing/pom.xml
@@ -5,7 +5,7 @@
   4.0.0
   com.google.cloud
   google-cloud-testing
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   pom
 
   Google Cloud Testing
@@ -30,7 +30,7 @@
       
         com.google.cloud
         google-cloud-bom
-        0.48.0-alpha
+        0.48.1-alpha-SNAPSHOT
         pom
         import
       
diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml
index f964bbcb1b57..5cedfc4ba610 100644
--- a/google-cloud-util/google-cloud-compat-checker/pom.xml
+++ b/google-cloud-util/google-cloud-compat-checker/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-compat-checker
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   jar
   Google Cloud Java Compatibility Checker
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util/google-cloud-compat-checker
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-util
-    0.48.0-alpha
+    0.48.1-alpha-SNAPSHOT
   
   
     google-cloud-compat-checker
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index 587c74267bbc..afb58ef7b5ea 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   com.google.cloud
   google-cloud-util
-  0.48.0-alpha
+  0.48.1-alpha-SNAPSHOT
   pom
   Google Cloud Util
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util
diff --git a/versions.txt b/versions.txt
index 6929406101eb..733c280e3221 100644
--- a/versions.txt
+++ b/versions.txt
@@ -5,132 +5,132 @@
 # google-api-grpc versions
 #
 # parent
-google-api-grpc:0.13.0:0.13.0
+google-api-grpc:0.13.0:0.13.1-SNAPSHOT
 # children
 #grpc-google-cloud-datastore-v1
-grpc-google-cloud-bigquerydatatransfer-v1:0.13.0:0.13.0
-grpc-google-cloud-bigtable-admin-v2:0.13.0:0.13.0
-grpc-google-cloud-bigtable-v2:0.13.0:0.13.0
-grpc-google-cloud-container-v1:0.13.0:0.13.0
-grpc-google-cloud-dataproc-v1:0.13.0:0.13.0
-grpc-google-cloud-dialogflow-v2:0.13.0:0.13.0
-grpc-google-cloud-dialogflow-v2beta1:0.13.0:0.13.0
-grpc-google-cloud-dlp-v2:0.13.0:0.13.0
-grpc-google-cloud-error-reporting-v1beta1:0.13.0:0.13.0
-grpc-google-cloud-firestore-v1beta1:0.13.0:0.13.0
-grpc-google-cloud-language-v1:1.12.0:1.12.0
-grpc-google-cloud-language-v1beta2:0.13.0:0.13.0
-grpc-google-cloud-logging-v2:0.13.0:0.13.0
-grpc-google-cloud-monitoring-v3:0.13.0:0.13.0
-grpc-google-cloud-os-login-v1:0.13.0:0.13.0
-grpc-google-cloud-pubsub-v1:0.13.0:0.13.0
-grpc-google-cloud-spanner-admin-database-v1:0.13.0:0.13.0
-grpc-google-cloud-spanner-admin-instance-v1:0.13.0:0.13.0
-grpc-google-cloud-spanner-v1:0.13.0:0.13.0
-grpc-google-cloud-speech-v1:0.13.0:0.13.0
-grpc-google-cloud-speech-v1beta1:0.13.0:0.13.0
-grpc-google-cloud-speech-v1p1beta1:0.13.0:0.13.0
-grpc-google-cloud-texttospeech-v1beta1:0.13.0:0.13.0
-grpc-google-cloud-trace-v1:0.13.0:0.13.0
-grpc-google-cloud-trace-v2:0.13.0:0.13.0
-grpc-google-cloud-video-intelligence-v1:0.13.0:0.13.0
-grpc-google-cloud-video-intelligence-v1beta1:0.13.0:0.13.0
-grpc-google-cloud-video-intelligence-v1beta2:0.13.0:0.13.0
-grpc-google-cloud-video-intelligence-v1p1beta1:0.13.0:0.13.0
-grpc-google-cloud-vision-v1:1.12.0:1.12.0
-grpc-google-cloud-vision-v1p1beta1:0.13.0:0.13.0
-grpc-google-cloud-vision-v1p2beta1:1.12.0:1.12.0
-grpc-google-cloud-iot-v1:0.13.0:0.13.0
-grpc-google-cloud-redis-v1beta1:0.13.0:0.13.0
-grpc-google-cloud-websecurityscanner-v1alpha:0.13.0:0.13.0
-proto-google-cloud-bigquerydatatransfer-v1:0.13.0:0.13.0
-proto-google-cloud-bigtable-admin-v2:0.13.0:0.13.0
-proto-google-cloud-bigtable-v2:0.13.0:0.13.0
-proto-google-cloud-container-v1:0.13.0:0.13.0
-proto-google-cloud-dataproc-v1:0.13.0:0.13.0
-proto-google-cloud-datastore-v1:0.13.0:0.13.0
-proto-google-cloud-dialogflow-v2:0.13.0:0.13.0
-proto-google-cloud-dialogflow-v2beta1:0.13.0:0.13.0
-proto-google-cloud-dlp-v2:0.13.0:0.13.0
-proto-google-cloud-error-reporting-v1beta1:0.13.0:0.13.0
-proto-google-cloud-firestore-v1beta1:0.13.0:0.13.0
-proto-google-cloud-language-v1:1.12.0:1.12.0
-proto-google-cloud-language-v1beta2:0.13.0:0.13.0
-proto-google-cloud-logging-v2:0.13.0:0.13.0
-proto-google-cloud-monitoring-v3:0.13.0:0.13.0
-proto-google-cloud-os-login-v1:0.13.0:0.13.0
-proto-google-cloud-pubsub-v1:0.13.0:0.13.0
-proto-google-cloud-spanner-admin-database-v1:0.13.0:0.13.0
-proto-google-cloud-spanner-admin-instance-v1:0.13.0:0.13.0
-proto-google-cloud-spanner-v1:0.13.0:0.13.0
-proto-google-cloud-speech-v1:0.13.0:0.13.0
-proto-google-cloud-speech-v1beta1:0.13.0:0.13.0
-proto-google-cloud-speech-v1p1beta1:0.13.0:0.13.0
-proto-google-cloud-texttospeech-v1beta1:0.13.0:0.13.0
-proto-google-cloud-trace-v1:0.13.0:0.13.0
-proto-google-cloud-trace-v2:0.13.0:0.13.0
-proto-google-cloud-video-intelligence-v1:0.13.0:0.13.0
-proto-google-cloud-video-intelligence-v1beta1:0.13.0:0.13.0
-proto-google-cloud-video-intelligence-v1beta2:0.13.0:0.13.0
-proto-google-cloud-video-intelligence-v1p1beta1:0.13.0:0.13.0
-proto-google-cloud-vision-v1:1.12.0:1.12.0
-proto-google-cloud-vision-v1p1beta1:0.13.0:0.13.0
-proto-google-cloud-vision-v1p2beta1:1.12.0:1.12.0
-proto-google-cloud-iot-v1:0.13.0:0.13.0
-proto-google-cloud-redis-v1beta1:0.13.0:0.13.0
-proto-google-cloud-websecurityscanner-v1alpha:0.13.0:0.13.0
+grpc-google-cloud-bigquerydatatransfer-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-bigtable-admin-v2:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-bigtable-v2:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-container-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-dataproc-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-dialogflow-v2:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-dialogflow-v2beta1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-dlp-v2:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-error-reporting-v1beta1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-firestore-v1beta1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-language-v1:1.12.0:1.12.1-SNAPSHOT
+grpc-google-cloud-language-v1beta2:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-logging-v2:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-monitoring-v3:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-os-login-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-pubsub-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-spanner-admin-database-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-spanner-admin-instance-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-spanner-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-speech-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-speech-v1beta1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-speech-v1p1beta1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-texttospeech-v1beta1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-trace-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-trace-v2:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-video-intelligence-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-video-intelligence-v1beta1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-video-intelligence-v1beta2:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-video-intelligence-v1p1beta1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-vision-v1:1.12.0:1.12.1-SNAPSHOT
+grpc-google-cloud-vision-v1p1beta1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-vision-v1p2beta1:1.12.0:1.12.1-SNAPSHOT
+grpc-google-cloud-iot-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-redis-v1beta1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-websecurityscanner-v1alpha:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-bigquerydatatransfer-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-bigtable-admin-v2:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-bigtable-v2:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-container-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-dataproc-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-dialogflow-v2:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-dialogflow-v2beta1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-dlp-v2:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-error-reporting-v1beta1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-firestore-v1beta1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-language-v1:1.12.0:1.12.1-SNAPSHOT
+proto-google-cloud-language-v1beta2:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-logging-v2:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-monitoring-v3:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-os-login-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-pubsub-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-spanner-admin-database-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-spanner-admin-instance-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-spanner-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-speech-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-speech-v1beta1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-speech-v1p1beta1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-texttospeech-v1beta1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-trace-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-trace-v2:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-video-intelligence-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-video-intelligence-v1beta1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-video-intelligence-v1beta2:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-video-intelligence-v1p1beta1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-vision-v1:1.12.0:1.12.1-SNAPSHOT
+proto-google-cloud-vision-v1p1beta1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-vision-v1p2beta1:1.12.0:1.12.1-SNAPSHOT
+proto-google-cloud-iot-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-redis-v1beta1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-websecurityscanner-v1alpha:0.13.0:0.13.1-SNAPSHOT
 
 #
 # google-cloud-clients versions
 #
 # parent
-google-cloud-clients:0.48.0-alpha:0.48.0-alpha
+google-cloud-clients:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
 # children
-google-cloud-appengineflexcompat:0.48.0-alpha:0.48.0-alpha
-google-cloud-appengineflexcustom:0.48.0-alpha:0.48.0-alpha
-google-cloud-appengineflexjava:0.48.0-alpha:0.48.0-alpha
-google-cloud-appenginejava8:0.48.0-alpha:0.48.0-alpha
-google-cloud:0.48.0-alpha:0.48.0-alpha
-google-cloud-bigquery:1.30.0:1.30.0
-google-cloud-bigquerydatatransfer:0.48.0-beta:0.48.0-beta
-google-cloud-bigtable:0.48.0-alpha:0.48.0-alpha
-google-cloud-bom:0.48.0-alpha:0.48.0-alpha
-google-cloud-compat-checker:0.48.0-alpha:0.48.0-alpha
-google-cloud-compute:0.48.0-alpha:0.48.0-alpha
-google-cloud-container:0.48.0-beta:0.48.0-beta
-google-cloud-contrib:0.48.0-alpha:0.48.0-alpha
-google-cloud-core:1.30.0:1.30.0
-google-cloud-core-grpc:1.30.0:1.30.0
-google-cloud-core-http:1.30.0:1.30.0
-google-cloud-dataproc:0.48.0-alpha:0.48.0-alpha
-google-cloud-datastore:1.30.0:1.30.0
-google-cloud-dialogflow:0.48.0-alpha:0.48.0-alpha
-google-cloud-dlp:0.48.0-beta:0.48.0-beta
-google-cloud-dns:0.48.0-alpha:0.48.0-alpha
-google-cloud-errorreporting:0.48.0-beta:0.48.0-beta
-google-cloud-examples:0.48.0-alpha:0.48.0-alpha
-google-cloud-firestore:0.48.0-beta:0.48.0-beta
-google-cloud-language:1.30.0:1.30.0
-google-cloud-logging:1.30.0:1.30.0
-google-cloud-logging-logback:0.48.0-alpha:0.48.0-alpha
-google-cloud-managedtest:0.48.0-alpha:0.48.0-alpha
-google-cloud-monitoring:0.48.0-beta:0.48.0-beta
-google-cloud-nio:0.48.0-alpha:0.48.0-alpha
-google-cloud-nio-examples:0.48.0-alpha:0.48.0-alpha
-google-cloud-notification:0.48.0-beta:0.48.0-beta
-google-cloud-os-login:0.48.0-alpha:0.48.0-alpha
-google-cloud-pubsub:0.48.0-beta:0.48.0-beta
-google-cloud-redis:0.48.0-alpha:0.48.0-alpha
-google-cloud-resourcemanager:0.48.0-alpha:0.48.0-alpha
-google-cloud-spanner:0.48.0-beta:0.48.0-beta
-google-cloud-speech:0.48.0-alpha:0.48.0-alpha
-google-cloud-storage:1.30.0:1.30.0
-google-cloud-texttospeech:0.48.0-beta:0.48.0-beta
-google-cloud-testing:0.48.0-alpha:0.48.0-alpha
-google-cloud-trace:0.48.0-beta:0.48.0-beta
-google-cloud-translate:1.30.0:1.30.0
-google-cloud-util:0.48.0-alpha:0.48.0-alpha
-google-cloud-video-intelligence:0.48.0-beta:0.48.0-beta
-google-cloud-vision:1.30.0:1.30.0
-google-cloud-iot:0.48.0-beta:0.48.0-beta
-google-cloud-websecurityscanner:0.48.0-alpha:0.48.0-alpha
+google-cloud-appengineflexcompat:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-appengineflexcustom:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-appengineflexjava:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-appenginejava8:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-bigquery:1.30.0:1.30.1-SNAPSHOT
+google-cloud-bigquerydatatransfer:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-bigtable:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-bom:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-compat-checker:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-compute:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-container:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-contrib:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-core:1.30.0:1.30.1-SNAPSHOT
+google-cloud-core-grpc:1.30.0:1.30.1-SNAPSHOT
+google-cloud-core-http:1.30.0:1.30.1-SNAPSHOT
+google-cloud-dataproc:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-datastore:1.30.0:1.30.1-SNAPSHOT
+google-cloud-dialogflow:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-dlp:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-dns:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-errorreporting:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-examples:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-firestore:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-language:1.30.0:1.30.1-SNAPSHOT
+google-cloud-logging:1.30.0:1.30.1-SNAPSHOT
+google-cloud-logging-logback:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-managedtest:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-monitoring:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-nio:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-nio-examples:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-notification:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-os-login:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-pubsub:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-redis:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-resourcemanager:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-spanner:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-speech:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-storage:1.30.0:1.30.1-SNAPSHOT
+google-cloud-texttospeech:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-testing:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-trace:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-translate:1.30.0:1.30.1-SNAPSHOT
+google-cloud-util:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-video-intelligence:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-vision:1.30.0:1.30.1-SNAPSHOT
+google-cloud-iot:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-websecurityscanner:0.48.0-alpha:0.48.1-alpha-SNAPSHOT

From 03e18696fe51e606323562ea15185f4ebe5c089f Mon Sep 17 00:00:00 2001
From: chenyumic 
Date: Mon, 21 May 2018 15:11:38 -0700
Subject: [PATCH 44/65] Update CreateTopicAndPublishMessages.java (#3249)

Add the publisher error handler sample. As requested, the error handling part in the publishing quickstart sample is now removed.
---
 .../CreateTopicAndPublishMessages.java        | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java
index 5ffedde5a2d8..16b1dc7c14b6 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java
@@ -17,7 +17,9 @@
 package com.google.cloud.examples.pubsub.snippets;
 
 import com.google.api.core.ApiFuture;
+import com.google.api.core.ApiFutureCallback;
 import com.google.api.core.ApiFutures;
+import com.google.api.gax.rpc.ApiException;
 import com.google.cloud.pubsub.v1.Publisher;
 import com.google.cloud.pubsub.v1.TopicAdminClient;
 import com.google.protobuf.ByteString;
@@ -78,6 +80,54 @@ public static void publishMessages() throws Exception {
     // [END pubsub_publish]
   }
 
+  public static void publishMessagesWithErrorHandler() throws Exception {
+    // [START pubsub_publish_error_handler]
+    ProjectTopicName topicName = ProjectTopicName.of("my-project-id", "my-topic-id");
+    Publisher publisher = null;
+
+    try {
+      // Create a publisher instance with default settings bound to the topic
+      publisher = Publisher.newBuilder(topicName).build();
+
+      List messages = Arrays.asList("first message", "second message");
+
+      for (final String message : messages) {
+        ByteString data = ByteString.copyFromUtf8(message);
+        PubsubMessage pubsubMessage = PubsubMessage.newBuilder().setData(data).build();
+
+        // Once published, returns a server-assigned message id (unique within the topic)
+        ApiFuture future = publisher.publish(pubsubMessage);
+
+        // Add an asynchronous callback to handle success / failure
+        ApiFutures.addCallback(future, new ApiFutureCallback() {
+
+          @Override
+          public void onFailure(Throwable throwable) {
+            if (throwable instanceof ApiException) {
+              ApiException apiException = ((ApiException) throwable);
+              // details on the API exception
+              System.out.println(apiException.getStatusCode().getCode());
+              System.out.println(apiException.isRetryable());
+            }
+            System.out.println("Error publishing message : " + message);
+          }
+
+          @Override
+          public void onSuccess(String messageId) {
+            // Once published, returns server-assigned message ids (unique within the topic)
+            System.out.println(messageId);
+          }
+        });
+      }
+    } finally {
+      if (publisher != null) {
+        // When finished with the publisher, shutdown to free up resources.
+        publisher.shutdown();
+      }
+    }
+    // [END pubsub_publish_error_handler]
+  }
+  
   public static void main(String... args) throws Exception {
     createTopic();
     publishMessages();

From e7e4911fb1f4b5e324673b7f337bc45a54b1aac2 Mon Sep 17 00:00:00 2001
From: Frank Natividad 
Date: Mon, 21 May 2018 15:31:27 -0700
Subject: [PATCH 45/65] Remove String instantiation

---
 .../src/main/java/com/google/cloud/storage/BucketInfo.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
index e2fe369aa375..6e0b3e2c38e9 100644
--- a/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
+++ b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
@@ -599,7 +599,7 @@ public Builder setLabels(Map labels) {
     @Override
     public Builder setDefaultKmsKeyName(String defaultKmsKeyName) {
       this.defaultKmsKeyName = defaultKmsKeyName != null
-              ? new String(defaultKmsKeyName) : Data.nullOf(String.class);
+              ? defaultKmsKeyName : Data.nullOf(String.class);
       return this;
     }
 

From fd28af49d7728097af788b2b47669881fa2aeedd Mon Sep 17 00:00:00 2001
From: Alix Hamilton 
Date: Tue, 22 May 2018 09:12:50 -0700
Subject: [PATCH 46/65] Pubsub: adds missing region tags

---
 .../cloud/examples/pubsub/snippets/PublisherSnippets.java     | 4 ++--
 .../cloud/examples/pubsub/snippets/SubscriberSnippets.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java
index fe9293074443..0682e8dc4be9 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java
@@ -122,13 +122,13 @@ public Publisher getPublisherWithCustomRetrySettings(ProjectTopicName topicName)
   }
 
   public Publisher getSingleThreadedPublisher(ProjectTopicName topicName) throws Exception {
-    // [START pubsub_publisher_single_threaded]
+    // [START pubsub_publisher_concurrency_control]
     // create a publisher with a single threaded executor
     ExecutorProvider executorProvider = InstantiatingExecutorProvider.newBuilder()
         .setExecutorThreadCount(1).build();
     Publisher publisher = Publisher.newBuilder(topicName)
         .setExecutorProvider(executorProvider).build();
-    // [END pubsub_publisher_single_threaded]
+    // [END pubsub_publisher_concurrency_control]
     return publisher;
   }
 
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java
index 059665282a61..642d571f67d0 100644
--- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java
+++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java
@@ -146,7 +146,7 @@ public void failed(Subscriber.State from, Throwable failure) {
   }
 
   private Subscriber createSingleThreadedSubscriber() throws Exception {
-    // [START pubsub_subscriber_single_threaded]
+    // [START pubsub_subscriber_concurrency_control]
     // provide a separate executor service for polling
     ExecutorProvider executorProvider =
         InstantiatingExecutorProvider.newBuilder().setExecutorThreadCount(1).build();
@@ -155,7 +155,7 @@ private Subscriber createSingleThreadedSubscriber() throws Exception {
         Subscriber.newBuilder(subscriptionName, receiver)
             .setExecutorProvider(executorProvider)
             .build();
-    // [END pubsub_subscriber_single_threaded]
+    // [END pubsub_subscriber_concurrency_control]
     return subscriber;
   }
 

From 9360deff5247c272bc09b9aebdf02eab278986f0 Mon Sep 17 00:00:00 2001
From: parkjam4 
Date: Tue, 22 May 2018 12:42:10 -0400
Subject: [PATCH 47/65] Update README.md (#3278)

Updating the links for Cloud Tools for IntelliJ and Cloud Tools for Eclipse to include campaign tags
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8792fba1fd37..17130151784e 100644
--- a/README.md
+++ b/README.md
@@ -75,8 +75,8 @@ libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.30.0"
 [//]: # ({x-version-update-end})
 
 If you're using IntelliJ or Eclipse, you can add client libraries to your project using these IDE plugins: 
-* [Cloud Tools for IntelliJ](https://cloud.google.com/tools/intellij/docs/client-libraries)
-* [Cloud Tools for Eclipse](https://cloud.google.com/eclipse/docs/libraries)
+* [Cloud Tools for IntelliJ](https://cloud.google.com/tools/intellij/docs/client-libraries?utm_source=github&utm_medium=google-cloud-java&utm_campaign=ToolsforIntelliJ)
+* [Cloud Tools for Eclipse](https://cloud.google.com/eclipse/docs/libraries?utm_source=github&utm_medium=google-cloud-java&utm_campaign=ToolsforEclipse)
 
 Besides adding client libraries, the plugins provide additional functionality, such as service account key management. Refer to the documentation for each plugin for more details.
 

From 754b1fc2cbecc4bbdd2ace96ce4e7ae09afacb7c Mon Sep 17 00:00:00 2001
From: Elliott Brossard 
Date: Tue, 22 May 2018 10:08:29 -0700
Subject: [PATCH 48/65] Add support for BigQuery's NUMERIC type (#3110)

---
 .../com/google/cloud/bigquery/FieldValue.java | 24 ++++++++++++--
 .../cloud/bigquery/LegacySQLTypeName.java     |  5 +++
 .../cloud/bigquery/QueryParameterValue.java   | 14 ++++++++
 .../cloud/bigquery/StandardSQLTypeName.java   |  2 ++
 .../cloud/bigquery/FieldValueListTest.java    | 20 ++++++++----
 .../google/cloud/bigquery/FieldValueTest.java | 11 +++++++
 .../bigquery/QueryParameterValueTest.java     | 20 ++++++++++++
 .../cloud/bigquery/it/ITBigQueryTest.java     | 32 ++++++++++++++++---
 8 files changed, 115 insertions(+), 13 deletions(-)

diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValue.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValue.java
index 42d1993900a5..4d6d303aae2c 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValue.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FieldValue.java
@@ -24,6 +24,7 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.io.BaseEncoding;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -48,7 +49,8 @@ public enum Attribute {
      * A primitive field value. A {@code FieldValue} is primitive when the corresponding field has
      * type {@link LegacySQLTypeName#BYTES}, {@link LegacySQLTypeName#BOOLEAN},
      * {@link LegacySQLTypeName#STRING}, {@link LegacySQLTypeName#FLOAT},
-     * {@link LegacySQLTypeName#INTEGER}, {@link LegacySQLTypeName#TIMESTAMP} or the value is set to
+     * {@link LegacySQLTypeName#INTEGER}, {@link LegacySQLTypeName#NUMERIC},
+     * {@link LegacySQLTypeName#TIMESTAMP}, or the value is set to
      * {@code null}.
      */
     PRIMITIVE,
@@ -76,7 +78,8 @@ private FieldValue(Attribute attribute, Object value) {
    * @return {@link Attribute#PRIMITIVE} if the field is a primitive type
    *     ({@link LegacySQLTypeName#BYTES}, {@link LegacySQLTypeName#BOOLEAN}, {@link LegacySQLTypeName#STRING},
    *     {@link LegacySQLTypeName#FLOAT}, {@link LegacySQLTypeName#INTEGER},
-   *     {@link LegacySQLTypeName#TIMESTAMP}) or is {@code null}. Returns {@link Attribute#REPEATED} if
+   *     {@link LegacySQLTypeName#NUMERIC}, {@link LegacySQLTypeName#TIMESTAMP})
+   *     or is {@code null}. Returns {@link Attribute#REPEATED} if
    *     the corresponding field has ({@link Field.Mode#REPEATED}) mode. Returns
    *     {@link Attribute#RECORD} if the corresponding field is a
    *     {@link LegacySQLTypeName#RECORD} type.
@@ -107,7 +110,7 @@ public Object getValue() {
    * corresponding field has primitive type ({@link LegacySQLTypeName#BYTES},
    * {@link LegacySQLTypeName#BOOLEAN}, {@link LegacySQLTypeName#STRING},
    * {@link LegacySQLTypeName#FLOAT}, {@link LegacySQLTypeName#INTEGER},
-   * {@link LegacySQLTypeName#TIMESTAMP}).
+   * {@link LegacySQLTypeName#NUMERIC} {@link LegacySQLTypeName#TIMESTAMP}).
    *
    * @throws ClassCastException if the field is not a primitive type
    * @throws NullPointerException if {@link #isNull()} returns {@code true}
@@ -198,6 +201,21 @@ public long getTimestampValue() {
   }
 
 
+  /**
+   * Returns this field's value as a {@link java.math.BigDecimal}. This method should only be used if the
+   * corresponding field has {@link LegacySQLTypeName#NUMERIC} type.
+   *
+   * @throws ClassCastException if the field is not a primitive type
+   * @throws NumberFormatException if the field's value could not be converted to
+   *   {@link java.math.BigDecimal}
+   * @throws NullPointerException if {@link #isNull()} returns {@code true}
+   */
+  @SuppressWarnings("unchecked")
+  public BigDecimal getNumericValue() {
+    return new BigDecimal(getStringValue());
+  }
+
+
   /**
    * Returns this field's value as a list of {@link FieldValue}. This method should only be used if
    * the corresponding field has {@link Field.Mode#REPEATED} mode (i.e. {@link #getAttribute()} is
diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LegacySQLTypeName.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LegacySQLTypeName.java
index e99fbe21438b..a0f6da6c992e 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LegacySQLTypeName.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LegacySQLTypeName.java
@@ -49,6 +49,11 @@ public LegacySQLTypeName apply(String constant) {
   public static final LegacySQLTypeName INTEGER = type.createAndRegister("INTEGER").setStandardType(StandardSQLTypeName.INT64);
   /** A 64-bit IEEE binary floating-point value. */
   public static final LegacySQLTypeName FLOAT = type.createAndRegister("FLOAT").setStandardType(StandardSQLTypeName.FLOAT64);
+  /**
+   * A decimal value with 38 digits of precision and 9 digits of scale.
+   * Note, support for this type is limited in legacy SQL.
+   */
+  public static final LegacySQLTypeName NUMERIC = type.createAndRegister("NUMERIC").setStandardType(StandardSQLTypeName.NUMERIC);
   /** A Boolean value (true or false). */
   public static final LegacySQLTypeName BOOLEAN = type.createAndRegister("BOOLEAN").setStandardType(StandardSQLTypeName.BOOL);
   /** Represents an absolute point in time, with microsecond precision. */
diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java
index 3038db96e724..56b62cd45b6e 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java
@@ -24,6 +24,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.io.BaseEncoding;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -47,6 +48,7 @@
  *   
  • Long: StandardSQLTypeName.INT64
  *   
  • Double: StandardSQLTypeName.FLOAT64
  *   
  • Float: StandardSQLTypeName.FLOAT64
+ *   
  • BigDecimal: StandardSQLTypeName.NUMERIC
  * 
  *
  * 
    No other types are supported through that entry point. The other types can be created by
@@ -164,6 +166,11 @@ public static QueryParameterValue float64(Float value) {
     return of(value, StandardSQLTypeName.FLOAT64);
   }
 
+  /** Creates a {@code QueryParameterValue} object with a type of NUMERIC. */
+  public static QueryParameterValue numeric(BigDecimal value) {
+    return of(value, StandardSQLTypeName.NUMERIC);
+  }
+
   /** Creates a {@code QueryParameterValue} object with a type of STRING. */
   public static QueryParameterValue string(String value) {
     return of(value, StandardSQLTypeName.STRING);
@@ -245,6 +252,8 @@ private static  StandardSQLTypeName classToType(Class type) {
       return StandardSQLTypeName.FLOAT64;
     } else if (Float.class.isAssignableFrom(type)) {
       return StandardSQLTypeName.FLOAT64;
+    } else if (BigDecimal.class.isAssignableFrom(type)) {
+      return StandardSQLTypeName.NUMERIC;
     }
     throw new IllegalArgumentException("Unsupported object type for QueryParameter: " + type);
   }
@@ -269,6 +278,11 @@ private static  String valueToStringOrNull(T value, StandardSQLTypeName type)
           return value.toString();
         }
         break;
+      case NUMERIC:
+        if (value instanceof BigDecimal) {
+          return value.toString();
+        }
+        break;
       case BYTES:
         if (value instanceof byte[]) {
           return BaseEncoding.base64().encode((byte[]) value);
diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardSQLTypeName.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardSQLTypeName.java
index a250c1fc1509..e6f43b0b776f 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardSQLTypeName.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardSQLTypeName.java
@@ -29,6 +29,8 @@ public enum StandardSQLTypeName {
   INT64,
   /** A 64-bit IEEE binary floating-point value. */
   FLOAT64,
+  /** A decimal value with 38 digits of precision and 9 digits of scale. */
+  NUMERIC,
   /** Variable-length character (Unicode) data. */
   STRING,
   /** Variable-length binary data. */
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueListTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueListTest.java
index c59f5c94a5c4..e0f8e0ef65a3 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueListTest.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueListTest.java
@@ -48,7 +48,8 @@ public class FieldValueListTest {
               "ninth",
               LegacySQLTypeName.RECORD,
               Field.of("first", LegacySQLTypeName.FLOAT),
-              Field.of("second", LegacySQLTypeName.TIMESTAMP)));
+              Field.of("second", LegacySQLTypeName.TIMESTAMP)),
+          Field.of("tenth", LegacySQLTypeName.NUMERIC));
 
   private final Map integerPb = ImmutableMap.of("v", "1");
   private final Map floatPb = ImmutableMap.of("v", "1.5");
@@ -60,6 +61,7 @@ public class FieldValueListTest {
       ImmutableMap.of("v", ImmutableList.of(integerPb, integerPb));
   private final Map recordPb =
       ImmutableMap.of("f", ImmutableList.of(floatPb, timestampPb));
+  private final Map numericPb = ImmutableMap.of("v", "123456789.123456789");
 
   private final FieldValue booleanFv = FieldValue.of(Attribute.PRIMITIVE, "false");
   private final FieldValue integerFv = FieldValue.of(Attribute.PRIMITIVE, "1");
@@ -75,6 +77,7 @@ public class FieldValueListTest {
           Attribute.RECORD,
           FieldValueList.of(
               ImmutableList.of(floatFv, timestampFv), schema.get("ninth").getSubFields()));
+  private final FieldValue numericFv = FieldValue.of(Attribute.PRIMITIVE, "123456789.123456789");
 
   private final List fieldValuesPb =
       ImmutableList.of(
@@ -86,7 +89,8 @@ public class FieldValueListTest {
           bytesPb,
           nullPb,
           repeatedPb,
-          recordPb);
+          recordPb,
+          numericPb);
 
   private final FieldValueList fieldValues =
       FieldValueList.of(
@@ -99,7 +103,8 @@ public class FieldValueListTest {
               bytesFv,
               nullFv,
               repeatedFv,
-              recordFv),
+              recordFv,
+              numericFv),
           schema);
 
   @Test
@@ -111,7 +116,7 @@ public void testFromPb() {
 
   @Test
   public void testGetByIndex() {
-    assertEquals(9, fieldValues.size());
+    assertEquals(10, fieldValues.size());
     assertEquals(booleanFv, fieldValues.get(0));
     assertEquals(integerFv, fieldValues.get(1));
     assertEquals(floatFv, fieldValues.get(2));
@@ -127,11 +132,12 @@ public void testGetByIndex() {
     assertEquals(2, fieldValues.get(8).getRecordValue().size());
     assertEquals(floatFv, fieldValues.get(8).getRecordValue().get(0));
     assertEquals(timestampFv, fieldValues.get(8).getRecordValue().get(1));
+    assertEquals(numericFv, fieldValues.get(9));
   }
 
   @Test
   public void testGetByName() {
-    assertEquals(9, fieldValues.size());
+    assertEquals(10, fieldValues.size());
     assertEquals(booleanFv, fieldValues.get("first"));
     assertEquals(integerFv, fieldValues.get("second"));
     assertEquals(floatFv, fieldValues.get("third"));
@@ -147,6 +153,7 @@ public void testGetByName() {
     assertEquals(2, fieldValues.get("ninth").getRecordValue().size());
     assertEquals(floatFv, fieldValues.get("ninth").getRecordValue().get("first"));
     assertEquals(timestampFv, fieldValues.get("ninth").getRecordValue().get("second"));
+    assertEquals(numericFv, fieldValues.get("tenth"));
   }
 
   @Test
@@ -161,7 +168,8 @@ public void testNullSchema() {
             bytesFv,
             nullFv,
             repeatedFv,
-            recordFv));
+            recordFv,
+            numericFv));
 
     assertEquals(fieldValues, fieldValuesNoSchema);
 
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueTest.java
index f01a23d80a6f..e5afcedcbfad 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueTest.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FieldValueTest.java
@@ -29,6 +29,7 @@
 
 import org.junit.Test;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 public class FieldValueTest {
@@ -38,6 +39,8 @@ public class FieldValueTest {
   private static final TableCell BOOLEAN_FIELD = new TableCell().setV("false");
   private static final Map INTEGER_FIELD = ImmutableMap.of("v", "1");
   private static final Map FLOAT_FIELD = ImmutableMap.of("v", "1.5");
+  private static final Map NUMERIC_FIELD =
+      ImmutableMap.of("v", "123456789.123456789");
   private static final Map STRING_FIELD = ImmutableMap.of("v", "string");
   private static final Map TIMESTAMP_FIELD = ImmutableMap.of("v", "42");
   private static final Map BYTES_FIELD = ImmutableMap.of("v", BYTES_BASE64);
@@ -59,6 +62,9 @@ public void testFromPb() {
     value = FieldValue.fromPb(FLOAT_FIELD);
     assertEquals(FieldValue.Attribute.PRIMITIVE, value.getAttribute());
     assertEquals(1.5, value.getDoubleValue(), 0);
+    value = FieldValue.fromPb(NUMERIC_FIELD);
+    assertEquals(FieldValue.Attribute.PRIMITIVE, value.getAttribute());
+    assertEquals(new BigDecimal("123456789.123456789"), value.getNumericValue());
     value = FieldValue.fromPb(STRING_FIELD);
     assertEquals(FieldValue.Attribute.PRIMITIVE, value.getAttribute());
     assertEquals("string", value.getStringValue());
@@ -95,6 +101,11 @@ public void testEquals() {
     assertEquals(floatValue, FieldValue.fromPb(FLOAT_FIELD));
     assertEquals(floatValue.hashCode(), FieldValue.fromPb(FLOAT_FIELD).hashCode());
 
+    FieldValue numericValue =
+        FieldValue.of(FieldValue.Attribute.PRIMITIVE, "123456789.123456789");
+    assertEquals(numericValue, FieldValue.fromPb(NUMERIC_FIELD));
+    assertEquals(numericValue.hashCode(), FieldValue.fromPb(NUMERIC_FIELD).hashCode());
+
     FieldValue stringValue = FieldValue.of(FieldValue.Attribute.PRIMITIVE, "string");
     assertEquals(stringValue, FieldValue.fromPb(STRING_FIELD));
     assertEquals(stringValue.hashCode(), FieldValue.fromPb(STRING_FIELD).hashCode());
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java
index f804923bf7c1..5b024e3f8948 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryParameterValueTest.java
@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.api.services.bigquery.model.QueryParameterType;
+import java.math.BigDecimal;
 import java.util.List;
 import org.junit.Test;
 
@@ -69,6 +70,15 @@ public void testFloat64FromFloat() {
     assertThat(value.getArrayValues()).isNull();
   }
 
+  @Test
+  public void testNumeric() {
+    QueryParameterValue value = QueryParameterValue.numeric(new BigDecimal("123.456"));
+    assertThat(value.getValue()).isEqualTo("123.456");
+    assertThat(value.getType()).isEqualTo(StandardSQLTypeName.NUMERIC);
+    assertThat(value.getArrayType()).isNull();
+    assertThat(value.getArrayValues()).isNull();
+  }
+
   @Test
   public void testString() {
     QueryParameterValue value = QueryParameterValue.string("foo");
@@ -132,6 +142,16 @@ public void testFloat64ArrayFromFloats() {
     assertArrayDataEquals(new String[]{"2.6", "5.4"}, StandardSQLTypeName.FLOAT64, value.getArrayValues());
   }
 
+  @Test
+  public void testNumericArray() {
+    QueryParameterValue value = QueryParameterValue.array(
+        new BigDecimal[] {new BigDecimal("3.14"), new BigDecimal("1.59")}, BigDecimal.class);
+    assertThat(value.getValue()).isNull();
+    assertThat(value.getType()).isEqualTo(StandardSQLTypeName.ARRAY);
+    assertThat(value.getArrayType()).isEqualTo(StandardSQLTypeName.NUMERIC);
+    assertArrayDataEquals(new String[]{"3.14", "1.59"}, StandardSQLTypeName.NUMERIC, value.getArrayValues());
+  }
+
   @Test
   public void testStringArray() {
     QueryParameterValue value = QueryParameterValue.array(new String[] {"Ana", "Marv"}, String.class);
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
index 29d4c19ed74e..bd88f9e5f8bd 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
@@ -84,6 +84,7 @@
 import com.google.common.collect.Sets;
 import com.google.common.io.BaseEncoding;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
@@ -164,9 +165,14 @@ public class ITBigQueryTest {
           .setMode(Field.Mode.NULLABLE)
           .setDescription("FloatDescription")
           .build();
+  private static final Field NUMERIC_FIELD_SCHEMA =
+      Field.newBuilder("NumericField", LegacySQLTypeName.NUMERIC)
+          .setMode(Field.Mode.NULLABLE)
+          .setDescription("NumericDescription")
+          .build();
   private static final Schema TABLE_SCHEMA = Schema.of(TIMESTAMP_FIELD_SCHEMA, STRING_FIELD_SCHEMA,
       INTEGER_ARRAY_FIELD_SCHEMA, BOOLEAN_FIELD_SCHEMA, BYTES_FIELD_SCHEMA, RECORD_FIELD_SCHEMA,
-      INTEGER_FIELD_SCHEMA, FLOAT_FIELD_SCHEMA);
+      INTEGER_FIELD_SCHEMA, FLOAT_FIELD_SCHEMA, NUMERIC_FIELD_SCHEMA);
   private static final Schema SIMPLE_SCHEMA = Schema.of(STRING_FIELD_SCHEMA);
   private static final Schema QUERY_RESULT_SCHEMA = Schema.of(
       Field.newBuilder("TimestampField", LegacySQLTypeName.TIMESTAMP)
@@ -198,7 +204,8 @@ public class ITBigQueryTest {
       + "    \"BytesField\": \"" + BYTES_BASE64 + "\""
       + "  },"
       + "  \"IntegerField\": \"3\","
-      + "  \"FloatField\": \"1.2\""
+      + "  \"FloatField\": \"1.2\","
+      + "  \"NumericField\": \"3.14\""
       + "}\n"
       + "{"
       + "  \"TimestampField\": \"2014-08-19 07:41:35.220 -05:00\","
@@ -214,7 +221,8 @@ public class ITBigQueryTest {
       + "    \"BytesField\": \"" + BYTES_BASE64 + "\""
       + "  },"
       + "  \"IntegerField\": \"3\","
-      + "  \"FloatField\": \"1.2\""
+      + "  \"FloatField\": \"1.2\","
+      + "  \"NumericField\": \"123456.789012345\""
       + "}";
 
   private static final Set PUBLIC_DATASETS = ImmutableSet.of("github_repos", "hacker_news",
@@ -642,6 +650,7 @@ public void testInsertAll() throws IOException {
         "BytesField", BYTES_BASE64));
     builder1.put("IntegerField", 5);
     builder1.put("FloatField", 1.2);
+    builder1.put("NumericField", new BigDecimal("123456789.123456789"));
     ImmutableMap.Builder builder2 = ImmutableMap.builder();
     builder2.put("TimestampField", "2014-08-19 07:41:35.220 -05:00");
     builder2.put("StringField", "stringValue");
@@ -655,6 +664,7 @@ public void testInsertAll() throws IOException {
         "BytesField", BYTES_BASE64));
     builder2.put("IntegerField", 5);
     builder2.put("FloatField", 1.2);
+    builder2.put("NumericField", new BigDecimal("123456789.123456789"));
     InsertAllRequest request = InsertAllRequest.newBuilder(tableInfo.getTableId())
         .addRow(builder1.build())
         .addRow(builder2.build())
@@ -684,6 +694,7 @@ public void testInsertAllWithSuffix() throws InterruptedException {
         "BytesField", BYTES_BASE64));
     builder1.put("IntegerField", 5);
     builder1.put("FloatField", 1.2);
+    builder1.put("NumericField", new BigDecimal("123456789.123456789"));
     ImmutableMap.Builder builder2 = ImmutableMap.builder();
     builder2.put("TimestampField", "2014-08-19 07:41:35.220 -05:00");
     builder2.put("StringField", "stringValue");
@@ -697,6 +708,7 @@ public void testInsertAllWithSuffix() throws InterruptedException {
         "BytesField", BYTES_BASE64));
     builder2.put("IntegerField", 5);
     builder2.put("FloatField", 1.2);
+    builder2.put("NumericField", new BigDecimal("123456789.123456789"));
     InsertAllRequest request = InsertAllRequest.newBuilder(tableInfo.getTableId())
         .addRow(builder1.build())
         .addRow(builder2.build())
@@ -735,6 +747,7 @@ public void testInsertAllWithErrors() {
         "BytesField", BYTES_BASE64));
     builder1.put("IntegerField", 5);
     builder1.put("FloatField", 1.2);
+    builder1.put("NumericField", new BigDecimal("123456789.123456789"));
     ImmutableMap.Builder builder2 = ImmutableMap.builder();
     builder2.put("TimestampField", "invalidDate");
     builder2.put("StringField", "stringValue");
@@ -748,6 +761,7 @@ public void testInsertAllWithErrors() {
         "BytesField", BYTES_BASE64));
     builder2.put("IntegerField", 5);
     builder2.put("FloatField", 1.2);
+    builder2.put("NumericField", new BigDecimal("123456789.123456789"));
     ImmutableMap.Builder builder3 = ImmutableMap.builder();
     builder3.put("TimestampField", "2014-08-19 07:41:35.220 -05:00");
     builder3.put("StringField", "stringValue");
@@ -781,6 +795,7 @@ public void testListAllTableData() {
       FieldValue recordCell = row.get(5);
       FieldValue integerCell = row.get(6);
       FieldValue floatCell = row.get(7);
+      FieldValue numericCell = row.get(8);
       assertEquals(FieldValue.Attribute.PRIMITIVE, timestampCell.getAttribute());
       assertEquals(FieldValue.Attribute.PRIMITIVE, stringCell.getAttribute());
       assertEquals(FieldValue.Attribute.REPEATED, integerArrayCell.getAttribute());
@@ -789,6 +804,7 @@ public void testListAllTableData() {
       assertEquals(FieldValue.Attribute.RECORD, recordCell.getAttribute());
       assertEquals(FieldValue.Attribute.PRIMITIVE, integerCell.getAttribute());
       assertEquals(FieldValue.Attribute.PRIMITIVE, floatCell.getAttribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, numericCell.getAttribute());
       assertEquals(1408452095220000L, timestampCell.getTimestampValue());
       assertEquals("stringValue", stringCell.getStringValue());
       assertEquals(0, integerArrayCell.getRepeatedValue().get(0).getLongValue());
@@ -802,6 +818,7 @@ public void testListAllTableData() {
       assertEquals(true, recordCell.getRecordValue().get(3).getBooleanValue());
       assertEquals(3, integerCell.getLongValue());
       assertEquals(1.2, floatCell.getDoubleValue(), 0.0001);
+      assertEquals(new BigDecimal("123456789.123456789"), numericCell.getNumericValue());
       rowCount++;
     }
     assertEquals(2, rowCount);
@@ -849,7 +866,8 @@ public void testPositionalQueryParameters() throws InterruptedException {
         " AND TimestampField > ?" +
         " AND IntegerField IN UNNEST(?)" +
         " AND IntegerField < ?" +
-        " AND FloatField > ?";
+        " AND FloatField > ?" +
+        " AND NumericField < ?";
     QueryParameterValue stringParameter = QueryParameterValue.string("stringValue");
     QueryParameterValue timestampParameter =
         QueryParameterValue.timestamp("2014-01-01 07:00:00.000000+00:00");
@@ -857,6 +875,8 @@ public void testPositionalQueryParameters() throws InterruptedException {
         QueryParameterValue.array(new Integer[] {3, 4}, Integer.class);
     QueryParameterValue int64Parameter = QueryParameterValue.int64(5);
     QueryParameterValue float64Parameter = QueryParameterValue.float64(0.5);
+    QueryParameterValue numericParameter =
+        QueryParameterValue.numeric(new BigDecimal("234567890.123456"));
     QueryJobConfiguration config = QueryJobConfiguration.newBuilder(query)
         .setDefaultDataset(DatasetId.of(DATASET))
         .setUseLegacySql(false)
@@ -865,6 +885,7 @@ public void testPositionalQueryParameters() throws InterruptedException {
         .addPositionalParameter(intArrayParameter)
         .addPositionalParameter(int64Parameter)
         .addPositionalParameter(float64Parameter)
+        .addPositionalParameter(numericParameter)
         .build();
     TableResult result = bigquery.query(config);
     assertEquals(QUERY_RESULT_SCHEMA, result.getSchema());
@@ -1191,6 +1212,7 @@ public void testInsertFromFile() throws InterruptedException, IOException, Timeo
       FieldValue recordCell = row.get(5);
       FieldValue integerCell = row.get(6);
       FieldValue floatCell = row.get(7);
+      FieldValue numericCell = row.get(8);
       assertEquals(FieldValue.Attribute.PRIMITIVE, timestampCell.getAttribute());
       assertEquals(FieldValue.Attribute.PRIMITIVE, stringCell.getAttribute());
       assertEquals(FieldValue.Attribute.REPEATED, integerArrayCell.getAttribute());
@@ -1199,6 +1221,7 @@ public void testInsertFromFile() throws InterruptedException, IOException, Timeo
       assertEquals(FieldValue.Attribute.RECORD, recordCell.getAttribute());
       assertEquals(FieldValue.Attribute.PRIMITIVE, integerCell.getAttribute());
       assertEquals(FieldValue.Attribute.PRIMITIVE, floatCell.getAttribute());
+      assertEquals(FieldValue.Attribute.PRIMITIVE, numericCell.getAttribute());
       assertEquals(1408452095220000L, timestampCell.getTimestampValue());
       assertEquals("stringValue", stringCell.getStringValue());
       assertEquals(0, integerArrayCell.getRepeatedValue().get(0).getLongValue());
@@ -1212,6 +1235,7 @@ public void testInsertFromFile() throws InterruptedException, IOException, Timeo
       assertEquals(true, recordCell.getRecordValue().get(3).getBooleanValue());
       assertEquals(3, integerCell.getLongValue());
       assertEquals(1.2, floatCell.getDoubleValue(), 0.0001);
+      assertEquals(new BigDecimal("123456789.123456789"), floatCell.getNumericValue());
       rowCount++;
     }
     assertEquals(2, rowCount);

From d3fe98cff8c0d06a18091049426a8f60d60c1c68 Mon Sep 17 00:00:00 2001
From: Frank Natividad 
Date: Tue, 22 May 2018 11:15:18 -0700
Subject: [PATCH 49/65] storage: fix integration (#3297)

Do not pollute main test bucket with default kms key
---
 .../cloud/storage/it/ITStorageTest.java       | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
index 09360efe2a4f..0cb8776101e8 100644
--- a/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
+++ b/google-cloud-clients/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
@@ -1860,25 +1860,30 @@ public void testListBucketRequesterPaysFails() throws InterruptedException {
   }
 
   @Test
-  public void testListBucketDefaultKmsKeyName() throws InterruptedException {
-    Bucket remoteBucket = storage.get(BUCKET, Storage.BucketGetOption.fields(BucketField.ENCRYPTION));
-    assertNull(remoteBucket.getDefaultKmsKeyName());
-    remoteBucket = remoteBucket.toBuilder().setDefaultKmsKeyName(KMS_KEY_NAME_1).build().update();
+  public void testListBucketDefaultKmsKeyName() throws ExecutionException, InterruptedException {
+    String bucketName = RemoteStorageHelper.generateBucketName();
+    Bucket remoteBucket = storage.create(BucketInfo.newBuilder(bucketName)
+            .setDefaultKmsKeyName(KMS_KEY_NAME_1).setLocation("US").build());
+    assertNotNull(remoteBucket);
     assertTrue(remoteBucket.getDefaultKmsKeyName().startsWith(KMS_KEY_NAME_1));
-    Iterator bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET),
-            Storage.BucketListOption.fields(BucketField.ENCRYPTION)).iterateAll().iterator();
-    while (!bucketIterator.hasNext()) {
-      Thread.sleep(500);
-      bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET),
+    try {
+      Iterator bucketIterator = storage.list(Storage.BucketListOption.prefix(bucketName),
               Storage.BucketListOption.fields(BucketField.ENCRYPTION)).iterateAll().iterator();
-    }
-    while (bucketIterator.hasNext()) {
-      Bucket bucket = bucketIterator.next();
-      assertTrue(bucket.getName().startsWith(BUCKET));
-      assertNotNull(bucket.getDefaultKmsKeyName());
-      assertTrue(bucket.getDefaultKmsKeyName().startsWith(KMS_KEY_NAME_1));
-      assertNull(bucket.getCreateTime());
-      assertNull(bucket.getSelfLink());
+      while (!bucketIterator.hasNext()) {
+        Thread.sleep(500);
+        bucketIterator = storage.list(Storage.BucketListOption.prefix(bucketName),
+                Storage.BucketListOption.fields(BucketField.ENCRYPTION)).iterateAll().iterator();
+      }
+      while (bucketIterator.hasNext()) {
+        Bucket bucket = bucketIterator.next();
+        assertTrue(bucket.getName().startsWith(bucketName));
+        assertNotNull(bucket.getDefaultKmsKeyName());
+        assertTrue(bucket.getDefaultKmsKeyName().startsWith(KMS_KEY_NAME_1));
+        assertNull(bucket.getCreateTime());
+        assertNull(bucket.getSelfLink());
+      }
+    } finally {
+      RemoteStorageHelper.forceDelete(storage, bucketName, 5, TimeUnit.SECONDS);
     }
   }
 

From 86be7e5eb5cd45a2f8c89754d19f269527b004f0 Mon Sep 17 00:00:00 2001
From: Michael Darakananda 
Date: Tue, 22 May 2018 13:05:07 -0700
Subject: [PATCH 50/65] spanner: use method getters (#3299)

instead of deprecated fields.

Original PR: https://github.com/GoogleCloudPlatform/google-cloud-java/pull/2989
---
 .../cloud/spanner/spi/v1/GrpcSpannerRpc.java  | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GrpcSpannerRpc.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GrpcSpannerRpc.java
index f0a7878d661f..e983ef6303f9 100644
--- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GrpcSpannerRpc.java
+++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GrpcSpannerRpc.java
@@ -189,7 +189,7 @@ public Paginated listInstanceConfigs(int pageSize, @Nullable Str
     ListInstanceConfigsResponse response =
         get(
             doUnaryCall(
-                InstanceAdminGrpc.METHOD_LIST_INSTANCE_CONFIGS,
+                InstanceAdminGrpc.getListInstanceConfigsMethod(),
                 request.build(),
                 projectName(),
                 null));
@@ -201,7 +201,7 @@ public InstanceConfig getInstanceConfig(String instanceConfigName) throws Spanne
     GetInstanceConfigRequest request =
         GetInstanceConfigRequest.newBuilder().setName(instanceConfigName).build();
     return get(
-        doUnaryCall(InstanceAdminGrpc.METHOD_GET_INSTANCE_CONFIG, request, projectName(), null));
+        doUnaryCall(InstanceAdminGrpc.getGetInstanceConfigMethod(), request, projectName(), null));
   }
 
   @Override
@@ -218,7 +218,7 @@ public Paginated listInstances(
     ListInstancesResponse response =
         get(
             doUnaryCall(
-                InstanceAdminGrpc.METHOD_LIST_INSTANCES, request.build(), projectName(), null));
+                InstanceAdminGrpc.getListInstancesMethod(), request.build(), projectName(), null));
     return new Paginated<>(response.getInstancesList(), response.getNextPageToken());
   }
 
@@ -231,7 +231,7 @@ public Operation createInstance(String parent, String instanceId, Instance insta
             .setInstanceId(instanceId)
             .setInstance(instance)
             .build();
-    return get(doUnaryCall(InstanceAdminGrpc.METHOD_CREATE_INSTANCE, request, parent, null));
+    return get(doUnaryCall(InstanceAdminGrpc.getCreateInstanceMethod(), request, parent, null));
   }
 
   @Override
@@ -239,14 +239,14 @@ public Operation updateInstance(Instance instance, FieldMask fieldMask) throws S
     UpdateInstanceRequest request =
         UpdateInstanceRequest.newBuilder().setInstance(instance).setFieldMask(fieldMask).build();
     return get(
-        doUnaryCall(InstanceAdminGrpc.METHOD_UPDATE_INSTANCE, request, instance.getName(), null));
+        doUnaryCall(InstanceAdminGrpc.getUpdateInstanceMethod(), request, instance.getName(), null));
   }
 
   @Override
   public Instance getInstance(String instanceName) throws SpannerException {
     return get(
         doUnaryCall(
-            InstanceAdminGrpc.METHOD_GET_INSTANCE,
+            InstanceAdminGrpc.getGetInstanceMethod(),
             GetInstanceRequest.newBuilder().setName(instanceName).build(),
             instanceName,
             null));
@@ -256,7 +256,7 @@ public Instance getInstance(String instanceName) throws SpannerException {
   public void deleteInstance(String instanceName) throws SpannerException {
     get(
         doUnaryCall(
-            InstanceAdminGrpc.METHOD_DELETE_INSTANCE,
+            InstanceAdminGrpc.getDeleteInstanceMethod(),
             DeleteInstanceRequest.newBuilder().setName(instanceName).build(),
             instanceName,
             null));
@@ -273,7 +273,7 @@ public Paginated listDatabases(
     com.google.spanner.admin.database.v1.ListDatabasesResponse response =
         get(
             doUnaryCall(
-                DatabaseAdminGrpc.METHOD_LIST_DATABASES, builder.build(), instanceName, null));
+                DatabaseAdminGrpc.getListDatabasesMethod(), builder.build(), instanceName, null));
     return new Paginated<>(response.getDatabasesList(), response.getNextPageToken());
   }
 
@@ -287,7 +287,7 @@ public Operation createDatabase(
             .setCreateStatement(createDatabaseStatement)
             .addAllExtraStatements(additionalStatements)
             .build();
-    return get(doUnaryCall(DatabaseAdminGrpc.METHOD_CREATE_DATABASE, request, instanceName, null));
+    return get(doUnaryCall(DatabaseAdminGrpc.getCreateDatabaseMethod(), request, instanceName, null));
   }
 
   @Override
@@ -301,14 +301,14 @@ public Operation updateDatabaseDdl(
             .setOperationId(MoreObjects.firstNonNull(operationId, ""))
             .build();
     return get(
-        doUnaryCall(DatabaseAdminGrpc.METHOD_UPDATE_DATABASE_DDL, request, databaseName, null));
+        doUnaryCall(DatabaseAdminGrpc.getUpdateDatabaseDdlMethod(), request, databaseName, null));
   }
 
   @Override
   public void dropDatabase(String databaseName) throws SpannerException {
     get(
         doUnaryCall(
-            DatabaseAdminGrpc.METHOD_DROP_DATABASE,
+            DatabaseAdminGrpc.getDropDatabaseMethod(),
             DropDatabaseRequest.newBuilder().setDatabase(databaseName).build(),
             databaseName,
             null));
@@ -318,7 +318,7 @@ public void dropDatabase(String databaseName) throws SpannerException {
   public List getDatabaseDdl(String databaseName) throws SpannerException {
     GetDatabaseDdlRequest request =
         GetDatabaseDdlRequest.newBuilder().setDatabase(databaseName).build();
-    return get(doUnaryCall(DatabaseAdminGrpc.METHOD_GET_DATABASE_DDL, request, databaseName, null))
+    return get(doUnaryCall(DatabaseAdminGrpc.getGetDatabaseDdlMethod(), request, databaseName, null))
         .getStatementsList();
   }
 
@@ -326,7 +326,7 @@ public List getDatabaseDdl(String databaseName) throws SpannerException
   public Database getDatabase(String databaseName) throws SpannerException {
     return get(
         doUnaryCall(
-            DatabaseAdminGrpc.METHOD_GET_DATABASE,
+            DatabaseAdminGrpc.getGetDatabaseMethod(),
             GetDatabaseRequest.newBuilder().setName(databaseName).build(),
             databaseName,
             null));
@@ -335,7 +335,7 @@ public Database getDatabase(String databaseName) throws SpannerException {
   @Override
   public Operation getOperation(String name) throws SpannerException {
     GetOperationRequest request = GetOperationRequest.newBuilder().setName(name).build();
-    return get(doUnaryCall(OperationsGrpc.METHOD_GET_OPERATION, request, name, null));
+    return get(doUnaryCall(OperationsGrpc.getGetOperationMethod(), request, name, null));
   }
 
   @Override
@@ -349,7 +349,7 @@ public Session createSession(
     }
     return get(
         doUnaryCall(
-            SpannerGrpc.METHOD_CREATE_SESSION,
+            SpannerGrpc.getCreateSessionMethod(),
             request.build(),
             databaseName,
             Option.CHANNEL_HINT.getLong(options)));
@@ -360,7 +360,7 @@ public void deleteSession(String sessionName, @Nullable Map options)
     DeleteSessionRequest request = DeleteSessionRequest.newBuilder().setName(sessionName).build();
     get(
         doUnaryCall(
-            SpannerGrpc.METHOD_DELETE_SESSION,
+            SpannerGrpc.getDeleteSessionMethod(),
             request,
             sessionName,
             Option.CHANNEL_HINT.getLong(options)));
@@ -370,7 +370,7 @@ public void deleteSession(String sessionName, @Nullable Map options)
   public StreamingCall read(
       ReadRequest request, ResultStreamConsumer consumer, @Nullable Map options) {
     return doStreamingCall(
-        SpannerGrpc.METHOD_STREAMING_READ,
+        SpannerGrpc.getStreamingReadMethod(),
         request,
         consumer,
         request.getSession(),
@@ -381,7 +381,7 @@ public StreamingCall read(
   public StreamingCall executeQuery(
       ExecuteSqlRequest request, ResultStreamConsumer consumer, @Nullable Map options) {
     return doStreamingCall(
-        SpannerGrpc.METHOD_EXECUTE_STREAMING_SQL,
+        SpannerGrpc.getExecuteStreamingSqlMethod(),
         request,
         consumer,
         request.getSession(),
@@ -393,7 +393,7 @@ public Transaction beginTransaction(
       BeginTransactionRequest request, @Nullable Map options) {
     return get(
         doUnaryCall(
-            SpannerGrpc.METHOD_BEGIN_TRANSACTION,
+            SpannerGrpc.getBeginTransactionMethod(),
             request,
             request.getSession(),
             Option.CHANNEL_HINT.getLong(options)));
@@ -403,7 +403,7 @@ public Transaction beginTransaction(
   public CommitResponse commit(CommitRequest commitRequest, @Nullable Map options) {
     return get(
         doUnaryCall(
-            SpannerGrpc.METHOD_COMMIT,
+            SpannerGrpc.getCommitMethod(),
             commitRequest,
             commitRequest.getSession(),
             Option.CHANNEL_HINT.getLong(options)));
@@ -413,7 +413,7 @@ public CommitResponse commit(CommitRequest commitRequest, @Nullable Map options) {
     get(
         doUnaryCall(
-            SpannerGrpc.METHOD_ROLLBACK,
+            SpannerGrpc.getRollbackMethod(),
             request,
             request.getSession(),
             Option.CHANNEL_HINT.getLong(options)));
@@ -425,7 +425,7 @@ public PartitionResponse partitionQuery(
           throws SpannerException {
     return get(
         doUnaryCall(
-            SpannerGrpc.METHOD_PARTITION_QUERY,
+            SpannerGrpc.getPartitionQueryMethod(),
             request,
             request.getSession(),
             Option.CHANNEL_HINT.getLong(options)));
@@ -437,7 +437,7 @@ public PartitionResponse partitionRead(
           throws SpannerException {
     return get(
         doUnaryCall(
-            SpannerGrpc.METHOD_PARTITION_READ,
+            SpannerGrpc.getPartitionReadMethod(),
             request,
             request.getSession(),
             Option.CHANNEL_HINT.getLong(options)));

From bb092a0dfee83c44f2872760613674e1ea2af0b8 Mon Sep 17 00:00:00 2001
From: shollyman 
Date: Tue, 22 May 2018 15:37:09 -0700
Subject: [PATCH 51/65] BigQuery: correct ITBigQueryTest (#3303)

Test asserts consistent values for all rows within a table, but the
sample data used for generating tables was inconsistent between rows.
---
 .../java/com/google/cloud/bigquery/it/ITBigQueryTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
index bd88f9e5f8bd..3d69753279f6 100644
--- a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
+++ b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
@@ -205,7 +205,7 @@ public class ITBigQueryTest {
       + "  },"
       + "  \"IntegerField\": \"3\","
       + "  \"FloatField\": \"1.2\","
-      + "  \"NumericField\": \"3.14\""
+      + "  \"NumericField\": \"123456.789012345\""
       + "}\n"
       + "{"
       + "  \"TimestampField\": \"2014-08-19 07:41:35.220 -05:00\","
@@ -818,7 +818,7 @@ public void testListAllTableData() {
       assertEquals(true, recordCell.getRecordValue().get(3).getBooleanValue());
       assertEquals(3, integerCell.getLongValue());
       assertEquals(1.2, floatCell.getDoubleValue(), 0.0001);
-      assertEquals(new BigDecimal("123456789.123456789"), numericCell.getNumericValue());
+      assertEquals(new BigDecimal("123456.789012345"), numericCell.getNumericValue());
       rowCount++;
     }
     assertEquals(2, rowCount);
@@ -1235,7 +1235,7 @@ public void testInsertFromFile() throws InterruptedException, IOException, Timeo
       assertEquals(true, recordCell.getRecordValue().get(3).getBooleanValue());
       assertEquals(3, integerCell.getLongValue());
       assertEquals(1.2, floatCell.getDoubleValue(), 0.0001);
-      assertEquals(new BigDecimal("123456789.123456789"), floatCell.getNumericValue());
+      assertEquals(new BigDecimal("123456.789012345"), numericCell.getNumericValue());
       rowCount++;
     }
     assertEquals(2, rowCount);

From a9f3af8413813efc394356918bd6b1c1ecdad999 Mon Sep 17 00:00:00 2001
From: Michael Darakananda 
Date: Wed, 23 May 2018 11:57:05 -0700
Subject: [PATCH 52/65] pubsub: declare GA (#3298)

The version bump will be picked up by the next release.
We'll hold off on the README update until then.
---
 versions.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/versions.txt b/versions.txt
index 733c280e3221..ca75a779591e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -23,7 +23,7 @@ grpc-google-cloud-language-v1beta2:0.13.0:0.13.1-SNAPSHOT
 grpc-google-cloud-logging-v2:0.13.0:0.13.1-SNAPSHOT
 grpc-google-cloud-monitoring-v3:0.13.0:0.13.1-SNAPSHOT
 grpc-google-cloud-os-login-v1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-pubsub-v1:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-pubsub-v1:1.12.0:1.12.1-SNAPSHOT
 grpc-google-cloud-spanner-admin-database-v1:0.13.0:0.13.1-SNAPSHOT
 grpc-google-cloud-spanner-admin-instance-v1:0.13.0:0.13.1-SNAPSHOT
 grpc-google-cloud-spanner-v1:0.13.0:0.13.1-SNAPSHOT
@@ -59,7 +59,7 @@ proto-google-cloud-language-v1beta2:0.13.0:0.13.1-SNAPSHOT
 proto-google-cloud-logging-v2:0.13.0:0.13.1-SNAPSHOT
 proto-google-cloud-monitoring-v3:0.13.0:0.13.1-SNAPSHOT
 proto-google-cloud-os-login-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-pubsub-v1:0.13.0:0.13.1-SNAPSHOT
+proto-google-cloud-pubsub-v1:1.12.0:1.12.1-SNAPSHOT
 proto-google-cloud-spanner-admin-database-v1:0.13.0:0.13.1-SNAPSHOT
 proto-google-cloud-spanner-admin-instance-v1:0.13.0:0.13.1-SNAPSHOT
 proto-google-cloud-spanner-v1:0.13.0:0.13.1-SNAPSHOT
@@ -119,7 +119,7 @@ google-cloud-nio:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
 google-cloud-nio-examples:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
 google-cloud-notification:0.48.0-beta:0.48.1-beta-SNAPSHOT
 google-cloud-os-login:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-pubsub:0.48.0-beta:0.48.1-beta-SNAPSHOT
+google-cloud-pubsub:1.30.0:1.30.1-SNAPSHOT
 google-cloud-redis:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
 google-cloud-resourcemanager:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
 google-cloud-spanner:0.48.0-beta:0.48.1-beta-SNAPSHOT

From 292a845f0661915d401751b7de779cb42834099c Mon Sep 17 00:00:00 2001
From: neozwu 
Date: Wed, 23 May 2018 21:15:39 -0700
Subject: [PATCH 53/65] refresh proto, grpc and gapic clients (#3306)

* Regenerate proto, grpc and gapic clients.

* revert pubsub version changes - which will be picked up by version bump script during release

* revert more version changes
---
 .../admin/v2/BigtableInstanceAdminGrpc.java   | 140 ---
 .../admin/v2/BigtableTableAdminGrpc.java      | 212 ++---
 .../google/bigtable/admin/v2/AppProfile.java  |   8 -
 .../admin/v2/CheckConsistencyRequest.java     |   8 -
 .../admin/v2/CheckConsistencyResponse.java    |   8 -
 .../admin/v2/CreateAppProfileRequest.java     |   8 -
 .../v2/CreateTableFromSnapshotMetadata.java   |  16 +-
 .../v2/CreateTableFromSnapshotRequest.java    |  16 +-
 .../admin/v2/DeleteAppProfileRequest.java     |   8 -
 .../admin/v2/DeleteSnapshotRequest.java       |  16 +-
 .../v2/GenerateConsistencyTokenRequest.java   |   8 -
 .../v2/GenerateConsistencyTokenResponse.java  |   8 -
 .../admin/v2/GetAppProfileRequest.java        |   8 -
 .../bigtable/admin/v2/GetSnapshotRequest.java |  16 +-
 .../admin/v2/ListAppProfilesRequest.java      |   8 -
 .../admin/v2/ListAppProfilesResponse.java     |   8 -
 .../admin/v2/ListSnapshotsRequest.java        |  16 +-
 .../admin/v2/ListSnapshotsResponse.java       |  16 +-
 .../google/bigtable/admin/v2/Snapshot.java    |  16 +-
 .../admin/v2/SnapshotTableMetadata.java       |  16 +-
 .../admin/v2/SnapshotTableRequest.java        |  16 +-
 .../com/google/bigtable/admin/v2/Table.java   | 144 +--
 .../bigtable/admin/v2/TableOrBuilder.java     |  38 +-
 .../admin/v2/UpdateAppProfileMetadata.java    |   8 -
 .../admin/v2/UpdateAppProfileRequest.java     |   8 -
 .../admin/v2/bigtable_instance_admin.proto    | 167 ++--
 .../admin/v2/bigtable_table_admin.proto       | 226 ++---
 .../google/bigtable/admin/v2/common.proto     |   2 +-
 .../google/bigtable/admin/v2/instance.proto   |   7 +-
 .../google/bigtable/admin/v2/table.proto      |  50 +-
 .../bigtable/v2/CheckAndMutateRowRequest.java |  28 -
 .../v2/CheckAndMutateRowRequestOrBuilder.java |   8 -
 .../google/bigtable/v2/MutateRowRequest.java  |  28 -
 .../v2/MutateRowRequestOrBuilder.java         |   8 -
 .../google/bigtable/v2/MutateRowsRequest.java |  28 -
 .../v2/MutateRowsRequestOrBuilder.java        |   8 -
 .../v2/ReadModifyWriteRowRequest.java         |  28 -
 .../ReadModifyWriteRowRequestOrBuilder.java   |   8 -
 .../google/bigtable/v2/ReadRowsRequest.java   |  28 -
 .../bigtable/v2/ReadRowsRequestOrBuilder.java |   8 -
 .../bigtable/v2/SampleRowKeysRequest.java     |  28 -
 .../v2/SampleRowKeysRequestOrBuilder.java     |   8 -
 .../proto/google/bigtable/v2/bigtable.proto   |  61 +-
 .../main/proto/google/bigtable/v2/data.proto  |   2 +-
 .../privacy/dlp/v2/BigQueryOptions.java       | 212 +++++
 .../dlp/v2/BigQueryOptionsOrBuilder.java      |   9 +
 .../privacy/dlp/v2/CloudStorageOptions.java   | 296 ++++++
 .../dlp/v2/CloudStorageOptionsOrBuilder.java  |  20 +
 .../privacy/dlp/v2/CloudStoragePath.java      |   4 +-
 .../dlp/v2/CryptoReplaceFfxFpeConfig.java     |  36 +-
 .../CryptoReplaceFfxFpeConfigOrBuilder.java   |   9 +-
 .../com/google/privacy/dlp/v2/DlpStorage.java | 103 ++-
 .../google/privacy/dlp/v2/PrivacyMetric.java  |  10 +-
 .../proto/google/privacy/dlp/v2/dlp.proto     |   5 +-
 .../proto/google/privacy/dlp/v2/storage.proto |  38 +-
 .../speech/v1p1beta1/RecognitionConfig.java   | 858 +++++++++++++++++-
 .../v1p1beta1/RecognitionConfigOrBuilder.java | 148 +++
 .../cloud/speech/v1p1beta1/SpeechProto.java   | 191 ++--
 .../v1p1beta1/SpeechRecognitionResult.java    | 261 ++++++
 .../SpeechRecognitionResultOrBuilder.java     |  35 +
 .../v1p1beta1/StreamingRecognitionResult.java | 258 ++++++
 .../StreamingRecognitionResultOrBuilder.java  |  35 +
 .../cloud/speech/v1p1beta1/WordInfo.java      | 191 ++++
 .../speech/v1p1beta1/WordInfoOrBuilder.java   |  28 +
 .../cloud/speech/v1p1beta1/cloud_speech.proto |  92 ++
 .../admin/v2/BigtableInstanceAdminClient.java | 216 +----
 .../admin/v2/BigtableTableAdminClient.java    | 268 +++---
 67 files changed, 3238 insertions(+), 1590 deletions(-)

diff --git a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminGrpc.java b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminGrpc.java
index 1d74b6adac8b..6d3ad2b4632c 100644
--- a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminGrpc.java
+++ b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminGrpc.java
@@ -880,10 +880,6 @@ public void deleteCluster(com.google.bigtable.admin.v2.DeleteClusterRequest requ
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Creates an app profile within an instance.
      * 
    
      */
@@ -894,10 +890,6 @@ public void createAppProfile(com.google.bigtable.admin.v2.CreateAppProfileReques
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Gets information about an app profile.
      * 
    
      */
@@ -908,10 +900,6 @@ public void getAppProfile(com.google.bigtable.admin.v2.GetAppProfileRequest requ
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Lists information about app profiles in an instance.
      * 
    
      */
@@ -922,10 +910,6 @@ public void listAppProfiles(com.google.bigtable.admin.v2.ListAppProfilesRequest
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Updates an app profile within an instance.
      * 
    
      */
@@ -936,10 +920,6 @@ public void updateAppProfile(com.google.bigtable.admin.v2.UpdateAppProfileReques
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Deletes an app profile from an instance.
      * 
    
      */
@@ -950,11 +930,6 @@ public void deleteAppProfile(com.google.bigtable.admin.v2.DeleteAppProfileReques
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable instance level
-     * permissions. This feature is not currently available to most Cloud Bigtable
-     * customers. This 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.
      * Gets the access control policy for an instance resource. Returns an empty
      * policy if an instance exists but does not have a policy set.
      * 
    
@@ -966,11 +941,6 @@ public void getIamPolicy(com.google.iam.v1.GetIamPolicyRequest request,
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable instance level
-     * permissions. This feature is not currently available to most Cloud Bigtable
-     * customers. This 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.
      * Sets the access control policy on an instance resource. Replaces any
      * existing policy.
      * 
    
@@ -982,11 +952,6 @@ public void setIamPolicy(com.google.iam.v1.SetIamPolicyRequest request,
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable instance level
-     * permissions. This feature is not currently available to most Cloud Bigtable
-     * customers. This 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.
      * Returns permissions that the caller has on the specified instance resource.
      * 
    
      */
@@ -1280,10 +1245,6 @@ public void deleteCluster(com.google.bigtable.admin.v2.DeleteClusterRequest requ
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Creates an app profile within an instance.
      * 
    
      */
@@ -1295,10 +1256,6 @@ public void createAppProfile(com.google.bigtable.admin.v2.CreateAppProfileReques
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Gets information about an app profile.
      * 
    
      */
@@ -1310,10 +1267,6 @@ public void getAppProfile(com.google.bigtable.admin.v2.GetAppProfileRequest requ
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Lists information about app profiles in an instance.
      * 
    
      */
@@ -1325,10 +1278,6 @@ public void listAppProfiles(com.google.bigtable.admin.v2.ListAppProfilesRequest
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Updates an app profile within an instance.
      * 
    
      */
@@ -1340,10 +1289,6 @@ public void updateAppProfile(com.google.bigtable.admin.v2.UpdateAppProfileReques
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Deletes an app profile from an instance.
      * 
    
      */
@@ -1355,11 +1300,6 @@ public void deleteAppProfile(com.google.bigtable.admin.v2.DeleteAppProfileReques
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable instance level
-     * permissions. This feature is not currently available to most Cloud Bigtable
-     * customers. This 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.
      * Gets the access control policy for an instance resource. Returns an empty
      * policy if an instance exists but does not have a policy set.
      * 
    
@@ -1372,11 +1312,6 @@ public void getIamPolicy(com.google.iam.v1.GetIamPolicyRequest request,
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable instance level
-     * permissions. This feature is not currently available to most Cloud Bigtable
-     * customers. This 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.
      * Sets the access control policy on an instance resource. Replaces any
      * existing policy.
      * 
    
@@ -1389,11 +1324,6 @@ public void setIamPolicy(com.google.iam.v1.SetIamPolicyRequest request,
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable instance level
-     * permissions. This feature is not currently available to most Cloud Bigtable
-     * customers. This 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.
      * Returns permissions that the caller has on the specified instance resource.
      * 
    
      */
@@ -1539,10 +1469,6 @@ public com.google.protobuf.Empty deleteCluster(com.google.bigtable.admin.v2.Dele
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Creates an app profile within an instance.
      * 
    
      */
@@ -1553,10 +1479,6 @@ public com.google.bigtable.admin.v2.AppProfile createAppProfile(com.google.bigta
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Gets information about an app profile.
      * 
    
      */
@@ -1567,10 +1489,6 @@ public com.google.bigtable.admin.v2.AppProfile getAppProfile(com.google.bigtable
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Lists information about app profiles in an instance.
      * 
    
      */
@@ -1581,10 +1499,6 @@ public com.google.bigtable.admin.v2.ListAppProfilesResponse listAppProfiles(com.
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Updates an app profile within an instance.
      * 
    
      */
@@ -1595,10 +1509,6 @@ public com.google.longrunning.Operation updateAppProfile(com.google.bigtable.adm
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Deletes an app profile from an instance.
      * 
    
      */
@@ -1609,11 +1519,6 @@ public com.google.protobuf.Empty deleteAppProfile(com.google.bigtable.admin.v2.D
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable instance level
-     * permissions. This feature is not currently available to most Cloud Bigtable
-     * customers. This 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.
      * Gets the access control policy for an instance resource. Returns an empty
      * policy if an instance exists but does not have a policy set.
      * 
    
@@ -1625,11 +1530,6 @@ public com.google.iam.v1.Policy getIamPolicy(com.google.iam.v1.GetIamPolicyReque
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable instance level
-     * permissions. This feature is not currently available to most Cloud Bigtable
-     * customers. This 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.
      * Sets the access control policy on an instance resource. Replaces any
      * existing policy.
      * 
    
@@ -1641,11 +1541,6 @@ public com.google.iam.v1.Policy setIamPolicy(com.google.iam.v1.SetIamPolicyReque
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable instance level
-     * permissions. This feature is not currently available to most Cloud Bigtable
-     * customers. This 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.
      * Returns permissions that the caller has on the specified instance resource.
      * 
    
      */
@@ -1801,10 +1696,6 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Creates an app profile within an instance.
      * 
      */
@@ -1816,10 +1707,6 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Gets information about an app profile.
      * 
      */
@@ -1831,10 +1718,6 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Lists information about app profiles in an instance.
      * 
      */
@@ -1846,10 +1729,6 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Updates an app profile within an instance.
      * 
      */
@@ -1861,10 +1740,6 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Deletes an app profile from an instance.
      * 
      */
@@ -1876,11 +1751,6 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable instance level
-     * permissions. This feature is not currently available to most Cloud Bigtable
-     * customers. This 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.
      * Gets the access control policy for an instance resource. Returns an empty
      * policy if an instance exists but does not have a policy set.
      * 
@@ -1893,11 +1763,6 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable instance level
-     * permissions. This feature is not currently available to most Cloud Bigtable
-     * customers. This 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.
      * Sets the access control policy on an instance resource. Replaces any
      * existing policy.
      * 
@@ -1910,11 +1775,6 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable instance level
-     * permissions. This feature is not currently available to most Cloud Bigtable
-     * customers. This 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.
      * Returns permissions that the caller has on the specified instance resource.
      * 
      */
diff --git a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminGrpc.java b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminGrpc.java
index 4a3e690c2485..8282bef8e275 100644
--- a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminGrpc.java
+++ b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminGrpc.java
@@ -560,12 +560,13 @@ public void createTable(com.google.bigtable.admin.v2.CreateTableRequest request,
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Creates a new table from the specified snapshot. The target table must
      * not exist. The snapshot and the table must be in the same instance.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public void createTableFromSnapshot(com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest request,
@@ -630,10 +631,6 @@ public void dropRowRange(com.google.bigtable.admin.v2.DropRowRangeRequest reques
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Generates a consistency token for a Table, which can be used in
      * CheckConsistency to check whether mutations to the table that finished
      * before this call started have been replicated. The tokens will be available
@@ -647,10 +644,6 @@ public void generateConsistencyToken(com.google.bigtable.admin.v2.GenerateConsis
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * 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.
@@ -663,12 +656,13 @@ public void checkConsistency(com.google.bigtable.admin.v2.CheckConsistencyReques
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Creates a new snapshot in the specified cluster from the specified
      * source table. The cluster and the table must be in the same instance.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public void snapshotTable(com.google.bigtable.admin.v2.SnapshotTableRequest request,
@@ -678,11 +672,12 @@ public void snapshotTable(com.google.bigtable.admin.v2.SnapshotTableRequest requ
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Gets metadata information about the specified snapshot.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public void getSnapshot(com.google.bigtable.admin.v2.GetSnapshotRequest request,
@@ -692,11 +687,12 @@ public void getSnapshot(com.google.bigtable.admin.v2.GetSnapshotRequest request,
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Lists all snapshots associated with the specified cluster.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public void listSnapshots(com.google.bigtable.admin.v2.ListSnapshotsRequest request,
@@ -706,11 +702,12 @@ public void listSnapshots(com.google.bigtable.admin.v2.ListSnapshotsRequest requ
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Permanently deletes the specified snapshot.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public void deleteSnapshot(com.google.bigtable.admin.v2.DeleteSnapshotRequest request,
@@ -853,12 +850,13 @@ public void createTable(com.google.bigtable.admin.v2.CreateTableRequest request,
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Creates a new table from the specified snapshot. The target table must
      * not exist. The snapshot and the table must be in the same instance.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public void createTableFromSnapshot(com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest request,
@@ -929,10 +927,6 @@ public void dropRowRange(com.google.bigtable.admin.v2.DropRowRangeRequest reques
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Generates a consistency token for a Table, which can be used in
      * CheckConsistency to check whether mutations to the table that finished
      * before this call started have been replicated. The tokens will be available
@@ -947,10 +941,6 @@ public void generateConsistencyToken(com.google.bigtable.admin.v2.GenerateConsis
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * 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.
@@ -964,12 +954,13 @@ public void checkConsistency(com.google.bigtable.admin.v2.CheckConsistencyReques
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Creates a new snapshot in the specified cluster from the specified
      * source table. The cluster and the table must be in the same instance.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public void snapshotTable(com.google.bigtable.admin.v2.SnapshotTableRequest request,
@@ -980,11 +971,12 @@ public void snapshotTable(com.google.bigtable.admin.v2.SnapshotTableRequest requ
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Gets metadata information about the specified snapshot.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public void getSnapshot(com.google.bigtable.admin.v2.GetSnapshotRequest request,
@@ -995,11 +987,12 @@ public void getSnapshot(com.google.bigtable.admin.v2.GetSnapshotRequest request,
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Lists all snapshots associated with the specified cluster.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public void listSnapshots(com.google.bigtable.admin.v2.ListSnapshotsRequest request,
@@ -1010,11 +1003,12 @@ public void listSnapshots(com.google.bigtable.admin.v2.ListSnapshotsRequest requ
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Permanently deletes the specified snapshot.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public void deleteSnapshot(com.google.bigtable.admin.v2.DeleteSnapshotRequest request,
@@ -1061,12 +1055,13 @@ public com.google.bigtable.admin.v2.Table createTable(com.google.bigtable.admin.
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Creates a new table from the specified snapshot. The target table must
      * not exist. The snapshot and the table must be in the same instance.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public com.google.longrunning.Operation createTableFromSnapshot(com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest request) {
@@ -1131,10 +1126,6 @@ public com.google.protobuf.Empty dropRowRange(com.google.bigtable.admin.v2.DropR
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Generates a consistency token for a Table, which can be used in
      * CheckConsistency to check whether mutations to the table that finished
      * before this call started have been replicated. The tokens will be available
@@ -1148,10 +1139,6 @@ public com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse generateCon
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * 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.
@@ -1164,12 +1151,13 @@ public com.google.bigtable.admin.v2.CheckConsistencyResponse checkConsistency(co
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Creates a new snapshot in the specified cluster from the specified
      * source table. The cluster and the table must be in the same instance.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public com.google.longrunning.Operation snapshotTable(com.google.bigtable.admin.v2.SnapshotTableRequest request) {
@@ -1179,11 +1167,12 @@ public com.google.longrunning.Operation snapshotTable(com.google.bigtable.admin.
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Gets metadata information about the specified snapshot.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public com.google.bigtable.admin.v2.Snapshot getSnapshot(com.google.bigtable.admin.v2.GetSnapshotRequest request) {
@@ -1193,11 +1182,12 @@ public com.google.bigtable.admin.v2.Snapshot getSnapshot(com.google.bigtable.adm
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Lists all snapshots associated with the specified cluster.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public com.google.bigtable.admin.v2.ListSnapshotsResponse listSnapshots(com.google.bigtable.admin.v2.ListSnapshotsRequest request) {
@@ -1207,11 +1197,12 @@ public com.google.bigtable.admin.v2.ListSnapshotsResponse listSnapshots(com.goog
 
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Permanently deletes the specified snapshot.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public com.google.protobuf.Empty deleteSnapshot(com.google.bigtable.admin.v2.DeleteSnapshotRequest request) {
@@ -1258,12 +1249,13 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Creates a new table from the specified snapshot. The target table must
      * not exist. The snapshot and the table must be in the same instance.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public com.google.common.util.concurrent.ListenableFuture createTableFromSnapshot(
@@ -1334,10 +1326,6 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Generates a consistency token for a Table, which can be used in
      * CheckConsistency to check whether mutations to the table that finished
      * before this call started have been replicated. The tokens will be available
@@ -1352,10 +1340,6 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * 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.
@@ -1369,12 +1353,13 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Creates a new snapshot in the specified cluster from the specified
      * source table. The cluster and the table must be in the same instance.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public com.google.common.util.concurrent.ListenableFuture snapshotTable(
@@ -1385,11 +1370,12 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Gets metadata information about the specified snapshot.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public com.google.common.util.concurrent.ListenableFuture getSnapshot(
@@ -1400,11 +1386,12 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Lists all snapshots associated with the specified cluster.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public com.google.common.util.concurrent.ListenableFuture listSnapshots(
@@ -1415,11 +1402,12 @@ public com.google.common.util.concurrent.ListenableFuture
-     * This is a private alpha release of Cloud Bigtable snapshots. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * Permanently deletes the specified snapshot.
+     * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+     * feature is not currently available to most Cloud Bigtable customers. This
+     * 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.
      * 
    
      */
     public com.google.common.util.concurrent.ListenableFuture deleteSnapshot(
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java
index 36462697a96d..7cd0837dd1b8 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java
@@ -5,10 +5,6 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable replication. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * A configuration object describing how Cloud Bigtable should treat traffic
  * from a particular end user application.
  * 
    
@@ -1670,10 +1666,6 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * A configuration object describing how Cloud Bigtable should treat traffic
    * from a particular end user application.
    * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
index 20fad0b88430..77d8d2106abf 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
@@ -5,10 +5,6 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable replication. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Request message for
  * [google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency][google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency]
  * 
    
@@ -346,10 +342,6 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Request message for
    * [google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency][google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency]
    * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java
index d6d700d89be6..f861c56f7fe1 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java
@@ -5,10 +5,6 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable replication. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Response message for
  * [google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency][google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency]
  * 
    
@@ -256,10 +252,6 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Response message for
    * [google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency][google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency]
    * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java
index fd253602b985..9ff19486c728 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java
@@ -5,10 +5,6 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable replication. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Request message for BigtableInstanceAdmin.CreateAppProfile.
  * 
    
  *
@@ -445,10 +441,6 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Request message for BigtableInstanceAdmin.CreateAppProfile.
    * 
    
    *
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java
index d6a0524739d0..0a5b1aee0a89 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java
@@ -5,11 +5,11 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable snapshots. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * The metadata for the Operation returned by CreateTableFromSnapshot.
+ * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+ * feature is not currently available to most Cloud Bigtable customers. This
+ * 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.
  * 
    
  *
  * Protobuf type {@code google.bigtable.admin.v2.CreateTableFromSnapshotMetadata}
@@ -412,11 +412,11 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable snapshots. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * The metadata for the Operation returned by CreateTableFromSnapshot.
+   * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+   * feature is not currently available to most Cloud Bigtable customers. This
+   * 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.
    * 
    
    *
    * Protobuf type {@code google.bigtable.admin.v2.CreateTableFromSnapshotMetadata}
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java
index 0d8911a5c049..6e90991e9952 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java
@@ -5,12 +5,12 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable snapshots. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Request message for
  * [google.bigtable.admin.v2.BigtableTableAdmin.CreateTableFromSnapshot][google.bigtable.admin.v2.BigtableTableAdmin.CreateTableFromSnapshot]
+ * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+ * feature is not currently available to most Cloud Bigtable customers. This
+ * 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.
  * 
    
  *
  * Protobuf type {@code google.bigtable.admin.v2.CreateTableFromSnapshotRequest}
@@ -411,12 +411,12 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable snapshots. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Request message for
    * [google.bigtable.admin.v2.BigtableTableAdmin.CreateTableFromSnapshot][google.bigtable.admin.v2.BigtableTableAdmin.CreateTableFromSnapshot]
+   * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+   * feature is not currently available to most Cloud Bigtable customers. This
+   * 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.
    * 
    
    *
    * Protobuf type {@code google.bigtable.admin.v2.CreateTableFromSnapshotRequest}
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java
index 87eaa6b8685c..0556fafa92f4 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java
@@ -5,10 +5,6 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable replication. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Request message for BigtableInstanceAdmin.DeleteAppProfile.
  * 
    
  *
@@ -315,10 +311,6 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Request message for BigtableInstanceAdmin.DeleteAppProfile.
    * 
    
    *
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java
index 252095aed151..50f75c88dada 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java
@@ -5,12 +5,12 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable snapshots. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Request message for
  * [google.bigtable.admin.v2.BigtableTableAdmin.DeleteSnapshot][google.bigtable.admin.v2.BigtableTableAdmin.DeleteSnapshot]
+ * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+ * feature is not currently available to most Cloud Bigtable customers. This
+ * 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.
  * 
    
  *
  * Protobuf type {@code google.bigtable.admin.v2.DeleteSnapshotRequest}
@@ -287,12 +287,12 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable snapshots. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Request message for
    * [google.bigtable.admin.v2.BigtableTableAdmin.DeleteSnapshot][google.bigtable.admin.v2.BigtableTableAdmin.DeleteSnapshot]
+   * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+   * feature is not currently available to most Cloud Bigtable customers. This
+   * 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.
    * 
    
    *
    * Protobuf type {@code google.bigtable.admin.v2.DeleteSnapshotRequest}
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java
index 86fc2631c5d4..4a81887f8bca 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java
@@ -5,10 +5,6 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable replication. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Request message for
  * [google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken][google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken]
  * 
    
@@ -287,10 +283,6 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Request message for
    * [google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken][google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken]
    * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java
index 905ac8fd1e84..c892fd34d741 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java
@@ -5,10 +5,6 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable replication. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Response message for
  * [google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken][google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken]
  * 
    
@@ -283,10 +279,6 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Response message for
    * [google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken][google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken]
    * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java
index 51b96d45b955..b2adc4100710 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java
@@ -5,10 +5,6 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable replication. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Request message for BigtableInstanceAdmin.GetAppProfile.
  * 
    
  *
@@ -284,10 +280,6 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Request message for BigtableInstanceAdmin.GetAppProfile.
    * 
    
    *
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java
index f8845974fc5e..d9af5413f49e 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java
@@ -5,12 +5,12 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable snapshots. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Request message for
  * [google.bigtable.admin.v2.BigtableTableAdmin.GetSnapshot][google.bigtable.admin.v2.BigtableTableAdmin.GetSnapshot]
+ * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+ * feature is not currently available to most Cloud Bigtable customers. This
+ * 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.
  * 
    
  *
  * Protobuf type {@code google.bigtable.admin.v2.GetSnapshotRequest}
@@ -287,12 +287,12 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable snapshots. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Request message for
    * [google.bigtable.admin.v2.BigtableTableAdmin.GetSnapshot][google.bigtable.admin.v2.BigtableTableAdmin.GetSnapshot]
+   * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+   * feature is not currently available to most Cloud Bigtable customers. This
+   * 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.
    * 
    
    *
    * Protobuf type {@code google.bigtable.admin.v2.GetSnapshotRequest}
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java
index 59ebbabe0fd8..5e4eb76dcd2c 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java
@@ -5,10 +5,6 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable replication. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Request message for BigtableInstanceAdmin.ListAppProfiles.
  * 
    
  *
@@ -345,10 +341,6 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Request message for BigtableInstanceAdmin.ListAppProfiles.
    * 
    
    *
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java
index 396e2092ef38..9669d91d32f6 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java
@@ -5,10 +5,6 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable replication. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Response message for BigtableInstanceAdmin.ListAppProfiles.
  * 
    
  *
@@ -368,10 +364,6 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Response message for BigtableInstanceAdmin.ListAppProfiles.
    * 
    
    *
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java
index 9f6466ccb4a5..14d201abbac9 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java
@@ -5,12 +5,12 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable snapshots. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Request message for
  * [google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots][google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots]
+ * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+ * feature is not currently available to most Cloud Bigtable customers. This
+ * 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.
  * 
    
  *
  * Protobuf type {@code google.bigtable.admin.v2.ListSnapshotsRequest}
@@ -380,12 +380,12 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable snapshots. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Request message for
    * [google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots][google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots]
+   * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+   * feature is not currently available to most Cloud Bigtable customers. This
+   * 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.
    * 
    
    *
    * Protobuf type {@code google.bigtable.admin.v2.ListSnapshotsRequest}
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java
index 363946bd313e..4f562d1ff961 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java
@@ -5,12 +5,12 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable snapshots. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Response message for
  * [google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots][google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots]
+ * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+ * feature is not currently available to most Cloud Bigtable customers. This
+ * 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.
  * 
    
  *
  * Protobuf type {@code google.bigtable.admin.v2.ListSnapshotsResponse}
@@ -369,12 +369,12 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable snapshots. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Response message for
    * [google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots][google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots]
+   * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+   * feature is not currently available to most Cloud Bigtable customers. This
+   * 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.
    * 
    
    *
    * Protobuf type {@code google.bigtable.admin.v2.ListSnapshotsResponse}
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java
index a98201567701..9b57045298e2 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java
@@ -5,12 +5,12 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable snapshots. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * A snapshot of a table at a particular time. A snapshot can be used as a
  * checkpoint for data restoration or a data source for a new table.
+ * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+ * feature is not currently available to most Cloud Bigtable customers. This
+ * 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.
  * 
    
  *
  * Protobuf type {@code google.bigtable.admin.v2.Snapshot}
@@ -767,12 +767,12 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable snapshots. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * A snapshot of a table at a particular time. A snapshot can be used as a
    * checkpoint for data restoration or a data source for a new table.
+   * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+   * feature is not currently available to most Cloud Bigtable customers. This
+   * 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.
    * 
    
    *
    * Protobuf type {@code google.bigtable.admin.v2.Snapshot}
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java
index 5ecb1da14346..d1dfa7f8753d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java
@@ -5,11 +5,11 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable snapshots. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * The metadata for the Operation returned by SnapshotTable.
+ * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+ * feature is not currently available to most Cloud Bigtable customers. This
+ * 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.
  * 
    
  *
  * Protobuf type {@code google.bigtable.admin.v2.SnapshotTableMetadata}
@@ -409,11 +409,11 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable snapshots. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * The metadata for the Operation returned by SnapshotTable.
+   * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+   * feature is not currently available to most Cloud Bigtable customers. This
+   * 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.
    * 
    
    *
    * Protobuf type {@code google.bigtable.admin.v2.SnapshotTableMetadata}
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java
index 21f48651de47..36fd9afc937e 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java
@@ -5,12 +5,12 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable snapshots. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Request message for
  * [google.bigtable.admin.v2.BigtableTableAdmin.SnapshotTable][google.bigtable.admin.v2.BigtableTableAdmin.SnapshotTable]
+ * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+ * feature is not currently available to most Cloud Bigtable customers. This
+ * 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.
  * 
    
  *
  * Protobuf type {@code google.bigtable.admin.v2.SnapshotTableRequest}
@@ -545,12 +545,12 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable snapshots. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Request message for
    * [google.bigtable.admin.v2.BigtableTableAdmin.SnapshotTable][google.bigtable.admin.v2.BigtableTableAdmin.SnapshotTable]
+   * Note: This is a private alpha release of Cloud Bigtable snapshots. This
+   * feature is not currently available to most Cloud Bigtable customers. This
+   * 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.
    * 
    
    *
    * Protobuf type {@code google.bigtable.admin.v2.SnapshotTableRequest}
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java
index 1481502aac8e..b8ba4bca1796 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java
@@ -287,11 +287,6 @@ public enum View
     SCHEMA_VIEW(2),
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This
-     * feature is not currently available to most Cloud Bigtable customers. This
-     * 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.
      * Only populates `name` and fields related to the table's
      * replication state.
      * 
    
@@ -336,11 +331,6 @@ public enum View
     public static final int SCHEMA_VIEW_VALUE = 2;
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This
-     * feature is not currently available to most Cloud Bigtable customers. This
-     * 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.
      * Only populates `name` and fields related to the table's
      * replication state.
      * 
    
@@ -458,10 +448,6 @@ public interface ClusterStateOrBuilder extends
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * The state of a table's data in a particular cluster.
    * 
    
    *
@@ -562,8 +548,7 @@ public enum ReplicationState
        * 
            * The cluster was recently created, and the table must finish copying
        * over pre-existing data from other clusters before it can begin
-       * receiving live replication updates and serving
-       * [Data API][google.bigtable.v2.Bigtable] requests.
+       * receiving live replication updates and serving Data API requests.
        * 
    
        *
        * INITIALIZING = 1;
@@ -571,8 +556,7 @@ public enum ReplicationState
       INITIALIZING(1),
       /**
        * 
    -       * The table is temporarily unable to serve
-       * [Data API][google.bigtable.v2.Bigtable] requests from this
+       * The table is temporarily unable to serve Data API requests from this
        * cluster due to planned internal maintenance.
        * 
    
        *
@@ -581,8 +565,7 @@ public enum ReplicationState
       PLANNED_MAINTENANCE(2),
       /**
        * 
    -       * The table is temporarily unable to serve
-       * [Data API][google.bigtable.v2.Bigtable] requests from this
+       * The table is temporarily unable to serve Data API requests from this
        * cluster due to unplanned or emergency maintenance.
        * 
    
        *
@@ -591,10 +574,9 @@ public enum ReplicationState
       UNPLANNED_MAINTENANCE(3),
       /**
        * 
    -       * The table can serve
-       * [Data API][google.bigtable.v2.Bigtable] requests from this
-       * cluster. Depending on replication delay, reads may not immediately
-       * reflect the state of the table in other clusters.
+       * The table can serve Data API requests from this cluster. Depending on
+       * replication delay, reads may not immediately reflect the state of the
+       * table in other clusters.
        * 
    
        *
        * READY = 4;
@@ -615,8 +597,7 @@ public enum ReplicationState
        * 
            * The cluster was recently created, and the table must finish copying
        * over pre-existing data from other clusters before it can begin
-       * receiving live replication updates and serving
-       * [Data API][google.bigtable.v2.Bigtable] requests.
+       * receiving live replication updates and serving Data API requests.
        * 
    
        *
        * INITIALIZING = 1;
@@ -624,8 +605,7 @@ public enum ReplicationState
       public static final int INITIALIZING_VALUE = 1;
       /**
        * 
    -       * The table is temporarily unable to serve
-       * [Data API][google.bigtable.v2.Bigtable] requests from this
+       * The table is temporarily unable to serve Data API requests from this
        * cluster due to planned internal maintenance.
        * 
    
        *
@@ -634,8 +614,7 @@ public enum ReplicationState
       public static final int PLANNED_MAINTENANCE_VALUE = 2;
       /**
        * 
    -       * The table is temporarily unable to serve
-       * [Data API][google.bigtable.v2.Bigtable] requests from this
+       * The table is temporarily unable to serve Data API requests from this
        * cluster due to unplanned or emergency maintenance.
        * 
    
        *
@@ -644,10 +623,9 @@ public enum ReplicationState
       public static final int UNPLANNED_MAINTENANCE_VALUE = 3;
       /**
        * 
    -       * The table can serve
-       * [Data API][google.bigtable.v2.Bigtable] requests from this
-       * cluster. Depending on replication delay, reads may not immediately
-       * reflect the state of the table in other clusters.
+       * The table can serve Data API requests from this cluster. Depending on
+       * replication delay, reads may not immediately reflect the state of the
+       * table in other clusters.
        * 
    
        *
        * READY = 4;
@@ -908,10 +886,6 @@ protected Builder newBuilderForType(
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * The state of a table's data in a particular cluster.
      * 
    
      *
@@ -1171,7 +1145,7 @@ public com.google.bigtable.admin.v2.Table.ClusterState getDefaultInstanceForType
    * (`OutputOnly`)
    * The unique name of the table. Values are of the form
    * `projects/<project>/instances/<instance>/tables/[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.
-   * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `FULL`
+   * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `REPLICATION_VIEW`, `FULL`
    * 
    
    *
    * string name = 1;
@@ -1193,7 +1167,7 @@ public java.lang.String getName() {
    * (`OutputOnly`)
    * The unique name of the table. Values are of the form
    * `projects/<project>/instances/<instance>/tables/[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.
-   * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `FULL`
+   * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `REPLICATION_VIEW`, `FULL`
    * 
    *
    * string name = 1;
@@ -1240,16 +1214,12 @@ public int getClusterStatesCount() {
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * (`OutputOnly`)
    * Map from cluster ID to per-cluster table state.
    * If it could not be determined whether or not the table has data in a
    * particular cluster (for example, if its zone is unavailable), then
    * there will be an entry for the cluster with UNKNOWN `replication_status`.
-   * Views: `FULL`
+   * Views: `REPLICATION_VIEW`, `FULL`
    * 
    
    *
    * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -1269,16 +1239,12 @@ public java.util.Map
-   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * (`OutputOnly`)
    * Map from cluster ID to per-cluster table state.
    * If it could not be determined whether or not the table has data in a
    * particular cluster (for example, if its zone is unavailable), then
    * there will be an entry for the cluster with UNKNOWN `replication_status`.
-   * Views: `FULL`
+   * Views: `REPLICATION_VIEW`, `FULL`
    * 
    *
    * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -1289,16 +1255,12 @@ public java.util.Map
-   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * (`OutputOnly`)
    * Map from cluster ID to per-cluster table state.
    * If it could not be determined whether or not the table has data in a
    * particular cluster (for example, if its zone is unavailable), then
    * there will be an entry for the cluster with UNKNOWN `replication_status`.
-   * Views: `FULL`
+   * Views: `REPLICATION_VIEW`, `FULL`
    * 
    *
    * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -1314,16 +1276,12 @@ public com.google.bigtable.admin.v2.Table.ClusterState getClusterStatesOrDefault
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * (`OutputOnly`)
    * Map from cluster ID to per-cluster table state.
    * If it could not be determined whether or not the table has data in a
    * particular cluster (for example, if its zone is unavailable), then
    * there will be an entry for the cluster with UNKNOWN `replication_status`.
-   * Views: `FULL`
+   * Views: `REPLICATION_VIEW`, `FULL`
    * 
    
    *
    * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -1445,7 +1403,7 @@ public com.google.bigtable.admin.v2.ColumnFamily getColumnFamiliesOrThrow(
   /**
    * 
        * (`CreationOnly`)
-   * The granularity (e.g. `MILLIS`, `MICROS`) at which timestamps are stored in
+   * The granularity (i.e. `MILLIS`) at which timestamps are stored in
    * this table. Timestamps not matching the granularity will be rejected.
    * If unspecified at creation time, the value will be set to `MILLIS`.
    * Views: `SCHEMA_VIEW`, `FULL`
@@ -1459,7 +1417,7 @@ public int getGranularityValue() {
   /**
    * 
        * (`CreationOnly`)
-   * The granularity (e.g. `MILLIS`, `MICROS`) at which timestamps are stored in
+   * The granularity (i.e. `MILLIS`) at which timestamps are stored in
    * this table. Timestamps not matching the granularity will be rejected.
    * If unspecified at creation time, the value will be set to `MILLIS`.
    * Views: `SCHEMA_VIEW`, `FULL`
@@ -1866,7 +1824,7 @@ public Builder mergeFrom(
      * (`OutputOnly`)
      * The unique name of the table. Values are of the form
      * `projects/<project>/instances/<instance>/tables/[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.
-     * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `FULL`
+     * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `REPLICATION_VIEW`, `FULL`
      * 
    
      *
      * string name = 1;
@@ -1888,7 +1846,7 @@ public java.lang.String getName() {
      * (`OutputOnly`)
      * The unique name of the table. Values are of the form
      * `projects/<project>/instances/<instance>/tables/[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.
-     * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `FULL`
+     * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `REPLICATION_VIEW`, `FULL`
      * 
    
      *
      * string name = 1;
@@ -1911,7 +1869,7 @@ public java.lang.String getName() {
      * (`OutputOnly`)
      * The unique name of the table. Values are of the form
      * `projects/<project>/instances/<instance>/tables/[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.
-     * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `FULL`
+     * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `REPLICATION_VIEW`, `FULL`
      * 
      *
      * string name = 1;
@@ -1931,7 +1889,7 @@ public Builder setName(
      * (`OutputOnly`)
      * The unique name of the table. Values are of the form
      * `projects/<project>/instances/<instance>/tables/[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.
-     * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `FULL`
+     * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `REPLICATION_VIEW`, `FULL`
      * 
      *
      * string name = 1;
@@ -1947,7 +1905,7 @@ public Builder clearName() {
      * (`OutputOnly`)
      * The unique name of the table. Values are of the form
      * `projects/<project>/instances/<instance>/tables/[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.
-     * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `FULL`
+     * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `REPLICATION_VIEW`, `FULL`
      * 
      *
      * string name = 1;
@@ -1992,16 +1950,12 @@ public int getClusterStatesCount() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * (`OutputOnly`)
      * Map from cluster ID to per-cluster table state.
      * If it could not be determined whether or not the table has data in a
      * particular cluster (for example, if its zone is unavailable), then
      * there will be an entry for the cluster with UNKNOWN `replication_status`.
-     * Views: `FULL`
+     * Views: `REPLICATION_VIEW`, `FULL`
      * 
    
      *
      * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -2021,16 +1975,12 @@ public java.util.Map
-     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * (`OutputOnly`)
      * Map from cluster ID to per-cluster table state.
      * If it could not be determined whether or not the table has data in a
      * particular cluster (for example, if its zone is unavailable), then
      * there will be an entry for the cluster with UNKNOWN `replication_status`.
-     * Views: `FULL`
+     * Views: `REPLICATION_VIEW`, `FULL`
      * 
      *
      * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -2041,16 +1991,12 @@ public java.util.Map
-     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * (`OutputOnly`)
      * Map from cluster ID to per-cluster table state.
      * If it could not be determined whether or not the table has data in a
      * particular cluster (for example, if its zone is unavailable), then
      * there will be an entry for the cluster with UNKNOWN `replication_status`.
-     * Views: `FULL`
+     * Views: `REPLICATION_VIEW`, `FULL`
      * 
      *
      * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -2066,16 +2012,12 @@ public com.google.bigtable.admin.v2.Table.ClusterState getClusterStatesOrDefault
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * (`OutputOnly`)
      * Map from cluster ID to per-cluster table state.
      * If it could not be determined whether or not the table has data in a
      * particular cluster (for example, if its zone is unavailable), then
      * there will be an entry for the cluster with UNKNOWN `replication_status`.
-     * Views: `FULL`
+     * Views: `REPLICATION_VIEW`, `FULL`
      * 
    
      *
      * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -2099,16 +2041,12 @@ public Builder clearClusterStates() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * (`OutputOnly`)
      * Map from cluster ID to per-cluster table state.
      * If it could not be determined whether or not the table has data in a
      * particular cluster (for example, if its zone is unavailable), then
      * there will be an entry for the cluster with UNKNOWN `replication_status`.
-     * Views: `FULL`
+     * Views: `REPLICATION_VIEW`, `FULL`
      * 
    
      *
      * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -2131,16 +2069,12 @@ public Builder removeClusterStates(
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * (`OutputOnly`)
      * Map from cluster ID to per-cluster table state.
      * If it could not be determined whether or not the table has data in a
      * particular cluster (for example, if its zone is unavailable), then
      * there will be an entry for the cluster with UNKNOWN `replication_status`.
-     * Views: `FULL`
+     * Views: `REPLICATION_VIEW`, `FULL`
      * 
    
      *
      * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -2156,16 +2090,12 @@ public Builder putClusterStates(
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * (`OutputOnly`)
      * Map from cluster ID to per-cluster table state.
      * If it could not be determined whether or not the table has data in a
      * particular cluster (for example, if its zone is unavailable), then
      * there will be an entry for the cluster with UNKNOWN `replication_status`.
-     * Views: `FULL`
+     * Views: `REPLICATION_VIEW`, `FULL`
      * 
    
      *
      * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -2347,7 +2277,7 @@ public Builder putAllColumnFamilies(
     /**
      * 
          * (`CreationOnly`)
-     * The granularity (e.g. `MILLIS`, `MICROS`) at which timestamps are stored in
+     * The granularity (i.e. `MILLIS`) at which timestamps are stored in
      * this table. Timestamps not matching the granularity will be rejected.
      * If unspecified at creation time, the value will be set to `MILLIS`.
      * Views: `SCHEMA_VIEW`, `FULL`
@@ -2361,7 +2291,7 @@ public int getGranularityValue() {
     /**
      * 
          * (`CreationOnly`)
-     * The granularity (e.g. `MILLIS`, `MICROS`) at which timestamps are stored in
+     * The granularity (i.e. `MILLIS`) at which timestamps are stored in
      * this table. Timestamps not matching the granularity will be rejected.
      * If unspecified at creation time, the value will be set to `MILLIS`.
      * Views: `SCHEMA_VIEW`, `FULL`
@@ -2377,7 +2307,7 @@ public Builder setGranularityValue(int value) {
     /**
      * 
          * (`CreationOnly`)
-     * The granularity (e.g. `MILLIS`, `MICROS`) at which timestamps are stored in
+     * The granularity (i.e. `MILLIS`) at which timestamps are stored in
      * this table. Timestamps not matching the granularity will be rejected.
      * If unspecified at creation time, the value will be set to `MILLIS`.
      * Views: `SCHEMA_VIEW`, `FULL`
@@ -2392,7 +2322,7 @@ public com.google.bigtable.admin.v2.Table.TimestampGranularity getGranularity()
     /**
      * 
          * (`CreationOnly`)
-     * The granularity (e.g. `MILLIS`, `MICROS`) at which timestamps are stored in
+     * The granularity (i.e. `MILLIS`) at which timestamps are stored in
      * this table. Timestamps not matching the granularity will be rejected.
      * If unspecified at creation time, the value will be set to `MILLIS`.
      * Views: `SCHEMA_VIEW`, `FULL`
@@ -2412,7 +2342,7 @@ public Builder setGranularity(com.google.bigtable.admin.v2.Table.TimestampGranul
     /**
      * 
          * (`CreationOnly`)
-     * The granularity (e.g. `MILLIS`, `MICROS`) at which timestamps are stored in
+     * The granularity (i.e. `MILLIS`) at which timestamps are stored in
      * this table. Timestamps not matching the granularity will be rejected.
      * If unspecified at creation time, the value will be set to `MILLIS`.
      * Views: `SCHEMA_VIEW`, `FULL`
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableOrBuilder.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableOrBuilder.java
index 43615a912a5f..5512d6d89df6 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableOrBuilder.java
@@ -12,7 +12,7 @@ public interface TableOrBuilder extends
    * (`OutputOnly`)
    * The unique name of the table. Values are of the form
    * `projects/<project>/instances/<instance>/tables/[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.
-   * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `FULL`
+   * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `REPLICATION_VIEW`, `FULL`
    * 
    
    *
    * string name = 1;
@@ -23,7 +23,7 @@ public interface TableOrBuilder extends
    * (`OutputOnly`)
    * The unique name of the table. Values are of the form
    * `projects/<project>/instances/<instance>/tables/[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.
-   * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `FULL`
+   * Views: `NAME_ONLY`, `SCHEMA_VIEW`, `REPLICATION_VIEW`, `FULL`
    * 
    
    *
    * string name = 1;
@@ -33,16 +33,12 @@ public interface TableOrBuilder extends
 
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * (`OutputOnly`)
    * Map from cluster ID to per-cluster table state.
    * If it could not be determined whether or not the table has data in a
    * particular cluster (for example, if its zone is unavailable), then
    * there will be an entry for the cluster with UNKNOWN `replication_status`.
-   * Views: `FULL`
+   * Views: `REPLICATION_VIEW`, `FULL`
    * 
    
    *
    * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -50,16 +46,12 @@ public interface TableOrBuilder extends
   int getClusterStatesCount();
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * (`OutputOnly`)
    * Map from cluster ID to per-cluster table state.
    * If it could not be determined whether or not the table has data in a
    * particular cluster (for example, if its zone is unavailable), then
    * there will be an entry for the cluster with UNKNOWN `replication_status`.
-   * Views: `FULL`
+   * Views: `REPLICATION_VIEW`, `FULL`
    * 
    
    *
    * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -74,16 +66,12 @@ boolean containsClusterStates(
   getClusterStates();
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * (`OutputOnly`)
    * Map from cluster ID to per-cluster table state.
    * If it could not be determined whether or not the table has data in a
    * particular cluster (for example, if its zone is unavailable), then
    * there will be an entry for the cluster with UNKNOWN `replication_status`.
-   * Views: `FULL`
+   * Views: `REPLICATION_VIEW`, `FULL`
    * 
    
    *
    * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -92,16 +80,12 @@ boolean containsClusterStates(
   getClusterStatesMap();
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * (`OutputOnly`)
    * Map from cluster ID to per-cluster table state.
    * If it could not be determined whether or not the table has data in a
    * particular cluster (for example, if its zone is unavailable), then
    * there will be an entry for the cluster with UNKNOWN `replication_status`.
-   * Views: `FULL`
+   * Views: `REPLICATION_VIEW`, `FULL`
    * 
    
    *
    * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -112,16 +96,12 @@ com.google.bigtable.admin.v2.Table.ClusterState getClusterStatesOrDefault(
       com.google.bigtable.admin.v2.Table.ClusterState defaultValue);
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * (`OutputOnly`)
    * Map from cluster ID to per-cluster table state.
    * If it could not be determined whether or not the table has data in a
    * particular cluster (for example, if its zone is unavailable), then
    * there will be an entry for the cluster with UNKNOWN `replication_status`.
-   * Views: `FULL`
+   * Views: `REPLICATION_VIEW`, `FULL`
    * 
    
    *
    * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2;
@@ -197,7 +177,7 @@ com.google.bigtable.admin.v2.ColumnFamily getColumnFamiliesOrThrow(
   /**
    * 
        * (`CreationOnly`)
-   * The granularity (e.g. `MILLIS`, `MICROS`) at which timestamps are stored in
+   * The granularity (i.e. `MILLIS`) at which timestamps are stored in
    * this table. Timestamps not matching the granularity will be rejected.
    * If unspecified at creation time, the value will be set to `MILLIS`.
    * Views: `SCHEMA_VIEW`, `FULL`
@@ -209,7 +189,7 @@ com.google.bigtable.admin.v2.ColumnFamily getColumnFamiliesOrThrow(
   /**
    * 
        * (`CreationOnly`)
-   * The granularity (e.g. `MILLIS`, `MICROS`) at which timestamps are stored in
+   * The granularity (i.e. `MILLIS`) at which timestamps are stored in
    * this table. Timestamps not matching the granularity will be rejected.
    * If unspecified at creation time, the value will be set to `MILLIS`.
    * Views: `SCHEMA_VIEW`, `FULL`
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java
index fc73d65dbc29..67b1f2fd0e2c 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java
@@ -5,10 +5,6 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable replication. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * The metadata for the Operation returned by UpdateAppProfile.
  * 
    
  *
@@ -222,10 +218,6 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * The metadata for the Operation returned by UpdateAppProfile.
    * 
    
    *
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java
index 67467f64fad6..9a1b5a6031ee 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java
@@ -5,10 +5,6 @@
 
 /**
  * 
    - * This is a private alpha release of Cloud Bigtable replication. This feature
- * is not currently available to most Cloud Bigtable customers. This 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.
  * Request message for BigtableInstanceAdmin.UpdateAppProfile.
  * 
    
  *
@@ -381,10 +377,6 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * Request message for BigtableInstanceAdmin.UpdateAppProfile.
    * 
    
    *
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_instance_admin.proto b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_instance_admin.proto
index 6f883834a361..25d2c0991ea5 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_instance_admin.proto
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_instance_admin.proto
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc.
+// Copyright 2018 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -39,142 +39,147 @@ option php_namespace = "Google\\Cloud\\Bigtable\\Admin\\V2";
 service BigtableInstanceAdmin {
   // Create an instance within a project.
   rpc CreateInstance(CreateInstanceRequest) returns (google.longrunning.Operation) {
-    option (google.api.http) = { post: "/v2/{parent=projects/*}/instances" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{parent=projects/*}/instances"
+      body: "*"
+    };
   }
 
   // Gets information about an instance.
   rpc GetInstance(GetInstanceRequest) returns (Instance) {
-    option (google.api.http) = { get: "/v2/{name=projects/*/instances/*}" };
+    option (google.api.http) = {
+      get: "/v2/{name=projects/*/instances/*}"
+    };
   }
 
   // Lists information about instances in a project.
   rpc ListInstances(ListInstancesRequest) returns (ListInstancesResponse) {
-    option (google.api.http) = { get: "/v2/{parent=projects/*}/instances" };
+    option (google.api.http) = {
+      get: "/v2/{parent=projects/*}/instances"
+    };
   }
 
   // Updates an instance within a project.
   rpc UpdateInstance(Instance) returns (Instance) {
-    option (google.api.http) = { put: "/v2/{name=projects/*/instances/*}" body: "*" };
+    option (google.api.http) = {
+      put: "/v2/{name=projects/*/instances/*}"
+      body: "*"
+    };
   }
 
   // Partially updates an instance within a project.
   rpc PartialUpdateInstance(PartialUpdateInstanceRequest) returns (google.longrunning.Operation) {
-    option (google.api.http) = { patch: "/v2/{instance.name=projects/*/instances/*}" body: "instance" };
+    option (google.api.http) = {
+      patch: "/v2/{instance.name=projects/*/instances/*}"
+      body: "instance"
+    };
   }
 
   // Delete an instance from a project.
   rpc DeleteInstance(DeleteInstanceRequest) returns (google.protobuf.Empty) {
-    option (google.api.http) = { delete: "/v2/{name=projects/*/instances/*}" };
+    option (google.api.http) = {
+      delete: "/v2/{name=projects/*/instances/*}"
+    };
   }
 
   // Creates a cluster within an instance.
   rpc CreateCluster(CreateClusterRequest) returns (google.longrunning.Operation) {
-    option (google.api.http) = { post: "/v2/{parent=projects/*/instances/*}/clusters" body: "cluster" };
+    option (google.api.http) = {
+      post: "/v2/{parent=projects/*/instances/*}/clusters"
+      body: "cluster"
+    };
   }
 
   // Gets information about a cluster.
   rpc GetCluster(GetClusterRequest) returns (Cluster) {
-    option (google.api.http) = { get: "/v2/{name=projects/*/instances/*/clusters/*}" };
+    option (google.api.http) = {
+      get: "/v2/{name=projects/*/instances/*/clusters/*}"
+    };
   }
 
   // Lists information about clusters in an instance.
   rpc ListClusters(ListClustersRequest) returns (ListClustersResponse) {
-    option (google.api.http) = { get: "/v2/{parent=projects/*/instances/*}/clusters" };
+    option (google.api.http) = {
+      get: "/v2/{parent=projects/*/instances/*}/clusters"
+    };
   }
 
   // Updates a cluster within an instance.
   rpc UpdateCluster(Cluster) returns (google.longrunning.Operation) {
-    option (google.api.http) = { put: "/v2/{name=projects/*/instances/*/clusters/*}" body: "*" };
+    option (google.api.http) = {
+      put: "/v2/{name=projects/*/instances/*/clusters/*}"
+      body: "*"
+    };
   }
 
   // Deletes a cluster from an instance.
   rpc DeleteCluster(DeleteClusterRequest) returns (google.protobuf.Empty) {
-    option (google.api.http) = { delete: "/v2/{name=projects/*/instances/*/clusters/*}" };
+    option (google.api.http) = {
+      delete: "/v2/{name=projects/*/instances/*/clusters/*}"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // Creates an app profile within an instance.
   rpc CreateAppProfile(CreateAppProfileRequest) returns (AppProfile) {
-    option (google.api.http) = { post: "/v2/{parent=projects/*/instances/*}/appProfiles" body: "app_profile" };
+    option (google.api.http) = {
+      post: "/v2/{parent=projects/*/instances/*}/appProfiles"
+      body: "app_profile"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // Gets information about an app profile.
   rpc GetAppProfile(GetAppProfileRequest) returns (AppProfile) {
-    option (google.api.http) = { get: "/v2/{name=projects/*/instances/*/appProfiles/*}" };
+    option (google.api.http) = {
+      get: "/v2/{name=projects/*/instances/*/appProfiles/*}"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // Lists information about app profiles in an instance.
   rpc ListAppProfiles(ListAppProfilesRequest) returns (ListAppProfilesResponse) {
-    option (google.api.http) = { get: "/v2/{parent=projects/*/instances/*}/appProfiles" };
+    option (google.api.http) = {
+      get: "/v2/{parent=projects/*/instances/*}/appProfiles"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // Updates an app profile within an instance.
   rpc UpdateAppProfile(UpdateAppProfileRequest) returns (google.longrunning.Operation) {
-    option (google.api.http) = { patch: "/v2/{app_profile.name=projects/*/instances/*/appProfiles/*}" body: "app_profile" };
+    option (google.api.http) = {
+      patch: "/v2/{app_profile.name=projects/*/instances/*/appProfiles/*}"
+      body: "app_profile"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // Deletes an app profile from an instance.
   rpc DeleteAppProfile(DeleteAppProfileRequest) returns (google.protobuf.Empty) {
-    option (google.api.http) = { delete: "/v2/{name=projects/*/instances/*/appProfiles/*}" };
+    option (google.api.http) = {
+      delete: "/v2/{name=projects/*/instances/*/appProfiles/*}"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable instance level
-  // permissions. This feature is not currently available to most Cloud Bigtable
-  // customers. This 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.
-  //
   // Gets the access control policy for an instance resource. Returns an empty
   // policy if an instance exists but does not have a policy set.
   rpc GetIamPolicy(google.iam.v1.GetIamPolicyRequest) returns (google.iam.v1.Policy) {
-    option (google.api.http) = { post: "/v2/{resource=projects/*/instances/*}:getIamPolicy" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{resource=projects/*/instances/*}:getIamPolicy"
+      body: "*"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable instance level
-  // permissions. This feature is not currently available to most Cloud Bigtable
-  // customers. This 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.
-  //
   // Sets the access control policy on an instance resource. Replaces any
   // existing policy.
   rpc SetIamPolicy(google.iam.v1.SetIamPolicyRequest) returns (google.iam.v1.Policy) {
-    option (google.api.http) = { post: "/v2/{resource=projects/*/instances/*}:setIamPolicy" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{resource=projects/*/instances/*}:setIamPolicy"
+      body: "*"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable instance level
-  // permissions. This feature is not currently available to most Cloud Bigtable
-  // customers. This 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.
-  //
   // Returns permissions that the caller has on the specified instance resource.
   rpc TestIamPermissions(google.iam.v1.TestIamPermissionsRequest) returns (google.iam.v1.TestIamPermissionsResponse) {
-    option (google.api.http) = { post: "/v2/{resource=projects/*/instances/*}:testIamPermissions" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{resource=projects/*/instances/*}:testIamPermissions"
+      body: "*"
+    };
   }
 }
 
@@ -361,11 +366,6 @@ message UpdateClusterMetadata {
   google.protobuf.Timestamp finish_time = 3;
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Request message for BigtableInstanceAdmin.CreateAppProfile.
 message CreateAppProfileRequest {
   // The unique name of the instance in which to create the new app profile.
@@ -386,11 +386,6 @@ message CreateAppProfileRequest {
   bool ignore_warnings = 4;
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Request message for BigtableInstanceAdmin.GetAppProfile.
 message GetAppProfileRequest {
   // The unique name of the requested app profile. Values are of the form
@@ -398,11 +393,6 @@ message GetAppProfileRequest {
   string name = 1;
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Request message for BigtableInstanceAdmin.ListAppProfiles.
 message ListAppProfilesRequest {
   // The unique name of the instance for which a list of app profiles is
@@ -414,11 +404,6 @@ message ListAppProfilesRequest {
   string page_token = 2;
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Response message for BigtableInstanceAdmin.ListAppProfiles.
 message ListAppProfilesResponse {
   // The list of requested app profiles.
@@ -430,11 +415,6 @@ message ListAppProfilesResponse {
   string next_page_token = 2;
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Request message for BigtableInstanceAdmin.UpdateAppProfile.
 message UpdateAppProfileRequest {
   // The app profile which will (partially) replace the current value.
@@ -448,11 +428,7 @@ message UpdateAppProfileRequest {
   bool ignore_warnings = 3;
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
+
 // Request message for BigtableInstanceAdmin.DeleteAppProfile.
 message DeleteAppProfileRequest {
   // The unique name of the app profile to be deleted. Values are of the form
@@ -463,11 +439,6 @@ message DeleteAppProfileRequest {
   bool ignore_warnings = 2;
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // The metadata for the Operation returned by UpdateAppProfile.
 message UpdateAppProfileMetadata {
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_table_admin.proto b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_table_admin.proto
index 8abdb3ced595..650c5b8663d7 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_table_admin.proto
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_table_admin.proto
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc.
+// Copyright 2018 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -41,33 +41,46 @@ service BigtableTableAdmin {
   // The table can be created with a full set of initial column families,
   // specified in the request.
   rpc CreateTable(CreateTableRequest) returns (Table) {
-    option (google.api.http) = { post: "/v2/{parent=projects/*/instances/*}/tables" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{parent=projects/*/instances/*}/tables"
+      body: "*"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable snapshots. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // Creates a new table from the specified snapshot. The target table must
   // not exist. The snapshot and the table must be in the same instance.
+  //
+  // Note: This is a private alpha release of Cloud Bigtable snapshots. This
+  // feature is not currently available to most Cloud Bigtable customers. This
+  // 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) {
-    option (google.api.http) = { post: "/v2/{parent=projects/*/instances/*}/tables:createFromSnapshot" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{parent=projects/*/instances/*}/tables:createFromSnapshot"
+      body: "*"
+    };
   }
 
   // Lists all tables served from a specified instance.
   rpc ListTables(ListTablesRequest) returns (ListTablesResponse) {
-    option (google.api.http) = { get: "/v2/{parent=projects/*/instances/*}/tables" };
+    option (google.api.http) = {
+      get: "/v2/{parent=projects/*/instances/*}/tables"
+    };
   }
 
   // Gets metadata information about the specified table.
   rpc GetTable(GetTableRequest) returns (Table) {
-    option (google.api.http) = { get: "/v2/{name=projects/*/instances/*/tables/*}" };
+    option (google.api.http) = {
+      get: "/v2/{name=projects/*/instances/*/tables/*}"
+    };
   }
 
   // Permanently deletes a specified table and all of its data.
   rpc DeleteTable(DeleteTableRequest) returns (google.protobuf.Empty) {
-    option (google.api.http) = { delete: "/v2/{name=projects/*/instances/*/tables/*}" };
+    option (google.api.http) = {
+      delete: "/v2/{name=projects/*/instances/*/tables/*}"
+    };
   }
 
   // Performs a series of column family modifications on the specified table.
@@ -75,80 +88,95 @@ service BigtableTableAdmin {
   // returns, but data requests received prior to that point may see a table
   // where only some modifications have taken effect.
   rpc ModifyColumnFamilies(ModifyColumnFamiliesRequest) returns (Table) {
-    option (google.api.http) = { post: "/v2/{name=projects/*/instances/*/tables/*}:modifyColumnFamilies" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{name=projects/*/instances/*/tables/*}:modifyColumnFamilies"
+      body: "*"
+    };
   }
 
   // Permanently drop/delete a row range from a specified table. The request can
   // specify whether to delete all rows in a table, or only those that match a
   // particular prefix.
   rpc DropRowRange(DropRowRangeRequest) returns (google.protobuf.Empty) {
-    option (google.api.http) = { post: "/v2/{name=projects/*/instances/*/tables/*}:dropRowRange" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{name=projects/*/instances/*/tables/*}:dropRowRange"
+      body: "*"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // Generates a consistency token for a Table, which can be used in
   // 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) {
-    option (google.api.http) = { post: "/v2/{name=projects/*/instances/*/tables/*}:generateConsistencyToken" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{name=projects/*/instances/*/tables/*}:generateConsistencyToken"
+      body: "*"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // 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) {
-    option (google.api.http) = { post: "/v2/{name=projects/*/instances/*/tables/*}:checkConsistency" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{name=projects/*/instances/*/tables/*}:checkConsistency"
+      body: "*"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable snapshots. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // Creates a new snapshot in the specified cluster from the specified
   // source table. The cluster and the table must be in the same instance.
+  //
+  // Note: This is a private alpha release of Cloud Bigtable snapshots. This
+  // feature is not currently available to most Cloud Bigtable customers. This
+  // 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) {
-    option (google.api.http) = { post: "/v2/{name=projects/*/instances/*/tables/*}:snapshot" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{name=projects/*/instances/*/tables/*}:snapshot"
+      body: "*"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable snapshots. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // Gets metadata information about the specified snapshot.
+  //
+  // Note: This is a private alpha release of Cloud Bigtable snapshots. This
+  // feature is not currently available to most Cloud Bigtable customers. This
+  // 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 GetSnapshot(GetSnapshotRequest) returns (Snapshot) {
-    option (google.api.http) = { get: "/v2/{name=projects/*/instances/*/clusters/*/snapshots/*}" };
+    option (google.api.http) = {
+      get: "/v2/{name=projects/*/instances/*/clusters/*/snapshots/*}"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable snapshots. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // Lists all snapshots associated with the specified cluster.
+  //
+  // Note: This is a private alpha release of Cloud Bigtable snapshots. This
+  // feature is not currently available to most Cloud Bigtable customers. This
+  // 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 ListSnapshots(ListSnapshotsRequest) returns (ListSnapshotsResponse) {
-    option (google.api.http) = { get: "/v2/{parent=projects/*/instances/*/clusters/*}/snapshots" };
+    option (google.api.http) = {
+      get: "/v2/{parent=projects/*/instances/*/clusters/*}/snapshots"
+    };
   }
 
-  // This is a private alpha release of Cloud Bigtable snapshots. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // Permanently deletes the specified snapshot.
+  //
+  // Note: This is a private alpha release of Cloud Bigtable snapshots. This
+  // feature is not currently available to most Cloud Bigtable customers. This
+  // 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 DeleteSnapshot(DeleteSnapshotRequest) returns (google.protobuf.Empty) {
-    option (google.api.http) = { delete: "/v2/{name=projects/*/instances/*/clusters/*/snapshots/*}" };
+    option (google.api.http) = {
+      delete: "/v2/{name=projects/*/instances/*/clusters/*/snapshots/*}"
+    };
   }
 }
 
@@ -191,13 +219,13 @@ message CreateTableRequest {
   repeated Split initial_splits = 4;
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.CreateTableFromSnapshot][google.bigtable.admin.v2.BigtableTableAdmin.CreateTableFromSnapshot]
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// 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 CreateTableFromSnapshotRequest {
   // The unique name of the instance in which to create the table.
   // Values are of the form `projects//instances/`.
@@ -318,11 +346,6 @@ message ModifyColumnFamiliesRequest {
   repeated Modification modifications = 2;
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken][google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken]
 message GenerateConsistencyTokenRequest {
@@ -332,11 +355,6 @@ message GenerateConsistencyTokenRequest {
   string name = 1;
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Response message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken][google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken]
 message GenerateConsistencyTokenResponse {
@@ -344,11 +362,6 @@ message GenerateConsistencyTokenResponse {
   string consistency_token = 1;
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency][google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency]
 message CheckConsistencyRequest {
@@ -361,11 +374,6 @@ message CheckConsistencyRequest {
   string consistency_token = 2;
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Response message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency][google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency]
 message CheckConsistencyResponse {
@@ -374,13 +382,13 @@ message CheckConsistencyResponse {
   bool consistent = 1;
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.SnapshotTable][google.bigtable.admin.v2.BigtableTableAdmin.SnapshotTable]
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// 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 SnapshotTableRequest {
   // The unique name of the table to have the snapshot taken.
   // Values are of the form
@@ -408,13 +416,13 @@ message SnapshotTableRequest {
   string description = 5;
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.GetSnapshot][google.bigtable.admin.v2.BigtableTableAdmin.GetSnapshot]
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// 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 GetSnapshotRequest {
   // The unique name of the requested snapshot.
   // Values are of the form
@@ -422,13 +430,13 @@ message GetSnapshotRequest {
   string name = 1;
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots][google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots]
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// 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 {
   // The unique name of the cluster for which snapshots should be listed.
   // Values are of the form
@@ -444,13 +452,13 @@ message ListSnapshotsRequest {
   string page_token = 3;
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Response message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots][google.bigtable.admin.v2.BigtableTableAdmin.ListSnapshots]
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// 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 ListSnapshotsResponse {
   // The snapshots present in the requested cluster.
   repeated Snapshot snapshots = 1;
@@ -461,13 +469,13 @@ message ListSnapshotsResponse {
   string next_page_token = 2;
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.DeleteSnapshot][google.bigtable.admin.v2.BigtableTableAdmin.DeleteSnapshot]
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// 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 DeleteSnapshotRequest {
   // The unique name of the snapshot to be deleted.
   // Values are of the form
@@ -475,12 +483,12 @@ message DeleteSnapshotRequest {
   string name = 1;
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // The metadata for the Operation returned by SnapshotTable.
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// 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 SnapshotTableMetadata {
   // The request that prompted the initiation of this SnapshotTable operation.
   SnapshotTableRequest original_request = 1;
@@ -492,12 +500,12 @@ message SnapshotTableMetadata {
   google.protobuf.Timestamp finish_time = 3;
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // The metadata for the Operation returned by CreateTableFromSnapshot.
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// 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 CreateTableFromSnapshotMetadata {
   // The request that prompted the initiation of this CreateTableFromSnapshot
   // operation.
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/common.proto b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/common.proto
index efeda12e52a1..d4c1795b5f5d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/common.proto
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/common.proto
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc.
+// Copyright 2018 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/instance.proto b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/instance.proto
index 76f69d55c509..1ee649b02221 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/instance.proto
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/instance.proto
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc.
+// Copyright 2018 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -153,11 +153,6 @@ message Cluster {
   StorageType default_storage_type = 5;
 }
 
-// This is a private alpha release of Cloud Bigtable replication. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // A configuration object describing how Cloud Bigtable should treat traffic
 // from a particular end user application.
 message AppProfile {
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/table.proto b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/table.proto
index e7a6aa85cc36..95827c217c82 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/table.proto
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/table.proto
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc.
+// Copyright 2018 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -31,11 +31,6 @@ option php_namespace = "Google\\Cloud\\Bigtable\\Admin\\V2";
 // A collection of user data indexed by row, column, and timestamp.
 // Each table is served using the resources of its parent cluster.
 message Table {
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // The state of a table's data in a particular cluster.
   message ClusterState {
     // Table replication states.
@@ -45,24 +40,20 @@ message Table {
 
       // The cluster was recently created, and the table must finish copying
       // over pre-existing data from other clusters before it can begin
-      // receiving live replication updates and serving
-      // [Data API][google.bigtable.v2.Bigtable] requests.
+      // receiving live replication updates and serving Data API requests.
       INITIALIZING = 1;
 
-      // The table is temporarily unable to serve
-      // [Data API][google.bigtable.v2.Bigtable] requests from this
+      // The table is temporarily unable to serve Data API requests from this
       // cluster due to planned internal maintenance.
       PLANNED_MAINTENANCE = 2;
 
-      // The table is temporarily unable to serve
-      // [Data API][google.bigtable.v2.Bigtable] requests from this
+      // The table is temporarily unable to serve Data API requests from this
       // cluster due to unplanned or emergency maintenance.
       UNPLANNED_MAINTENANCE = 3;
 
-      // The table can serve
-      // [Data API][google.bigtable.v2.Bigtable] requests from this
-      // cluster. Depending on replication delay, reads may not immediately
-      // reflect the state of the table in other clusters.
+      // The table can serve Data API requests from this cluster. Depending on
+      // replication delay, reads may not immediately reflect the state of the
+      // table in other clusters.
       READY = 4;
     }
 
@@ -93,12 +84,6 @@ message Table {
     // Only populates `name` and fields related to the table's schema.
     SCHEMA_VIEW = 2;
 
-    // This is a private alpha release of Cloud Bigtable replication. This
-    // feature is not currently available to most Cloud Bigtable customers. This
-    // 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.
-    //
     // Only populates `name` and fields related to the table's
     // replication state.
     REPLICATION_VIEW = 3;
@@ -110,20 +95,15 @@ message Table {
   // (`OutputOnly`)
   // The unique name of the table. Values are of the form
   // `projects//instances//tables/[_a-zA-Z0-9][-_.a-zA-Z0-9]*`.
-  // Views: `NAME_ONLY`, `SCHEMA_VIEW`, `FULL`
+  // Views: `NAME_ONLY`, `SCHEMA_VIEW`, `REPLICATION_VIEW`, `FULL`
   string name = 1;
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // (`OutputOnly`)
   // Map from cluster ID to per-cluster table state.
   // If it could not be determined whether or not the table has data in a
   // particular cluster (for example, if its zone is unavailable), then
   // there will be an entry for the cluster with UNKNOWN `replication_status`.
-  // Views: `FULL`
+  // Views: `REPLICATION_VIEW`, `FULL`
   map cluster_states = 2;
 
   // (`CreationOnly`)
@@ -132,7 +112,7 @@ message Table {
   map column_families = 3;
 
   // (`CreationOnly`)
-  // The granularity (e.g. `MILLIS`, `MICROS`) at which timestamps are stored in
+  // The granularity (i.e. `MILLIS`) at which timestamps are stored in
   // this table. Timestamps not matching the granularity will be rejected.
   // If unspecified at creation time, the value will be set to `MILLIS`.
   // Views: `SCHEMA_VIEW`, `FULL`
@@ -182,13 +162,13 @@ message GcRule {
   }
 }
 
-// This is a private alpha release of Cloud Bigtable snapshots. This feature
-// is not currently available to most Cloud Bigtable customers. This 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.
-//
 // A snapshot of a table at a particular time. A snapshot can be used as a
 // checkpoint for data restoration or a data source for a new table.
+//
+// Note: This is a private alpha release of Cloud Bigtable snapshots. This
+// feature is not currently available to most Cloud Bigtable customers. This
+// 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 Snapshot {
   // Possible states of a snapshot.
   enum State {
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java
index 78d2244cc734..af170edb17a2 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java
@@ -189,10 +189,6 @@ public java.lang.String getTableName() {
   private volatile java.lang.Object appProfileId_;
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -213,10 +209,6 @@ public java.lang.String getAppProfileId() {
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -1014,10 +1006,6 @@ public Builder setTableNameBytes(
     private java.lang.Object appProfileId_ = "";
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -1038,10 +1026,6 @@ public java.lang.String getAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -1063,10 +1047,6 @@ public java.lang.String getAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -1085,10 +1065,6 @@ public Builder setAppProfileId(
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -1103,10 +1079,6 @@ public Builder clearAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequestOrBuilder.java
index c38e92cfe750..7933098515e0 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequestOrBuilder.java
@@ -33,10 +33,6 @@ public interface CheckAndMutateRowRequestOrBuilder extends
 
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -46,10 +42,6 @@ public interface CheckAndMutateRowRequestOrBuilder extends
   java.lang.String getAppProfileId();
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java
index 408cbade5d6b..8df11153c5ad 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java
@@ -161,10 +161,6 @@ public java.lang.String getTableName() {
   private volatile java.lang.Object appProfileId_;
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -185,10 +181,6 @@ public java.lang.String getAppProfileId() {
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -769,10 +761,6 @@ public Builder setTableNameBytes(
     private java.lang.Object appProfileId_ = "";
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -793,10 +781,6 @@ public java.lang.String getAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -818,10 +802,6 @@ public java.lang.String getAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -840,10 +820,6 @@ public Builder setAppProfileId(
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -858,10 +834,6 @@ public Builder clearAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequestOrBuilder.java
index c802addc3187..0d602849fc43 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequestOrBuilder.java
@@ -31,10 +31,6 @@ public interface MutateRowRequestOrBuilder extends
 
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -44,10 +40,6 @@ public interface MutateRowRequestOrBuilder extends
   java.lang.String getAppProfileId();
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java
index ad5a75b03858..da8097ffe6ee 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java
@@ -1193,10 +1193,6 @@ public java.lang.String getTableName() {
   private volatile java.lang.Object appProfileId_;
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -1217,10 +1213,6 @@ public java.lang.String getAppProfileId() {
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -1771,10 +1763,6 @@ public Builder setTableNameBytes(
     private java.lang.Object appProfileId_ = "";
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -1795,10 +1783,6 @@ public java.lang.String getAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -1820,10 +1804,6 @@ public java.lang.String getAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -1842,10 +1822,6 @@ public Builder setAppProfileId(
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -1860,10 +1836,6 @@ public Builder clearAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequestOrBuilder.java
index 95a7581e3323..9d17b4c34be5 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequestOrBuilder.java
@@ -27,10 +27,6 @@ public interface MutateRowsRequestOrBuilder extends
 
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -40,10 +36,6 @@ public interface MutateRowsRequestOrBuilder extends
   java.lang.String getAppProfileId();
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java
index a4aad8594b6b..3d15975abacd 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java
@@ -163,10 +163,6 @@ public java.lang.String getTableName() {
   private volatile java.lang.Object appProfileId_;
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -187,10 +183,6 @@ public java.lang.String getAppProfileId() {
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -776,10 +768,6 @@ public Builder setTableNameBytes(
     private java.lang.Object appProfileId_ = "";
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -800,10 +788,6 @@ public java.lang.String getAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -825,10 +809,6 @@ public java.lang.String getAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -847,10 +827,6 @@ public Builder setAppProfileId(
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -865,10 +841,6 @@ public Builder clearAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequestOrBuilder.java
index 182dd59f27af..ba2f06d4a17b 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequestOrBuilder.java
@@ -33,10 +33,6 @@ public interface ReadModifyWriteRowRequestOrBuilder extends
 
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -46,10 +42,6 @@ public interface ReadModifyWriteRowRequestOrBuilder extends
   java.lang.String getAppProfileId();
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java
index 857917c61fe4..9f82b19cae9b 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java
@@ -173,10 +173,6 @@ public java.lang.String getTableName() {
   private volatile java.lang.Object appProfileId_;
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -197,10 +193,6 @@ public java.lang.String getAppProfileId() {
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -788,10 +780,6 @@ public Builder setTableNameBytes(
     private java.lang.Object appProfileId_ = "";
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -812,10 +800,6 @@ public java.lang.String getAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -837,10 +821,6 @@ public java.lang.String getAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -859,10 +839,6 @@ public Builder setAppProfileId(
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -877,10 +853,6 @@ public Builder clearAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequestOrBuilder.java
index a7e463f266e1..8314aa387dd4 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequestOrBuilder.java
@@ -31,10 +31,6 @@ public interface ReadRowsRequestOrBuilder extends
 
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -44,10 +40,6 @@ public interface ReadRowsRequestOrBuilder extends
   java.lang.String getAppProfileId();
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java
index d314935974b6..955d647d46a7 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java
@@ -141,10 +141,6 @@ public java.lang.String getTableName() {
   private volatile java.lang.Object appProfileId_;
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -165,10 +161,6 @@ public java.lang.String getAppProfileId() {
   }
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -595,10 +587,6 @@ public Builder setTableNameBytes(
     private java.lang.Object appProfileId_ = "";
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -619,10 +607,6 @@ public java.lang.String getAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -644,10 +628,6 @@ public java.lang.String getAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -666,10 +646,6 @@ public Builder setAppProfileId(
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
@@ -684,10 +660,6 @@ public Builder clearAppProfileId() {
     }
     /**
      * 
    -     * This is a private alpha release of Cloud Bigtable replication. This feature
-     * is not currently available to most Cloud Bigtable customers. This 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.
      * This value specifies routing for replication. If not specified, the
      * "default" application profile will be used.
      * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequestOrBuilder.java
index 567b5d27e55f..6b15c959c510 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequestOrBuilder.java
@@ -31,10 +31,6 @@ public interface SampleRowKeysRequestOrBuilder extends
 
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
@@ -44,10 +40,6 @@ public interface SampleRowKeysRequestOrBuilder extends
   java.lang.String getAppProfileId();
   /**
    * 
    -   * This is a private alpha release of Cloud Bigtable replication. This feature
-   * is not currently available to most Cloud Bigtable customers. This 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.
    * This value specifies routing for replication. If not specified, the
    * "default" application profile will be used.
    * 
    
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/proto/google/bigtable/v2/bigtable.proto b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/proto/google/bigtable/v2/bigtable.proto
index 24d807ba20fe..d800c2c97ab8 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/proto/google/bigtable/v2/bigtable.proto
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/proto/google/bigtable/v2/bigtable.proto
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc.
+// Copyright 2018 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -37,7 +37,10 @@ service Bigtable {
   // atomicity of each row will still be preserved. See the
   // ReadRowsResponse documentation for details.
   rpc ReadRows(ReadRowsRequest) returns (stream ReadRowsResponse) {
-    option (google.api.http) = { post: "/v2/{table_name=projects/*/instances/*/tables/*}:readRows" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{table_name=projects/*/instances/*/tables/*}:readRows"
+      body: "*"
+    };
   }
 
   // Returns a sample of row keys in the table. The returned row keys will
@@ -45,25 +48,36 @@ service Bigtable {
   // which can be used to break up the data for distributed tasks like
   // mapreduces.
   rpc SampleRowKeys(SampleRowKeysRequest) returns (stream SampleRowKeysResponse) {
-    option (google.api.http) = { get: "/v2/{table_name=projects/*/instances/*/tables/*}:sampleRowKeys" };
+    option (google.api.http) = {
+      get: "/v2/{table_name=projects/*/instances/*/tables/*}:sampleRowKeys"
+    };
   }
 
   // Mutates a row atomically. Cells already present in the row are left
   // unchanged unless explicitly changed by `mutation`.
   rpc MutateRow(MutateRowRequest) returns (MutateRowResponse) {
-    option (google.api.http) = { post: "/v2/{table_name=projects/*/instances/*/tables/*}:mutateRow" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{table_name=projects/*/instances/*/tables/*}:mutateRow"
+      body: "*"
+    };
   }
 
   // Mutates multiple rows in a batch. Each individual row is mutated
   // atomically as in MutateRow, but the entire batch is not executed
   // atomically.
   rpc MutateRows(MutateRowsRequest) returns (stream MutateRowsResponse) {
-    option (google.api.http) = { post: "/v2/{table_name=projects/*/instances/*/tables/*}:mutateRows" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{table_name=projects/*/instances/*/tables/*}:mutateRows"
+      body: "*"
+    };
   }
 
   // Mutates a row atomically based on the output of a predicate Reader filter.
   rpc CheckAndMutateRow(CheckAndMutateRowRequest) returns (CheckAndMutateRowResponse) {
-    option (google.api.http) = { post: "/v2/{table_name=projects/*/instances/*/tables/*}:checkAndMutateRow" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{table_name=projects/*/instances/*/tables/*}:checkAndMutateRow"
+      body: "*"
+    };
   }
 
   // Modifies a row atomically on the server. The method reads the latest
@@ -72,7 +86,10 @@ service Bigtable {
   // timestamp is the greater of the existing timestamp or the current server
   // time. The method returns the new contents of all modified cells.
   rpc ReadModifyWriteRow(ReadModifyWriteRowRequest) returns (ReadModifyWriteRowResponse) {
-    option (google.api.http) = { post: "/v2/{table_name=projects/*/instances/*/tables/*}:readModifyWriteRow" body: "*" };
+    option (google.api.http) = {
+      post: "/v2/{table_name=projects/*/instances/*/tables/*}:readModifyWriteRow"
+      body: "*"
+    };
   }
 }
 
@@ -83,11 +100,6 @@ message ReadRowsRequest {
   // `projects//instances//tables/
    • `.
   string table_name = 1;
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // This value specifies routing for replication. If not specified, the
   // "default" application profile will be used.
   string app_profile_id = 5;
@@ -188,11 +200,6 @@ message SampleRowKeysRequest {
   // `projects//instances//tables/
    `.
   string table_name = 1;
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // This value specifies routing for replication. If not specified, the
   // "default" application profile will be used.
   string app_profile_id = 2;
@@ -223,11 +230,6 @@ message MutateRowRequest {
   // `projects//instances//tables/
    `.
   string table_name = 1;
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // This value specifies routing for replication. If not specified, the
   // "default" application profile will be used.
   string app_profile_id = 4;
@@ -262,11 +264,6 @@ message MutateRowsRequest {
   // The unique name of the table to which the mutations should be applied.
   string table_name = 1;
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // This value specifies routing for replication. If not specified, the
   // "default" application profile will be used.
   string app_profile_id = 3;
@@ -305,11 +302,6 @@ message CheckAndMutateRowRequest {
   // `projects//instances//tables/
    `.
   string table_name = 1;
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // This value specifies routing for replication. If not specified, the
   // "default" application profile will be used.
   string app_profile_id = 7;
@@ -353,11 +345,6 @@ message ReadModifyWriteRowRequest {
   // `projects//instances//tables/
    `.
   string table_name = 1;
 
-  // This is a private alpha release of Cloud Bigtable replication. This feature
-  // is not currently available to most Cloud Bigtable customers. This 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.
-  //
   // This value specifies routing for replication. If not specified, the
   // "default" application profile will be used.
   string app_profile_id = 4;
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/proto/google/bigtable/v2/data.proto b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/proto/google/bigtable/v2/data.proto
index 5d5023958f16..7400197e7b17 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/proto/google/bigtable/v2/data.proto
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/proto/google/bigtable/v2/data.proto
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc.
+// Copyright 2018 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptions.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptions.java
index 2256327685ec..f736f8eb78bb 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptions.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptions.java
@@ -22,6 +22,7 @@ private BigQueryOptions(com.google.protobuf.GeneratedMessageV3.Builder builde
   private BigQueryOptions() {
     identifyingFields_ = java.util.Collections.emptyList();
     rowsLimit_ = 0L;
+    sampleMethod_ = 0;
   }
 
   @java.lang.Override
@@ -82,6 +83,12 @@ private BigQueryOptions(
             rowsLimit_ = input.readInt64();
             break;
           }
+          case 32: {
+            int rawValue = input.readEnum();
+
+            sampleMethod_ = rawValue;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,6 +116,135 @@ private BigQueryOptions(
             com.google.privacy.dlp.v2.BigQueryOptions.class, com.google.privacy.dlp.v2.BigQueryOptions.Builder.class);
   }
 
+  /**
+   * 
    +   * How to sample rows if not all rows are scanned. Meaningful only when used
+   * in conjunction with rows_limit. If not specified, scanning would start
+   * from the top.
+   * 
    
+   *
+   * Protobuf enum {@code google.privacy.dlp.v2.BigQueryOptions.SampleMethod}
+   */
+  public enum SampleMethod
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * SAMPLE_METHOD_UNSPECIFIED = 0;
+     */
+    SAMPLE_METHOD_UNSPECIFIED(0),
+    /**
+     * 
    +     * Scan from the top (default).
+     * 
    
+     *
+     * TOP = 1;
+     */
+    TOP(1),
+    /**
+     * 
    +     * Randomly pick the row to start scanning. The scanned rows are contiguous.
+     * 
    
+     *
+     * RANDOM_START = 2;
+     */
+    RANDOM_START(2),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * SAMPLE_METHOD_UNSPECIFIED = 0;
+     */
+    public static final int SAMPLE_METHOD_UNSPECIFIED_VALUE = 0;
+    /**
+     * 
    +     * Scan from the top (default).
+     * 
    
+     *
+     * TOP = 1;
+     */
+    public static final int TOP_VALUE = 1;
+    /**
+     * 
    +     * Randomly pick the row to start scanning. The scanned rows are contiguous.
+     * 
    
+     *
+     * RANDOM_START = 2;
+     */
+    public static final int RANDOM_START_VALUE = 2;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static SampleMethod valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static SampleMethod forNumber(int value) {
+      switch (value) {
+        case 0: return SAMPLE_METHOD_UNSPECIFIED;
+        case 1: return TOP;
+        case 2: return RANDOM_START;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        SampleMethod> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public SampleMethod findValueByNumber(int number) {
+              return SampleMethod.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return com.google.privacy.dlp.v2.BigQueryOptions.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final SampleMethod[] VALUES = values();
+
+    public static SampleMethod valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private SampleMethod(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.privacy.dlp.v2.BigQueryOptions.SampleMethod)
+  }
+
   private int bitField0_;
   public static final int TABLE_REFERENCE_FIELD_NUMBER = 1;
   private com.google.privacy.dlp.v2.BigQueryTable tableReference_;
@@ -218,6 +354,22 @@ public long getRowsLimit() {
     return rowsLimit_;
   }
 
+  public static final int SAMPLE_METHOD_FIELD_NUMBER = 4;
+  private int sampleMethod_;
+  /**
+   * .google.privacy.dlp.v2.BigQueryOptions.SampleMethod sample_method = 4;
+   */
+  public int getSampleMethodValue() {
+    return sampleMethod_;
+  }
+  /**
+   * .google.privacy.dlp.v2.BigQueryOptions.SampleMethod sample_method = 4;
+   */
+  public com.google.privacy.dlp.v2.BigQueryOptions.SampleMethod getSampleMethod() {
+    com.google.privacy.dlp.v2.BigQueryOptions.SampleMethod result = com.google.privacy.dlp.v2.BigQueryOptions.SampleMethod.valueOf(sampleMethod_);
+    return result == null ? com.google.privacy.dlp.v2.BigQueryOptions.SampleMethod.UNRECOGNIZED : result;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -239,6 +391,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (rowsLimit_ != 0L) {
       output.writeInt64(3, rowsLimit_);
     }
+    if (sampleMethod_ != com.google.privacy.dlp.v2.BigQueryOptions.SampleMethod.SAMPLE_METHOD_UNSPECIFIED.getNumber()) {
+      output.writeEnum(4, sampleMethod_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -259,6 +414,10 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(3, rowsLimit_);
     }
+    if (sampleMethod_ != com.google.privacy.dlp.v2.BigQueryOptions.SampleMethod.SAMPLE_METHOD_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(4, sampleMethod_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -284,6 +443,7 @@ public boolean equals(final java.lang.Object obj) {
         .equals(other.getIdentifyingFieldsList());
     result = result && (getRowsLimit()
         == other.getRowsLimit());
+    result = result && sampleMethod_ == other.sampleMethod_;
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -306,6 +466,8 @@ public int hashCode() {
     hash = (37 * hash) + ROWS_LIMIT_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
         getRowsLimit());
+    hash = (37 * hash) + SAMPLE_METHOD_FIELD_NUMBER;
+    hash = (53 * hash) + sampleMethod_;
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -454,6 +616,8 @@ public Builder clear() {
       }
       rowsLimit_ = 0L;
 
+      sampleMethod_ = 0;
+
       return this;
     }
 
@@ -493,6 +657,7 @@ public com.google.privacy.dlp.v2.BigQueryOptions buildPartial() {
         result.identifyingFields_ = identifyingFieldsBuilder_.build();
       }
       result.rowsLimit_ = rowsLimit_;
+      result.sampleMethod_ = sampleMethod_;
       result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
@@ -567,6 +732,9 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.BigQueryOptions other) {
       if (other.getRowsLimit() != 0L) {
         setRowsLimit(other.getRowsLimit());
       }
+      if (other.sampleMethod_ != 0) {
+        setSampleMethodValue(other.getSampleMethodValue());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -1121,6 +1289,50 @@ public Builder clearRowsLimit() {
       onChanged();
       return this;
     }
+
+    private int sampleMethod_ = 0;
+    /**
+     * .google.privacy.dlp.v2.BigQueryOptions.SampleMethod sample_method = 4;
+     */
+    public int getSampleMethodValue() {
+      return sampleMethod_;
+    }
+    /**
+     * .google.privacy.dlp.v2.BigQueryOptions.SampleMethod sample_method = 4;
+     */
+    public Builder setSampleMethodValue(int value) {
+      sampleMethod_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * .google.privacy.dlp.v2.BigQueryOptions.SampleMethod sample_method = 4;
+     */
+    public com.google.privacy.dlp.v2.BigQueryOptions.SampleMethod getSampleMethod() {
+      com.google.privacy.dlp.v2.BigQueryOptions.SampleMethod result = com.google.privacy.dlp.v2.BigQueryOptions.SampleMethod.valueOf(sampleMethod_);
+      return result == null ? com.google.privacy.dlp.v2.BigQueryOptions.SampleMethod.UNRECOGNIZED : result;
+    }
+    /**
+     * .google.privacy.dlp.v2.BigQueryOptions.SampleMethod sample_method = 4;
+     */
+    public Builder setSampleMethod(com.google.privacy.dlp.v2.BigQueryOptions.SampleMethod value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      sampleMethod_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * .google.privacy.dlp.v2.BigQueryOptions.SampleMethod sample_method = 4;
+     */
+    public Builder clearSampleMethod() {
+      
+      sampleMethod_ = 0;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptionsOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptionsOrBuilder.java
index 8549fd8c157b..23d4dbdc538f 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptionsOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptionsOrBuilder.java
@@ -91,4 +91,13 @@ com.google.privacy.dlp.v2.FieldIdOrBuilder getIdentifyingFieldsOrBuilder(
    * int64 rows_limit = 3;
    */
   long getRowsLimit();
+
+  /**
+   * .google.privacy.dlp.v2.BigQueryOptions.SampleMethod sample_method = 4;
+   */
+  int getSampleMethodValue();
+  /**
+   * .google.privacy.dlp.v2.BigQueryOptions.SampleMethod sample_method = 4;
+   */
+  com.google.privacy.dlp.v2.BigQueryOptions.SampleMethod getSampleMethod();
 }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptions.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptions.java
index 5f8e6cd68e57..9f911bc1426b 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptions.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptions.java
@@ -23,6 +23,8 @@ private CloudStorageOptions(com.google.protobuf.GeneratedMessageV3.Builder bu
   private CloudStorageOptions() {
     bytesLimitPerFile_ = 0L;
     fileTypes_ = java.util.Collections.emptyList();
+    sampleMethod_ = 0;
+    filesLimitPercent_ = 0;
   }
 
   @java.lang.Override
@@ -97,6 +99,17 @@ private CloudStorageOptions(
             input.popLimit(oldLimit);
             break;
           }
+          case 48: {
+            int rawValue = input.readEnum();
+
+            sampleMethod_ = rawValue;
+            break;
+          }
+          case 56: {
+
+            filesLimitPercent_ = input.readInt32();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -124,6 +137,137 @@ private CloudStorageOptions(
             com.google.privacy.dlp.v2.CloudStorageOptions.class, com.google.privacy.dlp.v2.CloudStorageOptions.Builder.class);
   }
 
+  /**
+   * 
    +   * How to sample bytes if not all bytes are scanned. Meaningful only when used
+   * in conjunction with bytes_limit_per_file. If not specified, scanning would
+   * start from the top.
+   * 
    
+   *
+   * Protobuf enum {@code google.privacy.dlp.v2.CloudStorageOptions.SampleMethod}
+   */
+  public enum SampleMethod
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * SAMPLE_METHOD_UNSPECIFIED = 0;
+     */
+    SAMPLE_METHOD_UNSPECIFIED(0),
+    /**
+     * 
    +     * Scan from the top (default).
+     * 
    
+     *
+     * TOP = 1;
+     */
+    TOP(1),
+    /**
+     * 
    +     * For each file larger than bytes_limit_per_file, randomly pick the offset
+     * to start scanning. The scanned bytes are contiguous.
+     * 
    
+     *
+     * RANDOM_START = 2;
+     */
+    RANDOM_START(2),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * SAMPLE_METHOD_UNSPECIFIED = 0;
+     */
+    public static final int SAMPLE_METHOD_UNSPECIFIED_VALUE = 0;
+    /**
+     * 
    +     * Scan from the top (default).
+     * 
    
+     *
+     * TOP = 1;
+     */
+    public static final int TOP_VALUE = 1;
+    /**
+     * 
    +     * For each file larger than bytes_limit_per_file, randomly pick the offset
+     * to start scanning. The scanned bytes are contiguous.
+     * 
    
+     *
+     * RANDOM_START = 2;
+     */
+    public static final int RANDOM_START_VALUE = 2;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static SampleMethod valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static SampleMethod forNumber(int value) {
+      switch (value) {
+        case 0: return SAMPLE_METHOD_UNSPECIFIED;
+        case 1: return TOP;
+        case 2: return RANDOM_START;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        SampleMethod> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public SampleMethod findValueByNumber(int number) {
+              return SampleMethod.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return com.google.privacy.dlp.v2.CloudStorageOptions.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final SampleMethod[] VALUES = values();
+
+    public static SampleMethod valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private SampleMethod(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:google.privacy.dlp.v2.CloudStorageOptions.SampleMethod)
+  }
+
   public interface FileSetOrBuilder extends
       // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2.CloudStorageOptions.FileSet)
       com.google.protobuf.MessageOrBuilder {
@@ -813,6 +957,37 @@ public int getFileTypesValue(int index) {
   }
   private int fileTypesMemoizedSerializedSize;
 
+  public static final int SAMPLE_METHOD_FIELD_NUMBER = 6;
+  private int sampleMethod_;
+  /**
+   * .google.privacy.dlp.v2.CloudStorageOptions.SampleMethod sample_method = 6;
+   */
+  public int getSampleMethodValue() {
+    return sampleMethod_;
+  }
+  /**
+   * .google.privacy.dlp.v2.CloudStorageOptions.SampleMethod sample_method = 6;
+   */
+  public com.google.privacy.dlp.v2.CloudStorageOptions.SampleMethod getSampleMethod() {
+    com.google.privacy.dlp.v2.CloudStorageOptions.SampleMethod result = com.google.privacy.dlp.v2.CloudStorageOptions.SampleMethod.valueOf(sampleMethod_);
+    return result == null ? com.google.privacy.dlp.v2.CloudStorageOptions.SampleMethod.UNRECOGNIZED : result;
+  }
+
+  public static final int FILES_LIMIT_PERCENT_FIELD_NUMBER = 7;
+  private int filesLimitPercent_;
+  /**
+   * 
    +   * Limits the number of files to scan to this percentage of the input FileSet.
+   * Number of files scanned is rounded down. Must be between 0 and 100,
+   * inclusively. Both 0 and 100 means no limit. Defaults to 0.
+   * 
    
+   *
+   * int32 files_limit_percent = 7;
+   */
+  public int getFilesLimitPercent() {
+    return filesLimitPercent_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -839,6 +1014,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     for (int i = 0; i < fileTypes_.size(); i++) {
       output.writeEnumNoTag(fileTypes_.get(i));
     }
+    if (sampleMethod_ != com.google.privacy.dlp.v2.CloudStorageOptions.SampleMethod.SAMPLE_METHOD_UNSPECIFIED.getNumber()) {
+      output.writeEnum(6, sampleMethod_);
+    }
+    if (filesLimitPercent_ != 0) {
+      output.writeInt32(7, filesLimitPercent_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -867,6 +1048,14 @@ public int getSerializedSize() {
           .computeUInt32SizeNoTag(dataSize);
       }fileTypesMemoizedSerializedSize = dataSize;
     }
+    if (sampleMethod_ != com.google.privacy.dlp.v2.CloudStorageOptions.SampleMethod.SAMPLE_METHOD_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(6, sampleMethod_);
+    }
+    if (filesLimitPercent_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(7, filesLimitPercent_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -891,6 +1080,9 @@ public boolean equals(final java.lang.Object obj) {
     result = result && (getBytesLimitPerFile()
         == other.getBytesLimitPerFile());
     result = result && fileTypes_.equals(other.fileTypes_);
+    result = result && sampleMethod_ == other.sampleMethod_;
+    result = result && (getFilesLimitPercent()
+        == other.getFilesLimitPercent());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -913,6 +1105,10 @@ public int hashCode() {
       hash = (37 * hash) + FILE_TYPES_FIELD_NUMBER;
       hash = (53 * hash) + fileTypes_.hashCode();
     }
+    hash = (37 * hash) + SAMPLE_METHOD_FIELD_NUMBER;
+    hash = (53 * hash) + sampleMethod_;
+    hash = (37 * hash) + FILES_LIMIT_PERCENT_FIELD_NUMBER;
+    hash = (53 * hash) + getFilesLimitPercent();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1057,6 +1253,10 @@ public Builder clear() {
 
       fileTypes_ = java.util.Collections.emptyList();
       bitField0_ = (bitField0_ & ~0x00000004);
+      sampleMethod_ = 0;
+
+      filesLimitPercent_ = 0;
+
       return this;
     }
 
@@ -1092,6 +1292,8 @@ public com.google.privacy.dlp.v2.CloudStorageOptions buildPartial() {
         bitField0_ = (bitField0_ & ~0x00000004);
       }
       result.fileTypes_ = fileTypes_;
+      result.sampleMethod_ = sampleMethod_;
+      result.filesLimitPercent_ = filesLimitPercent_;
       result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
@@ -1150,6 +1352,12 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.CloudStorageOptions other) {
         }
         onChanged();
       }
+      if (other.sampleMethod_ != 0) {
+        setSampleMethodValue(other.getSampleMethodValue());
+      }
+      if (other.getFilesLimitPercent() != 0) {
+        setFilesLimitPercent(other.getFilesLimitPercent());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -1525,6 +1733,94 @@ public Builder addAllFileTypesValue(
       onChanged();
       return this;
     }
+
+    private int sampleMethod_ = 0;
+    /**
+     * .google.privacy.dlp.v2.CloudStorageOptions.SampleMethod sample_method = 6;
+     */
+    public int getSampleMethodValue() {
+      return sampleMethod_;
+    }
+    /**
+     * .google.privacy.dlp.v2.CloudStorageOptions.SampleMethod sample_method = 6;
+     */
+    public Builder setSampleMethodValue(int value) {
+      sampleMethod_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * .google.privacy.dlp.v2.CloudStorageOptions.SampleMethod sample_method = 6;
+     */
+    public com.google.privacy.dlp.v2.CloudStorageOptions.SampleMethod getSampleMethod() {
+      com.google.privacy.dlp.v2.CloudStorageOptions.SampleMethod result = com.google.privacy.dlp.v2.CloudStorageOptions.SampleMethod.valueOf(sampleMethod_);
+      return result == null ? com.google.privacy.dlp.v2.CloudStorageOptions.SampleMethod.UNRECOGNIZED : result;
+    }
+    /**
+     * .google.privacy.dlp.v2.CloudStorageOptions.SampleMethod sample_method = 6;
+     */
+    public Builder setSampleMethod(com.google.privacy.dlp.v2.CloudStorageOptions.SampleMethod value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      sampleMethod_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * .google.privacy.dlp.v2.CloudStorageOptions.SampleMethod sample_method = 6;
+     */
+    public Builder clearSampleMethod() {
+      
+      sampleMethod_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private int filesLimitPercent_ ;
+    /**
+     * 
    +     * Limits the number of files to scan to this percentage of the input FileSet.
+     * Number of files scanned is rounded down. Must be between 0 and 100,
+     * inclusively. Both 0 and 100 means no limit. Defaults to 0.
+     * 
    
+     *
+     * int32 files_limit_percent = 7;
+     */
+    public int getFilesLimitPercent() {
+      return filesLimitPercent_;
+    }
+    /**
+     * 
    +     * Limits the number of files to scan to this percentage of the input FileSet.
+     * Number of files scanned is rounded down. Must be between 0 and 100,
+     * inclusively. Both 0 and 100 means no limit. Defaults to 0.
+     * 
    
+     *
+     * int32 files_limit_percent = 7;
+     */
+    public Builder setFilesLimitPercent(int value) {
+      
+      filesLimitPercent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Limits the number of files to scan to this percentage of the input FileSet.
+     * Number of files scanned is rounded down. Must be between 0 and 100,
+     * inclusively. Both 0 and 100 means no limit. Defaults to 0.
+     * 
    
+     *
+     * int32 files_limit_percent = 7;
+     */
+    public Builder clearFilesLimitPercent() {
+      
+      filesLimitPercent_ = 0;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptionsOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptionsOrBuilder.java
index a21df19cd60a..7b707e8a207a 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptionsOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptionsOrBuilder.java
@@ -81,4 +81,24 @@ public interface CloudStorageOptionsOrBuilder extends
    * repeated .google.privacy.dlp.v2.FileType file_types = 5;
    */
   int getFileTypesValue(int index);
+
+  /**
+   * .google.privacy.dlp.v2.CloudStorageOptions.SampleMethod sample_method = 6;
+   */
+  int getSampleMethodValue();
+  /**
+   * .google.privacy.dlp.v2.CloudStorageOptions.SampleMethod sample_method = 6;
+   */
+  com.google.privacy.dlp.v2.CloudStorageOptions.SampleMethod getSampleMethod();
+
+  /**
+   * 
    +   * Limits the number of files to scan to this percentage of the input FileSet.
+   * Number of files scanned is rounded down. Must be between 0 and 100,
+   * inclusively. Both 0 and 100 means no limit. Defaults to 0.
+   * 
    
+   *
+   * int32 files_limit_percent = 7;
+   */
+  int getFilesLimitPercent();
 }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStoragePath.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStoragePath.java
index ef97e8584080..cad5bded62f2 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStoragePath.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStoragePath.java
@@ -5,7 +5,7 @@
 
 /**
  * 
    - * Message representing a path in Cloud Storage.
+ * Message representing a single file or path in Cloud Storage.
  * 
    
  *
  * Protobuf type {@code google.privacy.dlp.v2.CloudStoragePath}
@@ -280,7 +280,7 @@ protected Builder newBuilderForType(
   }
   /**
    * 
    -   * Message representing a path in Cloud Storage.
+   * Message representing a single file or path in Cloud Storage.
    * 
    
    *
    * Protobuf type {@code google.privacy.dlp.v2.CloudStoragePath}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfig.java
index c951e7257bc9..392830d79eee 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfig.java
@@ -395,8 +395,7 @@ public com.google.privacy.dlp.v2.CryptoKeyOrBuilder getCryptoKeyOrBuilder() {
    * The tweak is constructed as a sequence of bytes in big endian byte order
    * such that:
    * - a 64 bit integer is encoded followed by a single byte of value 1
-   * - a string is encoded in UTF-8 format followed by a single byte of value
-   *  å 2
+   * - a string is encoded in UTF-8 format followed by a single byte of value 2
    * 
    *
    * .google.privacy.dlp.v2.FieldId context = 2;
@@ -419,8 +418,7 @@ public boolean hasContext() {
    * The tweak is constructed as a sequence of bytes in big endian byte order
    * such that:
    * - a 64 bit integer is encoded followed by a single byte of value 1
-   * - a string is encoded in UTF-8 format followed by a single byte of value
-   *  å 2
+   * - a string is encoded in UTF-8 format followed by a single byte of value 2
    * 
    *
    * .google.privacy.dlp.v2.FieldId context = 2;
@@ -443,8 +441,7 @@ public com.google.privacy.dlp.v2.FieldId getContext() {
    * The tweak is constructed as a sequence of bytes in big endian byte order
    * such that:
    * - a 64 bit integer is encoded followed by a single byte of value 1
-   * - a string is encoded in UTF-8 format followed by a single byte of value
-   *  å 2
+   * - a string is encoded in UTF-8 format followed by a single byte of value 2
    * 
    *
    * .google.privacy.dlp.v2.FieldId context = 2;
@@ -1292,8 +1289,7 @@ public com.google.privacy.dlp.v2.CryptoKeyOrBuilder getCryptoKeyOrBuilder() {
      * The tweak is constructed as a sequence of bytes in big endian byte order
      * such that:
      * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value
-     *  å 2
+     * - a string is encoded in UTF-8 format followed by a single byte of value 2
      * 
      *
      * .google.privacy.dlp.v2.FieldId context = 2;
@@ -1316,8 +1312,7 @@ public boolean hasContext() {
      * The tweak is constructed as a sequence of bytes in big endian byte order
      * such that:
      * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value
-     *  å 2
+     * - a string is encoded in UTF-8 format followed by a single byte of value 2
      * 
      *
      * .google.privacy.dlp.v2.FieldId context = 2;
@@ -1344,8 +1339,7 @@ public com.google.privacy.dlp.v2.FieldId getContext() {
      * The tweak is constructed as a sequence of bytes in big endian byte order
      * such that:
      * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value
-     *  å 2
+     * - a string is encoded in UTF-8 format followed by a single byte of value 2
      * 
      *
      * .google.privacy.dlp.v2.FieldId context = 2;
@@ -1378,8 +1372,7 @@ public Builder setContext(com.google.privacy.dlp.v2.FieldId value) {
      * The tweak is constructed as a sequence of bytes in big endian byte order
      * such that:
      * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value
-     *  å 2
+     * - a string is encoded in UTF-8 format followed by a single byte of value 2
      * 
      *
      * .google.privacy.dlp.v2.FieldId context = 2;
@@ -1410,8 +1403,7 @@ public Builder setContext(
      * The tweak is constructed as a sequence of bytes in big endian byte order
      * such that:
      * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value
-     *  å 2
+     * - a string is encoded in UTF-8 format followed by a single byte of value 2
      * 
      *
      * .google.privacy.dlp.v2.FieldId context = 2;
@@ -1446,8 +1438,7 @@ public Builder mergeContext(com.google.privacy.dlp.v2.FieldId value) {
      * The tweak is constructed as a sequence of bytes in big endian byte order
      * such that:
      * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value
-     *  å 2
+     * - a string is encoded in UTF-8 format followed by a single byte of value 2
      * 
      *
      * .google.privacy.dlp.v2.FieldId context = 2;
@@ -1478,8 +1469,7 @@ public Builder clearContext() {
      * The tweak is constructed as a sequence of bytes in big endian byte order
      * such that:
      * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value
-     *  å 2
+     * - a string is encoded in UTF-8 format followed by a single byte of value 2
      * 
      *
      * .google.privacy.dlp.v2.FieldId context = 2;
@@ -1504,8 +1494,7 @@ public com.google.privacy.dlp.v2.FieldId.Builder getContextBuilder() {
      * The tweak is constructed as a sequence of bytes in big endian byte order
      * such that:
      * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value
-     *  å 2
+     * - a string is encoded in UTF-8 format followed by a single byte of value 2
      * 
      *
      * .google.privacy.dlp.v2.FieldId context = 2;
@@ -1533,8 +1522,7 @@ public com.google.privacy.dlp.v2.FieldIdOrBuilder getContextOrBuilder() {
      * The tweak is constructed as a sequence of bytes in big endian byte order
      * such that:
      * - a 64 bit integer is encoded followed by a single byte of value 1
-     * - a string is encoded in UTF-8 format followed by a single byte of value
-     *  å 2
+     * - a string is encoded in UTF-8 format followed by a single byte of value 2
      * 
      *
      * .google.privacy.dlp.v2.FieldId context = 2;
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfigOrBuilder.java
index 851d30367ff9..a5545abce2fe 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfigOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfigOrBuilder.java
@@ -47,8 +47,7 @@ public interface CryptoReplaceFfxFpeConfigOrBuilder extends
    * The tweak is constructed as a sequence of bytes in big endian byte order
    * such that:
    * - a 64 bit integer is encoded followed by a single byte of value 1
-   * - a string is encoded in UTF-8 format followed by a single byte of value
-   *  å 2
+   * - a string is encoded in UTF-8 format followed by a single byte of value 2
    * 
    *
    * .google.privacy.dlp.v2.FieldId context = 2;
@@ -69,8 +68,7 @@ public interface CryptoReplaceFfxFpeConfigOrBuilder extends
    * The tweak is constructed as a sequence of bytes in big endian byte order
    * such that:
    * - a 64 bit integer is encoded followed by a single byte of value 1
-   * - a string is encoded in UTF-8 format followed by a single byte of value
-   *  å 2
+   * - a string is encoded in UTF-8 format followed by a single byte of value 2
    * 
    *
    * .google.privacy.dlp.v2.FieldId context = 2;
@@ -91,8 +89,7 @@ public interface CryptoReplaceFfxFpeConfigOrBuilder extends
    * The tweak is constructed as a sequence of bytes in big endian byte order
    * such that:
    * - a 64 bit integer is encoded followed by a single byte of value 1
-   * - a string is encoded in UTF-8 format followed by a single byte of value
-   *  å 2
+   * - a string is encoded in UTF-8 format followed by a single byte of value 2
    * 
    *
    * .google.privacy.dlp.v2.FieldId context = 2;
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java
index 9498e2e037a5..c1f1d9849930 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java
@@ -199,54 +199,63 @@ public static void registerAllExtensions(
       "storeOptions\0228\n\014partition_id\030\001 \001(\0132\".goo" +
       "gle.privacy.dlp.v2.PartitionId\0223\n\004kind\030\002" +
       " \001(\0132%.google.privacy.dlp.v2.KindExpress" +
-      "ion\"\306\001\n\023CloudStorageOptions\022D\n\010file_set\030" +
+      "ion\"\375\002\n\023CloudStorageOptions\022D\n\010file_set\030" +
       "\001 \001(\01322.google.privacy.dlp.v2.CloudStora" +
       "geOptions.FileSet\022\034\n\024bytes_limit_per_fil" +
       "e\030\004 \001(\003\0223\n\nfile_types\030\005 \003(\0162\037.google.pri" +
-      "vacy.dlp.v2.FileType\032\026\n\007FileSet\022\013\n\003url\030\001" +
-      " \001(\t\" \n\020CloudStoragePath\022\014\n\004path\030\001 \001(\t\"\240" +
-      "\001\n\017BigQueryOptions\022=\n\017table_reference\030\001 " +
-      "\001(\0132$.google.privacy.dlp.v2.BigQueryTabl" +
-      "e\022:\n\022identifying_fields\030\002 \003(\0132\036.google.p" +
-      "rivacy.dlp.v2.FieldId\022\022\n\nrows_limit\030\003 \001(" +
-      "\003\"\232\004\n\rStorageConfig\022D\n\021datastore_options" +
-      "\030\002 \001(\0132\'.google.privacy.dlp.v2.Datastore" +
-      "OptionsH\000\022K\n\025cloud_storage_options\030\003 \001(\013" +
-      "2*.google.privacy.dlp.v2.CloudStorageOpt" +
-      "ionsH\000\022C\n\021big_query_options\030\004 \001(\0132&.goog" +
-      "le.privacy.dlp.v2.BigQueryOptionsH\000\022L\n\017t" +
-      "imespan_config\030\006 \001(\01323.google.privacy.dl" +
-      "p.v2.StorageConfig.TimespanConfig\032\332\001\n\016Ti" +
-      "mespanConfig\022.\n\nstart_time\030\001 \001(\0132\032.googl" +
-      "e.protobuf.Timestamp\022,\n\010end_time\030\002 \001(\0132\032" +
-      ".google.protobuf.Timestamp\0227\n\017timestamp_" +
-      "field\030\003 \001(\0132\036.google.privacy.dlp.v2.Fiel" +
-      "dId\0221\n)enable_auto_population_of_timespa" +
-      "n_config\030\004 \001(\010B\006\n\004type\"`\n\013BigQueryKey\022=\n" +
-      "\017table_reference\030\001 \001(\0132$.google.privacy." +
-      "dlp.v2.BigQueryTable\022\022\n\nrow_number\030\002 \001(\003" +
-      "\">\n\014DatastoreKey\022.\n\nentity_key\030\001 \001(\0132\032.g" +
-      "oogle.privacy.dlp.v2.Key\"\273\001\n\003Key\0228\n\014part" +
-      "ition_id\030\001 \001(\0132\".google.privacy.dlp.v2.P" +
-      "artitionId\0224\n\004path\030\002 \003(\0132&.google.privac" +
-      "y.dlp.v2.Key.PathElement\032D\n\013PathElement\022" +
-      "\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003 \001(" +
-      "\tH\000B\t\n\007id_type\"\216\001\n\tRecordKey\022<\n\rdatastor" +
-      "e_key\030\002 \001(\0132#.google.privacy.dlp.v2.Data" +
-      "storeKeyH\000\022;\n\rbig_query_key\030\003 \001(\0132\".goog" +
-      "le.privacy.dlp.v2.BigQueryKeyH\000B\006\n\004type\"" +
-      "I\n\rBigQueryTable\022\022\n\nproject_id\030\001 \001(\t\022\022\n\n" +
-      "dataset_id\030\002 \001(\t\022\020\n\010table_id\030\003 \001(\t\"9\n\010En" +
-      "tityId\022-\n\005field\030\001 \001(\0132\036.google.privacy.d" +
-      "lp.v2.FieldId*t\n\nLikelihood\022\032\n\026LIKELIHOO" +
-      "D_UNSPECIFIED\020\000\022\021\n\rVERY_UNLIKELY\020\001\022\014\n\010UN" +
-      "LIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIKELY\020\004\022\017\n\013VE" +
-      "RY_LIKELY\020\005*E\n\010FileType\022\031\n\025FILE_TYPE_UNS" +
-      "PECIFIED\020\000\022\017\n\013BINARY_FILE\020\001\022\r\n\tTEXT_FILE" +
-      "\020\002B\217\001\n\031com.google.privacy.dlp.v2B\nDlpSto" +
-      "rageP\001Z8google.golang.org/genproto/googl" +
-      "eapis/privacy/dlp/v2;dlp\252\002\023Google.Cloud." +
-      "Dlp.V2\312\002\023Google\\Cloud\\Dlp\\V2b\006proto3"
+      "vacy.dlp.v2.FileType\022N\n\rsample_method\030\006 " +
+      "\001(\01627.google.privacy.dlp.v2.CloudStorage" +
+      "Options.SampleMethod\022\033\n\023files_limit_perc" +
+      "ent\030\007 \001(\005\032\026\n\007FileSet\022\013\n\003url\030\001 \001(\t\"H\n\014Sam" +
+      "pleMethod\022\035\n\031SAMPLE_METHOD_UNSPECIFIED\020\000" +
+      "\022\007\n\003TOP\020\001\022\020\n\014RANDOM_START\020\002\" \n\020CloudStor" +
+      "agePath\022\014\n\004path\030\001 \001(\t\"\266\002\n\017BigQueryOption" +
+      "s\022=\n\017table_reference\030\001 \001(\0132$.google.priv" +
+      "acy.dlp.v2.BigQueryTable\022:\n\022identifying_" +
+      "fields\030\002 \003(\0132\036.google.privacy.dlp.v2.Fie" +
+      "ldId\022\022\n\nrows_limit\030\003 \001(\003\022J\n\rsample_metho" +
+      "d\030\004 \001(\01623.google.privacy.dlp.v2.BigQuery" +
+      "Options.SampleMethod\"H\n\014SampleMethod\022\035\n\031" +
+      "SAMPLE_METHOD_UNSPECIFIED\020\000\022\007\n\003TOP\020\001\022\020\n\014" +
+      "RANDOM_START\020\002\"\232\004\n\rStorageConfig\022D\n\021data" +
+      "store_options\030\002 \001(\0132\'.google.privacy.dlp" +
+      ".v2.DatastoreOptionsH\000\022K\n\025cloud_storage_" +
+      "options\030\003 \001(\0132*.google.privacy.dlp.v2.Cl" +
+      "oudStorageOptionsH\000\022C\n\021big_query_options" +
+      "\030\004 \001(\0132&.google.privacy.dlp.v2.BigQueryO" +
+      "ptionsH\000\022L\n\017timespan_config\030\006 \001(\01323.goog" +
+      "le.privacy.dlp.v2.StorageConfig.Timespan" +
+      "Config\032\332\001\n\016TimespanConfig\022.\n\nstart_time\030" +
+      "\001 \001(\0132\032.google.protobuf.Timestamp\022,\n\010end" +
+      "_time\030\002 \001(\0132\032.google.protobuf.Timestamp\022" +
+      "7\n\017timestamp_field\030\003 \001(\0132\036.google.privac" +
+      "y.dlp.v2.FieldId\0221\n)enable_auto_populati" +
+      "on_of_timespan_config\030\004 \001(\010B\006\n\004type\"`\n\013B" +
+      "igQueryKey\022=\n\017table_reference\030\001 \001(\0132$.go" +
+      "ogle.privacy.dlp.v2.BigQueryTable\022\022\n\nrow" +
+      "_number\030\002 \001(\003\">\n\014DatastoreKey\022.\n\nentity_" +
+      "key\030\001 \001(\0132\032.google.privacy.dlp.v2.Key\"\273\001" +
+      "\n\003Key\0228\n\014partition_id\030\001 \001(\0132\".google.pri" +
+      "vacy.dlp.v2.PartitionId\0224\n\004path\030\002 \003(\0132&." +
+      "google.privacy.dlp.v2.Key.PathElement\032D\n" +
+      "\013PathElement\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000" +
+      "\022\016\n\004name\030\003 \001(\tH\000B\t\n\007id_type\"\216\001\n\tRecordKe" +
+      "y\022<\n\rdatastore_key\030\002 \001(\0132#.google.privac" +
+      "y.dlp.v2.DatastoreKeyH\000\022;\n\rbig_query_key" +
+      "\030\003 \001(\0132\".google.privacy.dlp.v2.BigQueryK" +
+      "eyH\000B\006\n\004type\"I\n\rBigQueryTable\022\022\n\nproject" +
+      "_id\030\001 \001(\t\022\022\n\ndataset_id\030\002 \001(\t\022\020\n\010table_i" +
+      "d\030\003 \001(\t\"9\n\010EntityId\022-\n\005field\030\001 \001(\0132\036.goo" +
+      "gle.privacy.dlp.v2.FieldId*t\n\nLikelihood" +
+      "\022\032\n\026LIKELIHOOD_UNSPECIFIED\020\000\022\021\n\rVERY_UNL" +
+      "IKELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006L" +
+      "IKELY\020\004\022\017\n\013VERY_LIKELY\020\005*E\n\010FileType\022\031\n\025" +
+      "FILE_TYPE_UNSPECIFIED\020\000\022\017\n\013BINARY_FILE\020\001" +
+      "\022\r\n\tTEXT_FILE\020\002B\217\001\n\031com.google.privacy.d" +
+      "lp.v2B\nDlpStorageP\001Z8google.golang.org/g" +
+      "enproto/googleapis/privacy/dlp/v2;dlp\252\002\023" +
+      "Google.Cloud.Dlp.V2\312\002\023Google\\Cloud\\Dlp\\V" +
+      "2b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -351,7 +360,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_google_privacy_dlp_v2_CloudStorageOptions_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_privacy_dlp_v2_CloudStorageOptions_descriptor,
-        new java.lang.String[] { "FileSet", "BytesLimitPerFile", "FileTypes", });
+        new java.lang.String[] { "FileSet", "BytesLimitPerFile", "FileTypes", "SampleMethod", "FilesLimitPercent", });
     internal_static_google_privacy_dlp_v2_CloudStorageOptions_FileSet_descriptor =
       internal_static_google_privacy_dlp_v2_CloudStorageOptions_descriptor.getNestedTypes().get(0);
     internal_static_google_privacy_dlp_v2_CloudStorageOptions_FileSet_fieldAccessorTable = new
@@ -369,7 +378,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_google_privacy_dlp_v2_BigQueryOptions_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_privacy_dlp_v2_BigQueryOptions_descriptor,
-        new java.lang.String[] { "TableReference", "IdentifyingFields", "RowsLimit", });
+        new java.lang.String[] { "TableReference", "IdentifyingFields", "RowsLimit", "SampleMethod", });
     internal_static_google_privacy_dlp_v2_StorageConfig_descriptor =
       getDescriptor().getMessageTypes().get(9);
     internal_static_google_privacy_dlp_v2_StorageConfig_fieldAccessorTable = new
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrivacyMetric.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrivacyMetric.java
index a4a7df491d60..891f3ac385fc 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrivacyMetric.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrivacyMetric.java
@@ -4204,6 +4204,7 @@ com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTableOrBui
    * using publicly available data (like the US Census), or using a custom
    * statistical model (indicated as one or several BigQuery tables), or by
    * extrapolating from the distribution of values in the input dataset.
+   * A column with a semantic tag attached.
    * 
    *
    * Protobuf type {@code google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig}
@@ -4427,10 +4428,6 @@ public interface TaggedFieldOrBuilder extends
       public com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.TaggedField.TagCase getTagCase();
     }
     /**
-     * 
    -     * A column with a semantic tag attached.
-     * 
    
-     *
      * Protobuf type {@code google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.TaggedField}
      */
     public  static final class TaggedField extends
@@ -4978,10 +4975,6 @@ protected Builder newBuilderForType(
         return builder;
       }
       /**
-       * 
    -       * A column with a semantic tag attached.
-       * 
    
-       *
        * Protobuf type {@code google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.TaggedField}
        */
       public static final class Builder extends
@@ -8390,6 +8383,7 @@ protected Builder newBuilderForType(
      * using publicly available data (like the US Census), or using a custom
      * statistical model (indicated as one or several BigQuery tables), or by
      * extrapolating from the distribution of values in the input dataset.
+     * A column with a semantic tag attached.
      * 
      *
      * Protobuf type {@code google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto
index 97b25f469f16..d590a82c48e6 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto
@@ -894,8 +894,8 @@ message PrivacyMetric {
   // using publicly available data (like the US Census), or using a custom
   // statistical model (indicated as one or several BigQuery tables), or by
   // extrapolating from the distribution of values in the input dataset.
+  // A column with a semantic tag attached.
   message KMapEstimationConfig {
-    // A column with a semantic tag attached.
     message TaggedField {
       // Identifies the column. [required]
       FieldId field = 1;
@@ -1493,8 +1493,7 @@ message CryptoReplaceFfxFpeConfig {
   // such that:
   //
   // - a 64 bit integer is encoded followed by a single byte of value 1
-  // - a string is encoded in UTF-8 format followed by a single byte of value
-  //  å 2
+  // - a string is encoded in UTF-8 format followed by a single byte of value 2
   FieldId context = 2;
 
   oneof alphabet {
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/storage.proto b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/storage.proto
index 28d3c6e4d07b..cb8e9c973cac 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/storage.proto
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/storage.proto
@@ -223,6 +223,20 @@ message CloudStorageOptions {
     string url = 1;
   }
 
+  // How to sample bytes if not all bytes are scanned. Meaningful only when used
+  // in conjunction with bytes_limit_per_file. If not specified, scanning would
+  // start from the top.
+  enum SampleMethod {
+    SAMPLE_METHOD_UNSPECIFIED = 0;
+
+    // Scan from the top (default).
+    TOP = 1;
+
+    // For each file larger than bytes_limit_per_file, randomly pick the offset
+    // to start scanning. The scanned bytes are contiguous.
+    RANDOM_START = 2;
+  }
+
   FileSet file_set = 1;
 
   // Max number of bytes to scan from a file. If a scanned file's size is bigger
@@ -233,9 +247,16 @@ message CloudStorageOptions {
   // If empty, all files are scanned and available data format processors
   // are applied.
   repeated FileType file_types = 5;
+
+  SampleMethod sample_method = 6;
+
+  // Limits the number of files to scan to this percentage of the input FileSet.
+  // Number of files scanned is rounded down. Must be between 0 and 100,
+  // inclusively. Both 0 and 100 means no limit. Defaults to 0.
+  int32 files_limit_percent = 7;
 }
 
-// Message representing a path in Cloud Storage.
+// Message representing a single file or path in Cloud Storage.
 message CloudStoragePath {
   // A url representing a file or path (no wildcards) in Cloud Storage.
   // Example: gs://[BUCKET_NAME]/dictionary.txt
@@ -244,6 +265,19 @@ message CloudStoragePath {
 
 // Options defining BigQuery table and row identifiers.
 message BigQueryOptions {
+  // How to sample rows if not all rows are scanned. Meaningful only when used
+  // in conjunction with rows_limit. If not specified, scanning would start
+  // from the top.
+  enum SampleMethod {
+    SAMPLE_METHOD_UNSPECIFIED = 0;
+
+    // Scan from the top (default).
+    TOP = 1;
+
+    // Randomly pick the row to start scanning. The scanned rows are contiguous.
+    RANDOM_START = 2;
+  }
+
   // Complete BigQuery table reference.
   BigQueryTable table_reference = 1;
 
@@ -255,6 +289,8 @@ message BigQueryOptions {
   // rest of the rows are omitted. If not set, or if set to 0, all rows will be
   // scanned. Cannot be used in conjunction with TimespanConfig.
   int64 rows_limit = 3;
+
+  SampleMethod sample_method = 4;
 }
 
 // Shared message indicating Cloud storage type.
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java
index d5bfccd76c9d..8b05773c3847 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java
@@ -23,12 +23,18 @@ private RecognitionConfig(com.google.protobuf.GeneratedMessageV3.Builder buil
   private RecognitionConfig() {
     encoding_ = 0;
     sampleRateHertz_ = 0;
+    audioChannelCount_ = 0;
+    enableSeparateRecognitionPerChannel_ = false;
     languageCode_ = "";
+    alternativeLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     maxAlternatives_ = 0;
     profanityFilter_ = false;
     speechContexts_ = java.util.Collections.emptyList();
     enableWordTimeOffsets_ = false;
+    enableWordConfidence_ = false;
     enableAutomaticPunctuation_ = false;
+    enableSpeakerDiarization_ = false;
+    diarizationSpeakerCount_ = 0;
     model_ = "";
     useEnhanced_ = false;
   }
@@ -92,14 +98,19 @@ private RecognitionConfig(
             break;
           }
           case 50: {
-            if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+            if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
               speechContexts_ = new java.util.ArrayList();
-              mutable_bitField0_ |= 0x00000020;
+              mutable_bitField0_ |= 0x00000100;
             }
             speechContexts_.add(
                 input.readMessage(com.google.cloud.speech.v1p1beta1.SpeechContext.parser(), extensionRegistry));
             break;
           }
+          case 56: {
+
+            audioChannelCount_ = input.readInt32();
+            break;
+          }
           case 64: {
 
             enableWordTimeOffsets_ = input.readBool();
@@ -123,6 +134,11 @@ private RecognitionConfig(
             enableAutomaticPunctuation_ = input.readBool();
             break;
           }
+          case 96: {
+
+            enableSeparateRecognitionPerChannel_ = input.readBool();
+            break;
+          }
           case 106: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -134,6 +150,30 @@ private RecognitionConfig(
             useEnhanced_ = input.readBool();
             break;
           }
+          case 120: {
+
+            enableWordConfidence_ = input.readBool();
+            break;
+          }
+          case 128: {
+
+            enableSpeakerDiarization_ = input.readBool();
+            break;
+          }
+          case 136: {
+
+            diarizationSpeakerCount_ = input.readInt32();
+            break;
+          }
+          case 146: {
+            java.lang.String s = input.readStringRequireUtf8();
+            if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+              alternativeLanguageCodes_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000020;
+            }
+            alternativeLanguageCodes_.add(s);
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -142,9 +182,12 @@ private RecognitionConfig(
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+      if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
         speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_);
       }
+      if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+        alternativeLanguageCodes_ = alternativeLanguageCodes_.getUnmodifiableView();
+      }
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
@@ -483,6 +526,45 @@ public int getSampleRateHertz() {
     return sampleRateHertz_;
   }
 
+  public static final int AUDIO_CHANNEL_COUNT_FIELD_NUMBER = 7;
+  private int audioChannelCount_;
+  /**
+   * 
    +   * *Optional* The number of channels in the input audio data.
+   * ONLY set this for MULTI-CHANNEL recognition.
+   * Valid values for LINEAR16 and FLAC are `1`-`8`.
+   * Valid values for OGG_OPUS are '1'-'254'.
+   * Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`.
+   * If `0` or omitted, defaults to one channel (mono).
+   * NOTE: We only recognize the first channel by default.
+   * To perform independent recognition on each channel set
+   * enable_separate_recognition_per_channel to 'true'.
+   * 
    
+   *
+   * int32 audio_channel_count = 7;
+   */
+  public int getAudioChannelCount() {
+    return audioChannelCount_;
+  }
+
+  public static final int ENABLE_SEPARATE_RECOGNITION_PER_CHANNEL_FIELD_NUMBER = 12;
+  private boolean enableSeparateRecognitionPerChannel_;
+  /**
+   * 
    +   * This needs to be set to ‘true’ explicitly and audio_channel_count > 1
+   * to get each channel recognized separately. The recognition result will
+   * contain a channel_tag field to state which channel that result belongs to.
+   * If this is not ‘true’, we will only recognize the first channel.
+   * NOTE: The request is also billed cumulatively for all channels recognized:
+   *     (audio_channel_count times the audio length)
+   * 
    
+   *
+   * bool enable_separate_recognition_per_channel = 12;
+   */
+  public boolean getEnableSeparateRecognitionPerChannel() {
+    return enableSeparateRecognitionPerChannel_;
+  }
+
   public static final int LANGUAGE_CODE_FIELD_NUMBER = 3;
   private volatile java.lang.Object languageCode_;
   /**
@@ -533,6 +615,95 @@ public java.lang.String getLanguageCode() {
     }
   }
 
+  public static final int ALTERNATIVE_LANGUAGE_CODES_FIELD_NUMBER = 18;
+  private com.google.protobuf.LazyStringList alternativeLanguageCodes_;
+  /**
+   * 
    +   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
    
+   *
+   * repeated string alternative_language_codes = 18;
+   */
+  public com.google.protobuf.ProtocolStringList
+      getAlternativeLanguageCodesList() {
+    return alternativeLanguageCodes_;
+  }
+  /**
+   * 
    +   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
    
+   *
+   * repeated string alternative_language_codes = 18;
+   */
+  public int getAlternativeLanguageCodesCount() {
+    return alternativeLanguageCodes_.size();
+  }
+  /**
+   * 
    +   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
    
+   *
+   * repeated string alternative_language_codes = 18;
+   */
+  public java.lang.String getAlternativeLanguageCodes(int index) {
+    return alternativeLanguageCodes_.get(index);
+  }
+  /**
+   * 
    +   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
    
+   *
+   * repeated string alternative_language_codes = 18;
+   */
+  public com.google.protobuf.ByteString
+      getAlternativeLanguageCodesBytes(int index) {
+    return alternativeLanguageCodes_.getByteString(index);
+  }
+
   public static final int MAX_ALTERNATIVES_FIELD_NUMBER = 4;
   private int maxAlternatives_;
   /**
@@ -638,6 +809,21 @@ public boolean getEnableWordTimeOffsets() {
     return enableWordTimeOffsets_;
   }
 
+  public static final int ENABLE_WORD_CONFIDENCE_FIELD_NUMBER = 15;
+  private boolean enableWordConfidence_;
+  /**
+   * 
    +   * *Optional* If `true`, the top result includes a list of words and the
+   * confidence for those words. If `false`, no word-level confidence
+   * information is returned. The default is `false`.
+   * 
    
+   *
+   * bool enable_word_confidence = 15;
+   */
+  public boolean getEnableWordConfidence() {
+    return enableWordConfidence_;
+  }
+
   public static final int ENABLE_AUTOMATIC_PUNCTUATION_FIELD_NUMBER = 11;
   private boolean enableAutomaticPunctuation_;
   /**
@@ -657,6 +843,41 @@ public boolean getEnableAutomaticPunctuation() {
     return enableAutomaticPunctuation_;
   }
 
+  public static final int ENABLE_SPEAKER_DIARIZATION_FIELD_NUMBER = 16;
+  private boolean enableSpeakerDiarization_;
+  /**
+   * 
    +   * *Optional* If 'true', enables speaker detection for each recognized word in
+   * the top alternative of the recognition result using a speaker_tag provided
+   * in the WordInfo.
+   * Note: When this is true, we send all the words from the beginning of the
+   * audio for the top alternative in every consecutive responses.
+   * This is done in order to improve our speaker tags as our models learn to
+   * identify the speakers in the conversation over time.
+   * 
    
+   *
+   * bool enable_speaker_diarization = 16;
+   */
+  public boolean getEnableSpeakerDiarization() {
+    return enableSpeakerDiarization_;
+  }
+
+  public static final int DIARIZATION_SPEAKER_COUNT_FIELD_NUMBER = 17;
+  private int diarizationSpeakerCount_;
+  /**
+   * 
    +   * *Optional*
+   * If set, specifies the estimated number of speakers in the conversation.
+   * If not set, defaults to '2'.
+   * Ignored unless enable_speaker_diarization is set to true."
+   * 
    
+   *
+   * int32 diarization_speaker_count = 17;
+   */
+  public int getDiarizationSpeakerCount() {
+    return diarizationSpeakerCount_;
+  }
+
   public static final int METADATA_FIELD_NUMBER = 9;
   private com.google.cloud.speech.v1p1beta1.RecognitionMetadata metadata_;
   /**
@@ -846,6 +1067,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     for (int i = 0; i < speechContexts_.size(); i++) {
       output.writeMessage(6, speechContexts_.get(i));
     }
+    if (audioChannelCount_ != 0) {
+      output.writeInt32(7, audioChannelCount_);
+    }
     if (enableWordTimeOffsets_ != false) {
       output.writeBool(8, enableWordTimeOffsets_);
     }
@@ -855,12 +1079,27 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (enableAutomaticPunctuation_ != false) {
       output.writeBool(11, enableAutomaticPunctuation_);
     }
+    if (enableSeparateRecognitionPerChannel_ != false) {
+      output.writeBool(12, enableSeparateRecognitionPerChannel_);
+    }
     if (!getModelBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 13, model_);
     }
     if (useEnhanced_ != false) {
       output.writeBool(14, useEnhanced_);
     }
+    if (enableWordConfidence_ != false) {
+      output.writeBool(15, enableWordConfidence_);
+    }
+    if (enableSpeakerDiarization_ != false) {
+      output.writeBool(16, enableSpeakerDiarization_);
+    }
+    if (diarizationSpeakerCount_ != 0) {
+      output.writeInt32(17, diarizationSpeakerCount_);
+    }
+    for (int i = 0; i < alternativeLanguageCodes_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 18, alternativeLanguageCodes_.getRaw(i));
+    }
     unknownFields.writeTo(output);
   }
 
@@ -892,6 +1131,10 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(6, speechContexts_.get(i));
     }
+    if (audioChannelCount_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(7, audioChannelCount_);
+    }
     if (enableWordTimeOffsets_ != false) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(8, enableWordTimeOffsets_);
@@ -904,6 +1147,10 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(11, enableAutomaticPunctuation_);
     }
+    if (enableSeparateRecognitionPerChannel_ != false) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(12, enableSeparateRecognitionPerChannel_);
+    }
     if (!getModelBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, model_);
     }
@@ -911,6 +1158,26 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(14, useEnhanced_);
     }
+    if (enableWordConfidence_ != false) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(15, enableWordConfidence_);
+    }
+    if (enableSpeakerDiarization_ != false) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(16, enableSpeakerDiarization_);
+    }
+    if (diarizationSpeakerCount_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(17, diarizationSpeakerCount_);
+    }
+    {
+      int dataSize = 0;
+      for (int i = 0; i < alternativeLanguageCodes_.size(); i++) {
+        dataSize += computeStringSizeNoTag(alternativeLanguageCodes_.getRaw(i));
+      }
+      size += dataSize;
+      size += 2 * getAlternativeLanguageCodesList().size();
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -930,8 +1197,14 @@ public boolean equals(final java.lang.Object obj) {
     result = result && encoding_ == other.encoding_;
     result = result && (getSampleRateHertz()
         == other.getSampleRateHertz());
+    result = result && (getAudioChannelCount()
+        == other.getAudioChannelCount());
+    result = result && (getEnableSeparateRecognitionPerChannel()
+        == other.getEnableSeparateRecognitionPerChannel());
     result = result && getLanguageCode()
         .equals(other.getLanguageCode());
+    result = result && getAlternativeLanguageCodesList()
+        .equals(other.getAlternativeLanguageCodesList());
     result = result && (getMaxAlternatives()
         == other.getMaxAlternatives());
     result = result && (getProfanityFilter()
@@ -940,8 +1213,14 @@ public boolean equals(final java.lang.Object obj) {
         .equals(other.getSpeechContextsList());
     result = result && (getEnableWordTimeOffsets()
         == other.getEnableWordTimeOffsets());
+    result = result && (getEnableWordConfidence()
+        == other.getEnableWordConfidence());
     result = result && (getEnableAutomaticPunctuation()
         == other.getEnableAutomaticPunctuation());
+    result = result && (getEnableSpeakerDiarization()
+        == other.getEnableSpeakerDiarization());
+    result = result && (getDiarizationSpeakerCount()
+        == other.getDiarizationSpeakerCount());
     result = result && (hasMetadata() == other.hasMetadata());
     if (hasMetadata()) {
       result = result && getMetadata()
@@ -966,8 +1245,17 @@ public int hashCode() {
     hash = (53 * hash) + encoding_;
     hash = (37 * hash) + SAMPLE_RATE_HERTZ_FIELD_NUMBER;
     hash = (53 * hash) + getSampleRateHertz();
+    hash = (37 * hash) + AUDIO_CHANNEL_COUNT_FIELD_NUMBER;
+    hash = (53 * hash) + getAudioChannelCount();
+    hash = (37 * hash) + ENABLE_SEPARATE_RECOGNITION_PER_CHANNEL_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getEnableSeparateRecognitionPerChannel());
     hash = (37 * hash) + LANGUAGE_CODE_FIELD_NUMBER;
     hash = (53 * hash) + getLanguageCode().hashCode();
+    if (getAlternativeLanguageCodesCount() > 0) {
+      hash = (37 * hash) + ALTERNATIVE_LANGUAGE_CODES_FIELD_NUMBER;
+      hash = (53 * hash) + getAlternativeLanguageCodesList().hashCode();
+    }
     hash = (37 * hash) + MAX_ALTERNATIVES_FIELD_NUMBER;
     hash = (53 * hash) + getMaxAlternatives();
     hash = (37 * hash) + PROFANITY_FILTER_FIELD_NUMBER;
@@ -980,9 +1268,17 @@ public int hashCode() {
     hash = (37 * hash) + ENABLE_WORD_TIME_OFFSETS_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
         getEnableWordTimeOffsets());
+    hash = (37 * hash) + ENABLE_WORD_CONFIDENCE_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getEnableWordConfidence());
     hash = (37 * hash) + ENABLE_AUTOMATIC_PUNCTUATION_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
         getEnableAutomaticPunctuation());
+    hash = (37 * hash) + ENABLE_SPEAKER_DIARIZATION_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getEnableSpeakerDiarization());
+    hash = (37 * hash) + DIARIZATION_SPEAKER_COUNT_FIELD_NUMBER;
+    hash = (53 * hash) + getDiarizationSpeakerCount();
     if (hasMetadata()) {
       hash = (37 * hash) + METADATA_FIELD_NUMBER;
       hash = (53 * hash) + getMetadata().hashCode();
@@ -1131,22 +1427,34 @@ public Builder clear() {
 
       sampleRateHertz_ = 0;
 
+      audioChannelCount_ = 0;
+
+      enableSeparateRecognitionPerChannel_ = false;
+
       languageCode_ = "";
 
+      alternativeLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000020);
       maxAlternatives_ = 0;
 
       profanityFilter_ = false;
 
       if (speechContextsBuilder_ == null) {
         speechContexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
+        bitField0_ = (bitField0_ & ~0x00000100);
       } else {
         speechContextsBuilder_.clear();
       }
       enableWordTimeOffsets_ = false;
 
+      enableWordConfidence_ = false;
+
       enableAutomaticPunctuation_ = false;
 
+      enableSpeakerDiarization_ = false;
+
+      diarizationSpeakerCount_ = 0;
+
       if (metadataBuilder_ == null) {
         metadata_ = null;
       } else {
@@ -1183,20 +1491,30 @@ public com.google.cloud.speech.v1p1beta1.RecognitionConfig buildPartial() {
       int to_bitField0_ = 0;
       result.encoding_ = encoding_;
       result.sampleRateHertz_ = sampleRateHertz_;
+      result.audioChannelCount_ = audioChannelCount_;
+      result.enableSeparateRecognitionPerChannel_ = enableSeparateRecognitionPerChannel_;
       result.languageCode_ = languageCode_;
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        alternativeLanguageCodes_ = alternativeLanguageCodes_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000020);
+      }
+      result.alternativeLanguageCodes_ = alternativeLanguageCodes_;
       result.maxAlternatives_ = maxAlternatives_;
       result.profanityFilter_ = profanityFilter_;
       if (speechContextsBuilder_ == null) {
-        if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        if (((bitField0_ & 0x00000100) == 0x00000100)) {
           speechContexts_ = java.util.Collections.unmodifiableList(speechContexts_);
-          bitField0_ = (bitField0_ & ~0x00000020);
+          bitField0_ = (bitField0_ & ~0x00000100);
         }
         result.speechContexts_ = speechContexts_;
       } else {
         result.speechContexts_ = speechContextsBuilder_.build();
       }
       result.enableWordTimeOffsets_ = enableWordTimeOffsets_;
+      result.enableWordConfidence_ = enableWordConfidence_;
       result.enableAutomaticPunctuation_ = enableAutomaticPunctuation_;
+      result.enableSpeakerDiarization_ = enableSpeakerDiarization_;
+      result.diarizationSpeakerCount_ = diarizationSpeakerCount_;
       if (metadataBuilder_ == null) {
         result.metadata_ = metadata_;
       } else {
@@ -1252,10 +1570,26 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognitionConfig oth
       if (other.getSampleRateHertz() != 0) {
         setSampleRateHertz(other.getSampleRateHertz());
       }
+      if (other.getAudioChannelCount() != 0) {
+        setAudioChannelCount(other.getAudioChannelCount());
+      }
+      if (other.getEnableSeparateRecognitionPerChannel() != false) {
+        setEnableSeparateRecognitionPerChannel(other.getEnableSeparateRecognitionPerChannel());
+      }
       if (!other.getLanguageCode().isEmpty()) {
         languageCode_ = other.languageCode_;
         onChanged();
       }
+      if (!other.alternativeLanguageCodes_.isEmpty()) {
+        if (alternativeLanguageCodes_.isEmpty()) {
+          alternativeLanguageCodes_ = other.alternativeLanguageCodes_;
+          bitField0_ = (bitField0_ & ~0x00000020);
+        } else {
+          ensureAlternativeLanguageCodesIsMutable();
+          alternativeLanguageCodes_.addAll(other.alternativeLanguageCodes_);
+        }
+        onChanged();
+      }
       if (other.getMaxAlternatives() != 0) {
         setMaxAlternatives(other.getMaxAlternatives());
       }
@@ -1266,7 +1600,7 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognitionConfig oth
         if (!other.speechContexts_.isEmpty()) {
           if (speechContexts_.isEmpty()) {
             speechContexts_ = other.speechContexts_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00000100);
           } else {
             ensureSpeechContextsIsMutable();
             speechContexts_.addAll(other.speechContexts_);
@@ -1279,7 +1613,7 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognitionConfig oth
             speechContextsBuilder_.dispose();
             speechContextsBuilder_ = null;
             speechContexts_ = other.speechContexts_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00000100);
             speechContextsBuilder_ = 
               com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                  getSpeechContextsFieldBuilder() : null;
@@ -1291,9 +1625,18 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognitionConfig oth
       if (other.getEnableWordTimeOffsets() != false) {
         setEnableWordTimeOffsets(other.getEnableWordTimeOffsets());
       }
+      if (other.getEnableWordConfidence() != false) {
+        setEnableWordConfidence(other.getEnableWordConfidence());
+      }
       if (other.getEnableAutomaticPunctuation() != false) {
         setEnableAutomaticPunctuation(other.getEnableAutomaticPunctuation());
       }
+      if (other.getEnableSpeakerDiarization() != false) {
+        setEnableSpeakerDiarization(other.getEnableSpeakerDiarization());
+      }
+      if (other.getDiarizationSpeakerCount() != 0) {
+        setDiarizationSpeakerCount(other.getDiarizationSpeakerCount());
+      }
       if (other.hasMetadata()) {
         mergeMetadata(other.getMetadata());
       }
@@ -1462,6 +1805,121 @@ public Builder clearSampleRateHertz() {
       return this;
     }
 
+    private int audioChannelCount_ ;
+    /**
+     * 
    +     * *Optional* The number of channels in the input audio data.
+     * ONLY set this for MULTI-CHANNEL recognition.
+     * Valid values for LINEAR16 and FLAC are `1`-`8`.
+     * Valid values for OGG_OPUS are '1'-'254'.
+     * Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`.
+     * If `0` or omitted, defaults to one channel (mono).
+     * NOTE: We only recognize the first channel by default.
+     * To perform independent recognition on each channel set
+     * enable_separate_recognition_per_channel to 'true'.
+     * 
    
+     *
+     * int32 audio_channel_count = 7;
+     */
+    public int getAudioChannelCount() {
+      return audioChannelCount_;
+    }
+    /**
+     * 
    +     * *Optional* The number of channels in the input audio data.
+     * ONLY set this for MULTI-CHANNEL recognition.
+     * Valid values for LINEAR16 and FLAC are `1`-`8`.
+     * Valid values for OGG_OPUS are '1'-'254'.
+     * Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`.
+     * If `0` or omitted, defaults to one channel (mono).
+     * NOTE: We only recognize the first channel by default.
+     * To perform independent recognition on each channel set
+     * enable_separate_recognition_per_channel to 'true'.
+     * 
    
+     *
+     * int32 audio_channel_count = 7;
+     */
+    public Builder setAudioChannelCount(int value) {
+      
+      audioChannelCount_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * *Optional* The number of channels in the input audio data.
+     * ONLY set this for MULTI-CHANNEL recognition.
+     * Valid values for LINEAR16 and FLAC are `1`-`8`.
+     * Valid values for OGG_OPUS are '1'-'254'.
+     * Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`.
+     * If `0` or omitted, defaults to one channel (mono).
+     * NOTE: We only recognize the first channel by default.
+     * To perform independent recognition on each channel set
+     * enable_separate_recognition_per_channel to 'true'.
+     * 
    
+     *
+     * int32 audio_channel_count = 7;
+     */
+    public Builder clearAudioChannelCount() {
+      
+      audioChannelCount_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private boolean enableSeparateRecognitionPerChannel_ ;
+    /**
+     * 
    +     * This needs to be set to ‘true’ explicitly and audio_channel_count > 1
+     * to get each channel recognized separately. The recognition result will
+     * contain a channel_tag field to state which channel that result belongs to.
+     * If this is not ‘true’, we will only recognize the first channel.
+     * NOTE: The request is also billed cumulatively for all channels recognized:
+     *     (audio_channel_count times the audio length)
+     * 
    
+     *
+     * bool enable_separate_recognition_per_channel = 12;
+     */
+    public boolean getEnableSeparateRecognitionPerChannel() {
+      return enableSeparateRecognitionPerChannel_;
+    }
+    /**
+     * 
    +     * This needs to be set to ‘true’ explicitly and audio_channel_count > 1
+     * to get each channel recognized separately. The recognition result will
+     * contain a channel_tag field to state which channel that result belongs to.
+     * If this is not ‘true’, we will only recognize the first channel.
+     * NOTE: The request is also billed cumulatively for all channels recognized:
+     *     (audio_channel_count times the audio length)
+     * 
    
+     *
+     * bool enable_separate_recognition_per_channel = 12;
+     */
+    public Builder setEnableSeparateRecognitionPerChannel(boolean value) {
+      
+      enableSeparateRecognitionPerChannel_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * This needs to be set to ‘true’ explicitly and audio_channel_count > 1
+     * to get each channel recognized separately. The recognition result will
+     * contain a channel_tag field to state which channel that result belongs to.
+     * If this is not ‘true’, we will only recognize the first channel.
+     * NOTE: The request is also billed cumulatively for all channels recognized:
+     *     (audio_channel_count times the audio length)
+     * 
    
+     *
+     * bool enable_separate_recognition_per_channel = 12;
+     */
+    public Builder clearEnableSeparateRecognitionPerChannel() {
+      
+      enableSeparateRecognitionPerChannel_ = false;
+      onChanged();
+      return this;
+    }
+
     private java.lang.Object languageCode_ = "";
     /**
      * 
    @@ -1571,6 +2029,235 @@ public Builder setLanguageCodeBytes(
       return this;
     }
 
+    private com.google.protobuf.LazyStringList alternativeLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensureAlternativeLanguageCodesIsMutable() {
+      if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+        alternativeLanguageCodes_ = new com.google.protobuf.LazyStringArrayList(alternativeLanguageCodes_);
+        bitField0_ |= 0x00000020;
+       }
+    }
+    /**
+     * 
    +     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
    
+     *
+     * repeated string alternative_language_codes = 18;
+     */
+    public com.google.protobuf.ProtocolStringList
+        getAlternativeLanguageCodesList() {
+      return alternativeLanguageCodes_.getUnmodifiableView();
+    }
+    /**
+     * 
    +     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
    
+     *
+     * repeated string alternative_language_codes = 18;
+     */
+    public int getAlternativeLanguageCodesCount() {
+      return alternativeLanguageCodes_.size();
+    }
+    /**
+     * 
    +     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
    
+     *
+     * repeated string alternative_language_codes = 18;
+     */
+    public java.lang.String getAlternativeLanguageCodes(int index) {
+      return alternativeLanguageCodes_.get(index);
+    }
+    /**
+     * 
    +     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
    
+     *
+     * repeated string alternative_language_codes = 18;
+     */
+    public com.google.protobuf.ByteString
+        getAlternativeLanguageCodesBytes(int index) {
+      return alternativeLanguageCodes_.getByteString(index);
+    }
+    /**
+     * 
    +     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
    
+     *
+     * repeated string alternative_language_codes = 18;
+     */
+    public Builder setAlternativeLanguageCodes(
+        int index, java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureAlternativeLanguageCodesIsMutable();
+      alternativeLanguageCodes_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
    
+     *
+     * repeated string alternative_language_codes = 18;
+     */
+    public Builder addAlternativeLanguageCodes(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureAlternativeLanguageCodesIsMutable();
+      alternativeLanguageCodes_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
    
+     *
+     * repeated string alternative_language_codes = 18;
+     */
+    public Builder addAllAlternativeLanguageCodes(
+        java.lang.Iterable values) {
+      ensureAlternativeLanguageCodesIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, alternativeLanguageCodes_);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
    
+     *
+     * repeated string alternative_language_codes = 18;
+     */
+    public Builder clearAlternativeLanguageCodes() {
+      alternativeLanguageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000020);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * *Optional* A list of up to 3 additional
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+     * listing possible alternative languages of the supplied audio.
+     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * for a list of the currently supported language codes.
+     * If alternative languages are listed, recognition result will contain
+     * recognition in the most likely language detected including the main
+     * language_code. The recognition result will include the language tag
+     * of the language detected in the audio.
+     * NOTE: This feature is only supported for Voice Command and Voice Search
+     * use cases and performance may vary for other use cases (e.g., phone call
+     * transcription).
+     * 
    
+     *
+     * repeated string alternative_language_codes = 18;
+     */
+    public Builder addAlternativeLanguageCodesBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      ensureAlternativeLanguageCodesIsMutable();
+      alternativeLanguageCodes_.add(value);
+      onChanged();
+      return this;
+    }
+
     private int maxAlternatives_ ;
     /**
      * 
    @@ -1674,9 +2361,9 @@ public Builder clearProfanityFilter() {
     private java.util.List speechContexts_ =
       java.util.Collections.emptyList();
     private void ensureSpeechContextsIsMutable() {
-      if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+      if (!((bitField0_ & 0x00000100) == 0x00000100)) {
         speechContexts_ = new java.util.ArrayList(speechContexts_);
-        bitField0_ |= 0x00000020;
+        bitField0_ |= 0x00000100;
        }
     }
 
@@ -1870,7 +2557,7 @@ public Builder addAllSpeechContexts(
     public Builder clearSpeechContexts() {
       if (speechContextsBuilder_ == null) {
         speechContexts_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
+        bitField0_ = (bitField0_ & ~0x00000100);
         onChanged();
       } else {
         speechContextsBuilder_.clear();
@@ -1975,7 +2662,7 @@ public com.google.cloud.speech.v1p1beta1.SpeechContext.Builder addSpeechContexts
         speechContextsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
             com.google.cloud.speech.v1p1beta1.SpeechContext, com.google.cloud.speech.v1p1beta1.SpeechContext.Builder, com.google.cloud.speech.v1p1beta1.SpeechContextOrBuilder>(
                 speechContexts_,
-                ((bitField0_ & 0x00000020) == 0x00000020),
+                ((bitField0_ & 0x00000100) == 0x00000100),
                 getParentForChildren(),
                 isClean());
         speechContexts_ = null;
@@ -2030,6 +2717,50 @@ public Builder clearEnableWordTimeOffsets() {
       return this;
     }
 
+    private boolean enableWordConfidence_ ;
+    /**
+     * 
    +     * *Optional* If `true`, the top result includes a list of words and the
+     * confidence for those words. If `false`, no word-level confidence
+     * information is returned. The default is `false`.
+     * 
    
+     *
+     * bool enable_word_confidence = 15;
+     */
+    public boolean getEnableWordConfidence() {
+      return enableWordConfidence_;
+    }
+    /**
+     * 
    +     * *Optional* If `true`, the top result includes a list of words and the
+     * confidence for those words. If `false`, no word-level confidence
+     * information is returned. The default is `false`.
+     * 
    
+     *
+     * bool enable_word_confidence = 15;
+     */
+    public Builder setEnableWordConfidence(boolean value) {
+      
+      enableWordConfidence_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * *Optional* If `true`, the top result includes a list of words and the
+     * confidence for those words. If `false`, no word-level confidence
+     * information is returned. The default is `false`.
+     * 
    
+     *
+     * bool enable_word_confidence = 15;
+     */
+    public Builder clearEnableWordConfidence() {
+      
+      enableWordConfidence_ = false;
+      onChanged();
+      return this;
+    }
+
     private boolean enableAutomaticPunctuation_ ;
     /**
      * 
    @@ -2086,6 +2817,109 @@ public Builder clearEnableAutomaticPunctuation() {
       return this;
     }
 
+    private boolean enableSpeakerDiarization_ ;
+    /**
+     * 
    +     * *Optional* If 'true', enables speaker detection for each recognized word in
+     * the top alternative of the recognition result using a speaker_tag provided
+     * in the WordInfo.
+     * Note: When this is true, we send all the words from the beginning of the
+     * audio for the top alternative in every consecutive responses.
+     * This is done in order to improve our speaker tags as our models learn to
+     * identify the speakers in the conversation over time.
+     * 
    
+     *
+     * bool enable_speaker_diarization = 16;
+     */
+    public boolean getEnableSpeakerDiarization() {
+      return enableSpeakerDiarization_;
+    }
+    /**
+     * 
    +     * *Optional* If 'true', enables speaker detection for each recognized word in
+     * the top alternative of the recognition result using a speaker_tag provided
+     * in the WordInfo.
+     * Note: When this is true, we send all the words from the beginning of the
+     * audio for the top alternative in every consecutive responses.
+     * This is done in order to improve our speaker tags as our models learn to
+     * identify the speakers in the conversation over time.
+     * 
    
+     *
+     * bool enable_speaker_diarization = 16;
+     */
+    public Builder setEnableSpeakerDiarization(boolean value) {
+      
+      enableSpeakerDiarization_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * *Optional* If 'true', enables speaker detection for each recognized word in
+     * the top alternative of the recognition result using a speaker_tag provided
+     * in the WordInfo.
+     * Note: When this is true, we send all the words from the beginning of the
+     * audio for the top alternative in every consecutive responses.
+     * This is done in order to improve our speaker tags as our models learn to
+     * identify the speakers in the conversation over time.
+     * 
    
+     *
+     * bool enable_speaker_diarization = 16;
+     */
+    public Builder clearEnableSpeakerDiarization() {
+      
+      enableSpeakerDiarization_ = false;
+      onChanged();
+      return this;
+    }
+
+    private int diarizationSpeakerCount_ ;
+    /**
+     * 
    +     * *Optional*
+     * If set, specifies the estimated number of speakers in the conversation.
+     * If not set, defaults to '2'.
+     * Ignored unless enable_speaker_diarization is set to true."
+     * 
    
+     *
+     * int32 diarization_speaker_count = 17;
+     */
+    public int getDiarizationSpeakerCount() {
+      return diarizationSpeakerCount_;
+    }
+    /**
+     * 
    +     * *Optional*
+     * If set, specifies the estimated number of speakers in the conversation.
+     * If not set, defaults to '2'.
+     * Ignored unless enable_speaker_diarization is set to true."
+     * 
    
+     *
+     * int32 diarization_speaker_count = 17;
+     */
+    public Builder setDiarizationSpeakerCount(int value) {
+      
+      diarizationSpeakerCount_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * *Optional*
+     * If set, specifies the estimated number of speakers in the conversation.
+     * If not set, defaults to '2'.
+     * Ignored unless enable_speaker_diarization is set to true."
+     * 
    
+     *
+     * int32 diarization_speaker_count = 17;
+     */
+    public Builder clearDiarizationSpeakerCount() {
+      
+      diarizationSpeakerCount_ = 0;
+      onChanged();
+      return this;
+    }
+
     private com.google.cloud.speech.v1p1beta1.RecognitionMetadata metadata_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
         com.google.cloud.speech.v1p1beta1.RecognitionMetadata, com.google.cloud.speech.v1p1beta1.RecognitionMetadata.Builder, com.google.cloud.speech.v1p1beta1.RecognitionMetadataOrBuilder> metadataBuilder_;
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfigOrBuilder.java
index 91c355cfa3fc..31216fcceb26 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfigOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfigOrBuilder.java
@@ -43,6 +43,37 @@ public interface RecognitionConfigOrBuilder extends
    */
   int getSampleRateHertz();
 
+  /**
+   * 
    +   * *Optional* The number of channels in the input audio data.
+   * ONLY set this for MULTI-CHANNEL recognition.
+   * Valid values for LINEAR16 and FLAC are `1`-`8`.
+   * Valid values for OGG_OPUS are '1'-'254'.
+   * Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`.
+   * If `0` or omitted, defaults to one channel (mono).
+   * NOTE: We only recognize the first channel by default.
+   * To perform independent recognition on each channel set
+   * enable_separate_recognition_per_channel to 'true'.
+   * 
    
+   *
+   * int32 audio_channel_count = 7;
+   */
+  int getAudioChannelCount();
+
+  /**
+   * 
    +   * This needs to be set to ‘true’ explicitly and audio_channel_count > 1
+   * to get each channel recognized separately. The recognition result will
+   * contain a channel_tag field to state which channel that result belongs to.
+   * If this is not ‘true’, we will only recognize the first channel.
+   * NOTE: The request is also billed cumulatively for all channels recognized:
+   *     (audio_channel_count times the audio length)
+   * 
    
+   *
+   * bool enable_separate_recognition_per_channel = 12;
+   */
+  boolean getEnableSeparateRecognitionPerChannel();
+
   /**
    * 
        * *Required* The language of the supplied audio as a
@@ -69,6 +100,85 @@ public interface RecognitionConfigOrBuilder extends
   com.google.protobuf.ByteString
       getLanguageCodeBytes();
 
+  /**
+   * 
    +   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
    
+   *
+   * repeated string alternative_language_codes = 18;
+   */
+  java.util.List
+      getAlternativeLanguageCodesList();
+  /**
+   * 
    +   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
    
+   *
+   * repeated string alternative_language_codes = 18;
+   */
+  int getAlternativeLanguageCodesCount();
+  /**
+   * 
    +   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
    
+   *
+   * repeated string alternative_language_codes = 18;
+   */
+  java.lang.String getAlternativeLanguageCodes(int index);
+  /**
+   * 
    +   * *Optional* A list of up to 3 additional
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+   * listing possible alternative languages of the supplied audio.
+   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * for a list of the currently supported language codes.
+   * If alternative languages are listed, recognition result will contain
+   * recognition in the most likely language detected including the main
+   * language_code. The recognition result will include the language tag
+   * of the language detected in the audio.
+   * NOTE: This feature is only supported for Voice Command and Voice Search
+   * use cases and performance may vary for other use cases (e.g., phone call
+   * transcription).
+   * 
    
+   *
+   * repeated string alternative_language_codes = 18;
+   */
+  com.google.protobuf.ByteString
+      getAlternativeLanguageCodesBytes(int index);
+
   /**
    * 
        * *Optional* Maximum number of recognition hypotheses to be returned.
@@ -151,6 +261,17 @@ com.google.cloud.speech.v1p1beta1.SpeechContextOrBuilder getSpeechContextsOrBuil
    */
   boolean getEnableWordTimeOffsets();
 
+  /**
+   * 
    +   * *Optional* If `true`, the top result includes a list of words and the
+   * confidence for those words. If `false`, no word-level confidence
+   * information is returned. The default is `false`.
+   * 
    
+   *
+   * bool enable_word_confidence = 15;
+   */
+  boolean getEnableWordConfidence();
+
   /**
    * 
        * *Optional* If 'true', adds punctuation to recognition result hypotheses.
@@ -166,6 +287,33 @@ com.google.cloud.speech.v1p1beta1.SpeechContextOrBuilder getSpeechContextsOrBuil
    */
   boolean getEnableAutomaticPunctuation();
 
+  /**
+   * 
    +   * *Optional* If 'true', enables speaker detection for each recognized word in
+   * the top alternative of the recognition result using a speaker_tag provided
+   * in the WordInfo.
+   * Note: When this is true, we send all the words from the beginning of the
+   * audio for the top alternative in every consecutive responses.
+   * This is done in order to improve our speaker tags as our models learn to
+   * identify the speakers in the conversation over time.
+   * 
    
+   *
+   * bool enable_speaker_diarization = 16;
+   */
+  boolean getEnableSpeakerDiarization();
+
+  /**
+   * 
    +   * *Optional*
+   * If set, specifies the estimated number of speakers in the conversation.
+   * If not set, defaults to '2'.
+   * Ignored unless enable_speaker_diarization is set to true."
+   * 
    
+   *
+   * int32 diarization_speaker_count = 17;
+   */
+  int getDiarizationSpeakerCount();
+
   /**
    * 
        * *Optional* Metadata regarding this request.
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechProto.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechProto.java
index 2b7a093fd995..f64d1ab6b196 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechProto.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechProto.java
@@ -125,97 +125,106 @@ public static void registerAllExtensions(
       "nitionConfig\022@\n\006config\030\001 \001(\01320.google.cl" +
       "oud.speech.v1p1beta1.RecognitionConfig\022\030" +
       "\n\020single_utterance\030\002 \001(\010\022\027\n\017interim_resu" +
-      "lts\030\003 \001(\010\"\323\004\n\021RecognitionConfig\022P\n\010encod" +
+      "lts\030\003 \001(\010\"\254\006\n\021RecognitionConfig\022P\n\010encod" +
       "ing\030\001 \001(\0162>.google.cloud.speech.v1p1beta" +
       "1.RecognitionConfig.AudioEncoding\022\031\n\021sam" +
-      "ple_rate_hertz\030\002 \001(\005\022\025\n\rlanguage_code\030\003 " +
-      "\001(\t\022\030\n\020max_alternatives\030\004 \001(\005\022\030\n\020profani" +
-      "ty_filter\030\005 \001(\010\022E\n\017speech_contexts\030\006 \003(\013" +
-      "2,.google.cloud.speech.v1p1beta1.SpeechC" +
-      "ontext\022 \n\030enable_word_time_offsets\030\010 \001(\010" +
-      "\022$\n\034enable_automatic_punctuation\030\013 \001(\010\022D" +
-      "\n\010metadata\030\t \001(\01322.google.cloud.speech.v" +
-      "1p1beta1.RecognitionMetadata\022\r\n\005model\030\r " +
-      "\001(\t\022\024\n\014use_enhanced\030\016 \001(\010\"\213\001\n\rAudioEncod" +
-      "ing\022\030\n\024ENCODING_UNSPECIFIED\020\000\022\014\n\010LINEAR1" +
-      "6\020\001\022\010\n\004FLAC\020\002\022\t\n\005MULAW\020\003\022\007\n\003AMR\020\004\022\n\n\006AMR" +
-      "_WB\020\005\022\014\n\010OGG_OPUS\020\006\022\032\n\026SPEEX_WITH_HEADER" +
-      "_BYTE\020\007\"\323\010\n\023RecognitionMetadata\022\\\n\020inter" +
-      "action_type\030\001 \001(\0162B.google.cloud.speech." +
-      "v1p1beta1.RecognitionMetadata.Interactio" +
-      "nType\022$\n\034industry_naics_code_of_audio\030\003 " +
-      "\001(\r\022b\n\023microphone_distance\030\004 \001(\0162E.googl" +
-      "e.cloud.speech.v1p1beta1.RecognitionMeta" +
-      "data.MicrophoneDistance\022a\n\023original_medi" +
-      "a_type\030\005 \001(\0162D.google.cloud.speech.v1p1b" +
-      "eta1.RecognitionMetadata.OriginalMediaTy" +
-      "pe\022e\n\025recording_device_type\030\006 \001(\0162F.goog" +
+      "ple_rate_hertz\030\002 \001(\005\022\033\n\023audio_channel_co" +
+      "unt\030\007 \001(\005\022/\n\'enable_separate_recognition" +
+      "_per_channel\030\014 \001(\010\022\025\n\rlanguage_code\030\003 \001(" +
+      "\t\022\"\n\032alternative_language_codes\030\022 \003(\t\022\030\n" +
+      "\020max_alternatives\030\004 \001(\005\022\030\n\020profanity_fil" +
+      "ter\030\005 \001(\010\022E\n\017speech_contexts\030\006 \003(\0132,.goo" +
+      "gle.cloud.speech.v1p1beta1.SpeechContext" +
+      "\022 \n\030enable_word_time_offsets\030\010 \001(\010\022\036\n\026en" +
+      "able_word_confidence\030\017 \001(\010\022$\n\034enable_aut" +
+      "omatic_punctuation\030\013 \001(\010\022\"\n\032enable_speak" +
+      "er_diarization\030\020 \001(\010\022!\n\031diarization_spea" +
+      "ker_count\030\021 \001(\005\022D\n\010metadata\030\t \001(\01322.goog" +
       "le.cloud.speech.v1p1beta1.RecognitionMet" +
-      "adata.RecordingDeviceType\022\035\n\025recording_d" +
-      "evice_name\030\007 \001(\t\022\032\n\022original_mime_type\030\010" +
-      " \001(\t\022\025\n\robfuscated_id\030\t \001(\003\022\023\n\013audio_top" +
-      "ic\030\n \001(\t\"\305\001\n\017InteractionType\022 \n\034INTERACT" +
-      "ION_TYPE_UNSPECIFIED\020\000\022\016\n\nDISCUSSION\020\001\022\020" +
-      "\n\014PRESENTATION\020\002\022\016\n\nPHONE_CALL\020\003\022\r\n\tVOIC" +
-      "EMAIL\020\004\022\033\n\027PROFESSIONALLY_PRODUCED\020\005\022\020\n\014" +
-      "VOICE_SEARCH\020\006\022\021\n\rVOICE_COMMAND\020\007\022\r\n\tDIC" +
-      "TATION\020\010\"d\n\022MicrophoneDistance\022#\n\037MICROP" +
-      "HONE_DISTANCE_UNSPECIFIED\020\000\022\r\n\tNEARFIELD" +
-      "\020\001\022\014\n\010MIDFIELD\020\002\022\014\n\010FARFIELD\020\003\"N\n\021Origin" +
-      "alMediaType\022#\n\037ORIGINAL_MEDIA_TYPE_UNSPE" +
-      "CIFIED\020\000\022\t\n\005AUDIO\020\001\022\t\n\005VIDEO\020\002\"\244\001\n\023Recor" +
-      "dingDeviceType\022%\n!RECORDING_DEVICE_TYPE_" +
-      "UNSPECIFIED\020\000\022\016\n\nSMARTPHONE\020\001\022\006\n\002PC\020\002\022\016\n" +
-      "\nPHONE_LINE\020\003\022\013\n\007VEHICLE\020\004\022\030\n\024OTHER_OUTD" +
-      "OOR_DEVICE\020\005\022\027\n\023OTHER_INDOOR_DEVICE\020\006\" \n" +
-      "\rSpeechContext\022\017\n\007phrases\030\001 \003(\t\"D\n\020Recog" +
-      "nitionAudio\022\021\n\007content\030\001 \001(\014H\000\022\r\n\003uri\030\002 " +
-      "\001(\tH\000B\016\n\014audio_source\"\\\n\021RecognizeRespon" +
-      "se\022G\n\007results\030\002 \003(\01326.google.cloud.speec" +
-      "h.v1p1beta1.SpeechRecognitionResult\"g\n\034L" +
-      "ongRunningRecognizeResponse\022G\n\007results\030\002" +
-      " \003(\01326.google.cloud.speech.v1p1beta1.Spe" +
-      "echRecognitionResult\"\236\001\n\034LongRunningReco" +
-      "gnizeMetadata\022\030\n\020progress_percent\030\001 \001(\005\022" +
-      ".\n\nstart_time\030\002 \001(\0132\032.google.protobuf.Ti" +
-      "mestamp\0224\n\020last_update_time\030\003 \001(\0132\032.goog" +
-      "le.protobuf.Timestamp\"\277\002\n\032StreamingRecog" +
-      "nizeResponse\022!\n\005error\030\001 \001(\0132\022.google.rpc" +
-      ".Status\022J\n\007results\030\002 \003(\01329.google.cloud." +
-      "speech.v1p1beta1.StreamingRecognitionRes" +
-      "ult\022d\n\021speech_event_type\030\004 \001(\0162I.google." +
-      "cloud.speech.v1p1beta1.StreamingRecogniz" +
-      "eResponse.SpeechEventType\"L\n\017SpeechEvent" +
-      "Type\022\034\n\030SPEECH_EVENT_UNSPECIFIED\020\000\022\033\n\027EN" +
-      "D_OF_SINGLE_UTTERANCE\020\001\"\224\001\n\032StreamingRec" +
-      "ognitionResult\022Q\n\014alternatives\030\001 \003(\0132;.g" +
+      "adata\022\r\n\005model\030\r \001(\t\022\024\n\014use_enhanced\030\016 \001" +
+      "(\010\"\213\001\n\rAudioEncoding\022\030\n\024ENCODING_UNSPECI" +
+      "FIED\020\000\022\014\n\010LINEAR16\020\001\022\010\n\004FLAC\020\002\022\t\n\005MULAW\020" +
+      "\003\022\007\n\003AMR\020\004\022\n\n\006AMR_WB\020\005\022\014\n\010OGG_OPUS\020\006\022\032\n\026" +
+      "SPEEX_WITH_HEADER_BYTE\020\007\"\323\010\n\023Recognition" +
+      "Metadata\022\\\n\020interaction_type\030\001 \001(\0162B.goo" +
+      "gle.cloud.speech.v1p1beta1.RecognitionMe" +
+      "tadata.InteractionType\022$\n\034industry_naics" +
+      "_code_of_audio\030\003 \001(\r\022b\n\023microphone_dista" +
+      "nce\030\004 \001(\0162E.google.cloud.speech.v1p1beta" +
+      "1.RecognitionMetadata.MicrophoneDistance" +
+      "\022a\n\023original_media_type\030\005 \001(\0162D.google.c" +
+      "loud.speech.v1p1beta1.RecognitionMetadat" +
+      "a.OriginalMediaType\022e\n\025recording_device_" +
+      "type\030\006 \001(\0162F.google.cloud.speech.v1p1bet" +
+      "a1.RecognitionMetadata.RecordingDeviceTy" +
+      "pe\022\035\n\025recording_device_name\030\007 \001(\t\022\032\n\022ori" +
+      "ginal_mime_type\030\010 \001(\t\022\025\n\robfuscated_id\030\t" +
+      " \001(\003\022\023\n\013audio_topic\030\n \001(\t\"\305\001\n\017Interactio" +
+      "nType\022 \n\034INTERACTION_TYPE_UNSPECIFIED\020\000\022" +
+      "\016\n\nDISCUSSION\020\001\022\020\n\014PRESENTATION\020\002\022\016\n\nPHO" +
+      "NE_CALL\020\003\022\r\n\tVOICEMAIL\020\004\022\033\n\027PROFESSIONAL" +
+      "LY_PRODUCED\020\005\022\020\n\014VOICE_SEARCH\020\006\022\021\n\rVOICE" +
+      "_COMMAND\020\007\022\r\n\tDICTATION\020\010\"d\n\022MicrophoneD" +
+      "istance\022#\n\037MICROPHONE_DISTANCE_UNSPECIFI" +
+      "ED\020\000\022\r\n\tNEARFIELD\020\001\022\014\n\010MIDFIELD\020\002\022\014\n\010FAR" +
+      "FIELD\020\003\"N\n\021OriginalMediaType\022#\n\037ORIGINAL" +
+      "_MEDIA_TYPE_UNSPECIFIED\020\000\022\t\n\005AUDIO\020\001\022\t\n\005" +
+      "VIDEO\020\002\"\244\001\n\023RecordingDeviceType\022%\n!RECOR" +
+      "DING_DEVICE_TYPE_UNSPECIFIED\020\000\022\016\n\nSMARTP" +
+      "HONE\020\001\022\006\n\002PC\020\002\022\016\n\nPHONE_LINE\020\003\022\013\n\007VEHICL" +
+      "E\020\004\022\030\n\024OTHER_OUTDOOR_DEVICE\020\005\022\027\n\023OTHER_I" +
+      "NDOOR_DEVICE\020\006\" \n\rSpeechContext\022\017\n\007phras" +
+      "es\030\001 \003(\t\"D\n\020RecognitionAudio\022\021\n\007content\030" +
+      "\001 \001(\014H\000\022\r\n\003uri\030\002 \001(\tH\000B\016\n\014audio_source\"\\" +
+      "\n\021RecognizeResponse\022G\n\007results\030\002 \003(\01326.g" +
       "oogle.cloud.speech.v1p1beta1.SpeechRecog" +
-      "nitionAlternative\022\020\n\010is_final\030\002 \001(\010\022\021\n\ts" +
-      "tability\030\003 \001(\002\"l\n\027SpeechRecognitionResul" +
-      "t\022Q\n\014alternatives\030\001 \003(\0132;.google.cloud.s" +
-      "peech.v1p1beta1.SpeechRecognitionAlterna" +
-      "tive\"~\n\034SpeechRecognitionAlternative\022\022\n\n" +
-      "transcript\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\0226\n\005" +
-      "words\030\003 \003(\0132\'.google.cloud.speech.v1p1be" +
-      "ta1.WordInfo\"t\n\010WordInfo\022-\n\nstart_time\030\001" +
-      " \001(\0132\031.google.protobuf.Duration\022+\n\010end_t" +
-      "ime\030\002 \001(\0132\031.google.protobuf.Duration\022\014\n\004" +
-      "word\030\003 \001(\t2\330\003\n\006Speech\022\226\001\n\tRecognize\022/.go" +
-      "ogle.cloud.speech.v1p1beta1.RecognizeReq" +
-      "uest\0320.google.cloud.speech.v1p1beta1.Rec" +
-      "ognizeResponse\"&\202\323\344\223\002 \"\033/v1p1beta1/speec" +
-      "h:recognize:\001*\022\244\001\n\024LongRunningRecognize\022" +
-      ":.google.cloud.speech.v1p1beta1.LongRunn" +
-      "ingRecognizeRequest\032\035.google.longrunning" +
-      ".Operation\"1\202\323\344\223\002+\"&/v1p1beta1/speech:lo" +
-      "ngrunningrecognize:\001*\022\215\001\n\022StreamingRecog" +
-      "nize\0228.google.cloud.speech.v1p1beta1.Str" +
-      "eamingRecognizeRequest\0329.google.cloud.sp" +
-      "eech.v1p1beta1.StreamingRecognizeRespons" +
-      "e(\0010\001Bz\n!com.google.cloud.speech.v1p1bet" +
-      "a1B\013SpeechProtoP\001ZCgoogle.golang.org/gen" +
-      "proto/googleapis/cloud/speech/v1p1beta1;" +
-      "speech\370\001\001b\006proto3"
+      "nitionResult\"g\n\034LongRunningRecognizeResp" +
+      "onse\022G\n\007results\030\002 \003(\01326.google.cloud.spe" +
+      "ech.v1p1beta1.SpeechRecognitionResult\"\236\001" +
+      "\n\034LongRunningRecognizeMetadata\022\030\n\020progre" +
+      "ss_percent\030\001 \001(\005\022.\n\nstart_time\030\002 \001(\0132\032.g" +
+      "oogle.protobuf.Timestamp\0224\n\020last_update_" +
+      "time\030\003 \001(\0132\032.google.protobuf.Timestamp\"\277" +
+      "\002\n\032StreamingRecognizeResponse\022!\n\005error\030\001" +
+      " \001(\0132\022.google.rpc.Status\022J\n\007results\030\002 \003(" +
+      "\01329.google.cloud.speech.v1p1beta1.Stream" +
+      "ingRecognitionResult\022d\n\021speech_event_typ" +
+      "e\030\004 \001(\0162I.google.cloud.speech.v1p1beta1." +
+      "StreamingRecognizeResponse.SpeechEventTy" +
+      "pe\"L\n\017SpeechEventType\022\034\n\030SPEECH_EVENT_UN" +
+      "SPECIFIED\020\000\022\033\n\027END_OF_SINGLE_UTTERANCE\020\001" +
+      "\"\300\001\n\032StreamingRecognitionResult\022Q\n\014alter" +
+      "natives\030\001 \003(\0132;.google.cloud.speech.v1p1" +
+      "beta1.SpeechRecognitionAlternative\022\020\n\010is" +
+      "_final\030\002 \001(\010\022\021\n\tstability\030\003 \001(\002\022\023\n\013chann" +
+      "el_tag\030\005 \001(\005\022\025\n\rlanguage_code\030\006 \001(\t\"\230\001\n\027" +
+      "SpeechRecognitionResult\022Q\n\014alternatives\030" +
+      "\001 \003(\0132;.google.cloud.speech.v1p1beta1.Sp" +
+      "eechRecognitionAlternative\022\023\n\013channel_ta" +
+      "g\030\002 \001(\005\022\025\n\rlanguage_code\030\005 \001(\t\"~\n\034Speech" +
+      "RecognitionAlternative\022\022\n\ntranscript\030\001 \001" +
+      "(\t\022\022\n\nconfidence\030\002 \001(\002\0226\n\005words\030\003 \003(\0132\'." +
+      "google.cloud.speech.v1p1beta1.WordInfo\"\235" +
+      "\001\n\010WordInfo\022-\n\nstart_time\030\001 \001(\0132\031.google" +
+      ".protobuf.Duration\022+\n\010end_time\030\002 \001(\0132\031.g" +
+      "oogle.protobuf.Duration\022\014\n\004word\030\003 \001(\t\022\022\n" +
+      "\nconfidence\030\004 \001(\002\022\023\n\013speaker_tag\030\005 \001(\0052\330" +
+      "\003\n\006Speech\022\226\001\n\tRecognize\022/.google.cloud.s" +
+      "peech.v1p1beta1.RecognizeRequest\0320.googl" +
+      "e.cloud.speech.v1p1beta1.RecognizeRespon" +
+      "se\"&\202\323\344\223\002 \"\033/v1p1beta1/speech:recognize:" +
+      "\001*\022\244\001\n\024LongRunningRecognize\022:.google.clo" +
+      "ud.speech.v1p1beta1.LongRunningRecognize" +
+      "Request\032\035.google.longrunning.Operation\"1" +
+      "\202\323\344\223\002+\"&/v1p1beta1/speech:longrunningrec" +
+      "ognize:\001*\022\215\001\n\022StreamingRecognize\0228.googl" +
+      "e.cloud.speech.v1p1beta1.StreamingRecogn" +
+      "izeRequest\0329.google.cloud.speech.v1p1bet" +
+      "a1.StreamingRecognizeResponse(\0010\001Bz\n!com" +
+      ".google.cloud.speech.v1p1beta1B\013SpeechPr" +
+      "otoP\001ZCgoogle.golang.org/genproto/google" +
+      "apis/cloud/speech/v1p1beta1;speech\370\001\001b\006p" +
+      "roto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -264,7 +273,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_google_cloud_speech_v1p1beta1_RecognitionConfig_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_cloud_speech_v1p1beta1_RecognitionConfig_descriptor,
-        new java.lang.String[] { "Encoding", "SampleRateHertz", "LanguageCode", "MaxAlternatives", "ProfanityFilter", "SpeechContexts", "EnableWordTimeOffsets", "EnableAutomaticPunctuation", "Metadata", "Model", "UseEnhanced", });
+        new java.lang.String[] { "Encoding", "SampleRateHertz", "AudioChannelCount", "EnableSeparateRecognitionPerChannel", "LanguageCode", "AlternativeLanguageCodes", "MaxAlternatives", "ProfanityFilter", "SpeechContexts", "EnableWordTimeOffsets", "EnableWordConfidence", "EnableAutomaticPunctuation", "EnableSpeakerDiarization", "DiarizationSpeakerCount", "Metadata", "Model", "UseEnhanced", });
     internal_static_google_cloud_speech_v1p1beta1_RecognitionMetadata_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_google_cloud_speech_v1p1beta1_RecognitionMetadata_fieldAccessorTable = new
@@ -312,13 +321,13 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionResult_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionResult_descriptor,
-        new java.lang.String[] { "Alternatives", "IsFinal", "Stability", });
+        new java.lang.String[] { "Alternatives", "IsFinal", "Stability", "ChannelTag", "LanguageCode", });
     internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionResult_descriptor =
       getDescriptor().getMessageTypes().get(13);
     internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionResult_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionResult_descriptor,
-        new java.lang.String[] { "Alternatives", });
+        new java.lang.String[] { "Alternatives", "ChannelTag", "LanguageCode", });
     internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionAlternative_descriptor =
       getDescriptor().getMessageTypes().get(14);
     internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionAlternative_fieldAccessorTable = new
@@ -330,7 +339,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_google_cloud_speech_v1p1beta1_WordInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_google_cloud_speech_v1p1beta1_WordInfo_descriptor,
-        new java.lang.String[] { "StartTime", "EndTime", "Word", });
+        new java.lang.String[] { "StartTime", "EndTime", "Word", "Confidence", "SpeakerTag", });
     com.google.protobuf.ExtensionRegistry registry =
         com.google.protobuf.ExtensionRegistry.newInstance();
     registry.add(com.google.api.AnnotationsProto.http);
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java
index 25cba65956ec..6d356b420a88 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java
@@ -21,6 +21,8 @@ private SpeechRecognitionResult(com.google.protobuf.GeneratedMessageV3.Builder alternatives_;
   /**
@@ -160,6 +174,69 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternativeOrBuilder g
     return alternatives_.get(index);
   }
 
+  public static final int CHANNEL_TAG_FIELD_NUMBER = 2;
+  private int channelTag_;
+  /**
+   * 
    +   * For multi-channel audio, this is the channel number corresponding to the
+   * recognized result for the audio from that channel.
+   * For audio_channel_count = N, its output values can range from '1' to 'N'.
+   * 
    
+   *
+   * int32 channel_tag = 2;
+   */
+  public int getChannelTag() {
+    return channelTag_;
+  }
+
+  public static final int LANGUAGE_CODE_FIELD_NUMBER = 5;
+  private volatile java.lang.Object languageCode_;
+  /**
+   * 
    +   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
    
+   *
+   * string language_code = 5;
+   */
+  public java.lang.String getLanguageCode() {
+    java.lang.Object ref = languageCode_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      languageCode_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
    +   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
    
+   *
+   * string language_code = 5;
+   */
+  public com.google.protobuf.ByteString
+      getLanguageCodeBytes() {
+    java.lang.Object ref = languageCode_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      languageCode_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -175,6 +252,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     for (int i = 0; i < alternatives_.size(); i++) {
       output.writeMessage(1, alternatives_.get(i));
     }
+    if (channelTag_ != 0) {
+      output.writeInt32(2, channelTag_);
+    }
+    if (!getLanguageCodeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 5, languageCode_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -187,6 +270,13 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, alternatives_.get(i));
     }
+    if (channelTag_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(2, channelTag_);
+    }
+    if (!getLanguageCodeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, languageCode_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -205,6 +295,10 @@ public boolean equals(final java.lang.Object obj) {
     boolean result = true;
     result = result && getAlternativesList()
         .equals(other.getAlternativesList());
+    result = result && (getChannelTag()
+        == other.getChannelTag());
+    result = result && getLanguageCode()
+        .equals(other.getLanguageCode());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -220,6 +314,10 @@ public int hashCode() {
       hash = (37 * hash) + ALTERNATIVES_FIELD_NUMBER;
       hash = (53 * hash) + getAlternativesList().hashCode();
     }
+    hash = (37 * hash) + CHANNEL_TAG_FIELD_NUMBER;
+    hash = (53 * hash) + getChannelTag();
+    hash = (37 * hash) + LANGUAGE_CODE_FIELD_NUMBER;
+    hash = (53 * hash) + getLanguageCode().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -360,6 +458,10 @@ public Builder clear() {
       } else {
         alternativesBuilder_.clear();
       }
+      channelTag_ = 0;
+
+      languageCode_ = "";
+
       return this;
     }
 
@@ -383,6 +485,7 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult build() {
     public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult buildPartial() {
       com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult result = new com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult(this);
       int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
       if (alternativesBuilder_ == null) {
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           alternatives_ = java.util.Collections.unmodifiableList(alternatives_);
@@ -392,6 +495,9 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult buildPartial()
       } else {
         result.alternatives_ = alternativesBuilder_.build();
       }
+      result.channelTag_ = channelTag_;
+      result.languageCode_ = languageCode_;
+      result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
@@ -459,6 +565,13 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.SpeechRecognitionResu
           }
         }
       }
+      if (other.getChannelTag() != 0) {
+        setChannelTag(other.getChannelTag());
+      }
+      if (!other.getLanguageCode().isEmpty()) {
+        languageCode_ = other.languageCode_;
+        onChanged();
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -852,6 +965,154 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative.Builder ad
       }
       return alternativesBuilder_;
     }
+
+    private int channelTag_ ;
+    /**
+     * 
    +     * For multi-channel audio, this is the channel number corresponding to the
+     * recognized result for the audio from that channel.
+     * For audio_channel_count = N, its output values can range from '1' to 'N'.
+     * 
    
+     *
+     * int32 channel_tag = 2;
+     */
+    public int getChannelTag() {
+      return channelTag_;
+    }
+    /**
+     * 
    +     * For multi-channel audio, this is the channel number corresponding to the
+     * recognized result for the audio from that channel.
+     * For audio_channel_count = N, its output values can range from '1' to 'N'.
+     * 
    
+     *
+     * int32 channel_tag = 2;
+     */
+    public Builder setChannelTag(int value) {
+      
+      channelTag_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * For multi-channel audio, this is the channel number corresponding to the
+     * recognized result for the audio from that channel.
+     * For audio_channel_count = N, its output values can range from '1' to 'N'.
+     * 
    
+     *
+     * int32 channel_tag = 2;
+     */
+    public Builder clearChannelTag() {
+      
+      channelTag_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object languageCode_ = "";
+    /**
+     * 
    +     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
    
+     *
+     * string language_code = 5;
+     */
+    public java.lang.String getLanguageCode() {
+      java.lang.Object ref = languageCode_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        languageCode_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
    +     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
    
+     *
+     * string language_code = 5;
+     */
+    public com.google.protobuf.ByteString
+        getLanguageCodeBytes() {
+      java.lang.Object ref = languageCode_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        languageCode_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
    +     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
    
+     *
+     * string language_code = 5;
+     */
+    public Builder setLanguageCode(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      languageCode_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
    
+     *
+     * string language_code = 5;
+     */
+    public Builder clearLanguageCode() {
+      
+      languageCode_ = getDefaultInstance().getLanguageCode();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
    
+     *
+     * string language_code = 5;
+     */
+    public Builder setLanguageCodeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      languageCode_ = value;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResultOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResultOrBuilder.java
index 5544ddc22475..e7c9474105cd 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResultOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResultOrBuilder.java
@@ -65,4 +65,39 @@ public interface SpeechRecognitionResultOrBuilder extends
    */
   com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternativeOrBuilder getAlternativesOrBuilder(
       int index);
+
+  /**
+   * 
    +   * For multi-channel audio, this is the channel number corresponding to the
+   * recognized result for the audio from that channel.
+   * For audio_channel_count = N, its output values can range from '1' to 'N'.
+   * 
    
+   *
+   * int32 channel_tag = 2;
+   */
+  int getChannelTag();
+
+  /**
+   * 
    +   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
    
+   *
+   * string language_code = 5;
+   */
+  java.lang.String getLanguageCode();
+  /**
+   * 
    +   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
    
+   *
+   * string language_code = 5;
+   */
+  com.google.protobuf.ByteString
+      getLanguageCodeBytes();
 }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java
index 7e188addda7f..fd563d43977a 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java
@@ -24,6 +24,8 @@ private StreamingRecognitionResult() {
     alternatives_ = java.util.Collections.emptyList();
     isFinal_ = false;
     stability_ = 0F;
+    channelTag_ = 0;
+    languageCode_ = "";
   }
 
   @java.lang.Override
@@ -76,6 +78,17 @@ private StreamingRecognitionResult(
             stability_ = input.readFloat();
             break;
           }
+          case 40: {
+
+            channelTag_ = input.readInt32();
+            break;
+          }
+          case 50: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            languageCode_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -208,6 +221,69 @@ public float getStability() {
     return stability_;
   }
 
+  public static final int CHANNEL_TAG_FIELD_NUMBER = 5;
+  private int channelTag_;
+  /**
+   * 
    +   * For multi-channel audio, this is the channel number corresponding to the
+   * recognized result for the audio from that channel.
+   * For audio_channel_count = N, its output values can range from '1' to 'N'.
+   * 
    
+   *
+   * int32 channel_tag = 5;
+   */
+  public int getChannelTag() {
+    return channelTag_;
+  }
+
+  public static final int LANGUAGE_CODE_FIELD_NUMBER = 6;
+  private volatile java.lang.Object languageCode_;
+  /**
+   * 
    +   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
    
+   *
+   * string language_code = 6;
+   */
+  public java.lang.String getLanguageCode() {
+    java.lang.Object ref = languageCode_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      languageCode_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
    +   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
    
+   *
+   * string language_code = 6;
+   */
+  public com.google.protobuf.ByteString
+      getLanguageCodeBytes() {
+    java.lang.Object ref = languageCode_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      languageCode_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -229,6 +305,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (stability_ != 0F) {
       output.writeFloat(3, stability_);
     }
+    if (channelTag_ != 0) {
+      output.writeInt32(5, channelTag_);
+    }
+    if (!getLanguageCodeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 6, languageCode_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -249,6 +331,13 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeFloatSize(3, stability_);
     }
+    if (channelTag_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(5, channelTag_);
+    }
+    if (!getLanguageCodeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, languageCode_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -273,6 +362,10 @@ public boolean equals(final java.lang.Object obj) {
         java.lang.Float.floatToIntBits(getStability())
         == java.lang.Float.floatToIntBits(
             other.getStability()));
+    result = result && (getChannelTag()
+        == other.getChannelTag());
+    result = result && getLanguageCode()
+        .equals(other.getLanguageCode());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -294,6 +387,10 @@ public int hashCode() {
     hash = (37 * hash) + STABILITY_FIELD_NUMBER;
     hash = (53 * hash) + java.lang.Float.floatToIntBits(
         getStability());
+    hash = (37 * hash) + CHANNEL_TAG_FIELD_NUMBER;
+    hash = (53 * hash) + getChannelTag();
+    hash = (37 * hash) + LANGUAGE_CODE_FIELD_NUMBER;
+    hash = (53 * hash) + getLanguageCode().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -439,6 +536,10 @@ public Builder clear() {
 
       stability_ = 0F;
 
+      channelTag_ = 0;
+
+      languageCode_ = "";
+
       return this;
     }
 
@@ -474,6 +575,8 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult buildPartial
       }
       result.isFinal_ = isFinal_;
       result.stability_ = stability_;
+      result.channelTag_ = channelTag_;
+      result.languageCode_ = languageCode_;
       result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
@@ -548,6 +651,13 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.StreamingRecognitionR
       if (other.getStability() != 0F) {
         setStability(other.getStability());
       }
+      if (other.getChannelTag() != 0) {
+        setChannelTag(other.getChannelTag());
+      }
+      if (!other.getLanguageCode().isEmpty()) {
+        languageCode_ = other.languageCode_;
+        onChanged();
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -1041,6 +1151,154 @@ public Builder clearStability() {
       onChanged();
       return this;
     }
+
+    private int channelTag_ ;
+    /**
+     * 
    +     * For multi-channel audio, this is the channel number corresponding to the
+     * recognized result for the audio from that channel.
+     * For audio_channel_count = N, its output values can range from '1' to 'N'.
+     * 
    
+     *
+     * int32 channel_tag = 5;
+     */
+    public int getChannelTag() {
+      return channelTag_;
+    }
+    /**
+     * 
    +     * For multi-channel audio, this is the channel number corresponding to the
+     * recognized result for the audio from that channel.
+     * For audio_channel_count = N, its output values can range from '1' to 'N'.
+     * 
    
+     *
+     * int32 channel_tag = 5;
+     */
+    public Builder setChannelTag(int value) {
+      
+      channelTag_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * For multi-channel audio, this is the channel number corresponding to the
+     * recognized result for the audio from that channel.
+     * For audio_channel_count = N, its output values can range from '1' to 'N'.
+     * 
    
+     *
+     * int32 channel_tag = 5;
+     */
+    public Builder clearChannelTag() {
+      
+      channelTag_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object languageCode_ = "";
+    /**
+     * 
    +     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
    
+     *
+     * string language_code = 6;
+     */
+    public java.lang.String getLanguageCode() {
+      java.lang.Object ref = languageCode_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        languageCode_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
    +     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
    
+     *
+     * string language_code = 6;
+     */
+    public com.google.protobuf.ByteString
+        getLanguageCodeBytes() {
+      java.lang.Object ref = languageCode_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        languageCode_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
    +     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
    
+     *
+     * string language_code = 6;
+     */
+    public Builder setLanguageCode(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      languageCode_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
    
+     *
+     * string language_code = 6;
+     */
+    public Builder clearLanguageCode() {
+      
+      languageCode_ = getDefaultInstance().getLanguageCode();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Output only. The
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+     * language in this result. This language code was detected to have the most
+     * likelihood of being spoken in the audio.
+     * 
    
+     *
+     * string language_code = 6;
+     */
+    public Builder setLanguageCodeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      languageCode_ = value;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResultOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResultOrBuilder.java
index 76a508fd71a1..445015b286b7 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResultOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResultOrBuilder.java
@@ -91,4 +91,39 @@ com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternativeOrBuilder getAlter
    * float stability = 3;
    */
   float getStability();
+
+  /**
+   * 
    +   * For multi-channel audio, this is the channel number corresponding to the
+   * recognized result for the audio from that channel.
+   * For audio_channel_count = N, its output values can range from '1' to 'N'.
+   * 
    
+   *
+   * int32 channel_tag = 5;
+   */
+  int getChannelTag();
+
+  /**
+   * 
    +   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
    
+   *
+   * string language_code = 6;
+   */
+  java.lang.String getLanguageCode();
+  /**
+   * 
    +   * Output only. The
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+   * language in this result. This language code was detected to have the most
+   * likelihood of being spoken in the audio.
+   * 
    
+   *
+   * string language_code = 6;
+   */
+  com.google.protobuf.ByteString
+      getLanguageCodeBytes();
 }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java
index 9bef41cdfbf7..0eddd9c6e8bd 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java
@@ -21,6 +21,8 @@ private WordInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) {
   }
   private WordInfo() {
     word_ = "";
+    confidence_ = 0F;
+    speakerTag_ = 0;
   }
 
   @java.lang.Override
@@ -86,6 +88,16 @@ private WordInfo(
             word_ = s;
             break;
           }
+          case 37: {
+
+            confidence_ = input.readFloat();
+            break;
+          }
+          case 40: {
+
+            speakerTag_ = input.readInt32();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -248,6 +260,42 @@ public java.lang.String getWord() {
     }
   }
 
+  public static final int CONFIDENCE_FIELD_NUMBER = 4;
+  private float confidence_;
+  /**
+   * 
    +   * Output only. The confidence estimate between 0.0 and 1.0. A higher number
+   * indicates an estimated greater likelihood that the recognized words are
+   * correct. This field is set only for the top alternative of a non-streaming
+   * result or, of a streaming result where `is_final=true`.
+   * This field is not guaranteed to be accurate and users should not rely on it
+   * to be always provided.
+   * The default of 0.0 is a sentinel value indicating `confidence` was not set.
+   * 
    
+   *
+   * float confidence = 4;
+   */
+  public float getConfidence() {
+    return confidence_;
+  }
+
+  public static final int SPEAKER_TAG_FIELD_NUMBER = 5;
+  private int speakerTag_;
+  /**
+   * 
    +   * Output only. A distinct integer value is assigned for every speaker within
+   * the audio. This field specifies which one of those speakers was detected to
+   * have spoken this word. Value ranges from '1' to diarization_speaker_count.
+   * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
+   * top alternative.
+   * 
    
+   *
+   * int32 speaker_tag = 5;
+   */
+  public int getSpeakerTag() {
+    return speakerTag_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -269,6 +317,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (!getWordBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, word_);
     }
+    if (confidence_ != 0F) {
+      output.writeFloat(4, confidence_);
+    }
+    if (speakerTag_ != 0) {
+      output.writeInt32(5, speakerTag_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -288,6 +342,14 @@ public int getSerializedSize() {
     if (!getWordBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, word_);
     }
+    if (confidence_ != 0F) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeFloatSize(4, confidence_);
+    }
+    if (speakerTag_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(5, speakerTag_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -316,6 +378,12 @@ public boolean equals(final java.lang.Object obj) {
     }
     result = result && getWord()
         .equals(other.getWord());
+    result = result && (
+        java.lang.Float.floatToIntBits(getConfidence())
+        == java.lang.Float.floatToIntBits(
+            other.getConfidence()));
+    result = result && (getSpeakerTag()
+        == other.getSpeakerTag());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -337,6 +405,11 @@ public int hashCode() {
     }
     hash = (37 * hash) + WORD_FIELD_NUMBER;
     hash = (53 * hash) + getWord().hashCode();
+    hash = (37 * hash) + CONFIDENCE_FIELD_NUMBER;
+    hash = (53 * hash) + java.lang.Float.floatToIntBits(
+        getConfidence());
+    hash = (37 * hash) + SPEAKER_TAG_FIELD_NUMBER;
+    hash = (53 * hash) + getSpeakerTag();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -484,6 +557,10 @@ public Builder clear() {
       }
       word_ = "";
 
+      confidence_ = 0F;
+
+      speakerTag_ = 0;
+
       return this;
     }
 
@@ -517,6 +594,8 @@ public com.google.cloud.speech.v1p1beta1.WordInfo buildPartial() {
         result.endTime_ = endTimeBuilder_.build();
       }
       result.word_ = word_;
+      result.confidence_ = confidence_;
+      result.speakerTag_ = speakerTag_;
       onBuilt();
       return result;
     }
@@ -568,6 +647,12 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.WordInfo other) {
         word_ = other.word_;
         onChanged();
       }
+      if (other.getConfidence() != 0F) {
+        setConfidence(other.getConfidence());
+      }
+      if (other.getSpeakerTag() != 0) {
+        setSpeakerTag(other.getSpeakerTag());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -1079,6 +1164,112 @@ public Builder setWordBytes(
       onChanged();
       return this;
     }
+
+    private float confidence_ ;
+    /**
+     * 
    +     * Output only. The confidence estimate between 0.0 and 1.0. A higher number
+     * indicates an estimated greater likelihood that the recognized words are
+     * correct. This field is set only for the top alternative of a non-streaming
+     * result or, of a streaming result where `is_final=true`.
+     * This field is not guaranteed to be accurate and users should not rely on it
+     * to be always provided.
+     * The default of 0.0 is a sentinel value indicating `confidence` was not set.
+     * 
    
+     *
+     * float confidence = 4;
+     */
+    public float getConfidence() {
+      return confidence_;
+    }
+    /**
+     * 
    +     * Output only. The confidence estimate between 0.0 and 1.0. A higher number
+     * indicates an estimated greater likelihood that the recognized words are
+     * correct. This field is set only for the top alternative of a non-streaming
+     * result or, of a streaming result where `is_final=true`.
+     * This field is not guaranteed to be accurate and users should not rely on it
+     * to be always provided.
+     * The default of 0.0 is a sentinel value indicating `confidence` was not set.
+     * 
    
+     *
+     * float confidence = 4;
+     */
+    public Builder setConfidence(float value) {
+      
+      confidence_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Output only. The confidence estimate between 0.0 and 1.0. A higher number
+     * indicates an estimated greater likelihood that the recognized words are
+     * correct. This field is set only for the top alternative of a non-streaming
+     * result or, of a streaming result where `is_final=true`.
+     * This field is not guaranteed to be accurate and users should not rely on it
+     * to be always provided.
+     * The default of 0.0 is a sentinel value indicating `confidence` was not set.
+     * 
    
+     *
+     * float confidence = 4;
+     */
+    public Builder clearConfidence() {
+      
+      confidence_ = 0F;
+      onChanged();
+      return this;
+    }
+
+    private int speakerTag_ ;
+    /**
+     * 
    +     * Output only. A distinct integer value is assigned for every speaker within
+     * the audio. This field specifies which one of those speakers was detected to
+     * have spoken this word. Value ranges from '1' to diarization_speaker_count.
+     * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
+     * top alternative.
+     * 
    
+     *
+     * int32 speaker_tag = 5;
+     */
+    public int getSpeakerTag() {
+      return speakerTag_;
+    }
+    /**
+     * 
    +     * Output only. A distinct integer value is assigned for every speaker within
+     * the audio. This field specifies which one of those speakers was detected to
+     * have spoken this word. Value ranges from '1' to diarization_speaker_count.
+     * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
+     * top alternative.
+     * 
    
+     *
+     * int32 speaker_tag = 5;
+     */
+    public Builder setSpeakerTag(int value) {
+      
+      speakerTag_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Output only. A distinct integer value is assigned for every speaker within
+     * the audio. This field specifies which one of those speakers was detected to
+     * have spoken this word. Value ranges from '1' to diarization_speaker_count.
+     * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
+     * top alternative.
+     * 
    
+     *
+     * int32 speaker_tag = 5;
+     */
+    public Builder clearSpeakerTag() {
+      
+      speakerTag_ = 0;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfoOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfoOrBuilder.java
index c6d2e8478d81..c47302b64c6c 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfoOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfoOrBuilder.java
@@ -104,4 +104,32 @@ public interface WordInfoOrBuilder extends
    */
   com.google.protobuf.ByteString
       getWordBytes();
+
+  /**
+   * 
    +   * Output only. The confidence estimate between 0.0 and 1.0. A higher number
+   * indicates an estimated greater likelihood that the recognized words are
+   * correct. This field is set only for the top alternative of a non-streaming
+   * result or, of a streaming result where `is_final=true`.
+   * This field is not guaranteed to be accurate and users should not rely on it
+   * to be always provided.
+   * The default of 0.0 is a sentinel value indicating `confidence` was not set.
+   * 
    
+   *
+   * float confidence = 4;
+   */
+  float getConfidence();
+
+  /**
+   * 
    +   * Output only. A distinct integer value is assigned for every speaker within
+   * the audio. This field specifies which one of those speakers was detected to
+   * have spoken this word. Value ranges from '1' to diarization_speaker_count.
+   * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
+   * top alternative.
+   * 
    
+   *
+   * int32 speaker_tag = 5;
+   */
+  int getSpeakerTag();
 }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/proto/google/cloud/speech/v1p1beta1/cloud_speech.proto b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/proto/google/cloud/speech/v1p1beta1/cloud_speech.proto
index 77e4e1081662..208f53633e02 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/proto/google/cloud/speech/v1p1beta1/cloud_speech.proto
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/proto/google/cloud/speech/v1p1beta1/cloud_speech.proto
@@ -212,6 +212,25 @@ message RecognitionConfig {
   // for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding].
   int32 sample_rate_hertz = 2;
 
+  // *Optional* The number of channels in the input audio data.
+  // ONLY set this for MULTI-CHANNEL recognition.
+  // Valid values for LINEAR16 and FLAC are `1`-`8`.
+  // Valid values for OGG_OPUS are '1'-'254'.
+  // Valid value for MULAW, AMR, AMR_WB and SPEEX_WITH_HEADER_BYTE is only `1`.
+  // If `0` or omitted, defaults to one channel (mono).
+  // NOTE: We only recognize the first channel by default.
+  // To perform independent recognition on each channel set
+  // enable_separate_recognition_per_channel to 'true'.
+  int32 audio_channel_count = 7;
+
+  // This needs to be set to ‘true’ explicitly and audio_channel_count > 1
+  // to get each channel recognized separately. The recognition result will
+  // contain a channel_tag field to state which channel that result belongs to.
+  // If this is not ‘true’, we will only recognize the first channel.
+  // NOTE: The request is also billed cumulatively for all channels recognized:
+  //     (audio_channel_count times the audio length)
+  bool enable_separate_recognition_per_channel = 12;
+
   // *Required* The language of the supplied audio as a
   // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
   // Example: "en-US".
@@ -219,6 +238,20 @@ message RecognitionConfig {
   // for a list of the currently supported language codes.
   string language_code = 3;
 
+  // *Optional* A list of up to 3 additional
+  // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags,
+  // listing possible alternative languages of the supplied audio.
+  // See [Language Support](https://cloud.google.com/speech/docs/languages)
+  // for a list of the currently supported language codes.
+  // If alternative languages are listed, recognition result will contain
+  // recognition in the most likely language detected including the main
+  // language_code. The recognition result will include the language tag
+  // of the language detected in the audio.
+  // NOTE: This feature is only supported for Voice Command and Voice Search
+  // use cases and performance may vary for other use cases (e.g., phone call
+  // transcription).
+  repeated string alternative_language_codes = 18;
+
   // *Optional* Maximum number of recognition hypotheses to be returned.
   // Specifically, the maximum number of `SpeechRecognitionAlternative` messages
   // within each `SpeechRecognitionResult`.
@@ -242,6 +275,11 @@ message RecognitionConfig {
   // `false`.
   bool enable_word_time_offsets = 8;
 
+  // *Optional* If `true`, the top result includes a list of words and the
+  // confidence for those words. If `false`, no word-level confidence
+  // information is returned. The default is `false`.
+  bool enable_word_confidence = 15;
+
   // *Optional* If 'true', adds punctuation to recognition result hypotheses.
   // This feature is only available in select languages. Setting this for
   // requests in other languages has no effect at all.
@@ -251,6 +289,21 @@ message RecognitionConfig {
   // premium feature."
   bool enable_automatic_punctuation = 11;
 
+  // *Optional* If 'true', enables speaker detection for each recognized word in
+  // the top alternative of the recognition result using a speaker_tag provided
+  // in the WordInfo.
+  // Note: When this is true, we send all the words from the beginning of the
+  // audio for the top alternative in every consecutive responses.
+  // This is done in order to improve our speaker tags as our models learn to
+  // identify the speakers in the conversation over time.
+  bool enable_speaker_diarization = 16;
+
+  // *Optional*
+  // If set, specifies the estimated number of speakers in the conversation.
+  // If not set, defaults to '2'.
+  // Ignored unless enable_speaker_diarization is set to true."
+  int32 diarization_speaker_count = 17;
+
   // *Optional* Metadata regarding this request.
   RecognitionMetadata metadata = 9;
 
@@ -604,6 +657,17 @@ message StreamingRecognitionResult {
   // This field is only provided for interim results (`is_final=false`).
   // The default of 0.0 is a sentinel value indicating `stability` was not set.
   float stability = 3;
+
+  // For multi-channel audio, this is the channel number corresponding to the
+  // recognized result for the audio from that channel.
+  // For audio_channel_count = N, its output values can range from '1' to 'N'.
+  int32 channel_tag = 5;
+
+  // Output only. The
+  // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+  // language in this result. This language code was detected to have the most
+  // likelihood of being spoken in the audio.
+  string language_code = 6;
 }
 
 // A speech recognition result corresponding to a portion of the audio.
@@ -613,6 +677,17 @@ message SpeechRecognitionResult {
   // These alternatives are ordered in terms of accuracy, with the top (first)
   // alternative being the most probable, as ranked by the recognizer.
   repeated SpeechRecognitionAlternative alternatives = 1;
+
+  // For multi-channel audio, this is the channel number corresponding to the
+  // recognized result for the audio from that channel.
+  // For audio_channel_count = N, its output values can range from '1' to 'N'.
+  int32 channel_tag = 2;
+
+  // Output only. The
+  // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag of the
+  // language in this result. This language code was detected to have the most
+  // likelihood of being spoken in the audio.
+  string language_code = 5;
 }
 
 // Alternative hypotheses (a.k.a. n-best list).
@@ -655,4 +730,21 @@ message WordInfo {
 
   // Output only. The word corresponding to this set of information.
   string word = 3;
+
+  // Output only. The confidence estimate between 0.0 and 1.0. A higher number
+  // indicates an estimated greater likelihood that the recognized words are
+  // correct. This field is set only for the top alternative of a non-streaming
+  // result or, of a streaming result where `is_final=true`.
+  // This field is not guaranteed to be accurate and users should not rely on it
+  // to be always provided.
+  // The default of 0.0 is a sentinel value indicating `confidence` was not set.
+  float confidence = 4;
+
+  // Output only. A distinct integer value is assigned for every speaker within
+  // the audio. This field specifies which one of those speakers was detected to
+  // have spoken this word. Value ranges from '1' to diarization_speaker_count.
+  // speaker_tag is set if enable_speaker_diarization = 'true' and only in the
+  // top alternative.
+  int32 speaker_tag = 5;
+
 }
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
index e50a09b1c0be..5a67f6769b68 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java
@@ -1295,12 +1295,7 @@ public final UnaryCallable deleteClusterCallable()
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Creates an app profile within an instance.
+   * Creates an app profile within an instance.
    *
    * 
    Sample code:
    *
@@ -1335,12 +1330,7 @@ public final AppProfile createAppProfile(
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Creates an app profile within an instance.
+   * Creates an app profile within an instance.
    *
    * 
    Sample code:
    *
@@ -1375,12 +1365,7 @@ public final AppProfile createAppProfile(
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Creates an app profile within an instance.
+   * Creates an app profile within an instance.
    *
    * 
    Sample code:
    *
@@ -1407,12 +1392,7 @@ public final AppProfile createAppProfile(CreateAppProfileRequest request) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Creates an app profile within an instance.
+   * Creates an app profile within an instance.
    *
    * 
    Sample code:
    *
@@ -1438,12 +1418,7 @@ public final UnaryCallable createAppProfile
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Gets information about an app profile.
+   * Gets information about an app profile.
    *
    * 
    Sample code:
    *
@@ -1467,12 +1442,7 @@ public final AppProfile getAppProfile(AppProfileName name) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Gets information about an app profile.
+   * Gets information about an app profile.
    *
    * 
    Sample code:
    *
@@ -1495,12 +1465,7 @@ public final AppProfile getAppProfile(String name) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Gets information about an app profile.
+   * Gets information about an app profile.
    *
    * 
    Sample code:
    *
@@ -1523,12 +1488,7 @@ private final AppProfile getAppProfile(GetAppProfileRequest request) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Gets information about an app profile.
+   * Gets information about an app profile.
    *
    * 
    Sample code:
    *
@@ -1550,12 +1510,7 @@ public final UnaryCallable getAppProfileCallab
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Lists information about app profiles in an instance.
+   * Lists information about app profiles in an instance.
    *
    * 
    Sample code:
    *
@@ -1582,12 +1537,7 @@ public final ListAppProfilesPagedResponse listAppProfiles(InstanceName parent) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Lists information about app profiles in an instance.
+   * Lists information about app profiles in an instance.
    *
    * 
    Sample code:
    *
@@ -1611,12 +1561,7 @@ public final ListAppProfilesPagedResponse listAppProfiles(String parent) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Lists information about app profiles in an instance.
+   * Lists information about app profiles in an instance.
    *
    * 
    Sample code:
    *
@@ -1641,12 +1586,7 @@ public final ListAppProfilesPagedResponse listAppProfiles(ListAppProfilesRequest
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Lists information about app profiles in an instance.
+   * Lists information about app profiles in an instance.
    *
    * 
    Sample code:
    *
@@ -1671,12 +1611,7 @@ public final ListAppProfilesPagedResponse listAppProfiles(ListAppProfilesRequest
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Lists information about app profiles in an instance.
+   * Lists information about app profiles in an instance.
    *
    * 
    Sample code:
    *
@@ -1708,12 +1643,7 @@ public final ListAppProfilesPagedResponse listAppProfiles(ListAppProfilesRequest
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Updates an app profile within an instance.
+   * Updates an app profile within an instance.
    *
    * 
    Sample code:
    *
@@ -1745,12 +1675,7 @@ public final OperationFuture updateAppProf
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Updates an app profile within an instance.
+   * Updates an app profile within an instance.
    *
    * 
    Sample code:
    *
@@ -1778,12 +1703,7 @@ public final OperationFuture updateAppProf
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Updates an app profile within an instance.
+   * Updates an app profile within an instance.
    *
    * 
    Sample code:
    *
@@ -1809,12 +1729,7 @@ public final OperationFuture updateAppProf
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Updates an app profile within an instance.
+   * Updates an app profile within an instance.
    *
    * 
    Sample code:
    *
@@ -1838,12 +1753,7 @@ public final UnaryCallable updateAppProfileC
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Deletes an app profile from an instance.
+   * Deletes an app profile from an instance.
    *
    * 
    Sample code:
    *
@@ -1867,12 +1777,7 @@ public final void deleteAppProfile(AppProfileName name) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Deletes an app profile from an instance.
+   * Deletes an app profile from an instance.
    *
    * 
    Sample code:
    *
@@ -1895,12 +1800,7 @@ public final void deleteAppProfile(String name) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Deletes an app profile from an instance.
+   * Deletes an app profile from an instance.
    *
    * 
    Sample code:
    *
@@ -1925,12 +1825,7 @@ public final void deleteAppProfile(DeleteAppProfileRequest request) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Deletes an app profile from an instance.
+   * Deletes an app profile from an instance.
    *
    * 
    Sample code:
    *
@@ -1954,13 +1849,8 @@ public final UnaryCallable deleteAppProfileCalla
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable instance level permissions. This feature is
-   * not currently available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Gets the access control policy for an instance resource. Returns an empty policy if an
-   * instance exists but does not have a policy set.
+   * Gets the access control policy for an instance resource. Returns an empty policy if an instance
+   * exists but does not have a policy set.
    *
    * 
    Sample code:
    *
@@ -1984,13 +1874,8 @@ public final Policy getIamPolicy(String resource) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable instance level permissions. This feature is
-   * not currently available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Gets the access control policy for an instance resource. Returns an empty policy if an
-   * instance exists but does not have a policy set.
+   * Gets the access control policy for an instance resource. Returns an empty policy if an instance
+   * exists but does not have a policy set.
    *
    * 
    Sample code:
    *
@@ -2013,13 +1898,8 @@ private final Policy getIamPolicy(GetIamPolicyRequest request) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable instance level permissions. This feature is
-   * not currently available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Gets the access control policy for an instance resource. Returns an empty policy if an
-   * instance exists but does not have a policy set.
+   * Gets the access control policy for an instance resource. Returns an empty policy if an instance
+   * exists but does not have a policy set.
    *
    * 
    Sample code:
    *
@@ -2041,12 +1921,7 @@ public final UnaryCallable getIamPolicyCallable() {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable instance level permissions. This feature is
-   * not currently available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Sets the access control policy on an instance resource. Replaces any existing policy.
+   * Sets the access control policy on an instance resource. Replaces any existing policy.
    *
    * 
    Sample code:
    *
@@ -2075,12 +1950,7 @@ public final Policy setIamPolicy(String resource, Policy policy) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable instance level permissions. This feature is
-   * not currently available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Sets the access control policy on an instance resource. Replaces any existing policy.
+   * Sets the access control policy on an instance resource. Replaces any existing policy.
    *
    * 
    Sample code:
    *
@@ -2105,12 +1975,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable instance level permissions. This feature is
-   * not currently available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Sets the access control policy on an instance resource. Replaces any existing policy.
+   * Sets the access control policy on an instance resource. Replaces any existing policy.
    *
    * 
    Sample code:
    *
@@ -2134,12 +1999,7 @@ public final UnaryCallable setIamPolicyCallable() {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable instance level permissions. This feature is
-   * not currently available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Returns permissions that the caller has on the specified instance resource.
+   * Returns permissions that the caller has on the specified instance resource.
    *
    * 
    Sample code:
    *
@@ -2172,12 +2032,7 @@ public final TestIamPermissionsResponse testIamPermissions(
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable instance level permissions. This feature is
-   * not currently available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Returns permissions that the caller has on the specified instance resource.
+   * Returns permissions that the caller has on the specified instance resource.
    *
    * 
    Sample code:
    *
@@ -2202,12 +2057,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable instance level permissions. This feature is
-   * not currently available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Returns permissions that the caller has on the specified instance resource.
+   * Returns permissions that the caller has on the specified instance resource.
    *
    * 
    Sample code:
    *
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
index 07fac64c4f88..79e8e7d0bdd1 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java
@@ -326,14 +326,14 @@ public final UnaryCallable createTableCallable() {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Creates a new table from the specified snapshot. The target table must not exist. The snapshot
+   * and the table must be in the same instance.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Creates a new table from the specified snapshot. The target table must not exist. The
-   * snapshot and the table must be in the same instance.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -370,14 +370,14 @@ public final OperationFuture createTable
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Creates a new table from the specified snapshot. The target table must not exist. The snapshot
+   * and the table must be in the same instance.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Creates a new table from the specified snapshot. The target table must not exist. The
-   * snapshot and the table must be in the same instance.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -414,14 +414,14 @@ public final OperationFuture createTable
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Creates a new table from the specified snapshot. The target table must not exist. The snapshot
+   * and the table must be in the same instance.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Creates a new table from the specified snapshot. The target table must not exist. The
-   * snapshot and the table must be in the same instance.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -450,14 +450,14 @@ public final OperationFuture createTable
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Creates a new table from the specified snapshot. The target table must not exist. The snapshot
+   * and the table must be in the same instance.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Creates a new table from the specified snapshot. The target table must not exist. The
-   * snapshot and the table must be in the same instance.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -485,14 +485,14 @@ public final OperationFuture createTable
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Creates a new table from the specified snapshot. The target table must not exist. The snapshot
+   * and the table must be in the same instance.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Creates a new table from the specified snapshot. The target table must not exist. The
-   * snapshot and the table must be in the same instance.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -999,12 +999,7 @@ public final UnaryCallable dropRowRangeCallable() {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Generates a consistency token for a Table, which can be used in CheckConsistency to check
+   * Generates a consistency token for a Table, which can be used in 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.
    *
@@ -1032,12 +1027,7 @@ public final GenerateConsistencyTokenResponse generateConsistencyToken(TableName
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Generates a consistency token for a Table, which can be used in CheckConsistency to check
+   * Generates a consistency token for a Table, which can be used in 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.
    *
@@ -1063,12 +1053,7 @@ public final GenerateConsistencyTokenResponse generateConsistencyToken(String na
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Generates a consistency token for a Table, which can be used in CheckConsistency to check
+   * Generates a consistency token for a Table, which can be used in 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.
    *
@@ -1094,12 +1079,7 @@ private final GenerateConsistencyTokenResponse generateConsistencyToken(
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    Generates a consistency token for a Table, which can be used in CheckConsistency to check
+   * Generates a consistency token for a Table, which can be used in 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.
    *
@@ -1124,13 +1104,8 @@ private final GenerateConsistencyTokenResponse generateConsistencyToken(
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    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.
+   * 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.
    *
    * 
    Sample code:
    *
@@ -1159,13 +1134,8 @@ public final CheckConsistencyResponse checkConsistency(TableName name, String co
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    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.
+   * 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.
    *
    * 
    Sample code:
    *
@@ -1194,13 +1164,8 @@ public final CheckConsistencyResponse checkConsistency(String name, String consi
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    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.
+   * 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.
    *
    * 
    Sample code:
    *
@@ -1225,13 +1190,8 @@ public final CheckConsistencyResponse checkConsistency(CheckConsistencyRequest r
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable replication. This feature is not currently
-   * available to most Cloud Bigtable customers. This 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.
-   *
-   * 
    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.
+   * 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.
    *
    * 
    Sample code:
    *
@@ -1256,14 +1216,14 @@ public final CheckConsistencyResponse checkConsistency(CheckConsistencyRequest r
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Creates a new snapshot in the specified cluster from the specified source table. The cluster
+   * and the table must be in the same instance.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Creates a new snapshot in the specified cluster from the specified source table. The cluster
-   * and the table must be in the same instance.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1303,14 +1263,14 @@ public final OperationFuture snapshotTableAsync
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Creates a new snapshot in the specified cluster from the specified source table. The cluster
+   * and the table must be in the same instance.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Creates a new snapshot in the specified cluster from the specified source table. The cluster
-   * and the table must be in the same instance.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1350,14 +1310,14 @@ public final OperationFuture snapshotTableAsync
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Creates a new snapshot in the specified cluster from the specified source table. The cluster
+   * and the table must be in the same instance.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Creates a new snapshot in the specified cluster from the specified source table. The cluster
-   * and the table must be in the same instance.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1388,14 +1348,14 @@ public final OperationFuture snapshotTableAsync
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Creates a new snapshot in the specified cluster from the specified source table. The cluster
+   * and the table must be in the same instance.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Creates a new snapshot in the specified cluster from the specified source table. The cluster
-   * and the table must be in the same instance.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1424,14 +1384,14 @@ public final OperationFuture snapshotTableAsync
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Creates a new snapshot in the specified cluster from the specified source table. The cluster
+   * and the table must be in the same instance.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Creates a new snapshot in the specified cluster from the specified source table. The cluster
-   * and the table must be in the same instance.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1458,13 +1418,13 @@ public final UnaryCallable snapshotTableCallabl
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Gets metadata information about the specified snapshot.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Gets metadata information about the specified snapshot.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1487,13 +1447,13 @@ public final Snapshot getSnapshot(SnapshotName name) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Gets metadata information about the specified snapshot.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Gets metadata information about the specified snapshot.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1515,13 +1475,13 @@ public final Snapshot getSnapshot(String name) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Gets metadata information about the specified snapshot.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Gets metadata information about the specified snapshot.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1543,13 +1503,13 @@ private final Snapshot getSnapshot(GetSnapshotRequest request) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Gets metadata information about the specified snapshot.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Gets metadata information about the specified snapshot.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1570,13 +1530,13 @@ public final UnaryCallable getSnapshotCallable() {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Lists all snapshots associated with the specified cluster.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Lists all snapshots associated with the specified cluster.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1604,13 +1564,13 @@ public final ListSnapshotsPagedResponse listSnapshots(ClusterName parent) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Lists all snapshots associated with the specified cluster.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Lists all snapshots associated with the specified cluster.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1635,13 +1595,13 @@ public final ListSnapshotsPagedResponse listSnapshots(String parent) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Lists all snapshots associated with the specified cluster.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Lists all snapshots associated with the specified cluster.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1665,13 +1625,13 @@ public final ListSnapshotsPagedResponse listSnapshots(ListSnapshotsRequest reque
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Lists all snapshots associated with the specified cluster.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Lists all snapshots associated with the specified cluster.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1695,13 +1655,13 @@ public final ListSnapshotsPagedResponse listSnapshots(ListSnapshotsRequest reque
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Lists all snapshots associated with the specified cluster.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Lists all snapshots associated with the specified cluster.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1731,13 +1691,13 @@ public final UnaryCallable listSnap
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Permanently deletes the specified snapshot.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Permanently deletes the specified snapshot.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1760,13 +1720,13 @@ public final void deleteSnapshot(SnapshotName name) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Permanently deletes the specified snapshot.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Permanently deletes the specified snapshot.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1788,13 +1748,13 @@ public final void deleteSnapshot(String name) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Permanently deletes the specified snapshot.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Permanently deletes the specified snapshot.
-   *
    * 
    Sample code:
    *
    * 
    
@@ -1816,13 +1776,13 @@ private final void deleteSnapshot(DeleteSnapshotRequest request) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * This is a private alpha release of Cloud Bigtable snapshots. This feature is not currently
-   * available to most Cloud Bigtable customers. This feature might be changed in
+   * Permanently deletes the specified snapshot.
+   *
+   * 
    Note: This is a private alpha release of Cloud Bigtable snapshots. This feature is not
+   * currently available to most Cloud Bigtable customers. This 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.
    *
-   * 
    Permanently deletes the specified snapshot.
-   *
    * 
    Sample code:
    *
    * 
    

From 6f75996bb3386bd4dac3d796497b10d24507ccd3 Mon Sep 17 00:00:00 2001
From: neozwu 
Date: Thu, 24 May 2018 10:13:56 -0700
Subject: [PATCH 54/65] release 0.49.0 (#3310)

---
 README.md                                     |   8 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-bigtable-v2/pom.xml     |   4 +-
 .../grpc-google-cloud-container-v1/pom.xml    |   4 +-
 .../grpc-google-cloud-dataproc-v1/pom.xml     |   4 +-
 .../grpc-google-cloud-dialogflow-v2/pom.xml   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-dlp-v2/pom.xml          |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-iot-v1/pom.xml          |   4 +-
 .../grpc-google-cloud-language-v1/pom.xml     |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-logging-v2/pom.xml      |   4 +-
 .../grpc-google-cloud-monitoring-v3/pom.xml   |   4 +-
 .../grpc-google-cloud-os-login-v1/pom.xml     |   4 +-
 .../grpc-google-cloud-pubsub-v1/pom.xml       |   4 +-
 .../grpc-google-cloud-redis-v1beta1/pom.xml   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-spanner-v1/pom.xml      |   4 +-
 .../grpc-google-cloud-speech-v1/pom.xml       |   4 +-
 .../grpc-google-cloud-speech-v1beta1/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-trace-v1/pom.xml        |   4 +-
 .../grpc-google-cloud-trace-v2/pom.xml        |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-vision-v1/pom.xml       |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 google-api-grpc/pom.xml                       | 144 ++++-----
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-bigtable-v2/pom.xml    |   4 +-
 .../proto-google-cloud-container-v1/pom.xml   |   4 +-
 .../proto-google-cloud-dataproc-v1/pom.xml    |   4 +-
 .../proto-google-cloud-datastore-v1/pom.xml   |   4 +-
 .../proto-google-cloud-dialogflow-v2/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-dlp-v2/pom.xml         |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-iot-v1/pom.xml         |   4 +-
 .../proto-google-cloud-language-v1/pom.xml    |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-logging-v2/pom.xml     |   4 +-
 .../proto-google-cloud-monitoring-v3/pom.xml  |   4 +-
 .../proto-google-cloud-os-login-v1/pom.xml    |   4 +-
 .../proto-google-cloud-pubsub-v1/pom.xml      |   4 +-
 .../proto-google-cloud-redis-v1beta1/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-spanner-v1/pom.xml     |   4 +-
 .../proto-google-cloud-speech-v1/pom.xml      |   4 +-
 .../proto-google-cloud-speech-v1beta1/pom.xml |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-trace-v1/pom.xml       |   4 +-
 .../proto-google-cloud-trace-v2/pom.xml       |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-vision-v1/pom.xml      |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 google-cloud-bom/README.md                    |   2 +-
 google-cloud-bom/pom.xml                      | 274 +++++++++---------
 .../google-cloud-bigquery/README.md           |   6 +-
 .../google-cloud-bigquery/pom.xml             |   4 +-
 .../README.md                                 |   6 +-
 .../google-cloud-bigquerydatatransfer/pom.xml |   4 +-
 .../google-cloud-bigtable/README.md           |   6 +-
 .../google-cloud-bigtable/pom.xml             |   4 +-
 .../google-cloud-compute/README.md            |   6 +-
 .../google-cloud-compute/pom.xml              |   4 +-
 .../google-cloud-container/README.md          |   6 +-
 .../google-cloud-container/pom.xml            |   4 +-
 .../google-cloud-contrib/README.md            |   6 +-
 .../google-cloud-logging-logback/README.md    |   6 +-
 .../google-cloud-logging-logback/pom.xml      |   4 +-
 .../google-cloud-nio-examples/README.md       |   4 +-
 .../google-cloud-nio-examples/pom.xml         |   4 +-
 .../google-cloud-nio/README.md                |   6 +-
 .../google-cloud-nio/pom.xml                  |   4 +-
 .../google-cloud-contrib/pom.xml              |   4 +-
 .../google-cloud-core-grpc/pom.xml            |   4 +-
 .../google-cloud-core-http/pom.xml            |   4 +-
 .../google-cloud-core/README.md               |   6 +-
 .../google-cloud-core/pom.xml                 |   4 +-
 .../google-cloud-dataproc/README.md           |   6 +-
 .../google-cloud-dataproc/pom.xml             |   4 +-
 .../google-cloud-datastore/README.md          |   6 +-
 .../google-cloud-datastore/pom.xml            |   4 +-
 .../google-cloud-dialogflow/README.md         |   6 +-
 .../google-cloud-dialogflow/pom.xml           |   4 +-
 .../google-cloud-dlp/README.md                |   6 +-
 google-cloud-clients/google-cloud-dlp/pom.xml |   4 +-
 .../google-cloud-dns/README.md                |   6 +-
 google-cloud-clients/google-cloud-dns/pom.xml |   4 +-
 .../google-cloud-errorreporting/README.md     |   6 +-
 .../google-cloud-errorreporting/pom.xml       |   4 +-
 .../google-cloud-firestore/README.md          |   6 +-
 .../google-cloud-firestore/pom.xml            |   4 +-
 .../google-cloud-iot/README.md                |   6 +-
 google-cloud-clients/google-cloud-iot/pom.xml |   4 +-
 .../google-cloud-language/README.md           |   6 +-
 .../google-cloud-language/pom.xml             |   4 +-
 .../google-cloud-logging/README.md            |   6 +-
 .../google-cloud-logging/pom.xml              |   4 +-
 .../google-cloud-monitoring/README.md         |   6 +-
 .../google-cloud-monitoring/pom.xml           |   4 +-
 .../google-cloud-notification/README.md       |   6 +-
 .../google-cloud-notification/pom.xml         |   4 +-
 .../google-cloud-os-login/README.md           |   6 +-
 .../google-cloud-os-login/pom.xml             |   4 +-
 .../google-cloud-pubsub/README.md             |   6 +-
 .../google-cloud-pubsub/pom.xml               |   4 +-
 .../google-cloud-redis/README.md              |   6 +-
 .../google-cloud-redis/pom.xml                |   4 +-
 .../google-cloud-resourcemanager/README.md    |   6 +-
 .../google-cloud-resourcemanager/pom.xml      |   4 +-
 .../google-cloud-spanner/README.md            |   6 +-
 .../google-cloud-spanner/pom.xml              |   4 +-
 .../google-cloud-speech/README.md             |   6 +-
 .../google-cloud-speech/pom.xml               |   4 +-
 .../google-cloud-storage/README.md            |   6 +-
 .../google-cloud-storage/pom.xml              |   4 +-
 .../google-cloud-texttospeech/README.md       |   6 +-
 .../google-cloud-texttospeech/pom.xml         |   4 +-
 .../google-cloud-trace/README.md              |   6 +-
 .../google-cloud-trace/pom.xml                |   4 +-
 .../google-cloud-translate/README.md          |   6 +-
 .../google-cloud-translate/pom.xml            |   4 +-
 .../google-cloud-video-intelligence/README.md |   6 +-
 .../google-cloud-video-intelligence/pom.xml   |   4 +-
 .../google-cloud-vision/README.md             |   6 +-
 .../google-cloud-vision/pom.xml               |   4 +-
 .../google-cloud-websecurityscanner/README.md |   6 +-
 .../google-cloud-websecurityscanner/pom.xml   |   4 +-
 google-cloud-clients/pom.xml                  |   4 +-
 google-cloud-examples/README.md               |   6 +-
 google-cloud-examples/pom.xml                 |   4 +-
 .../google-cloud-appengineflexcompat/pom.xml  |   4 +-
 .../google-cloud-appengineflexcustom/pom.xml  |   4 +-
 .../google-cloud-appengineflexjava/pom.xml    |   4 +-
 .../google-cloud-appenginejava8/pom.xml       |   4 +-
 .../google-cloud-managedtest/pom.xml          |   4 +-
 google-cloud-testing/pom.xml                  |   4 +-
 .../google-cloud-compat-checker/pom.xml       |   4 +-
 google-cloud-util/pom.xml                     |   2 +-
 versions.txt                                  | 242 ++++++++--------
 159 files changed, 677 insertions(+), 677 deletions(-)

diff --git a/README.md b/README.md
index 17130151784e..bdc33cdf98e5 100644
--- a/README.md
+++ b/README.md
@@ -61,16 +61,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-storage
-  1.30.0
+  1.31.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-storage:1.30.0'
+compile 'com.google.cloud:google-cloud-storage:1.31.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.30.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.31.0"
 ```
 [//]: # ({x-version-update-end})
 
@@ -291,7 +291,7 @@ The easiest way to solve version conflicts is to use google-cloud's BOM. In Mave
       
         com.google.cloud
         google-cloud-bom
-        0.48.0-alpha
+        0.49.0-alpha
         pom
         import
       
diff --git a/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml b/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
index a29776ae6aab..11e83edbdf94 100644
--- a/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigquerydatatransfer-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-bigquerydatatransfer-v1
   GRPC library for grpc-google-cloud-bigquerydatatransfer-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
index 0d90f5077ec6..5c33ee068185 100644
--- a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigtable-admin-v2
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-bigtable-admin-v2
   GRPC library for grpc-google-cloud-bigtable-admin-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml b/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
index 549296a9c2a6..9933e2f06ad9 100644
--- a/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigtable-v2
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-bigtable-v2
   GRPC library for grpc-google-cloud-bigtable-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-container-v1/pom.xml b/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
index cd19c5be1dd2..70dca2bd9e2c 100644
--- a/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-container-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-container-v1
   GRPC library for grpc-google-cloud-container-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml b/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
index 74dd4809ecde..2bf971e2c1d7 100644
--- a/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dataproc-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-dataproc-v1
   GRPC library for grpc-google-cloud-dataproc-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml b/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
index 59325149cd60..a850dde702f8 100644
--- a/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dialogflow-v2
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-dialogflow-v2
   GRPC library for grpc-google-cloud-dialogflow-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
index 5ee959be85fa..937f04b64069 100644
--- a/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dialogflow-v2beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-dialogflow-v2beta1
   GRPC library for grpc-google-cloud-dialogflow-v2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml b/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
index d4e4416bc5dc..af2f5ddf6c69 100644
--- a/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dlp-v2
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-dlp-v2
   GRPC library for grpc-google-cloud-dlp-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
index e2bd26a92a6f..8ed80e9dcdad 100644
--- a/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-error-reporting-v1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-error-reporting-v1beta1
   GRPC library for grpc-google-cloud-error-reporting-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
index 24b90022a28d..70d18f498205 100644
--- a/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-firestore-v1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-firestore-v1beta1
   GRPC library for grpc-google-cloud-firestore-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml b/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
index a4dc7ae803df..052a0be2072c 100644
--- a/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-iot-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-iot-v1
   GRPC library for grpc-google-cloud-iot-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-language-v1/pom.xml b/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
index aed4213d88b3..d005140515d8 100644
--- a/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-language-v1
-  1.12.1-SNAPSHOT
+  1.13.0
   grpc-google-cloud-language-v1
   GRPC library for grpc-google-cloud-language-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml b/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
index 01d8c290d7c8..13fb695cd0bc 100644
--- a/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-language-v1beta2
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-language-v1beta2
   GRPC library for grpc-google-cloud-language-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml b/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
index 88eb535215be..7e28e2fc8ae7 100644
--- a/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-logging-v2
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-logging-v2
   GRPC library for grpc-google-cloud-logging-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml b/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
index 1bb266130351..de0c410ae90e 100644
--- a/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-monitoring-v3
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-monitoring-v3
   GRPC library for grpc-google-cloud-monitoring-v3
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml b/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
index 2d8b6aed69b1..56560f0171f4 100644
--- a/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-os-login-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-os-login-v1
   GRPC library for grpc-google-cloud-os-login-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml b/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
index bd70a06b9891..d488542320a4 100644
--- a/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-pubsub-v1
-  0.13.1-SNAPSHOT
+  1.13.0
   grpc-google-cloud-pubsub-v1
   GRPC library for grpc-google-cloud-pubsub-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
index 7ca2959e225c..9bae85c43948 100644
--- a/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-redis-v1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-redis-v1beta1
   GRPC library for grpc-google-cloud-redis-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
index 2c7f046b10b2..6d8ae0006255 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-admin-database-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-spanner-admin-database-v1
   GRPC library for grpc-google-cloud-spanner-admin-database-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
index d8f217fc49bb..4af724336528 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-admin-instance-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-spanner-admin-instance-v1
   GRPC library for grpc-google-cloud-spanner-admin-instance-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
index 373ee4e943b9..0eef60dbfef1 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-spanner-v1
   GRPC library for grpc-google-cloud-spanner-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
index 5c1d492af719..36a172c35bb4 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-speech-v1
   GRPC library for grpc-google-cloud-speech-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
index 851807891661..ea2f03e787b6 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-speech-v1beta1
   GRPC library for grpc-google-cloud-speech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
index 5005ca67aa7f..91d7f701f8e1 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1p1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-speech-v1p1beta1
   GRPC library for grpc-google-cloud-speech-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
index 8edd1d0e2943..ae6b2ed41d9d 100644
--- a/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-texttospeech-v1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-texttospeech-v1beta1
   GRPC library for grpc-google-cloud-texttospeech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml b/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
index e59fd731b9d3..217407ff1bdc 100644
--- a/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-trace-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-trace-v1
   GRPC library for grpc-google-cloud-trace-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml b/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
index bec21427cf6d..755cfe3d3f7c 100644
--- a/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-trace-v2
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-trace-v2
   GRPC library for grpc-google-cloud-trace-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
index 45d27e62e23f..b7b88d637259 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-video-intelligence-v1
   GRPC library for grpc-google-cloud-video-intelligence-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
index a83047346aff..1faa9b01a88e 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-video-intelligence-v1beta1
   GRPC library for grpc-google-cloud-video-intelligence-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
index 75dc02482b1a..1a55db5f4667 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1beta2
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-video-intelligence-v1beta2
   GRPC library for grpc-google-cloud-video-intelligence-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
index 6f77afb5c2ba..35d5796fe6df 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1p1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-video-intelligence-v1p1beta1
   GRPC library for grpc-google-cloud-video-intelligence-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
index 1b65af372e20..dd2da65a11e0 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1
-  1.12.1-SNAPSHOT
+  1.13.0
   grpc-google-cloud-vision-v1
   GRPC library for grpc-google-cloud-vision-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
index 60390d9cfb42..bb45f82b7825 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1p1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-vision-v1p1beta1
   GRPC library for grpc-google-cloud-vision-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
index 033d9527cbe0..e3ed4a77794a 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1p2beta1
-  1.12.1-SNAPSHOT
+  1.13.0
   grpc-google-cloud-vision-v1p2beta1
   GRPC library for grpc-google-cloud-vision-v1p2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
index 8a4a1027a3e3..5738cf19be34 100644
--- a/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-websecurityscanner-v1alpha
-  0.13.1-SNAPSHOT
+  0.14.0
   grpc-google-cloud-websecurityscanner-v1alpha
   GRPC library for grpc-google-cloud-websecurityscanner-v1alpha
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index a96165f3fe64..645e96a659d5 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -4,7 +4,7 @@
   com.google.api.grpc
   google-api-grpc
   pom
-  0.13.1-SNAPSHOT
+  0.14.0
   Google Cloud API gRPC
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-api-grpc
   
@@ -134,357 +134,357 @@
       
         com.google.api.grpc
         proto-google-cloud-bigtable-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-admin-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-admin-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-bigquerydatatransfer-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-bigquerydatatransfer-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-container-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-container-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-dataproc-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dataproc-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dlp-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-error-reporting-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-error-reporting-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-firestore-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-firestore-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1
-        1.12.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1
-        1.12.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1beta2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1beta2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-logging-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-logging-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-monitoring-v3
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-monitoring-v3
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-os-login-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-os-login-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-pubsub-v1
-        0.13.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-pubsub-v1
-        0.13.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-database-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-database-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-instance-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-instance-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1p1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1p1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-texttospeech-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-texttospeech-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1
-        1.12.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1
-        1.12.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p2beta1
-        1.12.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p2beta1
-        1.12.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1p1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1p1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-iot-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-iot-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-redis-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-redis-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-websecurityscanner-v1alpha
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-websecurityscanner-v1alpha
-        0.13.1-SNAPSHOT
+        0.14.0
       
     
   
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
index 53358db8abc6..f1c33153b11c 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigquerydatatransfer-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-bigquerydatatransfer-v1
   PROTO library for proto-google-cloud-bigquerydatatransfer-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
index 1395b0c440ee..9345c6aa405e 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigtable-admin-v2
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-bigtable-admin-v2
   PROTO library for proto-google-cloud-bigtable-admin-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml b/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
index 61da00e71abd..74a413eca4c1 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigtable-v2
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-bigtable-v2
   PROTO library for proto-google-cloud-bigtable-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-container-v1/pom.xml b/google-api-grpc/proto-google-cloud-container-v1/pom.xml
index 60dd95aeff32..a52e894e487f 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-container-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-container-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-container-v1
   PROTO library for proto-google-cloud-container-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml b/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
index a4a274edd245..2b497d9de584 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dataproc-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-dataproc-v1
   PROTO library for proto-google-cloud-dataproc-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml b/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
index e50b29643497..e5aeff1a21dd 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml b/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
index 21a1361c98af..6ceebedea034 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dialogflow-v2
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-dialogflow-v2
   PROTO library for proto-google-cloud-dialogflow-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
index 5f7499b0d9bc..9792535f16da 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dialogflow-v2beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-dialogflow-v2beta1
   PROTO library for proto-google-cloud-dialogflow-v2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml b/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
index 2f255d74049e..ae68291e9016 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dlp-v2
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-dlp-v2
   PROTO library for proto-google-cloud-dlp-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
index 5886d4706d13..de885f9a589b 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-error-reporting-v1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-error-reporting-v1beta1
   PROTO library for proto-google-cloud-error-reporting-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
index 648e5a889fc8..87dfa5fc0ff1 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-firestore-v1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-firestore-v1beta1
   PROTO library for proto-google-cloud-firestore-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/pom.xml b/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
index 21a1c0e35f54..edea52f0456f 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-iot-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-iot-v1
   PROTO library for proto-google-cloud-iot-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-language-v1/pom.xml b/google-api-grpc/proto-google-cloud-language-v1/pom.xml
index d656d349678f..e5a2d081d3b8 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-language-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-language-v1
-  1.12.1-SNAPSHOT
+  1.13.0
   proto-google-cloud-language-v1
   PROTO library for proto-google-cloud-language-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml b/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
index 647b748bb147..6cc23e59dd24 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-language-v1beta2
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-language-v1beta2
   PROTO library for proto-google-cloud-language-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/pom.xml b/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
index 8a43f28b9380..3f1576aef0f5 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-logging-v2
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-logging-v2
   PROTO library for proto-google-cloud-logging-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml b/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
index 279551415698..93374d249c6c 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-monitoring-v3
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-monitoring-v3
   PROTO library for proto-google-cloud-monitoring-v3
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml b/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
index d89738f6e6d1..5e29fa87f637 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-os-login-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-os-login-v1
   PROTO library for proto-google-cloud-os-login-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml b/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
index dd04bb795525..5fea0f556956 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-pubsub-v1
-  0.13.1-SNAPSHOT
+  1.13.0
   proto-google-cloud-pubsub-v1
   PROTO library for proto-google-cloud-pubsub-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
index f55a7f9143d7..7bdf1800473f 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-redis-v1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-redis-v1beta1
   PROTO library for proto-google-cloud-redis-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
index 5e492b1d60d9..5f2e970cee85 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-admin-database-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-spanner-admin-database-v1
   PROTO library for proto-google-cloud-spanner-admin-database-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
index 183efcde009a..b57193c99f02 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-admin-instance-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-spanner-admin-instance-v1
   PROTO library for proto-google-cloud-spanner-admin-instance-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
index 3cb469312c81..0b76c4cb6b5c 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-spanner-v1
   PROTO library for proto-google-cloud-spanner-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
index 3eddbd57be97..62cc41feef9f 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-speech-v1
   PROTO library for proto-google-cloud-speech-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
index 950795d1e013..d37557676492 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-speech-v1beta1
   PROTO library for proto-google-cloud-speech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
index e11a258761b0..b8cc0e8cceb1 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1p1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-speech-v1p1beta1
   PROTO library for proto-google-cloud-speech-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
index f974fb340eef..70bf1b7ff85c 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-texttospeech-v1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-texttospeech-v1beta1
   PROTO library for proto-google-cloud-texttospeech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/pom.xml b/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
index 6d7c436e3d51..17055af46953 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-trace-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-trace-v1
   PROTO library for proto-google-cloud-trace-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/pom.xml b/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
index ac8aeb04cfaa..2c0d3e65b391 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-trace-v2
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-trace-v2
   PROTO library for proto-google-cloud-trace-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
index b316fdffe505..ff221325d632 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-video-intelligence-v1
   PROTO library for proto-google-cloud-video-intelligence-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
index 779557fa8053..87e0dffb0acc 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-video-intelligence-v1beta1
   PROTO library for proto-google-cloud-video-intelligence-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
index c560e6405074..e64ca0a2c14a 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1beta2
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-video-intelligence-v1beta2
   PROTO library for proto-google-cloud-video-intelligence-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
index d065512c0a7d..b39c15fd944d 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1p1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-video-intelligence-v1p1beta1
   PROTO library for proto-google-cloud-video-intelligence-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
index ef19f7be3c0e..aaf5d561ed48 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1
-  1.12.1-SNAPSHOT
+  1.13.0
   proto-google-cloud-vision-v1
   PROTO library for proto-google-cloud-vision-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
index b8a88f563061..494ed03430b9 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1p1beta1
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-vision-v1p1beta1
   PROTO library for proto-google-cloud-vision-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
index 5e7201e96678..6ebeed3ab7e9 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1p2beta1
-  1.12.1-SNAPSHOT
+  1.13.0
   proto-google-cloud-vision-v1p2beta1
   PROTO library for proto-google-cloud-vision-v1p2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
index 104f7becc8e6..5a70d0e49e72 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-websecurityscanner-v1alpha
-  0.13.1-SNAPSHOT
+  0.14.0
   proto-google-cloud-websecurityscanner-v1alpha
   PROTO library for proto-google-cloud-websecurityscanner-v1alpha
   
     com.google.api.grpc
     google-api-grpc
-    0.13.1-SNAPSHOT
+    0.14.0
   
   
     
diff --git a/google-cloud-bom/README.md b/google-cloud-bom/README.md
index 6e65e946aa43..78373dd14fb4 100644
--- a/google-cloud-bom/README.md
+++ b/google-cloud-bom/README.md
@@ -13,7 +13,7 @@ To use it in Maven, add the following to your POM:
       
         com.google.cloud
         google-cloud-bom
-        0.48.0-alpha
+        0.49.0-alpha
         pom
         import
       
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index b82b37d6e7e1..5e15ba7b5ac2 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-bom
   pom
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   Google Cloud Java BOM
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bom
   
@@ -199,715 +199,715 @@
       
         com.google.cloud
         google-cloud-bigtable
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
       
       
         com.google.cloud
         google-cloud-bigtable
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-admin-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-admin-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-bigquery
-        1.30.1-SNAPSHOT
+        1.31.0
       
       
         com.google.cloud
         google-cloud-bigquery
-        1.30.1-SNAPSHOT
+        1.31.0
         test-jar
       
       
         com.google.cloud
         google-cloud-bigquerydatatransfer
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
       
       
         com.google.cloud
         google-cloud-bigquerydatatransfer
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-bigquerydatatransfer-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-bigquerydatatransfer-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-compute
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
       
       
         com.google.cloud
         google-cloud-compute
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         test-jar
       
       
         com.google.cloud
         google-cloud-container
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
       
       
         com.google.cloud
         google-cloud-container
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-container-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-container-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-contrib
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
       
       
         com.google.cloud
         google-cloud-contrib
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         test-jar
       
       
         com.google.cloud
         google-cloud-nio
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
       
       
         com.google.cloud
         google-cloud-nio
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         test-jar
       
       
         com.google.cloud
         google-cloud-core
-        1.30.1-SNAPSHOT
+        1.31.0
       
       
         com.google.cloud
         google-cloud-core
-        1.30.1-SNAPSHOT
+        1.31.0
         test-jar
       
       
         com.google.cloud
         google-cloud-core-grpc
-        1.30.1-SNAPSHOT
+        1.31.0
       
       
         com.google.cloud
         google-cloud-core-grpc
-        1.30.1-SNAPSHOT
+        1.31.0
         test-jar
       
       
         com.google.cloud
         google-cloud-core-http
-        1.30.1-SNAPSHOT
+        1.31.0
       
       
         com.google.cloud
         google-cloud-core-http
-        1.30.1-SNAPSHOT
+        1.31.0
         test-jar
       
       
         com.google.cloud
         google-cloud-dataproc
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
       
       
         com.google.cloud
         google-cloud-dataproc
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dataproc-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dataproc-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-datastore
-        1.30.1-SNAPSHOT
+        1.31.0
       
       
         com.google.cloud
         google-cloud-datastore
-        1.30.1-SNAPSHOT
+        1.31.0
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-dlp
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
       
       
         com.google.cloud
         google-cloud-dlp
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dlp-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-dialogflow
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
       
       
         com.google.cloud
         google-cloud-dialogflow
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-dns
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
       
       
         com.google.cloud
         google-cloud-dns
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         test-jar
       
       
         com.google.cloud
         google-cloud-errorreporting
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
       
       
         com.google.cloud
         google-cloud-errorreporting
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-error-reporting-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-error-reporting-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-firestore
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
       
       
         com.google.cloud
         google-cloud-firestore
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-firestore-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-firestore-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-language
-        1.30.1-SNAPSHOT
+        1.31.0
       
       
         com.google.cloud
         google-cloud-language
-        1.30.1-SNAPSHOT
+        1.31.0
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1
-        1.12.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1
-        1.12.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1beta2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1beta2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-logging
-        1.30.1-SNAPSHOT
+        1.31.0
       
       
         com.google.cloud
         google-cloud-logging
-        1.30.1-SNAPSHOT
+        1.31.0
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-logging-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-logging-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-logging-logback
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
       
 
       
         com.google.cloud
         google-cloud-monitoring
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
       
       
         com.google.cloud
         google-cloud-monitoring
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-monitoring-v3
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-monitoring-v3
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-os-login
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
       
       
         com.google.cloud
         google-cloud-os-login
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-os-login-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-os-login-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-pubsub
-        0.48.1-beta-SNAPSHOT
+        1.31.0
       
       
         com.google.cloud
         google-cloud-pubsub
-        0.48.1-beta-SNAPSHOT
+        1.31.0
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-pubsub-v1
-        0.13.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-pubsub-v1
-        0.13.1-SNAPSHOT
+        1.13.0
       
       
         com.google.cloud
         google-cloud-redis
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
       
       
         com.google.cloud
         google-cloud-redis
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-redis-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-redis-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-resourcemanager
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
       
       
         com.google.cloud
         google-cloud-resourcemanager
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         test-jar
       
       
         com.google.cloud
         google-cloud-spanner
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
       
       
         com.google.cloud
         google-cloud-spanner
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-database-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-database-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-instance-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-instance-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-speech
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
       
       
         com.google.cloud
         google-cloud-speech
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1p1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1p1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-storage
-        1.30.1-SNAPSHOT
+        1.31.0
       
       
         com.google.cloud
         google-cloud-storage
-        1.30.1-SNAPSHOT
+        1.31.0
         test-jar
       
       
         com.google.cloud
         google-cloud-texttospeech
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
       
       
         com.google.cloud
         google-cloud-texttospeech
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-texttospeech-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-texttospeech-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-trace
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
       
       
         com.google.cloud
         google-cloud-trace
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.cloud
         google-cloud-translate
-        1.30.1-SNAPSHOT
+        1.31.0
       
       
         com.google.cloud
         google-cloud-translate
-        1.30.1-SNAPSHOT
+        1.31.0
         test-jar
       
       
         com.google.cloud
         google-cloud-vision
-        1.30.1-SNAPSHOT
+        1.31.0
       
       
         com.google.cloud
         google-cloud-vision
-        1.30.1-SNAPSHOT
+        1.31.0
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1
-        1.12.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1
-        1.12.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p2beta1
-        1.12.1-SNAPSHOT
+        1.13.0
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p2beta1
-        1.12.1-SNAPSHOT
+        1.13.0
       
       
         com.google.cloud
         google-cloud-video-intelligence
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
       
       
         com.google.cloud
         google-cloud-video-intelligence
-        0.48.1-beta-SNAPSHOT
+        0.49.0-beta
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta2
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1p1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1p1beta1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-iot-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-iot-v1
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         proto-google-cloud-websecurityscanner-v1alpha
-        0.13.1-SNAPSHOT
+        0.14.0
       
       
         com.google.api.grpc
         grpc-google-cloud-websecurityscanner-v1alpha
-        0.13.1-SNAPSHOT
+        0.14.0
       
     
   
diff --git a/google-cloud-clients/google-cloud-bigquery/README.md b/google-cloud-clients/google-cloud-bigquery/README.md
index cd07059f3449..d2b3373937f7 100644
--- a/google-cloud-clients/google-cloud-bigquery/README.md
+++ b/google-cloud-clients/google-cloud-bigquery/README.md
@@ -20,16 +20,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-bigquery
-  1.30.0
+  1.31.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-bigquery:1.30.0'
+compile 'com.google.cloud:google-cloud-bigquery:1.31.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "1.30.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "1.31.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-bigquery/pom.xml b/google-cloud-clients/google-cloud-bigquery/pom.xml
index 41e8abd466dc..04530f68adc0 100644
--- a/google-cloud-clients/google-cloud-bigquery/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquery/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigquery
-  1.30.1-SNAPSHOT
+  1.31.0
   jar
   Google Cloud BigQuery
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquery
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-bigquery
diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md b/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md
index f94c5053a3d6..4e85b9b2b7f1 100644
--- a/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md
+++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/README.md
@@ -25,16 +25,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-bigquerydatatransfer
-  0.48.0-beta
+  0.49.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-bigquerydatatransfer:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-bigquerydatatransfer:0.49.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigquerydatatransfer" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigquerydatatransfer" % "0.49.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
index a5ede241c7d7..6a4bb922d0cd 100644
--- a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigquerydatatransfer
-  0.48.1-beta-SNAPSHOT
+  0.49.0-beta
   jar
   Google Cloud Bigquery Data Transfer
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquerydatatransfer
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-bigquerydatatransfer
diff --git a/google-cloud-clients/google-cloud-bigtable/README.md b/google-cloud-clients/google-cloud-bigtable/README.md
index fe8d8b30d608..c925363d525c 100644
--- a/google-cloud-clients/google-cloud-bigtable/README.md
+++ b/google-cloud-clients/google-cloud-bigtable/README.md
@@ -23,16 +23,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-bigtable
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-bigtable:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-bigtable:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index 910244a5e6b2..3a6ebf72bb62 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigtable
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud Bigtable
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigtable
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-bigtable
diff --git a/google-cloud-clients/google-cloud-compute/README.md b/google-cloud-clients/google-cloud-compute/README.md
index 52bdc19fbc89..596035d0ee1c 100644
--- a/google-cloud-clients/google-cloud-compute/README.md
+++ b/google-cloud-clients/google-cloud-compute/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-compute
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-compute:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-compute:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-compute/pom.xml b/google-cloud-clients/google-cloud-compute/pom.xml
index d8faab8a6303..7a52840e918d 100644
--- a/google-cloud-clients/google-cloud-compute/pom.xml
+++ b/google-cloud-clients/google-cloud-compute/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-compute
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud Compute
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-compute
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-compute
diff --git a/google-cloud-clients/google-cloud-container/README.md b/google-cloud-clients/google-cloud-container/README.md
index 2eb4b8959cbc..2cb456c317a4 100644
--- a/google-cloud-clients/google-cloud-container/README.md
+++ b/google-cloud-clients/google-cloud-container/README.md
@@ -24,16 +24,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-container
-  0.48.0-beta
+  0.49.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-container:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-container:0.49.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-container" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-container" % "0.49.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-container/pom.xml b/google-cloud-clients/google-cloud-container/pom.xml
index 8b5bb6d2a104..9c30d8ec991b 100644
--- a/google-cloud-clients/google-cloud-container/pom.xml
+++ b/google-cloud-clients/google-cloud-container/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-container
-  0.48.1-beta-SNAPSHOT
+  0.49.0-beta
   jar
   Google Cloud Container
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-container
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-container
diff --git a/google-cloud-clients/google-cloud-contrib/README.md b/google-cloud-clients/google-cloud-contrib/README.md
index 92d29ac1d372..6f646ea8f79c 100644
--- a/google-cloud-clients/google-cloud-contrib/README.md
+++ b/google-cloud-clients/google-cloud-contrib/README.md
@@ -26,16 +26,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-contrib
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-contrib:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-contrib:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-contrib" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-contrib" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md
index a486a65ab458..c284ddff7d84 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-logging-logback
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-logging-logback:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-logging-logback:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
index 88b1806af692..1f54c3f1abb0 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
@@ -5,7 +5,7 @@
   4.0.0
 
   google-cloud-logging-logback
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud Logging Logback Appender
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-logging-logback
@@ -20,7 +20,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
index caf4f374a63f..db601aa44b22 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
@@ -23,12 +23,12 @@ To run this example:
 
 [//]: # ({x-version-update-start:google-cloud-nio:current})
     ```
-    java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.48.1-alpha-SNAPSHOT.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.48.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
+    java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.49.0-alpha.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.49.0-alpha.jar com.google.cloud.nio.examples.ListFilesystems
     ```
 
     Notice that it lists Google Cloud Storage, which it wouldn't if you ran it without the NIO jar:
     ```
-    java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.48.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
+    java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.49.0-alpha.jar com.google.cloud.nio.examples.ListFilesystems
     ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
index 774b7a6b8210..d80280d60326 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-nio-examples
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud NIO Examples
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio-examples
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-nio-examples
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md
index fb3e9e3c86c0..4a9b4fc92ca4 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md
@@ -28,16 +28,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-nio
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-nio:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-nio:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-nio" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-nio" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
index 7701e0c0b7e5..8d7e79606040 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-nio
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud NIO
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-nio
diff --git a/google-cloud-clients/google-cloud-contrib/pom.xml b/google-cloud-clients/google-cloud-contrib/pom.xml
index af9310b47a09..bca8c8470f69 100644
--- a/google-cloud-clients/google-cloud-contrib/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-contrib
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   pom
   Google Cloud Contributions
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-contrib
diff --git a/google-cloud-clients/google-cloud-core-grpc/pom.xml b/google-cloud-clients/google-cloud-core-grpc/pom.xml
index cb6dd8106c84..a170eed85fcf 100644
--- a/google-cloud-clients/google-cloud-core-grpc/pom.xml
+++ b/google-cloud-clients/google-cloud-core-grpc/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-core-grpc
-  1.30.1-SNAPSHOT
+  1.31.0
   jar
   Google Cloud Core gRPC
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-core-grpc
diff --git a/google-cloud-clients/google-cloud-core-http/pom.xml b/google-cloud-clients/google-cloud-core-http/pom.xml
index 31b598d990fc..de6e9bdefaf3 100644
--- a/google-cloud-clients/google-cloud-core-http/pom.xml
+++ b/google-cloud-clients/google-cloud-core-http/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-core-http
-  1.30.1-SNAPSHOT
+  1.31.0
   jar
   Google Cloud Core HTTP
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-core-http
diff --git a/google-cloud-clients/google-cloud-core/README.md b/google-cloud-clients/google-cloud-core/README.md
index efaa15277877..693bb3aad11d 100644
--- a/google-cloud-clients/google-cloud-core/README.md
+++ b/google-cloud-clients/google-cloud-core/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-core
-  1.30.0
+  1.31.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-core:1.30.0'
+compile 'com.google.cloud:google-cloud-core:1.31.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-core" % "1.30.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-core" % "1.31.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-core/pom.xml b/google-cloud-clients/google-cloud-core/pom.xml
index 1bfbe3f375fc..26968c754265 100644
--- a/google-cloud-clients/google-cloud-core/pom.xml
+++ b/google-cloud-clients/google-cloud-core/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-core
-  1.30.1-SNAPSHOT
+  1.31.0
   jar
   Google Cloud Core
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-core
diff --git a/google-cloud-clients/google-cloud-dataproc/README.md b/google-cloud-clients/google-cloud-dataproc/README.md
index 5a94cc74de2f..549da569e3cb 100644
--- a/google-cloud-clients/google-cloud-dataproc/README.md
+++ b/google-cloud-clients/google-cloud-dataproc/README.md
@@ -24,16 +24,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-dataproc
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-dataproc:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-dataproc:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-dataproc" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-dataproc" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-dataproc/pom.xml b/google-cloud-clients/google-cloud-dataproc/pom.xml
index 55a186b13888..fa3725f46e85 100644
--- a/google-cloud-clients/google-cloud-dataproc/pom.xml
+++ b/google-cloud-clients/google-cloud-dataproc/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-dataproc
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud Dataproc
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dataproc
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-dataproc
diff --git a/google-cloud-clients/google-cloud-datastore/README.md b/google-cloud-clients/google-cloud-datastore/README.md
index d087855ac7b4..38a47726cd86 100644
--- a/google-cloud-clients/google-cloud-datastore/README.md
+++ b/google-cloud-clients/google-cloud-datastore/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-datastore
-  1.30.0
+  1.31.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-datastore:1.30.0'
+compile 'com.google.cloud:google-cloud-datastore:1.31.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.30.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.31.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-datastore/pom.xml b/google-cloud-clients/google-cloud-datastore/pom.xml
index 02bc47fc8582..9ae9d93451e4 100644
--- a/google-cloud-clients/google-cloud-datastore/pom.xml
+++ b/google-cloud-clients/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.30.1-SNAPSHOT
+  1.31.0
   jar
   Google Cloud Datastore
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-datastore
diff --git a/google-cloud-clients/google-cloud-dialogflow/README.md b/google-cloud-clients/google-cloud-dialogflow/README.md
index ea699cc7d84e..65cb0fffc51e 100644
--- a/google-cloud-clients/google-cloud-dialogflow/README.md
+++ b/google-cloud-clients/google-cloud-dialogflow/README.md
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-dialogflow
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-dialogflow:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-dialogflow:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-dialogflow/pom.xml b/google-cloud-clients/google-cloud-dialogflow/pom.xml
index 1e3db817492a..e8fc0b98b5ad 100644
--- a/google-cloud-clients/google-cloud-dialogflow/pom.xml
+++ b/google-cloud-clients/google-cloud-dialogflow/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-dialogflow
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud Dialog Flow API
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dialogflow
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-dialogflow
diff --git a/google-cloud-clients/google-cloud-dlp/README.md b/google-cloud-clients/google-cloud-dlp/README.md
index 5fcbd57301e6..04f6fd8752f2 100644
--- a/google-cloud-clients/google-cloud-dlp/README.md
+++ b/google-cloud-clients/google-cloud-dlp/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-dlp
-  0.48.0-beta
+  0.49.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-dlp:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-dlp:0.49.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-dlp" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-dlp" % "0.49.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-dlp/pom.xml b/google-cloud-clients/google-cloud-dlp/pom.xml
index 6ebcf157805b..d00426f9da9d 100644
--- a/google-cloud-clients/google-cloud-dlp/pom.xml
+++ b/google-cloud-clients/google-cloud-dlp/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-dlp
-  0.48.1-beta-SNAPSHOT
+  0.49.0-beta
   jar
   Google Cloud Data Loss Prevention API
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dlp
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-dlp
diff --git a/google-cloud-clients/google-cloud-dns/README.md b/google-cloud-clients/google-cloud-dns/README.md
index e950cb879887..458e380cbe05 100644
--- a/google-cloud-clients/google-cloud-dns/README.md
+++ b/google-cloud-clients/google-cloud-dns/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-dns
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-dns:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-dns:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-dns" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-dns" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-dns/pom.xml b/google-cloud-clients/google-cloud-dns/pom.xml
index 5c862cfbd67f..659351bd0480 100644
--- a/google-cloud-clients/google-cloud-dns/pom.xml
+++ b/google-cloud-clients/google-cloud-dns/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-dns
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud DNS
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dns
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-dns
diff --git a/google-cloud-clients/google-cloud-errorreporting/README.md b/google-cloud-clients/google-cloud-errorreporting/README.md
index e1a8586dab1b..aab43befd3d1 100644
--- a/google-cloud-clients/google-cloud-errorreporting/README.md
+++ b/google-cloud-clients/google-cloud-errorreporting/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-errorreporting
-  0.48.0-beta
+  0.49.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-errorreporting:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-errorreporting:0.49.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-errorreporting" % "0.49.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-errorreporting/pom.xml b/google-cloud-clients/google-cloud-errorreporting/pom.xml
index 9e33861e3ba6..0b8dbe94649f 100644
--- a/google-cloud-clients/google-cloud-errorreporting/pom.xml
+++ b/google-cloud-clients/google-cloud-errorreporting/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-errorreporting
-  0.48.1-beta-SNAPSHOT
+  0.49.0-beta
   jar
   Google Cloud Error Reporting
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-errorreporting
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-errorreporting
diff --git a/google-cloud-clients/google-cloud-firestore/README.md b/google-cloud-clients/google-cloud-firestore/README.md
index d8679c8f1f48..2879ae9e67f0 100644
--- a/google-cloud-clients/google-cloud-firestore/README.md
+++ b/google-cloud-clients/google-cloud-firestore/README.md
@@ -14,16 +14,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-firestore
-  0.48.0-beta
+  0.49.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-firestore:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-firestore:0.49.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "0.49.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-firestore/pom.xml b/google-cloud-clients/google-cloud-firestore/pom.xml
index c3832e1c66d5..7029384127af 100644
--- a/google-cloud-clients/google-cloud-firestore/pom.xml
+++ b/google-cloud-clients/google-cloud-firestore/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-firestore
-  0.48.1-beta-SNAPSHOT
+  0.49.0-beta
   jar
   Google Cloud Firestore
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-firestore
@@ -15,7 +15,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-firestore
diff --git a/google-cloud-clients/google-cloud-iot/README.md b/google-cloud-clients/google-cloud-iot/README.md
index eb2fc8b008b9..8e7b1d5c27dd 100644
--- a/google-cloud-clients/google-cloud-iot/README.md
+++ b/google-cloud-clients/google-cloud-iot/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-iot
-  0.48.0-beta
+  0.49.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-iot:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-iot:0.49.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-iot" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-iot" % "0.49.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-iot/pom.xml b/google-cloud-clients/google-cloud-iot/pom.xml
index 1e52a03ccf22..d1398b3e5702 100644
--- a/google-cloud-clients/google-cloud-iot/pom.xml
+++ b/google-cloud-clients/google-cloud-iot/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-iot
-  0.48.1-beta-SNAPSHOT
+  0.49.0-beta
   jar
   Google Cloud IoT
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-iot
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-iot
diff --git a/google-cloud-clients/google-cloud-language/README.md b/google-cloud-clients/google-cloud-language/README.md
index 1632714ab117..7b49f6f49d50 100644
--- a/google-cloud-clients/google-cloud-language/README.md
+++ b/google-cloud-clients/google-cloud-language/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-language
-  1.30.0
+  1.31.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-language:1.30.0'
+compile 'com.google.cloud:google-cloud-language:1.31.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-language" % "1.30.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-language" % "1.31.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-language/pom.xml b/google-cloud-clients/google-cloud-language/pom.xml
index 1ec41d330696..e7432c6a1fdd 100644
--- a/google-cloud-clients/google-cloud-language/pom.xml
+++ b/google-cloud-clients/google-cloud-language/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-language
-  1.30.1-SNAPSHOT
+  1.31.0
   jar
   Google Cloud Natural Language
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-language
@@ -15,7 +15,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-language
diff --git a/google-cloud-clients/google-cloud-logging/README.md b/google-cloud-clients/google-cloud-logging/README.md
index 518bd62ab07e..9746927af2ec 100644
--- a/google-cloud-clients/google-cloud-logging/README.md
+++ b/google-cloud-clients/google-cloud-logging/README.md
@@ -21,16 +21,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-logging
-  1.30.0
+  1.31.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-logging:1.30.0'
+compile 'com.google.cloud:google-cloud-logging:1.31.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "1.30.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "1.31.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
index c5f0614a4099..1f67772f3edf 100644
--- a/google-cloud-clients/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-logging
-  1.30.1-SNAPSHOT
+  1.31.0
   jar
   Google Cloud Logging
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-logging
diff --git a/google-cloud-clients/google-cloud-monitoring/README.md b/google-cloud-clients/google-cloud-monitoring/README.md
index 1ec637d80862..ae5ed9211a62 100644
--- a/google-cloud-clients/google-cloud-monitoring/README.md
+++ b/google-cloud-clients/google-cloud-monitoring/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-monitoring
-  0.48.0-beta
+  0.49.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-monitoring:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-monitoring:0.49.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-monitoring" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-monitoring" % "0.49.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-monitoring/pom.xml b/google-cloud-clients/google-cloud-monitoring/pom.xml
index e2fbefe146be..cc9bc3442fc3 100644
--- a/google-cloud-clients/google-cloud-monitoring/pom.xml
+++ b/google-cloud-clients/google-cloud-monitoring/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-monitoring
-  0.48.1-beta-SNAPSHOT
+  0.49.0-beta
   jar
   Google Cloud Monitoring
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-monitoring
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-monitoring
diff --git a/google-cloud-clients/google-cloud-notification/README.md b/google-cloud-clients/google-cloud-notification/README.md
index d2cdb43a0a44..80ac5574e78d 100644
--- a/google-cloud-clients/google-cloud-notification/README.md
+++ b/google-cloud-clients/google-cloud-notification/README.md
@@ -14,16 +14,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-notification
-  0.48.0-beta
+  0.49.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-notification:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-notification:0.49.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-notification" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-notification" % "0.49.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-notification/pom.xml b/google-cloud-clients/google-cloud-notification/pom.xml
index a3e81b6eb1a3..69974c641118 100644
--- a/google-cloud-clients/google-cloud-notification/pom.xml
+++ b/google-cloud-clients/google-cloud-notification/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-notification
-  0.48.1-beta-SNAPSHOT
+  0.49.0-beta
   jar
   Google Cloud Pub/Sub Notifications for GCS
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-notification
@@ -15,7 +15,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-notification
diff --git a/google-cloud-clients/google-cloud-os-login/README.md b/google-cloud-clients/google-cloud-os-login/README.md
index 550cea3e661c..364a3e5a07fb 100644
--- a/google-cloud-clients/google-cloud-os-login/README.md
+++ b/google-cloud-clients/google-cloud-os-login/README.md
@@ -24,16 +24,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-os-login
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-os-login:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-os-login:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-os-login" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-os-login" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-os-login/pom.xml b/google-cloud-clients/google-cloud-os-login/pom.xml
index 9ee5502545f9..4050a4504e8f 100644
--- a/google-cloud-clients/google-cloud-os-login/pom.xml
+++ b/google-cloud-clients/google-cloud-os-login/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-os-login
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud OS Login
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-os-login
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-os-login
diff --git a/google-cloud-clients/google-cloud-pubsub/README.md b/google-cloud-clients/google-cloud-pubsub/README.md
index 7c52f35873b5..ee85f1e4018a 100644
--- a/google-cloud-clients/google-cloud-pubsub/README.md
+++ b/google-cloud-clients/google-cloud-pubsub/README.md
@@ -24,16 +24,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-pubsub
-  0.48.0-beta
+  1.31.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-pubsub:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-pubsub:1.31.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.31.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-pubsub/pom.xml b/google-cloud-clients/google-cloud-pubsub/pom.xml
index 4fbd1cc99921..42ff0011d3c7 100644
--- a/google-cloud-clients/google-cloud-pubsub/pom.xml
+++ b/google-cloud-clients/google-cloud-pubsub/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-pubsub
-  0.48.1-beta-SNAPSHOT
+  1.31.0
   jar
   Google Cloud Pub/Sub
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-pubsub
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-pubsub
diff --git a/google-cloud-clients/google-cloud-redis/README.md b/google-cloud-clients/google-cloud-redis/README.md
index 9b92a24f97ac..09c66f1180ae 100644
--- a/google-cloud-clients/google-cloud-redis/README.md
+++ b/google-cloud-clients/google-cloud-redis/README.md
@@ -24,16 +24,16 @@ Add this to your pom.xml file
 
   com.google.cloud
   google-cloud-redis
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-redis:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-redis:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-redis" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-redis" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-redis/pom.xml b/google-cloud-clients/google-cloud-redis/pom.xml
index b1d3028db72a..837e9f09c3b8 100644
--- a/google-cloud-clients/google-cloud-redis/pom.xml
+++ b/google-cloud-clients/google-cloud-redis/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-redis
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud Redis
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-redis
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-redis
diff --git a/google-cloud-clients/google-cloud-resourcemanager/README.md b/google-cloud-clients/google-cloud-resourcemanager/README.md
index 98db58a59853..09283fd079d6 100644
--- a/google-cloud-clients/google-cloud-resourcemanager/README.md
+++ b/google-cloud-clients/google-cloud-resourcemanager/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-resourcemanager
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-resourcemanager:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-resourcemanager:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-resourcemanager" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-resourcemanager" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-resourcemanager/pom.xml b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
index 51c4cade4375..61e95e79a38b 100644
--- a/google-cloud-clients/google-cloud-resourcemanager/pom.xml
+++ b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-resourcemanager
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud Resource Manager
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-resourcemanager
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-resourcemanager
diff --git a/google-cloud-clients/google-cloud-spanner/README.md b/google-cloud-clients/google-cloud-spanner/README.md
index bcc7d8f65eb9..b3a23e8f7ee5 100644
--- a/google-cloud-clients/google-cloud-spanner/README.md
+++ b/google-cloud-clients/google-cloud-spanner/README.md
@@ -22,16 +22,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-spanner
-  0.48.0-beta
+  0.49.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-spanner:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-spanner:0.49.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "0.49.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
index cfb2631ec5de..9ae74ae373b7 100644
--- a/google-cloud-clients/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -4,7 +4,7 @@
                               http://maven.apache.org/maven-v4_0_0.xsd">
   4.0.0
   google-cloud-spanner
-  0.48.1-beta-SNAPSHOT
+  0.49.0-beta
   jar
   Google Cloud Spanner
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-spanner
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-spanner
diff --git a/google-cloud-clients/google-cloud-speech/README.md b/google-cloud-clients/google-cloud-speech/README.md
index 474e9f51e344..621f40cd74ee 100644
--- a/google-cloud-clients/google-cloud-speech/README.md
+++ b/google-cloud-clients/google-cloud-speech/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-speech
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-speech:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-speech:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-speech" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-speech" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-speech/pom.xml b/google-cloud-clients/google-cloud-speech/pom.xml
index 9deef77b2520..255b8cac2cc4 100644
--- a/google-cloud-clients/google-cloud-speech/pom.xml
+++ b/google-cloud-clients/google-cloud-speech/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-speech
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud Speech
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-speech
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-speech
diff --git a/google-cloud-clients/google-cloud-storage/README.md b/google-cloud-clients/google-cloud-storage/README.md
index 17e424866991..93e6b6e53ca6 100644
--- a/google-cloud-clients/google-cloud-storage/README.md
+++ b/google-cloud-clients/google-cloud-storage/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-storage
-  1.30.0
+  1.31.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-storage:1.30.0'
+compile 'com.google.cloud:google-cloud-storage:1.31.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.30.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.31.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-storage/pom.xml b/google-cloud-clients/google-cloud-storage/pom.xml
index ca3711cee34d..4554081a7f81 100644
--- a/google-cloud-clients/google-cloud-storage/pom.xml
+++ b/google-cloud-clients/google-cloud-storage/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-storage
-  1.30.1-SNAPSHOT
+  1.31.0
   jar
   Google Cloud Storage
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-storage
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-storage
diff --git a/google-cloud-clients/google-cloud-texttospeech/README.md b/google-cloud-clients/google-cloud-texttospeech/README.md
index feef52da2fcd..97d6a44aed6b 100644
--- a/google-cloud-clients/google-cloud-texttospeech/README.md
+++ b/google-cloud-clients/google-cloud-texttospeech/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-texttospeech
-  0.48.0-beta
+  0.49.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-texttospeech:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-texttospeech:0.49.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-texttospeech" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-texttospeech" % "0.49.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-texttospeech/pom.xml b/google-cloud-clients/google-cloud-texttospeech/pom.xml
index 0cdeb1234d2f..2c2efd1505d6 100644
--- a/google-cloud-clients/google-cloud-texttospeech/pom.xml
+++ b/google-cloud-clients/google-cloud-texttospeech/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-texttospeech
-  0.48.1-beta-SNAPSHOT
+  0.49.0-beta
   jar
   Google Cloud Text-to-Speech
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-texttospeech
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-texttospeech-v1beta1
diff --git a/google-cloud-clients/google-cloud-trace/README.md b/google-cloud-clients/google-cloud-trace/README.md
index 9087665ca5bf..4afabf216bf9 100644
--- a/google-cloud-clients/google-cloud-trace/README.md
+++ b/google-cloud-clients/google-cloud-trace/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-trace
-  0.48.0-beta
+  0.49.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-trace:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-trace:0.49.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-trace" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-trace" % "0.49.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-trace/pom.xml b/google-cloud-clients/google-cloud-trace/pom.xml
index 906c9c6be403..b846651b84ee 100644
--- a/google-cloud-clients/google-cloud-trace/pom.xml
+++ b/google-cloud-clients/google-cloud-trace/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-trace
-  0.48.1-beta-SNAPSHOT
+  0.49.0-beta
   jar
   Google Cloud Trace
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-trace
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-trace
diff --git a/google-cloud-clients/google-cloud-translate/README.md b/google-cloud-clients/google-cloud-translate/README.md
index 1136c1684984..2efcb08b7802 100644
--- a/google-cloud-clients/google-cloud-translate/README.md
+++ b/google-cloud-clients/google-cloud-translate/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-translate
-  1.30.0
+  1.31.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-translate:1.30.0'
+compile 'com.google.cloud:google-cloud-translate:1.31.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-translate" % "1.30.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-translate" % "1.31.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-translate/pom.xml b/google-cloud-clients/google-cloud-translate/pom.xml
index 81433e8d566a..d0840b5e7aa0 100644
--- a/google-cloud-clients/google-cloud-translate/pom.xml
+++ b/google-cloud-clients/google-cloud-translate/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-translate
-  1.30.1-SNAPSHOT
+  1.31.0
   jar
   Google Cloud Translation
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-translate
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-translate
diff --git a/google-cloud-clients/google-cloud-video-intelligence/README.md b/google-cloud-clients/google-cloud-video-intelligence/README.md
index f5d503c41c6f..7deda801b472 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/README.md
+++ b/google-cloud-clients/google-cloud-video-intelligence/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-video-intelligence
-  0.48.0-beta
+  0.49.0-beta
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-video-intelligence:0.48.0-beta'
+compile 'com.google.cloud:google-cloud-video-intelligence:0.49.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-video-intelligence" % "0.48.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-video-intelligence" % "0.49.0-beta"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-video-intelligence/pom.xml b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
index 1a609a9dc428..c087db463b65 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/pom.xml
+++ b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-video-intelligence
-  0.48.1-beta-SNAPSHOT
+  0.49.0-beta
   jar
   Google Cloud Video Intelligence
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-video-intelligence
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-video-intelligence
diff --git a/google-cloud-clients/google-cloud-vision/README.md b/google-cloud-clients/google-cloud-vision/README.md
index ed12897c7261..ba13d20d85e8 100644
--- a/google-cloud-clients/google-cloud-vision/README.md
+++ b/google-cloud-clients/google-cloud-vision/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-vision
-  1.30.0
+  1.31.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-vision:1.30.0'
+compile 'com.google.cloud:google-cloud-vision:1.31.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-vision" % "1.30.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-vision" % "1.31.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-vision/pom.xml b/google-cloud-clients/google-cloud-vision/pom.xml
index cf593f8050bc..688299cd35c4 100644
--- a/google-cloud-clients/google-cloud-vision/pom.xml
+++ b/google-cloud-clients/google-cloud-vision/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-vision
-  1.30.1-SNAPSHOT
+  1.31.0
   jar
   Google Cloud Vision
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-vision
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-vision
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/README.md b/google-cloud-clients/google-cloud-websecurityscanner/README.md
index 59a8b2bb675f..5d8a90b40aaa 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/README.md
+++ b/google-cloud-clients/google-cloud-websecurityscanner/README.md
@@ -24,16 +24,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-websecurityscanner
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-websecurityscanner:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-websecurityscanner:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-websecurityscanner" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-websecurityscanner" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
index e95226343a83..5400ac4329aa 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
+++ b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-websecurityscanner
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud Web Security Scanner
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-websecurityscanner
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-websecurityscanner
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index dd9b6e56751c..c7c7cca271de 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -6,7 +6,7 @@
   com.google.cloud
   google-cloud-clients
   pom
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   Google Cloud
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients
   
@@ -154,7 +154,7 @@
     UTF-8
     github
     google-cloud-clients
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
     1.23.0
     1.25.0
     0.9.1
diff --git a/google-cloud-examples/README.md b/google-cloud-examples/README.md
index 687ccb13e7c4..f4becfb0788d 100644
--- a/google-cloud-examples/README.md
+++ b/google-cloud-examples/README.md
@@ -21,16 +21,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-examples
-  0.48.0-alpha
+  0.49.0-alpha
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-examples:0.48.0-alpha'
+compile 'com.google.cloud:google-cloud-examples:0.49.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-examples" % "0.48.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-examples" % "0.49.0-alpha"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
index 4a1e7d3334ca..1fc6f6e7d4be 100644
--- a/google-cloud-examples/pom.xml
+++ b/google-cloud-examples/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   com.google.cloud
   google-cloud-examples
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud Examples
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-examples
@@ -18,7 +18,7 @@
       
         com.google.cloud
         google-cloud-bom
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         pom
         import
       
diff --git a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
index 5f17abc352f8..d837763521eb 100644
--- a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
+++ b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appengineflexcompat
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
 
   
diff --git a/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml b/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml
index 76d58baa2e21..62d3a92eb186 100644
--- a/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml
+++ b/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appengineflexcustom
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
 
   
diff --git a/google-cloud-testing/google-cloud-appengineflexjava/pom.xml b/google-cloud-testing/google-cloud-appengineflexjava/pom.xml
index 7d043882507b..f429839f6444 100644
--- a/google-cloud-testing/google-cloud-appengineflexjava/pom.xml
+++ b/google-cloud-testing/google-cloud-appengineflexjava/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appengineflexjava
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
 
   
diff --git a/google-cloud-testing/google-cloud-appenginejava8/pom.xml b/google-cloud-testing/google-cloud-appenginejava8/pom.xml
index cb65281bf52d..c3d0a3f8ce45 100644
--- a/google-cloud-testing/google-cloud-appenginejava8/pom.xml
+++ b/google-cloud-testing/google-cloud-appenginejava8/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appenginejava8
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
 
   
diff --git a/google-cloud-testing/google-cloud-managedtest/pom.xml b/google-cloud-testing/google-cloud-managedtest/pom.xml
index 528e86b253d6..29034ab57428 100644
--- a/google-cloud-testing/google-cloud-managedtest/pom.xml
+++ b/google-cloud-testing/google-cloud-managedtest/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-managedtest
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
 
   
     google-cloud-testing
     com.google.cloud
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
 
   
diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml
index 54bb9394227c..42dc9a1a9302 100644
--- a/google-cloud-testing/pom.xml
+++ b/google-cloud-testing/pom.xml
@@ -5,7 +5,7 @@
   4.0.0
   com.google.cloud
   google-cloud-testing
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   pom
 
   Google Cloud Testing
@@ -30,7 +30,7 @@
       
         com.google.cloud
         google-cloud-bom
-        0.48.1-alpha-SNAPSHOT
+        0.49.0-alpha
         pom
         import
       
diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml
index 5cedfc4ba610..b0d2a9b42b1b 100644
--- a/google-cloud-util/google-cloud-compat-checker/pom.xml
+++ b/google-cloud-util/google-cloud-compat-checker/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-compat-checker
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   jar
   Google Cloud Java Compatibility Checker
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util/google-cloud-compat-checker
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-util
-    0.48.1-alpha-SNAPSHOT
+    0.49.0-alpha
   
   
     google-cloud-compat-checker
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index afb58ef7b5ea..5880708c829c 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   com.google.cloud
   google-cloud-util
-  0.48.1-alpha-SNAPSHOT
+  0.49.0-alpha
   pom
   Google Cloud Util
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util
diff --git a/versions.txt b/versions.txt
index ca75a779591e..b3908205914a 100644
--- a/versions.txt
+++ b/versions.txt
@@ -5,132 +5,132 @@
 # google-api-grpc versions
 #
 # parent
-google-api-grpc:0.13.0:0.13.1-SNAPSHOT
+google-api-grpc:0.14.0:0.14.0
 # children
 #grpc-google-cloud-datastore-v1
-grpc-google-cloud-bigquerydatatransfer-v1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-bigtable-admin-v2:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-bigtable-v2:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-container-v1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-dataproc-v1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-dialogflow-v2:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-dialogflow-v2beta1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-dlp-v2:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-error-reporting-v1beta1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-firestore-v1beta1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-language-v1:1.12.0:1.12.1-SNAPSHOT
-grpc-google-cloud-language-v1beta2:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-logging-v2:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-monitoring-v3:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-os-login-v1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-pubsub-v1:1.12.0:1.12.1-SNAPSHOT
-grpc-google-cloud-spanner-admin-database-v1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-spanner-admin-instance-v1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-spanner-v1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-speech-v1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-speech-v1beta1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-speech-v1p1beta1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-texttospeech-v1beta1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-trace-v1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-trace-v2:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-video-intelligence-v1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-video-intelligence-v1beta1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-video-intelligence-v1beta2:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-video-intelligence-v1p1beta1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-vision-v1:1.12.0:1.12.1-SNAPSHOT
-grpc-google-cloud-vision-v1p1beta1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-vision-v1p2beta1:1.12.0:1.12.1-SNAPSHOT
-grpc-google-cloud-iot-v1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-redis-v1beta1:0.13.0:0.13.1-SNAPSHOT
-grpc-google-cloud-websecurityscanner-v1alpha:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-bigquerydatatransfer-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-bigtable-admin-v2:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-bigtable-v2:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-container-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-dataproc-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-datastore-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-dialogflow-v2:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-dialogflow-v2beta1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-dlp-v2:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-error-reporting-v1beta1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-firestore-v1beta1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-language-v1:1.12.0:1.12.1-SNAPSHOT
-proto-google-cloud-language-v1beta2:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-logging-v2:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-monitoring-v3:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-os-login-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-pubsub-v1:1.12.0:1.12.1-SNAPSHOT
-proto-google-cloud-spanner-admin-database-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-spanner-admin-instance-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-spanner-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-speech-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-speech-v1beta1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-speech-v1p1beta1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-texttospeech-v1beta1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-trace-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-trace-v2:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-video-intelligence-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-video-intelligence-v1beta1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-video-intelligence-v1beta2:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-video-intelligence-v1p1beta1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-vision-v1:1.12.0:1.12.1-SNAPSHOT
-proto-google-cloud-vision-v1p1beta1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-vision-v1p2beta1:1.12.0:1.12.1-SNAPSHOT
-proto-google-cloud-iot-v1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-redis-v1beta1:0.13.0:0.13.1-SNAPSHOT
-proto-google-cloud-websecurityscanner-v1alpha:0.13.0:0.13.1-SNAPSHOT
+grpc-google-cloud-bigquerydatatransfer-v1:0.14.0:0.14.0
+grpc-google-cloud-bigtable-admin-v2:0.14.0:0.14.0
+grpc-google-cloud-bigtable-v2:0.14.0:0.14.0
+grpc-google-cloud-container-v1:0.14.0:0.14.0
+grpc-google-cloud-dataproc-v1:0.14.0:0.14.0
+grpc-google-cloud-dialogflow-v2:0.14.0:0.14.0
+grpc-google-cloud-dialogflow-v2beta1:0.14.0:0.14.0
+grpc-google-cloud-dlp-v2:0.14.0:0.14.0
+grpc-google-cloud-error-reporting-v1beta1:0.14.0:0.14.0
+grpc-google-cloud-firestore-v1beta1:0.14.0:0.14.0
+grpc-google-cloud-language-v1:1.13.0:1.13.0
+grpc-google-cloud-language-v1beta2:0.14.0:0.14.0
+grpc-google-cloud-logging-v2:0.14.0:0.14.0
+grpc-google-cloud-monitoring-v3:0.14.0:0.14.0
+grpc-google-cloud-os-login-v1:0.14.0:0.14.0
+grpc-google-cloud-pubsub-v1:1.13.0:1.13.0
+grpc-google-cloud-spanner-admin-database-v1:0.14.0:0.14.0
+grpc-google-cloud-spanner-admin-instance-v1:0.14.0:0.14.0
+grpc-google-cloud-spanner-v1:0.14.0:0.14.0
+grpc-google-cloud-speech-v1:0.14.0:0.14.0
+grpc-google-cloud-speech-v1beta1:0.14.0:0.14.0
+grpc-google-cloud-speech-v1p1beta1:0.14.0:0.14.0
+grpc-google-cloud-texttospeech-v1beta1:0.14.0:0.14.0
+grpc-google-cloud-trace-v1:0.14.0:0.14.0
+grpc-google-cloud-trace-v2:0.14.0:0.14.0
+grpc-google-cloud-video-intelligence-v1:0.14.0:0.14.0
+grpc-google-cloud-video-intelligence-v1beta1:0.14.0:0.14.0
+grpc-google-cloud-video-intelligence-v1beta2:0.14.0:0.14.0
+grpc-google-cloud-video-intelligence-v1p1beta1:0.14.0:0.14.0
+grpc-google-cloud-vision-v1:1.13.0:1.13.0
+grpc-google-cloud-vision-v1p1beta1:0.14.0:0.14.0
+grpc-google-cloud-vision-v1p2beta1:1.13.0:1.13.0
+grpc-google-cloud-iot-v1:0.14.0:0.14.0
+grpc-google-cloud-redis-v1beta1:0.14.0:0.14.0
+grpc-google-cloud-websecurityscanner-v1alpha:0.14.0:0.14.0
+proto-google-cloud-bigquerydatatransfer-v1:0.14.0:0.14.0
+proto-google-cloud-bigtable-admin-v2:0.14.0:0.14.0
+proto-google-cloud-bigtable-v2:0.14.0:0.14.0
+proto-google-cloud-container-v1:0.14.0:0.14.0
+proto-google-cloud-dataproc-v1:0.14.0:0.14.0
+proto-google-cloud-datastore-v1:0.14.0:0.14.0
+proto-google-cloud-dialogflow-v2:0.14.0:0.14.0
+proto-google-cloud-dialogflow-v2beta1:0.14.0:0.14.0
+proto-google-cloud-dlp-v2:0.14.0:0.14.0
+proto-google-cloud-error-reporting-v1beta1:0.14.0:0.14.0
+proto-google-cloud-firestore-v1beta1:0.14.0:0.14.0
+proto-google-cloud-language-v1:1.13.0:1.13.0
+proto-google-cloud-language-v1beta2:0.14.0:0.14.0
+proto-google-cloud-logging-v2:0.14.0:0.14.0
+proto-google-cloud-monitoring-v3:0.14.0:0.14.0
+proto-google-cloud-os-login-v1:0.14.0:0.14.0
+proto-google-cloud-pubsub-v1:1.13.0:1.13.0
+proto-google-cloud-spanner-admin-database-v1:0.14.0:0.14.0
+proto-google-cloud-spanner-admin-instance-v1:0.14.0:0.14.0
+proto-google-cloud-spanner-v1:0.14.0:0.14.0
+proto-google-cloud-speech-v1:0.14.0:0.14.0
+proto-google-cloud-speech-v1beta1:0.14.0:0.14.0
+proto-google-cloud-speech-v1p1beta1:0.14.0:0.14.0
+proto-google-cloud-texttospeech-v1beta1:0.14.0:0.14.0
+proto-google-cloud-trace-v1:0.14.0:0.14.0
+proto-google-cloud-trace-v2:0.14.0:0.14.0
+proto-google-cloud-video-intelligence-v1:0.14.0:0.14.0
+proto-google-cloud-video-intelligence-v1beta1:0.14.0:0.14.0
+proto-google-cloud-video-intelligence-v1beta2:0.14.0:0.14.0
+proto-google-cloud-video-intelligence-v1p1beta1:0.14.0:0.14.0
+proto-google-cloud-vision-v1:1.13.0:1.13.0
+proto-google-cloud-vision-v1p1beta1:0.14.0:0.14.0
+proto-google-cloud-vision-v1p2beta1:1.13.0:1.13.0
+proto-google-cloud-iot-v1:0.14.0:0.14.0
+proto-google-cloud-redis-v1beta1:0.14.0:0.14.0
+proto-google-cloud-websecurityscanner-v1alpha:0.14.0:0.14.0
 
 #
 # google-cloud-clients versions
 #
 # parent
-google-cloud-clients:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-clients:0.49.0-alpha:0.49.0-alpha
 # children
-google-cloud-appengineflexcompat:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-appengineflexcustom:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-appengineflexjava:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-appenginejava8:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-bigquery:1.30.0:1.30.1-SNAPSHOT
-google-cloud-bigquerydatatransfer:0.48.0-beta:0.48.1-beta-SNAPSHOT
-google-cloud-bigtable:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-bom:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-compat-checker:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-compute:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-container:0.48.0-beta:0.48.1-beta-SNAPSHOT
-google-cloud-contrib:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-core:1.30.0:1.30.1-SNAPSHOT
-google-cloud-core-grpc:1.30.0:1.30.1-SNAPSHOT
-google-cloud-core-http:1.30.0:1.30.1-SNAPSHOT
-google-cloud-dataproc:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-datastore:1.30.0:1.30.1-SNAPSHOT
-google-cloud-dialogflow:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-dlp:0.48.0-beta:0.48.1-beta-SNAPSHOT
-google-cloud-dns:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-errorreporting:0.48.0-beta:0.48.1-beta-SNAPSHOT
-google-cloud-examples:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-firestore:0.48.0-beta:0.48.1-beta-SNAPSHOT
-google-cloud-language:1.30.0:1.30.1-SNAPSHOT
-google-cloud-logging:1.30.0:1.30.1-SNAPSHOT
-google-cloud-logging-logback:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-managedtest:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-monitoring:0.48.0-beta:0.48.1-beta-SNAPSHOT
-google-cloud-nio:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-nio-examples:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-notification:0.48.0-beta:0.48.1-beta-SNAPSHOT
-google-cloud-os-login:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-pubsub:1.30.0:1.30.1-SNAPSHOT
-google-cloud-redis:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-resourcemanager:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-spanner:0.48.0-beta:0.48.1-beta-SNAPSHOT
-google-cloud-speech:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-storage:1.30.0:1.30.1-SNAPSHOT
-google-cloud-texttospeech:0.48.0-beta:0.48.1-beta-SNAPSHOT
-google-cloud-testing:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-trace:0.48.0-beta:0.48.1-beta-SNAPSHOT
-google-cloud-translate:1.30.0:1.30.1-SNAPSHOT
-google-cloud-util:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
-google-cloud-video-intelligence:0.48.0-beta:0.48.1-beta-SNAPSHOT
-google-cloud-vision:1.30.0:1.30.1-SNAPSHOT
-google-cloud-iot:0.48.0-beta:0.48.1-beta-SNAPSHOT
-google-cloud-websecurityscanner:0.48.0-alpha:0.48.1-alpha-SNAPSHOT
+google-cloud-appengineflexcompat:0.49.0-alpha:0.49.0-alpha
+google-cloud-appengineflexcustom:0.49.0-alpha:0.49.0-alpha
+google-cloud-appengineflexjava:0.49.0-alpha:0.49.0-alpha
+google-cloud-appenginejava8:0.49.0-alpha:0.49.0-alpha
+google-cloud:0.49.0-alpha:0.49.0-alpha
+google-cloud-bigquery:1.31.0:1.31.0
+google-cloud-bigquerydatatransfer:0.49.0-beta:0.49.0-beta
+google-cloud-bigtable:0.49.0-alpha:0.49.0-alpha
+google-cloud-bom:0.49.0-alpha:0.49.0-alpha
+google-cloud-compat-checker:0.49.0-alpha:0.49.0-alpha
+google-cloud-compute:0.49.0-alpha:0.49.0-alpha
+google-cloud-container:0.49.0-beta:0.49.0-beta
+google-cloud-contrib:0.49.0-alpha:0.49.0-alpha
+google-cloud-core:1.31.0:1.31.0
+google-cloud-core-grpc:1.31.0:1.31.0
+google-cloud-core-http:1.31.0:1.31.0
+google-cloud-dataproc:0.49.0-alpha:0.49.0-alpha
+google-cloud-datastore:1.31.0:1.31.0
+google-cloud-dialogflow:0.49.0-alpha:0.49.0-alpha
+google-cloud-dlp:0.49.0-beta:0.49.0-beta
+google-cloud-dns:0.49.0-alpha:0.49.0-alpha
+google-cloud-errorreporting:0.49.0-beta:0.49.0-beta
+google-cloud-examples:0.49.0-alpha:0.49.0-alpha
+google-cloud-firestore:0.49.0-beta:0.49.0-beta
+google-cloud-language:1.31.0:1.31.0
+google-cloud-logging:1.31.0:1.31.0
+google-cloud-logging-logback:0.49.0-alpha:0.49.0-alpha
+google-cloud-managedtest:0.49.0-alpha:0.49.0-alpha
+google-cloud-monitoring:0.49.0-beta:0.49.0-beta
+google-cloud-nio:0.49.0-alpha:0.49.0-alpha
+google-cloud-nio-examples:0.49.0-alpha:0.49.0-alpha
+google-cloud-notification:0.49.0-beta:0.49.0-beta
+google-cloud-os-login:0.49.0-alpha:0.49.0-alpha
+google-cloud-pubsub:1.31.0:1.31.0
+google-cloud-redis:0.49.0-alpha:0.49.0-alpha
+google-cloud-resourcemanager:0.49.0-alpha:0.49.0-alpha
+google-cloud-spanner:0.49.0-beta:0.49.0-beta
+google-cloud-speech:0.49.0-alpha:0.49.0-alpha
+google-cloud-storage:1.31.0:1.31.0
+google-cloud-texttospeech:0.49.0-beta:0.49.0-beta
+google-cloud-testing:0.49.0-alpha:0.49.0-alpha
+google-cloud-trace:0.49.0-beta:0.49.0-beta
+google-cloud-translate:1.31.0:1.31.0
+google-cloud-util:0.49.0-alpha:0.49.0-alpha
+google-cloud-video-intelligence:0.49.0-beta:0.49.0-beta
+google-cloud-vision:1.31.0:1.31.0
+google-cloud-iot:0.49.0-beta:0.49.0-beta
+google-cloud-websecurityscanner:0.49.0-alpha:0.49.0-alpha

From 7835d9f5e2a5bcffa03f9d23e7e396a2d902c4ac Mon Sep 17 00:00:00 2001
From: neozwu 
Date: Thu, 24 May 2018 11:10:53 -0700
Subject: [PATCH 55/65] bump version for development (#3311)

---
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-bigtable-v2/pom.xml     |   4 +-
 .../grpc-google-cloud-container-v1/pom.xml    |   4 +-
 .../grpc-google-cloud-dataproc-v1/pom.xml     |   4 +-
 .../grpc-google-cloud-dialogflow-v2/pom.xml   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-dlp-v2/pom.xml          |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-iot-v1/pom.xml          |   4 +-
 .../grpc-google-cloud-language-v1/pom.xml     |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-logging-v2/pom.xml      |   4 +-
 .../grpc-google-cloud-monitoring-v3/pom.xml   |   4 +-
 .../grpc-google-cloud-os-login-v1/pom.xml     |   4 +-
 .../grpc-google-cloud-pubsub-v1/pom.xml       |   4 +-
 .../grpc-google-cloud-redis-v1beta1/pom.xml   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-spanner-v1/pom.xml      |   4 +-
 .../grpc-google-cloud-speech-v1/pom.xml       |   4 +-
 .../grpc-google-cloud-speech-v1beta1/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-trace-v1/pom.xml        |   4 +-
 .../grpc-google-cloud-trace-v2/pom.xml        |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../grpc-google-cloud-vision-v1/pom.xml       |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 google-api-grpc/pom.xml                       | 144 ++++-----
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-bigtable-v2/pom.xml    |   4 +-
 .../proto-google-cloud-container-v1/pom.xml   |   4 +-
 .../proto-google-cloud-dataproc-v1/pom.xml    |   4 +-
 .../proto-google-cloud-datastore-v1/pom.xml   |   4 +-
 .../proto-google-cloud-dialogflow-v2/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-dlp-v2/pom.xml         |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-iot-v1/pom.xml         |   4 +-
 .../proto-google-cloud-language-v1/pom.xml    |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-logging-v2/pom.xml     |   4 +-
 .../proto-google-cloud-monitoring-v3/pom.xml  |   4 +-
 .../proto-google-cloud-os-login-v1/pom.xml    |   4 +-
 .../proto-google-cloud-pubsub-v1/pom.xml      |   4 +-
 .../proto-google-cloud-redis-v1beta1/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-spanner-v1/pom.xml     |   4 +-
 .../proto-google-cloud-speech-v1/pom.xml      |   4 +-
 .../proto-google-cloud-speech-v1beta1/pom.xml |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-trace-v1/pom.xml       |   4 +-
 .../proto-google-cloud-trace-v2/pom.xml       |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../proto-google-cloud-vision-v1/pom.xml      |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 google-cloud-bom/pom.xml                      | 274 +++++++++---------
 .../google-cloud-bigquery/pom.xml             |   4 +-
 .../google-cloud-bigquerydatatransfer/pom.xml |   4 +-
 .../google-cloud-bigtable/pom.xml             |   4 +-
 .../google-cloud-compute/pom.xml              |   4 +-
 .../google-cloud-container/pom.xml            |   4 +-
 .../google-cloud-logging-logback/pom.xml      |   4 +-
 .../google-cloud-nio-examples/README.md       |   4 +-
 .../google-cloud-nio-examples/pom.xml         |   4 +-
 .../google-cloud-nio/pom.xml                  |   4 +-
 .../google-cloud-contrib/pom.xml              |   4 +-
 .../google-cloud-core-grpc/pom.xml            |   4 +-
 .../google-cloud-core-http/pom.xml            |   4 +-
 .../google-cloud-core/pom.xml                 |   4 +-
 .../google-cloud-dataproc/pom.xml             |   4 +-
 .../google-cloud-datastore/pom.xml            |   4 +-
 .../google-cloud-dialogflow/pom.xml           |   4 +-
 google-cloud-clients/google-cloud-dlp/pom.xml |   4 +-
 google-cloud-clients/google-cloud-dns/pom.xml |   4 +-
 .../google-cloud-errorreporting/pom.xml       |   4 +-
 .../google-cloud-firestore/pom.xml            |   4 +-
 google-cloud-clients/google-cloud-iot/pom.xml |   4 +-
 .../google-cloud-language/pom.xml             |   4 +-
 .../google-cloud-logging/pom.xml              |   4 +-
 .../google-cloud-monitoring/pom.xml           |   4 +-
 .../google-cloud-notification/pom.xml         |   4 +-
 .../google-cloud-os-login/pom.xml             |   4 +-
 .../google-cloud-pubsub/pom.xml               |   4 +-
 .../google-cloud-redis/pom.xml                |   4 +-
 .../google-cloud-resourcemanager/pom.xml      |   4 +-
 .../google-cloud-spanner/pom.xml              |   4 +-
 .../google-cloud-speech/pom.xml               |   4 +-
 .../google-cloud-storage/pom.xml              |   4 +-
 .../google-cloud-texttospeech/pom.xml         |   4 +-
 .../google-cloud-trace/pom.xml                |   4 +-
 .../google-cloud-translate/pom.xml            |   4 +-
 .../google-cloud-video-intelligence/pom.xml   |   4 +-
 .../google-cloud-vision/pom.xml               |   4 +-
 .../google-cloud-websecurityscanner/pom.xml   |   4 +-
 google-cloud-clients/pom.xml                  |   4 +-
 google-cloud-examples/pom.xml                 |   4 +-
 .../google-cloud-appengineflexcompat/pom.xml  |   4 +-
 .../google-cloud-appengineflexcustom/pom.xml  |   4 +-
 .../google-cloud-appengineflexjava/pom.xml    |   4 +-
 .../google-cloud-appenginejava8/pom.xml       |   4 +-
 .../google-cloud-managedtest/pom.xml          |   4 +-
 google-cloud-testing/pom.xml                  |   4 +-
 .../google-cloud-compat-checker/pom.xml       |   4 +-
 google-cloud-util/pom.xml                     |   2 +-
 versions.txt                                  | 242 ++++++++--------
 122 files changed, 567 insertions(+), 567 deletions(-)

diff --git a/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml b/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
index 11e83edbdf94..9f7f151db328 100644
--- a/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigquerydatatransfer-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-bigquerydatatransfer-v1
   GRPC library for grpc-google-cloud-bigquerydatatransfer-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
index 5c33ee068185..27eea82f57b7 100644
--- a/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigtable-admin-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigtable-admin-v2
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-bigtable-admin-v2
   GRPC library for grpc-google-cloud-bigtable-admin-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml b/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
index 9933e2f06ad9..6b86591bc014 100644
--- a/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-bigtable-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-bigtable-v2
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-bigtable-v2
   GRPC library for grpc-google-cloud-bigtable-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-container-v1/pom.xml b/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
index 70dca2bd9e2c..dcc73df5bf4f 100644
--- a/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-container-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-container-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-container-v1
   GRPC library for grpc-google-cloud-container-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml b/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
index 2bf971e2c1d7..a8985f14b6e4 100644
--- a/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dataproc-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dataproc-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-dataproc-v1
   GRPC library for grpc-google-cloud-dataproc-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml b/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
index a850dde702f8..84e275497c0d 100644
--- a/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dialogflow-v2
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-dialogflow-v2
   GRPC library for grpc-google-cloud-dialogflow-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
index 937f04b64069..476ae7811c0d 100644
--- a/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dialogflow-v2beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-dialogflow-v2beta1
   GRPC library for grpc-google-cloud-dialogflow-v2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml b/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
index af2f5ddf6c69..3f2a4d364fae 100644
--- a/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dlp-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-dlp-v2
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-dlp-v2
   GRPC library for grpc-google-cloud-dlp-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
index 8ed80e9dcdad..f3148d54f5a9 100644
--- a/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-error-reporting-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-error-reporting-v1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-error-reporting-v1beta1
   GRPC library for grpc-google-cloud-error-reporting-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
index 70d18f498205..8dc1ba22c8e8 100644
--- a/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-firestore-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-firestore-v1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-firestore-v1beta1
   GRPC library for grpc-google-cloud-firestore-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml b/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
index 052a0be2072c..18b5012f681e 100644
--- a/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-iot-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-iot-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-iot-v1
   GRPC library for grpc-google-cloud-iot-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-language-v1/pom.xml b/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
index d005140515d8..af1e93b4cbbc 100644
--- a/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-language-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-language-v1
-  1.13.0
+  1.13.1-SNAPSHOT
   grpc-google-cloud-language-v1
   GRPC library for grpc-google-cloud-language-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml b/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
index 13fb695cd0bc..536e0e856b2d 100644
--- a/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-language-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-language-v1beta2
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-language-v1beta2
   GRPC library for grpc-google-cloud-language-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml b/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
index 7e28e2fc8ae7..2da5a700b08c 100644
--- a/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-logging-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-logging-v2
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-logging-v2
   GRPC library for grpc-google-cloud-logging-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml b/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
index de0c410ae90e..8e3516827895 100644
--- a/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-monitoring-v3/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-monitoring-v3
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-monitoring-v3
   GRPC library for grpc-google-cloud-monitoring-v3
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml b/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
index 56560f0171f4..a9204c340eab 100644
--- a/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-os-login-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-os-login-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-os-login-v1
   GRPC library for grpc-google-cloud-os-login-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml b/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
index d488542320a4..c8cf4e95269a 100644
--- a/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-pubsub-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-pubsub-v1
-  1.13.0
+  1.13.1-SNAPSHOT
   grpc-google-cloud-pubsub-v1
   GRPC library for grpc-google-cloud-pubsub-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
index 9bae85c43948..e0adc6dcf214 100644
--- a/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-redis-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-redis-v1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-redis-v1beta1
   GRPC library for grpc-google-cloud-redis-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
index 6d8ae0006255..f6c321abd3ee 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-admin-database-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-admin-database-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-spanner-admin-database-v1
   GRPC library for grpc-google-cloud-spanner-admin-database-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
index 4af724336528..e59fca062dd1 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-admin-instance-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-spanner-admin-instance-v1
   GRPC library for grpc-google-cloud-spanner-admin-instance-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml b/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
index 0eef60dbfef1..3c225009caec 100644
--- a/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-spanner-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-spanner-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-spanner-v1
   GRPC library for grpc-google-cloud-spanner-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
index 36a172c35bb4..b3ac159a0470 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-speech-v1
   GRPC library for grpc-google-cloud-speech-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
index ea2f03e787b6..c02308e48dd5 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-speech-v1beta1
   GRPC library for grpc-google-cloud-speech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
index 91d7f701f8e1..9c9b94fe00b6 100644
--- a/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-speech-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-speech-v1p1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-speech-v1p1beta1
   GRPC library for grpc-google-cloud-speech-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
index ae6b2ed41d9d..4a07f0e545d7 100644
--- a/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-texttospeech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-texttospeech-v1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-texttospeech-v1beta1
   GRPC library for grpc-google-cloud-texttospeech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml b/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
index 217407ff1bdc..b61fc6bfbdbb 100644
--- a/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-trace-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-trace-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-trace-v1
   GRPC library for grpc-google-cloud-trace-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml b/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
index 755cfe3d3f7c..3fc76c9a7519 100644
--- a/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-trace-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-trace-v2
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-trace-v2
   GRPC library for grpc-google-cloud-trace-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
index b7b88d637259..7a2eef0dfea2 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-video-intelligence-v1
   GRPC library for grpc-google-cloud-video-intelligence-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
index 1faa9b01a88e..667794787c45 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-video-intelligence-v1beta1
   GRPC library for grpc-google-cloud-video-intelligence-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
index 1a55db5f4667..fca8dba71c8c 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1beta2
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-video-intelligence-v1beta2
   GRPC library for grpc-google-cloud-video-intelligence-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
index 35d5796fe6df..d8d9a9bb2273 100644
--- a/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-video-intelligence-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-video-intelligence-v1p1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-video-intelligence-v1p1beta1
   GRPC library for grpc-google-cloud-video-intelligence-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
index dd2da65a11e0..76f6cf941a4e 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1
-  1.13.0
+  1.13.1-SNAPSHOT
   grpc-google-cloud-vision-v1
   GRPC library for grpc-google-cloud-vision-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
index bb45f82b7825..3ae4e1a8f287 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1p1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-vision-v1p1beta1
   GRPC library for grpc-google-cloud-vision-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
index e3ed4a77794a..6098a7ef0f9f 100644
--- a/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-vision-v1p2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-vision-v1p2beta1
-  1.13.0
+  1.13.1-SNAPSHOT
   grpc-google-cloud-vision-v1p2beta1
   GRPC library for grpc-google-cloud-vision-v1p2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
index 5738cf19be34..a831f5a341bd 100644
--- a/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-websecurityscanner-v1alpha/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   grpc-google-cloud-websecurityscanner-v1alpha
-  0.14.0
+  0.14.1-SNAPSHOT
   grpc-google-cloud-websecurityscanner-v1alpha
   GRPC library for grpc-google-cloud-websecurityscanner-v1alpha
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 645e96a659d5..658712dc4177 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -4,7 +4,7 @@
   com.google.api.grpc
   google-api-grpc
   pom
-  0.14.0
+  0.14.1-SNAPSHOT
   Google Cloud API gRPC
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-api-grpc
   
@@ -134,357 +134,357 @@
       
         com.google.api.grpc
         proto-google-cloud-bigtable-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-admin-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-admin-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-bigquerydatatransfer-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigquerydatatransfer-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-container-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-container-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dataproc-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dataproc-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dlp-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-error-reporting-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-error-reporting-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-firestore-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-firestore-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1beta2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1beta2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-logging-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-logging-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-monitoring-v3
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-monitoring-v3
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-os-login-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-os-login-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-pubsub-v1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-pubsub-v1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-database-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-database-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-instance-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-instance-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1p1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1p1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-texttospeech-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-texttospeech-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p2beta1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p2beta1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1p1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1p1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-iot-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-iot-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-redis-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-redis-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-websecurityscanner-v1alpha
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-websecurityscanner-v1alpha
-        0.14.0
+        0.14.1-SNAPSHOT
       
     
   
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
index f1c33153b11c..ca02e9672296 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigquerydatatransfer-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-bigquerydatatransfer-v1
   PROTO library for proto-google-cloud-bigquerydatatransfer-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
index 9345c6aa405e..ae4cfa3c3d74 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigtable-admin-v2
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-bigtable-admin-v2
   PROTO library for proto-google-cloud-bigtable-admin-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml b/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
index 74a413eca4c1..1f1ebf539834 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-bigtable-v2
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-bigtable-v2
   PROTO library for proto-google-cloud-bigtable-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-container-v1/pom.xml b/google-api-grpc/proto-google-cloud-container-v1/pom.xml
index a52e894e487f..c3fb14029e65 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-container-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-container-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-container-v1
   PROTO library for proto-google-cloud-container-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml b/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
index 2b497d9de584..54675786bb04 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dataproc-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-dataproc-v1
   PROTO library for proto-google-cloud-dataproc-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml b/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
index e5aeff1a21dd..d63819c98199 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-datastore-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-datastore-v1
   PROTO library for proto-google-cloud-datastore-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml b/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
index 6ceebedea034..45cbe60120dc 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dialogflow-v2
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-dialogflow-v2
   PROTO library for proto-google-cloud-dialogflow-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
index 9792535f16da..4537c63d0e32 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dialogflow-v2beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-dialogflow-v2beta1
   PROTO library for proto-google-cloud-dialogflow-v2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml b/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
index ae68291e9016..3acf264fcf99 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-dlp-v2
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-dlp-v2
   PROTO library for proto-google-cloud-dlp-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
index de885f9a589b..c7622f343e54 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-error-reporting-v1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-error-reporting-v1beta1
   PROTO library for proto-google-cloud-error-reporting-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
index 87dfa5fc0ff1..68b4c5afe605 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-firestore-v1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-firestore-v1beta1
   PROTO library for proto-google-cloud-firestore-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/pom.xml b/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
index edea52f0456f..2c6fcd6b9be0 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-iot-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-iot-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-iot-v1
   PROTO library for proto-google-cloud-iot-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-language-v1/pom.xml b/google-api-grpc/proto-google-cloud-language-v1/pom.xml
index e5a2d081d3b8..50d1bd5291ce 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-language-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-language-v1
-  1.13.0
+  1.13.1-SNAPSHOT
   proto-google-cloud-language-v1
   PROTO library for proto-google-cloud-language-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml b/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
index 6cc23e59dd24..488078817159 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-language-v1beta2
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-language-v1beta2
   PROTO library for proto-google-cloud-language-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/pom.xml b/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
index 3f1576aef0f5..7897b00ce15f 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-logging-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-logging-v2
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-logging-v2
   PROTO library for proto-google-cloud-logging-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml b/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
index 93374d249c6c..dd1ee22fd1fe 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-monitoring-v3
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-monitoring-v3
   PROTO library for proto-google-cloud-monitoring-v3
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml b/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
index 5e29fa87f637..a2071e3ca2c1 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-os-login-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-os-login-v1
   PROTO library for proto-google-cloud-os-login-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml b/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
index 5fea0f556956..2b5e6bbd1963 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-pubsub-v1
-  1.13.0
+  1.13.1-SNAPSHOT
   proto-google-cloud-pubsub-v1
   PROTO library for proto-google-cloud-pubsub-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
index 7bdf1800473f..daa8de18bc17 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-redis-v1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-redis-v1beta1
   PROTO library for proto-google-cloud-redis-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
index 5f2e970cee85..83d136b942cb 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-admin-database-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-spanner-admin-database-v1
   PROTO library for proto-google-cloud-spanner-admin-database-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
index b57193c99f02..946a6ac794b5 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-admin-instance-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-spanner-admin-instance-v1
   PROTO library for proto-google-cloud-spanner-admin-instance-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml b/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
index 0b76c4cb6b5c..0341fc47c98c 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-spanner-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-spanner-v1
   PROTO library for proto-google-cloud-spanner-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
index 62cc41feef9f..ef66a4bf9582 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-speech-v1
   PROTO library for proto-google-cloud-speech-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
index d37557676492..6251102b98ce 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-speech-v1beta1
   PROTO library for proto-google-cloud-speech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
index b8cc0e8cceb1..7b0d5d43ba17 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-speech-v1p1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-speech-v1p1beta1
   PROTO library for proto-google-cloud-speech-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
index 70bf1b7ff85c..3876323ca515 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-texttospeech-v1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-texttospeech-v1beta1
   PROTO library for proto-google-cloud-texttospeech-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/pom.xml b/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
index 17055af46953..35af58308afe 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-trace-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-trace-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-trace-v1
   PROTO library for proto-google-cloud-trace-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/pom.xml b/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
index 2c0d3e65b391..9f8caee9fa3a 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-trace-v2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-trace-v2
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-trace-v2
   PROTO library for proto-google-cloud-trace-v2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
index ff221325d632..b4c3feccab42 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-video-intelligence-v1
   PROTO library for proto-google-cloud-video-intelligence-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
index 87e0dffb0acc..dd6b6b547f94 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-video-intelligence-v1beta1
   PROTO library for proto-google-cloud-video-intelligence-v1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
index e64ca0a2c14a..be1d8d3fbe5e 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1beta2
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-video-intelligence-v1beta2
   PROTO library for proto-google-cloud-video-intelligence-v1beta2
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
index b39c15fd944d..0833b5cf05d0 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-video-intelligence-v1p1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-video-intelligence-v1p1beta1
   PROTO library for proto-google-cloud-video-intelligence-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
index aaf5d561ed48..44728d73e3d6 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1
-  1.13.0
+  1.13.1-SNAPSHOT
   proto-google-cloud-vision-v1
   PROTO library for proto-google-cloud-vision-v1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
index 494ed03430b9..f271a0afcdc8 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1p1beta1
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-vision-v1p1beta1
   PROTO library for proto-google-cloud-vision-v1p1beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
index 6ebeed3ab7e9..a0dd38d11252 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-vision-v1p2beta1
-  1.13.0
+  1.13.1-SNAPSHOT
   proto-google-cloud-vision-v1p2beta1
   PROTO library for proto-google-cloud-vision-v1p2beta1
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
index 5a70d0e49e72..b2090bb61d71 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/pom.xml
@@ -3,13 +3,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   proto-google-cloud-websecurityscanner-v1alpha
-  0.14.0
+  0.14.1-SNAPSHOT
   proto-google-cloud-websecurityscanner-v1alpha
   PROTO library for proto-google-cloud-websecurityscanner-v1alpha
   
     com.google.api.grpc
     google-api-grpc
-    0.14.0
+    0.14.1-SNAPSHOT
   
   
     
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index 5e15ba7b5ac2..764858bc1f04 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -4,7 +4,7 @@
   com.google.cloud
   google-cloud-bom
   pom
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   Google Cloud Java BOM
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bom
   
@@ -199,715 +199,715 @@
       
         com.google.cloud
         google-cloud-bigtable
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-bigtable
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-bigtable-admin-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigtable-admin-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-bigquery
-        1.31.0
+        1.31.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-bigquery
-        1.31.0
+        1.31.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-bigquerydatatransfer
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-bigquerydatatransfer
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-bigquerydatatransfer-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-bigquerydatatransfer-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-compute
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-compute
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-container
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-container
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-container-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-container-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-contrib
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-contrib
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-nio
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-nio
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-core
-        1.31.0
+        1.31.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-core
-        1.31.0
+        1.31.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-core-grpc
-        1.31.0
+        1.31.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-core-grpc
-        1.31.0
+        1.31.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-core-http
-        1.31.0
+        1.31.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-core-http
-        1.31.0
+        1.31.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-dataproc
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dataproc
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dataproc-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dataproc-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.31.0
+        1.31.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-datastore
-        1.31.0
+        1.31.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-datastore-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dlp
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dlp
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dlp-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dlp-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dialogflow
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dialogflow
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-dialogflow-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-dialogflow-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dns
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-dns
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-errorreporting
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-errorreporting
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-error-reporting-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-error-reporting-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-firestore
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-firestore
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-firestore-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-firestore-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-language
-        1.31.0
+        1.31.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-language
-        1.31.0
+        1.31.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-language-v1beta2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-language-v1beta2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-logging
-        1.31.0
+        1.31.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-logging
-        1.31.0
+        1.31.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-logging-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-logging-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-logging-logback
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
       
 
       
         com.google.cloud
         google-cloud-monitoring
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-monitoring
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-monitoring-v3
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-monitoring-v3
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-os-login
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-os-login
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-os-login-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-os-login-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-pubsub
-        1.31.0
+        1.31.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-pubsub
-        1.31.0
+        1.31.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-pubsub-v1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-pubsub-v1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-redis
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-redis
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-redis-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-redis-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-resourcemanager
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-resourcemanager
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-spanner
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-spanner
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-database-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-database-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-spanner-admin-instance-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-spanner-admin-instance-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-speech
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-speech
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1p1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1p1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-speech-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-speech-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-storage
-        1.31.0
+        1.31.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-storage
-        1.31.0
+        1.31.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-texttospeech
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-texttospeech
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-texttospeech-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-texttospeech-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-trace
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-trace
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-trace-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-trace-v2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-translate
-        1.31.0
+        1.31.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-translate
-        1.31.0
+        1.31.1-SNAPSHOT
         test-jar
       
       
         com.google.cloud
         google-cloud-vision
-        1.31.0
+        1.31.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-vision
-        1.31.0
+        1.31.1-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-vision-v1p2beta1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-vision-v1p2beta1
-        1.13.0
+        1.13.1-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-video-intelligence
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
       
       
         com.google.cloud
         google-cloud-video-intelligence
-        0.49.0-beta
+        0.49.1-beta-SNAPSHOT
         test-jar
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1beta2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1beta2
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-video-intelligence-v1p1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-video-intelligence-v1p1beta1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-iot-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-iot-v1
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         proto-google-cloud-websecurityscanner-v1alpha
-        0.14.0
+        0.14.1-SNAPSHOT
       
       
         com.google.api.grpc
         grpc-google-cloud-websecurityscanner-v1alpha
-        0.14.0
+        0.14.1-SNAPSHOT
       
     
   
diff --git a/google-cloud-clients/google-cloud-bigquery/pom.xml b/google-cloud-clients/google-cloud-bigquery/pom.xml
index 04530f68adc0..5d8430b9a57b 100644
--- a/google-cloud-clients/google-cloud-bigquery/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquery/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigquery
-  1.31.0
+  1.31.1-SNAPSHOT
   jar
   Google Cloud BigQuery
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquery
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-bigquery
diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
index 6a4bb922d0cd..773d2e45c4c4 100644
--- a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigquerydatatransfer
-  0.49.0-beta
+  0.49.1-beta-SNAPSHOT
   jar
   Google Cloud Bigquery Data Transfer
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquerydatatransfer
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-bigquerydatatransfer
diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index 3a6ebf72bb62..8bfd421f12d5 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigtable
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud Bigtable
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigtable
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-bigtable
diff --git a/google-cloud-clients/google-cloud-compute/pom.xml b/google-cloud-clients/google-cloud-compute/pom.xml
index 7a52840e918d..00c286fadff0 100644
--- a/google-cloud-clients/google-cloud-compute/pom.xml
+++ b/google-cloud-clients/google-cloud-compute/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-compute
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud Compute
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-compute
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-compute
diff --git a/google-cloud-clients/google-cloud-container/pom.xml b/google-cloud-clients/google-cloud-container/pom.xml
index 9c30d8ec991b..a0a9aabd56d9 100644
--- a/google-cloud-clients/google-cloud-container/pom.xml
+++ b/google-cloud-clients/google-cloud-container/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-container
-  0.49.0-beta
+  0.49.1-beta-SNAPSHOT
   jar
   Google Cloud Container
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-container
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-container
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
index 1f54c3f1abb0..4b7397708304 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
@@ -5,7 +5,7 @@
   4.0.0
 
   google-cloud-logging-logback
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud Logging Logback Appender
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-logging-logback
@@ -20,7 +20,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
index db601aa44b22..b7501615ee54 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
@@ -23,12 +23,12 @@ To run this example:
 
 [//]: # ({x-version-update-start:google-cloud-nio:current})
     ```
-    java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.49.0-alpha.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.49.0-alpha.jar com.google.cloud.nio.examples.ListFilesystems
+    java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.49.1-alpha-SNAPSHOT.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.49.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
     ```
 
     Notice that it lists Google Cloud Storage, which it wouldn't if you ran it without the NIO jar:
     ```
-    java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.49.0-alpha.jar com.google.cloud.nio.examples.ListFilesystems
+    java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.49.1-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
     ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
index d80280d60326..dbcf184f55c4 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-nio-examples
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud NIO Examples
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio-examples
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-nio-examples
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
index 8d7e79606040..a323d91c33ba 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-nio
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud NIO
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-contrib
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-nio
diff --git a/google-cloud-clients/google-cloud-contrib/pom.xml b/google-cloud-clients/google-cloud-contrib/pom.xml
index bca8c8470f69..97b81d36bb7b 100644
--- a/google-cloud-clients/google-cloud-contrib/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-contrib
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   pom
   Google Cloud Contributions
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-contrib
diff --git a/google-cloud-clients/google-cloud-core-grpc/pom.xml b/google-cloud-clients/google-cloud-core-grpc/pom.xml
index a170eed85fcf..bbf1bcd2437b 100644
--- a/google-cloud-clients/google-cloud-core-grpc/pom.xml
+++ b/google-cloud-clients/google-cloud-core-grpc/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-core-grpc
-  1.31.0
+  1.31.1-SNAPSHOT
   jar
   Google Cloud Core gRPC
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-core-grpc
diff --git a/google-cloud-clients/google-cloud-core-http/pom.xml b/google-cloud-clients/google-cloud-core-http/pom.xml
index de6e9bdefaf3..de7e0a41e2f7 100644
--- a/google-cloud-clients/google-cloud-core-http/pom.xml
+++ b/google-cloud-clients/google-cloud-core-http/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-core-http
-  1.31.0
+  1.31.1-SNAPSHOT
   jar
   Google Cloud Core HTTP
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-core-http
diff --git a/google-cloud-clients/google-cloud-core/pom.xml b/google-cloud-clients/google-cloud-core/pom.xml
index 26968c754265..d2586486159d 100644
--- a/google-cloud-clients/google-cloud-core/pom.xml
+++ b/google-cloud-clients/google-cloud-core/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-core
-  1.31.0
+  1.31.1-SNAPSHOT
   jar
   Google Cloud Core
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-core
diff --git a/google-cloud-clients/google-cloud-dataproc/pom.xml b/google-cloud-clients/google-cloud-dataproc/pom.xml
index fa3725f46e85..65ed51a6e490 100644
--- a/google-cloud-clients/google-cloud-dataproc/pom.xml
+++ b/google-cloud-clients/google-cloud-dataproc/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-dataproc
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud Dataproc
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dataproc
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-dataproc
diff --git a/google-cloud-clients/google-cloud-datastore/pom.xml b/google-cloud-clients/google-cloud-datastore/pom.xml
index 9ae9d93451e4..4fb56f75021a 100644
--- a/google-cloud-clients/google-cloud-datastore/pom.xml
+++ b/google-cloud-clients/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-datastore
-  1.31.0
+  1.31.1-SNAPSHOT
   jar
   Google Cloud Datastore
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-datastore
diff --git a/google-cloud-clients/google-cloud-dialogflow/pom.xml b/google-cloud-clients/google-cloud-dialogflow/pom.xml
index e8fc0b98b5ad..562ed71ef002 100644
--- a/google-cloud-clients/google-cloud-dialogflow/pom.xml
+++ b/google-cloud-clients/google-cloud-dialogflow/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-dialogflow
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud Dialog Flow API
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dialogflow
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-dialogflow
diff --git a/google-cloud-clients/google-cloud-dlp/pom.xml b/google-cloud-clients/google-cloud-dlp/pom.xml
index d00426f9da9d..c7f6273b9ba5 100644
--- a/google-cloud-clients/google-cloud-dlp/pom.xml
+++ b/google-cloud-clients/google-cloud-dlp/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-dlp
-  0.49.0-beta
+  0.49.1-beta-SNAPSHOT
   jar
   Google Cloud Data Loss Prevention API
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dlp
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-dlp
diff --git a/google-cloud-clients/google-cloud-dns/pom.xml b/google-cloud-clients/google-cloud-dns/pom.xml
index 659351bd0480..e0e7de9b95cc 100644
--- a/google-cloud-clients/google-cloud-dns/pom.xml
+++ b/google-cloud-clients/google-cloud-dns/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-dns
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud DNS
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dns
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-dns
diff --git a/google-cloud-clients/google-cloud-errorreporting/pom.xml b/google-cloud-clients/google-cloud-errorreporting/pom.xml
index 0b8dbe94649f..17e599dba019 100644
--- a/google-cloud-clients/google-cloud-errorreporting/pom.xml
+++ b/google-cloud-clients/google-cloud-errorreporting/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-errorreporting
-  0.49.0-beta
+  0.49.1-beta-SNAPSHOT
   jar
   Google Cloud Error Reporting
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-errorreporting
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-errorreporting
diff --git a/google-cloud-clients/google-cloud-firestore/pom.xml b/google-cloud-clients/google-cloud-firestore/pom.xml
index 7029384127af..9980a9122a60 100644
--- a/google-cloud-clients/google-cloud-firestore/pom.xml
+++ b/google-cloud-clients/google-cloud-firestore/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-firestore
-  0.49.0-beta
+  0.49.1-beta-SNAPSHOT
   jar
   Google Cloud Firestore
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-firestore
@@ -15,7 +15,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-firestore
diff --git a/google-cloud-clients/google-cloud-iot/pom.xml b/google-cloud-clients/google-cloud-iot/pom.xml
index d1398b3e5702..ff6ea6219c83 100644
--- a/google-cloud-clients/google-cloud-iot/pom.xml
+++ b/google-cloud-clients/google-cloud-iot/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-iot
-  0.49.0-beta
+  0.49.1-beta-SNAPSHOT
   jar
   Google Cloud IoT
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-iot
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-iot
diff --git a/google-cloud-clients/google-cloud-language/pom.xml b/google-cloud-clients/google-cloud-language/pom.xml
index e7432c6a1fdd..bc37fe2d6961 100644
--- a/google-cloud-clients/google-cloud-language/pom.xml
+++ b/google-cloud-clients/google-cloud-language/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-language
-  1.31.0
+  1.31.1-SNAPSHOT
   jar
   Google Cloud Natural Language
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-language
@@ -15,7 +15,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-language
diff --git a/google-cloud-clients/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
index 1f67772f3edf..e060ef3a33c9 100644
--- a/google-cloud-clients/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-logging
-  1.31.0
+  1.31.1-SNAPSHOT
   jar
   Google Cloud Logging
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-logging
diff --git a/google-cloud-clients/google-cloud-monitoring/pom.xml b/google-cloud-clients/google-cloud-monitoring/pom.xml
index cc9bc3442fc3..c6673e5ecb89 100644
--- a/google-cloud-clients/google-cloud-monitoring/pom.xml
+++ b/google-cloud-clients/google-cloud-monitoring/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-monitoring
-  0.49.0-beta
+  0.49.1-beta-SNAPSHOT
   jar
   Google Cloud Monitoring
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-monitoring
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-monitoring
diff --git a/google-cloud-clients/google-cloud-notification/pom.xml b/google-cloud-clients/google-cloud-notification/pom.xml
index 69974c641118..31fd862b0eb6 100644
--- a/google-cloud-clients/google-cloud-notification/pom.xml
+++ b/google-cloud-clients/google-cloud-notification/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-notification
-  0.49.0-beta
+  0.49.1-beta-SNAPSHOT
   jar
   Google Cloud Pub/Sub Notifications for GCS
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-notification
@@ -15,7 +15,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-notification
diff --git a/google-cloud-clients/google-cloud-os-login/pom.xml b/google-cloud-clients/google-cloud-os-login/pom.xml
index 4050a4504e8f..625fb90fd111 100644
--- a/google-cloud-clients/google-cloud-os-login/pom.xml
+++ b/google-cloud-clients/google-cloud-os-login/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-os-login
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud OS Login
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-os-login
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-os-login
diff --git a/google-cloud-clients/google-cloud-pubsub/pom.xml b/google-cloud-clients/google-cloud-pubsub/pom.xml
index 42ff0011d3c7..0a30696eb755 100644
--- a/google-cloud-clients/google-cloud-pubsub/pom.xml
+++ b/google-cloud-clients/google-cloud-pubsub/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-pubsub
-  1.31.0
+  1.31.1-SNAPSHOT
   jar
   Google Cloud Pub/Sub
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-pubsub
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-pubsub
diff --git a/google-cloud-clients/google-cloud-redis/pom.xml b/google-cloud-clients/google-cloud-redis/pom.xml
index 837e9f09c3b8..27cfe1c72261 100644
--- a/google-cloud-clients/google-cloud-redis/pom.xml
+++ b/google-cloud-clients/google-cloud-redis/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-redis
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud Redis
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-redis
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-redis
diff --git a/google-cloud-clients/google-cloud-resourcemanager/pom.xml b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
index 61e95e79a38b..a744f3dffa55 100644
--- a/google-cloud-clients/google-cloud-resourcemanager/pom.xml
+++ b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-resourcemanager
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud Resource Manager
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-resourcemanager
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-resourcemanager
diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
index 9ae74ae373b7..30afaf0a6960 100644
--- a/google-cloud-clients/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -4,7 +4,7 @@
                               http://maven.apache.org/maven-v4_0_0.xsd">
   4.0.0
   google-cloud-spanner
-  0.49.0-beta
+  0.49.1-beta-SNAPSHOT
   jar
   Google Cloud Spanner
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-spanner
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-spanner
diff --git a/google-cloud-clients/google-cloud-speech/pom.xml b/google-cloud-clients/google-cloud-speech/pom.xml
index 255b8cac2cc4..d54f6251862e 100644
--- a/google-cloud-clients/google-cloud-speech/pom.xml
+++ b/google-cloud-clients/google-cloud-speech/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-speech
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud Speech
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-speech
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-speech
diff --git a/google-cloud-clients/google-cloud-storage/pom.xml b/google-cloud-clients/google-cloud-storage/pom.xml
index 4554081a7f81..27e6489d51da 100644
--- a/google-cloud-clients/google-cloud-storage/pom.xml
+++ b/google-cloud-clients/google-cloud-storage/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-storage
-  1.31.0
+  1.31.1-SNAPSHOT
   jar
   Google Cloud Storage
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-storage
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-storage
diff --git a/google-cloud-clients/google-cloud-texttospeech/pom.xml b/google-cloud-clients/google-cloud-texttospeech/pom.xml
index 2c2efd1505d6..28ff83f107c2 100644
--- a/google-cloud-clients/google-cloud-texttospeech/pom.xml
+++ b/google-cloud-clients/google-cloud-texttospeech/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-texttospeech
-  0.49.0-beta
+  0.49.1-beta-SNAPSHOT
   jar
   Google Cloud Text-to-Speech
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-texttospeech
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-texttospeech-v1beta1
diff --git a/google-cloud-clients/google-cloud-trace/pom.xml b/google-cloud-clients/google-cloud-trace/pom.xml
index b846651b84ee..bb950c1c3448 100644
--- a/google-cloud-clients/google-cloud-trace/pom.xml
+++ b/google-cloud-clients/google-cloud-trace/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-trace
-  0.49.0-beta
+  0.49.1-beta-SNAPSHOT
   jar
   Google Cloud Trace
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-trace
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-trace
diff --git a/google-cloud-clients/google-cloud-translate/pom.xml b/google-cloud-clients/google-cloud-translate/pom.xml
index d0840b5e7aa0..9d4b7b474fec 100644
--- a/google-cloud-clients/google-cloud-translate/pom.xml
+++ b/google-cloud-clients/google-cloud-translate/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-translate
-  1.31.0
+  1.31.1-SNAPSHOT
   jar
   Google Cloud Translation
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-translate
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-translate
diff --git a/google-cloud-clients/google-cloud-video-intelligence/pom.xml b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
index c087db463b65..070365d44b6d 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/pom.xml
+++ b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-video-intelligence
-  0.49.0-beta
+  0.49.1-beta-SNAPSHOT
   jar
   Google Cloud Video Intelligence
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-video-intelligence
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-video-intelligence
diff --git a/google-cloud-clients/google-cloud-vision/pom.xml b/google-cloud-clients/google-cloud-vision/pom.xml
index 688299cd35c4..78011bb98751 100644
--- a/google-cloud-clients/google-cloud-vision/pom.xml
+++ b/google-cloud-clients/google-cloud-vision/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-vision
-  1.31.0
+  1.31.1-SNAPSHOT
   jar
   Google Cloud Vision
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-vision
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-vision
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
index 5400ac4329aa..a018a90ace5e 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
+++ b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-websecurityscanner
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud Web Security Scanner
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-websecurityscanner
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-websecurityscanner
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index c7c7cca271de..6450bf728591 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -6,7 +6,7 @@
   com.google.cloud
   google-cloud-clients
   pom
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   Google Cloud
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients
   
@@ -154,7 +154,7 @@
     UTF-8
     github
     google-cloud-clients
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
     1.23.0
     1.25.0
     0.9.1
diff --git a/google-cloud-examples/pom.xml b/google-cloud-examples/pom.xml
index 1fc6f6e7d4be..990d829e10e9 100644
--- a/google-cloud-examples/pom.xml
+++ b/google-cloud-examples/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   com.google.cloud
   google-cloud-examples
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud Examples
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-examples
@@ -18,7 +18,7 @@
       
         com.google.cloud
         google-cloud-bom
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         pom
         import
       
diff --git a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
index d837763521eb..87ad03735c81 100644
--- a/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
+++ b/google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appengineflexcompat
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
 
   
diff --git a/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml b/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml
index 62d3a92eb186..c4db90c57333 100644
--- a/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml
+++ b/google-cloud-testing/google-cloud-appengineflexcustom/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appengineflexcustom
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
 
   
diff --git a/google-cloud-testing/google-cloud-appengineflexjava/pom.xml b/google-cloud-testing/google-cloud-appengineflexjava/pom.xml
index f429839f6444..993204f57afa 100644
--- a/google-cloud-testing/google-cloud-appengineflexjava/pom.xml
+++ b/google-cloud-testing/google-cloud-appengineflexjava/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appengineflexjava
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
 
   
diff --git a/google-cloud-testing/google-cloud-appenginejava8/pom.xml b/google-cloud-testing/google-cloud-appenginejava8/pom.xml
index c3d0a3f8ce45..2b053478d88f 100644
--- a/google-cloud-testing/google-cloud-appenginejava8/pom.xml
+++ b/google-cloud-testing/google-cloud-appenginejava8/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-appenginejava8
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   war
 
   
     google-cloud-testing
     com.google.cloud
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
 
   
diff --git a/google-cloud-testing/google-cloud-managedtest/pom.xml b/google-cloud-testing/google-cloud-managedtest/pom.xml
index 29034ab57428..a564a87d8383 100644
--- a/google-cloud-testing/google-cloud-managedtest/pom.xml
+++ b/google-cloud-testing/google-cloud-managedtest/pom.xml
@@ -4,13 +4,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   4.0.0
   google-cloud-managedtest
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
 
   
     google-cloud-testing
     com.google.cloud
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
 
   
diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml
index 42dc9a1a9302..32cb92959712 100644
--- a/google-cloud-testing/pom.xml
+++ b/google-cloud-testing/pom.xml
@@ -5,7 +5,7 @@
   4.0.0
   com.google.cloud
   google-cloud-testing
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   pom
 
   Google Cloud Testing
@@ -30,7 +30,7 @@
       
         com.google.cloud
         google-cloud-bom
-        0.49.0-alpha
+        0.49.1-alpha-SNAPSHOT
         pom
         import
       
diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml
index b0d2a9b42b1b..35f87d5069dc 100644
--- a/google-cloud-util/google-cloud-compat-checker/pom.xml
+++ b/google-cloud-util/google-cloud-compat-checker/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-compat-checker
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   jar
   Google Cloud Java Compatibility Checker
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util/google-cloud-compat-checker
@@ -12,7 +12,7 @@
   
     com.google.cloud
     google-cloud-util
-    0.49.0-alpha
+    0.49.1-alpha-SNAPSHOT
   
   
     google-cloud-compat-checker
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index 5880708c829c..a5b02c5901b9 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -3,7 +3,7 @@
   4.0.0
   com.google.cloud
   google-cloud-util
-  0.49.0-alpha
+  0.49.1-alpha-SNAPSHOT
   pom
   Google Cloud Util
   https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-util
diff --git a/versions.txt b/versions.txt
index b3908205914a..42db89bb9860 100644
--- a/versions.txt
+++ b/versions.txt
@@ -5,132 +5,132 @@
 # google-api-grpc versions
 #
 # parent
-google-api-grpc:0.14.0:0.14.0
+google-api-grpc:0.14.0:0.14.1-SNAPSHOT
 # children
 #grpc-google-cloud-datastore-v1
-grpc-google-cloud-bigquerydatatransfer-v1:0.14.0:0.14.0
-grpc-google-cloud-bigtable-admin-v2:0.14.0:0.14.0
-grpc-google-cloud-bigtable-v2:0.14.0:0.14.0
-grpc-google-cloud-container-v1:0.14.0:0.14.0
-grpc-google-cloud-dataproc-v1:0.14.0:0.14.0
-grpc-google-cloud-dialogflow-v2:0.14.0:0.14.0
-grpc-google-cloud-dialogflow-v2beta1:0.14.0:0.14.0
-grpc-google-cloud-dlp-v2:0.14.0:0.14.0
-grpc-google-cloud-error-reporting-v1beta1:0.14.0:0.14.0
-grpc-google-cloud-firestore-v1beta1:0.14.0:0.14.0
-grpc-google-cloud-language-v1:1.13.0:1.13.0
-grpc-google-cloud-language-v1beta2:0.14.0:0.14.0
-grpc-google-cloud-logging-v2:0.14.0:0.14.0
-grpc-google-cloud-monitoring-v3:0.14.0:0.14.0
-grpc-google-cloud-os-login-v1:0.14.0:0.14.0
-grpc-google-cloud-pubsub-v1:1.13.0:1.13.0
-grpc-google-cloud-spanner-admin-database-v1:0.14.0:0.14.0
-grpc-google-cloud-spanner-admin-instance-v1:0.14.0:0.14.0
-grpc-google-cloud-spanner-v1:0.14.0:0.14.0
-grpc-google-cloud-speech-v1:0.14.0:0.14.0
-grpc-google-cloud-speech-v1beta1:0.14.0:0.14.0
-grpc-google-cloud-speech-v1p1beta1:0.14.0:0.14.0
-grpc-google-cloud-texttospeech-v1beta1:0.14.0:0.14.0
-grpc-google-cloud-trace-v1:0.14.0:0.14.0
-grpc-google-cloud-trace-v2:0.14.0:0.14.0
-grpc-google-cloud-video-intelligence-v1:0.14.0:0.14.0
-grpc-google-cloud-video-intelligence-v1beta1:0.14.0:0.14.0
-grpc-google-cloud-video-intelligence-v1beta2:0.14.0:0.14.0
-grpc-google-cloud-video-intelligence-v1p1beta1:0.14.0:0.14.0
-grpc-google-cloud-vision-v1:1.13.0:1.13.0
-grpc-google-cloud-vision-v1p1beta1:0.14.0:0.14.0
-grpc-google-cloud-vision-v1p2beta1:1.13.0:1.13.0
-grpc-google-cloud-iot-v1:0.14.0:0.14.0
-grpc-google-cloud-redis-v1beta1:0.14.0:0.14.0
-grpc-google-cloud-websecurityscanner-v1alpha:0.14.0:0.14.0
-proto-google-cloud-bigquerydatatransfer-v1:0.14.0:0.14.0
-proto-google-cloud-bigtable-admin-v2:0.14.0:0.14.0
-proto-google-cloud-bigtable-v2:0.14.0:0.14.0
-proto-google-cloud-container-v1:0.14.0:0.14.0
-proto-google-cloud-dataproc-v1:0.14.0:0.14.0
-proto-google-cloud-datastore-v1:0.14.0:0.14.0
-proto-google-cloud-dialogflow-v2:0.14.0:0.14.0
-proto-google-cloud-dialogflow-v2beta1:0.14.0:0.14.0
-proto-google-cloud-dlp-v2:0.14.0:0.14.0
-proto-google-cloud-error-reporting-v1beta1:0.14.0:0.14.0
-proto-google-cloud-firestore-v1beta1:0.14.0:0.14.0
-proto-google-cloud-language-v1:1.13.0:1.13.0
-proto-google-cloud-language-v1beta2:0.14.0:0.14.0
-proto-google-cloud-logging-v2:0.14.0:0.14.0
-proto-google-cloud-monitoring-v3:0.14.0:0.14.0
-proto-google-cloud-os-login-v1:0.14.0:0.14.0
-proto-google-cloud-pubsub-v1:1.13.0:1.13.0
-proto-google-cloud-spanner-admin-database-v1:0.14.0:0.14.0
-proto-google-cloud-spanner-admin-instance-v1:0.14.0:0.14.0
-proto-google-cloud-spanner-v1:0.14.0:0.14.0
-proto-google-cloud-speech-v1:0.14.0:0.14.0
-proto-google-cloud-speech-v1beta1:0.14.0:0.14.0
-proto-google-cloud-speech-v1p1beta1:0.14.0:0.14.0
-proto-google-cloud-texttospeech-v1beta1:0.14.0:0.14.0
-proto-google-cloud-trace-v1:0.14.0:0.14.0
-proto-google-cloud-trace-v2:0.14.0:0.14.0
-proto-google-cloud-video-intelligence-v1:0.14.0:0.14.0
-proto-google-cloud-video-intelligence-v1beta1:0.14.0:0.14.0
-proto-google-cloud-video-intelligence-v1beta2:0.14.0:0.14.0
-proto-google-cloud-video-intelligence-v1p1beta1:0.14.0:0.14.0
-proto-google-cloud-vision-v1:1.13.0:1.13.0
-proto-google-cloud-vision-v1p1beta1:0.14.0:0.14.0
-proto-google-cloud-vision-v1p2beta1:1.13.0:1.13.0
-proto-google-cloud-iot-v1:0.14.0:0.14.0
-proto-google-cloud-redis-v1beta1:0.14.0:0.14.0
-proto-google-cloud-websecurityscanner-v1alpha:0.14.0:0.14.0
+grpc-google-cloud-bigquerydatatransfer-v1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-bigtable-admin-v2:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-bigtable-v2:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-container-v1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-dataproc-v1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-dialogflow-v2:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-dialogflow-v2beta1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-dlp-v2:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-error-reporting-v1beta1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-firestore-v1beta1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-language-v1:1.13.0:1.13.1-SNAPSHOT
+grpc-google-cloud-language-v1beta2:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-logging-v2:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-monitoring-v3:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-os-login-v1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-pubsub-v1:1.13.0:1.13.1-SNAPSHOT
+grpc-google-cloud-spanner-admin-database-v1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-spanner-admin-instance-v1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-spanner-v1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-speech-v1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-speech-v1beta1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-speech-v1p1beta1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-texttospeech-v1beta1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-trace-v1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-trace-v2:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-video-intelligence-v1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-video-intelligence-v1beta1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-video-intelligence-v1beta2:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-video-intelligence-v1p1beta1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-vision-v1:1.13.0:1.13.1-SNAPSHOT
+grpc-google-cloud-vision-v1p1beta1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-vision-v1p2beta1:1.13.0:1.13.1-SNAPSHOT
+grpc-google-cloud-iot-v1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-redis-v1beta1:0.14.0:0.14.1-SNAPSHOT
+grpc-google-cloud-websecurityscanner-v1alpha:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-bigquerydatatransfer-v1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-bigtable-admin-v2:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-bigtable-v2:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-container-v1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-dataproc-v1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-datastore-v1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-dialogflow-v2:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-dialogflow-v2beta1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-dlp-v2:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-error-reporting-v1beta1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-firestore-v1beta1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-language-v1:1.13.0:1.13.1-SNAPSHOT
+proto-google-cloud-language-v1beta2:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-logging-v2:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-monitoring-v3:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-os-login-v1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-pubsub-v1:1.13.0:1.13.1-SNAPSHOT
+proto-google-cloud-spanner-admin-database-v1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-spanner-admin-instance-v1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-spanner-v1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-speech-v1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-speech-v1beta1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-speech-v1p1beta1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-texttospeech-v1beta1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-trace-v1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-trace-v2:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-video-intelligence-v1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-video-intelligence-v1beta1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-video-intelligence-v1beta2:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-video-intelligence-v1p1beta1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-vision-v1:1.13.0:1.13.1-SNAPSHOT
+proto-google-cloud-vision-v1p1beta1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-vision-v1p2beta1:1.13.0:1.13.1-SNAPSHOT
+proto-google-cloud-iot-v1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-redis-v1beta1:0.14.0:0.14.1-SNAPSHOT
+proto-google-cloud-websecurityscanner-v1alpha:0.14.0:0.14.1-SNAPSHOT
 
 #
 # google-cloud-clients versions
 #
 # parent
-google-cloud-clients:0.49.0-alpha:0.49.0-alpha
+google-cloud-clients:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
 # children
-google-cloud-appengineflexcompat:0.49.0-alpha:0.49.0-alpha
-google-cloud-appengineflexcustom:0.49.0-alpha:0.49.0-alpha
-google-cloud-appengineflexjava:0.49.0-alpha:0.49.0-alpha
-google-cloud-appenginejava8:0.49.0-alpha:0.49.0-alpha
-google-cloud:0.49.0-alpha:0.49.0-alpha
-google-cloud-bigquery:1.31.0:1.31.0
-google-cloud-bigquerydatatransfer:0.49.0-beta:0.49.0-beta
-google-cloud-bigtable:0.49.0-alpha:0.49.0-alpha
-google-cloud-bom:0.49.0-alpha:0.49.0-alpha
-google-cloud-compat-checker:0.49.0-alpha:0.49.0-alpha
-google-cloud-compute:0.49.0-alpha:0.49.0-alpha
-google-cloud-container:0.49.0-beta:0.49.0-beta
-google-cloud-contrib:0.49.0-alpha:0.49.0-alpha
-google-cloud-core:1.31.0:1.31.0
-google-cloud-core-grpc:1.31.0:1.31.0
-google-cloud-core-http:1.31.0:1.31.0
-google-cloud-dataproc:0.49.0-alpha:0.49.0-alpha
-google-cloud-datastore:1.31.0:1.31.0
-google-cloud-dialogflow:0.49.0-alpha:0.49.0-alpha
-google-cloud-dlp:0.49.0-beta:0.49.0-beta
-google-cloud-dns:0.49.0-alpha:0.49.0-alpha
-google-cloud-errorreporting:0.49.0-beta:0.49.0-beta
-google-cloud-examples:0.49.0-alpha:0.49.0-alpha
-google-cloud-firestore:0.49.0-beta:0.49.0-beta
-google-cloud-language:1.31.0:1.31.0
-google-cloud-logging:1.31.0:1.31.0
-google-cloud-logging-logback:0.49.0-alpha:0.49.0-alpha
-google-cloud-managedtest:0.49.0-alpha:0.49.0-alpha
-google-cloud-monitoring:0.49.0-beta:0.49.0-beta
-google-cloud-nio:0.49.0-alpha:0.49.0-alpha
-google-cloud-nio-examples:0.49.0-alpha:0.49.0-alpha
-google-cloud-notification:0.49.0-beta:0.49.0-beta
-google-cloud-os-login:0.49.0-alpha:0.49.0-alpha
-google-cloud-pubsub:1.31.0:1.31.0
-google-cloud-redis:0.49.0-alpha:0.49.0-alpha
-google-cloud-resourcemanager:0.49.0-alpha:0.49.0-alpha
-google-cloud-spanner:0.49.0-beta:0.49.0-beta
-google-cloud-speech:0.49.0-alpha:0.49.0-alpha
-google-cloud-storage:1.31.0:1.31.0
-google-cloud-texttospeech:0.49.0-beta:0.49.0-beta
-google-cloud-testing:0.49.0-alpha:0.49.0-alpha
-google-cloud-trace:0.49.0-beta:0.49.0-beta
-google-cloud-translate:1.31.0:1.31.0
-google-cloud-util:0.49.0-alpha:0.49.0-alpha
-google-cloud-video-intelligence:0.49.0-beta:0.49.0-beta
-google-cloud-vision:1.31.0:1.31.0
-google-cloud-iot:0.49.0-beta:0.49.0-beta
-google-cloud-websecurityscanner:0.49.0-alpha:0.49.0-alpha
+google-cloud-appengineflexcompat:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-appengineflexcustom:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-appengineflexjava:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-appenginejava8:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-bigquery:1.31.0:1.31.1-SNAPSHOT
+google-cloud-bigquerydatatransfer:0.49.0-beta:0.49.1-beta-SNAPSHOT
+google-cloud-bigtable:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-bom:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-compat-checker:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-compute:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-container:0.49.0-beta:0.49.1-beta-SNAPSHOT
+google-cloud-contrib:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-core:1.31.0:1.31.1-SNAPSHOT
+google-cloud-core-grpc:1.31.0:1.31.1-SNAPSHOT
+google-cloud-core-http:1.31.0:1.31.1-SNAPSHOT
+google-cloud-dataproc:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-datastore:1.31.0:1.31.1-SNAPSHOT
+google-cloud-dialogflow:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-dlp:0.49.0-beta:0.49.1-beta-SNAPSHOT
+google-cloud-dns:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-errorreporting:0.49.0-beta:0.49.1-beta-SNAPSHOT
+google-cloud-examples:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-firestore:0.49.0-beta:0.49.1-beta-SNAPSHOT
+google-cloud-language:1.31.0:1.31.1-SNAPSHOT
+google-cloud-logging:1.31.0:1.31.1-SNAPSHOT
+google-cloud-logging-logback:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-managedtest:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-monitoring:0.49.0-beta:0.49.1-beta-SNAPSHOT
+google-cloud-nio:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-nio-examples:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-notification:0.49.0-beta:0.49.1-beta-SNAPSHOT
+google-cloud-os-login:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-pubsub:1.31.0:1.31.1-SNAPSHOT
+google-cloud-redis:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-resourcemanager:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-spanner:0.49.0-beta:0.49.1-beta-SNAPSHOT
+google-cloud-speech:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-storage:1.31.0:1.31.1-SNAPSHOT
+google-cloud-texttospeech:0.49.0-beta:0.49.1-beta-SNAPSHOT
+google-cloud-testing:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-trace:0.49.0-beta:0.49.1-beta-SNAPSHOT
+google-cloud-translate:1.31.0:1.31.1-SNAPSHOT
+google-cloud-util:0.49.0-alpha:0.49.1-alpha-SNAPSHOT
+google-cloud-video-intelligence:0.49.0-beta:0.49.1-beta-SNAPSHOT
+google-cloud-vision:1.31.0:1.31.1-SNAPSHOT
+google-cloud-iot:0.49.0-beta:0.49.1-beta-SNAPSHOT
+google-cloud-websecurityscanner:0.49.0-alpha:0.49.1-alpha-SNAPSHOT

From 2b61e9a2196598a3f99368f9f65e489bee406c91 Mon Sep 17 00:00:00 2001
From: Dan O'Meara 
Date: Fri, 25 May 2018 00:46:21 +0000
Subject: [PATCH 56/65] Bump Pub/Sub from Beta list to GA list

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bdc33cdf98e5..fa82dcfdf525 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ This library supports the following Google Cloud Platform services with clients
 -  [Stackdriver Logging](google-cloud-clients/google-cloud-logging) (GA)
 -  [Cloud Datastore](google-cloud-clients/google-cloud-datastore) (GA)
 -  [Cloud Natural Language](google-cloud-clients/google-cloud-language) (GA)
+-  [Cloud Pub/Sub](google-cloud-clients/google-cloud-pubsub) (GA)
 -  [Cloud Storage](google-cloud-clients/google-cloud-storage) (GA)
 -  [Cloud Translation](google-cloud-clients/google-cloud-translate) (GA)
 -  [Cloud Vision](google-cloud-clients/google-cloud-vision) (GA)
@@ -28,7 +29,6 @@ This library supports the following Google Cloud Platform services with clients
 -  [Stackdriver Error Reporting](google-cloud-clients/google-cloud-errorreporting) (Beta)
 -  [Cloud Firestore](google-cloud-clients/google-cloud-firestore) (Beta)
 -  [Stackdriver Monitoring](google-cloud-clients/google-cloud-monitoring) (Beta)
--  [Cloud Pub/Sub](google-cloud-clients/google-cloud-pubsub) (Beta)
 -  [Cloud Spanner](google-cloud-clients/google-cloud-spanner) (Beta)
 -  [Cloud Video Intelligence](google-cloud-clients/google-cloud-video-intelligence) (Beta)
 -  [Stackdriver Trace](google-cloud-clients/google-cloud-trace) (Beta)

From 5c4c5bc55058f407f225d2b6b4616c81b6036591 Mon Sep 17 00:00:00 2001
From: Dan O'Meara 
Date: Fri, 25 May 2018 00:49:58 +0000
Subject: [PATCH 57/65] Remove note about client surface changing

---
 google-cloud-clients/google-cloud-pubsub/README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/google-cloud-clients/google-cloud-pubsub/README.md b/google-cloud-clients/google-cloud-pubsub/README.md
index ee85f1e4018a..5ce6b54473a2 100644
--- a/google-cloud-clients/google-cloud-pubsub/README.md
+++ b/google-cloud-clients/google-cloud-pubsub/README.md
@@ -12,9 +12,6 @@ Java idiomatic client for [Google Cloud Pub/Sub][cloud-pubsub].
 - [Product Documentation][pubsub-product-docs]
 - [Client Library Documentation][pubsub-client-lib-docs]
 
-> Note: This client is a work-in-progress, and may occasionally
-> make backwards-incompatible changes.
-
 Quickstart
 ----------
 

From a83f9ed8cdf938fadfdb070ba981bb458859ba85 Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt 
Date: Fri, 25 May 2018 16:50:40 -0700
Subject: [PATCH 58/65] Adding Timestamp.toDate() (#3313)

---
 .../main/java/com/google/cloud/Timestamp.java | 12 ++++++++++
 .../java/com/google/cloud/TimestampTest.java  | 23 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java
index 456877bd2740..0c2eca786367 100644
--- a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java
+++ b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java
@@ -130,6 +130,18 @@ public java.sql.Timestamp toSqlTimestamp() {
     return ts;
   }
 
+  /**
+   * Returns a new {@code java.util.Date} corresponding to this {@code timestamp}. Any
+   * sub-millisecond precision will be stripped.
+   *
+   * @return An approximate {@code java.util.Date} representation of this {@code timestamp}.
+   */
+  public Date toDate() {
+    long secondsInMilliseconds = TimeUnit.SECONDS.toMillis(this.seconds);
+    long nanosInMilliseconds = TimeUnit.NANOSECONDS.toMillis(this.nanos);
+    return new Date(secondsInMilliseconds + nanosInMilliseconds);
+  }
+
   @Override
   public int compareTo(Timestamp other) {
     int r = Long.compare(seconds, other.seconds);
diff --git a/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java
index 2aa07999c823..51d2ecb20f18 100644
--- a/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java
+++ b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java
@@ -21,8 +21,10 @@
 
 import com.google.common.testing.EqualsTester;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -35,6 +37,9 @@ public class TimestampTest {
   private static final String TEST_TIME_ISO = "2015-10-12T15:14:54Z";
   private static final long TEST_TIME_SECONDS = 1444662894L;
   private static final long TEST_TIME_MICROSECONDS = 10000100L;
+  private static final long TEST_TIME_MILLISECONDS =
+      TimeUnit.SECONDS.toMillis(1444662894L) + TimeUnit.MICROSECONDS.toMillis(1234);
+  private static final Date TEST_DATE = new Date(TEST_TIME_MILLISECONDS);
 
   @Rule public ExpectedException expectedException = ExpectedException.none();
 
@@ -64,6 +69,24 @@ public void ofMicroseconds() {
     assertThat(timestamp.getNanos()).isEqualTo(TEST_TIME_MICROSECONDS % 1000000L * 1000);
   }
 
+  @Test
+  public void ofDate() {
+    Timestamp timestamp = Timestamp.of(TEST_DATE);
+    Long expectedSeconds = TimeUnit.MILLISECONDS.toSeconds(TEST_TIME_MILLISECONDS);
+    Long expectedNanos =
+        TimeUnit.MILLISECONDS.toNanos(TEST_TIME_MILLISECONDS)
+            - TimeUnit.SECONDS.toNanos(expectedSeconds);
+    assertThat(timestamp.getSeconds()).isEqualTo(expectedSeconds);
+    assertThat(timestamp.getNanos()).isEqualTo(expectedNanos);
+  }
+
+  @Test
+  public void toDate() {
+    Timestamp timestamp = Timestamp.ofTimeSecondsAndNanos(TEST_TIME_SECONDS, 1234 * 1000);
+    Date date = timestamp.toDate();
+    assertThat(TEST_TIME_MILLISECONDS).isEqualTo(date.getTime());
+  }
+
   @Test
   public void toFromSqlTimestamp() {
     long seconds = TEST_TIME_SECONDS;

From 170f1e52162053f5a567bae89be9db0e59974be8 Mon Sep 17 00:00:00 2001
From: Colin Arnott 
Date: Sat, 26 May 2018 01:14:36 +0000
Subject: [PATCH 59/65] make MetadataConfig.getAttribute() public (#3307)

---
 .../src/main/java/com/google/cloud/MetadataConfig.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
index a285462165a5..9b1ee3ffc635 100644
--- a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
+++ b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java
@@ -57,7 +57,7 @@ public static String getClusterName() {
     return getAttribute("instance/attributes/cluster-name");
   }
 
-  private static String getAttribute(String attributeName) {
+  public static String getAttribute(String attributeName) {
     try {
       URL url = new URL(METADATA_URL + attributeName);
       HttpURLConnection connection = (HttpURLConnection) url.openConnection();

From f90bbc706b5a73fbc1fff7708b269b8d53e00a4e Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Tue, 29 May 2018 18:09:16 -0400
Subject: [PATCH 60/65] fix run-on sentence (#3318)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fa82dcfdf525..2a8be64404ce 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ If you're using IntelliJ or Eclipse, you can add client libraries to your projec
 
 Besides adding client libraries, the plugins provide additional functionality, such as service account key management. Refer to the documentation for each plugin for more details.
 
-These client libraries can be used on App Engine standard for Java 8 runtime, App Engine flexible (including the Compat runtime).  Most of the libraries do not work on the App Engine standard for Java 7 runtime, however, Datastore, Storage, and Bigquery should work.
+These client libraries can be used on App Engine standard for Java 8 runtime and App Engine flexible (including the Compat runtime).  Most of the libraries do not work on the App Engine standard for Java 7 runtime. However, Datastore, Storage, and Bigquery should work.
 
 If you are running into problems with version conflicts, see [Version Management](#version-management).
 

From cd9d226828e716dd1c71ff317a52b78fe342fef5 Mon Sep 17 00:00:00 2001
From: Hanzhen Yi <33737743+hzyi-google@users.noreply.github.com>
Date: Wed, 30 May 2018 11:44:01 -0700
Subject: [PATCH 61/65] fix storage auth example in README (#3322)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2a8be64404ce..ff04769c4f20 100644
--- a/README.md
+++ b/README.md
@@ -165,7 +165,7 @@ Storage storage = StorageOptions.getDefaultInstance().getService();
   case, the access token will not be automatically refreshed):
   ```java
   Storage storage = StorageOptions.newBuilder()
-      .setCredentials(new GoogleCredentials(new AccessToken(accessToken, expirationTime)))
+      .setCredentials(GoogleCredentials.create(new AccessToken(accessToken, expirationTime)))
       .build()
       .getService();
   ```

From d39325260d19dd274d33ec51b239c230803b7cb0 Mon Sep 17 00:00:00 2001
From: Hanzhen Yi <33737743+hzyi-google@users.noreply.github.com>
Date: Thu, 31 May 2018 12:22:05 -0700
Subject: [PATCH 62/65] Add port to storage upload url (#3324)

---
 .../java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
index 1ce683e7aab4..9fcf24ccb628 100644
--- a/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
+++ b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
@@ -717,8 +717,10 @@ public String open(StorageObject object, Map options) {
       GenericUrl url = req.buildHttpRequest().getUrl();
       String scheme = url.getScheme();
       String host = url.getHost();
+      int port = url.getPort();
+      port = port < 0 ? port : url.toURL().getDefaultPort();
       String path = "/upload" + url.getRawPath();
-      url = new GenericUrl(scheme + "://" + host + path);
+      url = new GenericUrl(scheme + "://" + host + ":" + port + path);
       url.set("uploadType", "resumable");
       url.set("name", object.getName());
       for (Option option : options.keySet()) {

From 89436180eb6dabd90bbc38c5600d00f5b262cc36 Mon Sep 17 00:00:00 2001
From: Andrea Lin 
Date: Thu, 31 May 2018 16:51:38 -0700
Subject: [PATCH 63/65] Add TextToSpeech v1 pom.xml and java files (#3327)

This concludes weekly batch refresh.
---
 .../grpc-google-cloud-texttospeech-v1/pom.xml |   31 +
 .../texttospeech/v1/TextToSpeechGrpc.java     |  413 +++++++
 google-api-grpc/pom.xml                       |   12 +
 .../pom.xml                                   |   31 +
 .../cloud/texttospeech/v1/AudioConfig.java    |  881 ++++++++++++++
 .../texttospeech/v1/AudioConfigOrBuilder.java |   79 ++
 .../cloud/texttospeech/v1/AudioEncoding.java  |  166 +++
 .../texttospeech/v1/ListVoicesRequest.java    |  601 +++++++++
 .../v1/ListVoicesRequestOrBuilder.java        |   41 +
 .../texttospeech/v1/ListVoicesResponse.java   |  834 +++++++++++++
 .../v1/ListVoicesResponseOrBuilder.java       |   53 +
 .../texttospeech/v1/SsmlVoiceGender.java      |  166 +++
 .../cloud/texttospeech/v1/SynthesisInput.java |  856 +++++++++++++
 .../v1/SynthesisInputOrBuilder.java           |   53 +
 .../v1/SynthesizeSpeechRequest.java           | 1084 +++++++++++++++++
 .../v1/SynthesizeSpeechRequestOrBuilder.java  |   84 ++
 .../v1/SynthesizeSpeechResponse.java          |  486 ++++++++
 .../v1/SynthesizeSpeechResponseOrBuilder.java |   21 +
 .../texttospeech/v1/TextToSpeechProto.java    |  180 +++
 .../google/cloud/texttospeech/v1/Voice.java   |  990 +++++++++++++++
 .../cloud/texttospeech/v1/VoiceOrBuilder.java |   96 ++
 .../texttospeech/v1/VoiceSelectionParams.java |  923 ++++++++++++++
 .../v1/VoiceSelectionParamsOrBuilder.java     |   92 ++
 .../cloud/texttospeech/v1/cloud_tts.proto     |  225 ++++
 google-cloud-bom/pom.xml                      |   10 +
 .../google-cloud-texttospeech/README.md       |    2 +-
 .../google-cloud-texttospeech/pom.xml         |    9 +
 .../texttospeech/v1/TextToSpeechClient.java   |  329 +++++
 .../texttospeech/v1/TextToSpeechSettings.java |  186 +++
 .../cloud/texttospeech/v1/package-info.java   |   37 +
 .../stub/GrpcTextToSpeechCallableFactory.java |  116 ++
 .../v1/stub/GrpcTextToSpeechStub.java         |  167 +++
 .../v1/stub/TextToSpeechStub.java             |   48 +
 .../v1/stub/TextToSpeechStubSettings.java     |  294 +++++
 .../texttospeech/v1/MockTextToSpeech.java     |   57 +
 .../texttospeech/v1/MockTextToSpeechImpl.java |   88 ++
 .../v1/TextToSpeechClientTest.java            |  159 +++
 google-cloud-clients/pom.xml                  |    2 +-
 38 files changed, 9900 insertions(+), 2 deletions(-)
 create mode 100644 google-api-grpc/grpc-google-cloud-texttospeech-v1/pom.xml
 create mode 100644 google-api-grpc/grpc-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechGrpc.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/pom.xml
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfigOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioEncoding.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SsmlVoiceGender.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInputOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequestOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponseOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParamsOrBuilder.java
 create mode 100644 google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto
 create mode 100644 google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechClient.java
 create mode 100644 google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechSettings.java
 create mode 100644 google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/package-info.java
 create mode 100644 google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/GrpcTextToSpeechCallableFactory.java
 create mode 100644 google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/GrpcTextToSpeechStub.java
 create mode 100644 google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStub.java
 create mode 100644 google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStubSettings.java
 create mode 100644 google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeech.java
 create mode 100644 google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeechImpl.java
 create mode 100644 google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/TextToSpeechClientTest.java

diff --git a/google-api-grpc/grpc-google-cloud-texttospeech-v1/pom.xml b/google-api-grpc/grpc-google-cloud-texttospeech-v1/pom.xml
new file mode 100644
index 000000000000..e19d75119bc2
--- /dev/null
+++ b/google-api-grpc/grpc-google-cloud-texttospeech-v1/pom.xml
@@ -0,0 +1,31 @@
+
+  4.0.0
+  grpc-google-cloud-texttospeech-v1
+  0.14.1-SNAPSHOT
+  grpc-google-cloud-texttospeech-v1
+  GRPC library for grpc-google-cloud-texttospeech-v1
+  
+    com.google.api.grpc
+    google-api-grpc
+    0.14.1-SNAPSHOT
+  
+  
+    
+      io.grpc
+      grpc-stub
+      compile
+    
+    
+      io.grpc
+      grpc-protobuf
+      compile
+    
+    
+      com.google.api.grpc
+      proto-google-cloud-texttospeech-v1
+      compile
+    
+  
+
diff --git a/google-api-grpc/grpc-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechGrpc.java b/google-api-grpc/grpc-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechGrpc.java
new file mode 100644
index 000000000000..555b17ebc353
--- /dev/null
+++ b/google-api-grpc/grpc-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechGrpc.java
@@ -0,0 +1,413 @@
+package com.google.cloud.texttospeech.v1;
+
+import static io.grpc.MethodDescriptor.generateFullMethodName;
+import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncUnaryCall;
+import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
+import static io.grpc.stub.ClientCalls.blockingUnaryCall;
+import static io.grpc.stub.ClientCalls.futureUnaryCall;
+import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnaryCall;
+import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
+
+/**
+ * 
    + * Service that implements Google Cloud Text-to-Speech API.
+ * 
    
+ */
+@javax.annotation.Generated(
+    value = "by gRPC proto compiler (version 1.10.0)",
+    comments = "Source: google/cloud/texttospeech/v1/cloud_tts.proto")
+public final class TextToSpeechGrpc {
+
+  private TextToSpeechGrpc() {}
+
+  public static final String SERVICE_NAME = "google.cloud.texttospeech.v1.TextToSpeech";
+
+  // Static method descriptors that strictly reflect the proto.
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getListVoicesMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_LIST_VOICES = getListVoicesMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getListVoicesMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getListVoicesMethod() {
+    return getListVoicesMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getListVoicesMethodHelper() {
+    io.grpc.MethodDescriptor getListVoicesMethod;
+    if ((getListVoicesMethod = TextToSpeechGrpc.getListVoicesMethod) == null) {
+      synchronized (TextToSpeechGrpc.class) {
+        if ((getListVoicesMethod = TextToSpeechGrpc.getListVoicesMethod) == null) {
+          TextToSpeechGrpc.getListVoicesMethod = getListVoicesMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.texttospeech.v1.TextToSpeech", "ListVoices"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.texttospeech.v1.ListVoicesRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.texttospeech.v1.ListVoicesResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new TextToSpeechMethodDescriptorSupplier("ListVoices"))
+                  .build();
+          }
+        }
+     }
+     return getListVoicesMethod;
+  }
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getSynthesizeSpeechMethod()} instead. 
+  public static final io.grpc.MethodDescriptor METHOD_SYNTHESIZE_SPEECH = getSynthesizeSpeechMethodHelper();
+
+  private static volatile io.grpc.MethodDescriptor getSynthesizeSpeechMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor getSynthesizeSpeechMethod() {
+    return getSynthesizeSpeechMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor getSynthesizeSpeechMethodHelper() {
+    io.grpc.MethodDescriptor getSynthesizeSpeechMethod;
+    if ((getSynthesizeSpeechMethod = TextToSpeechGrpc.getSynthesizeSpeechMethod) == null) {
+      synchronized (TextToSpeechGrpc.class) {
+        if ((getSynthesizeSpeechMethod = TextToSpeechGrpc.getSynthesizeSpeechMethod) == null) {
+          TextToSpeechGrpc.getSynthesizeSpeechMethod = getSynthesizeSpeechMethod = 
+              io.grpc.MethodDescriptor.newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "google.cloud.texttospeech.v1.TextToSpeech", "SynthesizeSpeech"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new TextToSpeechMethodDescriptorSupplier("SynthesizeSpeech"))
+                  .build();
+          }
+        }
+     }
+     return getSynthesizeSpeechMethod;
+  }
+
+  /**
+   * Creates a new async stub that supports all call types for the service
+   */
+  public static TextToSpeechStub newStub(io.grpc.Channel channel) {
+    return new TextToSpeechStub(channel);
+  }
+
+  /**
+   * Creates a new blocking-style stub that supports unary and streaming output calls on the service
+   */
+  public static TextToSpeechBlockingStub newBlockingStub(
+      io.grpc.Channel channel) {
+    return new TextToSpeechBlockingStub(channel);
+  }
+
+  /**
+   * Creates a new ListenableFuture-style stub that supports unary calls on the service
+   */
+  public static TextToSpeechFutureStub newFutureStub(
+      io.grpc.Channel channel) {
+    return new TextToSpeechFutureStub(channel);
+  }
+
+  /**
+   * 
    +   * Service that implements Google Cloud Text-to-Speech API.
+   * 
    
+   */
+  public static abstract class TextToSpeechImplBase implements io.grpc.BindableService {
+
+    /**
+     * 
    +     * Returns a list of [Voice][google.cloud.texttospeech.v1.Voice]
+     * supported for synthesis.
+     * 
    
+     */
+    public void listVoices(com.google.cloud.texttospeech.v1.ListVoicesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getListVoicesMethodHelper(), responseObserver);
+    }
+
+    /**
+     * 
    +     * Synthesizes speech synchronously: receive results after all text input
+     * has been processed.
+     * 
    
+     */
+    public void synthesizeSpeech(com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnimplementedUnaryCall(getSynthesizeSpeechMethodHelper(), responseObserver);
+    }
+
+    @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
+      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+          .addMethod(
+            getListVoicesMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.texttospeech.v1.ListVoicesRequest,
+                com.google.cloud.texttospeech.v1.ListVoicesResponse>(
+                  this, METHODID_LIST_VOICES)))
+          .addMethod(
+            getSynthesizeSpeechMethodHelper(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest,
+                com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse>(
+                  this, METHODID_SYNTHESIZE_SPEECH)))
+          .build();
+    }
+  }
+
+  /**
+   * 
    +   * Service that implements Google Cloud Text-to-Speech API.
+   * 
    
+   */
+  public static final class TextToSpeechStub extends io.grpc.stub.AbstractStub {
+    private TextToSpeechStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private TextToSpeechStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected TextToSpeechStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new TextToSpeechStub(channel, callOptions);
+    }
+
+    /**
+     * 
    +     * Returns a list of [Voice][google.cloud.texttospeech.v1.Voice]
+     * supported for synthesis.
+     * 
    
+     */
+    public void listVoices(com.google.cloud.texttospeech.v1.ListVoicesRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getListVoicesMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+
+    /**
+     * 
    +     * Synthesizes speech synchronously: receive results after all text input
+     * has been processed.
+     * 
    
+     */
+    public void synthesizeSpeech(com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest request,
+        io.grpc.stub.StreamObserver responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getSynthesizeSpeechMethodHelper(), getCallOptions()), request, responseObserver);
+    }
+  }
+
+  /**
+   * 
    +   * Service that implements Google Cloud Text-to-Speech API.
+   * 
    
+   */
+  public static final class TextToSpeechBlockingStub extends io.grpc.stub.AbstractStub {
+    private TextToSpeechBlockingStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private TextToSpeechBlockingStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected TextToSpeechBlockingStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new TextToSpeechBlockingStub(channel, callOptions);
+    }
+
+    /**
+     * 
    +     * Returns a list of [Voice][google.cloud.texttospeech.v1.Voice]
+     * supported for synthesis.
+     * 
    
+     */
+    public com.google.cloud.texttospeech.v1.ListVoicesResponse listVoices(com.google.cloud.texttospeech.v1.ListVoicesRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getListVoicesMethodHelper(), getCallOptions(), request);
+    }
+
+    /**
+     * 
    +     * Synthesizes speech synchronously: receive results after all text input
+     * has been processed.
+     * 
    
+     */
+    public com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse synthesizeSpeech(com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest request) {
+      return blockingUnaryCall(
+          getChannel(), getSynthesizeSpeechMethodHelper(), getCallOptions(), request);
+    }
+  }
+
+  /**
+   * 
    +   * Service that implements Google Cloud Text-to-Speech API.
+   * 
    
+   */
+  public static final class TextToSpeechFutureStub extends io.grpc.stub.AbstractStub {
+    private TextToSpeechFutureStub(io.grpc.Channel channel) {
+      super(channel);
+    }
+
+    private TextToSpeechFutureStub(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      super(channel, callOptions);
+    }
+
+    @java.lang.Override
+    protected TextToSpeechFutureStub build(io.grpc.Channel channel,
+        io.grpc.CallOptions callOptions) {
+      return new TextToSpeechFutureStub(channel, callOptions);
+    }
+
+    /**
+     * 
    +     * Returns a list of [Voice][google.cloud.texttospeech.v1.Voice]
+     * supported for synthesis.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture listVoices(
+        com.google.cloud.texttospeech.v1.ListVoicesRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getListVoicesMethodHelper(), getCallOptions()), request);
+    }
+
+    /**
+     * 
    +     * Synthesizes speech synchronously: receive results after all text input
+     * has been processed.
+     * 
    
+     */
+    public com.google.common.util.concurrent.ListenableFuture synthesizeSpeech(
+        com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest request) {
+      return futureUnaryCall(
+          getChannel().newCall(getSynthesizeSpeechMethodHelper(), getCallOptions()), request);
+    }
+  }
+
+  private static final int METHODID_LIST_VOICES = 0;
+  private static final int METHODID_SYNTHESIZE_SPEECH = 1;
+
+  private static final class MethodHandlers implements
+      io.grpc.stub.ServerCalls.UnaryMethod,
+      io.grpc.stub.ServerCalls.ServerStreamingMethod,
+      io.grpc.stub.ServerCalls.ClientStreamingMethod,
+      io.grpc.stub.ServerCalls.BidiStreamingMethod {
+    private final TextToSpeechImplBase serviceImpl;
+    private final int methodId;
+
+    MethodHandlers(TextToSpeechImplBase serviceImpl, int methodId) {
+      this.serviceImpl = serviceImpl;
+      this.methodId = methodId;
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) {
+      switch (methodId) {
+        case METHODID_LIST_VOICES:
+          serviceImpl.listVoices((com.google.cloud.texttospeech.v1.ListVoicesRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        case METHODID_SYNTHESIZE_SPEECH:
+          serviceImpl.synthesizeSpeech((com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest) request,
+              (io.grpc.stub.StreamObserver) responseObserver);
+          break;
+        default:
+          throw new AssertionError();
+      }
+    }
+
+    @java.lang.Override
+    @java.lang.SuppressWarnings("unchecked")
+    public io.grpc.stub.StreamObserver invoke(
+        io.grpc.stub.StreamObserver responseObserver) {
+      switch (methodId) {
+        default:
+          throw new AssertionError();
+      }
+    }
+  }
+
+  private static abstract class TextToSpeechBaseDescriptorSupplier
+      implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
+    TextToSpeechBaseDescriptorSupplier() {}
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.getDescriptor();
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
+      return getFileDescriptor().findServiceByName("TextToSpeech");
+    }
+  }
+
+  private static final class TextToSpeechFileDescriptorSupplier
+      extends TextToSpeechBaseDescriptorSupplier {
+    TextToSpeechFileDescriptorSupplier() {}
+  }
+
+  private static final class TextToSpeechMethodDescriptorSupplier
+      extends TextToSpeechBaseDescriptorSupplier
+      implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
+    private final String methodName;
+
+    TextToSpeechMethodDescriptorSupplier(String methodName) {
+      this.methodName = methodName;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
+      return getServiceDescriptor().findMethodByName(methodName);
+    }
+  }
+
+  private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
+
+  public static io.grpc.ServiceDescriptor getServiceDescriptor() {
+    io.grpc.ServiceDescriptor result = serviceDescriptor;
+    if (result == null) {
+      synchronized (TextToSpeechGrpc.class) {
+        result = serviceDescriptor;
+        if (result == null) {
+          serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
+              .setSchemaDescriptor(new TextToSpeechFileDescriptorSupplier())
+              .addMethod(getListVoicesMethodHelper())
+              .addMethod(getSynthesizeSpeechMethodHelper())
+              .build();
+        }
+      }
+    }
+    return result;
+  }
+}
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 658712dc4177..a32cc6772202 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -356,6 +356,16 @@
         grpc-google-cloud-speech-v1
         0.14.1-SNAPSHOT
           
+      
+        com.google.api.grpc
+        proto-google-cloud-texttospeech-v1
+        0.14.1-SNAPSHOT
+      
+      
+        com.google.api.grpc
+        grpc-google-cloud-texttospeech-v1
+        0.14.1-SNAPSHOT
+      
       
         com.google.api.grpc
         proto-google-cloud-texttospeech-v1beta1
@@ -512,6 +522,7 @@
     grpc-google-cloud-speech-v1
     grpc-google-cloud-speech-v1beta1
     grpc-google-cloud-speech-v1p1beta1
+    grpc-google-cloud-texttospeech-v1
     grpc-google-cloud-texttospeech-v1beta1
     grpc-google-cloud-trace-v1
     grpc-google-cloud-trace-v2
@@ -548,6 +559,7 @@
     proto-google-cloud-speech-v1
     proto-google-cloud-speech-v1beta1
     proto-google-cloud-speech-v1p1beta1
+    proto-google-cloud-texttospeech-v1
     proto-google-cloud-texttospeech-v1beta1
     proto-google-cloud-trace-v1
     proto-google-cloud-trace-v2
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/pom.xml b/google-api-grpc/proto-google-cloud-texttospeech-v1/pom.xml
new file mode 100644
index 000000000000..80857b2dc53e
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/pom.xml
@@ -0,0 +1,31 @@
+
+  4.0.0
+  proto-google-cloud-texttospeech-v1
+  0.14.1-SNAPSHOT
+  proto-google-cloud-texttospeech-v1
+  PROTO library for proto-google-cloud-texttospeech-v1
+  
+    com.google.api.grpc
+    google-api-grpc
+    0.14.1-SNAPSHOT
+  
+  
+    
+      com.google.protobuf
+      protobuf-java
+      compile
+    
+    
+      com.google.api
+      api-common
+      compile
+    
+    
+      com.google.api.grpc
+      proto-google-common-protos
+      compile
+    
+  
+
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java
new file mode 100644
index 000000000000..321ef1b3ea24
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java
@@ -0,0 +1,881 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+/**
+ * 
    + * Description of audio data to be synthesized.
+ * 
    
+ *
+ * Protobuf type {@code google.cloud.texttospeech.v1.AudioConfig}
+ */
+public  final class AudioConfig extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.texttospeech.v1.AudioConfig)
+    AudioConfigOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use AudioConfig.newBuilder() to construct.
+  private AudioConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private AudioConfig() {
+    audioEncoding_ = 0;
+    speakingRate_ = 0D;
+    pitch_ = 0D;
+    volumeGainDb_ = 0D;
+    sampleRateHertz_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private AudioConfig(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            audioEncoding_ = rawValue;
+            break;
+          }
+          case 17: {
+
+            speakingRate_ = input.readDouble();
+            break;
+          }
+          case 25: {
+
+            pitch_ = input.readDouble();
+            break;
+          }
+          case 33: {
+
+            volumeGainDb_ = input.readDouble();
+            break;
+          }
+          case 40: {
+
+            sampleRateHertz_ = input.readInt32();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_AudioConfig_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_AudioConfig_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.texttospeech.v1.AudioConfig.class, com.google.cloud.texttospeech.v1.AudioConfig.Builder.class);
+  }
+
+  public static final int AUDIO_ENCODING_FIELD_NUMBER = 1;
+  private int audioEncoding_;
+  /**
+   * 
    +   * Required. The format of the requested audio byte stream.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.AudioEncoding audio_encoding = 1;
+   */
+  public int getAudioEncodingValue() {
+    return audioEncoding_;
+  }
+  /**
+   * 
    +   * Required. The format of the requested audio byte stream.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.AudioEncoding audio_encoding = 1;
+   */
+  public com.google.cloud.texttospeech.v1.AudioEncoding getAudioEncoding() {
+    com.google.cloud.texttospeech.v1.AudioEncoding result = com.google.cloud.texttospeech.v1.AudioEncoding.valueOf(audioEncoding_);
+    return result == null ? com.google.cloud.texttospeech.v1.AudioEncoding.UNRECOGNIZED : result;
+  }
+
+  public static final int SPEAKING_RATE_FIELD_NUMBER = 2;
+  private double speakingRate_;
+  /**
+   * 
    +   * Optional speaking rate/speed, in the range [0.25, 4.0]. 1.0 is the normal
+   * native speed supported by the specific voice. 2.0 is twice as fast, and
+   * 0.5 is half as fast. If unset(0.0), defaults to the native 1.0 speed. Any
+   * other values < 0.25 or > 4.0 will return an error.
+   * 
    
+   *
+   * double speaking_rate = 2;
+   */
+  public double getSpeakingRate() {
+    return speakingRate_;
+  }
+
+  public static final int PITCH_FIELD_NUMBER = 3;
+  private double pitch_;
+  /**
+   * 
    +   * Optional speaking pitch, in the range [-20.0, 20.0]. 20 means increase 20
+   * semitones from the original pitch. -20 means decrease 20 semitones from the
+   * original pitch.
+   * 
    
+   *
+   * double pitch = 3;
+   */
+  public double getPitch() {
+    return pitch_;
+  }
+
+  public static final int VOLUME_GAIN_DB_FIELD_NUMBER = 4;
+  private double volumeGainDb_;
+  /**
+   * 
    +   * Optional volume gain (in dB) of the normal native volume supported by the
+   * specific voice, in the range [-96.0, 16.0]. If unset, or set to a value of
+   * 0.0 (dB), will play at normal native signal amplitude. A value of -6.0 (dB)
+   * will play at approximately half the amplitude of the normal native signal
+   * amplitude. A value of +6.0 (dB) will play at approximately twice the
+   * amplitude of the normal native signal amplitude. Strongly recommend not to
+   * exceed +10 (dB) as there's usually no effective increase in loudness for
+   * any value greater than that.
+   * 
    
+   *
+   * double volume_gain_db = 4;
+   */
+  public double getVolumeGainDb() {
+    return volumeGainDb_;
+  }
+
+  public static final int SAMPLE_RATE_HERTZ_FIELD_NUMBER = 5;
+  private int sampleRateHertz_;
+  /**
+   * 
    +   * The synthesis sample rate (in hertz) for this audio. Optional.  If this is
+   * different from the voice's natural sample rate, then the synthesizer will
+   * honor this request by converting to the desired sample rate (which might
+   * result in worse audio quality), unless the specified sample rate is not
+   * supported for the encoding chosen, in which case it will fail the request
+   * and return [google.rpc.Code.INVALID_ARGUMENT][].
+   * 
    
+   *
+   * int32 sample_rate_hertz = 5;
+   */
+  public int getSampleRateHertz() {
+    return sampleRateHertz_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (audioEncoding_ != com.google.cloud.texttospeech.v1.AudioEncoding.AUDIO_ENCODING_UNSPECIFIED.getNumber()) {
+      output.writeEnum(1, audioEncoding_);
+    }
+    if (speakingRate_ != 0D) {
+      output.writeDouble(2, speakingRate_);
+    }
+    if (pitch_ != 0D) {
+      output.writeDouble(3, pitch_);
+    }
+    if (volumeGainDb_ != 0D) {
+      output.writeDouble(4, volumeGainDb_);
+    }
+    if (sampleRateHertz_ != 0) {
+      output.writeInt32(5, sampleRateHertz_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (audioEncoding_ != com.google.cloud.texttospeech.v1.AudioEncoding.AUDIO_ENCODING_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(1, audioEncoding_);
+    }
+    if (speakingRate_ != 0D) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeDoubleSize(2, speakingRate_);
+    }
+    if (pitch_ != 0D) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeDoubleSize(3, pitch_);
+    }
+    if (volumeGainDb_ != 0D) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeDoubleSize(4, volumeGainDb_);
+    }
+    if (sampleRateHertz_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(5, sampleRateHertz_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.texttospeech.v1.AudioConfig)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.texttospeech.v1.AudioConfig other = (com.google.cloud.texttospeech.v1.AudioConfig) obj;
+
+    boolean result = true;
+    result = result && audioEncoding_ == other.audioEncoding_;
+    result = result && (
+        java.lang.Double.doubleToLongBits(getSpeakingRate())
+        == java.lang.Double.doubleToLongBits(
+            other.getSpeakingRate()));
+    result = result && (
+        java.lang.Double.doubleToLongBits(getPitch())
+        == java.lang.Double.doubleToLongBits(
+            other.getPitch()));
+    result = result && (
+        java.lang.Double.doubleToLongBits(getVolumeGainDb())
+        == java.lang.Double.doubleToLongBits(
+            other.getVolumeGainDb()));
+    result = result && (getSampleRateHertz()
+        == other.getSampleRateHertz());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + AUDIO_ENCODING_FIELD_NUMBER;
+    hash = (53 * hash) + audioEncoding_;
+    hash = (37 * hash) + SPEAKING_RATE_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        java.lang.Double.doubleToLongBits(getSpeakingRate()));
+    hash = (37 * hash) + PITCH_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        java.lang.Double.doubleToLongBits(getPitch()));
+    hash = (37 * hash) + VOLUME_GAIN_DB_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        java.lang.Double.doubleToLongBits(getVolumeGainDb()));
+    hash = (37 * hash) + SAMPLE_RATE_HERTZ_FIELD_NUMBER;
+    hash = (53 * hash) + getSampleRateHertz();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.texttospeech.v1.AudioConfig parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.AudioConfig parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.AudioConfig parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.AudioConfig parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.AudioConfig parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.AudioConfig parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.AudioConfig parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.AudioConfig parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.AudioConfig parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.AudioConfig parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.AudioConfig parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.AudioConfig parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.texttospeech.v1.AudioConfig prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
    +   * Description of audio data to be synthesized.
+   * 
    
+   *
+   * Protobuf type {@code google.cloud.texttospeech.v1.AudioConfig}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.texttospeech.v1.AudioConfig)
+      com.google.cloud.texttospeech.v1.AudioConfigOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_AudioConfig_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_AudioConfig_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.texttospeech.v1.AudioConfig.class, com.google.cloud.texttospeech.v1.AudioConfig.Builder.class);
+    }
+
+    // Construct using com.google.cloud.texttospeech.v1.AudioConfig.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      audioEncoding_ = 0;
+
+      speakingRate_ = 0D;
+
+      pitch_ = 0D;
+
+      volumeGainDb_ = 0D;
+
+      sampleRateHertz_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_AudioConfig_descriptor;
+    }
+
+    public com.google.cloud.texttospeech.v1.AudioConfig getDefaultInstanceForType() {
+      return com.google.cloud.texttospeech.v1.AudioConfig.getDefaultInstance();
+    }
+
+    public com.google.cloud.texttospeech.v1.AudioConfig build() {
+      com.google.cloud.texttospeech.v1.AudioConfig result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.texttospeech.v1.AudioConfig buildPartial() {
+      com.google.cloud.texttospeech.v1.AudioConfig result = new com.google.cloud.texttospeech.v1.AudioConfig(this);
+      result.audioEncoding_ = audioEncoding_;
+      result.speakingRate_ = speakingRate_;
+      result.pitch_ = pitch_;
+      result.volumeGainDb_ = volumeGainDb_;
+      result.sampleRateHertz_ = sampleRateHertz_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.texttospeech.v1.AudioConfig) {
+        return mergeFrom((com.google.cloud.texttospeech.v1.AudioConfig)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.texttospeech.v1.AudioConfig other) {
+      if (other == com.google.cloud.texttospeech.v1.AudioConfig.getDefaultInstance()) return this;
+      if (other.audioEncoding_ != 0) {
+        setAudioEncodingValue(other.getAudioEncodingValue());
+      }
+      if (other.getSpeakingRate() != 0D) {
+        setSpeakingRate(other.getSpeakingRate());
+      }
+      if (other.getPitch() != 0D) {
+        setPitch(other.getPitch());
+      }
+      if (other.getVolumeGainDb() != 0D) {
+        setVolumeGainDb(other.getVolumeGainDb());
+      }
+      if (other.getSampleRateHertz() != 0) {
+        setSampleRateHertz(other.getSampleRateHertz());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.texttospeech.v1.AudioConfig parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.texttospeech.v1.AudioConfig) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int audioEncoding_ = 0;
+    /**
+     * 
    +     * Required. The format of the requested audio byte stream.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioEncoding audio_encoding = 1;
+     */
+    public int getAudioEncodingValue() {
+      return audioEncoding_;
+    }
+    /**
+     * 
    +     * Required. The format of the requested audio byte stream.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioEncoding audio_encoding = 1;
+     */
+    public Builder setAudioEncodingValue(int value) {
+      audioEncoding_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Required. The format of the requested audio byte stream.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioEncoding audio_encoding = 1;
+     */
+    public com.google.cloud.texttospeech.v1.AudioEncoding getAudioEncoding() {
+      com.google.cloud.texttospeech.v1.AudioEncoding result = com.google.cloud.texttospeech.v1.AudioEncoding.valueOf(audioEncoding_);
+      return result == null ? com.google.cloud.texttospeech.v1.AudioEncoding.UNRECOGNIZED : result;
+    }
+    /**
+     * 
    +     * Required. The format of the requested audio byte stream.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioEncoding audio_encoding = 1;
+     */
+    public Builder setAudioEncoding(com.google.cloud.texttospeech.v1.AudioEncoding value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      audioEncoding_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Required. The format of the requested audio byte stream.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioEncoding audio_encoding = 1;
+     */
+    public Builder clearAudioEncoding() {
+      
+      audioEncoding_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private double speakingRate_ ;
+    /**
+     * 
    +     * Optional speaking rate/speed, in the range [0.25, 4.0]. 1.0 is the normal
+     * native speed supported by the specific voice. 2.0 is twice as fast, and
+     * 0.5 is half as fast. If unset(0.0), defaults to the native 1.0 speed. Any
+     * other values < 0.25 or > 4.0 will return an error.
+     * 
    
+     *
+     * double speaking_rate = 2;
+     */
+    public double getSpeakingRate() {
+      return speakingRate_;
+    }
+    /**
+     * 
    +     * Optional speaking rate/speed, in the range [0.25, 4.0]. 1.0 is the normal
+     * native speed supported by the specific voice. 2.0 is twice as fast, and
+     * 0.5 is half as fast. If unset(0.0), defaults to the native 1.0 speed. Any
+     * other values < 0.25 or > 4.0 will return an error.
+     * 
    
+     *
+     * double speaking_rate = 2;
+     */
+    public Builder setSpeakingRate(double value) {
+      
+      speakingRate_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Optional speaking rate/speed, in the range [0.25, 4.0]. 1.0 is the normal
+     * native speed supported by the specific voice. 2.0 is twice as fast, and
+     * 0.5 is half as fast. If unset(0.0), defaults to the native 1.0 speed. Any
+     * other values < 0.25 or > 4.0 will return an error.
+     * 
    
+     *
+     * double speaking_rate = 2;
+     */
+    public Builder clearSpeakingRate() {
+      
+      speakingRate_ = 0D;
+      onChanged();
+      return this;
+    }
+
+    private double pitch_ ;
+    /**
+     * 
    +     * Optional speaking pitch, in the range [-20.0, 20.0]. 20 means increase 20
+     * semitones from the original pitch. -20 means decrease 20 semitones from the
+     * original pitch.
+     * 
    
+     *
+     * double pitch = 3;
+     */
+    public double getPitch() {
+      return pitch_;
+    }
+    /**
+     * 
    +     * Optional speaking pitch, in the range [-20.0, 20.0]. 20 means increase 20
+     * semitones from the original pitch. -20 means decrease 20 semitones from the
+     * original pitch.
+     * 
    
+     *
+     * double pitch = 3;
+     */
+    public Builder setPitch(double value) {
+      
+      pitch_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Optional speaking pitch, in the range [-20.0, 20.0]. 20 means increase 20
+     * semitones from the original pitch. -20 means decrease 20 semitones from the
+     * original pitch.
+     * 
    
+     *
+     * double pitch = 3;
+     */
+    public Builder clearPitch() {
+      
+      pitch_ = 0D;
+      onChanged();
+      return this;
+    }
+
+    private double volumeGainDb_ ;
+    /**
+     * 
    +     * Optional volume gain (in dB) of the normal native volume supported by the
+     * specific voice, in the range [-96.0, 16.0]. If unset, or set to a value of
+     * 0.0 (dB), will play at normal native signal amplitude. A value of -6.0 (dB)
+     * will play at approximately half the amplitude of the normal native signal
+     * amplitude. A value of +6.0 (dB) will play at approximately twice the
+     * amplitude of the normal native signal amplitude. Strongly recommend not to
+     * exceed +10 (dB) as there's usually no effective increase in loudness for
+     * any value greater than that.
+     * 
    
+     *
+     * double volume_gain_db = 4;
+     */
+    public double getVolumeGainDb() {
+      return volumeGainDb_;
+    }
+    /**
+     * 
    +     * Optional volume gain (in dB) of the normal native volume supported by the
+     * specific voice, in the range [-96.0, 16.0]. If unset, or set to a value of
+     * 0.0 (dB), will play at normal native signal amplitude. A value of -6.0 (dB)
+     * will play at approximately half the amplitude of the normal native signal
+     * amplitude. A value of +6.0 (dB) will play at approximately twice the
+     * amplitude of the normal native signal amplitude. Strongly recommend not to
+     * exceed +10 (dB) as there's usually no effective increase in loudness for
+     * any value greater than that.
+     * 
    
+     *
+     * double volume_gain_db = 4;
+     */
+    public Builder setVolumeGainDb(double value) {
+      
+      volumeGainDb_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Optional volume gain (in dB) of the normal native volume supported by the
+     * specific voice, in the range [-96.0, 16.0]. If unset, or set to a value of
+     * 0.0 (dB), will play at normal native signal amplitude. A value of -6.0 (dB)
+     * will play at approximately half the amplitude of the normal native signal
+     * amplitude. A value of +6.0 (dB) will play at approximately twice the
+     * amplitude of the normal native signal amplitude. Strongly recommend not to
+     * exceed +10 (dB) as there's usually no effective increase in loudness for
+     * any value greater than that.
+     * 
    
+     *
+     * double volume_gain_db = 4;
+     */
+    public Builder clearVolumeGainDb() {
+      
+      volumeGainDb_ = 0D;
+      onChanged();
+      return this;
+    }
+
+    private int sampleRateHertz_ ;
+    /**
+     * 
    +     * The synthesis sample rate (in hertz) for this audio. Optional.  If this is
+     * different from the voice's natural sample rate, then the synthesizer will
+     * honor this request by converting to the desired sample rate (which might
+     * result in worse audio quality), unless the specified sample rate is not
+     * supported for the encoding chosen, in which case it will fail the request
+     * and return [google.rpc.Code.INVALID_ARGUMENT][].
+     * 
    
+     *
+     * int32 sample_rate_hertz = 5;
+     */
+    public int getSampleRateHertz() {
+      return sampleRateHertz_;
+    }
+    /**
+     * 
    +     * The synthesis sample rate (in hertz) for this audio. Optional.  If this is
+     * different from the voice's natural sample rate, then the synthesizer will
+     * honor this request by converting to the desired sample rate (which might
+     * result in worse audio quality), unless the specified sample rate is not
+     * supported for the encoding chosen, in which case it will fail the request
+     * and return [google.rpc.Code.INVALID_ARGUMENT][].
+     * 
    
+     *
+     * int32 sample_rate_hertz = 5;
+     */
+    public Builder setSampleRateHertz(int value) {
+      
+      sampleRateHertz_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The synthesis sample rate (in hertz) for this audio. Optional.  If this is
+     * different from the voice's natural sample rate, then the synthesizer will
+     * honor this request by converting to the desired sample rate (which might
+     * result in worse audio quality), unless the specified sample rate is not
+     * supported for the encoding chosen, in which case it will fail the request
+     * and return [google.rpc.Code.INVALID_ARGUMENT][].
+     * 
    
+     *
+     * int32 sample_rate_hertz = 5;
+     */
+    public Builder clearSampleRateHertz() {
+      
+      sampleRateHertz_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.texttospeech.v1.AudioConfig)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.texttospeech.v1.AudioConfig)
+  private static final com.google.cloud.texttospeech.v1.AudioConfig DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.texttospeech.v1.AudioConfig();
+  }
+
+  public static com.google.cloud.texttospeech.v1.AudioConfig getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public AudioConfig parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new AudioConfig(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.texttospeech.v1.AudioConfig getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfigOrBuilder.java
new file mode 100644
index 000000000000..af07139da48a
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfigOrBuilder.java
@@ -0,0 +1,79 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+public interface AudioConfigOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.texttospeech.v1.AudioConfig)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
    +   * Required. The format of the requested audio byte stream.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.AudioEncoding audio_encoding = 1;
+   */
+  int getAudioEncodingValue();
+  /**
+   * 
    +   * Required. The format of the requested audio byte stream.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.AudioEncoding audio_encoding = 1;
+   */
+  com.google.cloud.texttospeech.v1.AudioEncoding getAudioEncoding();
+
+  /**
+   * 
    +   * Optional speaking rate/speed, in the range [0.25, 4.0]. 1.0 is the normal
+   * native speed supported by the specific voice. 2.0 is twice as fast, and
+   * 0.5 is half as fast. If unset(0.0), defaults to the native 1.0 speed. Any
+   * other values < 0.25 or > 4.0 will return an error.
+   * 
    
+   *
+   * double speaking_rate = 2;
+   */
+  double getSpeakingRate();
+
+  /**
+   * 
    +   * Optional speaking pitch, in the range [-20.0, 20.0]. 20 means increase 20
+   * semitones from the original pitch. -20 means decrease 20 semitones from the
+   * original pitch.
+   * 
    
+   *
+   * double pitch = 3;
+   */
+  double getPitch();
+
+  /**
+   * 
    +   * Optional volume gain (in dB) of the normal native volume supported by the
+   * specific voice, in the range [-96.0, 16.0]. If unset, or set to a value of
+   * 0.0 (dB), will play at normal native signal amplitude. A value of -6.0 (dB)
+   * will play at approximately half the amplitude of the normal native signal
+   * amplitude. A value of +6.0 (dB) will play at approximately twice the
+   * amplitude of the normal native signal amplitude. Strongly recommend not to
+   * exceed +10 (dB) as there's usually no effective increase in loudness for
+   * any value greater than that.
+   * 
    
+   *
+   * double volume_gain_db = 4;
+   */
+  double getVolumeGainDb();
+
+  /**
+   * 
    +   * The synthesis sample rate (in hertz) for this audio. Optional.  If this is
+   * different from the voice's natural sample rate, then the synthesizer will
+   * honor this request by converting to the desired sample rate (which might
+   * result in worse audio quality), unless the specified sample rate is not
+   * supported for the encoding chosen, in which case it will fail the request
+   * and return [google.rpc.Code.INVALID_ARGUMENT][].
+   * 
    
+   *
+   * int32 sample_rate_hertz = 5;
+   */
+  int getSampleRateHertz();
+}
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioEncoding.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioEncoding.java
new file mode 100644
index 000000000000..adbeb00b61bf
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioEncoding.java
@@ -0,0 +1,166 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+/**
+ * 
    + * Configuration to set up audio encoder. The encoding determines the output
+ * audio format that we'd like.
+ * 
    
+ *
+ * Protobuf enum {@code google.cloud.texttospeech.v1.AudioEncoding}
+ */
+public enum AudioEncoding
+    implements com.google.protobuf.ProtocolMessageEnum {
+  /**
+   * 
    +   * Not specified. Will return result [google.rpc.Code.INVALID_ARGUMENT][].
+   * 
    
+   *
+   * AUDIO_ENCODING_UNSPECIFIED = 0;
+   */
+  AUDIO_ENCODING_UNSPECIFIED(0),
+  /**
+   * 
    +   * Uncompressed 16-bit signed little-endian samples (Linear PCM).
+   * Audio content returned as LINEAR16 also contains a WAV header.
+   * 
    
+   *
+   * LINEAR16 = 1;
+   */
+  LINEAR16(1),
+  /**
+   * 
    +   * MP3 audio.
+   * 
    
+   *
+   * MP3 = 2;
+   */
+  MP3(2),
+  /**
+   * 
    +   * Opus encoded audio wrapped in an ogg container. The result will be a
+   * file which can be played natively on Android, and in browsers (at least
+   * Chrome and Firefox). The quality of the encoding is considerably higher
+   * than MP3 while using approximately the same bitrate.
+   * 
    
+   *
+   * OGG_OPUS = 3;
+   */
+  OGG_OPUS(3),
+  UNRECOGNIZED(-1),
+  ;
+
+  /**
+   * 
    +   * Not specified. Will return result [google.rpc.Code.INVALID_ARGUMENT][].
+   * 
    
+   *
+   * AUDIO_ENCODING_UNSPECIFIED = 0;
+   */
+  public static final int AUDIO_ENCODING_UNSPECIFIED_VALUE = 0;
+  /**
+   * 
    +   * Uncompressed 16-bit signed little-endian samples (Linear PCM).
+   * Audio content returned as LINEAR16 also contains a WAV header.
+   * 
    
+   *
+   * LINEAR16 = 1;
+   */
+  public static final int LINEAR16_VALUE = 1;
+  /**
+   * 
    +   * MP3 audio.
+   * 
    
+   *
+   * MP3 = 2;
+   */
+  public static final int MP3_VALUE = 2;
+  /**
+   * 
    +   * Opus encoded audio wrapped in an ogg container. The result will be a
+   * file which can be played natively on Android, and in browsers (at least
+   * Chrome and Firefox). The quality of the encoding is considerably higher
+   * than MP3 while using approximately the same bitrate.
+   * 
    
+   *
+   * OGG_OPUS = 3;
+   */
+  public static final int OGG_OPUS_VALUE = 3;
+
+
+  public final int getNumber() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalArgumentException(
+          "Can't get the number of an unknown enum value.");
+    }
+    return value;
+  }
+
+  /**
+   * @deprecated Use {@link #forNumber(int)} instead.
+   */
+  @java.lang.Deprecated
+  public static AudioEncoding valueOf(int value) {
+    return forNumber(value);
+  }
+
+  public static AudioEncoding forNumber(int value) {
+    switch (value) {
+      case 0: return AUDIO_ENCODING_UNSPECIFIED;
+      case 1: return LINEAR16;
+      case 2: return MP3;
+      case 3: return OGG_OPUS;
+      default: return null;
+    }
+  }
+
+  public static com.google.protobuf.Internal.EnumLiteMap
+      internalGetValueMap() {
+    return internalValueMap;
+  }
+  private static final com.google.protobuf.Internal.EnumLiteMap<
+      AudioEncoding> internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public AudioEncoding findValueByNumber(int number) {
+            return AudioEncoding.forNumber(number);
+          }
+        };
+
+  public final com.google.protobuf.Descriptors.EnumValueDescriptor
+      getValueDescriptor() {
+    return getDescriptor().getValues().get(ordinal());
+  }
+  public final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptorForType() {
+    return getDescriptor();
+  }
+  public static final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptor() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.getDescriptor().getEnumTypes().get(1);
+  }
+
+  private static final AudioEncoding[] VALUES = values();
+
+  public static AudioEncoding valueOf(
+      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    if (desc.getType() != getDescriptor()) {
+      throw new java.lang.IllegalArgumentException(
+        "EnumValueDescriptor is not for this type.");
+    }
+    if (desc.getIndex() == -1) {
+      return UNRECOGNIZED;
+    }
+    return VALUES[desc.getIndex()];
+  }
+
+  private final int value;
+
+  private AudioEncoding(int value) {
+    this.value = value;
+  }
+
+  // @@protoc_insertion_point(enum_scope:google.cloud.texttospeech.v1.AudioEncoding)
+}
+
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java
new file mode 100644
index 000000000000..c76ded93fa8f
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java
@@ -0,0 +1,601 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+/**
+ * 
    + * The top-level message sent by the client for the `ListVoices` method.
+ * 
    
+ *
+ * Protobuf type {@code google.cloud.texttospeech.v1.ListVoicesRequest}
+ */
+public  final class ListVoicesRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.texttospeech.v1.ListVoicesRequest)
+    ListVoicesRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListVoicesRequest.newBuilder() to construct.
+  private ListVoicesRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListVoicesRequest() {
+    languageCode_ = "";
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListVoicesRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            languageCode_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.texttospeech.v1.ListVoicesRequest.class, com.google.cloud.texttospeech.v1.ListVoicesRequest.Builder.class);
+  }
+
+  public static final int LANGUAGE_CODE_FIELD_NUMBER = 1;
+  private volatile java.lang.Object languageCode_;
+  /**
+   * 
    +   * Optional (but recommended)
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If
+   * specified, the ListVoices call will only return voices that can be used to
+   * synthesize this language_code. E.g. when specifying "en-NZ", you will get
+   * supported "en-*" voices; when specifying "no", you will get supported
+   * "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh"
+   * will also get supported "cmn-*" voices; specifying "zh-hk" will also get
+   * supported "yue-*" voices.
+   * 
    
+   *
+   * string language_code = 1;
+   */
+  public java.lang.String getLanguageCode() {
+    java.lang.Object ref = languageCode_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      languageCode_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
    +   * Optional (but recommended)
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If
+   * specified, the ListVoices call will only return voices that can be used to
+   * synthesize this language_code. E.g. when specifying "en-NZ", you will get
+   * supported "en-*" voices; when specifying "no", you will get supported
+   * "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh"
+   * will also get supported "cmn-*" voices; specifying "zh-hk" will also get
+   * supported "yue-*" voices.
+   * 
    
+   *
+   * string language_code = 1;
+   */
+  public com.google.protobuf.ByteString
+      getLanguageCodeBytes() {
+    java.lang.Object ref = languageCode_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      languageCode_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getLanguageCodeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, languageCode_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getLanguageCodeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, languageCode_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.texttospeech.v1.ListVoicesRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.texttospeech.v1.ListVoicesRequest other = (com.google.cloud.texttospeech.v1.ListVoicesRequest) obj;
+
+    boolean result = true;
+    result = result && getLanguageCode()
+        .equals(other.getLanguageCode());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + LANGUAGE_CODE_FIELD_NUMBER;
+    hash = (53 * hash) + getLanguageCode().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.texttospeech.v1.ListVoicesRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
    +   * The top-level message sent by the client for the `ListVoices` method.
+   * 
    
+   *
+   * Protobuf type {@code google.cloud.texttospeech.v1.ListVoicesRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.texttospeech.v1.ListVoicesRequest)
+      com.google.cloud.texttospeech.v1.ListVoicesRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.texttospeech.v1.ListVoicesRequest.class, com.google.cloud.texttospeech.v1.ListVoicesRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.texttospeech.v1.ListVoicesRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      languageCode_ = "";
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_descriptor;
+    }
+
+    public com.google.cloud.texttospeech.v1.ListVoicesRequest getDefaultInstanceForType() {
+      return com.google.cloud.texttospeech.v1.ListVoicesRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.texttospeech.v1.ListVoicesRequest build() {
+      com.google.cloud.texttospeech.v1.ListVoicesRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.texttospeech.v1.ListVoicesRequest buildPartial() {
+      com.google.cloud.texttospeech.v1.ListVoicesRequest result = new com.google.cloud.texttospeech.v1.ListVoicesRequest(this);
+      result.languageCode_ = languageCode_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.texttospeech.v1.ListVoicesRequest) {
+        return mergeFrom((com.google.cloud.texttospeech.v1.ListVoicesRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.texttospeech.v1.ListVoicesRequest other) {
+      if (other == com.google.cloud.texttospeech.v1.ListVoicesRequest.getDefaultInstance()) return this;
+      if (!other.getLanguageCode().isEmpty()) {
+        languageCode_ = other.languageCode_;
+        onChanged();
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.texttospeech.v1.ListVoicesRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.texttospeech.v1.ListVoicesRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object languageCode_ = "";
+    /**
+     * 
    +     * Optional (but recommended)
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If
+     * specified, the ListVoices call will only return voices that can be used to
+     * synthesize this language_code. E.g. when specifying "en-NZ", you will get
+     * supported "en-*" voices; when specifying "no", you will get supported
+     * "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh"
+     * will also get supported "cmn-*" voices; specifying "zh-hk" will also get
+     * supported "yue-*" voices.
+     * 
    
+     *
+     * string language_code = 1;
+     */
+    public java.lang.String getLanguageCode() {
+      java.lang.Object ref = languageCode_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        languageCode_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
    +     * Optional (but recommended)
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If
+     * specified, the ListVoices call will only return voices that can be used to
+     * synthesize this language_code. E.g. when specifying "en-NZ", you will get
+     * supported "en-*" voices; when specifying "no", you will get supported
+     * "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh"
+     * will also get supported "cmn-*" voices; specifying "zh-hk" will also get
+     * supported "yue-*" voices.
+     * 
    
+     *
+     * string language_code = 1;
+     */
+    public com.google.protobuf.ByteString
+        getLanguageCodeBytes() {
+      java.lang.Object ref = languageCode_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        languageCode_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
    +     * Optional (but recommended)
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If
+     * specified, the ListVoices call will only return voices that can be used to
+     * synthesize this language_code. E.g. when specifying "en-NZ", you will get
+     * supported "en-*" voices; when specifying "no", you will get supported
+     * "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh"
+     * will also get supported "cmn-*" voices; specifying "zh-hk" will also get
+     * supported "yue-*" voices.
+     * 
    
+     *
+     * string language_code = 1;
+     */
+    public Builder setLanguageCode(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      languageCode_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Optional (but recommended)
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If
+     * specified, the ListVoices call will only return voices that can be used to
+     * synthesize this language_code. E.g. when specifying "en-NZ", you will get
+     * supported "en-*" voices; when specifying "no", you will get supported
+     * "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh"
+     * will also get supported "cmn-*" voices; specifying "zh-hk" will also get
+     * supported "yue-*" voices.
+     * 
    
+     *
+     * string language_code = 1;
+     */
+    public Builder clearLanguageCode() {
+      
+      languageCode_ = getDefaultInstance().getLanguageCode();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * Optional (but recommended)
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If
+     * specified, the ListVoices call will only return voices that can be used to
+     * synthesize this language_code. E.g. when specifying "en-NZ", you will get
+     * supported "en-*" voices; when specifying "no", you will get supported
+     * "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh"
+     * will also get supported "cmn-*" voices; specifying "zh-hk" will also get
+     * supported "yue-*" voices.
+     * 
    
+     *
+     * string language_code = 1;
+     */
+    public Builder setLanguageCodeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      languageCode_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.texttospeech.v1.ListVoicesRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.texttospeech.v1.ListVoicesRequest)
+  private static final com.google.cloud.texttospeech.v1.ListVoicesRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.texttospeech.v1.ListVoicesRequest();
+  }
+
+  public static com.google.cloud.texttospeech.v1.ListVoicesRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListVoicesRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListVoicesRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.texttospeech.v1.ListVoicesRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequestOrBuilder.java
new file mode 100644
index 000000000000..be63654600cd
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequestOrBuilder.java
@@ -0,0 +1,41 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+public interface ListVoicesRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.texttospeech.v1.ListVoicesRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
    +   * Optional (but recommended)
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If
+   * specified, the ListVoices call will only return voices that can be used to
+   * synthesize this language_code. E.g. when specifying "en-NZ", you will get
+   * supported "en-*" voices; when specifying "no", you will get supported
+   * "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh"
+   * will also get supported "cmn-*" voices; specifying "zh-hk" will also get
+   * supported "yue-*" voices.
+   * 
    
+   *
+   * string language_code = 1;
+   */
+  java.lang.String getLanguageCode();
+  /**
+   * 
    +   * Optional (but recommended)
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If
+   * specified, the ListVoices call will only return voices that can be used to
+   * synthesize this language_code. E.g. when specifying "en-NZ", you will get
+   * supported "en-*" voices; when specifying "no", you will get supported
+   * "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh"
+   * will also get supported "cmn-*" voices; specifying "zh-hk" will also get
+   * supported "yue-*" voices.
+   * 
    
+   *
+   * string language_code = 1;
+   */
+  com.google.protobuf.ByteString
+      getLanguageCodeBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java
new file mode 100644
index 000000000000..cecca6db7d9b
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java
@@ -0,0 +1,834 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+/**
+ * 
    + * The message returned to the client by the `ListVoices` method.
+ * 
    
+ *
+ * Protobuf type {@code google.cloud.texttospeech.v1.ListVoicesResponse}
+ */
+public  final class ListVoicesResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.texttospeech.v1.ListVoicesResponse)
+    ListVoicesResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ListVoicesResponse.newBuilder() to construct.
+  private ListVoicesResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private ListVoicesResponse() {
+    voices_ = java.util.Collections.emptyList();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ListVoicesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              voices_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            voices_.add(
+                input.readMessage(com.google.cloud.texttospeech.v1.Voice.parser(), extensionRegistry));
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        voices_ = java.util.Collections.unmodifiableList(voices_);
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.texttospeech.v1.ListVoicesResponse.class, com.google.cloud.texttospeech.v1.ListVoicesResponse.Builder.class);
+  }
+
+  public static final int VOICES_FIELD_NUMBER = 1;
+  private java.util.List voices_;
+  /**
+   * 
    +   * The list of voices.
+   * 
    
+   *
+   * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+   */
+  public java.util.List getVoicesList() {
+    return voices_;
+  }
+  /**
+   * 
    +   * The list of voices.
+   * 
    
+   *
+   * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+   */
+  public java.util.List 
+      getVoicesOrBuilderList() {
+    return voices_;
+  }
+  /**
+   * 
    +   * The list of voices.
+   * 
    
+   *
+   * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+   */
+  public int getVoicesCount() {
+    return voices_.size();
+  }
+  /**
+   * 
    +   * The list of voices.
+   * 
    
+   *
+   * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+   */
+  public com.google.cloud.texttospeech.v1.Voice getVoices(int index) {
+    return voices_.get(index);
+  }
+  /**
+   * 
    +   * The list of voices.
+   * 
    
+   *
+   * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+   */
+  public com.google.cloud.texttospeech.v1.VoiceOrBuilder getVoicesOrBuilder(
+      int index) {
+    return voices_.get(index);
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < voices_.size(); i++) {
+      output.writeMessage(1, voices_.get(i));
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    for (int i = 0; i < voices_.size(); i++) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, voices_.get(i));
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.texttospeech.v1.ListVoicesResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.texttospeech.v1.ListVoicesResponse other = (com.google.cloud.texttospeech.v1.ListVoicesResponse) obj;
+
+    boolean result = true;
+    result = result && getVoicesList()
+        .equals(other.getVoicesList());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getVoicesCount() > 0) {
+      hash = (37 * hash) + VOICES_FIELD_NUMBER;
+      hash = (53 * hash) + getVoicesList().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.texttospeech.v1.ListVoicesResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
    +   * The message returned to the client by the `ListVoices` method.
+   * 
    
+   *
+   * Protobuf type {@code google.cloud.texttospeech.v1.ListVoicesResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.texttospeech.v1.ListVoicesResponse)
+      com.google.cloud.texttospeech.v1.ListVoicesResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.texttospeech.v1.ListVoicesResponse.class, com.google.cloud.texttospeech.v1.ListVoicesResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.texttospeech.v1.ListVoicesResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+        getVoicesFieldBuilder();
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (voicesBuilder_ == null) {
+        voices_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      } else {
+        voicesBuilder_.clear();
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_descriptor;
+    }
+
+    public com.google.cloud.texttospeech.v1.ListVoicesResponse getDefaultInstanceForType() {
+      return com.google.cloud.texttospeech.v1.ListVoicesResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.texttospeech.v1.ListVoicesResponse build() {
+      com.google.cloud.texttospeech.v1.ListVoicesResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.texttospeech.v1.ListVoicesResponse buildPartial() {
+      com.google.cloud.texttospeech.v1.ListVoicesResponse result = new com.google.cloud.texttospeech.v1.ListVoicesResponse(this);
+      int from_bitField0_ = bitField0_;
+      if (voicesBuilder_ == null) {
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          voices_ = java.util.Collections.unmodifiableList(voices_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.voices_ = voices_;
+      } else {
+        result.voices_ = voicesBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.texttospeech.v1.ListVoicesResponse) {
+        return mergeFrom((com.google.cloud.texttospeech.v1.ListVoicesResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.texttospeech.v1.ListVoicesResponse other) {
+      if (other == com.google.cloud.texttospeech.v1.ListVoicesResponse.getDefaultInstance()) return this;
+      if (voicesBuilder_ == null) {
+        if (!other.voices_.isEmpty()) {
+          if (voices_.isEmpty()) {
+            voices_ = other.voices_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureVoicesIsMutable();
+            voices_.addAll(other.voices_);
+          }
+          onChanged();
+        }
+      } else {
+        if (!other.voices_.isEmpty()) {
+          if (voicesBuilder_.isEmpty()) {
+            voicesBuilder_.dispose();
+            voicesBuilder_ = null;
+            voices_ = other.voices_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+            voicesBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getVoicesFieldBuilder() : null;
+          } else {
+            voicesBuilder_.addAllMessages(other.voices_);
+          }
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.texttospeech.v1.ListVoicesResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.texttospeech.v1.ListVoicesResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private java.util.List voices_ =
+      java.util.Collections.emptyList();
+    private void ensureVoicesIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        voices_ = new java.util.ArrayList(voices_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.texttospeech.v1.Voice, com.google.cloud.texttospeech.v1.Voice.Builder, com.google.cloud.texttospeech.v1.VoiceOrBuilder> voicesBuilder_;
+
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public java.util.List getVoicesList() {
+      if (voicesBuilder_ == null) {
+        return java.util.Collections.unmodifiableList(voices_);
+      } else {
+        return voicesBuilder_.getMessageList();
+      }
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public int getVoicesCount() {
+      if (voicesBuilder_ == null) {
+        return voices_.size();
+      } else {
+        return voicesBuilder_.getCount();
+      }
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public com.google.cloud.texttospeech.v1.Voice getVoices(int index) {
+      if (voicesBuilder_ == null) {
+        return voices_.get(index);
+      } else {
+        return voicesBuilder_.getMessage(index);
+      }
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public Builder setVoices(
+        int index, com.google.cloud.texttospeech.v1.Voice value) {
+      if (voicesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureVoicesIsMutable();
+        voices_.set(index, value);
+        onChanged();
+      } else {
+        voicesBuilder_.setMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public Builder setVoices(
+        int index, com.google.cloud.texttospeech.v1.Voice.Builder builderForValue) {
+      if (voicesBuilder_ == null) {
+        ensureVoicesIsMutable();
+        voices_.set(index, builderForValue.build());
+        onChanged();
+      } else {
+        voicesBuilder_.setMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public Builder addVoices(com.google.cloud.texttospeech.v1.Voice value) {
+      if (voicesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureVoicesIsMutable();
+        voices_.add(value);
+        onChanged();
+      } else {
+        voicesBuilder_.addMessage(value);
+      }
+      return this;
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public Builder addVoices(
+        int index, com.google.cloud.texttospeech.v1.Voice value) {
+      if (voicesBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureVoicesIsMutable();
+        voices_.add(index, value);
+        onChanged();
+      } else {
+        voicesBuilder_.addMessage(index, value);
+      }
+      return this;
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public Builder addVoices(
+        com.google.cloud.texttospeech.v1.Voice.Builder builderForValue) {
+      if (voicesBuilder_ == null) {
+        ensureVoicesIsMutable();
+        voices_.add(builderForValue.build());
+        onChanged();
+      } else {
+        voicesBuilder_.addMessage(builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public Builder addVoices(
+        int index, com.google.cloud.texttospeech.v1.Voice.Builder builderForValue) {
+      if (voicesBuilder_ == null) {
+        ensureVoicesIsMutable();
+        voices_.add(index, builderForValue.build());
+        onChanged();
+      } else {
+        voicesBuilder_.addMessage(index, builderForValue.build());
+      }
+      return this;
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public Builder addAllVoices(
+        java.lang.Iterable values) {
+      if (voicesBuilder_ == null) {
+        ensureVoicesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, voices_);
+        onChanged();
+      } else {
+        voicesBuilder_.addAllMessages(values);
+      }
+      return this;
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public Builder clearVoices() {
+      if (voicesBuilder_ == null) {
+        voices_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+      } else {
+        voicesBuilder_.clear();
+      }
+      return this;
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public Builder removeVoices(int index) {
+      if (voicesBuilder_ == null) {
+        ensureVoicesIsMutable();
+        voices_.remove(index);
+        onChanged();
+      } else {
+        voicesBuilder_.remove(index);
+      }
+      return this;
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public com.google.cloud.texttospeech.v1.Voice.Builder getVoicesBuilder(
+        int index) {
+      return getVoicesFieldBuilder().getBuilder(index);
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public com.google.cloud.texttospeech.v1.VoiceOrBuilder getVoicesOrBuilder(
+        int index) {
+      if (voicesBuilder_ == null) {
+        return voices_.get(index);  } else {
+        return voicesBuilder_.getMessageOrBuilder(index);
+      }
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public java.util.List 
+         getVoicesOrBuilderList() {
+      if (voicesBuilder_ != null) {
+        return voicesBuilder_.getMessageOrBuilderList();
+      } else {
+        return java.util.Collections.unmodifiableList(voices_);
+      }
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public com.google.cloud.texttospeech.v1.Voice.Builder addVoicesBuilder() {
+      return getVoicesFieldBuilder().addBuilder(
+          com.google.cloud.texttospeech.v1.Voice.getDefaultInstance());
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public com.google.cloud.texttospeech.v1.Voice.Builder addVoicesBuilder(
+        int index) {
+      return getVoicesFieldBuilder().addBuilder(
+          index, com.google.cloud.texttospeech.v1.Voice.getDefaultInstance());
+    }
+    /**
+     * 
    +     * The list of voices.
+     * 
    
+     *
+     * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+     */
+    public java.util.List 
+         getVoicesBuilderList() {
+      return getVoicesFieldBuilder().getBuilderList();
+    }
+    private com.google.protobuf.RepeatedFieldBuilderV3<
+        com.google.cloud.texttospeech.v1.Voice, com.google.cloud.texttospeech.v1.Voice.Builder, com.google.cloud.texttospeech.v1.VoiceOrBuilder> 
+        getVoicesFieldBuilder() {
+      if (voicesBuilder_ == null) {
+        voicesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.cloud.texttospeech.v1.Voice, com.google.cloud.texttospeech.v1.Voice.Builder, com.google.cloud.texttospeech.v1.VoiceOrBuilder>(
+                voices_,
+                ((bitField0_ & 0x00000001) == 0x00000001),
+                getParentForChildren(),
+                isClean());
+        voices_ = null;
+      }
+      return voicesBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.texttospeech.v1.ListVoicesResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.texttospeech.v1.ListVoicesResponse)
+  private static final com.google.cloud.texttospeech.v1.ListVoicesResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.texttospeech.v1.ListVoicesResponse();
+  }
+
+  public static com.google.cloud.texttospeech.v1.ListVoicesResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public ListVoicesResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ListVoicesResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.texttospeech.v1.ListVoicesResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponseOrBuilder.java
new file mode 100644
index 000000000000..253480e24e01
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponseOrBuilder.java
@@ -0,0 +1,53 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+public interface ListVoicesResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.texttospeech.v1.ListVoicesResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
    +   * The list of voices.
+   * 
    
+   *
+   * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+   */
+  java.util.List 
+      getVoicesList();
+  /**
+   * 
    +   * The list of voices.
+   * 
    
+   *
+   * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+   */
+  com.google.cloud.texttospeech.v1.Voice getVoices(int index);
+  /**
+   * 
    +   * The list of voices.
+   * 
    
+   *
+   * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+   */
+  int getVoicesCount();
+  /**
+   * 
    +   * The list of voices.
+   * 
    
+   *
+   * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+   */
+  java.util.List 
+      getVoicesOrBuilderList();
+  /**
+   * 
    +   * The list of voices.
+   * 
    
+   *
+   * repeated .google.cloud.texttospeech.v1.Voice voices = 1;
+   */
+  com.google.cloud.texttospeech.v1.VoiceOrBuilder getVoicesOrBuilder(
+      int index);
+}
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SsmlVoiceGender.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SsmlVoiceGender.java
new file mode 100644
index 000000000000..12481e55c8b0
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SsmlVoiceGender.java
@@ -0,0 +1,166 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+/**
+ * 
    + * Gender of the voice as described in
+ * [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice).
+ * 
    
+ *
+ * Protobuf enum {@code google.cloud.texttospeech.v1.SsmlVoiceGender}
+ */
+public enum SsmlVoiceGender
+    implements com.google.protobuf.ProtocolMessageEnum {
+  /**
+   * 
    +   * An unspecified gender.
+   * In VoiceSelectionParams, this means that the client doesn't care which
+   * gender the selected voice will have. In the Voice field of
+   * ListVoicesResponse, this may mean that the voice doesn't fit any of the
+   * other categories in this enum, or that the gender of the voice isn't known.
+   * 
    
+   *
+   * SSML_VOICE_GENDER_UNSPECIFIED = 0;
+   */
+  SSML_VOICE_GENDER_UNSPECIFIED(0),
+  /**
+   * 
    +   * A male voice.
+   * 
    
+   *
+   * MALE = 1;
+   */
+  MALE(1),
+  /**
+   * 
    +   * A female voice.
+   * 
    
+   *
+   * FEMALE = 2;
+   */
+  FEMALE(2),
+  /**
+   * 
    +   * A gender-neutral voice.
+   * 
    
+   *
+   * NEUTRAL = 3;
+   */
+  NEUTRAL(3),
+  UNRECOGNIZED(-1),
+  ;
+
+  /**
+   * 
    +   * An unspecified gender.
+   * In VoiceSelectionParams, this means that the client doesn't care which
+   * gender the selected voice will have. In the Voice field of
+   * ListVoicesResponse, this may mean that the voice doesn't fit any of the
+   * other categories in this enum, or that the gender of the voice isn't known.
+   * 
    
+   *
+   * SSML_VOICE_GENDER_UNSPECIFIED = 0;
+   */
+  public static final int SSML_VOICE_GENDER_UNSPECIFIED_VALUE = 0;
+  /**
+   * 
    +   * A male voice.
+   * 
    
+   *
+   * MALE = 1;
+   */
+  public static final int MALE_VALUE = 1;
+  /**
+   * 
    +   * A female voice.
+   * 
    
+   *
+   * FEMALE = 2;
+   */
+  public static final int FEMALE_VALUE = 2;
+  /**
+   * 
    +   * A gender-neutral voice.
+   * 
    
+   *
+   * NEUTRAL = 3;
+   */
+  public static final int NEUTRAL_VALUE = 3;
+
+
+  public final int getNumber() {
+    if (this == UNRECOGNIZED) {
+      throw new java.lang.IllegalArgumentException(
+          "Can't get the number of an unknown enum value.");
+    }
+    return value;
+  }
+
+  /**
+   * @deprecated Use {@link #forNumber(int)} instead.
+   */
+  @java.lang.Deprecated
+  public static SsmlVoiceGender valueOf(int value) {
+    return forNumber(value);
+  }
+
+  public static SsmlVoiceGender forNumber(int value) {
+    switch (value) {
+      case 0: return SSML_VOICE_GENDER_UNSPECIFIED;
+      case 1: return MALE;
+      case 2: return FEMALE;
+      case 3: return NEUTRAL;
+      default: return null;
+    }
+  }
+
+  public static com.google.protobuf.Internal.EnumLiteMap
+      internalGetValueMap() {
+    return internalValueMap;
+  }
+  private static final com.google.protobuf.Internal.EnumLiteMap<
+      SsmlVoiceGender> internalValueMap =
+        new com.google.protobuf.Internal.EnumLiteMap() {
+          public SsmlVoiceGender findValueByNumber(int number) {
+            return SsmlVoiceGender.forNumber(number);
+          }
+        };
+
+  public final com.google.protobuf.Descriptors.EnumValueDescriptor
+      getValueDescriptor() {
+    return getDescriptor().getValues().get(ordinal());
+  }
+  public final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptorForType() {
+    return getDescriptor();
+  }
+  public static final com.google.protobuf.Descriptors.EnumDescriptor
+      getDescriptor() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.getDescriptor().getEnumTypes().get(0);
+  }
+
+  private static final SsmlVoiceGender[] VALUES = values();
+
+  public static SsmlVoiceGender valueOf(
+      com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    if (desc.getType() != getDescriptor()) {
+      throw new java.lang.IllegalArgumentException(
+        "EnumValueDescriptor is not for this type.");
+    }
+    if (desc.getIndex() == -1) {
+      return UNRECOGNIZED;
+    }
+    return VALUES[desc.getIndex()];
+  }
+
+  private final int value;
+
+  private SsmlVoiceGender(int value) {
+    this.value = value;
+  }
+
+  // @@protoc_insertion_point(enum_scope:google.cloud.texttospeech.v1.SsmlVoiceGender)
+}
+
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java
new file mode 100644
index 000000000000..7096500138b4
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java
@@ -0,0 +1,856 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+/**
+ * 
    + * Contains text input to be synthesized. Either `text` or `ssml` must be
+ * supplied. Supplying both or neither returns
+ * [google.rpc.Code.INVALID_ARGUMENT][]. The input size is limited to 5000
+ * characters.
+ * 
    
+ *
+ * Protobuf type {@code google.cloud.texttospeech.v1.SynthesisInput}
+ */
+public  final class SynthesisInput extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.texttospeech.v1.SynthesisInput)
+    SynthesisInputOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use SynthesisInput.newBuilder() to construct.
+  private SynthesisInput(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private SynthesisInput() {
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private SynthesisInput(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+            inputSourceCase_ = 1;
+            inputSource_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+            inputSourceCase_ = 2;
+            inputSource_ = s;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesisInput_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesisInput_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.texttospeech.v1.SynthesisInput.class, com.google.cloud.texttospeech.v1.SynthesisInput.Builder.class);
+  }
+
+  private int inputSourceCase_ = 0;
+  private java.lang.Object inputSource_;
+  public enum InputSourceCase
+      implements com.google.protobuf.Internal.EnumLite {
+    TEXT(1),
+    SSML(2),
+    INPUTSOURCE_NOT_SET(0);
+    private final int value;
+    private InputSourceCase(int value) {
+      this.value = value;
+    }
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static InputSourceCase valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static InputSourceCase forNumber(int value) {
+      switch (value) {
+        case 1: return TEXT;
+        case 2: return SSML;
+        case 0: return INPUTSOURCE_NOT_SET;
+        default: return null;
+      }
+    }
+    public int getNumber() {
+      return this.value;
+    }
+  };
+
+  public InputSourceCase
+  getInputSourceCase() {
+    return InputSourceCase.forNumber(
+        inputSourceCase_);
+  }
+
+  public static final int TEXT_FIELD_NUMBER = 1;
+  /**
+   * 
    +   * The raw text to be synthesized.
+   * 
    
+   *
+   * string text = 1;
+   */
+  public java.lang.String getText() {
+    java.lang.Object ref = "";
+    if (inputSourceCase_ == 1) {
+      ref = inputSource_;
+    }
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      if (inputSourceCase_ == 1) {
+        inputSource_ = s;
+      }
+      return s;
+    }
+  }
+  /**
+   * 
    +   * The raw text to be synthesized.
+   * 
    
+   *
+   * string text = 1;
+   */
+  public com.google.protobuf.ByteString
+      getTextBytes() {
+    java.lang.Object ref = "";
+    if (inputSourceCase_ == 1) {
+      ref = inputSource_;
+    }
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      if (inputSourceCase_ == 1) {
+        inputSource_ = b;
+      }
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int SSML_FIELD_NUMBER = 2;
+  /**
+   * 
    +   * The SSML document to be synthesized. The SSML document must be valid
+   * and well-formed. Otherwise the RPC will fail and return
+   * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see
+   * [SSML](/speech/text-to-speech/docs/ssml).
+   * 
    
+   *
+   * string ssml = 2;
+   */
+  public java.lang.String getSsml() {
+    java.lang.Object ref = "";
+    if (inputSourceCase_ == 2) {
+      ref = inputSource_;
+    }
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      if (inputSourceCase_ == 2) {
+        inputSource_ = s;
+      }
+      return s;
+    }
+  }
+  /**
+   * 
    +   * The SSML document to be synthesized. The SSML document must be valid
+   * and well-formed. Otherwise the RPC will fail and return
+   * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see
+   * [SSML](/speech/text-to-speech/docs/ssml).
+   * 
    
+   *
+   * string ssml = 2;
+   */
+  public com.google.protobuf.ByteString
+      getSsmlBytes() {
+    java.lang.Object ref = "";
+    if (inputSourceCase_ == 2) {
+      ref = inputSource_;
+    }
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      if (inputSourceCase_ == 2) {
+        inputSource_ = b;
+      }
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (inputSourceCase_ == 1) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, inputSource_);
+    }
+    if (inputSourceCase_ == 2) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, inputSource_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (inputSourceCase_ == 1) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, inputSource_);
+    }
+    if (inputSourceCase_ == 2) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, inputSource_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.texttospeech.v1.SynthesisInput)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.texttospeech.v1.SynthesisInput other = (com.google.cloud.texttospeech.v1.SynthesisInput) obj;
+
+    boolean result = true;
+    result = result && getInputSourceCase().equals(
+        other.getInputSourceCase());
+    if (!result) return false;
+    switch (inputSourceCase_) {
+      case 1:
+        result = result && getText()
+            .equals(other.getText());
+        break;
+      case 2:
+        result = result && getSsml()
+            .equals(other.getSsml());
+        break;
+      case 0:
+      default:
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    switch (inputSourceCase_) {
+      case 1:
+        hash = (37 * hash) + TEXT_FIELD_NUMBER;
+        hash = (53 * hash) + getText().hashCode();
+        break;
+      case 2:
+        hash = (37 * hash) + SSML_FIELD_NUMBER;
+        hash = (53 * hash) + getSsml().hashCode();
+        break;
+      case 0:
+      default:
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.texttospeech.v1.SynthesisInput parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesisInput parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesisInput parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesisInput parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesisInput parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesisInput parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesisInput parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesisInput parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesisInput parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesisInput parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesisInput parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesisInput parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.texttospeech.v1.SynthesisInput prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
    +   * Contains text input to be synthesized. Either `text` or `ssml` must be
+   * supplied. Supplying both or neither returns
+   * [google.rpc.Code.INVALID_ARGUMENT][]. The input size is limited to 5000
+   * characters.
+   * 
    
+   *
+   * Protobuf type {@code google.cloud.texttospeech.v1.SynthesisInput}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.texttospeech.v1.SynthesisInput)
+      com.google.cloud.texttospeech.v1.SynthesisInputOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesisInput_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesisInput_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.texttospeech.v1.SynthesisInput.class, com.google.cloud.texttospeech.v1.SynthesisInput.Builder.class);
+    }
+
+    // Construct using com.google.cloud.texttospeech.v1.SynthesisInput.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      inputSourceCase_ = 0;
+      inputSource_ = null;
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesisInput_descriptor;
+    }
+
+    public com.google.cloud.texttospeech.v1.SynthesisInput getDefaultInstanceForType() {
+      return com.google.cloud.texttospeech.v1.SynthesisInput.getDefaultInstance();
+    }
+
+    public com.google.cloud.texttospeech.v1.SynthesisInput build() {
+      com.google.cloud.texttospeech.v1.SynthesisInput result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.texttospeech.v1.SynthesisInput buildPartial() {
+      com.google.cloud.texttospeech.v1.SynthesisInput result = new com.google.cloud.texttospeech.v1.SynthesisInput(this);
+      if (inputSourceCase_ == 1) {
+        result.inputSource_ = inputSource_;
+      }
+      if (inputSourceCase_ == 2) {
+        result.inputSource_ = inputSource_;
+      }
+      result.inputSourceCase_ = inputSourceCase_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.texttospeech.v1.SynthesisInput) {
+        return mergeFrom((com.google.cloud.texttospeech.v1.SynthesisInput)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.texttospeech.v1.SynthesisInput other) {
+      if (other == com.google.cloud.texttospeech.v1.SynthesisInput.getDefaultInstance()) return this;
+      switch (other.getInputSourceCase()) {
+        case TEXT: {
+          inputSourceCase_ = 1;
+          inputSource_ = other.inputSource_;
+          onChanged();
+          break;
+        }
+        case SSML: {
+          inputSourceCase_ = 2;
+          inputSource_ = other.inputSource_;
+          onChanged();
+          break;
+        }
+        case INPUTSOURCE_NOT_SET: {
+          break;
+        }
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.texttospeech.v1.SynthesisInput parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.texttospeech.v1.SynthesisInput) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int inputSourceCase_ = 0;
+    private java.lang.Object inputSource_;
+    public InputSourceCase
+        getInputSourceCase() {
+      return InputSourceCase.forNumber(
+          inputSourceCase_);
+    }
+
+    public Builder clearInputSource() {
+      inputSourceCase_ = 0;
+      inputSource_ = null;
+      onChanged();
+      return this;
+    }
+
+
+    /**
+     * 
    +     * The raw text to be synthesized.
+     * 
    
+     *
+     * string text = 1;
+     */
+    public java.lang.String getText() {
+      java.lang.Object ref = "";
+      if (inputSourceCase_ == 1) {
+        ref = inputSource_;
+      }
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (inputSourceCase_ == 1) {
+          inputSource_ = s;
+        }
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
    +     * The raw text to be synthesized.
+     * 
    
+     *
+     * string text = 1;
+     */
+    public com.google.protobuf.ByteString
+        getTextBytes() {
+      java.lang.Object ref = "";
+      if (inputSourceCase_ == 1) {
+        ref = inputSource_;
+      }
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        if (inputSourceCase_ == 1) {
+          inputSource_ = b;
+        }
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
    +     * The raw text to be synthesized.
+     * 
    
+     *
+     * string text = 1;
+     */
+    public Builder setText(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  inputSourceCase_ = 1;
+      inputSource_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The raw text to be synthesized.
+     * 
    
+     *
+     * string text = 1;
+     */
+    public Builder clearText() {
+      if (inputSourceCase_ == 1) {
+        inputSourceCase_ = 0;
+        inputSource_ = null;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     * 
    +     * The raw text to be synthesized.
+     * 
    
+     *
+     * string text = 1;
+     */
+    public Builder setTextBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      inputSourceCase_ = 1;
+      inputSource_ = value;
+      onChanged();
+      return this;
+    }
+
+    /**
+     * 
    +     * The SSML document to be synthesized. The SSML document must be valid
+     * and well-formed. Otherwise the RPC will fail and return
+     * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see
+     * [SSML](/speech/text-to-speech/docs/ssml).
+     * 
    
+     *
+     * string ssml = 2;
+     */
+    public java.lang.String getSsml() {
+      java.lang.Object ref = "";
+      if (inputSourceCase_ == 2) {
+        ref = inputSource_;
+      }
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (inputSourceCase_ == 2) {
+          inputSource_ = s;
+        }
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
    +     * The SSML document to be synthesized. The SSML document must be valid
+     * and well-formed. Otherwise the RPC will fail and return
+     * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see
+     * [SSML](/speech/text-to-speech/docs/ssml).
+     * 
    
+     *
+     * string ssml = 2;
+     */
+    public com.google.protobuf.ByteString
+        getSsmlBytes() {
+      java.lang.Object ref = "";
+      if (inputSourceCase_ == 2) {
+        ref = inputSource_;
+      }
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        if (inputSourceCase_ == 2) {
+          inputSource_ = b;
+        }
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
    +     * The SSML document to be synthesized. The SSML document must be valid
+     * and well-formed. Otherwise the RPC will fail and return
+     * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see
+     * [SSML](/speech/text-to-speech/docs/ssml).
+     * 
    
+     *
+     * string ssml = 2;
+     */
+    public Builder setSsml(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  inputSourceCase_ = 2;
+      inputSource_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The SSML document to be synthesized. The SSML document must be valid
+     * and well-formed. Otherwise the RPC will fail and return
+     * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see
+     * [SSML](/speech/text-to-speech/docs/ssml).
+     * 
    
+     *
+     * string ssml = 2;
+     */
+    public Builder clearSsml() {
+      if (inputSourceCase_ == 2) {
+        inputSourceCase_ = 0;
+        inputSource_ = null;
+        onChanged();
+      }
+      return this;
+    }
+    /**
+     * 
    +     * The SSML document to be synthesized. The SSML document must be valid
+     * and well-formed. Otherwise the RPC will fail and return
+     * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see
+     * [SSML](/speech/text-to-speech/docs/ssml).
+     * 
    
+     *
+     * string ssml = 2;
+     */
+    public Builder setSsmlBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      inputSourceCase_ = 2;
+      inputSource_ = value;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.texttospeech.v1.SynthesisInput)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.texttospeech.v1.SynthesisInput)
+  private static final com.google.cloud.texttospeech.v1.SynthesisInput DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.texttospeech.v1.SynthesisInput();
+  }
+
+  public static com.google.cloud.texttospeech.v1.SynthesisInput getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public SynthesisInput parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new SynthesisInput(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.texttospeech.v1.SynthesisInput getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInputOrBuilder.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInputOrBuilder.java
new file mode 100644
index 000000000000..5a4477e12a50
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInputOrBuilder.java
@@ -0,0 +1,53 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+public interface SynthesisInputOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.texttospeech.v1.SynthesisInput)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
    +   * The raw text to be synthesized.
+   * 
    
+   *
+   * string text = 1;
+   */
+  java.lang.String getText();
+  /**
+   * 
    +   * The raw text to be synthesized.
+   * 
    
+   *
+   * string text = 1;
+   */
+  com.google.protobuf.ByteString
+      getTextBytes();
+
+  /**
+   * 
    +   * The SSML document to be synthesized. The SSML document must be valid
+   * and well-formed. Otherwise the RPC will fail and return
+   * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see
+   * [SSML](/speech/text-to-speech/docs/ssml).
+   * 
    
+   *
+   * string ssml = 2;
+   */
+  java.lang.String getSsml();
+  /**
+   * 
    +   * The SSML document to be synthesized. The SSML document must be valid
+   * and well-formed. Otherwise the RPC will fail and return
+   * [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see
+   * [SSML](/speech/text-to-speech/docs/ssml).
+   * 
    
+   *
+   * string ssml = 2;
+   */
+  com.google.protobuf.ByteString
+      getSsmlBytes();
+
+  public com.google.cloud.texttospeech.v1.SynthesisInput.InputSourceCase getInputSourceCase();
+}
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java
new file mode 100644
index 000000000000..bd0b1c6f228d
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java
@@ -0,0 +1,1084 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+/**
+ * 
    + * The top-level message sent by the client for the `SynthesizeSpeech` method.
+ * 
    
+ *
+ * Protobuf type {@code google.cloud.texttospeech.v1.SynthesizeSpeechRequest}
+ */
+public  final class SynthesizeSpeechRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.texttospeech.v1.SynthesizeSpeechRequest)
+    SynthesizeSpeechRequestOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use SynthesizeSpeechRequest.newBuilder() to construct.
+  private SynthesizeSpeechRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private SynthesizeSpeechRequest() {
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private SynthesizeSpeechRequest(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            com.google.cloud.texttospeech.v1.SynthesisInput.Builder subBuilder = null;
+            if (input_ != null) {
+              subBuilder = input_.toBuilder();
+            }
+            input_ = input.readMessage(com.google.cloud.texttospeech.v1.SynthesisInput.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(input_);
+              input_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 18: {
+            com.google.cloud.texttospeech.v1.VoiceSelectionParams.Builder subBuilder = null;
+            if (voice_ != null) {
+              subBuilder = voice_.toBuilder();
+            }
+            voice_ = input.readMessage(com.google.cloud.texttospeech.v1.VoiceSelectionParams.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(voice_);
+              voice_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 26: {
+            com.google.cloud.texttospeech.v1.AudioConfig.Builder subBuilder = null;
+            if (audioConfig_ != null) {
+              subBuilder = audioConfig_.toBuilder();
+            }
+            audioConfig_ = input.readMessage(com.google.cloud.texttospeech.v1.AudioConfig.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(audioConfig_);
+              audioConfig_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest.class, com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest.Builder.class);
+  }
+
+  public static final int INPUT_FIELD_NUMBER = 1;
+  private com.google.cloud.texttospeech.v1.SynthesisInput input_;
+  /**
+   * 
    +   * Required. The Synthesizer requires either plain text or SSML as input.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+   */
+  public boolean hasInput() {
+    return input_ != null;
+  }
+  /**
+   * 
    +   * Required. The Synthesizer requires either plain text or SSML as input.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+   */
+  public com.google.cloud.texttospeech.v1.SynthesisInput getInput() {
+    return input_ == null ? com.google.cloud.texttospeech.v1.SynthesisInput.getDefaultInstance() : input_;
+  }
+  /**
+   * 
    +   * Required. The Synthesizer requires either plain text or SSML as input.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+   */
+  public com.google.cloud.texttospeech.v1.SynthesisInputOrBuilder getInputOrBuilder() {
+    return getInput();
+  }
+
+  public static final int VOICE_FIELD_NUMBER = 2;
+  private com.google.cloud.texttospeech.v1.VoiceSelectionParams voice_;
+  /**
+   * 
    +   * Required. The desired voice of the synthesized audio.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+   */
+  public boolean hasVoice() {
+    return voice_ != null;
+  }
+  /**
+   * 
    +   * Required. The desired voice of the synthesized audio.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+   */
+  public com.google.cloud.texttospeech.v1.VoiceSelectionParams getVoice() {
+    return voice_ == null ? com.google.cloud.texttospeech.v1.VoiceSelectionParams.getDefaultInstance() : voice_;
+  }
+  /**
+   * 
    +   * Required. The desired voice of the synthesized audio.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+   */
+  public com.google.cloud.texttospeech.v1.VoiceSelectionParamsOrBuilder getVoiceOrBuilder() {
+    return getVoice();
+  }
+
+  public static final int AUDIO_CONFIG_FIELD_NUMBER = 3;
+  private com.google.cloud.texttospeech.v1.AudioConfig audioConfig_;
+  /**
+   * 
    +   * Required. The configuration of the synthesized audio.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+   */
+  public boolean hasAudioConfig() {
+    return audioConfig_ != null;
+  }
+  /**
+   * 
    +   * Required. The configuration of the synthesized audio.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+   */
+  public com.google.cloud.texttospeech.v1.AudioConfig getAudioConfig() {
+    return audioConfig_ == null ? com.google.cloud.texttospeech.v1.AudioConfig.getDefaultInstance() : audioConfig_;
+  }
+  /**
+   * 
    +   * Required. The configuration of the synthesized audio.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+   */
+  public com.google.cloud.texttospeech.v1.AudioConfigOrBuilder getAudioConfigOrBuilder() {
+    return getAudioConfig();
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (input_ != null) {
+      output.writeMessage(1, getInput());
+    }
+    if (voice_ != null) {
+      output.writeMessage(2, getVoice());
+    }
+    if (audioConfig_ != null) {
+      output.writeMessage(3, getAudioConfig());
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (input_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getInput());
+    }
+    if (voice_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getVoice());
+    }
+    if (audioConfig_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, getAudioConfig());
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest other = (com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest) obj;
+
+    boolean result = true;
+    result = result && (hasInput() == other.hasInput());
+    if (hasInput()) {
+      result = result && getInput()
+          .equals(other.getInput());
+    }
+    result = result && (hasVoice() == other.hasVoice());
+    if (hasVoice()) {
+      result = result && getVoice()
+          .equals(other.getVoice());
+    }
+    result = result && (hasAudioConfig() == other.hasAudioConfig());
+    if (hasAudioConfig()) {
+      result = result && getAudioConfig()
+          .equals(other.getAudioConfig());
+    }
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (hasInput()) {
+      hash = (37 * hash) + INPUT_FIELD_NUMBER;
+      hash = (53 * hash) + getInput().hashCode();
+    }
+    if (hasVoice()) {
+      hash = (37 * hash) + VOICE_FIELD_NUMBER;
+      hash = (53 * hash) + getVoice().hashCode();
+    }
+    if (hasAudioConfig()) {
+      hash = (37 * hash) + AUDIO_CONFIG_FIELD_NUMBER;
+      hash = (53 * hash) + getAudioConfig().hashCode();
+    }
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
    +   * The top-level message sent by the client for the `SynthesizeSpeech` method.
+   * 
    
+   *
+   * Protobuf type {@code google.cloud.texttospeech.v1.SynthesizeSpeechRequest}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.texttospeech.v1.SynthesizeSpeechRequest)
+      com.google.cloud.texttospeech.v1.SynthesizeSpeechRequestOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest.class, com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest.Builder.class);
+    }
+
+    // Construct using com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      if (inputBuilder_ == null) {
+        input_ = null;
+      } else {
+        input_ = null;
+        inputBuilder_ = null;
+      }
+      if (voiceBuilder_ == null) {
+        voice_ = null;
+      } else {
+        voice_ = null;
+        voiceBuilder_ = null;
+      }
+      if (audioConfigBuilder_ == null) {
+        audioConfig_ = null;
+      } else {
+        audioConfig_ = null;
+        audioConfigBuilder_ = null;
+      }
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_descriptor;
+    }
+
+    public com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest getDefaultInstanceForType() {
+      return com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest.getDefaultInstance();
+    }
+
+    public com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest build() {
+      com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest buildPartial() {
+      com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest result = new com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest(this);
+      if (inputBuilder_ == null) {
+        result.input_ = input_;
+      } else {
+        result.input_ = inputBuilder_.build();
+      }
+      if (voiceBuilder_ == null) {
+        result.voice_ = voice_;
+      } else {
+        result.voice_ = voiceBuilder_.build();
+      }
+      if (audioConfigBuilder_ == null) {
+        result.audioConfig_ = audioConfig_;
+      } else {
+        result.audioConfig_ = audioConfigBuilder_.build();
+      }
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest) {
+        return mergeFrom((com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest other) {
+      if (other == com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest.getDefaultInstance()) return this;
+      if (other.hasInput()) {
+        mergeInput(other.getInput());
+      }
+      if (other.hasVoice()) {
+        mergeVoice(other.getVoice());
+      }
+      if (other.hasAudioConfig()) {
+        mergeAudioConfig(other.getAudioConfig());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.cloud.texttospeech.v1.SynthesisInput input_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.texttospeech.v1.SynthesisInput, com.google.cloud.texttospeech.v1.SynthesisInput.Builder, com.google.cloud.texttospeech.v1.SynthesisInputOrBuilder> inputBuilder_;
+    /**
+     * 
    +     * Required. The Synthesizer requires either plain text or SSML as input.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+     */
+    public boolean hasInput() {
+      return inputBuilder_ != null || input_ != null;
+    }
+    /**
+     * 
    +     * Required. The Synthesizer requires either plain text or SSML as input.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+     */
+    public com.google.cloud.texttospeech.v1.SynthesisInput getInput() {
+      if (inputBuilder_ == null) {
+        return input_ == null ? com.google.cloud.texttospeech.v1.SynthesisInput.getDefaultInstance() : input_;
+      } else {
+        return inputBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
    +     * Required. The Synthesizer requires either plain text or SSML as input.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+     */
+    public Builder setInput(com.google.cloud.texttospeech.v1.SynthesisInput value) {
+      if (inputBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        input_ = value;
+        onChanged();
+      } else {
+        inputBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
    +     * Required. The Synthesizer requires either plain text or SSML as input.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+     */
+    public Builder setInput(
+        com.google.cloud.texttospeech.v1.SynthesisInput.Builder builderForValue) {
+      if (inputBuilder_ == null) {
+        input_ = builderForValue.build();
+        onChanged();
+      } else {
+        inputBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
    +     * Required. The Synthesizer requires either plain text or SSML as input.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+     */
+    public Builder mergeInput(com.google.cloud.texttospeech.v1.SynthesisInput value) {
+      if (inputBuilder_ == null) {
+        if (input_ != null) {
+          input_ =
+            com.google.cloud.texttospeech.v1.SynthesisInput.newBuilder(input_).mergeFrom(value).buildPartial();
+        } else {
+          input_ = value;
+        }
+        onChanged();
+      } else {
+        inputBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
    +     * Required. The Synthesizer requires either plain text or SSML as input.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+     */
+    public Builder clearInput() {
+      if (inputBuilder_ == null) {
+        input_ = null;
+        onChanged();
+      } else {
+        input_ = null;
+        inputBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
    +     * Required. The Synthesizer requires either plain text or SSML as input.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+     */
+    public com.google.cloud.texttospeech.v1.SynthesisInput.Builder getInputBuilder() {
+      
+      onChanged();
+      return getInputFieldBuilder().getBuilder();
+    }
+    /**
+     * 
    +     * Required. The Synthesizer requires either plain text or SSML as input.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+     */
+    public com.google.cloud.texttospeech.v1.SynthesisInputOrBuilder getInputOrBuilder() {
+      if (inputBuilder_ != null) {
+        return inputBuilder_.getMessageOrBuilder();
+      } else {
+        return input_ == null ?
+            com.google.cloud.texttospeech.v1.SynthesisInput.getDefaultInstance() : input_;
+      }
+    }
+    /**
+     * 
    +     * Required. The Synthesizer requires either plain text or SSML as input.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.texttospeech.v1.SynthesisInput, com.google.cloud.texttospeech.v1.SynthesisInput.Builder, com.google.cloud.texttospeech.v1.SynthesisInputOrBuilder> 
+        getInputFieldBuilder() {
+      if (inputBuilder_ == null) {
+        inputBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.texttospeech.v1.SynthesisInput, com.google.cloud.texttospeech.v1.SynthesisInput.Builder, com.google.cloud.texttospeech.v1.SynthesisInputOrBuilder>(
+                getInput(),
+                getParentForChildren(),
+                isClean());
+        input_ = null;
+      }
+      return inputBuilder_;
+    }
+
+    private com.google.cloud.texttospeech.v1.VoiceSelectionParams voice_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.texttospeech.v1.VoiceSelectionParams, com.google.cloud.texttospeech.v1.VoiceSelectionParams.Builder, com.google.cloud.texttospeech.v1.VoiceSelectionParamsOrBuilder> voiceBuilder_;
+    /**
+     * 
    +     * Required. The desired voice of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+     */
+    public boolean hasVoice() {
+      return voiceBuilder_ != null || voice_ != null;
+    }
+    /**
+     * 
    +     * Required. The desired voice of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+     */
+    public com.google.cloud.texttospeech.v1.VoiceSelectionParams getVoice() {
+      if (voiceBuilder_ == null) {
+        return voice_ == null ? com.google.cloud.texttospeech.v1.VoiceSelectionParams.getDefaultInstance() : voice_;
+      } else {
+        return voiceBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
    +     * Required. The desired voice of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+     */
+    public Builder setVoice(com.google.cloud.texttospeech.v1.VoiceSelectionParams value) {
+      if (voiceBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        voice_ = value;
+        onChanged();
+      } else {
+        voiceBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
    +     * Required. The desired voice of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+     */
+    public Builder setVoice(
+        com.google.cloud.texttospeech.v1.VoiceSelectionParams.Builder builderForValue) {
+      if (voiceBuilder_ == null) {
+        voice_ = builderForValue.build();
+        onChanged();
+      } else {
+        voiceBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
    +     * Required. The desired voice of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+     */
+    public Builder mergeVoice(com.google.cloud.texttospeech.v1.VoiceSelectionParams value) {
+      if (voiceBuilder_ == null) {
+        if (voice_ != null) {
+          voice_ =
+            com.google.cloud.texttospeech.v1.VoiceSelectionParams.newBuilder(voice_).mergeFrom(value).buildPartial();
+        } else {
+          voice_ = value;
+        }
+        onChanged();
+      } else {
+        voiceBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
    +     * Required. The desired voice of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+     */
+    public Builder clearVoice() {
+      if (voiceBuilder_ == null) {
+        voice_ = null;
+        onChanged();
+      } else {
+        voice_ = null;
+        voiceBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
    +     * Required. The desired voice of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+     */
+    public com.google.cloud.texttospeech.v1.VoiceSelectionParams.Builder getVoiceBuilder() {
+      
+      onChanged();
+      return getVoiceFieldBuilder().getBuilder();
+    }
+    /**
+     * 
    +     * Required. The desired voice of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+     */
+    public com.google.cloud.texttospeech.v1.VoiceSelectionParamsOrBuilder getVoiceOrBuilder() {
+      if (voiceBuilder_ != null) {
+        return voiceBuilder_.getMessageOrBuilder();
+      } else {
+        return voice_ == null ?
+            com.google.cloud.texttospeech.v1.VoiceSelectionParams.getDefaultInstance() : voice_;
+      }
+    }
+    /**
+     * 
    +     * Required. The desired voice of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.texttospeech.v1.VoiceSelectionParams, com.google.cloud.texttospeech.v1.VoiceSelectionParams.Builder, com.google.cloud.texttospeech.v1.VoiceSelectionParamsOrBuilder> 
+        getVoiceFieldBuilder() {
+      if (voiceBuilder_ == null) {
+        voiceBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.texttospeech.v1.VoiceSelectionParams, com.google.cloud.texttospeech.v1.VoiceSelectionParams.Builder, com.google.cloud.texttospeech.v1.VoiceSelectionParamsOrBuilder>(
+                getVoice(),
+                getParentForChildren(),
+                isClean());
+        voice_ = null;
+      }
+      return voiceBuilder_;
+    }
+
+    private com.google.cloud.texttospeech.v1.AudioConfig audioConfig_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.texttospeech.v1.AudioConfig, com.google.cloud.texttospeech.v1.AudioConfig.Builder, com.google.cloud.texttospeech.v1.AudioConfigOrBuilder> audioConfigBuilder_;
+    /**
+     * 
    +     * Required. The configuration of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+     */
+    public boolean hasAudioConfig() {
+      return audioConfigBuilder_ != null || audioConfig_ != null;
+    }
+    /**
+     * 
    +     * Required. The configuration of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+     */
+    public com.google.cloud.texttospeech.v1.AudioConfig getAudioConfig() {
+      if (audioConfigBuilder_ == null) {
+        return audioConfig_ == null ? com.google.cloud.texttospeech.v1.AudioConfig.getDefaultInstance() : audioConfig_;
+      } else {
+        return audioConfigBuilder_.getMessage();
+      }
+    }
+    /**
+     * 
    +     * Required. The configuration of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+     */
+    public Builder setAudioConfig(com.google.cloud.texttospeech.v1.AudioConfig value) {
+      if (audioConfigBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        audioConfig_ = value;
+        onChanged();
+      } else {
+        audioConfigBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
    +     * Required. The configuration of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+     */
+    public Builder setAudioConfig(
+        com.google.cloud.texttospeech.v1.AudioConfig.Builder builderForValue) {
+      if (audioConfigBuilder_ == null) {
+        audioConfig_ = builderForValue.build();
+        onChanged();
+      } else {
+        audioConfigBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * 
    +     * Required. The configuration of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+     */
+    public Builder mergeAudioConfig(com.google.cloud.texttospeech.v1.AudioConfig value) {
+      if (audioConfigBuilder_ == null) {
+        if (audioConfig_ != null) {
+          audioConfig_ =
+            com.google.cloud.texttospeech.v1.AudioConfig.newBuilder(audioConfig_).mergeFrom(value).buildPartial();
+        } else {
+          audioConfig_ = value;
+        }
+        onChanged();
+      } else {
+        audioConfigBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * 
    +     * Required. The configuration of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+     */
+    public Builder clearAudioConfig() {
+      if (audioConfigBuilder_ == null) {
+        audioConfig_ = null;
+        onChanged();
+      } else {
+        audioConfig_ = null;
+        audioConfigBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * 
    +     * Required. The configuration of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+     */
+    public com.google.cloud.texttospeech.v1.AudioConfig.Builder getAudioConfigBuilder() {
+      
+      onChanged();
+      return getAudioConfigFieldBuilder().getBuilder();
+    }
+    /**
+     * 
    +     * Required. The configuration of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+     */
+    public com.google.cloud.texttospeech.v1.AudioConfigOrBuilder getAudioConfigOrBuilder() {
+      if (audioConfigBuilder_ != null) {
+        return audioConfigBuilder_.getMessageOrBuilder();
+      } else {
+        return audioConfig_ == null ?
+            com.google.cloud.texttospeech.v1.AudioConfig.getDefaultInstance() : audioConfig_;
+      }
+    }
+    /**
+     * 
    +     * Required. The configuration of the synthesized audio.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.cloud.texttospeech.v1.AudioConfig, com.google.cloud.texttospeech.v1.AudioConfig.Builder, com.google.cloud.texttospeech.v1.AudioConfigOrBuilder> 
+        getAudioConfigFieldBuilder() {
+      if (audioConfigBuilder_ == null) {
+        audioConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.cloud.texttospeech.v1.AudioConfig, com.google.cloud.texttospeech.v1.AudioConfig.Builder, com.google.cloud.texttospeech.v1.AudioConfigOrBuilder>(
+                getAudioConfig(),
+                getParentForChildren(),
+                isClean());
+        audioConfig_ = null;
+      }
+      return audioConfigBuilder_;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.texttospeech.v1.SynthesizeSpeechRequest)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.texttospeech.v1.SynthesizeSpeechRequest)
+  private static final com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest();
+  }
+
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public SynthesizeSpeechRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new SynthesizeSpeechRequest(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequestOrBuilder.java
new file mode 100644
index 000000000000..f1cf70304f7e
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequestOrBuilder.java
@@ -0,0 +1,84 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+public interface SynthesizeSpeechRequestOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.texttospeech.v1.SynthesizeSpeechRequest)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
    +   * Required. The Synthesizer requires either plain text or SSML as input.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+   */
+  boolean hasInput();
+  /**
+   * 
    +   * Required. The Synthesizer requires either plain text or SSML as input.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+   */
+  com.google.cloud.texttospeech.v1.SynthesisInput getInput();
+  /**
+   * 
    +   * Required. The Synthesizer requires either plain text or SSML as input.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SynthesisInput input = 1;
+   */
+  com.google.cloud.texttospeech.v1.SynthesisInputOrBuilder getInputOrBuilder();
+
+  /**
+   * 
    +   * Required. The desired voice of the synthesized audio.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+   */
+  boolean hasVoice();
+  /**
+   * 
    +   * Required. The desired voice of the synthesized audio.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+   */
+  com.google.cloud.texttospeech.v1.VoiceSelectionParams getVoice();
+  /**
+   * 
    +   * Required. The desired voice of the synthesized audio.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.VoiceSelectionParams voice = 2;
+   */
+  com.google.cloud.texttospeech.v1.VoiceSelectionParamsOrBuilder getVoiceOrBuilder();
+
+  /**
+   * 
    +   * Required. The configuration of the synthesized audio.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+   */
+  boolean hasAudioConfig();
+  /**
+   * 
    +   * Required. The configuration of the synthesized audio.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+   */
+  com.google.cloud.texttospeech.v1.AudioConfig getAudioConfig();
+  /**
+   * 
    +   * Required. The configuration of the synthesized audio.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.AudioConfig audio_config = 3;
+   */
+  com.google.cloud.texttospeech.v1.AudioConfigOrBuilder getAudioConfigOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java
new file mode 100644
index 000000000000..19ea28eb872b
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java
@@ -0,0 +1,486 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+/**
+ * 
    + * The message returned to the client by the `SynthesizeSpeech` method.
+ * 
    
+ *
+ * Protobuf type {@code google.cloud.texttospeech.v1.SynthesizeSpeechResponse}
+ */
+public  final class SynthesizeSpeechResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.texttospeech.v1.SynthesizeSpeechResponse)
+    SynthesizeSpeechResponseOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use SynthesizeSpeechResponse.newBuilder() to construct.
+  private SynthesizeSpeechResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private SynthesizeSpeechResponse() {
+    audioContent_ = com.google.protobuf.ByteString.EMPTY;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private SynthesizeSpeechResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+
+            audioContent_ = input.readBytes();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse.class, com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse.Builder.class);
+  }
+
+  public static final int AUDIO_CONTENT_FIELD_NUMBER = 1;
+  private com.google.protobuf.ByteString audioContent_;
+  /**
+   * 
    +   * The audio data bytes encoded as specified in the request, including the
+   * header (For LINEAR16 audio, we include the WAV header). Note: as
+   * with all bytes fields, protobuffers use a pure binary representation,
+   * whereas JSON representations use base64.
+   * 
    
+   *
+   * bytes audio_content = 1;
+   */
+  public com.google.protobuf.ByteString getAudioContent() {
+    return audioContent_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!audioContent_.isEmpty()) {
+      output.writeBytes(1, audioContent_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!audioContent_.isEmpty()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(1, audioContent_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse other = (com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse) obj;
+
+    boolean result = true;
+    result = result && getAudioContent()
+        .equals(other.getAudioContent());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + AUDIO_CONTENT_FIELD_NUMBER;
+    hash = (53 * hash) + getAudioContent().hashCode();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
    +   * The message returned to the client by the `SynthesizeSpeech` method.
+   * 
    
+   *
+   * Protobuf type {@code google.cloud.texttospeech.v1.SynthesizeSpeechResponse}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.texttospeech.v1.SynthesizeSpeechResponse)
+      com.google.cloud.texttospeech.v1.SynthesizeSpeechResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse.class, com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse.Builder.class);
+    }
+
+    // Construct using com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      audioContent_ = com.google.protobuf.ByteString.EMPTY;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_descriptor;
+    }
+
+    public com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse getDefaultInstanceForType() {
+      return com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse.getDefaultInstance();
+    }
+
+    public com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse build() {
+      com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse buildPartial() {
+      com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse result = new com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse(this);
+      result.audioContent_ = audioContent_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse) {
+        return mergeFrom((com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse other) {
+      if (other == com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse.getDefaultInstance()) return this;
+      if (other.getAudioContent() != com.google.protobuf.ByteString.EMPTY) {
+        setAudioContent(other.getAudioContent());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private com.google.protobuf.ByteString audioContent_ = com.google.protobuf.ByteString.EMPTY;
+    /**
+     * 
    +     * The audio data bytes encoded as specified in the request, including the
+     * header (For LINEAR16 audio, we include the WAV header). Note: as
+     * with all bytes fields, protobuffers use a pure binary representation,
+     * whereas JSON representations use base64.
+     * 
    
+     *
+     * bytes audio_content = 1;
+     */
+    public com.google.protobuf.ByteString getAudioContent() {
+      return audioContent_;
+    }
+    /**
+     * 
    +     * The audio data bytes encoded as specified in the request, including the
+     * header (For LINEAR16 audio, we include the WAV header). Note: as
+     * with all bytes fields, protobuffers use a pure binary representation,
+     * whereas JSON representations use base64.
+     * 
    
+     *
+     * bytes audio_content = 1;
+     */
+    public Builder setAudioContent(com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      audioContent_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The audio data bytes encoded as specified in the request, including the
+     * header (For LINEAR16 audio, we include the WAV header). Note: as
+     * with all bytes fields, protobuffers use a pure binary representation,
+     * whereas JSON representations use base64.
+     * 
    
+     *
+     * bytes audio_content = 1;
+     */
+    public Builder clearAudioContent() {
+      
+      audioContent_ = getDefaultInstance().getAudioContent();
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.texttospeech.v1.SynthesizeSpeechResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.texttospeech.v1.SynthesizeSpeechResponse)
+  private static final com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse();
+  }
+
+  public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public SynthesizeSpeechResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new SynthesizeSpeechResponse(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponseOrBuilder.java
new file mode 100644
index 000000000000..0f6cd18e0efe
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponseOrBuilder.java
@@ -0,0 +1,21 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+public interface SynthesizeSpeechResponseOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.texttospeech.v1.SynthesizeSpeechResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
    +   * The audio data bytes encoded as specified in the request, including the
+   * header (For LINEAR16 audio, we include the WAV header). Note: as
+   * with all bytes fields, protobuffers use a pure binary representation,
+   * whereas JSON representations use base64.
+   * 
    
+   *
+   * bytes audio_content = 1;
+   */
+  com.google.protobuf.ByteString getAudioContent();
+}
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java
new file mode 100644
index 000000000000..b06155ef6cd8
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java
@@ -0,0 +1,180 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+public final class TextToSpeechProto {
+  private TextToSpeechProto() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_texttospeech_v1_Voice_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_texttospeech_v1_Voice_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_texttospeech_v1_SynthesisInput_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_texttospeech_v1_SynthesisInput_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_texttospeech_v1_AudioConfig_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_texttospeech_v1_AudioConfig_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n,google/cloud/texttospeech/v1/cloud_tts" +
+      ".proto\022\034google.cloud.texttospeech.v1\032\034go" +
+      "ogle/api/annotations.proto\"*\n\021ListVoices" +
+      "Request\022\025\n\rlanguage_code\030\001 \001(\t\"I\n\022ListVo" +
+      "icesResponse\0223\n\006voices\030\001 \003(\0132#.google.cl" +
+      "oud.texttospeech.v1.Voice\"\224\001\n\005Voice\022\026\n\016l" +
+      "anguage_codes\030\001 \003(\t\022\014\n\004name\030\002 \001(\t\022B\n\013ssm" +
+      "l_gender\030\003 \001(\0162-.google.cloud.texttospee" +
+      "ch.v1.SsmlVoiceGender\022!\n\031natural_sample_" +
+      "rate_hertz\030\004 \001(\005\"\332\001\n\027SynthesizeSpeechReq" +
+      "uest\022;\n\005input\030\001 \001(\0132,.google.cloud.textt" +
+      "ospeech.v1.SynthesisInput\022A\n\005voice\030\002 \001(\013" +
+      "22.google.cloud.texttospeech.v1.VoiceSel" +
+      "ectionParams\022?\n\014audio_config\030\003 \001(\0132).goo" +
+      "gle.cloud.texttospeech.v1.AudioConfig\"@\n" +
+      "\016SynthesisInput\022\016\n\004text\030\001 \001(\tH\000\022\016\n\004ssml\030" +
+      "\002 \001(\tH\000B\016\n\014input_source\"\177\n\024VoiceSelectio" +
+      "nParams\022\025\n\rlanguage_code\030\001 \001(\t\022\014\n\004name\030\002" +
+      " \001(\t\022B\n\013ssml_gender\030\003 \001(\0162-.google.cloud" +
+      ".texttospeech.v1.SsmlVoiceGender\"\253\001\n\013Aud" +
+      "ioConfig\022C\n\016audio_encoding\030\001 \001(\0162+.googl" +
+      "e.cloud.texttospeech.v1.AudioEncoding\022\025\n" +
+      "\rspeaking_rate\030\002 \001(\001\022\r\n\005pitch\030\003 \001(\001\022\026\n\016v" +
+      "olume_gain_db\030\004 \001(\001\022\031\n\021sample_rate_hertz" +
+      "\030\005 \001(\005\"1\n\030SynthesizeSpeechResponse\022\025\n\rau" +
+      "dio_content\030\001 \001(\014*W\n\017SsmlVoiceGender\022!\n\035" +
+      "SSML_VOICE_GENDER_UNSPECIFIED\020\000\022\010\n\004MALE\020" +
+      "\001\022\n\n\006FEMALE\020\002\022\013\n\007NEUTRAL\020\003*T\n\rAudioEncod" +
+      "ing\022\036\n\032AUDIO_ENCODING_UNSPECIFIED\020\000\022\014\n\010L" +
+      "INEAR16\020\001\022\007\n\003MP3\020\002\022\014\n\010OGG_OPUS\020\0032\270\002\n\014Tex" +
+      "tToSpeech\022\203\001\n\nListVoices\022/.google.cloud." +
+      "texttospeech.v1.ListVoicesRequest\0320.goog" +
+      "le.cloud.texttospeech.v1.ListVoicesRespo" +
+      "nse\"\022\202\323\344\223\002\014\022\n/v1/voices\022\241\001\n\020SynthesizeSp" +
+      "eech\0225.google.cloud.texttospeech.v1.Synt" +
+      "hesizeSpeechRequest\0326.google.cloud.textt" +
+      "ospeech.v1.SynthesizeSpeechResponse\"\036\202\323\344" +
+      "\223\002\030\"\023/v1/text:synthesize:\001*B\302\001\n com.goog" +
+      "le.cloud.texttospeech.v1B\021TextToSpeechPr" +
+      "otoP\001ZHgoogle.golang.org/genproto/google" +
+      "apis/cloud/texttospeech/v1;texttospeech\370" +
+      "\001\001\252\002\034Google.Cloud.TextToSpeech.V1\312\002\034Goog" +
+      "le\\Cloud\\TextToSpeech\\V1b\006proto3"
+    };
+    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.api.AnnotationsProto.getDescriptor(),
+        }, assigner);
+    internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_descriptor,
+        new java.lang.String[] { "LanguageCode", });
+    internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_descriptor,
+        new java.lang.String[] { "Voices", });
+    internal_static_google_cloud_texttospeech_v1_Voice_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_google_cloud_texttospeech_v1_Voice_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_texttospeech_v1_Voice_descriptor,
+        new java.lang.String[] { "LanguageCodes", "Name", "SsmlGender", "NaturalSampleRateHertz", });
+    internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_descriptor,
+        new java.lang.String[] { "Input", "Voice", "AudioConfig", });
+    internal_static_google_cloud_texttospeech_v1_SynthesisInput_descriptor =
+      getDescriptor().getMessageTypes().get(4);
+    internal_static_google_cloud_texttospeech_v1_SynthesisInput_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_texttospeech_v1_SynthesisInput_descriptor,
+        new java.lang.String[] { "Text", "Ssml", "InputSource", });
+    internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_descriptor =
+      getDescriptor().getMessageTypes().get(5);
+    internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_descriptor,
+        new java.lang.String[] { "LanguageCode", "Name", "SsmlGender", });
+    internal_static_google_cloud_texttospeech_v1_AudioConfig_descriptor =
+      getDescriptor().getMessageTypes().get(6);
+    internal_static_google_cloud_texttospeech_v1_AudioConfig_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_texttospeech_v1_AudioConfig_descriptor,
+        new java.lang.String[] { "AudioEncoding", "SpeakingRate", "Pitch", "VolumeGainDb", "SampleRateHertz", });
+    internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_descriptor =
+      getDescriptor().getMessageTypes().get(7);
+    internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_descriptor,
+        new java.lang.String[] { "AudioContent", });
+    com.google.protobuf.ExtensionRegistry registry =
+        com.google.protobuf.ExtensionRegistry.newInstance();
+    registry.add(com.google.api.AnnotationsProto.http);
+    com.google.protobuf.Descriptors.FileDescriptor
+        .internalUpdateFileDescriptor(descriptor, registry);
+    com.google.api.AnnotationsProto.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java
new file mode 100644
index 000000000000..63b486b6e0d4
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java
@@ -0,0 +1,990 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+/**
+ * 
    + * Description of a voice supported by the TTS service.
+ * 
    
+ *
+ * Protobuf type {@code google.cloud.texttospeech.v1.Voice}
+ */
+public  final class Voice extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.texttospeech.v1.Voice)
+    VoiceOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use Voice.newBuilder() to construct.
+  private Voice(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private Voice() {
+    languageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    name_ = "";
+    ssmlGender_ = 0;
+    naturalSampleRateHertz_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private Voice(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+            if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+              languageCodes_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            languageCodes_.add(s);
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 24: {
+            int rawValue = input.readEnum();
+
+            ssmlGender_ = rawValue;
+            break;
+          }
+          case 32: {
+
+            naturalSampleRateHertz_ = input.readInt32();
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+        languageCodes_ = languageCodes_.getUnmodifiableView();
+      }
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_Voice_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_Voice_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.texttospeech.v1.Voice.class, com.google.cloud.texttospeech.v1.Voice.Builder.class);
+  }
+
+  private int bitField0_;
+  public static final int LANGUAGE_CODES_FIELD_NUMBER = 1;
+  private com.google.protobuf.LazyStringList languageCodes_;
+  /**
+   * 
    +   * The languages that this voice supports, expressed as
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+   * "en-US", "es-419", "cmn-tw").
+   * 
    
+   *
+   * repeated string language_codes = 1;
+   */
+  public com.google.protobuf.ProtocolStringList
+      getLanguageCodesList() {
+    return languageCodes_;
+  }
+  /**
+   * 
    +   * The languages that this voice supports, expressed as
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+   * "en-US", "es-419", "cmn-tw").
+   * 
    
+   *
+   * repeated string language_codes = 1;
+   */
+  public int getLanguageCodesCount() {
+    return languageCodes_.size();
+  }
+  /**
+   * 
    +   * The languages that this voice supports, expressed as
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+   * "en-US", "es-419", "cmn-tw").
+   * 
    
+   *
+   * repeated string language_codes = 1;
+   */
+  public java.lang.String getLanguageCodes(int index) {
+    return languageCodes_.get(index);
+  }
+  /**
+   * 
    +   * The languages that this voice supports, expressed as
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+   * "en-US", "es-419", "cmn-tw").
+   * 
    
+   *
+   * repeated string language_codes = 1;
+   */
+  public com.google.protobuf.ByteString
+      getLanguageCodesBytes(int index) {
+    return languageCodes_.getByteString(index);
+  }
+
+  public static final int NAME_FIELD_NUMBER = 2;
+  private volatile java.lang.Object name_;
+  /**
+   * 
    +   * The name of this voice.  Each distinct voice has a unique name.
+   * 
    
+   *
+   * string name = 2;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
    +   * The name of this voice.  Each distinct voice has a unique name.
+   * 
    
+   *
+   * string name = 2;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int SSML_GENDER_FIELD_NUMBER = 3;
+  private int ssmlGender_;
+  /**
+   * 
    +   * The gender of this voice.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+   */
+  public int getSsmlGenderValue() {
+    return ssmlGender_;
+  }
+  /**
+   * 
    +   * The gender of this voice.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+   */
+  public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() {
+    com.google.cloud.texttospeech.v1.SsmlVoiceGender result = com.google.cloud.texttospeech.v1.SsmlVoiceGender.valueOf(ssmlGender_);
+    return result == null ? com.google.cloud.texttospeech.v1.SsmlVoiceGender.UNRECOGNIZED : result;
+  }
+
+  public static final int NATURAL_SAMPLE_RATE_HERTZ_FIELD_NUMBER = 4;
+  private int naturalSampleRateHertz_;
+  /**
+   * 
    +   * The natural sample rate (in hertz) for this voice.
+   * 
    
+   *
+   * int32 natural_sample_rate_hertz = 4;
+   */
+  public int getNaturalSampleRateHertz() {
+    return naturalSampleRateHertz_;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    for (int i = 0; i < languageCodes_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, languageCodes_.getRaw(i));
+    }
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_);
+    }
+    if (ssmlGender_ != com.google.cloud.texttospeech.v1.SsmlVoiceGender.SSML_VOICE_GENDER_UNSPECIFIED.getNumber()) {
+      output.writeEnum(3, ssmlGender_);
+    }
+    if (naturalSampleRateHertz_ != 0) {
+      output.writeInt32(4, naturalSampleRateHertz_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    {
+      int dataSize = 0;
+      for (int i = 0; i < languageCodes_.size(); i++) {
+        dataSize += computeStringSizeNoTag(languageCodes_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getLanguageCodesList().size();
+    }
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_);
+    }
+    if (ssmlGender_ != com.google.cloud.texttospeech.v1.SsmlVoiceGender.SSML_VOICE_GENDER_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(3, ssmlGender_);
+    }
+    if (naturalSampleRateHertz_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(4, naturalSampleRateHertz_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.texttospeech.v1.Voice)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.texttospeech.v1.Voice other = (com.google.cloud.texttospeech.v1.Voice) obj;
+
+    boolean result = true;
+    result = result && getLanguageCodesList()
+        .equals(other.getLanguageCodesList());
+    result = result && getName()
+        .equals(other.getName());
+    result = result && ssmlGender_ == other.ssmlGender_;
+    result = result && (getNaturalSampleRateHertz()
+        == other.getNaturalSampleRateHertz());
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    if (getLanguageCodesCount() > 0) {
+      hash = (37 * hash) + LANGUAGE_CODES_FIELD_NUMBER;
+      hash = (53 * hash) + getLanguageCodesList().hashCode();
+    }
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (37 * hash) + SSML_GENDER_FIELD_NUMBER;
+    hash = (53 * hash) + ssmlGender_;
+    hash = (37 * hash) + NATURAL_SAMPLE_RATE_HERTZ_FIELD_NUMBER;
+    hash = (53 * hash) + getNaturalSampleRateHertz();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.texttospeech.v1.Voice parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.Voice parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.Voice parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.Voice parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.Voice parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.Voice parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.Voice parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.Voice parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.Voice parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.Voice parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.Voice parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.Voice parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.texttospeech.v1.Voice prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
    +   * Description of a voice supported by the TTS service.
+   * 
    
+   *
+   * Protobuf type {@code google.cloud.texttospeech.v1.Voice}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.texttospeech.v1.Voice)
+      com.google.cloud.texttospeech.v1.VoiceOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_Voice_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_Voice_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.texttospeech.v1.Voice.class, com.google.cloud.texttospeech.v1.Voice.Builder.class);
+    }
+
+    // Construct using com.google.cloud.texttospeech.v1.Voice.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      languageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      name_ = "";
+
+      ssmlGender_ = 0;
+
+      naturalSampleRateHertz_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_Voice_descriptor;
+    }
+
+    public com.google.cloud.texttospeech.v1.Voice getDefaultInstanceForType() {
+      return com.google.cloud.texttospeech.v1.Voice.getDefaultInstance();
+    }
+
+    public com.google.cloud.texttospeech.v1.Voice build() {
+      com.google.cloud.texttospeech.v1.Voice result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.texttospeech.v1.Voice buildPartial() {
+      com.google.cloud.texttospeech.v1.Voice result = new com.google.cloud.texttospeech.v1.Voice(this);
+      int from_bitField0_ = bitField0_;
+      int to_bitField0_ = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        languageCodes_ = languageCodes_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000001);
+      }
+      result.languageCodes_ = languageCodes_;
+      result.name_ = name_;
+      result.ssmlGender_ = ssmlGender_;
+      result.naturalSampleRateHertz_ = naturalSampleRateHertz_;
+      result.bitField0_ = to_bitField0_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.texttospeech.v1.Voice) {
+        return mergeFrom((com.google.cloud.texttospeech.v1.Voice)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.texttospeech.v1.Voice other) {
+      if (other == com.google.cloud.texttospeech.v1.Voice.getDefaultInstance()) return this;
+      if (!other.languageCodes_.isEmpty()) {
+        if (languageCodes_.isEmpty()) {
+          languageCodes_ = other.languageCodes_;
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          ensureLanguageCodesIsMutable();
+          languageCodes_.addAll(other.languageCodes_);
+        }
+        onChanged();
+      }
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (other.ssmlGender_ != 0) {
+        setSsmlGenderValue(other.getSsmlGenderValue());
+      }
+      if (other.getNaturalSampleRateHertz() != 0) {
+        setNaturalSampleRateHertz(other.getNaturalSampleRateHertz());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.texttospeech.v1.Voice parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.texttospeech.v1.Voice) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+    private int bitField0_;
+
+    private com.google.protobuf.LazyStringList languageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensureLanguageCodesIsMutable() {
+      if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+        languageCodes_ = new com.google.protobuf.LazyStringArrayList(languageCodes_);
+        bitField0_ |= 0x00000001;
+       }
+    }
+    /**
+     * 
    +     * The languages that this voice supports, expressed as
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+     * "en-US", "es-419", "cmn-tw").
+     * 
    
+     *
+     * repeated string language_codes = 1;
+     */
+    public com.google.protobuf.ProtocolStringList
+        getLanguageCodesList() {
+      return languageCodes_.getUnmodifiableView();
+    }
+    /**
+     * 
    +     * The languages that this voice supports, expressed as
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+     * "en-US", "es-419", "cmn-tw").
+     * 
    
+     *
+     * repeated string language_codes = 1;
+     */
+    public int getLanguageCodesCount() {
+      return languageCodes_.size();
+    }
+    /**
+     * 
    +     * The languages that this voice supports, expressed as
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+     * "en-US", "es-419", "cmn-tw").
+     * 
    
+     *
+     * repeated string language_codes = 1;
+     */
+    public java.lang.String getLanguageCodes(int index) {
+      return languageCodes_.get(index);
+    }
+    /**
+     * 
    +     * The languages that this voice supports, expressed as
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+     * "en-US", "es-419", "cmn-tw").
+     * 
    
+     *
+     * repeated string language_codes = 1;
+     */
+    public com.google.protobuf.ByteString
+        getLanguageCodesBytes(int index) {
+      return languageCodes_.getByteString(index);
+    }
+    /**
+     * 
    +     * The languages that this voice supports, expressed as
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+     * "en-US", "es-419", "cmn-tw").
+     * 
    
+     *
+     * repeated string language_codes = 1;
+     */
+    public Builder setLanguageCodes(
+        int index, java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureLanguageCodesIsMutable();
+      languageCodes_.set(index, value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The languages that this voice supports, expressed as
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+     * "en-US", "es-419", "cmn-tw").
+     * 
    
+     *
+     * repeated string language_codes = 1;
+     */
+    public Builder addLanguageCodes(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureLanguageCodesIsMutable();
+      languageCodes_.add(value);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The languages that this voice supports, expressed as
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+     * "en-US", "es-419", "cmn-tw").
+     * 
    
+     *
+     * repeated string language_codes = 1;
+     */
+    public Builder addAllLanguageCodes(
+        java.lang.Iterable values) {
+      ensureLanguageCodesIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, languageCodes_);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The languages that this voice supports, expressed as
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+     * "en-US", "es-419", "cmn-tw").
+     * 
    
+     *
+     * repeated string language_codes = 1;
+     */
+    public Builder clearLanguageCodes() {
+      languageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000001);
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The languages that this voice supports, expressed as
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+     * "en-US", "es-419", "cmn-tw").
+     * 
    
+     *
+     * repeated string language_codes = 1;
+     */
+    public Builder addLanguageCodesBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      ensureLanguageCodesIsMutable();
+      languageCodes_.add(value);
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
    +     * The name of this voice.  Each distinct voice has a unique name.
+     * 
    
+     *
+     * string name = 2;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
    +     * The name of this voice.  Each distinct voice has a unique name.
+     * 
    
+     *
+     * string name = 2;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
    +     * The name of this voice.  Each distinct voice has a unique name.
+     * 
    
+     *
+     * string name = 2;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The name of this voice.  Each distinct voice has a unique name.
+     * 
    
+     *
+     * string name = 2;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The name of this voice.  Each distinct voice has a unique name.
+     * 
    
+     *
+     * string name = 2;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int ssmlGender_ = 0;
+    /**
+     * 
    +     * The gender of this voice.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+     */
+    public int getSsmlGenderValue() {
+      return ssmlGender_;
+    }
+    /**
+     * 
    +     * The gender of this voice.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+     */
+    public Builder setSsmlGenderValue(int value) {
+      ssmlGender_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The gender of this voice.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+     */
+    public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() {
+      com.google.cloud.texttospeech.v1.SsmlVoiceGender result = com.google.cloud.texttospeech.v1.SsmlVoiceGender.valueOf(ssmlGender_);
+      return result == null ? com.google.cloud.texttospeech.v1.SsmlVoiceGender.UNRECOGNIZED : result;
+    }
+    /**
+     * 
    +     * The gender of this voice.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+     */
+    public Builder setSsmlGender(com.google.cloud.texttospeech.v1.SsmlVoiceGender value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      ssmlGender_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The gender of this voice.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+     */
+    public Builder clearSsmlGender() {
+      
+      ssmlGender_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private int naturalSampleRateHertz_ ;
+    /**
+     * 
    +     * The natural sample rate (in hertz) for this voice.
+     * 
    
+     *
+     * int32 natural_sample_rate_hertz = 4;
+     */
+    public int getNaturalSampleRateHertz() {
+      return naturalSampleRateHertz_;
+    }
+    /**
+     * 
    +     * The natural sample rate (in hertz) for this voice.
+     * 
    
+     *
+     * int32 natural_sample_rate_hertz = 4;
+     */
+    public Builder setNaturalSampleRateHertz(int value) {
+      
+      naturalSampleRateHertz_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The natural sample rate (in hertz) for this voice.
+     * 
    
+     *
+     * int32 natural_sample_rate_hertz = 4;
+     */
+    public Builder clearNaturalSampleRateHertz() {
+      
+      naturalSampleRateHertz_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.texttospeech.v1.Voice)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.texttospeech.v1.Voice)
+  private static final com.google.cloud.texttospeech.v1.Voice DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.texttospeech.v1.Voice();
+  }
+
+  public static com.google.cloud.texttospeech.v1.Voice getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public Voice parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Voice(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.texttospeech.v1.Voice getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceOrBuilder.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceOrBuilder.java
new file mode 100644
index 000000000000..0275938f644a
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceOrBuilder.java
@@ -0,0 +1,96 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+public interface VoiceOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.texttospeech.v1.Voice)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
    +   * The languages that this voice supports, expressed as
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+   * "en-US", "es-419", "cmn-tw").
+   * 
    
+   *
+   * repeated string language_codes = 1;
+   */
+  java.util.List
+      getLanguageCodesList();
+  /**
+   * 
    +   * The languages that this voice supports, expressed as
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+   * "en-US", "es-419", "cmn-tw").
+   * 
    
+   *
+   * repeated string language_codes = 1;
+   */
+  int getLanguageCodesCount();
+  /**
+   * 
    +   * The languages that this voice supports, expressed as
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+   * "en-US", "es-419", "cmn-tw").
+   * 
    
+   *
+   * repeated string language_codes = 1;
+   */
+  java.lang.String getLanguageCodes(int index);
+  /**
+   * 
    +   * The languages that this voice supports, expressed as
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+   * "en-US", "es-419", "cmn-tw").
+   * 
    
+   *
+   * repeated string language_codes = 1;
+   */
+  com.google.protobuf.ByteString
+      getLanguageCodesBytes(int index);
+
+  /**
+   * 
    +   * The name of this voice.  Each distinct voice has a unique name.
+   * 
    
+   *
+   * string name = 2;
+   */
+  java.lang.String getName();
+  /**
+   * 
    +   * The name of this voice.  Each distinct voice has a unique name.
+   * 
    
+   *
+   * string name = 2;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * 
    +   * The gender of this voice.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+   */
+  int getSsmlGenderValue();
+  /**
+   * 
    +   * The gender of this voice.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+   */
+  com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender();
+
+  /**
+   * 
    +   * The natural sample rate (in hertz) for this voice.
+   * 
    
+   *
+   * int32 natural_sample_rate_hertz = 4;
+   */
+  int getNaturalSampleRateHertz();
+}
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java
new file mode 100644
index 000000000000..27475c7dfbfc
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java
@@ -0,0 +1,923 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+/**
+ * 
    + * Description of which voice to use for a synthesis request.
+ * 
    
+ *
+ * Protobuf type {@code google.cloud.texttospeech.v1.VoiceSelectionParams}
+ */
+public  final class VoiceSelectionParams extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:google.cloud.texttospeech.v1.VoiceSelectionParams)
+    VoiceSelectionParamsOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use VoiceSelectionParams.newBuilder() to construct.
+  private VoiceSelectionParams(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+    super(builder);
+  }
+  private VoiceSelectionParams() {
+    languageCode_ = "";
+    name_ = "";
+    ssmlGender_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private VoiceSelectionParams(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            languageCode_ = s;
+            break;
+          }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
+          case 24: {
+            int rawValue = input.readEnum();
+
+            ssmlGender_ = rawValue;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.texttospeech.v1.VoiceSelectionParams.class, com.google.cloud.texttospeech.v1.VoiceSelectionParams.Builder.class);
+  }
+
+  public static final int LANGUAGE_CODE_FIELD_NUMBER = 1;
+  private volatile java.lang.Object languageCode_;
+  /**
+   * 
    +   * The language (and optionally also the region) of the voice expressed as a
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag, e.g.
+   * "en-US". Required. This should not include a script tag (e.g. use
+   * "cmn-cn" rather than "cmn-Hant-cn"), because the script will be inferred
+   * from the input provided in the SynthesisInput.  The TTS service
+   * will use this parameter to help choose an appropriate voice.  Note that
+   * the TTS service may choose a voice with a slightly different language code
+   * than the one selected; it may substitute a different region
+   * (e.g. using en-US rather than en-CA if there isn't a Canadian voice
+   * available), or even a different language, e.g. using "nb" (Norwegian
+   * Bokmal) instead of "no" (Norwegian)".
+   * 
    
+   *
+   * string language_code = 1;
+   */
+  public java.lang.String getLanguageCode() {
+    java.lang.Object ref = languageCode_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      languageCode_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
    +   * The language (and optionally also the region) of the voice expressed as a
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag, e.g.
+   * "en-US". Required. This should not include a script tag (e.g. use
+   * "cmn-cn" rather than "cmn-Hant-cn"), because the script will be inferred
+   * from the input provided in the SynthesisInput.  The TTS service
+   * will use this parameter to help choose an appropriate voice.  Note that
+   * the TTS service may choose a voice with a slightly different language code
+   * than the one selected; it may substitute a different region
+   * (e.g. using en-US rather than en-CA if there isn't a Canadian voice
+   * available), or even a different language, e.g. using "nb" (Norwegian
+   * Bokmal) instead of "no" (Norwegian)".
+   * 
    
+   *
+   * string language_code = 1;
+   */
+  public com.google.protobuf.ByteString
+      getLanguageCodeBytes() {
+    java.lang.Object ref = languageCode_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      languageCode_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int NAME_FIELD_NUMBER = 2;
+  private volatile java.lang.Object name_;
+  /**
+   * 
    +   * The name of the voice. Optional; if not set, the service will choose a
+   * voice based on the other parameters such as language_code and gender.
+   * 
    
+   *
+   * string name = 2;
+   */
+  public java.lang.String getName() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      name_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
    +   * The name of the voice. Optional; if not set, the service will choose a
+   * voice based on the other parameters such as language_code and gender.
+   * 
    
+   *
+   * string name = 2;
+   */
+  public com.google.protobuf.ByteString
+      getNameBytes() {
+    java.lang.Object ref = name_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      name_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int SSML_GENDER_FIELD_NUMBER = 3;
+  private int ssmlGender_;
+  /**
+   * 
    +   * The preferred gender of the voice. Optional; if not set, the service will
+   * choose a voice based on the other parameters such as language_code and
+   * name. Note that this is only a preference, not requirement; if a
+   * voice of the appropriate gender is not available, the synthesizer should
+   * substitute a voice with a different gender rather than failing the request.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+   */
+  public int getSsmlGenderValue() {
+    return ssmlGender_;
+  }
+  /**
+   * 
    +   * The preferred gender of the voice. Optional; if not set, the service will
+   * choose a voice based on the other parameters such as language_code and
+   * name. Note that this is only a preference, not requirement; if a
+   * voice of the appropriate gender is not available, the synthesizer should
+   * substitute a voice with a different gender rather than failing the request.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+   */
+  public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() {
+    com.google.cloud.texttospeech.v1.SsmlVoiceGender result = com.google.cloud.texttospeech.v1.SsmlVoiceGender.valueOf(ssmlGender_);
+    return result == null ? com.google.cloud.texttospeech.v1.SsmlVoiceGender.UNRECOGNIZED : result;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (!getLanguageCodeBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 1, languageCode_);
+    }
+    if (!getNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_);
+    }
+    if (ssmlGender_ != com.google.cloud.texttospeech.v1.SsmlVoiceGender.SSML_VOICE_GENDER_UNSPECIFIED.getNumber()) {
+      output.writeEnum(3, ssmlGender_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (!getLanguageCodeBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, languageCode_);
+    }
+    if (!getNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_);
+    }
+    if (ssmlGender_ != com.google.cloud.texttospeech.v1.SsmlVoiceGender.SSML_VOICE_GENDER_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(3, ssmlGender_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof com.google.cloud.texttospeech.v1.VoiceSelectionParams)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.texttospeech.v1.VoiceSelectionParams other = (com.google.cloud.texttospeech.v1.VoiceSelectionParams) obj;
+
+    boolean result = true;
+    result = result && getLanguageCode()
+        .equals(other.getLanguageCode());
+    result = result && getName()
+        .equals(other.getName());
+    result = result && ssmlGender_ == other.ssmlGender_;
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + LANGUAGE_CODE_FIELD_NUMBER;
+    hash = (53 * hash) + getLanguageCode().hashCode();
+    hash = (37 * hash) + NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getName().hashCode();
+    hash = (37 * hash) + SSML_GENDER_FIELD_NUMBER;
+    hash = (53 * hash) + ssmlGender_;
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(com.google.cloud.texttospeech.v1.VoiceSelectionParams prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * 
    +   * Description of which voice to use for a synthesis request.
+   * 
    
+   *
+   * Protobuf type {@code google.cloud.texttospeech.v1.VoiceSelectionParams}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.texttospeech.v1.VoiceSelectionParams)
+      com.google.cloud.texttospeech.v1.VoiceSelectionParamsOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.texttospeech.v1.VoiceSelectionParams.class, com.google.cloud.texttospeech.v1.VoiceSelectionParams.Builder.class);
+    }
+
+    // Construct using com.google.cloud.texttospeech.v1.VoiceSelectionParams.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      languageCode_ = "";
+
+      name_ = "";
+
+      ssmlGender_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_descriptor;
+    }
+
+    public com.google.cloud.texttospeech.v1.VoiceSelectionParams getDefaultInstanceForType() {
+      return com.google.cloud.texttospeech.v1.VoiceSelectionParams.getDefaultInstance();
+    }
+
+    public com.google.cloud.texttospeech.v1.VoiceSelectionParams build() {
+      com.google.cloud.texttospeech.v1.VoiceSelectionParams result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public com.google.cloud.texttospeech.v1.VoiceSelectionParams buildPartial() {
+      com.google.cloud.texttospeech.v1.VoiceSelectionParams result = new com.google.cloud.texttospeech.v1.VoiceSelectionParams(this);
+      result.languageCode_ = languageCode_;
+      result.name_ = name_;
+      result.ssmlGender_ = ssmlGender_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof com.google.cloud.texttospeech.v1.VoiceSelectionParams) {
+        return mergeFrom((com.google.cloud.texttospeech.v1.VoiceSelectionParams)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(com.google.cloud.texttospeech.v1.VoiceSelectionParams other) {
+      if (other == com.google.cloud.texttospeech.v1.VoiceSelectionParams.getDefaultInstance()) return this;
+      if (!other.getLanguageCode().isEmpty()) {
+        languageCode_ = other.languageCode_;
+        onChanged();
+      }
+      if (!other.getName().isEmpty()) {
+        name_ = other.name_;
+        onChanged();
+      }
+      if (other.ssmlGender_ != 0) {
+        setSsmlGenderValue(other.getSsmlGenderValue());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      com.google.cloud.texttospeech.v1.VoiceSelectionParams parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (com.google.cloud.texttospeech.v1.VoiceSelectionParams) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private java.lang.Object languageCode_ = "";
+    /**
+     * 
    +     * The language (and optionally also the region) of the voice expressed as a
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag, e.g.
+     * "en-US". Required. This should not include a script tag (e.g. use
+     * "cmn-cn" rather than "cmn-Hant-cn"), because the script will be inferred
+     * from the input provided in the SynthesisInput.  The TTS service
+     * will use this parameter to help choose an appropriate voice.  Note that
+     * the TTS service may choose a voice with a slightly different language code
+     * than the one selected; it may substitute a different region
+     * (e.g. using en-US rather than en-CA if there isn't a Canadian voice
+     * available), or even a different language, e.g. using "nb" (Norwegian
+     * Bokmal) instead of "no" (Norwegian)".
+     * 
    
+     *
+     * string language_code = 1;
+     */
+    public java.lang.String getLanguageCode() {
+      java.lang.Object ref = languageCode_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        languageCode_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
    +     * The language (and optionally also the region) of the voice expressed as a
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag, e.g.
+     * "en-US". Required. This should not include a script tag (e.g. use
+     * "cmn-cn" rather than "cmn-Hant-cn"), because the script will be inferred
+     * from the input provided in the SynthesisInput.  The TTS service
+     * will use this parameter to help choose an appropriate voice.  Note that
+     * the TTS service may choose a voice with a slightly different language code
+     * than the one selected; it may substitute a different region
+     * (e.g. using en-US rather than en-CA if there isn't a Canadian voice
+     * available), or even a different language, e.g. using "nb" (Norwegian
+     * Bokmal) instead of "no" (Norwegian)".
+     * 
    
+     *
+     * string language_code = 1;
+     */
+    public com.google.protobuf.ByteString
+        getLanguageCodeBytes() {
+      java.lang.Object ref = languageCode_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        languageCode_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
    +     * The language (and optionally also the region) of the voice expressed as a
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag, e.g.
+     * "en-US". Required. This should not include a script tag (e.g. use
+     * "cmn-cn" rather than "cmn-Hant-cn"), because the script will be inferred
+     * from the input provided in the SynthesisInput.  The TTS service
+     * will use this parameter to help choose an appropriate voice.  Note that
+     * the TTS service may choose a voice with a slightly different language code
+     * than the one selected; it may substitute a different region
+     * (e.g. using en-US rather than en-CA if there isn't a Canadian voice
+     * available), or even a different language, e.g. using "nb" (Norwegian
+     * Bokmal) instead of "no" (Norwegian)".
+     * 
    
+     *
+     * string language_code = 1;
+     */
+    public Builder setLanguageCode(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      languageCode_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The language (and optionally also the region) of the voice expressed as a
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag, e.g.
+     * "en-US". Required. This should not include a script tag (e.g. use
+     * "cmn-cn" rather than "cmn-Hant-cn"), because the script will be inferred
+     * from the input provided in the SynthesisInput.  The TTS service
+     * will use this parameter to help choose an appropriate voice.  Note that
+     * the TTS service may choose a voice with a slightly different language code
+     * than the one selected; it may substitute a different region
+     * (e.g. using en-US rather than en-CA if there isn't a Canadian voice
+     * available), or even a different language, e.g. using "nb" (Norwegian
+     * Bokmal) instead of "no" (Norwegian)".
+     * 
    
+     *
+     * string language_code = 1;
+     */
+    public Builder clearLanguageCode() {
+      
+      languageCode_ = getDefaultInstance().getLanguageCode();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The language (and optionally also the region) of the voice expressed as a
+     * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag, e.g.
+     * "en-US". Required. This should not include a script tag (e.g. use
+     * "cmn-cn" rather than "cmn-Hant-cn"), because the script will be inferred
+     * from the input provided in the SynthesisInput.  The TTS service
+     * will use this parameter to help choose an appropriate voice.  Note that
+     * the TTS service may choose a voice with a slightly different language code
+     * than the one selected; it may substitute a different region
+     * (e.g. using en-US rather than en-CA if there isn't a Canadian voice
+     * available), or even a different language, e.g. using "nb" (Norwegian
+     * Bokmal) instead of "no" (Norwegian)".
+     * 
    
+     *
+     * string language_code = 1;
+     */
+    public Builder setLanguageCodeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      languageCode_ = value;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object name_ = "";
+    /**
+     * 
    +     * The name of the voice. Optional; if not set, the service will choose a
+     * voice based on the other parameters such as language_code and gender.
+     * 
    
+     *
+     * string name = 2;
+     */
+    public java.lang.String getName() {
+      java.lang.Object ref = name_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        name_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
    +     * The name of the voice. Optional; if not set, the service will choose a
+     * voice based on the other parameters such as language_code and gender.
+     * 
    
+     *
+     * string name = 2;
+     */
+    public com.google.protobuf.ByteString
+        getNameBytes() {
+      java.lang.Object ref = name_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        name_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
    +     * The name of the voice. Optional; if not set, the service will choose a
+     * voice based on the other parameters such as language_code and gender.
+     * 
    
+     *
+     * string name = 2;
+     */
+    public Builder setName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      name_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The name of the voice. Optional; if not set, the service will choose a
+     * voice based on the other parameters such as language_code and gender.
+     * 
    
+     *
+     * string name = 2;
+     */
+    public Builder clearName() {
+      
+      name_ = getDefaultInstance().getName();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The name of the voice. Optional; if not set, the service will choose a
+     * voice based on the other parameters such as language_code and gender.
+     * 
    
+     *
+     * string name = 2;
+     */
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      name_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int ssmlGender_ = 0;
+    /**
+     * 
    +     * The preferred gender of the voice. Optional; if not set, the service will
+     * choose a voice based on the other parameters such as language_code and
+     * name. Note that this is only a preference, not requirement; if a
+     * voice of the appropriate gender is not available, the synthesizer should
+     * substitute a voice with a different gender rather than failing the request.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+     */
+    public int getSsmlGenderValue() {
+      return ssmlGender_;
+    }
+    /**
+     * 
    +     * The preferred gender of the voice. Optional; if not set, the service will
+     * choose a voice based on the other parameters such as language_code and
+     * name. Note that this is only a preference, not requirement; if a
+     * voice of the appropriate gender is not available, the synthesizer should
+     * substitute a voice with a different gender rather than failing the request.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+     */
+    public Builder setSsmlGenderValue(int value) {
+      ssmlGender_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The preferred gender of the voice. Optional; if not set, the service will
+     * choose a voice based on the other parameters such as language_code and
+     * name. Note that this is only a preference, not requirement; if a
+     * voice of the appropriate gender is not available, the synthesizer should
+     * substitute a voice with a different gender rather than failing the request.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+     */
+    public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() {
+      com.google.cloud.texttospeech.v1.SsmlVoiceGender result = com.google.cloud.texttospeech.v1.SsmlVoiceGender.valueOf(ssmlGender_);
+      return result == null ? com.google.cloud.texttospeech.v1.SsmlVoiceGender.UNRECOGNIZED : result;
+    }
+    /**
+     * 
    +     * The preferred gender of the voice. Optional; if not set, the service will
+     * choose a voice based on the other parameters such as language_code and
+     * name. Note that this is only a preference, not requirement; if a
+     * voice of the appropriate gender is not available, the synthesizer should
+     * substitute a voice with a different gender rather than failing the request.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+     */
+    public Builder setSsmlGender(com.google.cloud.texttospeech.v1.SsmlVoiceGender value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      ssmlGender_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
    +     * The preferred gender of the voice. Optional; if not set, the service will
+     * choose a voice based on the other parameters such as language_code and
+     * name. Note that this is only a preference, not requirement; if a
+     * voice of the appropriate gender is not available, the synthesizer should
+     * substitute a voice with a different gender rather than failing the request.
+     * 
    
+     *
+     * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+     */
+    public Builder clearSsmlGender() {
+      
+      ssmlGender_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:google.cloud.texttospeech.v1.VoiceSelectionParams)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.texttospeech.v1.VoiceSelectionParams)
+  private static final com.google.cloud.texttospeech.v1.VoiceSelectionParams DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new com.google.cloud.texttospeech.v1.VoiceSelectionParams();
+  }
+
+  public static com.google.cloud.texttospeech.v1.VoiceSelectionParams getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    public VoiceSelectionParams parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new VoiceSelectionParams(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser getParserForType() {
+    return PARSER;
+  }
+
+  public com.google.cloud.texttospeech.v1.VoiceSelectionParams getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParamsOrBuilder.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParamsOrBuilder.java
new file mode 100644
index 000000000000..9c1b7706ca7e
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParamsOrBuilder.java
@@ -0,0 +1,92 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: google/cloud/texttospeech/v1/cloud_tts.proto
+
+package com.google.cloud.texttospeech.v1;
+
+public interface VoiceSelectionParamsOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.texttospeech.v1.VoiceSelectionParams)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * 
    +   * The language (and optionally also the region) of the voice expressed as a
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag, e.g.
+   * "en-US". Required. This should not include a script tag (e.g. use
+   * "cmn-cn" rather than "cmn-Hant-cn"), because the script will be inferred
+   * from the input provided in the SynthesisInput.  The TTS service
+   * will use this parameter to help choose an appropriate voice.  Note that
+   * the TTS service may choose a voice with a slightly different language code
+   * than the one selected; it may substitute a different region
+   * (e.g. using en-US rather than en-CA if there isn't a Canadian voice
+   * available), or even a different language, e.g. using "nb" (Norwegian
+   * Bokmal) instead of "no" (Norwegian)".
+   * 
    
+   *
+   * string language_code = 1;
+   */
+  java.lang.String getLanguageCode();
+  /**
+   * 
    +   * The language (and optionally also the region) of the voice expressed as a
+   * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag, e.g.
+   * "en-US". Required. This should not include a script tag (e.g. use
+   * "cmn-cn" rather than "cmn-Hant-cn"), because the script will be inferred
+   * from the input provided in the SynthesisInput.  The TTS service
+   * will use this parameter to help choose an appropriate voice.  Note that
+   * the TTS service may choose a voice with a slightly different language code
+   * than the one selected; it may substitute a different region
+   * (e.g. using en-US rather than en-CA if there isn't a Canadian voice
+   * available), or even a different language, e.g. using "nb" (Norwegian
+   * Bokmal) instead of "no" (Norwegian)".
+   * 
    
+   *
+   * string language_code = 1;
+   */
+  com.google.protobuf.ByteString
+      getLanguageCodeBytes();
+
+  /**
+   * 
    +   * The name of the voice. Optional; if not set, the service will choose a
+   * voice based on the other parameters such as language_code and gender.
+   * 
    
+   *
+   * string name = 2;
+   */
+  java.lang.String getName();
+  /**
+   * 
    +   * The name of the voice. Optional; if not set, the service will choose a
+   * voice based on the other parameters such as language_code and gender.
+   * 
    
+   *
+   * string name = 2;
+   */
+  com.google.protobuf.ByteString
+      getNameBytes();
+
+  /**
+   * 
    +   * The preferred gender of the voice. Optional; if not set, the service will
+   * choose a voice based on the other parameters such as language_code and
+   * name. Note that this is only a preference, not requirement; if a
+   * voice of the appropriate gender is not available, the synthesizer should
+   * substitute a voice with a different gender rather than failing the request.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+   */
+  int getSsmlGenderValue();
+  /**
+   * 
    +   * The preferred gender of the voice. Optional; if not set, the service will
+   * choose a voice based on the other parameters such as language_code and
+   * name. Note that this is only a preference, not requirement; if a
+   * voice of the appropriate gender is not available, the synthesizer should
+   * substitute a voice with a different gender rather than failing the request.
+   * 
    
+   *
+   * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
+   */
+  com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender();
+}
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto
new file mode 100644
index 000000000000..0ccbde389214
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto
@@ -0,0 +1,225 @@
+// Copyright 2018 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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";
+
+package google.cloud.texttospeech.v1;
+
+import "google/api/annotations.proto";
+
+option cc_enable_arenas = true;
+option csharp_namespace = "Google.Cloud.TextToSpeech.V1";
+option go_package = "google.golang.org/genproto/googleapis/cloud/texttospeech/v1;texttospeech";
+option java_multiple_files = true;
+option java_outer_classname = "TextToSpeechProto";
+option java_package = "com.google.cloud.texttospeech.v1";
+option php_namespace = "Google\\Cloud\\TextToSpeech\\V1";
+
+
+// Service that implements Google Cloud Text-to-Speech API.
+service TextToSpeech {
+  // Returns a list of [Voice][google.cloud.texttospeech.v1.Voice]
+  // supported for synthesis.
+  rpc ListVoices(ListVoicesRequest) returns (ListVoicesResponse) {
+    option (google.api.http) = {
+      get: "/v1/voices"
+    };
+  }
+
+  // Synthesizes speech synchronously: receive results after all text input
+  // has been processed.
+  rpc SynthesizeSpeech(SynthesizeSpeechRequest) returns (SynthesizeSpeechResponse) {
+    option (google.api.http) = {
+      post: "/v1/text:synthesize"
+      body: "*"
+    };
+  }
+}
+
+// The top-level message sent by the client for the `ListVoices` method.
+message ListVoicesRequest {
+  // Optional (but recommended)
+  // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If
+  // specified, the ListVoices call will only return voices that can be used to
+  // synthesize this language_code. E.g. when specifying "en-NZ", you will get
+  // supported "en-*" voices; when specifying "no", you will get supported
+  // "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal) voices; specifying "zh"
+  // will also get supported "cmn-*" voices; specifying "zh-hk" will also get
+  // supported "yue-*" voices.
+  string language_code = 1;
+}
+
+// The message returned to the client by the `ListVoices` method.
+message ListVoicesResponse {
+  // The list of voices.
+  repeated Voice voices = 1;
+}
+
+// Description of a voice supported by the TTS service.
+message Voice {
+  // The languages that this voice supports, expressed as
+  // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tags (e.g.
+  // "en-US", "es-419", "cmn-tw").
+  repeated string language_codes = 1;
+
+  // The name of this voice.  Each distinct voice has a unique name.
+  string name = 2;
+
+  // The gender of this voice.
+  SsmlVoiceGender ssml_gender = 3;
+
+  // The natural sample rate (in hertz) for this voice.
+  int32 natural_sample_rate_hertz = 4;
+}
+
+// The top-level message sent by the client for the `SynthesizeSpeech` method.
+message SynthesizeSpeechRequest {
+  // Required. The Synthesizer requires either plain text or SSML as input.
+  SynthesisInput input = 1;
+
+  // Required. The desired voice of the synthesized audio.
+  VoiceSelectionParams voice = 2;
+
+  // Required. The configuration of the synthesized audio.
+  AudioConfig audio_config = 3;
+}
+
+// Contains text input to be synthesized. Either `text` or `ssml` must be
+// supplied. Supplying both or neither returns
+// [google.rpc.Code.INVALID_ARGUMENT][]. The input size is limited to 5000
+// characters.
+message SynthesisInput {
+  // The input source, which is either plain text or SSML.
+  oneof input_source {
+    // The raw text to be synthesized.
+    string text = 1;
+
+    // The SSML document to be synthesized. The SSML document must be valid
+    // and well-formed. Otherwise the RPC will fail and return
+    // [google.rpc.Code.INVALID_ARGUMENT][]. For more information, see
+    // [SSML](/speech/text-to-speech/docs/ssml).
+    string ssml = 2;
+  }
+}
+
+// Description of which voice to use for a synthesis request.
+message VoiceSelectionParams {
+  // The language (and optionally also the region) of the voice expressed as a
+  // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag, e.g.
+  // "en-US". Required. This should not include a script tag (e.g. use
+  // "cmn-cn" rather than "cmn-Hant-cn"), because the script will be inferred
+  // from the input provided in the SynthesisInput.  The TTS service
+  // will use this parameter to help choose an appropriate voice.  Note that
+  // the TTS service may choose a voice with a slightly different language code
+  // than the one selected; it may substitute a different region
+  // (e.g. using en-US rather than en-CA if there isn't a Canadian voice
+  // available), or even a different language, e.g. using "nb" (Norwegian
+  // Bokmal) instead of "no" (Norwegian)".
+  string language_code = 1;
+
+  // The name of the voice. Optional; if not set, the service will choose a
+  // voice based on the other parameters such as language_code and gender.
+  string name = 2;
+
+  // The preferred gender of the voice. Optional; if not set, the service will
+  // choose a voice based on the other parameters such as language_code and
+  // name. Note that this is only a preference, not requirement; if a
+  // voice of the appropriate gender is not available, the synthesizer should
+  // substitute a voice with a different gender rather than failing the request.
+  SsmlVoiceGender ssml_gender = 3;
+}
+
+// Description of audio data to be synthesized.
+message AudioConfig {
+  // Required. The format of the requested audio byte stream.
+  AudioEncoding audio_encoding = 1;
+
+  // Optional speaking rate/speed, in the range [0.25, 4.0]. 1.0 is the normal
+  // native speed supported by the specific voice. 2.0 is twice as fast, and
+  // 0.5 is half as fast. If unset(0.0), defaults to the native 1.0 speed. Any
+  // other values < 0.25 or > 4.0 will return an error.
+  double speaking_rate = 2;
+
+  // Optional speaking pitch, in the range [-20.0, 20.0]. 20 means increase 20
+  // semitones from the original pitch. -20 means decrease 20 semitones from the
+  // original pitch.
+  double pitch = 3;
+
+  // Optional volume gain (in dB) of the normal native volume supported by the
+  // specific voice, in the range [-96.0, 16.0]. If unset, or set to a value of
+  // 0.0 (dB), will play at normal native signal amplitude. A value of -6.0 (dB)
+  // will play at approximately half the amplitude of the normal native signal
+  // amplitude. A value of +6.0 (dB) will play at approximately twice the
+  // amplitude of the normal native signal amplitude. Strongly recommend not to
+  // exceed +10 (dB) as there's usually no effective increase in loudness for
+  // any value greater than that.
+  double volume_gain_db = 4;
+
+  // The synthesis sample rate (in hertz) for this audio. Optional.  If this is
+  // different from the voice's natural sample rate, then the synthesizer will
+  // honor this request by converting to the desired sample rate (which might
+  // result in worse audio quality), unless the specified sample rate is not
+  // supported for the encoding chosen, in which case it will fail the request
+  // and return [google.rpc.Code.INVALID_ARGUMENT][].
+  int32 sample_rate_hertz = 5;
+}
+
+// The message returned to the client by the `SynthesizeSpeech` method.
+message SynthesizeSpeechResponse {
+  // The audio data bytes encoded as specified in the request, including the
+  // header (For LINEAR16 audio, we include the WAV header). Note: as
+  // with all bytes fields, protobuffers use a pure binary representation,
+  // whereas JSON representations use base64.
+  bytes audio_content = 1;
+}
+
+// Gender of the voice as described in
+// [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice).
+enum SsmlVoiceGender {
+  // An unspecified gender.
+  // In VoiceSelectionParams, this means that the client doesn't care which
+  // gender the selected voice will have. In the Voice field of
+  // ListVoicesResponse, this may mean that the voice doesn't fit any of the
+  // other categories in this enum, or that the gender of the voice isn't known.
+  SSML_VOICE_GENDER_UNSPECIFIED = 0;
+
+  // A male voice.
+  MALE = 1;
+
+  // A female voice.
+  FEMALE = 2;
+
+  // A gender-neutral voice.
+  NEUTRAL = 3;
+}
+
+// Configuration to set up audio encoder. The encoding determines the output
+// audio format that we'd like.
+enum AudioEncoding {
+  // Not specified. Will return result [google.rpc.Code.INVALID_ARGUMENT][].
+  AUDIO_ENCODING_UNSPECIFIED = 0;
+
+  // Uncompressed 16-bit signed little-endian samples (Linear PCM).
+  // Audio content returned as LINEAR16 also contains a WAV header.
+  LINEAR16 = 1;
+
+  // MP3 audio.
+  MP3 = 2;
+
+  // Opus encoded audio wrapped in an ogg container. The result will be a
+  // file which can be played natively on Android, and in browsers (at least
+  // Chrome and Firefox). The quality of the encoding is considerably higher
+  // than MP3 while using approximately the same bitrate.
+  OGG_OPUS = 3;
+}
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index 764858bc1f04..d5bb627b2b13 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -755,6 +755,16 @@
         grpc-google-cloud-texttospeech-v1beta1
         0.14.1-SNAPSHOT
           
+      
+        com.google.api.grpc
+        proto-google-cloud-texttospeech-v1
+        0.14.1-SNAPSHOT
+      
+      
+        com.google.api.grpc
+        grpc-google-cloud-texttospeech-v1
+        0.14.1-SNAPSHOT
+      
       
         com.google.cloud
         google-cloud-trace
diff --git a/google-cloud-clients/google-cloud-texttospeech/README.md b/google-cloud-clients/google-cloud-texttospeech/README.md
index 97d6a44aed6b..a526be6e51ef 100644
--- a/google-cloud-clients/google-cloud-texttospeech/README.md
+++ b/google-cloud-clients/google-cloud-texttospeech/README.md
@@ -99,4 +99,4 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-platform]: https://cloud.google.com/
 [cloud-texttospeech]: https://cloud.google.com/texttospeech
 [texttospeech-product-docs]: https://cloud.google.com/texttospeech/docs
-[texttospeech-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/texttospeech/v1beta1/package-summary.html
+[texttospeech-client-lib-docs]: https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/index.html?com/google/cloud/texttospeech/v1/package-summary.html
diff --git a/google-cloud-clients/google-cloud-texttospeech/pom.xml b/google-cloud-clients/google-cloud-texttospeech/pom.xml
index 28ff83f107c2..4f6e0931a13e 100644
--- a/google-cloud-clients/google-cloud-texttospeech/pom.xml
+++ b/google-cloud-clients/google-cloud-texttospeech/pom.xml
@@ -30,6 +30,10 @@
       com.google.api.grpc
       proto-google-cloud-texttospeech-v1beta1
     
+    
+      com.google.api.grpc
+      proto-google-cloud-texttospeech-v1
+    
     
       io.grpc
       grpc-netty-shaded
@@ -68,6 +72,11 @@
       grpc-google-cloud-texttospeech-v1beta1
       test
     
+    
+      com.google.api.grpc
+      grpc-google-cloud-texttospeech-v1
+      test
+    
     
       com.google.api
       gax-grpc
diff --git a/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechClient.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechClient.java
new file mode 100644
index 000000000000..8d5c3599cfcf
--- /dev/null
+++ b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechClient.java
@@ -0,0 +1,329 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.texttospeech.v1;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.texttospeech.v1.stub.TextToSpeechStub;
+import com.google.cloud.texttospeech.v1.stub.TextToSpeechStubSettings;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND SERVICE
+/**
+ * Service Description: Service that implements Google Cloud Text-to-Speech API.
+ *
+ * 
    This class provides the ability to make remote calls to the backing service through method
+ * calls that map to API methods. Sample code to get started:
+ *
+ * 
    + * 
+ * try (TextToSpeechClient textToSpeechClient = TextToSpeechClient.create()) {
+ *   String languageCode = "";
+ *   ListVoicesResponse response = textToSpeechClient.listVoices(languageCode);
+ * }
+ * 
+ * 
    
+ *
+ * 
    Note: close() needs to be called on the textToSpeechClient object to clean up resources such
+ * as threads. In the example above, try-with-resources is used, which automatically calls close().
+ *
+ * 
    The surface of this class includes several types of Java methods for each of the API's
+ * methods:
+ *
+ * 
      
+ *   
    1.  A "flattened" method. With this type of method, the fields of the request type have been
+ *       converted into function parameters. It may be the case that not all fields are available as
+ *       parameters, and not every API method will have a flattened method entry point.
+ *   
    2.  A "request object" method. This type of method only takes one parameter, a request object,
+ *       which must be constructed before the call. Not every API method will have a request object
+ *       method.
+ *   
    3.  A "callable" method. This type of method takes no parameters and returns an immutable API
+ *       callable object, which can be used to initiate calls to the service.
+ * 
    
+ *
+ * 
    See the individual methods for example code.
+ *
+ * 
    Many parameters require resource names to be formatted in a particular way. To assist with
+ * these names, this class includes a format method for each type of name, and additionally a parse
+ * method to extract the individual identifiers contained within names that are returned.
+ *
+ * 
    This class can be customized by passing in a custom instance of TextToSpeechSettings to
+ * create(). For example:
+ *
+ * 
    To customize credentials:
+ *
+ * 
    + * 
+ * TextToSpeechSettings textToSpeechSettings =
+ *     TextToSpeechSettings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .build();
+ * TextToSpeechClient textToSpeechClient =
+ *     TextToSpeechClient.create(textToSpeechSettings);
+ * 
+ * 
    
+ *
+ * To customize the endpoint:
+ *
+ * 
    + * 
+ * TextToSpeechSettings textToSpeechSettings =
+ *     TextToSpeechSettings.newBuilder().setEndpoint(myEndpoint).build();
+ * TextToSpeechClient textToSpeechClient =
+ *     TextToSpeechClient.create(textToSpeechSettings);
+ * 
+ * 
    
+ */
+@Generated("by gapic-generator")
+@BetaApi
+public class TextToSpeechClient implements BackgroundResource {
+  private final TextToSpeechSettings settings;
+  private final TextToSpeechStub stub;
+
+  /** Constructs an instance of TextToSpeechClient with default settings. */
+  public static final TextToSpeechClient create() throws IOException {
+    return create(TextToSpeechSettings.newBuilder().build());
+  }
+
+  /**
+   * Constructs an instance of TextToSpeechClient, using the given settings. The channels are
+   * created based on the settings passed in, or defaults for any settings that are not set.
+   */
+  public static final TextToSpeechClient create(TextToSpeechSettings settings) throws IOException {
+    return new TextToSpeechClient(settings);
+  }
+
+  /**
+   * Constructs an instance of TextToSpeechClient, using the given stub for making calls. This is
+   * for advanced usage - prefer to use TextToSpeechSettings}.
+   */
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  public static final TextToSpeechClient create(TextToSpeechStub stub) {
+    return new TextToSpeechClient(stub);
+  }
+
+  /**
+   * Constructs an instance of TextToSpeechClient, using the given settings. This is protected so
+   * that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected TextToSpeechClient(TextToSpeechSettings settings) throws IOException {
+    this.settings = settings;
+    this.stub = ((TextToSpeechStubSettings) settings.getStubSettings()).createStub();
+  }
+
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  protected TextToSpeechClient(TextToSpeechStub stub) {
+    this.settings = null;
+    this.stub = stub;
+  }
+
+  public final TextToSpeechSettings getSettings() {
+    return settings;
+  }
+
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  public TextToSpeechStub getStub() {
+    return stub;
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Returns a list of [Voice][google.cloud.texttospeech.v1.Voice] supported for synthesis.
+   *
+   * 
    Sample code:
+   *
+   * 
    
+   * try (TextToSpeechClient textToSpeechClient = TextToSpeechClient.create()) {
+   *   String languageCode = "";
+   *   ListVoicesResponse response = textToSpeechClient.listVoices(languageCode);
+   * }
+   * 
    
+   *
+   * @param languageCode Optional (but recommended)
+   *     [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag. If specified, the
+   *     ListVoices call will only return voices that can be used to synthesize this language_code.
+   *     E.g. when specifying "en-NZ", you will get supported "en-*" voices; when specifying
+   *     "no", you will get supported "no-*" (Norwegian) and "nb-*" (Norwegian Bokmal)
+   *     voices; specifying "zh" will also get supported "cmn-*" voices; specifying "zh-hk" will
+   *     also get supported "yue-*" voices.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListVoicesResponse listVoices(String languageCode) {
+
+    ListVoicesRequest request =
+        ListVoicesRequest.newBuilder().setLanguageCode(languageCode).build();
+    return listVoices(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Returns a list of [Voice][google.cloud.texttospeech.v1.Voice] supported for synthesis.
+   *
+   * 
    Sample code:
+   *
+   * 
    
+   * try (TextToSpeechClient textToSpeechClient = TextToSpeechClient.create()) {
+   *   ListVoicesRequest request = ListVoicesRequest.newBuilder().build();
+   *   ListVoicesResponse response = textToSpeechClient.listVoices(request);
+   * }
+   * 
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final ListVoicesResponse listVoices(ListVoicesRequest request) {
+    return listVoicesCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Returns a list of [Voice][google.cloud.texttospeech.v1.Voice] supported for synthesis.
+   *
+   * 
    Sample code:
+   *
+   * 
    
+   * try (TextToSpeechClient textToSpeechClient = TextToSpeechClient.create()) {
+   *   ListVoicesRequest request = ListVoicesRequest.newBuilder().build();
+   *   ApiFuture<ListVoicesResponse> future = textToSpeechClient.listVoicesCallable().futureCall(request);
+   *   // Do something
+   *   ListVoicesResponse response = future.get();
+   * }
+   * 
    
+   */
+  public final UnaryCallable listVoicesCallable() {
+    return stub.listVoicesCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Synthesizes speech synchronously: receive results after all text input has been processed.
+   *
+   * 
    Sample code:
+   *
+   * 
    
+   * try (TextToSpeechClient textToSpeechClient = TextToSpeechClient.create()) {
+   *   SynthesisInput input = SynthesisInput.newBuilder().build();
+   *   VoiceSelectionParams voice = VoiceSelectionParams.newBuilder().build();
+   *   AudioConfig audioConfig = AudioConfig.newBuilder().build();
+   *   SynthesizeSpeechResponse response = textToSpeechClient.synthesizeSpeech(input, voice, audioConfig);
+   * }
+   * 
    
+   *
+   * @param input Required. The Synthesizer requires either plain text or SSML as input.
+   * @param voice Required. The desired voice of the synthesized audio.
+   * @param audioConfig Required. The configuration of the synthesized audio.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final SynthesizeSpeechResponse synthesizeSpeech(
+      SynthesisInput input, VoiceSelectionParams voice, AudioConfig audioConfig) {
+
+    SynthesizeSpeechRequest request =
+        SynthesizeSpeechRequest.newBuilder()
+            .setInput(input)
+            .setVoice(voice)
+            .setAudioConfig(audioConfig)
+            .build();
+    return synthesizeSpeech(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Synthesizes speech synchronously: receive results after all text input has been processed.
+   *
+   * 
    Sample code:
+   *
+   * 
    
+   * try (TextToSpeechClient textToSpeechClient = TextToSpeechClient.create()) {
+   *   SynthesisInput input = SynthesisInput.newBuilder().build();
+   *   VoiceSelectionParams voice = VoiceSelectionParams.newBuilder().build();
+   *   AudioConfig audioConfig = AudioConfig.newBuilder().build();
+   *   SynthesizeSpeechRequest request = SynthesizeSpeechRequest.newBuilder()
+   *     .setInput(input)
+   *     .setVoice(voice)
+   *     .setAudioConfig(audioConfig)
+   *     .build();
+   *   SynthesizeSpeechResponse response = textToSpeechClient.synthesizeSpeech(request);
+   * }
+   * 
    
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final SynthesizeSpeechResponse synthesizeSpeech(SynthesizeSpeechRequest request) {
+    return synthesizeSpeechCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Synthesizes speech synchronously: receive results after all text input has been processed.
+   *
+   * 
    Sample code:
+   *
+   * 
    
+   * try (TextToSpeechClient textToSpeechClient = TextToSpeechClient.create()) {
+   *   SynthesisInput input = SynthesisInput.newBuilder().build();
+   *   VoiceSelectionParams voice = VoiceSelectionParams.newBuilder().build();
+   *   AudioConfig audioConfig = AudioConfig.newBuilder().build();
+   *   SynthesizeSpeechRequest request = SynthesizeSpeechRequest.newBuilder()
+   *     .setInput(input)
+   *     .setVoice(voice)
+   *     .setAudioConfig(audioConfig)
+   *     .build();
+   *   ApiFuture<SynthesizeSpeechResponse> future = textToSpeechClient.synthesizeSpeechCallable().futureCall(request);
+   *   // Do something
+   *   SynthesizeSpeechResponse response = future.get();
+   * }
+   * 
    
+   */
+  public final UnaryCallable
+      synthesizeSpeechCallable() {
+    return stub.synthesizeSpeechCallable();
+  }
+
+  @Override
+  public final void close() {
+    stub.close();
+  }
+
+  @Override
+  public void shutdown() {
+    stub.shutdown();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return stub.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return stub.isTerminated();
+  }
+
+  @Override
+  public void shutdownNow() {
+    stub.shutdownNow();
+  }
+
+  @Override
+  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
+    return stub.awaitTermination(duration, unit);
+  }
+}
diff --git a/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechSettings.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechSettings.java
new file mode 100644
index 000000000000..3ea6ca2f89d6
--- /dev/null
+++ b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechSettings.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.texttospeech.v1;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.GoogleCredentialsProvider;
+import com.google.api.gax.core.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.ClientSettings;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.cloud.texttospeech.v1.stub.TextToSpeechStubSettings;
+import java.io.IOException;
+import java.util.List;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * Settings class to configure an instance of {@link TextToSpeechClient}.
+ *
+ * 
    The default instance has everything set to sensible defaults:
+ *
+ * 
      
+ *   
    • The default service address (texttospeech.googleapis.com) and default port (443) are used.
+ *   
    • Credentials are acquired automatically through Application Default Credentials.
+ *   
    • Retries are configured for idempotent methods but not for non-idempotent methods.
+ * 
    
+ *
+ * 
    The builder of this class is recursive, so contained classes are themselves builders. When
+ * build() is called, the tree of builders is called to create the complete settings object. For
+ * example, to set the total timeout of listVoices to 30 seconds:
+ *
+ * 
    + * 
+ * TextToSpeechSettings.Builder textToSpeechSettingsBuilder =
+ *     TextToSpeechSettings.newBuilder();
+ * textToSpeechSettingsBuilder.listVoicesSettings().getRetrySettings().toBuilder()
+ *     .setTotalTimeout(Duration.ofSeconds(30));
+ * TextToSpeechSettings textToSpeechSettings = textToSpeechSettingsBuilder.build();
+ * 
+ * 
    
+ */
+@Generated("by gapic-generator")
+@BetaApi
+public class TextToSpeechSettings extends ClientSettings {
+  /** Returns the object with the settings used for calls to listVoices. */
+  public UnaryCallSettings listVoicesSettings() {
+    return ((TextToSpeechStubSettings) getStubSettings()).listVoicesSettings();
+  }
+
+  /** Returns the object with the settings used for calls to synthesizeSpeech. */
+  public UnaryCallSettings
+      synthesizeSpeechSettings() {
+    return ((TextToSpeechStubSettings) getStubSettings()).synthesizeSpeechSettings();
+  }
+
+  public static final TextToSpeechSettings create(TextToSpeechStubSettings stub)
+      throws IOException {
+    return new TextToSpeechSettings.Builder(stub.toBuilder()).build();
+  }
+
+  /** Returns a builder for the default ExecutorProvider for this service. */
+  public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
+    return TextToSpeechStubSettings.defaultExecutorProviderBuilder();
+  }
+
+  /** Returns the default service endpoint. */
+  public static String getDefaultEndpoint() {
+    return TextToSpeechStubSettings.getDefaultEndpoint();
+  }
+
+  /** Returns the default service scopes. */
+  public static List getDefaultServiceScopes() {
+    return TextToSpeechStubSettings.getDefaultServiceScopes();
+  }
+
+  /** Returns a builder for the default credentials for this service. */
+  public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
+    return TextToSpeechStubSettings.defaultCredentialsProviderBuilder();
+  }
+
+  /** Returns a builder for the default ChannelProvider for this service. */
+  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
+    return TextToSpeechStubSettings.defaultGrpcTransportProviderBuilder();
+  }
+
+  public static TransportChannelProvider defaultTransportChannelProvider() {
+    return TextToSpeechStubSettings.defaultTransportChannelProvider();
+  }
+
+  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
+  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+    return TextToSpeechStubSettings.defaultApiClientHeaderProviderBuilder();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder() {
+    return Builder.createDefault();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder(ClientContext clientContext) {
+    return new Builder(clientContext);
+  }
+
+  /** Returns a builder containing all the values of this settings class. */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  protected TextToSpeechSettings(Builder settingsBuilder) throws IOException {
+    super(settingsBuilder);
+  }
+
+  /** Builder for TextToSpeechSettings. */
+  public static class Builder extends ClientSettings.Builder {
+    protected Builder() throws IOException {
+      this((ClientContext) null);
+    }
+
+    protected Builder(ClientContext clientContext) {
+      super(TextToSpeechStubSettings.newBuilder(clientContext));
+    }
+
+    private static Builder createDefault() {
+      return new Builder(TextToSpeechStubSettings.newBuilder());
+    }
+
+    protected Builder(TextToSpeechSettings settings) {
+      super(settings.getStubSettings().toBuilder());
+    }
+
+    protected Builder(TextToSpeechStubSettings.Builder stubSettings) {
+      super(stubSettings);
+    }
+
+    public TextToSpeechStubSettings.Builder getStubSettingsBuilder() {
+      return ((TextToSpeechStubSettings.Builder) getStubSettings());
+    }
+
+    // NEXT_MAJOR_VER: remove 'throws Exception'
+    /**
+     * Applies the given settings updater function to all of the unary API methods in this service.
+     *
+     * 
    Note: This method does not support applying settings to streaming methods.
+     */
+    public Builder applyToAllUnaryMethods(
+        ApiFunction, Void> settingsUpdater) throws Exception {
+      super.applyToAllUnaryMethods(
+          getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
+      return this;
+    }
+
+    /** Returns the builder for the settings used for calls to listVoices. */
+    public UnaryCallSettings.Builder listVoicesSettings() {
+      return getStubSettingsBuilder().listVoicesSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to synthesizeSpeech. */
+    public UnaryCallSettings.Builder
+        synthesizeSpeechSettings() {
+      return getStubSettingsBuilder().synthesizeSpeechSettings();
+    }
+
+    @Override
+    public TextToSpeechSettings build() throws IOException {
+      return new TextToSpeechSettings(this);
+    }
+  }
+}
diff --git a/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/package-info.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/package-info.java
new file mode 100644
index 000000000000..812536497545
--- /dev/null
+++ b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/package-info.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+/**
+ * A client to Cloud Text-to-Speech API.
+ *
+ * 
    The interfaces provided are listed below, along with usage samples.
+ *
+ * 
    ================== TextToSpeechClient ==================
+ *
+ * 
    Service Description: Service that implements Google Cloud Text-to-Speech API.
+ *
+ * 
    Sample for TextToSpeechClient:
+ *
+ * 
    + * 
+ * try (TextToSpeechClient textToSpeechClient = TextToSpeechClient.create()) {
+ *   String languageCode = "";
+ *   ListVoicesResponse response = textToSpeechClient.listVoices(languageCode);
+ * }
+ * 
+ * 
    
+ */
+package com.google.cloud.texttospeech.v1;
diff --git a/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/GrpcTextToSpeechCallableFactory.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/GrpcTextToSpeechCallableFactory.java
new file mode 100644
index 000000000000..efcd67d7c97f
--- /dev/null
+++ b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/GrpcTextToSpeechCallableFactory.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.texttospeech.v1.stub;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.grpc.GrpcCallSettings;
+import com.google.api.gax.grpc.GrpcCallableFactory;
+import com.google.api.gax.grpc.GrpcStubCallableFactory;
+import com.google.api.gax.rpc.BatchingCallSettings;
+import com.google.api.gax.rpc.BidiStreamingCallable;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.ClientStreamingCallable;
+import com.google.api.gax.rpc.OperationCallSettings;
+import com.google.api.gax.rpc.OperationCallable;
+import com.google.api.gax.rpc.PagedCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallSettings;
+import com.google.api.gax.rpc.ServerStreamingCallable;
+import com.google.api.gax.rpc.StreamingCallSettings;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.longrunning.Operation;
+import com.google.longrunning.stub.OperationsStub;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * gRPC callable factory implementation for Cloud Text-to-Speech API.
+ *
+ * 
    This class is for advanced usage.
+ */
+@Generated("by gapic-generator")
+@BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+public class GrpcTextToSpeechCallableFactory implements GrpcStubCallableFactory {
+  @Override
+  public  UnaryCallable createUnaryCallable(
+      GrpcCallSettings grpcCallSettings,
+      UnaryCallSettings callSettings,
+      ClientContext clientContext) {
+    return GrpcCallableFactory.createUnaryCallable(grpcCallSettings, callSettings, clientContext);
+  }
+
+  @Override
+  public 
+      UnaryCallable createPagedCallable(
+          GrpcCallSettings grpcCallSettings,
+          PagedCallSettings pagedCallSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createPagedCallable(
+        grpcCallSettings, pagedCallSettings, clientContext);
+  }
+
+  @Override
+  public  UnaryCallable createBatchingCallable(
+      GrpcCallSettings grpcCallSettings,
+      BatchingCallSettings batchingCallSettings,
+      ClientContext clientContext) {
+    return GrpcCallableFactory.createBatchingCallable(
+        grpcCallSettings, batchingCallSettings, clientContext);
+  }
+
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
+  @Override
+  public 
+      OperationCallable createOperationCallable(
+          GrpcCallSettings grpcCallSettings,
+          OperationCallSettings operationCallSettings,
+          ClientContext clientContext,
+          OperationsStub operationsStub) {
+    return GrpcCallableFactory.createOperationCallable(
+        grpcCallSettings, operationCallSettings, clientContext, operationsStub);
+  }
+
+  @Override
+  public 
+      BidiStreamingCallable createBidiStreamingCallable(
+          GrpcCallSettings grpcCallSettings,
+          StreamingCallSettings streamingCallSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createBidiStreamingCallable(
+        grpcCallSettings, streamingCallSettings, clientContext);
+  }
+
+  @Override
+  public 
+      ServerStreamingCallable createServerStreamingCallable(
+          GrpcCallSettings grpcCallSettings,
+          ServerStreamingCallSettings streamingCallSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createServerStreamingCallable(
+        grpcCallSettings, streamingCallSettings, clientContext);
+  }
+
+  @Override
+  public 
+      ClientStreamingCallable createClientStreamingCallable(
+          GrpcCallSettings grpcCallSettings,
+          StreamingCallSettings streamingCallSettings,
+          ClientContext clientContext) {
+    return GrpcCallableFactory.createClientStreamingCallable(
+        grpcCallSettings, streamingCallSettings, clientContext);
+  }
+}
diff --git a/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/GrpcTextToSpeechStub.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/GrpcTextToSpeechStub.java
new file mode 100644
index 000000000000..08e7f70d2239
--- /dev/null
+++ b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/GrpcTextToSpeechStub.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.texttospeech.v1.stub;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.core.BackgroundResourceAggregation;
+import com.google.api.gax.grpc.GrpcCallSettings;
+import com.google.api.gax.grpc.GrpcStubCallableFactory;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.texttospeech.v1.ListVoicesRequest;
+import com.google.cloud.texttospeech.v1.ListVoicesResponse;
+import com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest;
+import com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse;
+import io.grpc.MethodDescriptor;
+import io.grpc.protobuf.ProtoUtils;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * gRPC stub implementation for Cloud Text-to-Speech API.
+ *
+ * 
    This class is for advanced usage and reflects the underlying API directly.
+ */
+@Generated("by gapic-generator")
+@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+public class GrpcTextToSpeechStub extends TextToSpeechStub {
+
+  private static final MethodDescriptor
+      listVoicesMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.texttospeech.v1.TextToSpeech/ListVoices")
+              .setRequestMarshaller(ProtoUtils.marshaller(ListVoicesRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(ListVoicesResponse.getDefaultInstance()))
+              .build();
+  private static final MethodDescriptor
+      synthesizeSpeechMethodDescriptor =
+          MethodDescriptor.newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.texttospeech.v1.TextToSpeech/SynthesizeSpeech")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(SynthesizeSpeechRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(SynthesizeSpeechResponse.getDefaultInstance()))
+              .build();
+
+  private final BackgroundResource backgroundResources;
+
+  private final UnaryCallable listVoicesCallable;
+  private final UnaryCallable
+      synthesizeSpeechCallable;
+
+  private final GrpcStubCallableFactory callableFactory;
+
+  public static final GrpcTextToSpeechStub create(TextToSpeechStubSettings settings)
+      throws IOException {
+    return new GrpcTextToSpeechStub(settings, ClientContext.create(settings));
+  }
+
+  public static final GrpcTextToSpeechStub create(ClientContext clientContext) throws IOException {
+    return new GrpcTextToSpeechStub(TextToSpeechStubSettings.newBuilder().build(), clientContext);
+  }
+
+  public static final GrpcTextToSpeechStub create(
+      ClientContext clientContext, GrpcStubCallableFactory callableFactory) throws IOException {
+    return new GrpcTextToSpeechStub(
+        TextToSpeechStubSettings.newBuilder().build(), clientContext, callableFactory);
+  }
+
+  /**
+   * Constructs an instance of GrpcTextToSpeechStub, using the given settings. This is protected so
+   * that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected GrpcTextToSpeechStub(TextToSpeechStubSettings settings, ClientContext clientContext)
+      throws IOException {
+    this(settings, clientContext, new GrpcTextToSpeechCallableFactory());
+  }
+
+  /**
+   * Constructs an instance of GrpcTextToSpeechStub, using the given settings. This is protected so
+   * that it is easy to make a subclass, but otherwise, the static factory methods should be
+   * preferred.
+   */
+  protected GrpcTextToSpeechStub(
+      TextToSpeechStubSettings settings,
+      ClientContext clientContext,
+      GrpcStubCallableFactory callableFactory)
+      throws IOException {
+    this.callableFactory = callableFactory;
+
+    GrpcCallSettings listVoicesTransportSettings =
+        GrpcCallSettings.newBuilder()
+            .setMethodDescriptor(listVoicesMethodDescriptor)
+            .build();
+    GrpcCallSettings
+        synthesizeSpeechTransportSettings =
+            GrpcCallSettings.newBuilder()
+                .setMethodDescriptor(synthesizeSpeechMethodDescriptor)
+                .build();
+
+    this.listVoicesCallable =
+        callableFactory.createUnaryCallable(
+            listVoicesTransportSettings, settings.listVoicesSettings(), clientContext);
+    this.synthesizeSpeechCallable =
+        callableFactory.createUnaryCallable(
+            synthesizeSpeechTransportSettings, settings.synthesizeSpeechSettings(), clientContext);
+
+    backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
+  }
+
+  public UnaryCallable listVoicesCallable() {
+    return listVoicesCallable;
+  }
+
+  public UnaryCallable
+      synthesizeSpeechCallable() {
+    return synthesizeSpeechCallable;
+  }
+
+  @Override
+  public final void close() {
+    shutdown();
+  }
+
+  @Override
+  public void shutdown() {
+    backgroundResources.shutdown();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return backgroundResources.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return backgroundResources.isTerminated();
+  }
+
+  @Override
+  public void shutdownNow() {
+    backgroundResources.shutdownNow();
+  }
+
+  @Override
+  public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException {
+    return backgroundResources.awaitTermination(duration, unit);
+  }
+}
diff --git a/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStub.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStub.java
new file mode 100644
index 000000000000..f75175223ea7
--- /dev/null
+++ b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStub.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.texttospeech.v1.stub;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.rpc.UnaryCallable;
+import com.google.cloud.texttospeech.v1.ListVoicesRequest;
+import com.google.cloud.texttospeech.v1.ListVoicesResponse;
+import com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest;
+import com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse;
+import javax.annotation.Generated;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * Base stub class for Cloud Text-to-Speech API.
+ *
+ * 
    This class is for advanced usage and reflects the underlying API directly.
+ */
+@Generated("by gapic-generator")
+@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+public abstract class TextToSpeechStub implements BackgroundResource {
+
+  public UnaryCallable listVoicesCallable() {
+    throw new UnsupportedOperationException("Not implemented: listVoicesCallable()");
+  }
+
+  public UnaryCallable
+      synthesizeSpeechCallable() {
+    throw new UnsupportedOperationException("Not implemented: synthesizeSpeechCallable()");
+  }
+
+  @Override
+  public abstract void close();
+}
diff --git a/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStubSettings.java b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStubSettings.java
new file mode 100644
index 000000000000..932079d562c0
--- /dev/null
+++ b/google-cloud-clients/google-cloud-texttospeech/src/main/java/com/google/cloud/texttospeech/v1/stub/TextToSpeechStubSettings.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.texttospeech.v1.stub;
+
+import com.google.api.core.ApiFunction;
+import com.google.api.core.BetaApi;
+import com.google.api.gax.core.GaxProperties;
+import com.google.api.gax.core.GoogleCredentialsProvider;
+import com.google.api.gax.core.InstantiatingExecutorProvider;
+import com.google.api.gax.grpc.GaxGrpcProperties;
+import com.google.api.gax.grpc.GrpcTransportChannel;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.ClientContext;
+import com.google.api.gax.rpc.StatusCode;
+import com.google.api.gax.rpc.StubSettings;
+import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.cloud.texttospeech.v1.ListVoicesRequest;
+import com.google.cloud.texttospeech.v1.ListVoicesResponse;
+import com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest;
+import com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import java.io.IOException;
+import java.util.List;
+import javax.annotation.Generated;
+import org.threeten.bp.Duration;
+
+// AUTO-GENERATED DOCUMENTATION AND CLASS
+/**
+ * Settings class to configure an instance of {@link TextToSpeechStub}.
+ *
+ * 
    The default instance has everything set to sensible defaults:
+ *
+ * 
      
+ *   
    • The default service address (texttospeech.googleapis.com) and default port (443) are used.
+ *   
    • Credentials are acquired automatically through Application Default Credentials.
+ *   
    • Retries are configured for idempotent methods but not for non-idempotent methods.
+ * 
    
+ *
+ * 
    The builder of this class is recursive, so contained classes are themselves builders. When
+ * build() is called, the tree of builders is called to create the complete settings object. For
+ * example, to set the total timeout of listVoices to 30 seconds:
+ *
+ * 
    + * 
+ * TextToSpeechStubSettings.Builder textToSpeechSettingsBuilder =
+ *     TextToSpeechStubSettings.newBuilder();
+ * textToSpeechSettingsBuilder.listVoicesSettings().getRetrySettings().toBuilder()
+ *     .setTotalTimeout(Duration.ofSeconds(30));
+ * TextToSpeechStubSettings textToSpeechSettings = textToSpeechSettingsBuilder.build();
+ * 
+ * 
    
+ */
+@Generated("by gapic-generator")
+@BetaApi
+public class TextToSpeechStubSettings extends StubSettings {
+  /** The default scopes of the service. */
+  private static final ImmutableList DEFAULT_SERVICE_SCOPES =
+      ImmutableList.builder().add("https://www.googleapis.com/auth/cloud-platform").build();
+
+  private final UnaryCallSettings listVoicesSettings;
+  private final UnaryCallSettings
+      synthesizeSpeechSettings;
+
+  /** Returns the object with the settings used for calls to listVoices. */
+  public UnaryCallSettings listVoicesSettings() {
+    return listVoicesSettings;
+  }
+
+  /** Returns the object with the settings used for calls to synthesizeSpeech. */
+  public UnaryCallSettings
+      synthesizeSpeechSettings() {
+    return synthesizeSpeechSettings;
+  }
+
+  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
+  public TextToSpeechStub createStub() throws IOException {
+    if (getTransportChannelProvider()
+        .getTransportName()
+        .equals(GrpcTransportChannel.getGrpcTransportName())) {
+      return GrpcTextToSpeechStub.create(this);
+    } else {
+      throw new UnsupportedOperationException(
+          "Transport not supported: " + getTransportChannelProvider().getTransportName());
+    }
+  }
+
+  /** Returns a builder for the default ExecutorProvider for this service. */
+  public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
+    return InstantiatingExecutorProvider.newBuilder();
+  }
+
+  /** Returns the default service endpoint. */
+  public static String getDefaultEndpoint() {
+    return "texttospeech.googleapis.com:443";
+  }
+
+  /** Returns the default service scopes. */
+  public static List getDefaultServiceScopes() {
+    return DEFAULT_SERVICE_SCOPES;
+  }
+
+  /** Returns a builder for the default credentials for this service. */
+  public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
+    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+  }
+
+  /** Returns a builder for the default ChannelProvider for this service. */
+  public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
+    return InstantiatingGrpcChannelProvider.newBuilder();
+  }
+
+  public static TransportChannelProvider defaultTransportChannelProvider() {
+    return defaultGrpcTransportProviderBuilder().build();
+  }
+
+  @BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
+  public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
+    return ApiClientHeaderProvider.newBuilder()
+        .setGeneratedLibToken(
+            "gapic", GaxProperties.getLibraryVersion(TextToSpeechStubSettings.class))
+        .setTransportToken(
+            GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder() {
+    return Builder.createDefault();
+  }
+
+  /** Returns a new builder for this class. */
+  public static Builder newBuilder(ClientContext clientContext) {
+    return new Builder(clientContext);
+  }
+
+  /** Returns a builder containing all the values of this settings class. */
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  protected TextToSpeechStubSettings(Builder settingsBuilder) throws IOException {
+    super(settingsBuilder);
+
+    listVoicesSettings = settingsBuilder.listVoicesSettings().build();
+    synthesizeSpeechSettings = settingsBuilder.synthesizeSpeechSettings().build();
+  }
+
+  /** Builder for TextToSpeechStubSettings. */
+  public static class Builder extends StubSettings.Builder {
+    private final ImmutableList> unaryMethodSettingsBuilders;
+
+    private final UnaryCallSettings.Builder
+        listVoicesSettings;
+    private final UnaryCallSettings.Builder
+        synthesizeSpeechSettings;
+
+    private static final ImmutableMap>
+        RETRYABLE_CODE_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder> definitions =
+          ImmutableMap.builder();
+      definitions.put(
+          "idempotent",
+          ImmutableSet.copyOf(
+              Lists.newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.newArrayList()));
+      RETRYABLE_CODE_DEFINITIONS = definitions.build();
+    }
+
+    private static final ImmutableMap RETRY_PARAM_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder definitions = ImmutableMap.builder();
+      RetrySettings settings = null;
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(20000L))
+              .setTotalTimeout(Duration.ofMillis(600000L))
+              .build();
+      definitions.put("default", settings);
+      RETRY_PARAM_DEFINITIONS = definitions.build();
+    }
+
+    protected Builder() {
+      this((ClientContext) null);
+    }
+
+    protected Builder(ClientContext clientContext) {
+      super(clientContext);
+
+      listVoicesSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      synthesizeSpeechSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      unaryMethodSettingsBuilders =
+          ImmutableList.>of(
+              listVoicesSettings, synthesizeSpeechSettings);
+
+      initDefaults(this);
+    }
+
+    private static Builder createDefault() {
+      Builder builder = new Builder((ClientContext) null);
+      builder.setTransportChannelProvider(defaultTransportChannelProvider());
+      builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
+      builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
+      builder.setEndpoint(getDefaultEndpoint());
+      return initDefaults(builder);
+    }
+
+    private static Builder initDefaults(Builder builder) {
+
+      builder
+          .listVoicesSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      builder
+          .synthesizeSpeechSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      return builder;
+    }
+
+    protected Builder(TextToSpeechStubSettings settings) {
+      super(settings);
+
+      listVoicesSettings = settings.listVoicesSettings.toBuilder();
+      synthesizeSpeechSettings = settings.synthesizeSpeechSettings.toBuilder();
+
+      unaryMethodSettingsBuilders =
+          ImmutableList.>of(
+              listVoicesSettings, synthesizeSpeechSettings);
+    }
+
+    // NEXT_MAJOR_VER: remove 'throws Exception'
+    /**
+     * Applies the given settings updater function to all of the unary API methods in this service.
+     *
+     * 
    Note: This method does not support applying settings to streaming methods.
+     */
+    public Builder applyToAllUnaryMethods(
+        ApiFunction, Void> settingsUpdater) throws Exception {
+      super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
+      return this;
+    }
+
+    public ImmutableList> unaryMethodSettingsBuilders() {
+      return unaryMethodSettingsBuilders;
+    }
+
+    /** Returns the builder for the settings used for calls to listVoices. */
+    public UnaryCallSettings.Builder listVoicesSettings() {
+      return listVoicesSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to synthesizeSpeech. */
+    public UnaryCallSettings.Builder
+        synthesizeSpeechSettings() {
+      return synthesizeSpeechSettings;
+    }
+
+    @Override
+    public TextToSpeechStubSettings build() throws IOException {
+      return new TextToSpeechStubSettings(this);
+    }
+  }
+}
diff --git a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeech.java b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeech.java
new file mode 100644
index 000000000000..6b311dc30c86
--- /dev/null
+++ b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeech.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.texttospeech.v1;
+
+import com.google.api.core.BetaApi;
+import com.google.api.gax.grpc.testing.MockGrpcService;
+import com.google.protobuf.GeneratedMessageV3;
+import io.grpc.ServerServiceDefinition;
+import java.util.List;
+
+@javax.annotation.Generated("by GAPIC")
+@BetaApi
+public class MockTextToSpeech implements MockGrpcService {
+  private final MockTextToSpeechImpl serviceImpl;
+
+  public MockTextToSpeech() {
+    serviceImpl = new MockTextToSpeechImpl();
+  }
+
+  @Override
+  public List getRequests() {
+    return serviceImpl.getRequests();
+  }
+
+  @Override
+  public void addResponse(GeneratedMessageV3 response) {
+    serviceImpl.addResponse(response);
+  }
+
+  @Override
+  public void addException(Exception exception) {
+    serviceImpl.addException(exception);
+  }
+
+  @Override
+  public ServerServiceDefinition getServiceDefinition() {
+    return serviceImpl.bindService();
+  }
+
+  @Override
+  public void reset() {
+    serviceImpl.reset();
+  }
+}
diff --git a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeechImpl.java b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeechImpl.java
new file mode 100644
index 000000000000..419597e9bdcb
--- /dev/null
+++ b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeechImpl.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.texttospeech.v1;
+
+import com.google.api.core.BetaApi;
+import com.google.cloud.texttospeech.v1.TextToSpeechGrpc.TextToSpeechImplBase;
+import com.google.protobuf.GeneratedMessageV3;
+import io.grpc.stub.StreamObserver;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+
+@javax.annotation.Generated("by GAPIC")
+@BetaApi
+public class MockTextToSpeechImpl extends TextToSpeechImplBase {
+  private ArrayList requests;
+  private Queue responses;
+
+  public MockTextToSpeechImpl() {
+    requests = new ArrayList<>();
+    responses = new LinkedList<>();
+  }
+
+  public List getRequests() {
+    return requests;
+  }
+
+  public void addResponse(GeneratedMessageV3 response) {
+    responses.add(response);
+  }
+
+  public void setResponses(List responses) {
+    this.responses = new LinkedList(responses);
+  }
+
+  public void addException(Exception exception) {
+    responses.add(exception);
+  }
+
+  public void reset() {
+    requests = new ArrayList<>();
+    responses = new LinkedList<>();
+  }
+
+  @Override
+  public void listVoices(
+      ListVoicesRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof ListVoicesResponse) {
+      requests.add(request);
+      responseObserver.onNext((ListVoicesResponse) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+
+  @Override
+  public void synthesizeSpeech(
+      SynthesizeSpeechRequest request, StreamObserver responseObserver) {
+    Object response = responses.remove();
+    if (response instanceof SynthesizeSpeechResponse) {
+      requests.add(request);
+      responseObserver.onNext((SynthesizeSpeechResponse) response);
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError((Exception) response);
+    } else {
+      responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
+    }
+  }
+}
diff --git a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/TextToSpeechClientTest.java b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/TextToSpeechClientTest.java
new file mode 100644
index 000000000000..6a133ee21e21
--- /dev/null
+++ b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/TextToSpeechClientTest.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+package com.google.cloud.texttospeech.v1;
+
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.grpc.GaxGrpcProperties;
+import com.google.api.gax.grpc.testing.LocalChannelProvider;
+import com.google.api.gax.grpc.testing.MockGrpcService;
+import com.google.api.gax.grpc.testing.MockServiceHelper;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.InvalidArgumentException;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.GeneratedMessageV3;
+import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+@javax.annotation.Generated("by GAPIC")
+public class TextToSpeechClientTest {
+  private static MockTextToSpeech mockTextToSpeech;
+  private static MockServiceHelper serviceHelper;
+  private TextToSpeechClient client;
+  private LocalChannelProvider channelProvider;
+
+  @BeforeClass
+  public static void startStaticServer() {
+    mockTextToSpeech = new MockTextToSpeech();
+    serviceHelper =
+        new MockServiceHelper("in-process-1", Arrays.asList(mockTextToSpeech));
+    serviceHelper.start();
+  }
+
+  @AfterClass
+  public static void stopServer() {
+    serviceHelper.stop();
+  }
+
+  @Before
+  public void setUp() throws IOException {
+    serviceHelper.reset();
+    channelProvider = serviceHelper.createChannelProvider();
+    TextToSpeechSettings settings =
+        TextToSpeechSettings.newBuilder()
+            .setTransportChannelProvider(channelProvider)
+            .setCredentialsProvider(NoCredentialsProvider.create())
+            .build();
+    client = TextToSpeechClient.create(settings);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    client.close();
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listVoicesTest() {
+    ListVoicesResponse expectedResponse = ListVoicesResponse.newBuilder().build();
+    mockTextToSpeech.addResponse(expectedResponse);
+
+    String languageCode = "languageCode-412800396";
+
+    ListVoicesResponse actualResponse = client.listVoices(languageCode);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockTextToSpeech.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    ListVoicesRequest actualRequest = (ListVoicesRequest) actualRequests.get(0);
+
+    Assert.assertEquals(languageCode, actualRequest.getLanguageCode());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void listVoicesExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockTextToSpeech.addException(exception);
+
+    try {
+      String languageCode = "languageCode-412800396";
+
+      client.listVoices(languageCode);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void synthesizeSpeechTest() {
+    ByteString audioContent = ByteString.copyFromUtf8("16");
+    SynthesizeSpeechResponse expectedResponse =
+        SynthesizeSpeechResponse.newBuilder().setAudioContent(audioContent).build();
+    mockTextToSpeech.addResponse(expectedResponse);
+
+    SynthesisInput input = SynthesisInput.newBuilder().build();
+    VoiceSelectionParams voice = VoiceSelectionParams.newBuilder().build();
+    AudioConfig audioConfig = AudioConfig.newBuilder().build();
+
+    SynthesizeSpeechResponse actualResponse = client.synthesizeSpeech(input, voice, audioConfig);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List actualRequests = mockTextToSpeech.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    SynthesizeSpeechRequest actualRequest = (SynthesizeSpeechRequest) actualRequests.get(0);
+
+    Assert.assertEquals(input, actualRequest.getInput());
+    Assert.assertEquals(voice, actualRequest.getVoice());
+    Assert.assertEquals(audioConfig, actualRequest.getAudioConfig());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void synthesizeSpeechExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockTextToSpeech.addException(exception);
+
+    try {
+      SynthesisInput input = SynthesisInput.newBuilder().build();
+      VoiceSelectionParams voice = VoiceSelectionParams.newBuilder().build();
+      AudioConfig audioConfig = AudioConfig.newBuilder().build();
+
+      client.synthesizeSpeech(input, voice, audioConfig);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+}
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 6450bf728591..baf14606a0b2 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -751,7 +751,7 @@
                   
                   
                     Stub packages
-                    com.google.cloud.bigquerydatatransfer.v1.stub:com.google.cloud.container.v1.stub:com.google.cloud.dlp.v2beta1.stub:com.google.cloud.dlp.v2.stub:com.google.cloud.dialogflow.v2beta1.stub:com.google.cloud.dialogflow.v2.stub:com.google.cloud.errorreporting.v1beta1.stub:com.google.cloud.firestore.v1beta1.stub:com.google.cloud.language.v1beta2.stub:com.google.cloud.language.v1.stub:com.google.cloud.logging.v2.stub:com.google.cloud.monitoring.v3.stub:com.google.cloud.pubsub.v1.stub:com.google.cloud.speech.v1beta1.stub:com.google.cloud.speech.v1.stub:com.google.cloud.texttospeech.v1beta1.stub:com.google.cloud.trace.v1.stub:com.google.cloud.trace.v2.stub:com.google.cloud.videointelligence.v1beta1.stub:com.google.cloud.videointelligence.v1beta2.stub:com.google.cloud.videointelligence.v1.stub:com.google.cloud.videointelligence.v1p1beta1.stub:com.google.cloud.vision.v1.stub:com.google.cloud.vision.v1p1beta1.stub:com.google.cloud.vision.v1p2beta1.stub
+                    com.google.cloud.bigquerydatatransfer.v1.stub:com.google.cloud.container.v1.stub:com.google.cloud.dlp.v2beta1.stub:com.google.cloud.dlp.v2.stub:com.google.cloud.dialogflow.v2beta1.stub:com.google.cloud.dialogflow.v2.stub:com.google.cloud.errorreporting.v1beta1.stub:com.google.cloud.firestore.v1beta1.stub:com.google.cloud.language.v1beta2.stub:com.google.cloud.language.v1.stub:com.google.cloud.logging.v2.stub:com.google.cloud.monitoring.v3.stub:com.google.cloud.pubsub.v1.stub:com.google.cloud.speech.v1beta1.stub:com.google.cloud.speech.v1.stub:com.google.cloud.texttospeech.v1beta1.stub:com.google.cloud.texttospeech.v1.stub:com.google.cloud.trace.v1.stub:com.google.cloud.trace.v2.stub:com.google.cloud.videointelligence.v1beta1.stub:com.google.cloud.videointelligence.v1beta2.stub:com.google.cloud.videointelligence.v1.stub:com.google.cloud.videointelligence.v1p1beta1.stub:com.google.cloud.vision.v1.stub:com.google.cloud.vision.v1p1beta1.stub:com.google.cloud.vision.v1p2beta1.stub
                   
                   
                     Deprecated packages

From fd6f29a7cea3d07d494b923fd8f35f436995db79 Mon Sep 17 00:00:00 2001
From: neozwu 
Date: Fri, 1 Jun 2018 10:55:00 -0700
Subject: [PATCH 64/65] fix example links (#3328)

---
 google-cloud-clients/google-cloud-bigquery/README.md   |  4 ++--
 google-cloud-clients/google-cloud-compute/README.md    |  8 ++++----
 google-cloud-clients/google-cloud-contrib/README.md    |  2 +-
 .../google-cloud-nio-examples/README.md                |  2 +-
 .../google-cloud-contrib/google-cloud-nio/README.md    |  6 +++---
 google-cloud-clients/google-cloud-datastore/README.md  |  6 +++---
 google-cloud-clients/google-cloud-dns/README.md        | 10 +++++-----
 google-cloud-clients/google-cloud-language/README.md   |  2 +-
 google-cloud-clients/google-cloud-logging/README.md    |  8 ++++----
 google-cloud-clients/google-cloud-pubsub/README.md     |  2 +-
 .../google-cloud-resourcemanager/README.md             |  8 ++++----
 google-cloud-clients/google-cloud-spanner/README.md    |  2 +-
 google-cloud-clients/google-cloud-speech/README.md     |  2 +-
 google-cloud-clients/google-cloud-storage/README.md    | 10 +++++-----
 google-cloud-clients/google-cloud-translate/README.md  |  4 ++--
 google-cloud-clients/google-cloud-vision/README.md     |  2 +-
 16 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/google-cloud-clients/google-cloud-bigquery/README.md b/google-cloud-clients/google-cloud-bigquery/README.md
index d2b3373937f7..f43d7d0f01b1 100644
--- a/google-cloud-clients/google-cloud-bigquery/README.md
+++ b/google-cloud-clients/google-cloud-bigquery/README.md
@@ -35,7 +35,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "1.31.0"
 
 Example Application
 -------------------
-- [`BigQueryExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java) - A simple command line interface providing some of Cloud BigQuery's functionality.
+- [`BigQueryExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java) - A simple command line interface providing some of Cloud BigQuery's functionality.
 Read more about using this application on the [`BigQueryExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/apidocs/?com/google/cloud/examples/bigquery/BigQueryExample.html).
 
 Authentication
@@ -188,7 +188,7 @@ for (FieldValueList row : bigquery.query(queryConfig).iterateAll()) {
 #### Complete source code
 
 In
-[InsertDataAndQueryTable.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java)
+[InsertDataAndQueryTable.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/bigquery/snippets/InsertDataAndQueryTable.java)
 we put together all the code shown above into one program. The program assumes that you are
 running on Compute Engine or from your own desktop. To run the example on App Engine, simply move
 the code from the main method to your application's servlet class and change the print statements to
diff --git a/google-cloud-clients/google-cloud-compute/README.md b/google-cloud-clients/google-cloud-compute/README.md
index 596035d0ee1c..bbaf3cf2270d 100644
--- a/google-cloud-clients/google-cloud-compute/README.md
+++ b/google-cloud-clients/google-cloud-compute/README.md
@@ -41,7 +41,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.49.0-alp
 Example Application
 -------------------
 
-[`ComputeExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java)
+[`ComputeExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java)
 is a simple command line interface that provides some of Google Cloud Compute Engine's
 functionality. Read more about using the application on the
 [`ComputeExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/apidocs/?com/google/cloud/examples/compute/ComputeExample.html).
@@ -211,7 +211,7 @@ if (operation.getErrors() == null) {
 #### Complete source code
 
 In
-[CreateAddressDiskAndInstance.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/compute/snippets/CreateAddressDiskAndInstance.java)
+[CreateAddressDiskAndInstance.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/compute/snippets/CreateAddressDiskAndInstance.java)
 we put together all the code shown above into one program. The program assumes that you are
 running on Compute Engine or from your own desktop. To run the example on App Engine, simply move
 the code from the main method to your application's servlet class and change the print statements to
@@ -221,9 +221,9 @@ display on your webpage.
 
 Other examples are available too:
 
-- [CreateSnapshot.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/compute/snippets/CreateSnapshot.java) shows
+- [CreateSnapshot.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/compute/snippets/CreateSnapshot.java) shows
 how to create a snapshot from an existing disk
-- [CreateInstance.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/compute/snippets/CreateInstance.java) shows
+- [CreateInstance.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/compute/snippets/CreateInstance.java) shows
 how to create a virtual machine instance (shorter sample than the one above)
 
 Troubleshooting
diff --git a/google-cloud-clients/google-cloud-contrib/README.md b/google-cloud-clients/google-cloud-contrib/README.md
index 6f646ea8f79c..2115302a6459 100644
--- a/google-cloud-clients/google-cloud-contrib/README.md
+++ b/google-cloud-clients/google-cloud-contrib/README.md
@@ -60,7 +60,7 @@ stable.
 See also
 --------
 
- * [google-cloud-examples](../google-cloud-examples) for an example of how to use NIO normally.
+ * [google-cloud-examples](../../google-cloud-examples) for an example of how to use NIO normally.
 
 Contributing
 ------------
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
index b7501615ee54..1fc63dbd6d78 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/README.md
@@ -6,7 +6,7 @@ application that uses Java NIO without the need to recompile.
 
 Note that whenever possible, you instead want to recompile the app and use the normal
 dependency mechanism to add a dependency to google-cloud-nio. You can see examples of
-this in the [google-cloud-examples](../../google-cloud-examples) project.
+this in the [google-cloud-examples](../../../google-cloud-examples) project.
 
 To run this example:
 
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md
index 4a9b4fc92ca4..b12a3f5fbe5b 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/README.md
@@ -44,10 +44,10 @@ libraryDependencies += "com.google.cloud" % "google-cloud-nio" % "0.49.0-alpha"
 Example Applications
 -------------------
 
-* [`Stat`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/nio/Stat.java)
+* [`Stat`](../../../google-cloud-examples/src/main/java/com/google/cloud/examples/nio/Stat.java)
 shows how to get started with NIO.
 
-* [`ParallelCountBytes`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/nio/ParallelCountBytes.java)
+* [`ParallelCountBytes`](../../../google-cloud-examples/src/main/java/com/google/cloud/examples/nio/ParallelCountBytes.java)
 efficiently downloads a file from Google Cloud Storage.
 
 * [`ListFileSystems`](../google-cloud-nio-examples/README.md) illustrates how
@@ -162,7 +162,7 @@ system implementation. You can disable this feature with
 
 #### Complete source code
 
-There are examples in [google-cloud-examples](../google-cloud-examples/src/main/java/com/google/cloud/examples/nio/)
+There are examples in [google-cloud-examples](../../google-cloud-examples/src/main/java/com/google/cloud/examples/nio/)
 for your perusal.
 
 Java Versions
diff --git a/google-cloud-clients/google-cloud-datastore/README.md b/google-cloud-clients/google-cloud-datastore/README.md
index 38a47726cd86..2a807d21de8f 100644
--- a/google-cloud-clients/google-cloud-datastore/README.md
+++ b/google-cloud-clients/google-cloud-datastore/README.md
@@ -36,7 +36,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "1.31.0"
 
 Example Applications
 --------------------
-- [`DatastoreExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore.  Read more about using the application on the [`DatastoreExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html).
+- [`DatastoreExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore.  Read more about using the application on the [`DatastoreExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/datastore/DatastoreExample.html).
 - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
   - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
 - [`Flexible Environment/Datastore example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/datastore) - A simple app that uses Cloud Datastore to list the last 10 IP addresses that visited your site.
@@ -164,12 +164,12 @@ if (entity != null) {
 ```
 
 The complete source code can be found at
-[UpdateEntity.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java).
+[UpdateEntity.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/UpdateEntity.java).
 
 #### Complete source code
 
 In
-[AddEntitiesAndRunQuery.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java)
+[AddEntitiesAndRunQuery.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/snippets/AddEntitiesAndRunQuery.java)
 we put together all the code to store data and run queries into one program. The program assumes that you are
 running on Compute Engine or from your own desktop. To run the example on App Engine, simply move
 the code from the main method to your application's servlet class and change the print statements to
diff --git a/google-cloud-clients/google-cloud-dns/README.md b/google-cloud-clients/google-cloud-dns/README.md
index 458e380cbe05..497d6870c7eb 100644
--- a/google-cloud-clients/google-cloud-dns/README.md
+++ b/google-cloud-clients/google-cloud-dns/README.md
@@ -40,7 +40,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-dns" % "0.49.0-alpha"
 Example Application
 -------------------
 
-[`DnsExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java)
+[`DnsExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java)
 is a simple command line interface that provides some of Google Cloud DNS's functionality.  Read
 more about using the application on the
 [`DnsExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/apidocs/?com/google/cloud/examples/dns/DnsExample.html).
@@ -330,11 +330,11 @@ if (result) {
 #### Complete Source Code
 
 We composed some of the aforementioned snippets into complete executable code samples. In
-[CreateZone.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateZone.java)
-we create a zone. In [CreateOrUpdateRecordSets.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java)
+[CreateZone.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateZone.java)
+we create a zone. In [CreateOrUpdateRecordSets.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/CreateOrUpdateRecordSets.java)
 we create a type A record set for a zone, or update an existing type A record set to a new IP address. We
-demonstrate how to delete a zone in [DeleteZone.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java).
-Finally, in [ManipulateZonesAndRecordSets.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java)
+demonstrate how to delete a zone in [DeleteZone.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/DeleteZone.java).
+Finally, in [ManipulateZonesAndRecordSets.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/dns/snippets/ManipulateZonesAndRecordSets.java)
 we assemble all the code snippets together and create zone, create or update a record set, list zones, list record sets, list changes, and
 delete a zone. The applications assume that they are running on Compute Engine or from your own desktop. To run any of these examples on App
 Engine, simply move the code from the main method to your application's servlet class and change the
diff --git a/google-cloud-clients/google-cloud-language/README.md b/google-cloud-clients/google-cloud-language/README.md
index 7b49f6f49d50..e71a0829c0b4 100644
--- a/google-cloud-clients/google-cloud-language/README.md
+++ b/google-cloud-clients/google-cloud-language/README.md
@@ -85,7 +85,7 @@ for (String text : texts) {
 
 #### Complete source code
 
-In [AnalyzeSentiment.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/language/snippets/AnalyzeSentiment.java) we put the code shown above into a complete program.
+In [AnalyzeSentiment.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/language/snippets/AnalyzeSentiment.java) we put the code shown above into a complete program.
 
 Troubleshooting
 ---------------
diff --git a/google-cloud-clients/google-cloud-logging/README.md b/google-cloud-clients/google-cloud-logging/README.md
index 9746927af2ec..a99d3742d5e1 100644
--- a/google-cloud-clients/google-cloud-logging/README.md
+++ b/google-cloud-clients/google-cloud-logging/README.md
@@ -36,7 +36,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "1.31.0"
 
 Example Application
 -------------------
-[`LoggingExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java)
+[`LoggingExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/logging/LoggingExample.java)
 is a simple command line interface that provides some of Stackdriver Logging's functionality. Read
 more about using the application on the
 [`LoggingExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/apidocs/?com/google/cloud/examples/logging/LoggingExample.html).
@@ -175,10 +175,10 @@ com.google.cloud.examples.logging.snippets.AddLoggingHandler.handlers=com.google
 #### Complete source code
 
 In
-[CreateAndListMetrics.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java),
-[WriteAndListLogEntries.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java)
+[CreateAndListMetrics.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/CreateAndListMetrics.java),
+[WriteAndListLogEntries.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/WriteAndListLogEntries.java)
 and
-[AddLoggingHandler.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/AddLoggingHandler.java)
+[AddLoggingHandler.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/AddLoggingHandler.java)
 we put together all the code shown above into three programs. The programs assume that you are
 running on Compute Engine or from your own desktop.
 
diff --git a/google-cloud-clients/google-cloud-pubsub/README.md b/google-cloud-clients/google-cloud-pubsub/README.md
index 5ce6b54473a2..64d6edb627ec 100644
--- a/google-cloud-clients/google-cloud-pubsub/README.md
+++ b/google-cloud-clients/google-cloud-pubsub/README.md
@@ -193,7 +193,7 @@ try {
 ```
 #### Complete source code
 
-In [CreateTopicAndPublishMessages.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java) and [CreateSubscriptionAndConsumeMessages.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java) we put together all the code shown above into two programs. The programs assume that you are running on Compute Engine, App Engine Flexible or from your own desktop.
+In [CreateTopicAndPublishMessages.java](../../../google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java) and [CreateSubscriptionAndConsumeMessages.java](../../../google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java) we put together all the code shown above into two programs. The programs assume that you are running on Compute Engine, App Engine Flexible or from your own desktop.
 
 Transport
 ---------
diff --git a/google-cloud-clients/google-cloud-resourcemanager/README.md b/google-cloud-clients/google-cloud-resourcemanager/README.md
index 09283fd079d6..ec2ea005d91b 100644
--- a/google-cloud-clients/google-cloud-resourcemanager/README.md
+++ b/google-cloud-clients/google-cloud-resourcemanager/README.md
@@ -39,7 +39,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-resourcemanager" % "0.
 
 Example Application
 --------------------
-[`ResourceManagerExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java) is a simple command line interface for the Cloud Resource Manager.  Read more about using the application on the [`ResourceManagerExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/apidocs/?com/google/cloud/examples/resourcemanager/ResourceManagerExample.html).
+[`ResourceManagerExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java) is a simple command line interface for the Cloud Resource Manager.  Read more about using the application on the [`ResourceManagerExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/apidocs/?com/google/cloud/examples/resourcemanager/ResourceManagerExample.html).
 
 Authentication
 --------------
@@ -203,15 +203,15 @@ We put together all the code shown above into three programs. The programs assum
 running from your own desktop and used the Google Cloud SDK to authenticate yourself.
 
 The first program creates a project if it does not exist. Complete source code can be found at
-[GetOrCreateProject.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/GetOrCreateProject.java).
+[GetOrCreateProject.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/GetOrCreateProject.java).
 
 The second program updates a project if it exists and lists all projects the user has permission to
 view. Complete source code can be found at
-[UpdateAndListProjects.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java).
+[UpdateAndListProjects.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java).
 
 The third program modifies the IAM policy associated with a project using the read-modify-write
 pattern.  Complete source code can be found at
-[ModifyPolicy.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/ModifyPolicy.java)
+[ModifyPolicy.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/ModifyPolicy.java)
 
 Transport
 ---------
diff --git a/google-cloud-clients/google-cloud-spanner/README.md b/google-cloud-clients/google-cloud-spanner/README.md
index b3a23e8f7ee5..2edabab290b0 100644
--- a/google-cloud-clients/google-cloud-spanner/README.md
+++ b/google-cloud-clients/google-cloud-spanner/README.md
@@ -101,7 +101,7 @@ try {
 
 #### Complete source code
 
-In [DatabaseSelect.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/spanner/snippets/DatabaseSelect.java) we put together all the code shown above in a single program.
+In [DatabaseSelect.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/spanner/snippets/DatabaseSelect.java) we put together all the code shown above in a single program.
 
 ## Troubleshooting
 
diff --git a/google-cloud-clients/google-cloud-speech/README.md b/google-cloud-clients/google-cloud-speech/README.md
index 621f40cd74ee..7c023891d6c5 100644
--- a/google-cloud-clients/google-cloud-speech/README.md
+++ b/google-cloud-clients/google-cloud-speech/README.md
@@ -89,7 +89,7 @@ Then add the following code to do the speech recognization:
 
 #### Complete source code
 
-In [RecognizeSpeech.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/speech/snippets/RecognizeSpeech.java) we put a quick start example, which shows how you can use Google Speech API to automatically recognize speech based on a local file.
+In [RecognizeSpeech.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/speech/snippets/RecognizeSpeech.java) we put a quick start example, which shows how you can use Google Speech API to automatically recognize speech based on a local file.
 
 For an example audio file, you can use the [audio.raw](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/speech/cloud-client/resources/audio.raw) file from the samples repository.
 Note, to play the file on Unix-like system you may use the following command: `play -t raw -r 16k -e signed -b 16 -c 1 audio.raw`
diff --git a/google-cloud-clients/google-cloud-storage/README.md b/google-cloud-clients/google-cloud-storage/README.md
index 93e6b6e53ca6..faf5890a181b 100644
--- a/google-cloud-clients/google-cloud-storage/README.md
+++ b/google-cloud-clients/google-cloud-storage/README.md
@@ -37,7 +37,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.31.0"
 Example Applications
 -------------------
 
-- [`StorageExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java) is a simple command line interface that provides some of Cloud Storage's functionality.  Read more about using the application on the [`StorageExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/storage/StorageExample.html).
+- [`StorageExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java) is a simple command line interface that provides some of Cloud Storage's functionality.  Read more about using the application on the [`StorageExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/?com/google/cloud/examples/storage/StorageExample.html).
 - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
   - This app uses `google-cloud` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
 - [`Flexible Environment/Storage example`](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/cloudstorage) - An app that uploads files to a public Cloud Storage bucket on the App Engine Flexible Environment runtime.
@@ -110,7 +110,7 @@ Blob blob = storage.create(blobInfo, "a simple blob".getBytes(UTF_8));
 ```
 
 A complete example for creating a blob can be found at
-[CreateBlob.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateBlob.java).
+[CreateBlob.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateBlob.java).
 
 At this point, you will be able to see your newly created bucket and blob on the Google Developers Console.
 
@@ -124,7 +124,7 @@ String contentString = new String(content, UTF_8);
 ```
 
 A complete example for accessing blobs can be found at
-[CreateBlob.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateBlob.java).
+[CreateBlob.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateBlob.java).
 
 #### Updating data
 Another thing we may want to do is update a blob. The following snippet shows how to update a Storage blob if it exists. 
@@ -142,7 +142,7 @@ if (blob != null) {
 ```
 
 The complete source code can be found at
-[UpdateBlob.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/UpdateBlob.java).
+[UpdateBlob.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/UpdateBlob.java).
 
 #### Listing buckets and contents of buckets
 Suppose that you've added more buckets and blobs, and now you want to see the names of your buckets and the contents of each one. Add the following code to list all your buckets and all the blobs inside each bucket.
@@ -164,7 +164,7 @@ for (Bucket bucket : storage.list().iterateAll()) {
 #### Complete source code
 
 In
-[CreateAndListBucketsAndBlobs.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java)
+[CreateAndListBucketsAndBlobs.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/CreateAndListBucketsAndBlobs.java)
 we put together examples creating and listing buckets and blobs into one program. The program assumes that you are
 running on Compute Engine or from your own desktop. To run the example on App Engine, simply move
 the code from the main method to your application's servlet class and change the print statements to
diff --git a/google-cloud-clients/google-cloud-translate/README.md b/google-cloud-clients/google-cloud-translate/README.md
index 2efcb08b7802..fba5ca901208 100644
--- a/google-cloud-clients/google-cloud-translate/README.md
+++ b/google-cloud-clients/google-cloud-translate/README.md
@@ -37,7 +37,7 @@ libraryDependencies += "com.google.cloud" % "google-cloud-translate" % "1.31.0"
 Example Application
 -------------------
 
-[`TranslateExample`](../google-cloud-examples/src/main/java/com/google/cloud/examples/translate/TranslateExample.java) is a simple command line interface that provides some of Google Translation's functionality.  Read more about using the application on the [`TranslateExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/apidocs/?com/google/cloud/examples/translate/TranslateExample.html).
+[`TranslateExample`](../../google-cloud-examples/src/main/java/com/google/cloud/examples/translate/TranslateExample.java) is a simple command line interface that provides some of Google Translation's functionality.  Read more about using the application on the [`TranslateExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/apidocs/?com/google/cloud/examples/translate/TranslateExample.html).
 
 Authentication
 --------------
@@ -147,7 +147,7 @@ Translation translation = translate.translate(
 #### Complete source code
 
 In
-[DetectLanguageAndTranslate.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/translate/snippets/DetectLanguageAndTranslate.java)
+[DetectLanguageAndTranslate.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/translate/snippets/DetectLanguageAndTranslate.java)
 we put together all the code shown above into one program. The program assumes that either Application
 Default Credentials or a valid API key are available.
 
diff --git a/google-cloud-clients/google-cloud-vision/README.md b/google-cloud-clients/google-cloud-vision/README.md
index ba13d20d85e8..a028f3304504 100644
--- a/google-cloud-clients/google-cloud-vision/README.md
+++ b/google-cloud-clients/google-cloud-vision/README.md
@@ -56,7 +56,7 @@ You'll need to obtain the `google-cloud-vision` library.  See the [Quickstart](#
 
 #### Complete working example
 
-In [AnnotateImage.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/vision/snippets/AnnotateImage.java) we put a quick start example, which shows how you can use the Google Vision API to automatically annotate an image (like "cat", "whiskers", "mammal" for a picture of a cat).
+In [AnnotateImage.java](../../google-cloud-examples/src/main/java/com/google/cloud/examples/vision/snippets/AnnotateImage.java) we put a quick start example, which shows how you can use the Google Vision API to automatically annotate an image (like "cat", "whiskers", "mammal" for a picture of a cat).
 
 For an example picture file, you can use the [wakeupcat.jpg](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/vision/cloud-client/resources/wakeupcat.jpg) image from the samples repository.
 

From a02ff76245067fb508d2bb10528bf25d03040c52 Mon Sep 17 00:00:00 2001
From: Andrea Lin 
Date: Fri, 1 Jun 2018 13:15:13 -0700
Subject: [PATCH 65/65] Update gax-java, api-common dependecies to latest
 (#3335)

* update gax deps to latest

* remove ResourceNameType, update api-common to 1.6, update jsr to 3.0.2

* regenerate grpc/proto packages using new protoc-gapic-p:
---
 google-api-grpc/pom.xml                       |   2 +-
 .../v1/CheckValidCredsRequest.java            |   5 +-
 .../v1/CheckValidCredsResponse.java           |   5 +-
 .../v1/CreateTransferConfigRequest.java       |   5 +-
 .../bigquery/datatransfer/v1/DataSource.java  |   5 +-
 .../datatransfer/v1/DataSourceParameter.java  |   5 +-
 .../datatransfer/v1/DataTransferProto.java    |  38 ++---
 .../v1/DeleteTransferConfigRequest.java       |   5 +-
 .../v1/DeleteTransferRunRequest.java          |   5 +-
 .../datatransfer/v1/GetDataSourceRequest.java |   5 +-
 .../v1/GetTransferConfigRequest.java          |   5 +-
 .../v1/GetTransferRunRequest.java             |   5 +-
 .../v1/ListDataSourcesRequest.java            |   5 +-
 .../v1/ListDataSourcesResponse.java           |   5 +-
 .../v1/ListTransferConfigsRequest.java        |   5 +-
 .../v1/ListTransferConfigsResponse.java       |   5 +-
 .../v1/ListTransferLogsRequest.java           |   5 +-
 .../v1/ListTransferLogsResponse.java          |   5 +-
 .../v1/ListTransferRunsRequest.java           |   5 +-
 .../v1/ListTransferRunsResponse.java          |   5 +-
 .../v1/LocationDataSourceName.java            |   9 --
 .../datatransfer/v1/LocationName.java         |   9 --
 .../datatransfer/v1/LocationRunName.java      |   9 --
 .../v1/LocationTransferConfigName.java        |   9 --
 .../v1/ProjectDataSourceName.java             |   9 --
 .../bigquery/datatransfer/v1/ProjectName.java |   9 --
 .../datatransfer/v1/ProjectRunName.java       |   9 --
 .../v1/ProjectTransferConfigName.java         |   9 --
 .../v1/ScheduleTransferRunsRequest.java       |   5 +-
 .../v1/ScheduleTransferRunsResponse.java      |   5 +-
 .../datatransfer/v1/TransferConfig.java       |   5 +-
 .../datatransfer/v1/TransferMessage.java      |   5 +-
 .../datatransfer/v1/TransferProto.java        |   8 +-
 .../bigquery/datatransfer/v1/TransferRun.java |   5 +-
 .../v1/UntypedDataSourceName.java             |   9 --
 .../datatransfer/v1/UntypedParentName.java    |   9 --
 .../datatransfer/v1/UntypedRunName.java       |   9 --
 .../v1/UntypedTransferConfigName.java         |   9 --
 .../v1/UpdateTransferConfigRequest.java       |   5 +-
 .../google/bigtable/admin/v2/AppProfile.java  |  15 +-
 .../bigtable/admin/v2/AppProfileName.java     |   9 --
 .../admin/v2/BigtableInstanceAdminProto.java  |  30 ++--
 .../admin/v2/BigtableTableAdminProto.java     |  22 +--
 .../admin/v2/CheckConsistencyRequest.java     |   5 +-
 .../admin/v2/CheckConsistencyResponse.java    |   5 +-
 .../com/google/bigtable/admin/v2/Cluster.java |   5 +-
 .../google/bigtable/admin/v2/ClusterName.java |   9 --
 .../bigtable/admin/v2/ColumnFamily.java       |   5 +-
 .../admin/v2/CreateAppProfileRequest.java     |   5 +-
 .../admin/v2/CreateClusterMetadata.java       |   5 +-
 .../admin/v2/CreateClusterRequest.java        |   5 +-
 .../admin/v2/CreateInstanceMetadata.java      |   5 +-
 .../admin/v2/CreateInstanceRequest.java       |   5 +-
 .../v2/CreateTableFromSnapshotMetadata.java   |   5 +-
 .../v2/CreateTableFromSnapshotRequest.java    |   5 +-
 .../bigtable/admin/v2/CreateTableRequest.java |  10 +-
 .../admin/v2/DeleteAppProfileRequest.java     |   5 +-
 .../admin/v2/DeleteClusterRequest.java        |   5 +-
 .../admin/v2/DeleteInstanceRequest.java       |   5 +-
 .../admin/v2/DeleteSnapshotRequest.java       |   5 +-
 .../bigtable/admin/v2/DeleteTableRequest.java |   5 +-
 .../admin/v2/DropRowRangeRequest.java         |   5 +-
 .../com/google/bigtable/admin/v2/GcRule.java  |  15 +-
 .../v2/GenerateConsistencyTokenRequest.java   |   5 +-
 .../v2/GenerateConsistencyTokenResponse.java  |   5 +-
 .../admin/v2/GetAppProfileRequest.java        |   5 +-
 .../bigtable/admin/v2/GetClusterRequest.java  |   5 +-
 .../bigtable/admin/v2/GetInstanceRequest.java |   5 +-
 .../bigtable/admin/v2/GetSnapshotRequest.java |   5 +-
 .../bigtable/admin/v2/GetTableRequest.java    |   5 +-
 .../google/bigtable/admin/v2/Instance.java    |   5 +-
 .../bigtable/admin/v2/InstanceName.java       |   9 --
 .../bigtable/admin/v2/InstanceProto.java      |   6 +-
 .../admin/v2/ListAppProfilesRequest.java      |   5 +-
 .../admin/v2/ListAppProfilesResponse.java     |   5 +-
 .../admin/v2/ListClustersRequest.java         |   5 +-
 .../admin/v2/ListClustersResponse.java        |   5 +-
 .../admin/v2/ListInstancesRequest.java        |   5 +-
 .../admin/v2/ListInstancesResponse.java       |   5 +-
 .../admin/v2/ListSnapshotsRequest.java        |   5 +-
 .../admin/v2/ListSnapshotsResponse.java       |   5 +-
 .../bigtable/admin/v2/ListTablesRequest.java  |   5 +-
 .../bigtable/admin/v2/ListTablesResponse.java |   5 +-
 .../bigtable/admin/v2/LocationName.java       |   9 --
 .../admin/v2/ModifyColumnFamiliesRequest.java |  10 +-
 .../v2/PartialUpdateInstanceRequest.java      |   5 +-
 .../google/bigtable/admin/v2/ProjectName.java |   9 --
 .../google/bigtable/admin/v2/Snapshot.java    |   5 +-
 .../bigtable/admin/v2/SnapshotName.java       |   9 --
 .../admin/v2/SnapshotTableMetadata.java       |   5 +-
 .../admin/v2/SnapshotTableRequest.java        |   5 +-
 .../com/google/bigtable/admin/v2/Table.java   |  10 +-
 .../google/bigtable/admin/v2/TableName.java   |   9 --
 .../google/bigtable/admin/v2/TableProto.java  |   8 +-
 .../admin/v2/UpdateAppProfileMetadata.java    |   5 +-
 .../admin/v2/UpdateAppProfileRequest.java     |   5 +-
 .../admin/v2/UpdateClusterMetadata.java       |   5 +-
 .../admin/v2/UpdateInstanceMetadata.java      |   5 +-
 .../com/google/bigtable/v2/BigtableProto.java |  14 +-
 .../java/com/google/bigtable/v2/Cell.java     |   5 +-
 .../bigtable/v2/CheckAndMutateRowRequest.java |   5 +-
 .../v2/CheckAndMutateRowResponse.java         |   5 +-
 .../java/com/google/bigtable/v2/Column.java   |   5 +-
 .../com/google/bigtable/v2/ColumnRange.java   |   5 +-
 .../com/google/bigtable/v2/DataProto.java     |  14 +-
 .../java/com/google/bigtable/v2/Family.java   |   5 +-
 .../google/bigtable/v2/MutateRowRequest.java  |   5 +-
 .../google/bigtable/v2/MutateRowResponse.java |   5 +-
 .../google/bigtable/v2/MutateRowsRequest.java |  10 +-
 .../bigtable/v2/MutateRowsResponse.java       |  10 +-
 .../java/com/google/bigtable/v2/Mutation.java |  25 +---
 .../v2/ReadModifyWriteRowRequest.java         |   5 +-
 .../v2/ReadModifyWriteRowResponse.java        |   5 +-
 .../bigtable/v2/ReadModifyWriteRule.java      |   5 +-
 .../google/bigtable/v2/ReadRowsRequest.java   |   5 +-
 .../google/bigtable/v2/ReadRowsResponse.java  |  10 +-
 .../main/java/com/google/bigtable/v2/Row.java |   5 +-
 .../com/google/bigtable/v2/RowFilter.java     |  20 +--
 .../java/com/google/bigtable/v2/RowRange.java |   5 +-
 .../java/com/google/bigtable/v2/RowSet.java   |   5 +-
 .../bigtable/v2/SampleRowKeysRequest.java     |   5 +-
 .../bigtable/v2/SampleRowKeysResponse.java    |   5 +-
 .../com/google/bigtable/v2/TableName.java     |   9 --
 .../google/bigtable/v2/TimestampRange.java    |   5 +-
 .../com/google/bigtable/v2/ValueRange.java    |   5 +-
 .../container/v1/AcceleratorConfig.java       |   5 +-
 .../com/google/container/v1/AddonsConfig.java |   5 +-
 .../container/v1/AutoUpgradeOptions.java      |   5 +-
 .../container/v1/CancelOperationRequest.java  |   5 +-
 .../container/v1/ClientCertificateConfig.java |   5 +-
 .../java/com/google/container/v1/Cluster.java |   5 +-
 .../container/v1/ClusterServiceProto.java     |  76 +++++-----
 .../google/container/v1/ClusterUpdate.java    |   5 +-
 .../v1/CompleteIPRotationRequest.java         |   5 +-
 .../container/v1/CreateClusterRequest.java    |   5 +-
 .../container/v1/CreateNodePoolRequest.java   |   5 +-
 .../container/v1/DailyMaintenanceWindow.java  |   5 +-
 .../container/v1/DeleteClusterRequest.java    |   5 +-
 .../container/v1/DeleteNodePoolRequest.java   |   5 +-
 .../container/v1/GetClusterRequest.java       |   5 +-
 .../container/v1/GetNodePoolRequest.java      |   5 +-
 .../container/v1/GetOperationRequest.java     |   5 +-
 .../container/v1/GetServerConfigRequest.java  |   5 +-
 .../v1/HorizontalPodAutoscaling.java          |   5 +-
 .../container/v1/HttpLoadBalancing.java       |   5 +-
 .../container/v1/IPAllocationPolicy.java      |   5 +-
 .../container/v1/KubernetesDashboard.java     |   5 +-
 .../com/google/container/v1/LegacyAbac.java   |   5 +-
 .../container/v1/ListClustersRequest.java     |   5 +-
 .../container/v1/ListClustersResponse.java    |   5 +-
 .../container/v1/ListNodePoolsRequest.java    |   5 +-
 .../container/v1/ListNodePoolsResponse.java   |   5 +-
 .../container/v1/ListOperationsRequest.java   |   5 +-
 .../container/v1/ListOperationsResponse.java  |   5 +-
 .../container/v1/MaintenancePolicy.java       |   5 +-
 .../container/v1/MaintenanceWindow.java       |   5 +-
 .../com/google/container/v1/MasterAuth.java   |   5 +-
 .../v1/MasterAuthorizedNetworksConfig.java    |  10 +-
 .../google/container/v1/NetworkPolicy.java    |   5 +-
 .../container/v1/NetworkPolicyConfig.java     |   5 +-
 .../com/google/container/v1/NodeConfig.java   |   5 +-
 .../google/container/v1/NodeManagement.java   |   5 +-
 .../com/google/container/v1/NodePool.java     |   5 +-
 .../container/v1/NodePoolAutoscaling.java     |   5 +-
 .../com/google/container/v1/Operation.java    |   5 +-
 .../v1/RollbackNodePoolUpgradeRequest.java    |   5 +-
 .../com/google/container/v1/ServerConfig.java |   5 +-
 .../container/v1/SetAddonsConfigRequest.java  |   5 +-
 .../google/container/v1/SetLabelsRequest.java |   5 +-
 .../container/v1/SetLegacyAbacRequest.java    |   5 +-
 .../container/v1/SetLocationsRequest.java     |   5 +-
 .../v1/SetLoggingServiceRequest.java          |   5 +-
 .../v1/SetMaintenancePolicyRequest.java       |   5 +-
 .../container/v1/SetMasterAuthRequest.java    |   5 +-
 .../v1/SetMonitoringServiceRequest.java       |   5 +-
 .../container/v1/SetNetworkPolicyRequest.java |   5 +-
 .../v1/SetNodePoolAutoscalingRequest.java     |   5 +-
 .../v1/SetNodePoolManagementRequest.java      |   5 +-
 .../container/v1/SetNodePoolSizeRequest.java  |   5 +-
 .../container/v1/StartIPRotationRequest.java  |   5 +-
 .../container/v1/UpdateClusterRequest.java    |   5 +-
 .../container/v1/UpdateMasterRequest.java     |   5 +-
 .../container/v1/UpdateNodePoolRequest.java   |   5 +-
 .../cloud/dataproc/v1/AcceleratorConfig.java  |   5 +-
 .../cloud/dataproc/v1/CancelJobRequest.java   |   5 +-
 .../com/google/cloud/dataproc/v1/Cluster.java |   5 +-
 .../cloud/dataproc/v1/ClusterConfig.java      |   5 +-
 .../cloud/dataproc/v1/ClusterMetrics.java     |   5 +-
 .../dataproc/v1/ClusterOperationMetadata.java |   5 +-
 .../dataproc/v1/ClusterOperationStatus.java   |   5 +-
 .../cloud/dataproc/v1/ClusterStatus.java      |   5 +-
 .../cloud/dataproc/v1/ClustersProto.java      |  24 ++--
 .../dataproc/v1/CreateClusterRequest.java     |   5 +-
 .../dataproc/v1/DeleteClusterRequest.java     |   5 +-
 .../cloud/dataproc/v1/DeleteJobRequest.java   |   5 +-
 .../dataproc/v1/DiagnoseClusterRequest.java   |   5 +-
 .../dataproc/v1/DiagnoseClusterResults.java   |   5 +-
 .../google/cloud/dataproc/v1/DiskConfig.java  |   5 +-
 .../cloud/dataproc/v1/GceClusterConfig.java   |   5 +-
 .../cloud/dataproc/v1/GetClusterRequest.java  |   5 +-
 .../cloud/dataproc/v1/GetJobRequest.java      |   5 +-
 .../google/cloud/dataproc/v1/HadoopJob.java   |   5 +-
 .../com/google/cloud/dataproc/v1/HiveJob.java |   5 +-
 .../dataproc/v1/InstanceGroupConfig.java      |   5 +-
 .../com/google/cloud/dataproc/v1/Job.java     |   5 +-
 .../cloud/dataproc/v1/JobPlacement.java       |   5 +-
 .../cloud/dataproc/v1/JobReference.java       |   5 +-
 .../cloud/dataproc/v1/JobScheduling.java      |   5 +-
 .../google/cloud/dataproc/v1/JobStatus.java   |   5 +-
 .../google/cloud/dataproc/v1/JobsProto.java   |  32 ++---
 .../dataproc/v1/ListClustersRequest.java      |   5 +-
 .../dataproc/v1/ListClustersResponse.java     |   5 +-
 .../cloud/dataproc/v1/ListJobsRequest.java    |   5 +-
 .../cloud/dataproc/v1/ListJobsResponse.java   |   5 +-
 .../cloud/dataproc/v1/LoggingConfig.java      |   5 +-
 .../cloud/dataproc/v1/ManagedGroupConfig.java |   5 +-
 .../dataproc/v1/NodeInitializationAction.java |   5 +-
 .../cloud/dataproc/v1/OperationsProto.java    |   4 +-
 .../com/google/cloud/dataproc/v1/PigJob.java  |   5 +-
 .../google/cloud/dataproc/v1/PySparkJob.java  |   5 +-
 .../google/cloud/dataproc/v1/QueryList.java   |   5 +-
 .../cloud/dataproc/v1/SoftwareConfig.java     |   5 +-
 .../google/cloud/dataproc/v1/SparkJob.java    |   5 +-
 .../google/cloud/dataproc/v1/SparkSqlJob.java |   5 +-
 .../cloud/dataproc/v1/SubmitJobRequest.java   |   5 +-
 .../dataproc/v1/UpdateClusterRequest.java     |   5 +-
 .../cloud/dataproc/v1/UpdateJobRequest.java   |   5 +-
 .../cloud/dataproc/v1/YarnApplication.java    |   5 +-
 .../datastore/v1/AllocateIdsRequest.java      |   5 +-
 .../datastore/v1/AllocateIdsResponse.java     |   5 +-
 .../com/google/datastore/v1/ArrayValue.java   |   5 +-
 .../datastore/v1/BeginTransactionRequest.java |   5 +-
 .../v1/BeginTransactionResponse.java          |   5 +-
 .../google/datastore/v1/CommitRequest.java    |   5 +-
 .../google/datastore/v1/CommitResponse.java   |   5 +-
 .../google/datastore/v1/CompositeFilter.java  |   5 +-
 .../google/datastore/v1/DatastoreProto.java   |  18 +--
 .../java/com/google/datastore/v1/Entity.java  |   5 +-
 .../com/google/datastore/v1/EntityProto.java  |   6 +-
 .../com/google/datastore/v1/EntityResult.java |   5 +-
 .../java/com/google/datastore/v1/Filter.java  |   5 +-
 .../com/google/datastore/v1/GqlQuery.java     |   5 +-
 .../datastore/v1/GqlQueryParameter.java       |   5 +-
 .../java/com/google/datastore/v1/Key.java     |  10 +-
 .../google/datastore/v1/KindExpression.java   |   5 +-
 .../google/datastore/v1/LookupRequest.java    |   5 +-
 .../google/datastore/v1/LookupResponse.java   |   5 +-
 .../com/google/datastore/v1/Mutation.java     |   5 +-
 .../google/datastore/v1/MutationResult.java   |   5 +-
 .../com/google/datastore/v1/PartitionId.java  |   5 +-
 .../com/google/datastore/v1/Projection.java   |   5 +-
 .../google/datastore/v1/PropertyFilter.java   |   5 +-
 .../google/datastore/v1/PropertyOrder.java    |   5 +-
 .../datastore/v1/PropertyReference.java       |   5 +-
 .../java/com/google/datastore/v1/Query.java   |   5 +-
 .../com/google/datastore/v1/QueryProto.java   |  12 +-
 .../google/datastore/v1/QueryResultBatch.java |   5 +-
 .../com/google/datastore/v1/ReadOptions.java  |   5 +-
 .../datastore/v1/ReserveIdsRequest.java       |   5 +-
 .../datastore/v1/ReserveIdsResponse.java      |   5 +-
 .../google/datastore/v1/RollbackRequest.java  |   5 +-
 .../google/datastore/v1/RollbackResponse.java |   5 +-
 .../google/datastore/v1/RunQueryRequest.java  |   5 +-
 .../google/datastore/v1/RunQueryResponse.java |   5 +-
 .../datastore/v1/TransactionOptions.java      |  15 +-
 .../java/com/google/datastore/v1/Value.java   |   5 +-
 .../com/google/cloud/dialogflow/v2/Agent.java |   5 +-
 .../google/cloud/dialogflow/v2/AgentName.java |   9 --
 .../cloud/dialogflow/v2/AgentProto.java       |  10 +-
 .../v2/BatchCreateEntitiesRequest.java        |   5 +-
 .../v2/BatchDeleteEntitiesRequest.java        |   5 +-
 .../v2/BatchDeleteEntityTypesRequest.java     |   5 +-
 .../v2/BatchDeleteIntentsRequest.java         |   5 +-
 .../v2/BatchUpdateEntitiesRequest.java        |   5 +-
 .../v2/BatchUpdateEntityTypesRequest.java     |   5 +-
 .../v2/BatchUpdateEntityTypesResponse.java    |   5 +-
 .../v2/BatchUpdateIntentsRequest.java         |   5 +-
 .../v2/BatchUpdateIntentsResponse.java        |   5 +-
 .../google/cloud/dialogflow/v2/Context.java   |   5 +-
 .../cloud/dialogflow/v2/ContextName.java      |   9 --
 .../cloud/dialogflow/v2/ContextProto.java     |   8 +-
 .../dialogflow/v2/CreateContextRequest.java   |   5 +-
 .../v2/CreateEntityTypeRequest.java           |   5 +-
 .../dialogflow/v2/CreateIntentRequest.java    |   5 +-
 .../v2/CreateSessionEntityTypeRequest.java    |   5 +-
 .../v2/DeleteAllContextsRequest.java          |   5 +-
 .../dialogflow/v2/DeleteContextRequest.java   |   5 +-
 .../v2/DeleteEntityTypeRequest.java           |   5 +-
 .../dialogflow/v2/DeleteIntentRequest.java    |   5 +-
 .../v2/DeleteSessionEntityTypeRequest.java    |   5 +-
 .../dialogflow/v2/DetectIntentRequest.java    |   5 +-
 .../dialogflow/v2/DetectIntentResponse.java   |   5 +-
 .../cloud/dialogflow/v2/EntityType.java       |  10 +-
 .../cloud/dialogflow/v2/EntityTypeBatch.java  |   5 +-
 .../cloud/dialogflow/v2/EntityTypeName.java   |   9 --
 .../cloud/dialogflow/v2/EntityTypeProto.java  |  20 +--
 .../cloud/dialogflow/v2/EventInput.java       |   5 +-
 .../dialogflow/v2/ExportAgentRequest.java     |   5 +-
 .../dialogflow/v2/ExportAgentResponse.java    |   5 +-
 .../cloud/dialogflow/v2/GetAgentRequest.java  |   5 +-
 .../dialogflow/v2/GetContextRequest.java      |   5 +-
 .../dialogflow/v2/GetEntityTypeRequest.java   |   5 +-
 .../cloud/dialogflow/v2/GetIntentRequest.java |   5 +-
 .../v2/GetSessionEntityTypeRequest.java       |   5 +-
 .../dialogflow/v2/ImportAgentRequest.java     |   5 +-
 .../cloud/dialogflow/v2/InputAudioConfig.java |   5 +-
 .../google/cloud/dialogflow/v2/Intent.java    | 120 ++++------------
 .../cloud/dialogflow/v2/IntentBatch.java      |   5 +-
 .../cloud/dialogflow/v2/IntentName.java       |   9 --
 .../cloud/dialogflow/v2/IntentProto.java      |  34 ++---
 .../dialogflow/v2/ListContextsRequest.java    |   5 +-
 .../dialogflow/v2/ListContextsResponse.java   |   5 +-
 .../dialogflow/v2/ListEntityTypesRequest.java |   5 +-
 .../v2/ListEntityTypesResponse.java           |   5 +-
 .../dialogflow/v2/ListIntentsRequest.java     |   5 +-
 .../dialogflow/v2/ListIntentsResponse.java    |   5 +-
 .../v2/ListSessionEntityTypesRequest.java     |   5 +-
 .../v2/ListSessionEntityTypesResponse.java    |   5 +-
 .../v2/OriginalDetectIntentRequest.java       |   5 +-
 .../cloud/dialogflow/v2/ProjectAgentName.java |   9 --
 .../cloud/dialogflow/v2/ProjectName.java      |   9 --
 .../cloud/dialogflow/v2/QueryInput.java       |   5 +-
 .../cloud/dialogflow/v2/QueryParameters.java  |   5 +-
 .../cloud/dialogflow/v2/QueryResult.java      |   5 +-
 .../dialogflow/v2/RestoreAgentRequest.java    |   5 +-
 .../dialogflow/v2/SearchAgentsRequest.java    |   5 +-
 .../dialogflow/v2/SearchAgentsResponse.java   |   5 +-
 .../dialogflow/v2/SessionEntityType.java      |   5 +-
 .../dialogflow/v2/SessionEntityTypeName.java  |   9 --
 .../dialogflow/v2/SessionEntityTypeProto.java |  10 +-
 .../cloud/dialogflow/v2/SessionName.java      |   9 --
 .../cloud/dialogflow/v2/SessionProto.java     |  16 +--
 .../v2/StreamingDetectIntentRequest.java      |   5 +-
 .../v2/StreamingDetectIntentResponse.java     |   5 +-
 .../v2/StreamingRecognitionResult.java        |   5 +-
 .../google/cloud/dialogflow/v2/TextInput.java |   5 +-
 .../dialogflow/v2/TrainAgentRequest.java      |   5 +-
 .../dialogflow/v2/UpdateContextRequest.java   |   5 +-
 .../v2/UpdateEntityTypeRequest.java           |   5 +-
 .../dialogflow/v2/UpdateIntentRequest.java    |   5 +-
 .../v2/UpdateSessionEntityTypeRequest.java    |   5 +-
 .../cloud/dialogflow/v2/WebhookProto.java     |   4 +-
 .../cloud/dialogflow/v2/WebhookRequest.java   |   5 +-
 .../cloud/dialogflow/v2/WebhookResponse.java  |   5 +-
 .../cloud/dialogflow/v2beta1/Agent.java       |   5 +-
 .../cloud/dialogflow/v2beta1/AgentName.java   |   9 --
 .../cloud/dialogflow/v2beta1/AgentProto.java  |  10 +-
 .../v2beta1/BatchCreateEntitiesRequest.java   |   5 +-
 .../v2beta1/BatchDeleteEntitiesRequest.java   |   5 +-
 .../BatchDeleteEntityTypesRequest.java        |   5 +-
 .../v2beta1/BatchDeleteIntentsRequest.java    |   5 +-
 .../v2beta1/BatchUpdateEntitiesRequest.java   |   5 +-
 .../BatchUpdateEntityTypesRequest.java        |   5 +-
 .../BatchUpdateEntityTypesResponse.java       |   5 +-
 .../v2beta1/BatchUpdateIntentsRequest.java    |   5 +-
 .../v2beta1/BatchUpdateIntentsResponse.java   |   5 +-
 .../cloud/dialogflow/v2beta1/Context.java     |   5 +-
 .../cloud/dialogflow/v2beta1/ContextName.java |   9 --
 .../dialogflow/v2beta1/ContextProto.java      |  12 +-
 .../v2beta1/CreateContextRequest.java         |   5 +-
 .../v2beta1/CreateEntityTypeRequest.java      |   5 +-
 .../v2beta1/CreateIntentRequest.java          |   5 +-
 .../CreateSessionEntityTypeRequest.java       |   5 +-
 .../v2beta1/DeleteAllContextsRequest.java     |   5 +-
 .../v2beta1/DeleteContextRequest.java         |   5 +-
 .../v2beta1/DeleteEntityTypeRequest.java      |   5 +-
 .../v2beta1/DeleteIntentRequest.java          |   5 +-
 .../DeleteSessionEntityTypeRequest.java       |   5 +-
 .../v2beta1/DetectIntentRequest.java          |   5 +-
 .../v2beta1/DetectIntentResponse.java         |   5 +-
 .../cloud/dialogflow/v2beta1/EntityType.java  |  10 +-
 .../dialogflow/v2beta1/EntityTypeBatch.java   |   5 +-
 .../dialogflow/v2beta1/EntityTypeName.java    |   9 --
 .../dialogflow/v2beta1/EntityTypeProto.java   |  20 +--
 .../v2beta1/EnvironmentContextName.java       |   9 --
 .../EnvironmentSessionEntityTypeName.java     |   9 --
 .../v2beta1/EnvironmentSessionName.java       |   9 --
 .../cloud/dialogflow/v2beta1/EventInput.java  |   5 +-
 .../v2beta1/ExportAgentRequest.java           |   5 +-
 .../v2beta1/ExportAgentResponse.java          |   5 +-
 .../dialogflow/v2beta1/GetAgentRequest.java   |   5 +-
 .../dialogflow/v2beta1/GetContextRequest.java |   5 +-
 .../v2beta1/GetEntityTypeRequest.java         |   5 +-
 .../dialogflow/v2beta1/GetIntentRequest.java  |   5 +-
 .../v2beta1/GetSessionEntityTypeRequest.java  |   5 +-
 .../v2beta1/ImportAgentRequest.java           |   5 +-
 .../dialogflow/v2beta1/InputAudioConfig.java  |   5 +-
 .../cloud/dialogflow/v2beta1/Intent.java      | 120 ++++------------
 .../cloud/dialogflow/v2beta1/IntentBatch.java |   5 +-
 .../cloud/dialogflow/v2beta1/IntentName.java  |   9 --
 .../cloud/dialogflow/v2beta1/IntentProto.java |  36 ++---
 .../v2beta1/ListContextsRequest.java          |   5 +-
 .../v2beta1/ListContextsResponse.java         |   5 +-
 .../v2beta1/ListEntityTypesRequest.java       |   5 +-
 .../v2beta1/ListEntityTypesResponse.java      |   5 +-
 .../v2beta1/ListIntentsRequest.java           |   5 +-
 .../v2beta1/ListIntentsResponse.java          |   5 +-
 .../ListSessionEntityTypesRequest.java        |   5 +-
 .../ListSessionEntityTypesResponse.java       |   5 +-
 .../v2beta1/OriginalDetectIntentRequest.java  |   5 +-
 .../dialogflow/v2beta1/ProjectAgentName.java  |   9 --
 .../cloud/dialogflow/v2beta1/ProjectName.java |   9 --
 .../cloud/dialogflow/v2beta1/QueryInput.java  |   5 +-
 .../dialogflow/v2beta1/QueryParameters.java   |   5 +-
 .../cloud/dialogflow/v2beta1/QueryResult.java |   5 +-
 .../v2beta1/RestoreAgentRequest.java          |   5 +-
 .../v2beta1/SearchAgentsRequest.java          |   5 +-
 .../v2beta1/SearchAgentsResponse.java         |   5 +-
 .../dialogflow/v2beta1/SessionEntityType.java |   5 +-
 .../v2beta1/SessionEntityTypeName.java        |   9 --
 .../v2beta1/SessionEntityTypeProto.java       |  14 +-
 .../cloud/dialogflow/v2beta1/SessionName.java |   9 --
 .../dialogflow/v2beta1/SessionProto.java      |  18 +--
 .../v2beta1/StreamingDetectIntentRequest.java |   5 +-
 .../StreamingDetectIntentResponse.java        |   5 +-
 .../v2beta1/StreamingRecognitionResult.java   |   5 +-
 .../cloud/dialogflow/v2beta1/TextInput.java   |   5 +-
 .../dialogflow/v2beta1/TrainAgentRequest.java |   5 +-
 .../v2beta1/UpdateContextRequest.java         |   5 +-
 .../v2beta1/UpdateEntityTypeRequest.java      |   5 +-
 .../v2beta1/UpdateIntentRequest.java          |   5 +-
 .../UpdateSessionEntityTypeRequest.java       |   5 +-
 .../dialogflow/v2beta1/WebhookProto.java      |   4 +-
 .../dialogflow/v2beta1/WebhookRequest.java    |   5 +-
 .../dialogflow/v2beta1/WebhookResponse.java   |   5 +-
 .../com/google/privacy/dlp/v2/Action.java     |  20 +--
 .../dlp/v2/AnalyzeDataSourceRiskDetails.java  |  65 ++-------
 .../google/privacy/dlp/v2/BigQueryKey.java    |   5 +-
 .../privacy/dlp/v2/BigQueryOptions.java       |   5 +-
 .../google/privacy/dlp/v2/BigQueryTable.java  |   5 +-
 .../google/privacy/dlp/v2/BoundingBox.java    |   5 +-
 .../privacy/dlp/v2/BucketingConfig.java       |  10 +-
 .../privacy/dlp/v2/ByteContentItem.java       |   5 +-
 .../privacy/dlp/v2/CancelDlpJobRequest.java   |   5 +-
 .../privacy/dlp/v2/CharacterMaskConfig.java   |   5 +-
 .../google/privacy/dlp/v2/CharsToIgnore.java  |   5 +-
 .../privacy/dlp/v2/CloudStorageOptions.java   |  10 +-
 .../privacy/dlp/v2/CloudStoragePath.java      |   5 +-
 .../java/com/google/privacy/dlp/v2/Color.java |   5 +-
 .../google/privacy/dlp/v2/ContentItem.java    |   5 +-
 .../privacy/dlp/v2/ContentLocation.java       |   5 +-
 .../v2/CreateDeidentifyTemplateRequest.java   |   5 +-
 .../privacy/dlp/v2/CreateDlpJobRequest.java   |   5 +-
 .../dlp/v2/CreateInspectTemplateRequest.java  |   5 +-
 .../dlp/v2/CreateJobTriggerRequest.java       |   5 +-
 .../privacy/dlp/v2/CryptoHashConfig.java      |   5 +-
 .../com/google/privacy/dlp/v2/CryptoKey.java  |   5 +-
 .../dlp/v2/CryptoReplaceFfxFpeConfig.java     |   5 +-
 .../google/privacy/dlp/v2/CustomInfoType.java |  45 ++----
 .../google/privacy/dlp/v2/DatastoreKey.java   |   5 +-
 .../privacy/dlp/v2/DatastoreOptions.java      |   5 +-
 .../privacy/dlp/v2/DateShiftConfig.java       |   5 +-
 .../com/google/privacy/dlp/v2/DateTime.java   |  10 +-
 .../privacy/dlp/v2/DeidentifyConfig.java      |   5 +-
 .../dlp/v2/DeidentifyContentRequest.java      |   5 +-
 .../dlp/v2/DeidentifyContentResponse.java     |   5 +-
 .../privacy/dlp/v2/DeidentifyTemplate.java    |   5 +-
 .../v2/DeleteDeidentifyTemplateRequest.java   |   5 +-
 .../privacy/dlp/v2/DeleteDlpJobRequest.java   |   5 +-
 .../dlp/v2/DeleteInspectTemplateRequest.java  |   5 +-
 .../dlp/v2/DeleteJobTriggerRequest.java       |   5 +-
 .../com/google/privacy/dlp/v2/DlpJob.java     |   5 +-
 .../com/google/privacy/dlp/v2/DlpJobName.java |   9 --
 .../com/google/privacy/dlp/v2/DlpProto.java   | 132 +++++++++---------
 .../com/google/privacy/dlp/v2/DlpStorage.java |  18 +--
 .../privacy/dlp/v2/DocumentLocation.java      |   5 +-
 .../com/google/privacy/dlp/v2/EntityId.java   |   5 +-
 .../java/com/google/privacy/dlp/v2/Error.java |   5 +-
 .../com/google/privacy/dlp/v2/FieldId.java    |   5 +-
 .../privacy/dlp/v2/FieldTransformation.java   |   5 +-
 .../com/google/privacy/dlp/v2/Finding.java    |   5 +-
 .../dlp/v2/FixedSizeBucketingConfig.java      |   5 +-
 .../dlp/v2/GetDeidentifyTemplateRequest.java  |   5 +-
 .../privacy/dlp/v2/GetDlpJobRequest.java      |   5 +-
 .../dlp/v2/GetInspectTemplateRequest.java     |   5 +-
 .../privacy/dlp/v2/GetJobTriggerRequest.java  |   5 +-
 .../google/privacy/dlp/v2/ImageLocation.java  |   5 +-
 .../com/google/privacy/dlp/v2/InfoType.java   |   5 +-
 .../privacy/dlp/v2/InfoTypeDescription.java   |   5 +-
 .../google/privacy/dlp/v2/InfoTypeStats.java  |   5 +-
 .../dlp/v2/InfoTypeTransformations.java       |  10 +-
 .../google/privacy/dlp/v2/InspectConfig.java  |  15 +-
 .../privacy/dlp/v2/InspectContentRequest.java |   5 +-
 .../dlp/v2/InspectContentResponse.java        |   5 +-
 .../dlp/v2/InspectDataSourceDetails.java      |  15 +-
 .../privacy/dlp/v2/InspectJobConfig.java      |   5 +-
 .../google/privacy/dlp/v2/InspectResult.java  |   5 +-
 .../privacy/dlp/v2/InspectTemplate.java       |   5 +-
 .../com/google/privacy/dlp/v2/JobTrigger.java |  10 +-
 .../java/com/google/privacy/dlp/v2/Key.java   |  10 +-
 .../google/privacy/dlp/v2/KindExpression.java |   5 +-
 .../privacy/dlp/v2/KmsWrappedCryptoKey.java   |   5 +-
 .../v2/ListDeidentifyTemplatesRequest.java    |   5 +-
 .../v2/ListDeidentifyTemplatesResponse.java   |   5 +-
 .../privacy/dlp/v2/ListDlpJobsRequest.java    |   5 +-
 .../privacy/dlp/v2/ListDlpJobsResponse.java   |   5 +-
 .../privacy/dlp/v2/ListInfoTypesRequest.java  |   5 +-
 .../privacy/dlp/v2/ListInfoTypesResponse.java |   5 +-
 .../dlp/v2/ListInspectTemplatesRequest.java   |   5 +-
 .../dlp/v2/ListInspectTemplatesResponse.java  |   5 +-
 .../dlp/v2/ListJobTriggersRequest.java        |   5 +-
 .../dlp/v2/ListJobTriggersResponse.java       |   5 +-
 .../com/google/privacy/dlp/v2/Location.java   |   5 +-
 .../OrganizationDeidentifyTemplateName.java   |   9 --
 .../v2/OrganizationInspectTemplateName.java   |   9 --
 .../privacy/dlp/v2/OrganizationName.java      |   9 --
 .../privacy/dlp/v2/OutputStorageConfig.java   |   5 +-
 .../google/privacy/dlp/v2/PartitionId.java    |   5 +-
 .../dlp/v2/PrimitiveTransformation.java       |   5 +-
 .../google/privacy/dlp/v2/PrivacyMetric.java  |  45 ++----
 .../dlp/v2/ProjectDeidentifyTemplateName.java |   9 --
 .../dlp/v2/ProjectInspectTemplateName.java    |   9 --
 .../privacy/dlp/v2/ProjectJobTriggerName.java |   9 --
 .../google/privacy/dlp/v2/ProjectName.java    |   9 --
 .../com/google/privacy/dlp/v2/QuoteInfo.java  |   5 +-
 .../java/com/google/privacy/dlp/v2/Range.java |   5 +-
 .../privacy/dlp/v2/RecordCondition.java       |  20 +--
 .../com/google/privacy/dlp/v2/RecordKey.java  |   5 +-
 .../google/privacy/dlp/v2/RecordLocation.java |   5 +-
 .../privacy/dlp/v2/RecordSuppression.java     |   5 +-
 .../privacy/dlp/v2/RecordTransformations.java |   5 +-
 .../google/privacy/dlp/v2/RedactConfig.java   |   5 +-
 .../privacy/dlp/v2/RedactImageRequest.java    |  10 +-
 .../privacy/dlp/v2/RedactImageResponse.java   |   5 +-
 .../dlp/v2/ReidentifyContentRequest.java      |   5 +-
 .../dlp/v2/ReidentifyContentResponse.java     |   5 +-
 .../privacy/dlp/v2/ReplaceValueConfig.java    |   5 +-
 .../dlp/v2/ReplaceWithInfoTypeConfig.java     |   5 +-
 .../privacy/dlp/v2/RiskAnalysisJobConfig.java |   5 +-
 .../com/google/privacy/dlp/v2/Schedule.java   |   5 +-
 .../google/privacy/dlp/v2/StorageConfig.java  |  10 +-
 .../java/com/google/privacy/dlp/v2/Table.java |  10 +-
 .../google/privacy/dlp/v2/TableLocation.java  |   5 +-
 .../google/privacy/dlp/v2/TimePartConfig.java |   5 +-
 .../dlp/v2/TransformationOverview.java        |   5 +-
 .../privacy/dlp/v2/TransformationSummary.java |  10 +-
 .../privacy/dlp/v2/TransientCryptoKey.java    |   5 +-
 .../dlp/v2/UntypedDeidentifyTemplateName.java |   9 --
 .../dlp/v2/UntypedInspectTemplateName.java    |   9 --
 .../privacy/dlp/v2/UnwrappedCryptoKey.java    |   5 +-
 .../v2/UpdateDeidentifyTemplateRequest.java   |   5 +-
 .../dlp/v2/UpdateInspectTemplateRequest.java  |   5 +-
 .../dlp/v2/UpdateJobTriggerRequest.java       |   5 +-
 .../java/com/google/privacy/dlp/v2/Value.java |   5 +-
 .../google/privacy/dlp/v2/ValueFrequency.java |   5 +-
 .../v1beta1/CommonProto.java                  |   6 +-
 .../v1beta1/DeleteEventsRequest.java          |   5 +-
 .../v1beta1/DeleteEventsResponse.java         |   5 +-
 .../v1beta1/ErrorContext.java                 |   5 +-
 .../v1beta1/ErrorEvent.java                   |   5 +-
 .../v1beta1/ErrorGroup.java                   |   5 +-
 .../v1beta1/ErrorGroupServiceProto.java       |   4 +-
 .../v1beta1/ErrorGroupStats.java              |   5 +-
 .../v1beta1/ErrorStatsServiceProto.java       |  18 +--
 .../v1beta1/GetGroupRequest.java              |   5 +-
 .../v1beta1/GroupName.java                    |   9 --
 .../v1beta1/HttpRequestContext.java           |   5 +-
 .../v1beta1/ListEventsRequest.java            |   5 +-
 .../v1beta1/ListEventsResponse.java           |   5 +-
 .../v1beta1/ListGroupStatsRequest.java        |   5 +-
 .../v1beta1/ListGroupStatsResponse.java       |   5 +-
 .../v1beta1/ProjectName.java                  |   9 --
 .../v1beta1/QueryTimeRange.java               |   5 +-
 .../v1beta1/ReportErrorEventRequest.java      |   5 +-
 .../v1beta1/ReportErrorEventResponse.java     |   5 +-
 .../v1beta1/ReportErrorsServiceProto.java     |   4 +-
 .../v1beta1/ReportedErrorEvent.java           |   5 +-
 .../v1beta1/ServiceContext.java               |   5 +-
 .../v1beta1/ServiceContextFilter.java         |   5 +-
 .../v1beta1/SourceLocation.java               |   5 +-
 .../v1beta1/TimedCount.java                   |   5 +-
 .../v1beta1/TrackingIssue.java                |   5 +-
 .../v1beta1/UpdateGroupRequest.java           |   5 +-
 .../google/firestore/v1beta1/AnyPathName.java |   9 --
 .../google/firestore/v1beta1/ArrayValue.java  |   5 +-
 .../v1beta1/BatchGetDocumentsRequest.java     |   5 +-
 .../v1beta1/BatchGetDocumentsResponse.java    |   5 +-
 .../v1beta1/BeginTransactionRequest.java      |   5 +-
 .../v1beta1/BeginTransactionResponse.java     |   5 +-
 .../firestore/v1beta1/CommitRequest.java      |   5 +-
 .../firestore/v1beta1/CommitResponse.java     |   5 +-
 .../google/firestore/v1beta1/CommonProto.java |   2 +-
 .../v1beta1/CreateDocumentRequest.java        |   5 +-
 .../com/google/firestore/v1beta1/Cursor.java  |   5 +-
 .../firestore/v1beta1/DatabaseRootName.java   |   9 --
 .../v1beta1/DeleteDocumentRequest.java        |   5 +-
 .../google/firestore/v1beta1/Document.java    |   5 +-
 .../firestore/v1beta1/DocumentChange.java     |   5 +-
 .../firestore/v1beta1/DocumentDelete.java     |   5 +-
 .../firestore/v1beta1/DocumentMask.java       |   5 +-
 .../firestore/v1beta1/DocumentPathName.java   |   9 --
 .../firestore/v1beta1/DocumentProto.java      |   6 +-
 .../firestore/v1beta1/DocumentRemove.java     |   5 +-
 .../firestore/v1beta1/DocumentRootName.java   |   9 --
 .../firestore/v1beta1/DocumentTransform.java  |  10 +-
 .../firestore/v1beta1/ExistenceFilter.java    |   5 +-
 .../firestore/v1beta1/FirestoreProto.java     |  36 ++---
 .../firestore/v1beta1/GetDocumentRequest.java |   5 +-
 .../v1beta1/ListCollectionIdsRequest.java     |   5 +-
 .../v1beta1/ListCollectionIdsResponse.java    |   5 +-
 .../v1beta1/ListDocumentsRequest.java         |   5 +-
 .../v1beta1/ListDocumentsResponse.java        |   5 +-
 .../firestore/v1beta1/ListenRequest.java      |   5 +-
 .../firestore/v1beta1/ListenResponse.java     |   5 +-
 .../google/firestore/v1beta1/MapValue.java    |   5 +-
 .../firestore/v1beta1/Precondition.java       |   5 +-
 .../google/firestore/v1beta1/QueryProto.java  |  10 +-
 .../firestore/v1beta1/RollbackRequest.java    |   5 +-
 .../firestore/v1beta1/RunQueryRequest.java    |   5 +-
 .../firestore/v1beta1/RunQueryResponse.java   |   5 +-
 .../firestore/v1beta1/StructuredQuery.java    |  45 ++----
 .../com/google/firestore/v1beta1/Target.java  |  15 +-
 .../firestore/v1beta1/TargetChange.java       |   5 +-
 .../firestore/v1beta1/TransactionOptions.java |  15 +-
 .../v1beta1/UpdateDocumentRequest.java        |   5 +-
 .../com/google/firestore/v1beta1/Value.java   |   5 +-
 .../com/google/firestore/v1beta1/Write.java   |   5 +-
 .../google/firestore/v1beta1/WriteProto.java  |   6 +-
 .../firestore/v1beta1/WriteRequest.java       |   5 +-
 .../firestore/v1beta1/WriteResponse.java      |   5 +-
 .../google/firestore/v1beta1/WriteResult.java |   5 +-
 .../iot/v1/CreateDeviceRegistryRequest.java   |   5 +-
 .../cloud/iot/v1/CreateDeviceRequest.java     |   5 +-
 .../iot/v1/DeleteDeviceRegistryRequest.java   |   5 +-
 .../cloud/iot/v1/DeleteDeviceRequest.java     |   5 +-
 .../java/com/google/cloud/iot/v1/Device.java  |   5 +-
 .../com/google/cloud/iot/v1/DeviceConfig.java |   5 +-
 .../google/cloud/iot/v1/DeviceCredential.java |   5 +-
 .../cloud/iot/v1/DeviceManagerProto.java      |  26 ++--
 .../com/google/cloud/iot/v1/DeviceName.java   |   9 --
 .../google/cloud/iot/v1/DeviceRegistry.java   |   5 +-
 .../com/google/cloud/iot/v1/DeviceState.java  |   5 +-
 .../cloud/iot/v1/EventNotificationConfig.java |   5 +-
 .../iot/v1/GetDeviceRegistryRequest.java      |   5 +-
 .../google/cloud/iot/v1/GetDeviceRequest.java |   5 +-
 .../com/google/cloud/iot/v1/HttpConfig.java   |   5 +-
 .../v1/ListDeviceConfigVersionsRequest.java   |   5 +-
 .../v1/ListDeviceConfigVersionsResponse.java  |   5 +-
 .../iot/v1/ListDeviceRegistriesRequest.java   |   5 +-
 .../iot/v1/ListDeviceRegistriesResponse.java  |   5 +-
 .../cloud/iot/v1/ListDeviceStatesRequest.java |   5 +-
 .../iot/v1/ListDeviceStatesResponse.java      |   5 +-
 .../cloud/iot/v1/ListDevicesRequest.java      |   5 +-
 .../cloud/iot/v1/ListDevicesResponse.java     |   5 +-
 .../com/google/cloud/iot/v1/LocationName.java |   9 --
 .../v1/ModifyCloudToDeviceConfigRequest.java  |   5 +-
 .../com/google/cloud/iot/v1/MqttConfig.java   |   5 +-
 .../cloud/iot/v1/PublicKeyCertificate.java    |   5 +-
 .../cloud/iot/v1/PublicKeyCredential.java     |   5 +-
 .../cloud/iot/v1/RegistryCredential.java      |   5 +-
 .../com/google/cloud/iot/v1/RegistryName.java |   9 --
 .../google/cloud/iot/v1/ResourcesProto.java   |  14 +-
 .../cloud/iot/v1/StateNotificationConfig.java |   5 +-
 .../iot/v1/UpdateDeviceRegistryRequest.java   |   5 +-
 .../cloud/iot/v1/UpdateDeviceRequest.java     |   5 +-
 .../cloud/iot/v1/X509CertificateDetails.java  |   5 +-
 .../language/v1/AnalyzeEntitiesRequest.java   |   5 +-
 .../language/v1/AnalyzeEntitiesResponse.java  |   5 +-
 .../v1/AnalyzeEntitySentimentRequest.java     |   5 +-
 .../v1/AnalyzeEntitySentimentResponse.java    |   5 +-
 .../language/v1/AnalyzeSentimentRequest.java  |   5 +-
 .../language/v1/AnalyzeSentimentResponse.java |   5 +-
 .../language/v1/AnalyzeSyntaxRequest.java     |   5 +-
 .../language/v1/AnalyzeSyntaxResponse.java    |   5 +-
 .../language/v1/AnnotateTextRequest.java      |  10 +-
 .../language/v1/AnnotateTextResponse.java     |   5 +-
 .../language/v1/ClassificationCategory.java   |   5 +-
 .../language/v1/ClassifyTextRequest.java      |   5 +-
 .../language/v1/ClassifyTextResponse.java     |   5 +-
 .../cloud/language/v1/DependencyEdge.java     |   5 +-
 .../google/cloud/language/v1/Document.java    |   5 +-
 .../com/google/cloud/language/v1/Entity.java  |   5 +-
 .../cloud/language/v1/EntityMention.java      |   5 +-
 .../language/v1/LanguageServiceProto.java     |  38 ++---
 .../cloud/language/v1/PartOfSpeech.java       |   5 +-
 .../google/cloud/language/v1/Sentence.java    |   5 +-
 .../google/cloud/language/v1/Sentiment.java   |   5 +-
 .../google/cloud/language/v1/TextSpan.java    |   5 +-
 .../com/google/cloud/language/v1/Token.java   |   5 +-
 .../v1beta2/AnalyzeEntitiesRequest.java       |   5 +-
 .../v1beta2/AnalyzeEntitiesResponse.java      |   5 +-
 .../AnalyzeEntitySentimentRequest.java        |   5 +-
 .../AnalyzeEntitySentimentResponse.java       |   5 +-
 .../v1beta2/AnalyzeSentimentRequest.java      |   5 +-
 .../v1beta2/AnalyzeSentimentResponse.java     |   5 +-
 .../v1beta2/AnalyzeSyntaxRequest.java         |   5 +-
 .../v1beta2/AnalyzeSyntaxResponse.java        |   5 +-
 .../language/v1beta2/AnnotateTextRequest.java |  10 +-
 .../v1beta2/AnnotateTextResponse.java         |   5 +-
 .../v1beta2/ClassificationCategory.java       |   5 +-
 .../language/v1beta2/ClassifyTextRequest.java |   5 +-
 .../v1beta2/ClassifyTextResponse.java         |   5 +-
 .../language/v1beta2/DependencyEdge.java      |   5 +-
 .../cloud/language/v1beta2/Document.java      |   5 +-
 .../google/cloud/language/v1beta2/Entity.java |   5 +-
 .../cloud/language/v1beta2/EntityMention.java |   5 +-
 .../v1beta2/LanguageServiceProto.java         |  40 +++---
 .../cloud/language/v1beta2/PartOfSpeech.java  |   5 +-
 .../cloud/language/v1beta2/Sentence.java      |   5 +-
 .../cloud/language/v1beta2/Sentiment.java     |   5 +-
 .../cloud/language/v1beta2/TextSpan.java      |   5 +-
 .../google/cloud/language/v1beta2/Token.java  |   5 +-
 .../logging/v2/BillingExclusionName.java      |   9 --
 .../com/google/logging/v2/BillingLogName.java |   9 --
 .../com/google/logging/v2/BillingName.java    |   9 --
 .../google/logging/v2/BillingSinkName.java    |   9 --
 .../logging/v2/CreateExclusionRequest.java    |   5 +-
 .../logging/v2/CreateLogMetricRequest.java    |   5 +-
 .../google/logging/v2/CreateSinkRequest.java  |   5 +-
 .../logging/v2/DeleteExclusionRequest.java    |   5 +-
 .../logging/v2/DeleteLogMetricRequest.java    |   5 +-
 .../google/logging/v2/DeleteLogRequest.java   |   5 +-
 .../google/logging/v2/DeleteSinkRequest.java  |   5 +-
 .../logging/v2/FolderExclusionName.java       |   9 --
 .../com/google/logging/v2/FolderLogName.java  |   9 --
 .../com/google/logging/v2/FolderName.java     |   9 --
 .../com/google/logging/v2/FolderSinkName.java |   9 --
 .../logging/v2/GetExclusionRequest.java       |   5 +-
 .../logging/v2/GetLogMetricRequest.java       |   5 +-
 .../com/google/logging/v2/GetSinkRequest.java |   5 +-
 .../logging/v2/ListExclusionsRequest.java     |   5 +-
 .../logging/v2/ListExclusionsResponse.java    |   5 +-
 .../logging/v2/ListLogEntriesRequest.java     |   5 +-
 .../logging/v2/ListLogEntriesResponse.java    |   5 +-
 .../logging/v2/ListLogMetricsRequest.java     |   5 +-
 .../logging/v2/ListLogMetricsResponse.java    |   5 +-
 .../google/logging/v2/ListLogsRequest.java    |   5 +-
 .../google/logging/v2/ListLogsResponse.java   |   5 +-
 ...stMonitoredResourceDescriptorsRequest.java |   5 +-
 ...tMonitoredResourceDescriptorsResponse.java |   5 +-
 .../google/logging/v2/ListSinksRequest.java   |   5 +-
 .../google/logging/v2/ListSinksResponse.java  |   5 +-
 .../java/com/google/logging/v2/LogEntry.java  |   5 +-
 .../google/logging/v2/LogEntryOperation.java  |   5 +-
 .../com/google/logging/v2/LogEntryProto.java  |   6 +-
 .../logging/v2/LogEntrySourceLocation.java    |   5 +-
 .../com/google/logging/v2/LogExclusion.java   |   5 +-
 .../java/com/google/logging/v2/LogMetric.java |   5 +-
 .../java/com/google/logging/v2/LogSink.java   |   5 +-
 .../google/logging/v2/LoggingConfigProto.java |  14 +-
 .../logging/v2/LoggingMetricsProto.java       |   8 +-
 .../com/google/logging/v2/LoggingProto.java   |  10 +-
 .../logging/v2/OrganizationExclusionName.java |   9 --
 .../logging/v2/OrganizationLogName.java       |   9 --
 .../google/logging/v2/OrganizationName.java   |   9 --
 .../logging/v2/OrganizationSinkName.java      |   9 --
 .../logging/v2/ProjectExclusionName.java      |   9 --
 .../com/google/logging/v2/ProjectLogName.java |   9 --
 .../google/logging/v2/ProjectMetricName.java  |   9 --
 .../com/google/logging/v2/ProjectName.java    |   9 --
 .../google/logging/v2/ProjectSinkName.java    |   9 --
 .../logging/v2/UntypedExclusionName.java      |   9 --
 .../com/google/logging/v2/UntypedLogName.java |   9 --
 .../google/logging/v2/UntypedMetricName.java  |   9 --
 .../google/logging/v2/UntypedParentName.java  |   9 --
 .../google/logging/v2/UntypedSinkName.java    |   9 --
 .../logging/v2/UpdateExclusionRequest.java    |   5 +-
 .../logging/v2/UpdateLogMetricRequest.java    |   5 +-
 .../google/logging/v2/UpdateSinkRequest.java  |   5 +-
 .../v2/WriteLogEntriesPartialErrors.java      |   5 +-
 .../logging/v2/WriteLogEntriesRequest.java    |   5 +-
 .../logging/v2/WriteLogEntriesResponse.java   |   5 +-
 .../com/google/monitoring/v3/Aggregation.java |   5 +-
 .../com/google/monitoring/v3/AlertPolicy.java |  30 +---
 .../v3/AlertPolicyConditionName.java          |   9 --
 .../google/monitoring/v3/AlertPolicyName.java |   9 --
 .../com/google/monitoring/v3/AlertProto.java  |  10 +-
 .../monitoring/v3/AlertServiceProto.java      |   8 +-
 .../com/google/monitoring/v3/CommonProto.java |   8 +-
 .../v3/CreateAlertPolicyRequest.java          |   5 +-
 .../monitoring/v3/CreateGroupRequest.java     |   5 +-
 .../v3/CreateMetricDescriptorRequest.java     |   5 +-
 .../v3/CreateNotificationChannelRequest.java  |   5 +-
 .../monitoring/v3/CreateTimeSeriesError.java  |   5 +-
 .../v3/CreateTimeSeriesRequest.java           |   5 +-
 .../v3/CreateUptimeCheckConfigRequest.java    |   5 +-
 .../v3/DeleteAlertPolicyRequest.java          |   5 +-
 .../monitoring/v3/DeleteGroupRequest.java     |   5 +-
 .../v3/DeleteMetricDescriptorRequest.java     |   5 +-
 .../v3/DeleteNotificationChannelRequest.java  |   5 +-
 .../v3/DeleteUptimeCheckConfigRequest.java    |   5 +-
 .../monitoring/v3/GetAlertPolicyRequest.java  |   5 +-
 .../google/monitoring/v3/GetGroupRequest.java |   5 +-
 .../v3/GetMetricDescriptorRequest.java        |   5 +-
 ...GetMonitoredResourceDescriptorRequest.java |   5 +-
 ...tNotificationChannelDescriptorRequest.java |   5 +-
 .../v3/GetNotificationChannelRequest.java     |   5 +-
 ...icationChannelVerificationCodeRequest.java |   5 +-
 ...cationChannelVerificationCodeResponse.java |   5 +-
 .../v3/GetUptimeCheckConfigRequest.java       |   5 +-
 .../java/com/google/monitoring/v3/Group.java  |   5 +-
 .../com/google/monitoring/v3/GroupName.java   |   9 --
 .../monitoring/v3/GroupServiceProto.java      |  10 +-
 .../v3/ListAlertPoliciesRequest.java          |   5 +-
 .../v3/ListAlertPoliciesResponse.java         |   5 +-
 .../v3/ListGroupMembersRequest.java           |   5 +-
 .../v3/ListGroupMembersResponse.java          |   5 +-
 .../monitoring/v3/ListGroupsRequest.java      |   5 +-
 .../monitoring/v3/ListGroupsResponse.java     |   5 +-
 .../v3/ListMetricDescriptorsRequest.java      |   5 +-
 .../v3/ListMetricDescriptorsResponse.java     |   5 +-
 ...stMonitoredResourceDescriptorsRequest.java |   5 +-
 ...tMonitoredResourceDescriptorsResponse.java |   5 +-
 ...NotificationChannelDescriptorsRequest.java |   5 +-
 ...otificationChannelDescriptorsResponse.java |   5 +-
 .../v3/ListNotificationChannelsRequest.java   |   5 +-
 .../v3/ListNotificationChannelsResponse.java  |   5 +-
 .../monitoring/v3/ListTimeSeriesRequest.java  |   5 +-
 .../monitoring/v3/ListTimeSeriesResponse.java |   5 +-
 .../v3/ListUptimeCheckConfigsRequest.java     |   5 +-
 .../v3/ListUptimeCheckConfigsResponse.java    |   5 +-
 .../v3/ListUptimeCheckIpsRequest.java         |   5 +-
 .../v3/ListUptimeCheckIpsResponse.java        |   5 +-
 .../monitoring/v3/MetricDescriptorName.java   |   9 --
 .../com/google/monitoring/v3/MetricProto.java |   2 +-
 .../monitoring/v3/MetricServiceProto.java     |  16 +--
 .../v3/MonitoredResourceDescriptorName.java   |   9 --
 .../google/monitoring/v3/MutationRecord.java  |   5 +-
 .../monitoring/v3/NotificationChannel.java    |   5 +-
 .../v3/NotificationChannelDescriptor.java     |   5 +-
 .../v3/NotificationChannelDescriptorName.java |   9 --
 .../v3/NotificationChannelName.java           |   9 --
 .../monitoring/v3/NotificationProto.java      |   4 +-
 .../v3/NotificationServiceProto.java          |  18 +--
 .../java/com/google/monitoring/v3/Point.java  |   5 +-
 .../com/google/monitoring/v3/ProjectName.java |   9 --
 ...icationChannelVerificationCodeRequest.java |   5 +-
 .../google/monitoring/v3/TimeInterval.java    |   5 +-
 .../com/google/monitoring/v3/TimeSeries.java  |   5 +-
 .../com/google/monitoring/v3/TypedValue.java  |   5 +-
 .../v3/UpdateAlertPolicyRequest.java          |   5 +-
 .../monitoring/v3/UpdateGroupRequest.java     |   5 +-
 .../v3/UpdateNotificationChannelRequest.java  |   5 +-
 .../v3/UpdateUptimeCheckConfigRequest.java    |   5 +-
 .../monitoring/v3/UptimeCheckConfig.java      |  35 +----
 .../monitoring/v3/UptimeCheckConfigName.java  |   9 --
 .../google/monitoring/v3/UptimeCheckIp.java   |   5 +-
 .../com/google/monitoring/v3/UptimeProto.java |   8 +-
 .../monitoring/v3/UptimeServiceProto.java     |  10 +-
 .../v3/VerifyNotificationChannelRequest.java  |   5 +-
 .../cloud/oslogin/common/FingerprintName.java |   9 --
 .../cloud/oslogin/common/OsLoginProto.java    |  12 +-
 .../cloud/oslogin/common/ProjectName.java     |   9 --
 .../google/cloud/oslogin/common/UserName.java |   9 --
 .../oslogin/v1/DeletePosixAccountRequest.java |   5 +-
 .../oslogin/v1/DeleteSshPublicKeyRequest.java |   5 +-
 .../cloud/oslogin/v1/FingerprintName.java     |   9 --
 .../oslogin/v1/GetLoginProfileRequest.java    |   5 +-
 .../oslogin/v1/GetSshPublicKeyRequest.java    |   5 +-
 .../oslogin/v1/ImportSshPublicKeyRequest.java |   5 +-
 .../v1/ImportSshPublicKeyResponse.java        |   5 +-
 .../google/cloud/oslogin/v1/LoginProfile.java |   5 +-
 .../google/cloud/oslogin/v1/OsLoginProto.java |  10 +-
 .../google/cloud/oslogin/v1/ProjectName.java  |   9 --
 .../oslogin/v1/UpdateSshPublicKeyRequest.java |   5 +-
 .../com/google/cloud/oslogin/v1/UserName.java |   9 --
 .../google/pubsub/v1/AcknowledgeRequest.java  |   5 +-
 .../pubsub/v1/CreateSnapshotRequest.java      |   5 +-
 .../pubsub/v1/DeleteSnapshotRequest.java      |   5 +-
 .../pubsub/v1/DeleteSubscriptionRequest.java  |   5 +-
 .../google/pubsub/v1/DeleteTopicRequest.java  |   5 +-
 .../com/google/pubsub/v1/DeletedTopic.java    |   9 --
 .../pubsub/v1/GetSubscriptionRequest.java     |   5 +-
 .../com/google/pubsub/v1/GetTopicRequest.java |   5 +-
 .../pubsub/v1/ListSnapshotsRequest.java       |   5 +-
 .../pubsub/v1/ListSnapshotsResponse.java      |   5 +-
 .../pubsub/v1/ListSubscriptionsRequest.java   |   5 +-
 .../pubsub/v1/ListSubscriptionsResponse.java  |   5 +-
 .../v1/ListTopicSubscriptionsRequest.java     |   5 +-
 .../v1/ListTopicSubscriptionsResponse.java    |   5 +-
 .../google/pubsub/v1/ListTopicsRequest.java   |   5 +-
 .../google/pubsub/v1/ListTopicsResponse.java  |   5 +-
 .../pubsub/v1/ModifyAckDeadlineRequest.java   |   5 +-
 .../pubsub/v1/ModifyPushConfigRequest.java    |   5 +-
 .../com/google/pubsub/v1/ProjectName.java     |   9 --
 .../google/pubsub/v1/ProjectSnapshotName.java |   9 --
 .../pubsub/v1/ProjectSubscriptionName.java    |   9 --
 .../google/pubsub/v1/ProjectTopicName.java    |   9 --
 .../com/google/pubsub/v1/PublishRequest.java  |   5 +-
 .../com/google/pubsub/v1/PublishResponse.java |   5 +-
 .../com/google/pubsub/v1/PubsubMessage.java   |   5 +-
 .../com/google/pubsub/v1/PubsubProto.java     |  34 ++---
 .../com/google/pubsub/v1/PullRequest.java     |   5 +-
 .../com/google/pubsub/v1/PullResponse.java    |   5 +-
 .../java/com/google/pubsub/v1/PushConfig.java |   5 +-
 .../com/google/pubsub/v1/ReceivedMessage.java |   5 +-
 .../com/google/pubsub/v1/SeekRequest.java     |   5 +-
 .../com/google/pubsub/v1/SeekResponse.java    |   5 +-
 .../java/com/google/pubsub/v1/Snapshot.java   |   5 +-
 .../pubsub/v1/StreamingPullRequest.java       |   5 +-
 .../pubsub/v1/StreamingPullResponse.java      |   5 +-
 .../com/google/pubsub/v1/Subscription.java    |   5 +-
 .../main/java/com/google/pubsub/v1/Topic.java |   5 +-
 .../google/pubsub/v1/UntypedTopicName.java    |   9 --
 .../pubsub/v1/UpdateSnapshotRequest.java      |   5 +-
 .../pubsub/v1/UpdateSubscriptionRequest.java  |   5 +-
 .../google/pubsub/v1/UpdateTopicRequest.java  |   5 +-
 .../v1beta1/CloudRedisServiceBetaProto.java   |  14 +-
 .../redis/v1beta1/CreateInstanceRequest.java  |   5 +-
 .../redis/v1beta1/DeleteInstanceRequest.java  |   5 +-
 .../redis/v1beta1/GetInstanceRequest.java     |   5 +-
 .../google/cloud/redis/v1beta1/Instance.java  |   5 +-
 .../cloud/redis/v1beta1/InstanceName.java     |   9 --
 .../redis/v1beta1/ListInstancesRequest.java   |   5 +-
 .../redis/v1beta1/ListInstancesResponse.java  |   5 +-
 .../cloud/redis/v1beta1/LocationMetadata.java |   5 +-
 .../cloud/redis/v1beta1/LocationName.java     |   9 --
 .../redis/v1beta1/UpdateInstanceRequest.java  |   5 +-
 .../cloud/redis/v1beta1/ZoneMetadata.java     |   5 +-
 .../database/v1/CreateDatabaseMetadata.java   |   5 +-
 .../database/v1/CreateDatabaseRequest.java    |   5 +-
 .../spanner/admin/database/v1/Database.java   |   5 +-
 .../admin/database/v1/DatabaseName.java       |   9 --
 .../database/v1/DropDatabaseRequest.java      |   5 +-
 .../database/v1/GetDatabaseDdlRequest.java    |   5 +-
 .../database/v1/GetDatabaseDdlResponse.java   |   5 +-
 .../admin/database/v1/GetDatabaseRequest.java |   5 +-
 .../admin/database/v1/InstanceName.java       |   9 --
 .../database/v1/ListDatabasesRequest.java     |   5 +-
 .../database/v1/ListDatabasesResponse.java    |   5 +-
 .../v1/SpannerDatabaseAdminProto.java         |  14 +-
 .../v1/UpdateDatabaseDdlMetadata.java         |   5 +-
 .../database/v1/UpdateDatabaseDdlRequest.java |   5 +-
 .../instance/v1/CreateInstanceMetadata.java   |   5 +-
 .../instance/v1/CreateInstanceRequest.java    |   5 +-
 .../instance/v1/DeleteInstanceRequest.java    |   5 +-
 .../instance/v1/GetInstanceConfigRequest.java |   5 +-
 .../admin/instance/v1/GetInstanceRequest.java |   5 +-
 .../spanner/admin/instance/v1/Instance.java   |   5 +-
 .../admin/instance/v1/InstanceConfig.java     |   5 +-
 .../admin/instance/v1/InstanceConfigName.java |   9 --
 .../admin/instance/v1/InstanceName.java       |   9 --
 .../v1/ListInstanceConfigsRequest.java        |   5 +-
 .../v1/ListInstanceConfigsResponse.java       |   5 +-
 .../instance/v1/ListInstancesRequest.java     |   5 +-
 .../instance/v1/ListInstancesResponse.java    |   5 +-
 .../admin/instance/v1/ProjectName.java        |   9 --
 .../v1/SpannerInstanceAdminProto.java         |  18 +--
 .../instance/v1/UpdateInstanceMetadata.java   |   5 +-
 .../instance/v1/UpdateInstanceRequest.java    |   5 +-
 .../spanner/v1/BeginTransactionRequest.java   |   5 +-
 .../com/google/spanner/v1/CommitRequest.java  |   5 +-
 .../com/google/spanner/v1/CommitResponse.java |   5 +-
 .../spanner/v1/CreateSessionRequest.java      |   5 +-
 .../com/google/spanner/v1/DatabaseName.java   |   9 --
 .../spanner/v1/DeleteSessionRequest.java      |   5 +-
 .../google/spanner/v1/ExecuteSqlRequest.java  |   5 +-
 .../google/spanner/v1/GetSessionRequest.java  |   5 +-
 .../java/com/google/spanner/v1/KeyRange.java  |   5 +-
 .../java/com/google/spanner/v1/KeySet.java    |   5 +-
 .../java/com/google/spanner/v1/KeysProto.java |   2 +-
 .../spanner/v1/ListSessionsRequest.java       |   5 +-
 .../spanner/v1/ListSessionsResponse.java      |   5 +-
 .../java/com/google/spanner/v1/Mutation.java  |  15 +-
 .../com/google/spanner/v1/MutationProto.java  |   2 +-
 .../google/spanner/v1/PartialResultSet.java   |   5 +-
 .../java/com/google/spanner/v1/Partition.java |   5 +-
 .../google/spanner/v1/PartitionOptions.java   |   5 +-
 .../spanner/v1/PartitionQueryRequest.java     |   5 +-
 .../spanner/v1/PartitionReadRequest.java      |   5 +-
 .../google/spanner/v1/PartitionResponse.java  |   5 +-
 .../java/com/google/spanner/v1/PlanNode.java  |  15 +-
 .../java/com/google/spanner/v1/QueryPlan.java |   5 +-
 .../com/google/spanner/v1/QueryPlanProto.java |   4 +-
 .../com/google/spanner/v1/ReadRequest.java    |   5 +-
 .../java/com/google/spanner/v1/ResultSet.java |   5 +-
 .../google/spanner/v1/ResultSetMetadata.java  |   5 +-
 .../com/google/spanner/v1/ResultSetProto.java |   4 +-
 .../com/google/spanner/v1/ResultSetStats.java |   5 +-
 .../google/spanner/v1/RollbackRequest.java    |   5 +-
 .../java/com/google/spanner/v1/Session.java   |   5 +-
 .../com/google/spanner/v1/SessionName.java    |   9 --
 .../com/google/spanner/v1/SpannerProto.java   |  26 ++--
 .../com/google/spanner/v1/StructType.java     |  10 +-
 .../com/google/spanner/v1/Transaction.java    |   5 +-
 .../google/spanner/v1/TransactionOptions.java |  15 +-
 .../google/spanner/v1/TransactionProto.java   |   4 +-
 .../spanner/v1/TransactionSelector.java       |   5 +-
 .../main/java/com/google/spanner/v1/Type.java |   5 +-
 .../java/com/google/spanner/v1/TypeProto.java |   2 +-
 .../v1/LongRunningRecognizeMetadata.java      |   5 +-
 .../v1/LongRunningRecognizeRequest.java       |   5 +-
 .../v1/LongRunningRecognizeResponse.java      |   5 +-
 .../cloud/speech/v1/RecognitionAudio.java     |   5 +-
 .../cloud/speech/v1/RecognitionConfig.java    |   5 +-
 .../cloud/speech/v1/RecognizeRequest.java     |   5 +-
 .../cloud/speech/v1/RecognizeResponse.java    |   5 +-
 .../google/cloud/speech/v1/SpeechContext.java |   5 +-
 .../google/cloud/speech/v1/SpeechProto.java   |  14 +-
 .../v1/SpeechRecognitionAlternative.java      |   5 +-
 .../speech/v1/SpeechRecognitionResult.java    |   5 +-
 .../speech/v1/StreamingRecognitionConfig.java |   5 +-
 .../speech/v1/StreamingRecognitionResult.java |   5 +-
 .../speech/v1/StreamingRecognizeRequest.java  |   5 +-
 .../speech/v1/StreamingRecognizeResponse.java |   5 +-
 .../com/google/cloud/speech/v1/WordInfo.java  |   5 +-
 .../v1beta1/AsyncRecognizeMetadata.java       |   5 +-
 .../speech/v1beta1/AsyncRecognizeRequest.java |   5 +-
 .../v1beta1/AsyncRecognizeResponse.java       |   5 +-
 .../speech/v1beta1/RecognitionAudio.java      |   5 +-
 .../speech/v1beta1/RecognitionConfig.java     |   5 +-
 .../cloud/speech/v1beta1/SpeechContext.java   |   5 +-
 .../cloud/speech/v1beta1/SpeechProto.java     |  14 +-
 .../v1beta1/SpeechRecognitionAlternative.java |   5 +-
 .../v1beta1/SpeechRecognitionResult.java      |   5 +-
 .../v1beta1/StreamingRecognitionConfig.java   |   5 +-
 .../v1beta1/StreamingRecognitionResult.java   |   5 +-
 .../v1beta1/StreamingRecognizeRequest.java    |   5 +-
 .../v1beta1/StreamingRecognizeResponse.java   |   5 +-
 .../speech/v1beta1/SyncRecognizeRequest.java  |   5 +-
 .../speech/v1beta1/SyncRecognizeResponse.java |   5 +-
 .../cloud/texttospeech/v1/AudioConfig.java    |   5 +-
 .../texttospeech/v1/ListVoicesRequest.java    |   5 +-
 .../texttospeech/v1/ListVoicesResponse.java   |   5 +-
 .../cloud/texttospeech/v1/SynthesisInput.java |   5 +-
 .../v1/SynthesizeSpeechRequest.java           |   5 +-
 .../v1/SynthesizeSpeechResponse.java          |   5 +-
 .../texttospeech/v1/TextToSpeechProto.java    |  13 +-
 .../google/cloud/texttospeech/v1/Voice.java   |   5 +-
 .../texttospeech/v1/VoiceSelectionParams.java |   5 +-
 .../cloud/texttospeech/v1/cloud_tts.proto     |   2 -
 .../texttospeech/v1beta1/AudioConfig.java     |   5 +-
 .../v1beta1/ListVoicesRequest.java            |   5 +-
 .../v1beta1/ListVoicesResponse.java           |   5 +-
 .../texttospeech/v1beta1/SynthesisInput.java  |   5 +-
 .../v1beta1/SynthesizeSpeechRequest.java      |   5 +-
 .../v1beta1/SynthesizeSpeechResponse.java     |   5 +-
 .../v1beta1/TextToSpeechProto.java            |   8 +-
 .../cloud/texttospeech/v1beta1/Voice.java     |   5 +-
 .../v1beta1/VoiceSelectionParams.java         |   5 +-
 .../cloudtrace/v1/GetTraceRequest.java        |   5 +-
 .../cloudtrace/v1/ListTracesRequest.java      |   5 +-
 .../cloudtrace/v1/ListTracesResponse.java     |   5 +-
 .../cloudtrace/v1/PatchTracesRequest.java     |   5 +-
 .../google/devtools/cloudtrace/v1/Trace.java  |   5 +-
 .../devtools/cloudtrace/v1/TraceProto.java    |  10 +-
 .../devtools/cloudtrace/v1/TraceSpan.java     |   5 +-
 .../google/devtools/cloudtrace/v1/Traces.java |   5 +-
 .../cloudtrace/v2/AttributeValue.java         |   5 +-
 .../cloudtrace/v2/BatchWriteSpansRequest.java |   5 +-
 .../google/devtools/cloudtrace/v2/Module.java |   5 +-
 .../devtools/cloudtrace/v2/ProjectName.java   |   9 --
 .../google/devtools/cloudtrace/v2/Span.java   |  40 ++----
 .../devtools/cloudtrace/v2/SpanName.java      |   9 --
 .../devtools/cloudtrace/v2/StackTrace.java    |  15 +-
 .../devtools/cloudtrace/v2/TraceProto.java    |  16 +--
 .../devtools/cloudtrace/v2/TracingProto.java  |   2 +-
 .../cloudtrace/v2/TruncatableString.java      |   5 +-
 .../v1/AnnotateVideoProgress.java             |   5 +-
 .../v1/AnnotateVideoRequest.java              |   5 +-
 .../v1/AnnotateVideoResponse.java             |   5 +-
 .../cloud/videointelligence/v1/Entity.java    |   5 +-
 .../v1/ExplicitContentAnnotation.java         |   5 +-
 .../v1/ExplicitContentDetectionConfig.java    |   5 +-
 .../v1/ExplicitContentFrame.java              |   5 +-
 .../videointelligence/v1/FaceAnnotation.java  |   5 +-
 .../v1/FaceDetectionConfig.java               |   5 +-
 .../cloud/videointelligence/v1/FaceFrame.java |   5 +-
 .../videointelligence/v1/FaceSegment.java     |   5 +-
 .../videointelligence/v1/LabelAnnotation.java |   5 +-
 .../v1/LabelDetectionConfig.java              |   5 +-
 .../videointelligence/v1/LabelFrame.java      |   5 +-
 .../videointelligence/v1/LabelSegment.java    |   5 +-
 .../v1/NormalizedBoundingBox.java             |   5 +-
 .../v1/ShotChangeDetectionConfig.java         |   5 +-
 .../v1/VideoAnnotationProgress.java           |   5 +-
 .../v1/VideoAnnotationResults.java            |   5 +-
 .../videointelligence/v1/VideoContext.java    |   5 +-
 .../v1/VideoIntelligenceServiceProto.java     |  22 +--
 .../videointelligence/v1/VideoSegment.java    |   5 +-
 .../v1beta1/AnnotateVideoProgress.java        |   5 +-
 .../v1beta1/AnnotateVideoRequest.java         |   5 +-
 .../v1beta1/AnnotateVideoResponse.java        |   5 +-
 .../v1beta1/BoundingBox.java                  |   5 +-
 .../v1beta1/FaceAnnotation.java               |   5 +-
 .../v1beta1/FaceLocation.java                 |   5 +-
 .../v1beta1/LabelAnnotation.java              |   5 +-
 .../v1beta1/LabelLocation.java                |   5 +-
 .../v1beta1/SafeSearchAnnotation.java         |   5 +-
 .../v1beta1/VideoAnnotationProgress.java      |   5 +-
 .../v1beta1/VideoAnnotationResults.java       |   5 +-
 .../v1beta1/VideoContext.java                 |   5 +-
 .../VideoIntelligenceServiceProto.java        |  18 +--
 .../v1beta1/VideoSegment.java                 |   5 +-
 .../v1beta2/AnnotateVideoProgress.java        |   5 +-
 .../v1beta2/AnnotateVideoRequest.java         |   5 +-
 .../v1beta2/AnnotateVideoResponse.java        |   5 +-
 .../videointelligence/v1beta2/Entity.java     |   5 +-
 .../v1beta2/ExplicitContentAnnotation.java    |   5 +-
 .../ExplicitContentDetectionConfig.java       |   5 +-
 .../v1beta2/ExplicitContentFrame.java         |   5 +-
 .../v1beta2/FaceAnnotation.java               |   5 +-
 .../v1beta2/FaceDetectionConfig.java          |   5 +-
 .../videointelligence/v1beta2/FaceFrame.java  |   5 +-
 .../v1beta2/FaceSegment.java                  |   5 +-
 .../v1beta2/LabelAnnotation.java              |   5 +-
 .../v1beta2/LabelDetectionConfig.java         |   5 +-
 .../videointelligence/v1beta2/LabelFrame.java |   5 +-
 .../v1beta2/LabelSegment.java                 |   5 +-
 .../v1beta2/NormalizedBoundingBox.java        |   5 +-
 .../v1beta2/ShotChangeDetectionConfig.java    |   5 +-
 .../v1beta2/VideoAnnotationProgress.java      |   5 +-
 .../v1beta2/VideoAnnotationResults.java       |   5 +-
 .../v1beta2/VideoContext.java                 |   5 +-
 .../VideoIntelligenceServiceProto.java        |  22 +--
 .../v1beta2/VideoSegment.java                 |   5 +-
 .../v1p1beta1/AnnotateVideoProgress.java      |   5 +-
 .../v1p1beta1/AnnotateVideoRequest.java       |   5 +-
 .../v1p1beta1/AnnotateVideoResponse.java      |   5 +-
 .../videointelligence/v1p1beta1/Entity.java   |   5 +-
 .../v1p1beta1/ExplicitContentAnnotation.java  |   5 +-
 .../ExplicitContentDetectionConfig.java       |   5 +-
 .../v1p1beta1/ExplicitContentFrame.java       |   5 +-
 .../v1p1beta1/LabelAnnotation.java            |   5 +-
 .../v1p1beta1/LabelDetectionConfig.java       |   5 +-
 .../v1p1beta1/LabelFrame.java                 |   5 +-
 .../v1p1beta1/LabelSegment.java               |   5 +-
 .../v1p1beta1/NormalizedBoundingBox.java      |   5 +-
 .../v1p1beta1/ShotChangeDetectionConfig.java  |   5 +-
 .../v1p1beta1/SpeechContext.java              |   5 +-
 .../SpeechRecognitionAlternative.java         |   5 +-
 .../v1p1beta1/SpeechTranscription.java        |   5 +-
 .../v1p1beta1/SpeechTranscriptionConfig.java  |   5 +-
 .../v1p1beta1/VideoAnnotationProgress.java    |   5 +-
 .../v1p1beta1/VideoAnnotationResults.java     |   5 +-
 .../v1p1beta1/VideoContext.java               |   5 +-
 .../VideoIntelligenceServiceProto.java        |  24 ++--
 .../v1p1beta1/VideoSegment.java               |   5 +-
 .../videointelligence/v1p1beta1/WordInfo.java |   5 +-
 .../cloud/vision/v1/AnnotateFileResponse.java |   5 +-
 .../cloud/vision/v1/AnnotateImageRequest.java |   5 +-
 .../vision/v1/AnnotateImageResponse.java      |   5 +-
 .../vision/v1/AsyncAnnotateFileRequest.java   |   5 +-
 .../vision/v1/AsyncAnnotateFileResponse.java  |   5 +-
 .../v1/AsyncBatchAnnotateFilesRequest.java    |   5 +-
 .../v1/AsyncBatchAnnotateFilesResponse.java   |   5 +-
 .../vision/v1/BatchAnnotateImagesRequest.java |   5 +-
 .../v1/BatchAnnotateImagesResponse.java       |   5 +-
 .../com/google/cloud/vision/v1/Block.java     |   5 +-
 .../google/cloud/vision/v1/BoundingPoly.java  |   5 +-
 .../com/google/cloud/vision/v1/ColorInfo.java |   5 +-
 .../com/google/cloud/vision/v1/CropHint.java  |   5 +-
 .../cloud/vision/v1/CropHintsAnnotation.java  |   5 +-
 .../cloud/vision/v1/CropHintsParams.java      |   5 +-
 .../vision/v1/DominantColorsAnnotation.java   |   5 +-
 .../cloud/vision/v1/EntityAnnotation.java     |   5 +-
 .../cloud/vision/v1/FaceAnnotation.java       |  10 +-
 .../com/google/cloud/vision/v1/Feature.java   |   5 +-
 .../cloud/vision/v1/GcsDestination.java       |   5 +-
 .../com/google/cloud/vision/v1/GcsSource.java |   5 +-
 .../google/cloud/vision/v1/GeometryProto.java |   2 +-
 .../com/google/cloud/vision/v1/Image.java     |   5 +-
 .../vision/v1/ImageAnnotationContext.java     |   5 +-
 .../cloud/vision/v1/ImageAnnotatorProto.java  |  36 ++---
 .../google/cloud/vision/v1/ImageContext.java  |   5 +-
 .../cloud/vision/v1/ImageProperties.java      |   5 +-
 .../google/cloud/vision/v1/ImageSource.java   |   5 +-
 .../google/cloud/vision/v1/InputConfig.java   |   5 +-
 .../google/cloud/vision/v1/LatLongRect.java   |   5 +-
 .../google/cloud/vision/v1/LocationInfo.java  |   5 +-
 .../cloud/vision/v1/NormalizedVertex.java     |   5 +-
 .../cloud/vision/v1/OperationMetadata.java    |   5 +-
 .../google/cloud/vision/v1/OutputConfig.java  |   5 +-
 .../java/com/google/cloud/vision/v1/Page.java |   5 +-
 .../com/google/cloud/vision/v1/Paragraph.java |   5 +-
 .../com/google/cloud/vision/v1/Position.java  |   5 +-
 .../com/google/cloud/vision/v1/Property.java  |   5 +-
 .../cloud/vision/v1/SafeSearchAnnotation.java |   5 +-
 .../com/google/cloud/vision/v1/Symbol.java    |   5 +-
 .../cloud/vision/v1/TextAnnotation.java       |  20 +--
 .../cloud/vision/v1/TextAnnotationProto.java  |   8 +-
 .../com/google/cloud/vision/v1/Vertex.java    |   5 +-
 .../google/cloud/vision/v1/WebDetection.java  |  25 +---
 .../cloud/vision/v1/WebDetectionParams.java   |   5 +-
 .../cloud/vision/v1/WebDetectionProto.java    |   4 +-
 .../java/com/google/cloud/vision/v1/Word.java |   5 +-
 .../v1p1beta1/AnnotateImageRequest.java       |   5 +-
 .../v1p1beta1/AnnotateImageResponse.java      |   5 +-
 .../v1p1beta1/BatchAnnotateImagesRequest.java |   5 +-
 .../BatchAnnotateImagesResponse.java          |   5 +-
 .../google/cloud/vision/v1p1beta1/Block.java  |   5 +-
 .../cloud/vision/v1p1beta1/BoundingPoly.java  |   5 +-
 .../cloud/vision/v1p1beta1/ColorInfo.java     |   5 +-
 .../cloud/vision/v1p1beta1/CropHint.java      |   5 +-
 .../vision/v1p1beta1/CropHintsAnnotation.java |   5 +-
 .../vision/v1p1beta1/CropHintsParams.java     |   5 +-
 .../v1p1beta1/DominantColorsAnnotation.java   |   5 +-
 .../vision/v1p1beta1/EntityAnnotation.java    |   5 +-
 .../vision/v1p1beta1/FaceAnnotation.java      |  10 +-
 .../cloud/vision/v1p1beta1/Feature.java       |   5 +-
 .../google/cloud/vision/v1p1beta1/Image.java  |   5 +-
 .../vision/v1p1beta1/ImageAnnotatorProto.java |  30 ++--
 .../cloud/vision/v1p1beta1/ImageContext.java  |   5 +-
 .../vision/v1p1beta1/ImageProperties.java     |   5 +-
 .../cloud/vision/v1p1beta1/ImageSource.java   |   5 +-
 .../cloud/vision/v1p1beta1/LatLongRect.java   |   5 +-
 .../cloud/vision/v1p1beta1/LocationInfo.java  |   5 +-
 .../google/cloud/vision/v1p1beta1/Page.java   |   5 +-
 .../cloud/vision/v1p1beta1/Paragraph.java     |   5 +-
 .../cloud/vision/v1p1beta1/Position.java      |   5 +-
 .../cloud/vision/v1p1beta1/Property.java      |   5 +-
 .../v1p1beta1/SafeSearchAnnotation.java       |   5 +-
 .../google/cloud/vision/v1p1beta1/Symbol.java |   5 +-
 .../vision/v1p1beta1/TextAnnotation.java      |  20 +--
 .../vision/v1p1beta1/TextAnnotationProto.java |  10 +-
 .../google/cloud/vision/v1p1beta1/Vertex.java |   5 +-
 .../cloud/vision/v1p1beta1/WebDetection.java  |  25 +---
 .../vision/v1p1beta1/WebDetectionParams.java  |   5 +-
 .../vision/v1p1beta1/WebDetectionProto.java   |   4 +-
 .../google/cloud/vision/v1p1beta1/Word.java   |   5 +-
 .../v1p2beta1/AnnotateFileResponse.java       |   5 +-
 .../v1p2beta1/AnnotateImageRequest.java       |   5 +-
 .../v1p2beta1/AnnotateImageResponse.java      |   5 +-
 .../v1p2beta1/AsyncAnnotateFileRequest.java   |   5 +-
 .../v1p2beta1/AsyncAnnotateFileResponse.java  |   5 +-
 .../AsyncBatchAnnotateFilesRequest.java       |   5 +-
 .../AsyncBatchAnnotateFilesResponse.java      |   5 +-
 .../v1p2beta1/BatchAnnotateImagesRequest.java |   5 +-
 .../BatchAnnotateImagesResponse.java          |   5 +-
 .../google/cloud/vision/v1p2beta1/Block.java  |   5 +-
 .../cloud/vision/v1p2beta1/BoundingPoly.java  |   5 +-
 .../cloud/vision/v1p2beta1/ColorInfo.java     |   5 +-
 .../cloud/vision/v1p2beta1/CropHint.java      |   5 +-
 .../vision/v1p2beta1/CropHintsAnnotation.java |   5 +-
 .../vision/v1p2beta1/CropHintsParams.java     |   5 +-
 .../v1p2beta1/DominantColorsAnnotation.java   |   5 +-
 .../vision/v1p2beta1/EntityAnnotation.java    |   5 +-
 .../vision/v1p2beta1/FaceAnnotation.java      |  10 +-
 .../cloud/vision/v1p2beta1/Feature.java       |   5 +-
 .../vision/v1p2beta1/GcsDestination.java      |   5 +-
 .../cloud/vision/v1p2beta1/GcsSource.java     |   5 +-
 .../cloud/vision/v1p2beta1/GeometryProto.java |   2 +-
 .../google/cloud/vision/v1p2beta1/Image.java  |   5 +-
 .../v1p2beta1/ImageAnnotationContext.java     |   5 +-
 .../vision/v1p2beta1/ImageAnnotatorProto.java |  38 ++---
 .../cloud/vision/v1p2beta1/ImageContext.java  |   5 +-
 .../vision/v1p2beta1/ImageProperties.java     |   5 +-
 .../cloud/vision/v1p2beta1/ImageSource.java   |   5 +-
 .../cloud/vision/v1p2beta1/InputConfig.java   |   5 +-
 .../cloud/vision/v1p2beta1/LatLongRect.java   |   5 +-
 .../cloud/vision/v1p2beta1/LocationInfo.java  |   5 +-
 .../vision/v1p2beta1/NormalizedVertex.java    |   5 +-
 .../vision/v1p2beta1/OperationMetadata.java   |   5 +-
 .../cloud/vision/v1p2beta1/OutputConfig.java  |   5 +-
 .../google/cloud/vision/v1p2beta1/Page.java   |   5 +-
 .../cloud/vision/v1p2beta1/Paragraph.java     |   5 +-
 .../cloud/vision/v1p2beta1/Position.java      |   5 +-
 .../cloud/vision/v1p2beta1/Property.java      |   5 +-
 .../v1p2beta1/SafeSearchAnnotation.java       |   5 +-
 .../google/cloud/vision/v1p2beta1/Symbol.java |   5 +-
 .../vision/v1p2beta1/TextAnnotation.java      |  20 +--
 .../vision/v1p2beta1/TextAnnotationProto.java |  10 +-
 .../google/cloud/vision/v1p2beta1/Vertex.java |   5 +-
 .../cloud/vision/v1p2beta1/WebDetection.java  |  25 +---
 .../vision/v1p2beta1/WebDetectionParams.java  |   5 +-
 .../vision/v1p2beta1/WebDetectionProto.java   |   4 +-
 .../google/cloud/vision/v1p2beta1/Word.java   |   5 +-
 .../v1alpha/CrawledUrl.java                   |   5 +-
 .../v1alpha/CreateScanConfigRequest.java      |   5 +-
 .../v1alpha/DeleteScanConfigRequest.java      |   5 +-
 .../websecurityscanner/v1alpha/Finding.java   |   5 +-
 .../v1alpha/FindingAddonProto.java            |   2 +-
 .../v1alpha/FindingName.java                  |   9 --
 .../v1alpha/FindingProto.java                 |   4 +-
 .../v1alpha/FindingTypeStats.java             |   5 +-
 .../v1alpha/FindingTypeStatsProto.java        |   2 +-
 .../v1alpha/GetFindingRequest.java            |   5 +-
 .../v1alpha/GetScanConfigRequest.java         |   5 +-
 .../v1alpha/GetScanRunRequest.java            |   5 +-
 .../v1alpha/ListCrawledUrlsRequest.java       |   5 +-
 .../v1alpha/ListCrawledUrlsResponse.java      |   5 +-
 .../v1alpha/ListFindingTypeStatsRequest.java  |   5 +-
 .../v1alpha/ListFindingTypeStatsResponse.java |   5 +-
 .../v1alpha/ListFindingsRequest.java          |   5 +-
 .../v1alpha/ListFindingsResponse.java         |   5 +-
 .../v1alpha/ListScanConfigsRequest.java       |   5 +-
 .../v1alpha/ListScanConfigsResponse.java      |   5 +-
 .../v1alpha/ListScanRunsRequest.java          |   5 +-
 .../v1alpha/ListScanRunsResponse.java         |   5 +-
 .../v1alpha/OutdatedLibrary.java              |   5 +-
 .../v1alpha/ProjectName.java                  |   9 --
 .../v1alpha/ScanConfig.java                   |  25 +---
 .../v1alpha/ScanConfigName.java               |   9 --
 .../v1alpha/ScanConfigProto.java              |   6 +-
 .../websecurityscanner/v1alpha/ScanRun.java   |   5 +-
 .../v1alpha/ScanRunName.java                  |   9 --
 .../v1alpha/ScanRunProto.java                 |   4 +-
 .../v1alpha/StartScanRunRequest.java          |   5 +-
 .../v1alpha/StopScanRunRequest.java           |   5 +-
 .../v1alpha/UpdateScanConfigRequest.java      |   5 +-
 .../v1alpha/ViolatingResource.java            |   5 +-
 .../v1alpha/VulnerableParameters.java         |   5 +-
 .../v1alpha/WebSecurityScannerProto.java      |  22 +--
 .../cloud/websecurityscanner/v1alpha/Xss.java |   5 +-
 google-cloud-bom/pom.xml                      |  12 +-
 .../bigtable/data/v2/models/InstanceName.java |   7 -
 google-cloud-clients/pom.xml                  |   4 +-
 1297 files changed, 2028 insertions(+), 6880 deletions(-)

diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index a32cc6772202..cb0943fa21a5 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -112,7 +112,7 @@
       
         com.google.api
         api-common
-        1.5.0
+        1.6.0
       
       
         com.google.api.grpc
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsRequest.java
index 660135f59cf6..ea85946ffdc4 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsRequest.java
@@ -38,9 +38,6 @@ private CheckValidCredsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -548,7 +545,7 @@ public CheckValidCredsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckValidCredsRequest(input, extensionRegistry);
+        return new CheckValidCredsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsResponse.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsResponse.java
index 06039cfd9254..57465fde5e0f 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsResponse.java
@@ -33,9 +33,6 @@ private CheckValidCredsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -451,7 +448,7 @@ public CheckValidCredsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckValidCredsResponse(input, extensionRegistry);
+        return new CheckValidCredsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CreateTransferConfigRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CreateTransferConfigRequest.java
index c1dc9ac4ba65..924ad6700d08 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CreateTransferConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CreateTransferConfigRequest.java
@@ -39,9 +39,6 @@ private CreateTransferConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1044,7 +1041,7 @@ public CreateTransferConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTransferConfigRequest(input, extensionRegistry);
+        return new CreateTransferConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSource.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSource.java
index ebb4157ef2d3..6c6fb120e785 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSource.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSource.java
@@ -50,9 +50,6 @@ private DataSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3461,7 +3458,7 @@ public DataSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DataSource(input, extensionRegistry);
+        return new DataSource(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSourceParameter.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSourceParameter.java
index 839d9b0188dd..588b6f0f85b4 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSourceParameter.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSourceParameter.java
@@ -50,9 +50,6 @@ private DataSourceParameter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3063,7 +3060,7 @@ public DataSourceParameter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DataSourceParameter(input, extensionRegistry);
+        return new DataSourceParameter(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferProto.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferProto.java
index 1b546165dc7e..44ccbc538f84 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferProto.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferProto.java
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "to\032 google/protobuf/field_mask.proto\032\037go" +
       "ogle/protobuf/timestamp.proto\032\036google/pr" +
       "otobuf/wrappers.proto\"\361\004\n\023DataSourcePara" +
-      "meter\022\020\n\010param_id\030\001 \001(\t\022\024\n\014display_name\030" +
+      "meter\022\020\n\010param_id\030\001 \001(\t\022\024\n\014display_name\030",
       "\002 \001(\t\022\023\n\013description\030\003 \001(\t\022M\n\004type\030\004 \001(\016" +
       "2?.google.cloud.bigquery.datatransfer.v1" +
       ".DataSourceParameter.Type\022\020\n\010required\030\005 " +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "\022/\n\tmax_value\030\n \001(\0132\034.google.protobuf.Do" +
       "ubleValue\022J\n\006fields\030\013 \003(\0132:.google.cloud" +
       ".bigquery.datatransfer.v1.DataSourcePara" +
-      "meter\022\036\n\026validation_description\030\014 \001(\t\022\033\n" +
+      "meter\022\036\n\026validation_description\030\014 \001(\t\022\033\n",
       "\023validation_help_url\030\r \001(\t\022\021\n\timmutable\030" +
       "\016 \001(\010\022\017\n\007recurse\030\017 \001(\010\"i\n\004Type\022\024\n\020TYPE_U" +
       "NSPECIFIED\020\000\022\n\n\006STRING\020\001\022\013\n\007INTEGER\020\002\022\n\n" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       " \001(\t\022\023\n\013description\030\004 \001(\t\022\021\n\tclient_id\030\005" +
       " \001(\t\022\016\n\006scopes\030\006 \003(\t\022J\n\rtransfer_type\030\007 " +
       "\001(\01623.google.cloud.bigquery.datatransfer" +
-      ".v1.TransferType\022#\n\033supports_multiple_tr" +
+      ".v1.TransferType\022#\n\033supports_multiple_tr",
       "ansfers\030\010 \001(\010\022\037\n\027update_deadline_seconds" +
       "\030\t \001(\005\022\030\n\020default_schedule\030\n \001(\t\022 \n\030supp" +
       "orts_custom_schedule\030\013 \001(\010\022N\n\nparameters" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "e.cloud.bigquery.datatransfer.v1.DataSou" +
       "rce.AuthorizationType\022\\\n\021data_refresh_ty" +
       "pe\030\017 \001(\0162A.google.cloud.bigquery.datatra" +
-      "nsfer.v1.DataSource.DataRefreshType\022(\n d" +
+      "nsfer.v1.DataSource.DataRefreshType\022(\n d",
       "efault_data_refresh_window_days\030\020 \001(\005\022\034\n" +
       "\024manual_runs_disabled\030\021 \001(\010\022<\n\031minimum_s" +
       "chedule_interval\030\022 \001(\0132\031.google.protobuf" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "CODE\020\002\"c\n\017DataRefreshType\022!\n\035DATA_REFRES" +
       "H_TYPE_UNSPECIFIED\020\000\022\022\n\016SLIDING_WINDOW\020\001" +
       "\022\031\n\025CUSTOM_SLIDING_WINDOW\020\002\"$\n\024GetDataSo" +
-      "urceRequest\022\014\n\004name\030\001 \001(\t\"O\n\026ListDataSou" +
+      "urceRequest\022\014\n\004name\030\001 \001(\t\"O\n\026ListDataSou",
       "rcesRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_toke" +
       "n\030\003 \001(\t\022\021\n\tpage_size\030\004 \001(\005\"{\n\027ListDataSo" +
       "urcesResponse\022G\n\014data_sources\030\001 \003(\01321.go" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "N\n\017transfer_config\030\002 \001(\01325.google.cloud." +
       "bigquery.datatransfer.v1.TransferConfig\022" +
       "\032\n\022authorization_code\030\003 \001(\t\"\272\001\n\033UpdateTr" +
-      "ansferConfigRequest\022N\n\017transfer_config\030\001" +
+      "ansferConfigRequest\022N\n\017transfer_config\030\001",
       " \001(\01325.google.cloud.bigquery.datatransfe" +
       "r.v1.TransferConfig\022\032\n\022authorization_cod" +
       "e\030\003 \001(\t\022/\n\013update_mask\030\004 \001(\0132\032.google.pr" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "nRequest\022\014\n\004name\030\001 \001(\t\"(\n\030DeleteTransfer" +
       "RunRequest\022\014\n\004name\030\001 \001(\t\"l\n\032ListTransfer" +
       "ConfigsRequest\022\016\n\006parent\030\001 \001(\t\022\027\n\017data_s" +
-      "ource_ids\030\002 \003(\t\022\022\n\npage_token\030\003 \001(\t\022\021\n\tp" +
+      "ource_ids\030\002 \003(\t\022\022\n\npage_token\030\003 \001(\t\022\021\n\tp",
       "age_size\030\004 \001(\005\"\207\001\n\033ListTransferConfigsRe" +
       "sponse\022O\n\020transfer_configs\030\001 \003(\01325.googl" +
       "e.cloud.bigquery.datatransfer.v1.Transfe" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "atransfer.v1.TransferState\022\022\n\npage_token" +
       "\030\003 \001(\t\022\021\n\tpage_size\030\004 \001(\005\022^\n\013run_attempt" +
       "\030\005 \001(\0162I.google.cloud.bigquery.datatrans" +
-      "fer.v1.ListTransferRunsRequest.RunAttemp" +
+      "fer.v1.ListTransferRunsRequest.RunAttemp",
       "t\"5\n\nRunAttempt\022\033\n\027RUN_ATTEMPT_UNSPECIFI" +
       "ED\020\000\022\n\n\006LATEST\020\001\"~\n\030ListTransferRunsResp" +
       "onse\022I\n\rtransfer_runs\030\001 \003(\01322.google.clo" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "en\030\004 \001(\t\022\021\n\tpage_size\030\005 \001(\005\022]\n\rmessage_t" +
       "ypes\030\006 \003(\0162F.google.cloud.bigquery.datat" +
       "ransfer.v1.TransferMessage.MessageSeveri" +
-      "ty\"\206\001\n\030ListTransferLogsResponse\022Q\n\021trans" +
+      "ty\"\206\001\n\030ListTransferLogsResponse\022Q\n\021trans",
       "fer_messages\030\001 \003(\01326.google.cloud.bigque" +
       "ry.datatransfer.v1.TransferMessage\022\027\n\017ne" +
       "xt_page_token\030\002 \001(\t\"&\n\026CheckValidCredsRe" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       ".\n\nstart_time\030\002 \001(\0132\032.google.protobuf.Ti" +
       "mestamp\022,\n\010end_time\030\003 \001(\0132\032.google.proto" +
       "buf.Timestamp\"`\n\034ScheduleTransferRunsRes" +
-      "ponse\022@\n\004runs\030\001 \003(\01322.google.cloud.bigqu" +
+      "ponse\022@\n\004runs\030\001 \003(\01322.google.cloud.bigqu",
       "ery.datatransfer.v1.TransferRun2\206\033\n\023Data" +
       "TransferService\022\337\001\n\rGetDataSource\022;.goog" +
       "le.cloud.bigquery.datatransfer.v1.GetDat" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "*}Z%\022#/v1/{name=projects/*/dataSources/*" +
       "}\022\360\001\n\017ListDataSources\022=.google.cloud.big" +
       "query.datatransfer.v1.ListDataSourcesReq" +
-      "uest\032>.google.cloud.bigquery.datatransfe" +
+      "uest\032>.google.cloud.bigquery.datatransfe",
       "r.v1.ListDataSourcesResponse\"^\202\323\344\223\002X\022//v" +
       "1/{parent=projects/*/locations/*}/dataSo" +
       "urcesZ%\022#/v1/{parent=projects/*}/dataSou" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       "y.datatransfer.v1.TransferConfig\"\211\001\202\323\344\223\002" +
       "\202\001\"3/v1/{parent=projects/*/locations/*}/" +
       "transferConfigs:\017transfer_configZ:\"\'/v1/" +
-      "{parent=projects/*}/transferConfigs:\017tra" +
+      "{parent=projects/*}/transferConfigs:\017tra",
       "nsfer_config\022\275\002\n\024UpdateTransferConfig\022B." +
       "google.cloud.bigquery.datatransfer.v1.Up" +
       "dateTransferConfigRequest\0325.google.cloud" +
@@ -257,7 +257,7 @@ public static void registerAllExtensions(
       "\017transfer_configZJ27/v1/{transfer_config" +
       ".name=projects/*/transferConfigs/*}:\017tra" +
       "nsfer_config\022\332\001\n\024DeleteTransferConfig\022B." +
-      "google.cloud.bigquery.datatransfer.v1.De" +
+      "google.cloud.bigquery.datatransfer.v1.De",
       "leteTransferConfigRequest\032\026.google.proto" +
       "buf.Empty\"f\202\323\344\223\002`*3/v1/{name=projects/*/" +
       "locations/*/transferConfigs/*}Z)*\'/v1/{n" +
@@ -267,7 +267,7 @@ public static void registerAllExtensions(
       "\0325.google.cloud.bigquery.datatransfer.v1" +
       ".TransferConfig\"f\202\323\344\223\002`\0223/v1/{name=proje" +
       "cts/*/locations/*/transferConfigs/*}Z)\022\'" +
-      "/v1/{name=projects/*/transferConfigs/*}\022" +
+      "/v1/{name=projects/*/transferConfigs/*}\022",
       "\204\002\n\023ListTransferConfigs\022A.google.cloud.b" +
       "igquery.datatransfer.v1.ListTransferConf" +
       "igsRequest\032B.google.cloud.bigquery.datat" +
@@ -277,7 +277,7 @@ public static void registerAllExtensions(
       "cts/*}/transferConfigs\022\255\002\n\024ScheduleTrans" +
       "ferRuns\022B.google.cloud.bigquery.datatran" +
       "sfer.v1.ScheduleTransferRunsRequest\032C.go" +
-      "ogle.cloud.bigquery.datatransfer.v1.Sche" +
+      "ogle.cloud.bigquery.datatransfer.v1.Sche",
       "duleTransferRunsResponse\"\213\001\202\323\344\223\002\204\001\"B/v1/" +
       "{parent=projects/*/locations/*/transferC" +
       "onfigs/*}:scheduleRuns:\001*Z;\"6/v1/{parent" +
@@ -287,7 +287,7 @@ public static void registerAllExtensions(
       "Request\0322.google.cloud.bigquery.datatran" +
       "sfer.v1.TransferRun\"t\202\323\344\223\002n\022:/v1/{name=p" +
       "rojects/*/locations/*/transferConfigs/*/" +
-      "runs/*}Z0\022./v1/{name=projects/*/transfer" +
+      "runs/*}Z0\022./v1/{name=projects/*/transfer",
       "Configs/*/runs/*}\022\342\001\n\021DeleteTransferRun\022" +
       "?.google.cloud.bigquery.datatransfer.v1." +
       "DeleteTransferRunRequest\032\026.google.protob" +
@@ -297,7 +297,7 @@ public static void registerAllExtensions(
       "uns/*}\022\211\002\n\020ListTransferRuns\022>.google.clo" +
       "ud.bigquery.datatransfer.v1.ListTransfer" +
       "RunsRequest\032?.google.cloud.bigquery.data" +
-      "transfer.v1.ListTransferRunsResponse\"t\202\323" +
+      "transfer.v1.ListTransferRunsResponse\"t\202\323",
       "\344\223\002n\022:/v1/{parent=projects/*/locations/*" +
       "/transferConfigs/*}/runsZ0\022./v1/{parent=" +
       "projects/*/transferConfigs/*}/runs\022\251\002\n\020L" +
@@ -307,7 +307,7 @@ public static void registerAllExtensions(
       "ListTransferLogsResponse\"\223\001\202\323\344\223\002\214\001\022I/v1/" +
       "{parent=projects/*/locations/*/transferC" +
       "onfigs/*/runs/*}/transferLogsZ?\022=/v1/{pa" +
-      "rent=projects/*/transferConfigs/*/runs/*" +
+      "rent=projects/*/transferConfigs/*/runs/*",
       "}/transferLogs\022\227\002\n\017CheckValidCreds\022=.goo" +
       "gle.cloud.bigquery.datatransfer.v1.Check" +
       "ValidCredsRequest\032>.google.cloud.bigquer" +
@@ -317,7 +317,7 @@ public static void registerAllExtensions(
       "\"3/v1/{name=projects/*/dataSources/*}:ch" +
       "eckValidCreds:\001*B\343\001\n)com.google.cloud.bi" +
       "gquery.datatransfer.v1B\021DataTransferProt" +
-      "oP\001ZQgoogle.golang.org/genproto/googleap" +
+      "oP\001ZQgoogle.golang.org/genproto/googleap",
       "is/cloud/bigquery/datatransfer/v1;datatr" +
       "ansfer\252\002%Google.Cloud.BigQuery.DataTrans" +
       "fer.V1\312\002%Google\\Cloud\\BigQuery\\DataTrans" +
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferConfigRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferConfigRequest.java
index 446f3cbc88a7..d6d50d1f06aa 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferConfigRequest.java
@@ -34,9 +34,6 @@ private DeleteTransferConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -540,7 +537,7 @@ public DeleteTransferConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteTransferConfigRequest(input, extensionRegistry);
+        return new DeleteTransferConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferRunRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferRunRequest.java
index e8b74201c273..fe71387ccf2f 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferRunRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferRunRequest.java
@@ -33,9 +33,6 @@ private DeleteTransferRunRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteTransferRunRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteTransferRunRequest(input, extensionRegistry);
+        return new DeleteTransferRunRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetDataSourceRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetDataSourceRequest.java
index 8a50c78dedef..14e890f86958 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetDataSourceRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetDataSourceRequest.java
@@ -33,9 +33,6 @@ private GetDataSourceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetDataSourceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDataSourceRequest(input, extensionRegistry);
+        return new GetDataSourceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferConfigRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferConfigRequest.java
index 95acc10cf554..81ab342a4468 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferConfigRequest.java
@@ -33,9 +33,6 @@ private GetTransferConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetTransferConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetTransferConfigRequest(input, extensionRegistry);
+        return new GetTransferConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferRunRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferRunRequest.java
index 4d1a85d360f3..4b8c670a3491 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferRunRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferRunRequest.java
@@ -33,9 +33,6 @@ private GetTransferRunRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetTransferRunRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetTransferRunRequest(input, extensionRegistry);
+        return new GetTransferRunRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesRequest.java
index f936e260327c..d43168dbdb21 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesRequest.java
@@ -35,9 +35,6 @@ private ListDataSourcesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -795,7 +792,7 @@ public ListDataSourcesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDataSourcesRequest(input, extensionRegistry);
+        return new ListDataSourcesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesResponse.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesResponse.java
index e392b0bd72c4..4ebb51012142 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesResponse.java
@@ -34,9 +34,6 @@ private ListDataSourcesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -992,7 +989,7 @@ public ListDataSourcesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDataSourcesResponse(input, extensionRegistry);
+        return new ListDataSourcesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsRequest.java
index 9d70c8ae7630..6f1584543667 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsRequest.java
@@ -36,9 +36,6 @@ private ListTransferConfigsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1022,7 +1019,7 @@ public ListTransferConfigsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTransferConfigsRequest(input, extensionRegistry);
+        return new ListTransferConfigsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsResponse.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsResponse.java
index 785cc57ce350..5879e6ffc891 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsResponse.java
@@ -34,9 +34,6 @@ private ListTransferConfigsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -992,7 +989,7 @@ public ListTransferConfigsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTransferConfigsResponse(input, extensionRegistry);
+        return new ListTransferConfigsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsRequest.java
index 062ba146531a..3ccd5583b086 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsRequest.java
@@ -36,9 +36,6 @@ private ListTransferLogsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1117,7 +1114,7 @@ public ListTransferLogsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTransferLogsRequest(input, extensionRegistry);
+        return new ListTransferLogsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsResponse.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsResponse.java
index c283e853167a..bc407d91cb48 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsResponse.java
@@ -34,9 +34,6 @@ private ListTransferLogsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -992,7 +989,7 @@ public ListTransferLogsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTransferLogsResponse(input, extensionRegistry);
+        return new ListTransferLogsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsRequest.java
index 441fce7afce5..2723a2c3137f 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsRequest.java
@@ -39,9 +39,6 @@ private ListTransferRunsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1340,7 +1337,7 @@ public ListTransferRunsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTransferRunsRequest(input, extensionRegistry);
+        return new ListTransferRunsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsResponse.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsResponse.java
index 68059b01e470..9977d85d41f4 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsResponse.java
@@ -34,9 +34,6 @@ private ListTransferRunsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -992,7 +989,7 @@ public ListTransferRunsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTransferRunsResponse(input, extensionRegistry);
+        return new ListTransferRunsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationDataSourceName.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationDataSourceName.java
index 9467d4db46e9..ebb05285eea4 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationDataSourceName.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationDataSourceName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("LocationDataSourceName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "location", location, "data_source", dataSource);
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationName.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationName.java
index 41b07e8abedf..d3ec63bf647a 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationName.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("LocationName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "location", location);
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationRunName.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationRunName.java
index 179c67005885..04ba2e8a87a1 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationRunName.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationRunName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -140,14 +139,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("LocationRunName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "location", location, "transfer_config", transferConfig, "run", run);
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationTransferConfigName.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationTransferConfigName.java
index 39cf33ff6dba..a20e9790c498 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationTransferConfigName.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/LocationTransferConfigName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("LocationTransferConfigName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "location", location, "transfer_config", transferConfig);
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectDataSourceName.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectDataSourceName.java
index 250254dfdbc5..b02d15669a33 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectDataSourceName.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectDataSourceName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectDataSourceName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "data_source", dataSource);
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectName.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectName.java
index 3edbb300877d..18bec1b8bab1 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectRunName.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectRunName.java
index c22a3cb13eeb..19d4b092f529 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectRunName.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectRunName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectRunName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "transfer_config", transferConfig, "run", run);
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectTransferConfigName.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectTransferConfigName.java
index eda17091223b..de27a3900257 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectTransferConfigName.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ProjectTransferConfigName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectTransferConfigName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "transfer_config", transferConfig);
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsRequest.java
index cee3426069ff..9f11c068aec2 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsRequest.java
@@ -33,9 +33,6 @@ private ScheduleTransferRunsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1020,7 +1017,7 @@ public ScheduleTransferRunsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ScheduleTransferRunsRequest(input, extensionRegistry);
+        return new ScheduleTransferRunsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsResponse.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsResponse.java
index b869955ce34b..87dbdd59006e 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsResponse.java
@@ -33,9 +33,6 @@ private ScheduleTransferRunsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public ScheduleTransferRunsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ScheduleTransferRunsResponse(input, extensionRegistry);
+        return new ScheduleTransferRunsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferConfig.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferConfig.java
index bc2a3cfac9aa..5ba24ee3d31e 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferConfig.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferConfig.java
@@ -47,9 +47,6 @@ private TransferConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2490,7 +2487,7 @@ public TransferConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransferConfig(input, extensionRegistry);
+        return new TransferConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferMessage.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferMessage.java
index aa099bc27d37..e1091af4a04c 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferMessage.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferMessage.java
@@ -34,9 +34,6 @@ private TransferMessage(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1023,7 +1020,7 @@ public TransferMessage parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransferMessage(input, extensionRegistry);
+        return new TransferMessage(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferProto.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferProto.java
index 9637c2a6eb59..6220bf3e7478 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferProto.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       " \001(\t\022\036\n\026destination_dataset_id\030\002 \001(\t\022\024\n\014" +
       "display_name\030\003 \001(\t\022\026\n\016data_source_id\030\005 \001" +
       "(\t\022\'\n\006params\030\t \001(\0132\027.google.protobuf.Str" +
-      "uct\022\020\n\010schedule\030\007 \001(\t\022 \n\030data_refresh_wi" +
+      "uct\022\020\n\010schedule\030\007 \001(\t\022 \n\030data_refresh_wi",
       "ndow_days\030\014 \001(\005\022\020\n\010disabled\030\r \001(\010\022/\n\013upd" +
       "ate_time\030\004 \001(\0132\032.google.protobuf.Timesta" +
       "mp\0221\n\rnext_run_time\030\010 \001(\0132\032.google.proto" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "\001(\t\"\376\003\n\013TransferRun\022\014\n\004name\030\001 \001(\t\0221\n\rsch" +
       "edule_time\030\003 \001(\0132\032.google.protobuf.Times" +
       "tamp\022,\n\010run_time\030\n \001(\0132\032.google.protobuf" +
-      ".Timestamp\022(\n\014error_status\030\025 \001(\0132\022.googl" +
+      ".Timestamp\022(\n\014error_status\030\025 \001(\0132\022.googl",
       "e.rpc.Status\022.\n\nstart_time\030\004 \001(\0132\032.googl" +
       "e.protobuf.Timestamp\022,\n\010end_time\030\005 \001(\0132\032" +
       ".google.protobuf.Timestamp\022/\n\013update_tim" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "rce_id\030\007 \001(\t\022C\n\005state\030\010 \001(\01624.google.clo" +
       "ud.bigquery.datatransfer.v1.TransferStat" +
       "e\022\017\n\007user_id\030\013 \001(\003\022\020\n\010schedule\030\014 \001(\t\"\212\002\n" +
-      "\017TransferMessage\0220\n\014message_time\030\001 \001(\0132\032" +
+      "\017TransferMessage\0220\n\014message_time\030\001 \001(\0132\032",
       ".google.protobuf.Timestamp\022X\n\010severity\030\002" +
       " \001(\0162F.google.cloud.bigquery.datatransfe" +
       "r.v1.TransferMessage.MessageSeverity\022\024\n\014" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "e\022\035\n\031TRANSFER_TYPE_UNSPECIFIED\020\000\022\t\n\005BATC" +
       "H\020\001\022\r\n\tSTREAMING\020\002*s\n\rTransferState\022\036\n\032T" +
       "RANSFER_STATE_UNSPECIFIED\020\000\022\013\n\007PENDING\020\002" +
-      "\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED\020\004\022\n\n\006FAILED\020\005" +
+      "\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED\020\004\022\n\n\006FAILED\020\005",
       "\022\r\n\tCANCELLED\020\006B\347\001\n)com.google.cloud.big" +
       "query.datatransfer.v1B\rTransferProtoP\001ZQ" +
       "google.golang.org/genproto/googleapis/cl" +
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferRun.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferRun.java
index 7bf0c66f1ab7..1121c21c750f 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferRun.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferRun.java
@@ -38,9 +38,6 @@ private TransferRun(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2886,7 +2883,7 @@ public TransferRun parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransferRun(input, extensionRegistry);
+        return new TransferRun(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedDataSourceName.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedDataSourceName.java
index f4d0b3409f44..61893290406f 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedDataSourceName.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedDataSourceName.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,14 +79,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UntypedDataSourceName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return rawValue;
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedParentName.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedParentName.java
index d3ac99171644..9375186c6daa 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedParentName.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedParentName.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,14 +79,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UntypedParentName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return rawValue;
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedRunName.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedRunName.java
index f69d83d272a6..5ae88ca39b3a 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedRunName.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedRunName.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,14 +79,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UntypedRunName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return rawValue;
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedTransferConfigName.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedTransferConfigName.java
index 1e75d3ec9f95..b656a7938b1f 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedTransferConfigName.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UntypedTransferConfigName.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,14 +79,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UntypedTransferConfigName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return rawValue;
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UpdateTransferConfigRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UpdateTransferConfigRequest.java
index b48e30a5f995..591bbed8ee87 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UpdateTransferConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UpdateTransferConfigRequest.java
@@ -34,9 +34,6 @@ private UpdateTransferConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1089,7 +1086,7 @@ public UpdateTransferConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateTransferConfigRequest(input, extensionRegistry);
+        return new UpdateTransferConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java
index 7cd0837dd1b8..0edffb99d612 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java
@@ -36,9 +36,6 @@ private AppProfile(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -163,9 +160,6 @@ private MultiClusterRoutingUseAny(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -509,7 +503,7 @@ public MultiClusterRoutingUseAny parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new MultiClusterRoutingUseAny(input, extensionRegistry);
+          return new MultiClusterRoutingUseAny(input, extensionRegistry);
       }
     };
 
@@ -594,9 +588,6 @@ private SingleClusterRouting(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1176,7 +1167,7 @@ public SingleClusterRouting parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SingleClusterRouting(input, extensionRegistry);
+          return new SingleClusterRouting(input, extensionRegistry);
       }
     };
 
@@ -2546,7 +2537,7 @@ public AppProfile parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AppProfile(input, extensionRegistry);
+        return new AppProfile(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfileName.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfileName.java
index 91513006b94f..7e2754b5da55 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfileName.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfileName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("AppProfileName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance", instance, "app_profile", appProfile);
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java
index 9927bf2348cc..fa0b536d1090 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "ions.proto\032\033google/protobuf/empty.proto\032" +
       " google/protobuf/field_mask.proto\032\037googl" +
       "e/protobuf/timestamp.proto\"\227\002\n\025CreateIns" +
-      "tanceRequest\022\016\n\006parent\030\001 \001(\t\022\023\n\013instance" +
+      "tanceRequest\022\016\n\006parent\030\001 \001(\t\022\023\n\013instance",
       "_id\030\002 \001(\t\0224\n\010instance\030\003 \001(\0132\".google.big" +
       "table.admin.v2.Instance\022O\n\010clusters\030\004 \003(" +
       "\0132=.google.bigtable.admin.v2.CreateInsta" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "nceRequest\022\014\n\004name\030\001 \001(\t\":\n\024ListInstance" +
       "sRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_token\030\002" +
       " \001(\t\"\201\001\n\025ListInstancesResponse\0225\n\tinstan" +
-      "ces\030\001 \003(\0132\".google.bigtable.admin.v2.Ins" +
+      "ces\030\001 \003(\0132\".google.bigtable.admin.v2.Ins",
       "tance\022\030\n\020failed_locations\030\002 \003(\t\022\027\n\017next_" +
       "page_token\030\003 \001(\t\"\205\001\n\034PartialUpdateInstan" +
       "ceRequest\0224\n\010instance\030\001 \001(\0132\".google.big" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "eClusterRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\nclust" +
       "er_id\030\002 \001(\t\0222\n\007cluster\030\003 \001(\0132!.google.bi" +
       "gtable.admin.v2.Cluster\"!\n\021GetClusterReq" +
-      "uest\022\014\n\004name\030\001 \001(\t\"9\n\023ListClustersReques" +
+      "uest\022\014\n\004name\030\001 \001(\t\"9\n\023ListClustersReques",
       "t\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_token\030\002 \001(\t\"~\n" +
       "\024ListClustersResponse\0223\n\010clusters\030\001 \003(\0132" +
       "!.google.bigtable.admin.v2.Cluster\022\030\n\020fa" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "al_request\030\001 \001(\0132/.google.bigtable.admin" +
       ".v2.CreateInstanceRequest\0220\n\014request_tim" +
       "e\030\002 \001(\0132\032.google.protobuf.Timestamp\022/\n\013f" +
-      "inish_time\030\003 \001(\0132\032.google.protobuf.Times" +
+      "inish_time\030\003 \001(\0132\032.google.protobuf.Times",
       "tamp\"\315\001\n\026UpdateInstanceMetadata\022P\n\020origi" +
       "nal_request\030\001 \001(\01326.google.bigtable.admi" +
       "n.v2.PartialUpdateInstanceRequest\0220\n\014req" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "\n\020original_request\030\001 \001(\0132..google.bigtab" +
       "le.admin.v2.CreateClusterRequest\0220\n\014requ" +
       "est_time\030\002 \001(\0132\032.google.protobuf.Timesta" +
-      "mp\022/\n\013finish_time\030\003 \001(\0132\032.google.protobu" +
+      "mp\022/\n\013finish_time\030\003 \001(\0132\032.google.protobu",
       "f.Timestamp\"\267\001\n\025UpdateClusterMetadata\022;\n" +
       "\020original_request\030\001 \001(\0132!.google.bigtabl" +
       "e.admin.v2.Cluster\0220\n\014request_time\030\002 \001(\013" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "\t\022\026\n\016app_profile_id\030\002 \001(\t\0229\n\013app_profile" +
       "\030\003 \001(\0132$.google.bigtable.admin.v2.AppPro" +
       "file\022\027\n\017ignore_warnings\030\004 \001(\010\"$\n\024GetAppP" +
-      "rofileRequest\022\014\n\004name\030\001 \001(\t\"<\n\026ListAppPr" +
+      "rofileRequest\022\014\n\004name\030\001 \001(\t\"<\n\026ListAppPr",
       "ofilesRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_to" +
       "ken\030\002 \001(\t\"n\n\027ListAppProfilesResponse\022:\n\014" +
       "app_profiles\030\001 \003(\0132$.google.bigtable.adm" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "pProfile\022/\n\013update_mask\030\002 \001(\0132\032.google.p" +
       "rotobuf.FieldMask\022\027\n\017ignore_warnings\030\003 \001" +
       "(\010\"@\n\027DeleteAppProfileRequest\022\014\n\004name\030\001 " +
-      "\001(\t\022\027\n\017ignore_warnings\030\002 \001(\010\"\032\n\030UpdateAp" +
+      "\001(\t\022\027\n\017ignore_warnings\030\002 \001(\010\"\032\n\030UpdateAp",
       "pProfileMetadata2\252\027\n\025BigtableInstanceAdm" +
       "in\022\216\001\n\016CreateInstance\022/.google.bigtable." +
       "admin.v2.CreateInstanceRequest\032\035.google." +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "ceRequest\032\".google.bigtable.admin.v2.Ins" +
       "tance\")\202\323\344\223\002#\022!/v2/{name=projects/*/inst" +
       "ances/*}\022\233\001\n\rListInstances\022..google.bigt" +
-      "able.admin.v2.ListInstancesRequest\032/.goo" +
+      "able.admin.v2.ListInstancesRequest\032/.goo",
       "gle.bigtable.admin.v2.ListInstancesRespo" +
       "nse\")\202\323\344\223\002#\022!/v2/{parent=projects/*}/ins" +
       "tances\022\206\001\n\016UpdateInstance\022\".google.bigta" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "eInstance\0226.google.bigtable.admin.v2.Par" +
       "tialUpdateInstanceRequest\032\035.google.longr" +
       "unning.Operation\"<\202\323\344\223\00262*/v2/{instance." +
-      "name=projects/*/instances/*}:\010instance\022\204" +
+      "name=projects/*/instances/*}:\010instance\022\204",
       "\001\n\016DeleteInstance\022/.google.bigtable.admi" +
       "n.v2.DeleteInstanceRequest\032\026.google.prot" +
       "obuf.Empty\")\202\323\344\223\002#*!/v2/{name=projects/*" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "/v2/{parent=projects/*/instances/*}/clus" +
       "ters:\007cluster\022\222\001\n\nGetCluster\022+.google.bi" +
       "gtable.admin.v2.GetClusterRequest\032!.goog" +
-      "le.bigtable.admin.v2.Cluster\"4\202\323\344\223\002.\022,/v" +
+      "le.bigtable.admin.v2.Cluster\"4\202\323\344\223\002.\022,/v",
       "2/{name=projects/*/instances/*/clusters/" +
       "*}\022\243\001\n\014ListClusters\022-.google.bigtable.ad" +
       "min.v2.ListClustersRequest\032..google.bigt" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       "able.admin.v2.Cluster\032\035.google.longrunni" +
       "ng.Operation\"7\202\323\344\223\0021\032,/v2/{name=projects" +
       "/*/instances/*/clusters/*}:\001*\022\215\001\n\rDelete" +
-      "Cluster\022..google.bigtable.admin.v2.Delet" +
+      "Cluster\022..google.bigtable.admin.v2.Delet",
       "eClusterRequest\032\026.google.protobuf.Empty\"" +
       "4\202\323\344\223\002.*,/v2/{name=projects/*/instances/" +
       "*/clusters/*}\022\261\001\n\020CreateAppProfile\0221.goo" +
@@ -257,7 +257,7 @@ public static void registerAllExtensions(
       "ances/*}/appProfiles:\013app_profile\022\236\001\n\rGe" +
       "tAppProfile\022..google.bigtable.admin.v2.G" +
       "etAppProfileRequest\032$.google.bigtable.ad" +
-      "min.v2.AppProfile\"7\202\323\344\223\0021\022//v2/{name=pro" +
+      "min.v2.AppProfile\"7\202\323\344\223\0021\022//v2/{name=pro",
       "jects/*/instances/*/appProfiles/*}\022\257\001\n\017L" +
       "istAppProfiles\0220.google.bigtable.admin.v" +
       "2.ListAppProfilesRequest\0321.google.bigtab" +
@@ -267,7 +267,7 @@ public static void registerAllExtensions(
       "le.bigtable.admin.v2.UpdateAppProfileReq" +
       "uest\032\035.google.longrunning.Operation\"P\202\323\344" +
       "\223\002J2;/v2/{app_profile.name=projects/*/in" +
-      "stances/*/appProfiles/*}:\013app_profile\022\226\001" +
+      "stances/*/appProfiles/*}:\013app_profile\022\226\001",
       "\n\020DeleteAppProfile\0221.google.bigtable.adm" +
       "in.v2.DeleteAppProfileRequest\032\026.google.p" +
       "rotobuf.Empty\"7\202\323\344\223\0021*//v2/{name=project" +
@@ -277,7 +277,7 @@ public static void registerAllExtensions(
       "{resource=projects/*/instances/*}:getIam" +
       "Policy:\001*\022\210\001\n\014SetIamPolicy\022\".google.iam." +
       "v1.SetIamPolicyRequest\032\025.google.iam.v1.P" +
-      "olicy\"=\202\323\344\223\0027\"2/v2/{resource=projects/*/" +
+      "olicy\"=\202\323\344\223\0027\"2/v2/{resource=projects/*/",
       "instances/*}:setIamPolicy:\001*\022\256\001\n\022TestIam" +
       "Permissions\022(.google.iam.v1.TestIamPermi" +
       "ssionsRequest\032).google.iam.v1.TestIamPer" +
@@ -287,7 +287,7 @@ public static void registerAllExtensions(
       "BigtableInstanceAdminProtoP\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\\V2b\006p" +
+      "n.V2\312\002\036Google\\Cloud\\Bigtable\\Admin\\V2b\006p",
       "roto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java
index 66a2c55f77d7..8bb4de21e6ee 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "proto\032\037google/protobuf/timestamp.proto\"\310" +
       "\001\n\022CreateTableRequest\022\016\n\006parent\030\001 \001(\t\022\020\n" +
       "\010table_id\030\002 \001(\t\022.\n\005table\030\003 \001(\0132\037.google." +
-      "bigtable.admin.v2.Table\022J\n\016initial_split" +
+      "bigtable.admin.v2.Table\022J\n\016initial_split",
       "s\030\004 \003(\01322.google.bigtable.admin.v2.Creat" +
       "eTableRequest.Split\032\024\n\005Split\022\013\n\003key\030\001 \001(" +
       "\014\"[\n\036CreateTableFromSnapshotRequest\022\016\n\006p" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "\032delete_all_data_from_table\030\003 \001(\010H\000B\010\n\006t" +
       "arget\"k\n\021ListTablesRequest\022\016\n\006parent\030\001 \001" +
       "(\t\0222\n\004view\030\002 \001(\0162$.google.bigtable.admin" +
-      ".v2.Table.View\022\022\n\npage_token\030\003 \001(\t\"^\n\022Li" +
+      ".v2.Table.View\022\022\n\npage_token\030\003 \001(\t\"^\n\022Li",
       "stTablesResponse\022/\n\006tables\030\001 \003(\0132\037.googl" +
       "e.bigtable.admin.v2.Table\022\027\n\017next_page_t" +
       "oken\030\002 \001(\t\"S\n\017GetTableRequest\022\014\n\004name\030\001 " +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "est\022\014\n\004name\030\001 \001(\t\022Y\n\rmodifications\030\002 \003(\013" +
       "2B.google.bigtable.admin.v2.ModifyColumn" +
       "FamiliesRequest.Modification\032\245\001\n\014Modific" +
-      "ation\022\n\n\002id\030\001 \001(\t\0228\n\006create\030\002 \001(\0132&.goog" +
+      "ation\022\n\n\002id\030\001 \001(\t\0228\n\006create\030\002 \001(\0132&.goog",
       "le.bigtable.admin.v2.ColumnFamilyH\000\0228\n\006u" +
       "pdate\030\003 \001(\0132&.google.bigtable.admin.v2.C" +
       "olumnFamilyH\000\022\016\n\004drop\030\004 \001(\010H\000B\005\n\003mod\"/\n\037" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "sistencyRequest\022\014\n\004name\030\001 \001(\t\022\031\n\021consist" +
       "ency_token\030\002 \001(\t\".\n\030CheckConsistencyResp" +
       "onse\022\022\n\nconsistent\030\001 \001(\010\"\207\001\n\024SnapshotTab" +
-      "leRequest\022\014\n\004name\030\001 \001(\t\022\017\n\007cluster\030\002 \001(\t" +
+      "leRequest\022\014\n\004name\030\001 \001(\t\022\017\n\007cluster\030\002 \001(\t",
       "\022\023\n\013snapshot_id\030\003 \001(\t\022&\n\003ttl\030\004 \001(\0132\031.goo" +
       "gle.protobuf.Duration\022\023\n\013description\030\005 \001" +
       "(\t\"\"\n\022GetSnapshotRequest\022\014\n\004name\030\001 \001(\t\"M" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "\0132\".google.bigtable.admin.v2.Snapshot\022\027\n" +
       "\017next_page_token\030\002 \001(\t\"%\n\025DeleteSnapshot" +
       "Request\022\014\n\004name\030\001 \001(\t\"\304\001\n\025SnapshotTableM" +
-      "etadata\022H\n\020original_request\030\001 \001(\0132..goog" +
+      "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" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "eFromSnapshotRequest\0220\n\014request_time\030\002 \001" +
       "(\0132\032.google.protobuf.Timestamp\022/\n\013finish" +
       "_time\030\003 \001(\0132\032.google.protobuf.Timestamp2" +
-      "\267\021\n\022BigtableTableAdmin\022\223\001\n\013CreateTable\022," +
+      "\267\021\n\022BigtableTableAdmin\022\223\001\n\013CreateTable\022,",
       ".google.bigtable.admin.v2.CreateTableReq" +
       "uest\032\037.google.bigtable.admin.v2.Table\"5\202" +
       "\323\344\223\002/\"*/v2/{parent=projects/*/instances/" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "Operation\"H\202\323\344\223\002B\"=/v2/{parent=projects/" +
       "*/instances/*}/tables:createFromSnapshot" +
       ":\001*\022\233\001\n\nListTables\022+.google.bigtable.adm" +
-      "in.v2.ListTablesRequest\032,.google.bigtabl" +
+      "in.v2.ListTablesRequest\032,.google.bigtabl",
       "e.admin.v2.ListTablesResponse\"2\202\323\344\223\002,\022*/" +
       "v2/{parent=projects/*/instances/*}/table" +
       "s\022\212\001\n\010GetTable\022).google.bigtable.admin.v" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       ".google.bigtable.admin.v2.DeleteTableReq" +
       "uest\032\026.google.protobuf.Empty\"2\202\323\344\223\002,**/v" +
       "2/{name=projects/*/instances/*/tables/*}" +
-      "\022\272\001\n\024ModifyColumnFamilies\0225.google.bigta" +
+      "\022\272\001\n\024ModifyColumnFamilies\0225.google.bigta",
       "ble.admin.v2.ModifyColumnFamiliesRequest" +
       "\032\037.google.bigtable.admin.v2.Table\"J\202\323\344\223\002" +
       "D\"?/v2/{name=projects/*/instances/*/tabl" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "\323\344\223\002<\"7/v2/{name=projects/*/instances/*/" +
       "tables/*}:dropRowRange:\001*\022\341\001\n\030GenerateCo" +
       "nsistencyToken\0229.google.bigtable.admin.v" +
-      "2.GenerateConsistencyTokenRequest\032:.goog" +
+      "2.GenerateConsistencyTokenRequest\032:.goog",
       "le.bigtable.admin.v2.GenerateConsistency" +
       "TokenResponse\"N\202\323\344\223\002H\"C/v2/{name=project" +
       "s/*/instances/*/tables/*}:generateConsis" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "nsistencyResponse\"F\202\323\344\223\002@\";/v2/{name=pro" +
       "jects/*/instances/*/tables/*}:checkConsi" +
       "stency:\001*\022\236\001\n\rSnapshotTable\022..google.big" +
-      "table.admin.v2.SnapshotTableRequest\032\035.go" +
+      "table.admin.v2.SnapshotTableRequest\032\035.go",
       "ogle.longrunning.Operation\">\202\323\344\223\0028\"3/v2/" +
       "{name=projects/*/instances/*/tables/*}:s" +
       "napshot:\001*\022\241\001\n\013GetSnapshot\022,.google.bigt" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "*/snapshots/*}\022\262\001\n\rListSnapshots\022..googl" +
       "e.bigtable.admin.v2.ListSnapshotsRequest" +
       "\032/.google.bigtable.admin.v2.ListSnapshot" +
-      "sResponse\"@\202\323\344\223\002:\0228/v2/{parent=projects/" +
+      "sResponse\"@\202\323\344\223\002:\0228/v2/{parent=projects/",
       "*/instances/*/clusters/*}/snapshots\022\233\001\n\016" +
       "DeleteSnapshot\022/.google.bigtable.admin.v" +
       "2.DeleteSnapshotRequest\032\026.google.protobu" +
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
index 77d8d2106abf..df2812f3d507 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
@@ -35,9 +35,6 @@ private CheckConsistencyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -702,7 +699,7 @@ public CheckConsistencyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckConsistencyRequest(input, extensionRegistry);
+        return new CheckConsistencyRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java
index f861c56f7fe1..95f21bc7bda3 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java
@@ -34,9 +34,6 @@ private CheckConsistencyResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -457,7 +454,7 @@ public CheckConsistencyResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckConsistencyResponse(input, extensionRegistry);
+        return new CheckConsistencyResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java
index 8815e4244437..3344a5cf7148 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java
@@ -39,9 +39,6 @@ private Cluster(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1236,7 +1233,7 @@ public Cluster parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Cluster(input, extensionRegistry);
+        return new Cluster(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ClusterName.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ClusterName.java
index 041d629ecf78..f4bb91de97b2 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ClusterName.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ClusterName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ClusterName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance", instance, "cluster", cluster);
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java
index ec193e9e8a73..3e88cbb0b5d1 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java
@@ -32,9 +32,6 @@ private ColumnFamily(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -653,7 +650,7 @@ public ColumnFamily parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ColumnFamily(input, extensionRegistry);
+        return new ColumnFamily(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java
index 9ff19486c728..1c6f090d753e 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java
@@ -35,9 +35,6 @@ private CreateAppProfileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1030,7 +1027,7 @@ public CreateAppProfileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateAppProfileRequest(input, extensionRegistry);
+        return new CreateAppProfileRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadata.java
index 7d351990b1dd..945903dc2eb1 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadata.java
@@ -32,9 +32,6 @@ private CreateClusterMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1063,7 +1060,7 @@ public CreateClusterMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateClusterMetadata(input, extensionRegistry);
+        return new CreateClusterMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterRequest.java
index 47f6561e9e10..80884acc7f8d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterRequest.java
@@ -34,9 +34,6 @@ private CreateClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -955,7 +952,7 @@ public CreateClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateClusterRequest(input, extensionRegistry);
+        return new CreateClusterRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceMetadata.java
index fe92405252a9..bb2e35ede09e 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceMetadata.java
@@ -32,9 +32,6 @@ private CreateInstanceMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1063,7 +1060,7 @@ public CreateInstanceMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateInstanceMetadata(input, extensionRegistry);
+        return new CreateInstanceMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequest.java
index 68d34486e05f..3973295c9a2d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequest.java
@@ -34,9 +34,6 @@ private CreateInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1313,7 +1310,7 @@ public CreateInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateInstanceRequest(input, extensionRegistry);
+        return new CreateInstanceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java
index 0a5b1aee0a89..c883cab07480 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java
@@ -36,9 +36,6 @@ private CreateTableFromSnapshotMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1083,7 +1080,7 @@ public CreateTableFromSnapshotMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTableFromSnapshotMetadata(input, extensionRegistry);
+        return new CreateTableFromSnapshotMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java
index 6e90991e9952..964f42270221 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java
@@ -40,9 +40,6 @@ private CreateTableFromSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -886,7 +883,7 @@ public CreateTableFromSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTableFromSnapshotRequest(input, extensionRegistry);
+        return new CreateTableFromSnapshotRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java
index 0d64d7a2df44..d0121518a909 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java
@@ -36,9 +36,6 @@ private CreateTableRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -161,9 +158,6 @@ private Split(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -581,7 +575,7 @@ public Split parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Split(input, extensionRegistry);
+          return new Split(input, extensionRegistry);
       }
     };
 
@@ -2152,7 +2146,7 @@ public CreateTableRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTableRequest(input, extensionRegistry);
+        return new CreateTableRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java
index 0556fafa92f4..72748939bae5 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java
@@ -34,9 +34,6 @@ private DeleteAppProfileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -613,7 +610,7 @@ public DeleteAppProfileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteAppProfileRequest(input, extensionRegistry);
+        return new DeleteAppProfileRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteClusterRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteClusterRequest.java
index 63611b47d8bf..276bcffb173d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteClusterRequest.java
@@ -33,9 +33,6 @@ private DeleteClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteClusterRequest(input, extensionRegistry);
+        return new DeleteClusterRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteInstanceRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteInstanceRequest.java
index 378efab7f52e..164bf2bd681b 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteInstanceRequest.java
@@ -33,9 +33,6 @@ private DeleteInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteInstanceRequest(input, extensionRegistry);
+        return new DeleteInstanceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java
index 50f75c88dada..39308b7dba1e 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java
@@ -38,9 +38,6 @@ private DeleteSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -555,7 +552,7 @@ public DeleteSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSnapshotRequest(input, extensionRegistry);
+        return new DeleteSnapshotRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteTableRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteTableRequest.java
index 1dfa6a293ade..42ed806dbc26 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteTableRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteTableRequest.java
@@ -34,9 +34,6 @@ private DeleteTableRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -547,7 +544,7 @@ public DeleteTableRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteTableRequest(input, extensionRegistry);
+        return new DeleteTableRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java
index 30f72282bf75..94fefeba73ee 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java
@@ -34,9 +34,6 @@ private DropRowRangeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -799,7 +796,7 @@ public DropRowRangeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DropRowRangeRequest(input, extensionRegistry);
+        return new DropRowRangeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java
index 8b7bc261ef8b..90cb7e6b15f7 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java
@@ -32,9 +32,6 @@ private GcRule(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -202,9 +199,6 @@ private Intersection(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -982,7 +976,7 @@ public Intersection parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Intersection(input, extensionRegistry);
+          return new Intersection(input, extensionRegistry);
       }
     };
 
@@ -1079,9 +1073,6 @@ private Union(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1859,7 +1850,7 @@ public Union parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Union(input, extensionRegistry);
+          return new Union(input, extensionRegistry);
       }
     };
 
@@ -3066,7 +3057,7 @@ public GcRule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcRule(input, extensionRegistry);
+        return new GcRule(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java
index 4a81887f8bca..9a3bfb2a9fad 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java
@@ -34,9 +34,6 @@ private GenerateConsistencyTokenRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -547,7 +544,7 @@ public GenerateConsistencyTokenRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GenerateConsistencyTokenRequest(input, extensionRegistry);
+        return new GenerateConsistencyTokenRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java
index c892fd34d741..ad26cd9cd94e 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java
@@ -34,9 +34,6 @@ private GenerateConsistencyTokenResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -533,7 +530,7 @@ public GenerateConsistencyTokenResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GenerateConsistencyTokenResponse(input, extensionRegistry);
+        return new GenerateConsistencyTokenResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java
index b2adc4100710..185ea19b4e15 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java
@@ -33,9 +33,6 @@ private GetAppProfileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetAppProfileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetAppProfileRequest(input, extensionRegistry);
+        return new GetAppProfileRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java
index 0f20082b1377..9516f2571b8f 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java
@@ -33,9 +33,6 @@ private GetClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetClusterRequest(input, extensionRegistry);
+        return new GetClusterRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java
index 4d97cbe3ac3b..e085ec13a2d5 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java
@@ -33,9 +33,6 @@ private GetInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetInstanceRequest(input, extensionRegistry);
+        return new GetInstanceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java
index d9af5413f49e..919a36acd327 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java
@@ -38,9 +38,6 @@ private GetSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -555,7 +552,7 @@ public GetSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSnapshotRequest(input, extensionRegistry);
+        return new GetSnapshotRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java
index af3ca9364944..8a32878002b0 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java
@@ -35,9 +35,6 @@ private GetTableRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -665,7 +662,7 @@ public GetTableRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetTableRequest(input, extensionRegistry);
+        return new GetTableRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java
index 412801b5a422..14eb893d5496 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java
@@ -39,9 +39,6 @@ private Instance(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1661,7 +1658,7 @@ public Instance parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Instance(input, extensionRegistry);
+        return new Instance(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceName.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceName.java
index 3fa203a1ba32..462cf7f55c5e 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceName.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("InstanceName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance", instance);
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceProto.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceProto.java
index 954081e8b9e1..25f0f939c92f 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceProto.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceProto.java
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "te\0225\n\004type\030\004 \001(\0162\'.google.bigtable.admin" +
       ".v2.Instance.Type\022>\n\006labels\030\005 \003(\0132..goog" +
       "le.bigtable.admin.v2.Instance.LabelsEntr" +
-      "y\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002" +
+      "y\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002",
       " \001(\t:\0028\001\"5\n\005State\022\023\n\017STATE_NOT_KNOWN\020\000\022\t" +
       "\n\005READY\020\001\022\014\n\010CREATING\020\002\"=\n\004Type\022\024\n\020TYPE_" +
       "UNSPECIFIED\020\000\022\016\n\nPRODUCTION\020\001\022\017\n\013DEVELOP" +
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "s\030\004 \001(\005\022C\n\024default_storage_type\030\005 \001(\0162%." +
       "google.bigtable.admin.v2.StorageType\"Q\n\005" +
       "State\022\023\n\017STATE_NOT_KNOWN\020\000\022\t\n\005READY\020\001\022\014\n" +
-      "\010CREATING\020\002\022\014\n\010RESIZING\020\003\022\014\n\010DISABLED\020\004\"" +
+      "\010CREATING\020\002\022\014\n\010RESIZING\020\003\022\014\n\010DISABLED\020\004\"",
       "\202\003\n\nAppProfile\022\014\n\004name\030\001 \001(\t\022\014\n\004etag\030\002 \001" +
       "(\t\022\023\n\013description\030\003 \001(\t\022g\n\035multi_cluster" +
       "_routing_use_any\030\005 \001(\0132>.google.bigtable" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "ingleClusterRoutingH\000\032\033\n\031MultiClusterRou" +
       "tingUseAny\032N\n\024SingleClusterRouting\022\022\n\ncl" +
       "uster_id\030\001 \001(\t\022\"\n\032allow_transactional_wr" +
-      "ites\030\002 \001(\010B\020\n\016routing_policyB\260\001\n\034com.goo" +
+      "ites\030\002 \001(\010B\020\n\016routing_policyB\260\001\n\034com.goo",
       "gle.bigtable.admin.v2B\rInstanceProtoP\001Z=" +
       "google.golang.org/genproto/googleapis/bi" +
       "gtable/admin/v2;admin\252\002\036Google.Cloud.Big" +
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java
index 5e4eb76dcd2c..75a1332dffc2 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java
@@ -34,9 +34,6 @@ private ListAppProfilesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -700,7 +697,7 @@ public ListAppProfilesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListAppProfilesRequest(input, extensionRegistry);
+        return new ListAppProfilesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java
index 9669d91d32f6..2e4ec7ebe0aa 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java
@@ -34,9 +34,6 @@ private ListAppProfilesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListAppProfilesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListAppProfilesResponse(input, extensionRegistry);
+        return new ListAppProfilesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java
index 9861f4708831..4daf9bb5a515 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java
@@ -34,9 +34,6 @@ private ListClustersRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -707,7 +704,7 @@ public ListClustersRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListClustersRequest(input, extensionRegistry);
+        return new ListClustersRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java
index 9c3ee71bb02a..7ab0e0252999 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java
@@ -35,9 +35,6 @@ private ListClustersResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1246,7 +1243,7 @@ public ListClustersResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListClustersResponse(input, extensionRegistry);
+        return new ListClustersResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java
index b909658fe3ca..67b1e19ad4bf 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java
@@ -34,9 +34,6 @@ private ListInstancesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -693,7 +690,7 @@ public ListInstancesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstancesRequest(input, extensionRegistry);
+        return new ListInstancesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java
index 2fb7732f9d08..b4836668ad8f 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java
@@ -35,9 +35,6 @@ private ListInstancesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1259,7 +1256,7 @@ public ListInstancesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstancesResponse(input, extensionRegistry);
+        return new ListInstancesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java
index 14d201abbac9..01e2d7f851fe 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java
@@ -40,9 +40,6 @@ private ListSnapshotsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -798,7 +795,7 @@ public ListSnapshotsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSnapshotsRequest(input, extensionRegistry);
+        return new ListSnapshotsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java
index 4f562d1ff961..189ca38b3027 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java
@@ -39,9 +39,6 @@ private ListSnapshotsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -995,7 +992,7 @@ public ListSnapshotsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSnapshotsResponse(input, extensionRegistry);
+        return new ListSnapshotsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java
index 96670aeae7f4..9249a2f7706d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java
@@ -36,9 +36,6 @@ private ListTablesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public ListTablesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTablesRequest(input, extensionRegistry);
+        return new ListTablesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java
index 2bc89dfb506f..b8a50f17a593 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java
@@ -35,9 +35,6 @@ private ListTablesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -987,7 +984,7 @@ public ListTablesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTablesResponse(input, extensionRegistry);
+        return new ListTablesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/LocationName.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/LocationName.java
index 5ef343a55abb..88fa3f108faf 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/LocationName.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/LocationName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("LocationName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "location", location);
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java
index 5fe2cffb4cf1..d75be49efcf3 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java
@@ -35,9 +35,6 @@ private ModifyColumnFamiliesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -218,9 +215,6 @@ private Modification(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1405,7 +1399,7 @@ public Modification parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Modification(input, extensionRegistry);
+          return new Modification(input, extensionRegistry);
       }
     };
 
@@ -2382,7 +2376,7 @@ public ModifyColumnFamiliesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ModifyColumnFamiliesRequest(input, extensionRegistry);
+        return new ModifyColumnFamiliesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java
index 585ee1b95b2a..a97efd9b2a59 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java
@@ -32,9 +32,6 @@ private PartialUpdateInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -846,7 +843,7 @@ public PartialUpdateInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartialUpdateInstanceRequest(input, extensionRegistry);
+        return new PartialUpdateInstanceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ProjectName.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ProjectName.java
index f4ad76c64b39..bf04756d75d2 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java
index 9b57045298e2..2c137c1ff6f7 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java
@@ -41,9 +41,6 @@ private Snapshot(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1815,7 +1812,7 @@ public Snapshot parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Snapshot(input, extensionRegistry);
+        return new Snapshot(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotName.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotName.java
index afeac03c840c..ee3ca7071a01 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotName.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -140,14 +139,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("SnapshotName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance", instance, "cluster", cluster, "snapshot", snapshot);
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java
index d1dfa7f8753d..3ffa99f7d0c5 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java
@@ -36,9 +36,6 @@ private SnapshotTableMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1071,7 +1068,7 @@ public SnapshotTableMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SnapshotTableMetadata(input, extensionRegistry);
+        return new SnapshotTableMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java
index 36fd9afc937e..0d728b8436a5 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java
@@ -41,9 +41,6 @@ private SnapshotTableRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1320,7 +1317,7 @@ public SnapshotTableRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SnapshotTableRequest(input, extensionRegistry);
+        return new SnapshotTableRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java
index b8ba4bca1796..ed22b8d1ff41 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java
@@ -35,9 +35,6 @@ private Table(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -476,9 +473,6 @@ private ClusterState(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1118,7 +1112,7 @@ public ClusterState parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ClusterState(input, extensionRegistry);
+          return new ClusterState(input, extensionRegistry);
       }
     };
 
@@ -2386,7 +2380,7 @@ public Table parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Table(input, extensionRegistry);
+        return new Table(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableName.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableName.java
index 02349c11ed86..6c2ef0b6fbff 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableName.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("TableName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance", instance, "table", table);
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableProto.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableProto.java
index cedc689943b6..2c3a17cee561 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableProto.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       ".ClusterStatesEntry\022L\n\017column_families\030\003" +
       " \003(\01323.google.bigtable.admin.v2.Table.Co" +
       "lumnFamiliesEntry\022I\n\013granularity\030\004 \001(\01624" +
-      ".google.bigtable.admin.v2.Table.Timestam" +
+      ".google.bigtable.admin.v2.Table.Timestam",
       "pGranularity\032\342\001\n\014ClusterState\022X\n\021replica" +
       "tion_state\030\001 \001(\0162=.google.bigtable.admin" +
       ".v2.Table.ClusterState.ReplicationState\"" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "\004\032b\n\022ClusterStatesEntry\022\013\n\003key\030\001 \001(\t\022;\n\005" +
       "value\030\002 \001(\0132,.google.bigtable.admin.v2.T" +
       "able.ClusterState:\0028\001\032]\n\023ColumnFamiliesE" +
-      "ntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.googl" +
+      "ntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.googl",
       "e.bigtable.admin.v2.ColumnFamily:\0028\001\"I\n\024" +
       "TimestampGranularity\022%\n!TIMESTAMP_GRANUL" +
       "ARITY_UNSPECIFIED\020\000\022\n\n\006MILLIS\020\001\"\\\n\004View\022" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       ".google.bigtable.admin.v2.GcRule\"\325\002\n\006GcR" +
       "ule\022\032\n\020max_num_versions\030\001 \001(\005H\000\022,\n\007max_a" +
       "ge\030\002 \001(\0132\031.google.protobuf.DurationH\000\022E\n" +
-      "\014intersection\030\003 \001(\0132-.google.bigtable.ad" +
+      "\014intersection\030\003 \001(\0132-.google.bigtable.ad",
       "min.v2.GcRule.IntersectionH\000\0227\n\005union\030\004 " +
       "\001(\0132&.google.bigtable.admin.v2.GcRule.Un" +
       "ionH\000\032?\n\014Intersection\022/\n\005rules\030\001 \003(\0132 .g" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "\001(\t\0225\n\014source_table\030\002 \001(\0132\037.google.bigta" +
       "ble.admin.v2.Table\022\027\n\017data_size_bytes\030\003 " +
       "\001(\003\022/\n\013create_time\030\004 \001(\0132\032.google.protob" +
-      "uf.Timestamp\022/\n\013delete_time\030\005 \001(\0132\032.goog" +
+      "uf.Timestamp\022/\n\013delete_time\030\005 \001(\0132\032.goog",
       "le.protobuf.Timestamp\0227\n\005state\030\006 \001(\0162(.g" +
       "oogle.bigtable.admin.v2.Snapshot.State\022\023" +
       "\n\013description\030\007 \001(\t\"5\n\005State\022\023\n\017STATE_NO" +
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java
index 67b1f2fd0e2c..286c4e658f04 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java
@@ -32,9 +32,6 @@ private UpdateAppProfileMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -375,7 +372,7 @@ public UpdateAppProfileMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateAppProfileMetadata(input, extensionRegistry);
+        return new UpdateAppProfileMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java
index 9a1b5a6031ee..5e6f5d169e65 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java
@@ -33,9 +33,6 @@ private UpdateAppProfileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -921,7 +918,7 @@ public UpdateAppProfileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateAppProfileRequest(input, extensionRegistry);
+        return new UpdateAppProfileRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateClusterMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateClusterMetadata.java
index 13dc60cd293b..aec8754f2d35 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateClusterMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateClusterMetadata.java
@@ -32,9 +32,6 @@ private UpdateClusterMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1063,7 +1060,7 @@ public UpdateClusterMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateClusterMetadata(input, extensionRegistry);
+        return new UpdateClusterMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateInstanceMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateInstanceMetadata.java
index 90b4e8416a2a..8fc4200580a8 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateInstanceMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateInstanceMetadata.java
@@ -32,9 +32,6 @@ private UpdateInstanceMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1063,7 +1060,7 @@ public UpdateInstanceMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateInstanceMetadata(input, extensionRegistry);
+        return new UpdateInstanceMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/BigtableProto.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/BigtableProto.java
index f045bb96c57e..eddc17a341d4 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/BigtableProto.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/BigtableProto.java
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "\004rows\030\002 \001(\0132\032.google.bigtable.v2.RowSet\022" +
       "-\n\006filter\030\003 \001(\0132\035.google.bigtable.v2.Row" +
       "Filter\022\022\n\nrows_limit\030\004 \001(\003\"\370\002\n\020ReadRowsR" +
-      "esponse\022>\n\006chunks\030\001 \003(\0132..google.bigtabl" +
+      "esponse\022>\n\006chunks\030\001 \003(\0132..google.bigtabl",
       "e.v2.ReadRowsResponse.CellChunk\022\034\n\024last_" +
       "scanned_row_key\030\002 \001(\014\032\205\002\n\tCellChunk\022\017\n\007r" +
       "ow_key\030\001 \001(\014\0221\n\013family_name\030\002 \001(\0132\034.goog" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "ue\030\006 \001(\014\022\022\n\nvalue_size\030\007 \001(\005\022\023\n\treset_ro" +
       "w\030\010 \001(\010H\000\022\024\n\ncommit_row\030\t \001(\010H\000B\014\n\nrow_s" +
       "tatus\"B\n\024SampleRowKeysRequest\022\022\n\ntable_n" +
-      "ame\030\001 \001(\t\022\026\n\016app_profile_id\030\002 \001(\t\">\n\025Sam" +
+      "ame\030\001 \001(\t\022\026\n\016app_profile_id\030\002 \001(\t\">\n\025Sam",
       "pleRowKeysResponse\022\017\n\007row_key\030\001 \001(\014\022\024\n\014o" +
       "ffset_bytes\030\002 \001(\003\"\200\001\n\020MutateRowRequest\022\022" +
       "\n\ntable_name\030\001 \001(\t\022\026\n\016app_profile_id\030\004 \001" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "_name\030\001 \001(\t\022\026\n\016app_profile_id\030\003 \001(\t\022<\n\007e" +
       "ntries\030\002 \003(\0132+.google.bigtable.v2.Mutate" +
       "RowsRequest.Entry\032I\n\005Entry\022\017\n\007row_key\030\001 " +
-      "\001(\014\022/\n\tmutations\030\002 \003(\0132\034.google.bigtable" +
+      "\001(\014\022/\n\tmutations\030\002 \003(\0132\034.google.bigtable",
       ".v2.Mutation\"\217\001\n\022MutateRowsResponse\022=\n\007e" +
       "ntries\030\001 \003(\0132,.google.bigtable.v2.Mutate" +
       "RowsResponse.Entry\032:\n\005Entry\022\r\n\005index\030\001 \001" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "ey\030\002 \001(\014\0227\n\020predicate_filter\030\006 \001(\0132\035.goo" +
       "gle.bigtable.v2.RowFilter\0224\n\016true_mutati" +
       "ons\030\004 \003(\0132\034.google.bigtable.v2.Mutation\022" +
-      "5\n\017false_mutations\030\005 \003(\0132\034.google.bigtab" +
+      "5\n\017false_mutations\030\005 \003(\0132\034.google.bigtab",
       "le.v2.Mutation\"6\n\031CheckAndMutateRowRespo" +
       "nse\022\031\n\021predicate_matched\030\001 \001(\010\"\220\001\n\031ReadM" +
       "odifyWriteRowRequest\022\022\n\ntable_name\030\001 \001(\t" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "esponse\022$\n\003row\030\001 \001(\0132\027.google.bigtable.v" +
       "2.Row2\255\010\n\010Bigtable\022\235\001\n\010ReadRows\022#.google" +
       ".bigtable.v2.ReadRowsRequest\032$.google.bi" +
-      "gtable.v2.ReadRowsResponse\"D\202\323\344\223\002>\"9/v2/" +
+      "gtable.v2.ReadRowsResponse\"D\202\323\344\223\002>\"9/v2/",
       "{table_name=projects/*/instances/*/table" +
       "s/*}:readRows:\001*0\001\022\256\001\n\rSampleRowKeys\022(.g" +
       "oogle.bigtable.v2.SampleRowKeysRequest\032)" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "MutateRow\022$.google.bigtable.v2.MutateRow" +
       "Request\032%.google.bigtable.v2.MutateRowRe" +
       "sponse\"E\202\323\344\223\002?\":/v2/{table_name=projects" +
-      "/*/instances/*/tables/*}:mutateRow:\001*\022\245\001" +
+      "/*/instances/*/tables/*}:mutateRow:\001*\022\245\001",
       "\n\nMutateRows\022%.google.bigtable.v2.Mutate" +
       "RowsRequest\032&.google.bigtable.v2.MutateR" +
       "owsResponse\"F\202\323\344\223\002@\";/v2/{table_name=pro" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "le.bigtable.v2.CheckAndMutateRowResponse" +
       "\"M\202\323\344\223\002G\"B/v2/{table_name=projects/*/ins" +
       "tances/*/tables/*}:checkAndMutateRow:\001*\022" +
-      "\303\001\n\022ReadModifyWriteRow\022-.google.bigtable" +
+      "\303\001\n\022ReadModifyWriteRow\022-.google.bigtable",
       ".v2.ReadModifyWriteRowRequest\032..google.b" +
       "igtable.v2.ReadModifyWriteRowResponse\"N\202" +
       "\323\344\223\002H\"C/v2/{table_name=projects/*/instan" +
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Cell.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Cell.java
index e04566ec6c8d..7ee032b242fc 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Cell.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Cell.java
@@ -35,9 +35,6 @@ private Cell(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -783,7 +780,7 @@ public Cell parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Cell(input, extensionRegistry);
+        return new Cell(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java
index af170edb17a2..d372e7d5deb8 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java
@@ -37,9 +37,6 @@ private CheckAndMutateRowRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2115,7 +2112,7 @@ public CheckAndMutateRowRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckAndMutateRowRequest(input, extensionRegistry);
+        return new CheckAndMutateRowRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java
index 85389250f03a..e5d58d094139 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java
@@ -33,9 +33,6 @@ private CheckAndMutateRowResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -455,7 +452,7 @@ public CheckAndMutateRowResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckAndMutateRowResponse(input, extensionRegistry);
+        return new CheckAndMutateRowResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java
index 51aa779dac6a..71743f5a3e59 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java
@@ -35,9 +35,6 @@ private Column(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -911,7 +908,7 @@ public Column parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Column(input, extensionRegistry);
+        return new Column(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java
index b1a862d1e56c..b8b304605365 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java
@@ -36,9 +36,6 @@ private ColumnRange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1037,7 +1034,7 @@ public ColumnRange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ColumnRange(input, extensionRegistry);
+        return new ColumnRange(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/DataProto.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/DataProto.java
index 66858365b135..94d203f78900 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/DataProto.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/DataProto.java
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "bigtable.v2.Cell\"?\n\004Cell\022\030\n\020timestamp_mi" +
       "cros\030\001 \001(\003\022\r\n\005value\030\002 \001(\014\022\016\n\006labels\030\003 \003(" +
       "\t\"\212\001\n\010RowRange\022\032\n\020start_key_closed\030\001 \001(\014" +
-      "H\000\022\030\n\016start_key_open\030\002 \001(\014H\000\022\026\n\014end_key_" +
+      "H\000\022\030\n\016start_key_open\030\002 \001(\014H\000\022\026\n\014end_key_",
       "open\030\003 \001(\014H\001\022\030\n\016end_key_closed\030\004 \001(\014H\001B\013" +
       "\n\tstart_keyB\t\n\007end_key\"L\n\006RowSet\022\020\n\010row_" +
       "keys\030\001 \003(\014\0220\n\nrow_ranges\030\002 \003(\0132\034.google." +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "\014H\000\022\036\n\024end_qualifier_closed\030\004 \001(\014H\001\022\034\n\022e" +
       "nd_qualifier_open\030\005 \001(\014H\001B\021\n\017start_quali" +
       "fierB\017\n\rend_qualifier\"N\n\016TimestampRange\022" +
-      "\036\n\026start_timestamp_micros\030\001 \001(\003\022\034\n\024end_t" +
+      "\036\n\026start_timestamp_micros\030\001 \001(\003\022\034\n\024end_t",
       "imestamp_micros\030\002 \001(\003\"\230\001\n\nValueRange\022\034\n\022" +
       "start_value_closed\030\001 \001(\014H\000\022\032\n\020start_valu" +
       "e_open\030\002 \001(\014H\000\022\032\n\020end_value_closed\030\003 \001(\014" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "inH\000\022>\n\ninterleave\030\002 \001(\0132(.google.bigtab" +
       "le.v2.RowFilter.InterleaveH\000\022<\n\tconditio" +
       "n\030\003 \001(\0132\'.google.bigtable.v2.RowFilter.C" +
-      "onditionH\000\022\016\n\004sink\030\020 \001(\010H\000\022\031\n\017pass_all_f" +
+      "onditionH\000\022\016\n\004sink\030\020 \001(\010H\000\022\031\n\017pass_all_f",
       "ilter\030\021 \001(\010H\000\022\032\n\020block_all_filter\030\022 \001(\010H" +
       "\000\022\036\n\024row_key_regex_filter\030\004 \001(\014H\000\022\033\n\021row" +
       "_sample_filter\030\016 \001(\001H\000\022\"\n\030family_name_re" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "eH\000\022D\n\026timestamp_range_filter\030\010 \001(\0132\".go" +
       "ogle.bigtable.v2.TimestampRangeH\000\022\034\n\022val" +
       "ue_regex_filter\030\t \001(\014H\000\022<\n\022value_range_f" +
-      "ilter\030\017 \001(\0132\036.google.bigtable.v2.ValueRa" +
+      "ilter\030\017 \001(\0132\036.google.bigtable.v2.ValueRa",
       "ngeH\000\022%\n\033cells_per_row_offset_filter\030\n \001" +
       "(\005H\000\022$\n\032cells_per_row_limit_filter\030\013 \001(\005" +
       "H\000\022\'\n\035cells_per_column_limit_filter\030\014 \001(" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       ".RowFilter\032<\n\nInterleave\022.\n\007filters\030\001 \003(" +
       "\0132\035.google.bigtable.v2.RowFilter\032\255\001\n\tCon" +
       "dition\0227\n\020predicate_filter\030\001 \001(\0132\035.googl" +
-      "e.bigtable.v2.RowFilter\0222\n\013true_filter\030\002" +
+      "e.bigtable.v2.RowFilter\0222\n\013true_filter\030\002",
       " \001(\0132\035.google.bigtable.v2.RowFilter\0223\n\014f" +
       "alse_filter\030\003 \001(\0132\035.google.bigtable.v2.R" +
       "owFilterB\010\n\006filter\"\311\004\n\010Mutation\0228\n\010set_c" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "lumnH\000\022K\n\022delete_from_family\030\003 \001(\0132-.goo" +
       "gle.bigtable.v2.Mutation.DeleteFromFamil" +
       "yH\000\022E\n\017delete_from_row\030\004 \001(\0132*.google.bi" +
-      "gtable.v2.Mutation.DeleteFromRowH\000\032a\n\007Se" +
+      "gtable.v2.Mutation.DeleteFromRowH\000\032a\n\007Se",
       "tCell\022\023\n\013family_name\030\001 \001(\t\022\030\n\020column_qua" +
       "lifier\030\002 \001(\014\022\030\n\020timestamp_micros\030\003 \001(\003\022\r" +
       "\n\005value\030\004 \001(\014\032y\n\020DeleteFromColumn\022\023\n\013fam" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "family_name\030\001 \001(\t\032\017\n\rDeleteFromRowB\n\n\010mu" +
       "tation\"\200\001\n\023ReadModifyWriteRule\022\023\n\013family" +
       "_name\030\001 \001(\t\022\030\n\020column_qualifier\030\002 \001(\014\022\026\n" +
-      "\014append_value\030\003 \001(\014H\000\022\032\n\020increment_amoun" +
+      "\014append_value\030\003 \001(\014H\000\022\032\n\020increment_amoun",
       "t\030\004 \001(\003H\000B\006\n\004ruleB\227\001\n\026com.google.bigtabl" +
       "e.v2B\tDataProtoP\001Z:google.golang.org/gen" +
       "proto/googleapis/bigtable/v2;bigtable\252\002\030" +
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java
index 6eb9f5209a61..d4b38dbe4f39 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java
@@ -35,9 +35,6 @@ private Family(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1008,7 +1005,7 @@ public Family parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Family(input, extensionRegistry);
+        return new Family(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java
index 8df11153c5ad..a46c9196a07b 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java
@@ -36,9 +36,6 @@ private MutateRowRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1270,7 +1267,7 @@ public MutateRowRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MutateRowRequest(input, extensionRegistry);
+        return new MutateRowRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowResponse.java
index 1597a4525f1c..017ef8b15db8 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowResponse.java
@@ -32,9 +32,6 @@ private MutateRowResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -375,7 +372,7 @@ public MutateRowResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MutateRowResponse(input, extensionRegistry);
+        return new MutateRowResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java
index da8097ffe6ee..15184ebbd8ff 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java
@@ -35,9 +35,6 @@ private MutateRowsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -203,9 +200,6 @@ private Entry(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1127,7 +1121,7 @@ public Entry parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Entry(input, extensionRegistry);
+          return new Entry(input, extensionRegistry);
       }
     };
 
@@ -2267,7 +2261,7 @@ public MutateRowsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MutateRowsRequest(input, extensionRegistry);
+        return new MutateRowsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java
index a3af7b895fe2..d4d7aec5e6d1 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java
@@ -33,9 +33,6 @@ private MutateRowsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -164,9 +161,6 @@ private Entry(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -847,7 +841,7 @@ public Entry parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Entry(input, extensionRegistry);
+          return new Entry(input, extensionRegistry);
       }
     };
 
@@ -1589,7 +1583,7 @@ public MutateRowsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MutateRowsResponse(input, extensionRegistry);
+        return new MutateRowsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java
index 75599ff3ffb4..79ee175d3fbe 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java
@@ -32,9 +32,6 @@ private Mutation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -222,9 +219,6 @@ private SetCell(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -973,7 +967,7 @@ public SetCell parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SetCell(input, extensionRegistry);
+          return new SetCell(input, extensionRegistry);
       }
     };
 
@@ -1083,9 +1077,6 @@ private DeleteFromColumn(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1898,7 +1889,7 @@ public DeleteFromColumn parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DeleteFromColumn(input, extensionRegistry);
+          return new DeleteFromColumn(input, extensionRegistry);
       }
     };
 
@@ -1971,9 +1962,6 @@ private DeleteFromFamily(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2476,7 +2464,7 @@ public DeleteFromFamily parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DeleteFromFamily(input, extensionRegistry);
+          return new DeleteFromFamily(input, extensionRegistry);
       }
     };
 
@@ -2528,9 +2516,6 @@ private DeleteFromRow(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -2871,7 +2856,7 @@ public DeleteFromRow parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DeleteFromRow(input, extensionRegistry);
+          return new DeleteFromRow(input, extensionRegistry);
       }
     };
 
@@ -4209,7 +4194,7 @@ public Mutation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Mutation(input, extensionRegistry);
+        return new Mutation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java
index 3d15975abacd..720adf0d11d5 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java
@@ -36,9 +36,6 @@ private ReadModifyWriteRowRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1277,7 +1274,7 @@ public ReadModifyWriteRowRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadModifyWriteRowRequest(input, extensionRegistry);
+        return new ReadModifyWriteRowRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java
index 0738cff286a5..e2d9741940f1 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java
@@ -32,9 +32,6 @@ private ReadModifyWriteRowResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public ReadModifyWriteRowResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadModifyWriteRowResponse(input, extensionRegistry);
+        return new ReadModifyWriteRowResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java
index b68b2abc86f1..97e6a916dee4 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java
@@ -35,9 +35,6 @@ private ReadModifyWriteRule(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -893,7 +890,7 @@ public ReadModifyWriteRule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadModifyWriteRule(input, extensionRegistry);
+        return new ReadModifyWriteRule(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java
index 9f82b19cae9b..cb400e6fd80b 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java
@@ -35,9 +35,6 @@ private ReadRowsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1256,7 +1253,7 @@ public ReadRowsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadRowsRequest(input, extensionRegistry);
+        return new ReadRowsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java
index 85dd9e6c3dc3..e3b59a2e539a 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java
@@ -34,9 +34,6 @@ private ReadRowsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -330,9 +327,6 @@ private CellChunk(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2114,7 +2108,7 @@ public CellChunk parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CellChunk(input, extensionRegistry);
+          return new CellChunk(input, extensionRegistry);
       }
     };
 
@@ -2862,7 +2856,7 @@ public ReadRowsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadRowsResponse(input, extensionRegistry);
+        return new ReadRowsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java
index 962494bac5b3..acf007311031 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java
@@ -35,9 +35,6 @@ private Row(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -926,7 +923,7 @@ public Row parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Row(input, extensionRegistry);
+        return new Row(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java
index 2b7137d195b9..abec9a5916a4 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java
@@ -59,9 +59,6 @@ private RowFilter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -343,9 +340,6 @@ private Chain(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1169,7 +1163,7 @@ public Chain parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Chain(input, extensionRegistry);
+          return new Chain(input, extensionRegistry);
       }
     };
 
@@ -1377,9 +1371,6 @@ private Interleave(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2664,7 +2655,7 @@ public Interleave parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Interleave(input, extensionRegistry);
+          return new Interleave(input, extensionRegistry);
       }
     };
 
@@ -2808,9 +2799,6 @@ private Condition(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3892,7 +3880,7 @@ public Condition parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Condition(input, extensionRegistry);
+          return new Condition(input, extensionRegistry);
       }
     };
 
@@ -7475,7 +7463,7 @@ public RowFilter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RowFilter(input, extensionRegistry);
+        return new RowFilter(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java
index d242ae83d60c..b7d94fafa71a 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java
@@ -32,9 +32,6 @@ private RowRange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -876,7 +873,7 @@ public RowRange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RowRange(input, extensionRegistry);
+        return new RowRange(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java
index cbc0ef0c87ce..b9f053098ec0 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java
@@ -34,9 +34,6 @@ private RowSet(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -994,7 +991,7 @@ public RowSet parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RowSet(input, extensionRegistry);
+        return new RowSet(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java
index 955d647d46a7..4edbb7e3ae6d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java
@@ -34,9 +34,6 @@ private SampleRowKeysRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -707,7 +704,7 @@ public SampleRowKeysRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SampleRowKeysRequest(input, extensionRegistry);
+        return new SampleRowKeysRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java
index bb6e4579c316..7477200ca710 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java
@@ -34,9 +34,6 @@ private SampleRowKeysResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -564,7 +561,7 @@ public SampleRowKeysResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SampleRowKeysResponse(input, extensionRegistry);
+        return new SampleRowKeysResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TableName.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TableName.java
index 0f068868e02b..693a98cee850 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TableName.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TableName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("TableName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance", instance, "table", table);
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java
index c553d6f6243b..9a3959c8381d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java
@@ -34,9 +34,6 @@ private TimestampRange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -526,7 +523,7 @@ public TimestampRange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TimestampRange(input, extensionRegistry);
+        return new TimestampRange(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java
index c2bc1e73fe4e..9ee037cc9b2d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java
@@ -32,9 +32,6 @@ private ValueRange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -876,7 +873,7 @@ public ValueRange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ValueRange(input, extensionRegistry);
+        return new ValueRange(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AcceleratorConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AcceleratorConfig.java
index 550786956aa2..108b4d7ec8b0 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AcceleratorConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AcceleratorConfig.java
@@ -34,9 +34,6 @@ private AcceleratorConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -613,7 +610,7 @@ public AcceleratorConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AcceleratorConfig(input, extensionRegistry);
+        return new AcceleratorConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AddonsConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AddonsConfig.java
index 8301594fa211..0696f7d6f5d5 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AddonsConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AddonsConfig.java
@@ -33,9 +33,6 @@ private AddonsConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1354,7 +1351,7 @@ public AddonsConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AddonsConfig(input, extensionRegistry);
+        return new AddonsConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AutoUpgradeOptions.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AutoUpgradeOptions.java
index 0a5b0c095b0a..7b38eafa1ae0 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AutoUpgradeOptions.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AutoUpgradeOptions.java
@@ -35,9 +35,6 @@ private AutoUpgradeOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -709,7 +706,7 @@ public AutoUpgradeOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AutoUpgradeOptions(input, extensionRegistry);
+        return new AutoUpgradeOptions(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequest.java
index ae5523da4a0b..4a681be022a1 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequest.java
@@ -35,9 +35,6 @@ private CancelOperationRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -855,7 +852,7 @@ public CancelOperationRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CancelOperationRequest(input, extensionRegistry);
+        return new CancelOperationRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClientCertificateConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClientCertificateConfig.java
index 7814c6eda9e9..93cde82763ae 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClientCertificateConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClientCertificateConfig.java
@@ -33,9 +33,6 @@ private ClientCertificateConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -451,7 +448,7 @@ public ClientCertificateConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClientCertificateConfig(input, extensionRegistry);
+        return new ClientCertificateConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Cluster.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Cluster.java
index 70988f04d37d..e5a763b1ceea 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Cluster.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Cluster.java
@@ -58,9 +58,6 @@ private Cluster(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     int mutable_bitField1_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -7316,7 +7313,7 @@ public Cluster parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Cluster(input, extensionRegistry);
+        return new Cluster(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterServiceProto.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterServiceProto.java
index 81671c0542bc..4df6650c2763 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterServiceProto.java
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "a\030\004 \003(\0132-.google.container.v1.NodeConfig" +
       ".MetadataEntry\022\022\n\nimage_type\030\005 \001(\t\022;\n\006la" +
       "bels\030\006 \003(\0132+.google.container.v1.NodeCon" +
-      "fig.LabelsEntry\022\027\n\017local_ssd_count\030\007 \001(\005" +
+      "fig.LabelsEntry\022\027\n\017local_ssd_count\030\007 \001(\005",
       "\022\014\n\004tags\030\010 \003(\t\022\023\n\013preemptible\030\n \001(\010\022<\n\014a" +
       "ccelerators\030\013 \003(\0132&.google.container.v1." +
       "AcceleratorConfig\022\030\n\020min_cpu_platform\030\r " +
@@ -352,7 +352,7 @@ public static void registerAllExtensions(
       "ername\030\001 \001(\t\022\020\n\010password\030\002 \001(\t\022O\n\031client" +
       "_certificate_config\030\003 \001(\0132,.google.conta" +
       "iner.v1.ClientCertificateConfig\022\036\n\026clust" +
-      "er_ca_certificate\030d \001(\t\022\032\n\022client_certif" +
+      "er_ca_certificate\030d \001(\t\022\032\n\022client_certif",
       "icate\030e \001(\t\022\022\n\nclient_key\030f \001(\t\";\n\027Clien" +
       "tCertificateConfig\022 \n\030issue_client_certi" +
       "ficate\030\001 \001(\010\"\267\002\n\014AddonsConfig\022C\n\023http_lo" +
@@ -362,7 +362,7 @@ public static void registerAllExtensions(
       "izontalPodAutoscaling\022F\n\024kubernetes_dash" +
       "board\030\003 \001(\0132(.google.container.v1.Kubern" +
       "etesDashboard\022G\n\025network_policy_config\030\004" +
-      " \001(\0132(.google.container.v1.NetworkPolicy" +
+      " \001(\0132(.google.container.v1.NetworkPolicy",
       "Config\"%\n\021HttpLoadBalancing\022\020\n\010disabled\030" +
       "\001 \001(\010\",\n\030HorizontalPodAutoscaling\022\020\n\010dis" +
       "abled\030\001 \001(\010\"\'\n\023KubernetesDashboard\022\020\n\010di" +
@@ -372,7 +372,7 @@ public static void registerAllExtensions(
       "\030\002 \003(\0132=.google.container.v1.MasterAutho" +
       "rizedNetworksConfig.CidrBlock\0325\n\tCidrBlo" +
       "ck\022\024\n\014display_name\030\001 \001(\t\022\022\n\ncidr_block\030\002" +
-      " \001(\t\"\035\n\nLegacyAbac\022\017\n\007enabled\030\001 \001(\010\"\221\001\n\r" +
+      " \001(\t\"\035\n\nLegacyAbac\022\017\n\007enabled\030\001 \001(\010\"\221\001\n\r",
       "NetworkPolicy\022=\n\010provider\030\001 \001(\0162+.google" +
       ".container.v1.NetworkPolicy.Provider\022\017\n\007" +
       "enabled\030\002 \001(\010\"0\n\010Provider\022\030\n\024PROVIDER_UN" +
@@ -382,7 +382,7 @@ public static void registerAllExtensions(
       "(\t\022\031\n\021cluster_ipv4_cidr\030\004 \001(\t\022\026\n\016node_ip" +
       "v4_cidr\030\005 \001(\t\022\032\n\022services_ipv4_cidr\030\006 \001(" +
       "\t\022$\n\034cluster_secondary_range_name\030\007 \001(\t\022" +
-      "%\n\035services_secondary_range_name\030\010 \001(\t\022\037" +
+      "%\n\035services_secondary_range_name\030\010 \001(\t\022\037",
       "\n\027cluster_ipv4_cidr_block\030\t \001(\t\022\034\n\024node_" +
       "ipv4_cidr_block\030\n \001(\t\022 \n\030services_ipv4_c" +
       "idr_block\030\013 \001(\t\"\252\013\n\007Cluster\022\014\n\004name\030\001 \001(" +
@@ -392,7 +392,7 @@ public static void registerAllExtensions(
       "\005 \001(\0132\037.google.container.v1.MasterAuth\022\027" +
       "\n\017logging_service\030\006 \001(\t\022\032\n\022monitoring_se" +
       "rvice\030\007 \001(\t\022\017\n\007network\030\010 \001(\t\022\031\n\021cluster_" +
-      "ipv4_cidr\030\t \001(\t\0228\n\raddons_config\030\n \001(\0132!" +
+      "ipv4_cidr\030\t \001(\t\0228\n\raddons_config\030\n \001(\0132!",
       ".google.container.v1.AddonsConfig\022\022\n\nsub" +
       "network\030\013 \001(\t\0221\n\nnode_pools\030\014 \003(\0132\035.goog" +
       "le.container.v1.NodePool\022\021\n\tlocations\030\r " +
@@ -402,7 +402,7 @@ public static void registerAllExtensions(
       "_fingerprint\030\020 \001(\t\0224\n\013legacy_abac\030\022 \001(\0132" +
       "\037.google.container.v1.LegacyAbac\022:\n\016netw" +
       "ork_policy\030\023 \001(\0132\".google.container.v1.N" +
-      "etworkPolicy\022E\n\024ip_allocation_policy\030\024 \001" +
+      "etworkPolicy\022E\n\024ip_allocation_policy\030\024 \001",
       "(\0132\'.google.container.v1.IPAllocationPol" +
       "icy\022^\n!master_authorized_networks_config" +
       "\030\026 \001(\01323.google.container.v1.MasterAutho" +
@@ -412,7 +412,7 @@ public static void registerAllExtensions(
       "\022\020\n\010endpoint\030f \001(\t\022\037\n\027initial_cluster_ve" +
       "rsion\030g \001(\t\022\036\n\026current_master_version\030h " +
       "\001(\t\022\034\n\024current_node_version\030i \001(\t\022\023\n\013cre" +
-      "ate_time\030j \001(\t\0223\n\006status\030k \001(\0162#.google." +
+      "ate_time\030j \001(\t\0223\n\006status\030k \001(\0162#.google.",
       "container.v1.Cluster.Status\022\026\n\016status_me" +
       "ssage\030l \001(\t\022\033\n\023node_ipv4_cidr_size\030m \001(\005" +
       "\022\032\n\022services_ipv4_cidr\030n \001(\t\022\033\n\023instance" +
@@ -422,7 +422,7 @@ public static void registerAllExtensions(
       "\001\"i\n\006Status\022\026\n\022STATUS_UNSPECIFIED\020\000\022\020\n\014P" +
       "ROVISIONING\020\001\022\013\n\007RUNNING\020\002\022\017\n\013RECONCILIN" +
       "G\020\003\022\014\n\010STOPPING\020\004\022\t\n\005ERROR\020\005\"\301\003\n\rCluster" +
-      "Update\022\034\n\024desired_node_version\030\004 \001(\t\022\"\n\032" +
+      "Update\022\034\n\024desired_node_version\030\004 \001(\t\022\"\n\032",
       "desired_monitoring_service\030\005 \001(\t\022@\n\025desi" +
       "red_addons_config\030\006 \001(\0132!.google.contain" +
       "er.v1.AddonsConfig\022\034\n\024desired_node_pool_" +
@@ -432,7 +432,7 @@ public static void registerAllExtensions(
       "\021desired_locations\030\n \003(\t\022f\n)desired_mast" +
       "er_authorized_networks_config\030\014 \001(\01323.go" +
       "ogle.container.v1.MasterAuthorizedNetwor" +
-      "ksConfig\022\036\n\026desired_master_version\030d \001(\t" +
+      "ksConfig\022\036\n\026desired_master_version\030d \001(\t",
       "\"\345\005\n\tOperation\022\014\n\004name\030\001 \001(\t\022\014\n\004zone\030\002 \001" +
       "(\t\022;\n\016operation_type\030\003 \001(\0162#.google.cont" +
       "ainer.v1.Operation.Type\0225\n\006status\030\004 \001(\0162" +
@@ -442,7 +442,7 @@ public static void registerAllExtensions(
       "\n\nstart_time\030\n \001(\t\022\020\n\010end_time\030\013 \001(\t\"R\n\006" +
       "Status\022\026\n\022STATUS_UNSPECIFIED\020\000\022\013\n\007PENDIN" +
       "G\020\001\022\013\n\007RUNNING\020\002\022\010\n\004DONE\020\003\022\014\n\010ABORTING\020\004" +
-      "\"\375\002\n\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\022\n\016CREAT" +
+      "\"\375\002\n\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\022\n\016CREAT",
       "E_CLUSTER\020\001\022\022\n\016DELETE_CLUSTER\020\002\022\022\n\016UPGRA" +
       "DE_MASTER\020\003\022\021\n\rUPGRADE_NODES\020\004\022\022\n\016REPAIR" +
       "_CLUSTER\020\005\022\022\n\016UPDATE_CLUSTER\020\006\022\024\n\020CREATE" +
@@ -452,7 +452,7 @@ public static void registerAllExtensions(
       "ABELS\020\014\022\023\n\017SET_MASTER_AUTH\020\r\022\026\n\022SET_NODE" +
       "_POOL_SIZE\020\016\022\026\n\022SET_NETWORK_POLICY\020\017\022\032\n\026" +
       "SET_MAINTENANCE_POLICY\020\020\"g\n\024CreateCluste" +
-      "rRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001" +
+      "rRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001",
       "(\t\022-\n\007cluster\030\003 \001(\0132\034.google.container.v" +
       "1.Cluster\"I\n\021GetClusterRequest\022\022\n\nprojec" +
       "t_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003" +
@@ -462,7 +462,7 @@ public static void registerAllExtensions(
       "1.ClusterUpdate\"\215\001\n\025UpdateNodePoolReques" +
       "t\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\nc" +
       "luster_id\030\003 \001(\t\022\024\n\014node_pool_id\030\004 \001(\t\022\024\n" +
-      "\014node_version\030\005 \001(\t\022\022\n\nimage_type\030\006 \001(\t\"" +
+      "\014node_version\030\005 \001(\t\022\022\n\nimage_type\030\006 \001(\t\"",
       "\252\001\n\035SetNodePoolAutoscalingRequest\022\022\n\npro" +
       "ject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_i" +
       "d\030\003 \001(\t\022\024\n\014node_pool_id\030\004 \001(\t\022=\n\013autosca" +
@@ -472,7 +472,7 @@ public static void registerAllExtensions(
       "uster_id\030\003 \001(\t\022\027\n\017logging_service\030\004 \001(\t\"" +
       "o\n\033SetMonitoringServiceRequest\022\022\n\nprojec" +
       "t_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003" +
-      " \001(\t\022\032\n\022monitoring_service\030\004 \001(\t\"\210\001\n\026Set" +
+      " \001(\t\022\032\n\022monitoring_service\030\004 \001(\t\"\210\001\n\026Set",
       "AddonsConfigRequest\022\022\n\nproject_id\030\001 \001(\t\022" +
       "\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\0228\n\radd" +
       "ons_config\030\004 \001(\0132!.google.container.v1.A" +
@@ -482,7 +482,7 @@ public static void registerAllExtensions(
       "terRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002" +
       " \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\026\n\016master_versi" +
       "on\030\004 \001(\t\"\221\002\n\024SetMasterAuthRequest\022\022\n\npro" +
-      "ject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_i" +
+      "ject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_i",
       "d\030\003 \001(\t\022@\n\006action\030\004 \001(\01620.google.contain" +
       "er.v1.SetMasterAuthRequest.Action\022/\n\006upd" +
       "ate\030\005 \001(\0132\037.google.container.v1.MasterAu" +
@@ -492,7 +492,7 @@ public static void registerAllExtensions(
       "id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001" +
       "(\t\"7\n\023ListClustersRequest\022\022\n\nproject_id\030" +
       "\001 \001(\t\022\014\n\004zone\030\002 \001(\t\"]\n\024ListClustersRespo" +
-      "nse\022.\n\010clusters\030\001 \003(\0132\034.google.container" +
+      "nse\022.\n\010clusters\030\001 \003(\0132\034.google.container",
       ".v1.Cluster\022\025\n\rmissing_zones\030\002 \003(\t\"M\n\023Ge" +
       "tOperationRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n" +
       "\004zone\030\002 \001(\t\022\024\n\014operation_id\030\003 \001(\t\"9\n\025Lis" +
@@ -502,7 +502,7 @@ public static void registerAllExtensions(
       "ation_id\030\003 \001(\t\"c\n\026ListOperationsResponse" +
       "\0222\n\noperations\030\001 \003(\0132\036.google.container." +
       "v1.Operation\022\025\n\rmissing_zones\030\002 \003(\t\":\n\026G" +
-      "etServerConfigRequest\022\022\n\nproject_id\030\001 \001(" +
+      "etServerConfigRequest\022\022\n\nproject_id\030\001 \001(",
       "\t\022\014\n\004zone\030\002 \001(\t\"\242\001\n\014ServerConfig\022\037\n\027defa" +
       "ult_cluster_version\030\001 \001(\t\022\033\n\023valid_node_" +
       "versions\030\003 \003(\t\022\032\n\022default_image_type\030\004 \001" +
@@ -512,7 +512,7 @@ public static void registerAllExtensions(
       "\022\n\ncluster_id\030\003 \001(\t\0220\n\tnode_pool\030\004 \001(\0132\035" +
       ".google.container.v1.NodePool\"c\n\025DeleteN" +
       "odePoolRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zo" +
-      "ne\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\024\n\014node_poo" +
+      "ne\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\024\n\014node_poo",
       "l_id\030\004 \001(\t\"L\n\024ListNodePoolsRequest\022\022\n\npr" +
       "oject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_" +
       "id\030\003 \001(\t\"`\n\022GetNodePoolRequest\022\022\n\nprojec" +
@@ -522,7 +522,7 @@ public static void registerAllExtensions(
       "ontainer.v1.NodeConfig\022\032\n\022initial_node_c" +
       "ount\030\003 \001(\005\022\021\n\tself_link\030d \001(\t\022\017\n\007version" +
       "\030e \001(\t\022\033\n\023instance_group_urls\030f \003(\t\0224\n\006s" +
-      "tatus\030g \001(\0162$.google.container.v1.NodePo" +
+      "tatus\030g \001(\0162$.google.container.v1.NodePo",
       "ol.Status\022\026\n\016status_message\030h \001(\t\022=\n\013aut" +
       "oscaling\030\004 \001(\0132(.google.container.v1.Nod" +
       "ePoolAutoscaling\0227\n\nmanagement\030\005 \001(\0132#.g" +
@@ -532,7 +532,7 @@ public static void registerAllExtensions(
       "R\020\003\022\017\n\013RECONCILING\020\004\022\014\n\010STOPPING\020\005\022\t\n\005ER" +
       "ROR\020\006\"}\n\016NodeManagement\022\024\n\014auto_upgrade\030" +
       "\001 \001(\010\022\023\n\013auto_repair\030\002 \001(\010\022@\n\017upgrade_op" +
-      "tions\030\n \001(\0132\'.google.container.v1.AutoUp" +
+      "tions\030\n \001(\0132\'.google.container.v1.AutoUp",
       "gradeOptions\"J\n\022AutoUpgradeOptions\022\037\n\027au" +
       "to_upgrade_start_time\030\001 \001(\t\022\023\n\013descripti" +
       "on\030\002 \001(\t\"K\n\021MaintenancePolicy\0226\n\006window\030" +
@@ -542,7 +542,7 @@ public static void registerAllExtensions(
       "v1.DailyMaintenanceWindowH\000B\010\n\006policy\">\n" +
       "\026DailyMaintenanceWindow\022\022\n\nstart_time\030\002 " +
       "\001(\t\022\020\n\010duration\030\003 \001(\t\"\243\001\n\034SetNodePoolMan" +
-      "agementRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zo" +
+      "agementRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zo",
       "ne\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\024\n\014node_poo" +
       "l_id\030\004 \001(\t\0227\n\nmanagement\030\005 \001(\0132#.google." +
       "container.v1.NodeManagement\"x\n\026SetNodePo" +
@@ -552,7 +552,7 @@ public static void registerAllExtensions(
       "kNodePoolUpgradeRequest\022\022\n\nproject_id\030\001 " +
       "\001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\024\n" +
       "\014node_pool_id\030\004 \001(\t\"J\n\025ListNodePoolsResp" +
-      "onse\0221\n\nnode_pools\030\001 \003(\0132\035.google.contai" +
+      "onse\0221\n\nnode_pools\030\001 \003(\0132\035.google.contai",
       "ner.v1.NodePool\"V\n\023NodePoolAutoscaling\022\017" +
       "\n\007enabled\030\001 \001(\010\022\026\n\016min_node_count\030\002 \001(\005\022" +
       "\026\n\016max_node_count\030\003 \001(\005\"\356\001\n\020SetLabelsReq" +
@@ -562,7 +562,7 @@ public static void registerAllExtensions(
       "st.ResourceLabelsEntry\022\031\n\021label_fingerpr" +
       "int\030\005 \001(\t\0325\n\023ResourceLabelsEntry\022\013\n\003key\030" +
       "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"]\n\024SetLegacyAba" +
-      "cRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001" +
+      "cRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001",
       "(\t\022\022\n\ncluster_id\030\003 \001(\t\022\017\n\007enabled\030\004 \001(\010\"" +
       "N\n\026StartIPRotationRequest\022\022\n\nproject_id\030" +
       "\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\"" +
@@ -572,7 +572,7 @@ public static void registerAllExtensions(
       "ount\030\001 \001(\003\022\030\n\020accelerator_type\030\002 \001(\t\"\213\001\n" +
       "\027SetNetworkPolicyRequest\022\022\n\nproject_id\030\001" +
       " \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022:" +
-      "\n\016network_policy\030\004 \001(\0132\".google.containe" +
+      "\n\016network_policy\030\004 \001(\0132\".google.containe",
       "r.v1.NetworkPolicy\"\227\001\n\033SetMaintenancePol" +
       "icyRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002" +
       " \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022B\n\022maintenance_" +
@@ -582,7 +582,7 @@ public static void registerAllExtensions(
       "ersRequest\032).google.container.v1.ListClu" +
       "stersResponse\"7\202\323\344\223\0021\022//v1/projects/{pro" +
       "ject_id}/zones/{zone}/clusters\022\230\001\n\nGetCl" +
-      "uster\022&.google.container.v1.GetClusterRe" +
+      "uster\022&.google.container.v1.GetClusterRe",
       "quest\032\034.google.container.v1.Cluster\"D\202\323\344" +
       "\223\002>\022*\"3/v1/projects/{project_id}/regio" +
-      "ns/{region}/clusters:\007cluster\022\263\001\n\rUpdate" +
+      "ns/{region}/clusters:\007cluster\022\263\001\n\rUpdate",
       "Cluster\022..google.cloud.dataproc.v1.Updat" +
       "eClusterRequest\032\035.google.longrunning.Ope" +
       "ration\"S\202\323\344\223\002M2B/v1/projects/{project_id" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "google.longrunning.Operation\"J\202\323\344\223\002D*B/v" +
       "1/projects/{project_id}/regions/{region}" +
       "/clusters/{cluster_name}\022\250\001\n\nGetCluster\022" +
-      "+.google.cloud.dataproc.v1.GetClusterReq" +
+      "+.google.cloud.dataproc.v1.GetClusterReq",
       "uest\032!.google.cloud.dataproc.v1.Cluster\"" +
       "J\202\323\344\223\002D\022B/v1/projects/{project_id}/regio" +
       "ns/{region}/clusters/{cluster_name}\022\252\001\n\014" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "/projects/{project_id}/regions/{region}/" +
       "clusters\022\272\001\n\017DiagnoseCluster\0220.google.cl" +
       "oud.dataproc.v1.DiagnoseClusterRequest\032\035" +
-      ".google.longrunning.Operation\"V\202\323\344\223\002P\"K/" +
+      ".google.longrunning.Operation\"V\202\323\344\223\002P\"K/",
       "v1/projects/{project_id}/regions/{region" +
       "}/clusters/{cluster_name}:diagnose:\001*Bq\n" +
       "\034com.google.cloud.dataproc.v1B\rClustersP" +
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/CreateClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/CreateClusterRequest.java
index 7af8f5426aee..e3c573770678 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/CreateClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/CreateClusterRequest.java
@@ -34,9 +34,6 @@ private CreateClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -922,7 +919,7 @@ public CreateClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateClusterRequest(input, extensionRegistry);
+        return new CreateClusterRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteClusterRequest.java
index 0cf67414e0b3..9f7a0f19681c 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteClusterRequest.java
@@ -35,9 +35,6 @@ private DeleteClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -848,7 +845,7 @@ public DeleteClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteClusterRequest(input, extensionRegistry);
+        return new DeleteClusterRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteJobRequest.java
index 3488014f4c83..ebbbaf2b8eef 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteJobRequest.java
@@ -35,9 +35,6 @@ private DeleteJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -848,7 +845,7 @@ public DeleteJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteJobRequest(input, extensionRegistry);
+        return new DeleteJobRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterRequest.java
index 653638222dff..ee3f6886fc6a 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterRequest.java
@@ -35,9 +35,6 @@ private DiagnoseClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -848,7 +845,7 @@ public DiagnoseClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DiagnoseClusterRequest(input, extensionRegistry);
+        return new DiagnoseClusterRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterResults.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterResults.java
index c381f2f9e69c..d967ff50f1e2 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterResults.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterResults.java
@@ -33,9 +33,6 @@ private DiagnoseClusterResults(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public DiagnoseClusterResults parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DiagnoseClusterResults(input, extensionRegistry);
+        return new DiagnoseClusterResults(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiskConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiskConfig.java
index 478dee335724..80b5f04706e9 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiskConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiskConfig.java
@@ -34,9 +34,6 @@ private DiskConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -544,7 +541,7 @@ public DiskConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DiskConfig(input, extensionRegistry);
+        return new DiskConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GceClusterConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GceClusterConfig.java
index e0b87a90b6f1..a9b1697f3818 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GceClusterConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GceClusterConfig.java
@@ -40,9 +40,6 @@ private GceClusterConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2208,7 +2205,7 @@ public GceClusterConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GceClusterConfig(input, extensionRegistry);
+        return new GceClusterConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetClusterRequest.java
index bb00dc6eece1..5f4787d73906 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetClusterRequest.java
@@ -35,9 +35,6 @@ private GetClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -848,7 +845,7 @@ public GetClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetClusterRequest(input, extensionRegistry);
+        return new GetClusterRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetJobRequest.java
index a32fb7787c9e..6556ffc9af10 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetJobRequest.java
@@ -35,9 +35,6 @@ private GetJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -848,7 +845,7 @@ public GetJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetJobRequest(input, extensionRegistry);
+        return new GetJobRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HadoopJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HadoopJob.java
index aaf3d9857362..94a0886b9441 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HadoopJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HadoopJob.java
@@ -38,9 +38,6 @@ private HadoopJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2422,7 +2419,7 @@ public HadoopJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HadoopJob(input, extensionRegistry);
+        return new HadoopJob(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HiveJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HiveJob.java
index 3791e75fd3dc..47e3940fc6bf 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HiveJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HiveJob.java
@@ -35,9 +35,6 @@ private HiveJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1865,7 +1862,7 @@ public HiveJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HiveJob(input, extensionRegistry);
+        return new HiveJob(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/InstanceGroupConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/InstanceGroupConfig.java
index 790659fffe33..5c9744e37630 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/InstanceGroupConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/InstanceGroupConfig.java
@@ -39,9 +39,6 @@ private InstanceGroupConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2115,7 +2112,7 @@ public InstanceGroupConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InstanceGroupConfig(input, extensionRegistry);
+        return new InstanceGroupConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/Job.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/Job.java
index 24df869b2b0b..c77b2411b636 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/Job.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/Job.java
@@ -36,9 +36,6 @@ private Job(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4567,7 +4564,7 @@ public Job parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Job(input, extensionRegistry);
+        return new Job(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobPlacement.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobPlacement.java
index ee3d8d13e2bc..e23ae7f6c80e 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobPlacement.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobPlacement.java
@@ -34,9 +34,6 @@ private JobPlacement(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -693,7 +690,7 @@ public JobPlacement parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobPlacement(input, extensionRegistry);
+        return new JobPlacement(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobReference.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobReference.java
index 5568f0bb187b..f9716aa54dc9 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobReference.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobReference.java
@@ -34,9 +34,6 @@ private JobReference(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -721,7 +718,7 @@ public JobReference parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobReference(input, extensionRegistry);
+        return new JobReference(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobScheduling.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobScheduling.java
index 68f23eb3eca1..dffe47ed6fb8 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobScheduling.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobScheduling.java
@@ -35,9 +35,6 @@ private JobScheduling(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -474,7 +471,7 @@ public JobScheduling parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobScheduling(input, extensionRegistry);
+        return new JobScheduling(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobStatus.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobStatus.java
index a65031df8761..8708aa31f1e5 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobStatus.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobStatus.java
@@ -35,9 +35,6 @@ private JobStatus(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1412,7 +1409,7 @@ public JobStatus parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobStatus(input, extensionRegistry);
+        return new JobStatus(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobsProto.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobsProto.java
index 13e14855d5ed..1e3b460a92c9 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobsProto.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobsProto.java
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "gle.cloud.dataproc.v1.LoggingConfig.Driv" +
       "erLogLevelsEntry\032e\n\024DriverLogLevelsEntry" +
       "\022\013\n\003key\030\001 \001(\t\022<\n\005value\030\002 \001(\0162-.google.cl" +
-      "oud.dataproc.v1.LoggingConfig.Level:\0028\001\"" +
+      "oud.dataproc.v1.LoggingConfig.Level:\0028\001\"",
       "p\n\005Level\022\025\n\021LEVEL_UNSPECIFIED\020\000\022\007\n\003ALL\020\001" +
       "\022\t\n\005TRACE\020\002\022\t\n\005DEBUG\020\003\022\010\n\004INFO\020\004\022\010\n\004WARN" +
       "\020\005\022\t\n\005ERROR\020\006\022\t\n\005FATAL\020\007\022\007\n\003OFF\020\010\"\323\002\n\tHa" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "chive_uris\030\006 \003(\t\022G\n\nproperties\030\007 \003(\01323.g" +
       "oogle.cloud.dataproc.v1.HadoopJob.Proper" +
       "tiesEntry\022?\n\016logging_config\030\010 \001(\0132\'.goog" +
-      "le.cloud.dataproc.v1.LoggingConfig\0321\n\017Pr" +
+      "le.cloud.dataproc.v1.LoggingConfig\0321\n\017Pr",
       "opertiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(" +
       "\t:\0028\001B\010\n\006driver\"\321\002\n\010SparkJob\022\033\n\021main_jar" +
       "_file_uri\030\001 \001(\tH\000\022\024\n\nmain_class\030\002 \001(\tH\000\022" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "c.v1.SparkJob.PropertiesEntry\022?\n\016logging" +
       "_config\030\010 \001(\0132\'.google.cloud.dataproc.v1" +
       ".LoggingConfig\0321\n\017PropertiesEntry\022\013\n\003key" +
-      "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\010\n\006driver\"\320\002\n\n" +
+      "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\010\n\006driver\"\320\002\n\n",
       "PySparkJob\022\034\n\024main_python_file_uri\030\001 \001(\t" +
       "\022\014\n\004args\030\002 \003(\t\022\030\n\020python_file_uris\030\003 \003(\t" +
       "\022\025\n\rjar_file_uris\030\004 \003(\t\022\021\n\tfile_uris\030\005 \003" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "(\0132\'.google.cloud.dataproc.v1.LoggingCon" +
       "fig\0321\n\017PropertiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005v" +
       "alue\030\002 \001(\t:\0028\001\"\034\n\tQueryList\022\017\n\007queries\030\001" +
-      " \003(\t\"\241\003\n\007HiveJob\022\030\n\016query_file_uri\030\001 \001(\t" +
+      " \003(\t\"\241\003\n\007HiveJob\022\030\n\016query_file_uri\030\001 \001(\t",
       "H\000\0229\n\nquery_list\030\002 \001(\0132#.google.cloud.da" +
       "taproc.v1.QueryListH\000\022\033\n\023continue_on_fai" +
       "lure\030\003 \001(\010\022P\n\020script_variables\030\004 \003(\01326.g" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "try\022\025\n\rjar_file_uris\030\006 \003(\t\0326\n\024ScriptVari" +
       "ablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\002" +
       "8\001\0321\n\017PropertiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" +
-      "lue\030\002 \001(\t:\0028\001B\t\n\007queries\"\321\003\n\013SparkSqlJob" +
+      "lue\030\002 \001(\t:\0028\001B\t\n\007queries\"\321\003\n\013SparkSqlJob",
       "\022\030\n\016query_file_uri\030\001 \001(\tH\000\0229\n\nquery_list" +
       "\030\002 \001(\0132#.google.cloud.dataproc.v1.QueryL" +
       "istH\000\022T\n\020script_variables\030\003 \003(\0132:.google" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "sEntry\022\025\n\rjar_file_uris\0308 \003(\t\022?\n\016logging" +
       "_config\030\006 \001(\0132\'.google.cloud.dataproc.v1" +
       ".LoggingConfig\0326\n\024ScriptVariablesEntry\022\013" +
-      "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0321\n\017Proper" +
+      "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0321\n\017Proper",
       "tiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028" +
       "\001B\t\n\007queries\"\337\003\n\006PigJob\022\030\n\016query_file_ur" +
       "i\030\001 \001(\tH\000\0229\n\nquery_list\030\002 \001(\0132#.google.c" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "riptVariablesEntry\022D\n\nproperties\030\005 \003(\01320" +
       ".google.cloud.dataproc.v1.PigJob.Propert" +
       "iesEntry\022\025\n\rjar_file_uris\030\006 \003(\t\022?\n\016loggi" +
-      "ng_config\030\007 \001(\0132\'.google.cloud.dataproc." +
+      "ng_config\030\007 \001(\0132\'.google.cloud.dataproc.",
       "v1.LoggingConfig\0326\n\024ScriptVariablesEntry" +
       "\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0321\n\017Prop" +
       "ertiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "ataproc.v1.JobStatus.State\022\017\n\007details\030\002 " +
       "\001(\t\0224\n\020state_start_time\030\006 \001(\0132\032.google.p" +
       "rotobuf.Timestamp\022>\n\010substate\030\007 \001(\0162,.go" +
-      "ogle.cloud.dataproc.v1.JobStatus.Substat" +
+      "ogle.cloud.dataproc.v1.JobStatus.Substat",
       "e\"\251\001\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\013\n\007PE" +
       "NDING\020\001\022\016\n\nSETUP_DONE\020\010\022\013\n\007RUNNING\020\002\022\022\n\016" +
       "CANCEL_PENDING\020\003\022\022\n\016CANCEL_STARTED\020\007\022\r\n\t" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "TATUS\020\003\"2\n\014JobReference\022\022\n\nproject_id\030\001 " +
       "\001(\t\022\016\n\006job_id\030\002 \001(\t\"\221\002\n\017YarnApplication\022" +
       "\014\n\004name\030\001 \001(\t\022>\n\005state\030\002 \001(\0162/.google.cl" +
-      "oud.dataproc.v1.YarnApplication.State\022\020\n" +
+      "oud.dataproc.v1.YarnApplication.State\022\020\n",
       "\010progress\030\003 \001(\002\022\024\n\014tracking_url\030\004 \001(\t\"\207\001" +
       "\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\007\n\003NEW\020\001\022" +
       "\016\n\nNEW_SAVING\020\002\022\r\n\tSUBMITTED\020\003\022\014\n\010ACCEPT" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "ce\0229\n\tplacement\030\002 \001(\0132&.google.cloud.dat" +
       "aproc.v1.JobPlacement\0229\n\nhadoop_job\030\003 \001(" +
       "\0132#.google.cloud.dataproc.v1.HadoopJobH\000" +
-      "\0227\n\tspark_job\030\004 \001(\0132\".google.cloud.datap" +
+      "\0227\n\tspark_job\030\004 \001(\0132\".google.cloud.datap",
       "roc.v1.SparkJobH\000\022;\n\013pyspark_job\030\005 \001(\0132$" +
       ".google.cloud.dataproc.v1.PySparkJobH\000\0225" +
       "\n\010hive_job\030\006 \001(\0132!.google.cloud.dataproc" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "rkSqlJobH\000\0223\n\006status\030\010 \001(\0132#.google.clou" +
       "d.dataproc.v1.JobStatus\022;\n\016status_histor" +
       "y\030\r \003(\0132#.google.cloud.dataproc.v1.JobSt" +
-      "atus\022D\n\021yarn_applications\030\t \003(\0132).google" +
+      "atus\022D\n\021yarn_applications\030\t \003(\0132).google",
       ".cloud.dataproc.v1.YarnApplication\022\"\n\032dr" +
       "iver_output_resource_uri\030\021 \001(\t\022 \n\030driver" +
       "_control_files_uri\030\017 \001(\t\0229\n\006labels\030\022 \003(\013" +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\n\n\010type_" +
       "job\".\n\rJobScheduling\022\035\n\025max_failures_per" +
       "_hour\030\001 \001(\005\"b\n\020SubmitJobRequest\022\022\n\nproje" +
-      "ct_id\030\001 \001(\t\022\016\n\006region\030\003 \001(\t\022*\n\003job\030\002 \001(\013" +
+      "ct_id\030\001 \001(\t\022\016\n\006region\030\003 \001(\t\022*\n\003job\030\002 \001(\013",
       "2\035.google.cloud.dataproc.v1.Job\"C\n\rGetJo" +
       "bRequest\022\022\n\nproject_id\030\001 \001(\t\022\016\n\006region\030\003" +
       " \001(\t\022\016\n\006job_id\030\002 \001(\t\"\220\002\n\017ListJobsRequest" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       " \001(\01629.google.cloud.dataproc.v1.ListJobs" +
       "Request.JobStateMatcher\022\016\n\006filter\030\007 \001(\t\"" +
       "6\n\017JobStateMatcher\022\007\n\003ALL\020\000\022\n\n\006ACTIVE\020\001\022" +
-      "\016\n\nNON_ACTIVE\020\002\"\243\001\n\020UpdateJobRequest\022\022\n\n" +
+      "\016\n\nNON_ACTIVE\020\002\"\243\001\n\020UpdateJobRequest\022\022\n\n",
       "project_id\030\001 \001(\t\022\016\n\006region\030\002 \001(\t\022\016\n\006job_" +
       "id\030\003 \001(\t\022*\n\003job\030\004 \001(\0132\035.google.cloud.dat" +
       "aproc.v1.Job\022/\n\013update_mask\030\005 \001(\0132\032.goog" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       "lJobRequest\022\022\n\nproject_id\030\001 \001(\t\022\016\n\006regio" +
       "n\030\003 \001(\t\022\016\n\006job_id\030\002 \001(\t\"F\n\020DeleteJobRequ" +
       "est\022\022\n\nproject_id\030\001 \001(\t\022\016\n\006region\030\003 \001(\t\022" +
-      "\016\n\006job_id\030\002 \001(\t2\266\007\n\rJobController\022\231\001\n\tSu" +
+      "\016\n\006job_id\030\002 \001(\t2\266\007\n\rJobController\022\231\001\n\tSu",
       "bmitJob\022*.google.cloud.dataproc.v1.Submi" +
       "tJobRequest\032\035.google.cloud.dataproc.v1.J" +
       "ob\"A\202\323\344\223\002;\"6/v1/projects/{project_id}/re" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "\0228/v1/projects/{project_id}/regions/{reg" +
       "ion}/jobs/{job_id}\022\232\001\n\010ListJobs\022).google" +
       ".cloud.dataproc.v1.ListJobsRequest\032*.goo" +
-      "gle.cloud.dataproc.v1.ListJobsResponse\"7" +
+      "gle.cloud.dataproc.v1.ListJobsResponse\"7",
       "\202\323\344\223\0021\022//v1/projects/{project_id}/region" +
       "s/{region}/jobs\022\235\001\n\tUpdateJob\022*.google.c" +
       "loud.dataproc.v1.UpdateJobRequest\032\035.goog" +
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "loud.dataproc.v1.CancelJobRequest\032\035.goog" +
       "le.cloud.dataproc.v1.Job\"J\202\323\344\223\002D\"?/v1/pr" +
       "ojects/{project_id}/regions/{region}/job" +
-      "s/{job_id}:cancel:\001*\022\221\001\n\tDeleteJob\022*.goo" +
+      "s/{job_id}:cancel:\001*\022\221\001\n\tDeleteJob\022*.goo",
       "gle.cloud.dataproc.v1.DeleteJobRequest\032\026" +
       ".google.protobuf.Empty\"@\202\323\344\223\002:*8/v1/proj" +
       "ects/{project_id}/regions/{region}/jobs/" +
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersRequest.java
index 1ce1d695ef4e..2d2534ec4ec2 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersRequest.java
@@ -37,9 +37,6 @@ private ListClustersRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1175,7 +1172,7 @@ public ListClustersRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListClustersRequest(input, extensionRegistry);
+        return new ListClustersRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersResponse.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersResponse.java
index c58ab305527c..adb81340fec9 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersResponse.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersResponse.java
@@ -34,9 +34,6 @@ private ListClustersResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListClustersResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListClustersResponse(input, extensionRegistry);
+        return new ListClustersResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsRequest.java
index add0a7d48813..a1efdd26f503 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsRequest.java
@@ -39,9 +39,6 @@ private ListJobsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1571,7 +1568,7 @@ public ListJobsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListJobsRequest(input, extensionRegistry);
+        return new ListJobsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsResponse.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsResponse.java
index 6a16e53d315f..270eb220e684 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsResponse.java
@@ -34,9 +34,6 @@ private ListJobsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListJobsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListJobsResponse(input, extensionRegistry);
+        return new ListJobsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/LoggingConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/LoggingConfig.java
index ec9087c977a1..84c59fa04cb6 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/LoggingConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/LoggingConfig.java
@@ -32,9 +32,6 @@ private LoggingConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1156,7 +1153,7 @@ public LoggingConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LoggingConfig(input, extensionRegistry);
+        return new LoggingConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ManagedGroupConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ManagedGroupConfig.java
index 65130ea2d335..b67328620d9f 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ManagedGroupConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ManagedGroupConfig.java
@@ -34,9 +34,6 @@ private ManagedGroupConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -693,7 +690,7 @@ public ManagedGroupConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ManagedGroupConfig(input, extensionRegistry);
+        return new ManagedGroupConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/NodeInitializationAction.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/NodeInitializationAction.java
index cf4b8feb1787..b1c1ab6d8b17 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/NodeInitializationAction.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/NodeInitializationAction.java
@@ -34,9 +34,6 @@ private NodeInitializationAction(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -798,7 +795,7 @@ public NodeInitializationAction parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NodeInitializationAction(input, extensionRegistry);
+        return new NodeInitializationAction(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/OperationsProto.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/OperationsProto.java
index 1b5700bc2f71..8559b588882a 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/OperationsProto.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/OperationsProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "26.google.cloud.dataproc.v1.ClusterOpera" +
       "tionStatus.State\022\023\n\013inner_state\030\002 \001(\t\022\017\n" +
       "\007details\030\003 \001(\t\0224\n\020state_start_time\030\004 \001(\013" +
-      "2\032.google.protobuf.Timestamp\"8\n\005State\022\013\n" +
+      "2\032.google.protobuf.Timestamp\"8\n\005State\022\013\n",
       "\007UNKNOWN\020\000\022\013\n\007PENDING\020\001\022\013\n\007RUNNING\020\002\022\010\n\004" +
       "DONE\020\003\"\220\003\n\030ClusterOperationMetadata\022\024\n\014c" +
       "luster_name\030\007 \001(\t\022\024\n\014cluster_uuid\030\010 \001(\t\022" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "sterOperationStatus\022\026\n\016operation_type\030\013 " +
       "\001(\t\022\023\n\013description\030\014 \001(\t\022N\n\006labels\030\r \003(\013" +
       "2>.google.cloud.dataproc.v1.ClusterOpera" +
-      "tionMetadata.LabelsEntry\022\020\n\010warnings\030\016 \003" +
+      "tionMetadata.LabelsEntry\022\020\n\010warnings\030\016 \003",
       "(\t\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030" +
       "\002 \001(\t:\0028\001Bs\n\034com.google.cloud.dataproc.v" +
       "1B\017OperationsProtoP\001Z@google.golang.org/" +
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PigJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PigJob.java
index 83203cc6189e..2e8c8ae6460b 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PigJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PigJob.java
@@ -35,9 +35,6 @@ private PigJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2081,7 +2078,7 @@ public PigJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PigJob(input, extensionRegistry);
+        return new PigJob(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PySparkJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PySparkJob.java
index 959ffec2cd15..294970ca8a09 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PySparkJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PySparkJob.java
@@ -40,9 +40,6 @@ private PySparkJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2313,7 +2310,7 @@ public PySparkJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PySparkJob(input, extensionRegistry);
+        return new PySparkJob(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/QueryList.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/QueryList.java
index d03e4d429d22..ebe9e3d13ca9 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/QueryList.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/QueryList.java
@@ -33,9 +33,6 @@ private QueryList(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -756,7 +753,7 @@ public QueryList parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryList(input, extensionRegistry);
+        return new QueryList(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SoftwareConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SoftwareConfig.java
index 88ab48b8c25e..8300a825f392 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SoftwareConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SoftwareConfig.java
@@ -33,9 +33,6 @@ private SoftwareConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1020,7 +1017,7 @@ public SoftwareConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SoftwareConfig(input, extensionRegistry);
+        return new SoftwareConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkJob.java
index 97098af3548e..998356dc282c 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkJob.java
@@ -37,9 +37,6 @@ private SparkJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2366,7 +2363,7 @@ public SparkJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SparkJob(input, extensionRegistry);
+        return new SparkJob(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkSqlJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkSqlJob.java
index 22f5249bd8ff..5b484ef1ebe2 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkSqlJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkSqlJob.java
@@ -34,9 +34,6 @@ private SparkSqlJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1974,7 +1971,7 @@ public SparkSqlJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SparkSqlJob(input, extensionRegistry);
+        return new SparkSqlJob(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SubmitJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SubmitJobRequest.java
index 69f915d514bb..3314ff07fc49 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SubmitJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SubmitJobRequest.java
@@ -34,9 +34,6 @@ private SubmitJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -922,7 +919,7 @@ public SubmitJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SubmitJobRequest(input, extensionRegistry);
+        return new SubmitJobRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateClusterRequest.java
index 41b6586fa176..fb996d8e0463 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateClusterRequest.java
@@ -35,9 +35,6 @@ private UpdateClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1822,7 +1819,7 @@ public UpdateClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateClusterRequest(input, extensionRegistry);
+        return new UpdateClusterRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateJobRequest.java
index 37afd2d409a9..400c93dae0ec 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateJobRequest.java
@@ -35,9 +35,6 @@ private UpdateJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1366,7 +1363,7 @@ public UpdateJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateJobRequest(input, extensionRegistry);
+        return new UpdateJobRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/YarnApplication.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/YarnApplication.java
index b03e9798a41e..247b7752bbf1 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/YarnApplication.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/YarnApplication.java
@@ -39,9 +39,6 @@ private YarnApplication(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1139,7 +1136,7 @@ public YarnApplication parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new YarnApplication(input, extensionRegistry);
+        return new YarnApplication(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java
index 400846c83530..aebc798e7c23 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java
@@ -34,9 +34,6 @@ private AllocateIdsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -994,7 +991,7 @@ public AllocateIdsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AllocateIdsRequest(input, extensionRegistry);
+        return new AllocateIdsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java
index ee62ee5fec98..3844547c3756 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java
@@ -33,9 +33,6 @@ private AllocateIdsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -836,7 +833,7 @@ public AllocateIdsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AllocateIdsResponse(input, extensionRegistry);
+        return new AllocateIdsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java
index fe6b290e9322..ad0cb62648e6 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java
@@ -33,9 +33,6 @@ private ArrayValue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -859,7 +856,7 @@ public ArrayValue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ArrayValue(input, extensionRegistry);
+        return new ArrayValue(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
index 2fdd90689108..e977c4250e83 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
@@ -33,9 +33,6 @@ private BeginTransactionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -760,7 +757,7 @@ public BeginTransactionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BeginTransactionRequest(input, extensionRegistry);
+        return new BeginTransactionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java
index 0bb48d6a6899..a511859f4210 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java
@@ -33,9 +33,6 @@ private BeginTransactionResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -453,7 +450,7 @@ public BeginTransactionResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BeginTransactionResponse(input, extensionRegistry);
+        return new BeginTransactionResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
index ffae15d56af6..3040ae1e25ab 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
@@ -35,9 +35,6 @@ private CommitRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1593,7 +1590,7 @@ public CommitRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitRequest(input, extensionRegistry);
+        return new CommitRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java
index 05ae3dda3d70..ff72b2e89499 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java
@@ -34,9 +34,6 @@ private CommitResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -917,7 +914,7 @@ public CommitResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitResponse(input, extensionRegistry);
+        return new CommitResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
index acb487899c4d..20ab2f6c13fe 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
@@ -34,9 +34,6 @@ private CompositeFilter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1068,7 +1065,7 @@ public CompositeFilter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CompositeFilter(input, extensionRegistry);
+        return new CompositeFilter(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
index 0ef9ef973d45..c4079ab19db1 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "adOptions\022&\n\004keys\030\003 \003(\0132\030.google.datasto" +
       "re.v1.Key\"\242\001\n\016LookupResponse\0220\n\005found\030\001 " +
       "\003(\0132!.google.datastore.v1.EntityResult\0222" +
-      "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En" +
+      "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En",
       "tityResult\022*\n\010deferred\030\003 \003(\0132\030.google.da" +
       "tastore.v1.Key\"\204\002\n\017RunQueryRequest\022\022\n\npr" +
       "oject_id\030\010 \001(\t\0226\n\014partition_id\030\002 \001(\0132 .g" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       ".v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google." +
       "datastore.v1.GqlQueryH\000B\014\n\nquery_type\"s\n" +
       "\020RunQueryResponse\0224\n\005batch\030\001 \001(\0132%.googl" +
-      "e.datastore.v1.QueryResultBatch\022)\n\005query" +
+      "e.datastore.v1.QueryResultBatch\022)\n\005query",
       "\030\002 \001(\0132\032.google.datastore.v1.Query\"s\n\027Be" +
       "ginTransactionRequest\022\022\n\nproject_id\030\010 \001(" +
       "\t\022D\n\023transaction_options\030\n \001(\0132\'.google." +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "\023\n\013transaction\030\001 \001(\014\"\022\n\020RollbackResponse" +
       "\"\203\002\n\rCommitRequest\022\022\n\nproject_id\030\010 \001(\t\0225" +
       "\n\004mode\030\005 \001(\0162\'.google.datastore.v1.Commi" +
-      "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t" +
+      "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t",
       "mutations\030\006 \003(\0132\035.google.datastore.v1.Mu" +
       "tation\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED\020\000\022\021\n\r" +
       "TRANSACTIONAL\020\001\022\025\n\021NON_TRANSACTIONAL\020\002B\026" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "\030\004 \001(\005\"P\n\022AllocateIdsRequest\022\022\n\nproject_" +
       "id\030\010 \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.datastor" +
       "e.v1.Key\"=\n\023AllocateIdsResponse\022&\n\004keys\030" +
-      "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser" +
+      "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser",
       "veIdsRequest\022\022\n\nproject_id\030\010 \001(\t\022\023\n\013data" +
       "base_id\030\t \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.dat" +
       "astore.v1.Key\"\024\n\022ReserveIdsResponse\"\207\002\n\010" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       ".google.datastore.v1.EntityH\000\022*\n\006delete\030" +
       "\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014bas" +
       "e_version\030\010 \001(\003H\001B\013\n\toperationB\035\n\033confli" +
-      "ct_detection_strategy\"c\n\016MutationResult\022" +
+      "ct_detection_strategy\"c\n\016MutationResult\022",
       "%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022\017" +
       "\n\007version\030\004 \001(\003\022\031\n\021conflict_detected\030\005 \001" +
       "(\010\"\325\001\n\013ReadOptions\022L\n\020read_consistency\030\001" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "NSPECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022" +
       "\n\020consistency_type\"\343\001\n\022TransactionOption" +
       "s\022G\n\nread_write\030\001 \001(\01321.google.datastore" +
-      ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre" +
+      ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre",
       "ad_only\030\002 \001(\01320.google.datastore.v1.Tran" +
       "sactionOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034" +
       "\n\024previous_transaction\030\001 \001(\014\032\n\n\010ReadOnly" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "rojects/{project_id}:lookup:\001*\022\206\001\n\010RunQu" +
       "ery\022$.google.datastore.v1.RunQueryReques" +
       "t\032%.google.datastore.v1.RunQueryResponse" +
-      "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ" +
+      "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ",
       "uery:\001*\022\246\001\n\020BeginTransaction\022,.google.da" +
       "tastore.v1.BeginTransactionRequest\032-.goo" +
       "gle.datastore.v1.BeginTransactionRespons" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "e.v1.CommitResponse\"+\202\323\344\223\002%\" /v1/project" +
       "s/{project_id}:commit:\001*\022\206\001\n\010Rollback\022$." +
       "google.datastore.v1.RollbackRequest\032%.go" +
-      "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223" +
+      "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223",
       "\002\'\"\"/v1/projects/{project_id}:rollback:\001" +
       "*\022\222\001\n\013AllocateIds\022\'.google.datastore.v1." +
       "AllocateIdsRequest\032(.google.datastore.v1" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "quest\032\'.google.datastore.v1.ReserveIdsRe" +
       "sponse\"/\202\323\344\223\002)\"$/v1/projects/{project_id" +
       "}:reserveIds:\001*B\241\001\n\027com.google.datastore" +
-      ".v1B\016DatastoreProtoP\001Z\n\017p" +
-      "roperty_filter\030\002 \001(\0132#.google.datastore." +
+      "roperty_filter\030\002 \001(\0132#.google.datastore.",
       "v1.PropertyFilterH\000B\r\n\013filter_type\"\251\001\n\017C" +
       "ompositeFilter\0229\n\002op\030\001 \001(\0162-.google.data" +
       "store.v1.CompositeFilter.Operator\022,\n\007fil" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "\001(\0132&.google.datastore.v1.PropertyRefere" +
       "nce\0228\n\002op\030\002 \001(\0162,.google.datastore.v1.Pr" +
       "opertyFilter.Operator\022)\n\005value\030\003 \001(\0132\032.g" +
-      "oogle.datastore.v1.Value\"\225\001\n\010Operator\022\030\n" +
+      "oogle.datastore.v1.Value\"\225\001\n\010Operator\022\030\n",
       "\024OPERATOR_UNSPECIFIED\020\000\022\r\n\tLESS_THAN\020\001\022\026" +
       "\n\022LESS_THAN_OR_EQUAL\020\002\022\020\n\014GREATER_THAN\020\003" +
       "\022\031\n\025GREATER_THAN_OR_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\020" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "1.GqlQuery.NamedBindingsEntry\022C\n\023positio" +
       "nal_bindings\030\004 \003(\0132&.google.datastore.v1" +
       ".GqlQueryParameter\032\\\n\022NamedBindingsEntry" +
-      "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da" +
+      "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da",
       "tastore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQ" +
       "ueryParameter\022+\n\005value\030\002 \001(\0132\032.google.da" +
       "tastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "e.datastore.v1.EntityResult.ResultType\0229" +
       "\n\016entity_results\030\002 \003(\0132!.google.datastor" +
       "e.v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n" +
-      "\014more_results\030\005 \001(\01625.google.datastore.v" +
+      "\014more_results\030\005 \001(\01625.google.datastore.v",
       "1.QueryResultBatch.MoreResultsType\022\030\n\020sn" +
       "apshot_version\030\007 \001(\003\"\230\001\n\017MoreResultsType" +
       "\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014N" +
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index cea8e80d4c64..b1b10aa07ef9 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -39,9 +39,6 @@ private QueryResultBatch(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1544,7 +1541,7 @@ public QueryResultBatch parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryResultBatch(input, extensionRegistry);
+        return new QueryResultBatch(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 048ee2dabfaf..b2bcfaa948fc 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -32,9 +32,6 @@ private ReadOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -818,7 +815,7 @@ public ReadOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadOptions(input, extensionRegistry);
+        return new ReadOptions(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java
index 2ffd5b09e1ac..d5c5f26c5142 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java
@@ -35,9 +35,6 @@ private ReserveIdsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1149,7 +1146,7 @@ public ReserveIdsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReserveIdsRequest(input, extensionRegistry);
+        return new ReserveIdsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java
index 1a905db7ea25..d5d38f6b6f60 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java
@@ -32,9 +32,6 @@ private ReserveIdsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -375,7 +372,7 @@ public ReserveIdsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReserveIdsResponse(input, extensionRegistry);
+        return new ReserveIdsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
index 16c714da64b5..0aa141f0cea0 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
@@ -34,9 +34,6 @@ private RollbackRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -612,7 +609,7 @@ public RollbackRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RollbackRequest(input, extensionRegistry);
+        return new RollbackRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
index 8570e62626f8..f309bbc17cf5 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
@@ -33,9 +33,6 @@ private RollbackResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -377,7 +374,7 @@ public RollbackResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RollbackResponse(input, extensionRegistry);
+        return new RollbackResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
index f06507679d03..25ec2ddfa31d 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
@@ -33,9 +33,6 @@ private RunQueryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1597,7 +1594,7 @@ public RunQueryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RunQueryRequest(input, extensionRegistry);
+        return new RunQueryRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
index 3f7dd2858e68..cf6f8aa66101 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
@@ -32,9 +32,6 @@ private RunQueryResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -834,7 +831,7 @@ public RunQueryResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RunQueryResponse(input, extensionRegistry);
+        return new RunQueryResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
index 697ff5bae265..4c832a372d80 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
@@ -35,9 +35,6 @@ private TransactionOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -151,9 +148,6 @@ private ReadWrite(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -571,7 +565,7 @@ public ReadWrite parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadWrite(input, extensionRegistry);
+          return new ReadWrite(input, extensionRegistry);
       }
     };
 
@@ -623,9 +617,6 @@ private ReadOnly(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -966,7 +957,7 @@ public ReadOnly parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadOnly(input, extensionRegistry);
+          return new ReadOnly(input, extensionRegistry);
       }
     };
 
@@ -1831,7 +1822,7 @@ public TransactionOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransactionOptions(input, extensionRegistry);
+        return new TransactionOptions(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
index 6070573eb5eb..24a7ce3b5f03 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
@@ -35,9 +35,6 @@ private Value(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2656,7 +2653,7 @@ public Value parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Value(input, extensionRegistry);
+        return new Value(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java
index 4a1e444855ef..7357870f9f83 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java
@@ -42,9 +42,6 @@ private Agent(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2035,7 +2032,7 @@ public Agent parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Agent(input, extensionRegistry);
+        return new Agent(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentName.java
index 3be7fc108bc8..b02cfba2a5bc 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("AgentName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "agent", agent);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentProto.java
index 223b016df8ec..8b6d80e57bd3 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "\n\006parent\030\001 \001(\t\022\024\n\014display_name\030\002 \001(\t\022\035\n\025" +
       "default_language_code\030\003 \001(\t\022 \n\030supported" +
       "_language_codes\030\004 \003(\t\022\021\n\ttime_zone\030\005 \001(\t" +
-      "\022\023\n\013description\030\006 \001(\t\022\022\n\navatar_uri\030\007 \001(" +
+      "\022\023\n\013description\030\006 \001(\t\022\022\n\navatar_uri\030\007 \001(",
       "\t\022\026\n\016enable_logging\030\010 \001(\010\022?\n\nmatch_mode\030" +
       "\t \001(\0162+.google.cloud.dialogflow.v2.Agent" +
       ".MatchMode\022 \n\030classification_threshold\030\n" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "t\030\001 \001(\t\"L\n\023SearchAgentsRequest\022\016\n\006parent" +
       "\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030" +
       "\003 \001(\t\"b\n\024SearchAgentsResponse\0221\n\006agents\030" +
-      "\001 \003(\0132!.google.cloud.dialogflow.v2.Agent" +
+      "\001 \003(\0132!.google.cloud.dialogflow.v2.Agent",
       "\022\027\n\017next_page_token\030\002 \001(\t\"#\n\021TrainAgentR" +
       "equest\022\016\n\006parent\030\001 \001(\t\"7\n\022ExportAgentReq" +
       "uest\022\016\n\006parent\030\001 \001(\t\022\021\n\tagent_uri\030\002 \001(\t\"" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "gent_uri\030\002 \001(\tH\000\022\027\n\ragent_content\030\003 \001(\014H" +
       "\000B\007\n\005agent\"\\\n\023RestoreAgentRequest\022\016\n\006par" +
       "ent\030\001 \001(\t\022\023\n\tagent_uri\030\002 \001(\tH\000\022\027\n\ragent_" +
-      "content\030\003 \001(\014H\000B\007\n\005agent2\356\006\n\006Agents\022\201\001\n\010" +
+      "content\030\003 \001(\014H\000B\007\n\005agent2\356\006\n\006Agents\022\201\001\n\010",
       "GetAgent\022+.google.cloud.dialogflow.v2.Ge" +
       "tAgentRequest\032!.google.cloud.dialogflow." +
       "v2.Agent\"%\202\323\344\223\002\037\022\035/v2/{parent=projects/*" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "nse\",\202\323\344\223\002&\022$/v2/{parent=projects/*}/age" +
       "nt:search\022\212\001\n\nTrainAgent\022-.google.cloud." +
       "dialogflow.v2.TrainAgentRequest\032\035.google" +
-      ".longrunning.Operation\".\202\323\344\223\002(\"#/v2/{par" +
+      ".longrunning.Operation\".\202\323\344\223\002(\"#/v2/{par",
       "ent=projects/*}/agent:train:\001*\022\215\001\n\013Expor" +
       "tAgent\022..google.cloud.dialogflow.v2.Expo" +
       "rtAgentRequest\032\035.google.longrunning.Oper" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       ".google.longrunning.Operation\"/\202\323\344\223\002)\"$/" +
       "v2/{parent=projects/*}/agent:import:\001*\022\220" +
       "\001\n\014RestoreAgent\022/.google.cloud.dialogflo" +
-      "w.v2.RestoreAgentRequest\032\035.google.longru" +
+      "w.v2.RestoreAgentRequest\032\035.google.longru",
       "nning.Operation\"0\202\323\344\223\002*\"%/v2/{parent=pro" +
       "jects/*}/agent:restore:\001*B\231\001\n\036com.google" +
       ".cloud.dialogflow.v2B\nAgentProtoP\001ZDgoog" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java
index 55286885dffa..959f7413eea8 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java
@@ -35,9 +35,6 @@ private BatchCreateEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1161,7 +1158,7 @@ public BatchCreateEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchCreateEntitiesRequest(input, extensionRegistry);
+        return new BatchCreateEntitiesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java
index 80a831333f1f..dcfe65a762da 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java
@@ -35,9 +35,6 @@ private BatchDeleteEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -974,7 +971,7 @@ public BatchDeleteEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchDeleteEntitiesRequest(input, extensionRegistry);
+        return new BatchDeleteEntitiesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java
index f1d6cd81c995..4f9fe0e95057 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java
@@ -34,9 +34,6 @@ private BatchDeleteEntityTypesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -778,7 +775,7 @@ public BatchDeleteEntityTypesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchDeleteEntityTypesRequest(input, extensionRegistry);
+        return new BatchDeleteEntityTypesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java
index e225daf0b743..9d7d203f80f3 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java
@@ -34,9 +34,6 @@ private BatchDeleteIntentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public BatchDeleteIntentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchDeleteIntentsRequest(input, extensionRegistry);
+        return new BatchDeleteIntentsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java
index ee8580729c2c..c306e43e863e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java
@@ -35,9 +35,6 @@ private BatchUpdateEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1390,7 +1387,7 @@ public BatchUpdateEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateEntitiesRequest(input, extensionRegistry);
+        return new BatchUpdateEntitiesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java
index f8b14eb488cc..3f51033d517e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java
@@ -34,9 +34,6 @@ private BatchUpdateEntityTypesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1473,7 +1470,7 @@ public BatchUpdateEntityTypesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateEntityTypesRequest(input, extensionRegistry);
+        return new BatchUpdateEntityTypesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java
index c0db39cd73be..dcefb3f93cab 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java
@@ -33,9 +33,6 @@ private BatchUpdateEntityTypesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public BatchUpdateEntityTypesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateEntityTypesResponse(input, extensionRegistry);
+        return new BatchUpdateEntityTypesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java
index 800411c7180b..ddf6df76cd2d 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java
@@ -35,9 +35,6 @@ private BatchUpdateIntentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1577,7 +1574,7 @@ public BatchUpdateIntentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateIntentsRequest(input, extensionRegistry);
+        return new BatchUpdateIntentsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java
index cffc3967863f..40504b429a51 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java
@@ -33,9 +33,6 @@ private BatchUpdateIntentsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public BatchUpdateIntentsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateIntentsResponse(input, extensionRegistry);
+        return new BatchUpdateIntentsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java
index 4ebe55bbeb7e..4b7a2d870d8b 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java
@@ -34,9 +34,6 @@ private Context(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -877,7 +874,7 @@ public Context parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Context(input, extensionRegistry);
+        return new Context(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextName.java
index 32810cbe83f8..11a8bef8c1a8 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ContextName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "session", session, "context", context);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextProto.java
index ec82bf27bb89..f6d3b8fbed0e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "(\005\022+\n\nparameters\030\003 \001(\0132\027.google.protobuf" +
       ".Struct\"L\n\023ListContextsRequest\022\016\n\006parent" +
       "\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030" +
-      "\003 \001(\t\"f\n\024ListContextsResponse\0225\n\010context" +
+      "\003 \001(\t\"f\n\024ListContextsResponse\0225\n\010context",
       "s\030\001 \003(\0132#.google.cloud.dialogflow.v2.Con" +
       "text\022\027\n\017next_page_token\030\002 \001(\t\"!\n\021GetCont" +
       "extRequest\022\014\n\004name\030\001 \001(\t\"\\\n\024CreateContex" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "#.google.cloud.dialogflow.v2.Context\022/\n\013" +
       "update_mask\030\002 \001(\0132\032.google.protobuf.Fiel" +
       "dMask\"$\n\024DeleteContextRequest\022\014\n\004name\030\001 " +
-      "\001(\t\"*\n\030DeleteAllContextsRequest\022\016\n\006paren" +
+      "\001(\t\"*\n\030DeleteAllContextsRequest\022\016\n\006paren",
       "t\030\001 \001(\t2\357\007\n\010Contexts\022\254\001\n\014ListContexts\022/." +
       "google.cloud.dialogflow.v2.ListContextsR" +
       "equest\0320.google.cloud.dialogflow.v2.List" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "GetContextRequest\032#.google.cloud.dialogf" +
       "low.v2.Context\"9\202\323\344\223\0023\0221/v2/{name=projec" +
       "ts/*/agent/sessions/*/contexts/*}\022\252\001\n\rCr" +
-      "eateContext\0220.google.cloud.dialogflow.v2" +
+      "eateContext\0220.google.cloud.dialogflow.v2",
       ".CreateContextRequest\032#.google.cloud.dia" +
       "logflow.v2.Context\"B\202\323\344\223\002<\"1/v2/{parent=" +
       "projects/*/agent/sessions/*}/contexts:\007c" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "9/v2/{context.name=projects/*/agent/sess" +
       "ions/*/contexts/*}:\007context\022\224\001\n\rDeleteCo" +
       "ntext\0220.google.cloud.dialogflow.v2.Delet" +
-      "eContextRequest\032\026.google.protobuf.Empty\"" +
+      "eContextRequest\032\026.google.protobuf.Empty\"",
       "9\202\323\344\223\0023*1/v2/{name=projects/*/agent/sess" +
       "ions/*/contexts/*}\022\234\001\n\021DeleteAllContexts" +
       "\0224.google.cloud.dialogflow.v2.DeleteAllC" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java
index 410a774c3e12..534049b8d558 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java
@@ -33,9 +33,6 @@ private CreateContextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -767,7 +764,7 @@ public CreateContextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateContextRequest(input, extensionRegistry);
+        return new CreateContextRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java
index 3df7adf00abd..c320a80c4931 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java
@@ -34,9 +34,6 @@ private CreateEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -950,7 +947,7 @@ public CreateEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateEntityTypeRequest(input, extensionRegistry);
+        return new CreateEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java
index bf9e8a0748ca..47eda4e174da 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java
@@ -35,9 +35,6 @@ private CreateIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1061,7 +1058,7 @@ public CreateIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateIntentRequest(input, extensionRegistry);
+        return new CreateIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java
index c88b30b39907..37a647932e5f 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java
@@ -33,9 +33,6 @@ private CreateSessionEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -767,7 +764,7 @@ public CreateSessionEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateSessionEntityTypeRequest(input, extensionRegistry);
+        return new CreateSessionEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java
index 3d5adcf33093..2a8b1b9aac1d 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java
@@ -33,9 +33,6 @@ private DeleteAllContextsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteAllContextsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteAllContextsRequest(input, extensionRegistry);
+        return new DeleteAllContextsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java
index b46357aa38d3..533dbea8ae0c 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java
@@ -33,9 +33,6 @@ private DeleteContextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteContextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteContextRequest(input, extensionRegistry);
+        return new DeleteContextRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java
index 5fc9bdfe368d..15038e13c25c 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java
@@ -33,9 +33,6 @@ private DeleteEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteEntityTypeRequest(input, extensionRegistry);
+        return new DeleteEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java
index e1e3a52b1956..2fd223bc6a49 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java
@@ -33,9 +33,6 @@ private DeleteIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteIntentRequest(input, extensionRegistry);
+        return new DeleteIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java
index 8e52e4221789..ab3fb5a8c3ec 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java
@@ -33,9 +33,6 @@ private DeleteSessionEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public DeleteSessionEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSessionEntityTypeRequest(input, extensionRegistry);
+        return new DeleteSessionEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java
index 58c91b333365..4c39c760859a 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java
@@ -34,9 +34,6 @@ private DetectIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1150,7 +1147,7 @@ public DetectIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DetectIntentRequest(input, extensionRegistry);
+        return new DetectIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java
index 1c85cd7f9801..b2fcd3f0444d 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java
@@ -33,9 +33,6 @@ private DetectIntentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1008,7 +1005,7 @@ public DetectIntentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DetectIntentResponse(input, extensionRegistry);
+        return new DetectIntentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java
index a91d515acc2e..8e036c48bc63 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java
@@ -39,9 +39,6 @@ private EntityType(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -485,9 +482,6 @@ private Entity(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1257,7 +1251,7 @@ public Entity parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Entity(input, extensionRegistry);
+          return new Entity(input, extensionRegistry);
       }
     };
 
@@ -2536,7 +2530,7 @@ public EntityType parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityType(input, extensionRegistry);
+        return new EntityType(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java
index 0833d9bc4434..2322567346a7 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java
@@ -33,9 +33,6 @@ private EntityTypeBatch(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public EntityTypeBatch parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityTypeBatch(input, extensionRegistry);
+        return new EntityTypeBatch(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeName.java
index b995caa0a81e..7a0583611563 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("EntityTypeName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "entity_type", entityType);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeProto.java
index ef423e7ebb89..2447a418e7bb 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeProto.java
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "ntityType\022\014\n\004name\030\001 \001(\t\022\024\n\014display_name\030" +
       "\002 \001(\t\0229\n\004kind\030\003 \001(\0162+.google.cloud.dialo" +
       "gflow.v2.EntityType.Kind\022U\n\023auto_expansi" +
-      "on_mode\030\004 \001(\01628.google.cloud.dialogflow." +
+      "on_mode\030\004 \001(\01628.google.cloud.dialogflow.",
       "v2.EntityType.AutoExpansionMode\022?\n\010entit" +
       "ies\030\006 \003(\0132-.google.cloud.dialogflow.v2.E" +
       "ntityType.Entity\032)\n\006Entity\022\r\n\005value\030\001 \001(" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "DE_UNSPECIFIED\020\000\022\037\n\033AUTO_EXPANSION_MODE_" +
       "DEFAULT\020\001\"f\n\026ListEntityTypesRequest\022\016\n\006p" +
       "arent\030\001 \001(\t\022\025\n\rlanguage_code\030\002 \001(\t\022\021\n\tpa" +
-      "ge_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"p\n\027Lis" +
+      "ge_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"p\n\027Lis",
       "tEntityTypesResponse\022<\n\014entity_types\030\001 \003" +
       "(\0132&.google.cloud.dialogflow.v2.EntityTy" +
       "pe\022\027\n\017next_page_token\030\002 \001(\t\";\n\024GetEntity" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "e.cloud.dialogflow.v2.EntityType\022\025\n\rlang" +
       "uage_code\030\003 \001(\t\"\236\001\n\027UpdateEntityTypeRequ" +
       "est\022;\n\013entity_type\030\001 \001(\0132&.google.cloud." +
-      "dialogflow.v2.EntityType\022\025\n\rlanguage_cod" +
+      "dialogflow.v2.EntityType\022\025\n\rlanguage_cod",
       "e\030\002 \001(\t\022/\n\013update_mask\030\003 \001(\0132\032.google.pr" +
       "otobuf.FieldMask\"\'\n\027DeleteEntityTypeRequ" +
       "est\022\014\n\004name\030\001 \001(\t\"\376\001\n\035BatchUpdateEntityT" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       ".v2.EntityTypeBatchH\000\022\025\n\rlanguage_code\030\004" +
       " \001(\t\022/\n\013update_mask\030\005 \001(\0132\032.google.proto" +
       "buf.FieldMaskB\023\n\021entity_type_batch\"^\n\036Ba" +
-      "tchUpdateEntityTypesResponse\022<\n\014entity_t" +
+      "tchUpdateEntityTypesResponse\022<\n\014entity_t",
       "ypes\030\001 \003(\0132&.google.cloud.dialogflow.v2." +
       "EntityType\"J\n\035BatchDeleteEntityTypesRequ" +
       "est\022\016\n\006parent\030\001 \001(\t\022\031\n\021entity_type_names" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "\n\rlanguage_code\030\003 \001(\t\"\265\001\n\032BatchUpdateEnt" +
       "itiesRequest\022\016\n\006parent\030\001 \001(\t\022?\n\010entities" +
       "\030\002 \003(\0132-.google.cloud.dialogflow.v2.Enti" +
-      "tyType.Entity\022\025\n\rlanguage_code\030\003 \001(\t\022/\n\013" +
+      "tyType.Entity\022\025\n\rlanguage_code\030\003 \001(\t\022/\n\013",
       "update_mask\030\004 \001(\0132\032.google.protobuf.Fiel" +
       "dMask\"Z\n\032BatchDeleteEntitiesRequest\022\016\n\006p" +
       "arent\030\001 \001(\t\022\025\n\rentity_values\030\002 \003(\t\022\025\n\rla" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "istEntityTypes\0222.google.cloud.dialogflow" +
       ".v2.ListEntityTypesRequest\0323.google.clou" +
       "d.dialogflow.v2.ListEntityTypesResponse\"" +
-      "1\202\323\344\223\002+\022)/v2/{parent=projects/*/agent}/e" +
+      "1\202\323\344\223\002+\022)/v2/{parent=projects/*/agent}/e",
       "ntityTypes\022\234\001\n\rGetEntityType\0220.google.cl" +
       "oud.dialogflow.v2.GetEntityTypeRequest\032&" +
       ".google.cloud.dialogflow.v2.EntityType\"1" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "est\032&.google.cloud.dialogflow.v2.EntityT" +
       "ype\">\202\323\344\223\0028\")/v2/{parent=projects/*/agen" +
       "t}/entityTypes:\013entity_type\022\273\001\n\020UpdateEn" +
-      "tityType\0223.google.cloud.dialogflow.v2.Up" +
+      "tityType\0223.google.cloud.dialogflow.v2.Up",
       "dateEntityTypeRequest\032&.google.cloud.dia" +
       "logflow.v2.EntityType\"J\202\323\344\223\002D25/v2/{enti" +
       "ty_type.name=projects/*/agent/entityType" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "\223\002+*)/v2/{name=projects/*/agent/entityTy" +
       "pes/*}\022\264\001\n\026BatchUpdateEntityTypes\0229.goog" +
       "le.cloud.dialogflow.v2.BatchUpdateEntity" +
-      "TypesRequest\032\035.google.longrunning.Operat" +
+      "TypesRequest\032\035.google.longrunning.Operat",
       "ion\"@\202\323\344\223\002:\"5/v2/{parent=projects/*/agen" +
       "t}/entityTypes:batchUpdate:\001*\022\264\001\n\026BatchD" +
       "eleteEntityTypes\0229.google.cloud.dialogfl" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "tchDelete:\001*\022\271\001\n\023BatchCreateEntities\0226.g" +
       "oogle.cloud.dialogflow.v2.BatchCreateEnt" +
       "itiesRequest\032\035.google.longrunning.Operat" +
-      "ion\"K\202\323\344\223\002E\"@/v2/{parent=projects/*/agen" +
+      "ion\"K\202\323\344\223\002E\"@/v2/{parent=projects/*/agen",
       "t/entityTypes/*}/entities:batchCreate:\001*" +
       "\022\271\001\n\023BatchUpdateEntities\0226.google.cloud." +
       "dialogflow.v2.BatchUpdateEntitiesRequest" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "leteEntities\0226.google.cloud.dialogflow.v" +
       "2.BatchDeleteEntitiesRequest\032\035.google.lo" +
       "ngrunning.Operation\"K\202\323\344\223\002E\"@/v2/{parent" +
-      "=projects/*/agent/entityTypes/*}/entitie" +
+      "=projects/*/agent/entityTypes/*}/entitie",
       "s:batchDelete:\001*B\236\001\n\036com.google.cloud.di" +
       "alogflow.v2B\017EntityTypeProtoP\001ZDgoogle.g" +
       "olang.org/genproto/googleapis/cloud/dial" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java
index b3fdbaf81efa..d7f98cfbd2a2 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java
@@ -38,9 +38,6 @@ private EventInput(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -944,7 +941,7 @@ public EventInput parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EventInput(input, extensionRegistry);
+        return new EventInput(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java
index 222ec8080b5c..6bda5850db24 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java
@@ -34,9 +34,6 @@ private ExportAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -707,7 +704,7 @@ public ExportAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExportAgentRequest(input, extensionRegistry);
+        return new ExportAgentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java
index 9d2b79e460a0..0fea43564697 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java
@@ -32,9 +32,6 @@ private ExportAgentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -768,7 +765,7 @@ public ExportAgentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExportAgentResponse(input, extensionRegistry);
+        return new ExportAgentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java
index 7955a87f3cc0..4efae16eb112 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java
@@ -33,9 +33,6 @@ private GetAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetAgentRequest(input, extensionRegistry);
+        return new GetAgentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java
index f951485bbc21..afa5e1c7b5c0 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java
@@ -33,9 +33,6 @@ private GetContextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetContextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetContextRequest(input, extensionRegistry);
+        return new GetContextRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java
index d6bd88bed552..26cee4ed21b6 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java
@@ -34,9 +34,6 @@ private GetEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -721,7 +718,7 @@ public GetEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetEntityTypeRequest(input, extensionRegistry);
+        return new GetEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java
index fe9b0db5586d..5ced7296c314 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java
@@ -35,9 +35,6 @@ private GetIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -832,7 +829,7 @@ public GetIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetIntentRequest(input, extensionRegistry);
+        return new GetIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java
index 4203465cb4ae..e72da1b3ebf7 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java
@@ -33,9 +33,6 @@ private GetSessionEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public GetSessionEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSessionEntityTypeRequest(input, extensionRegistry);
+        return new GetSessionEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java
index c649be17e31c..ba7575e60e15 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java
@@ -33,9 +33,6 @@ private ImportAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -930,7 +927,7 @@ public ImportAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImportAgentRequest(input, extensionRegistry);
+        return new ImportAgentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java
index f30f1d718694..703feacaf7a6 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java
@@ -36,9 +36,6 @@ private InputAudioConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1018,7 +1015,7 @@ public InputAudioConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InputAudioConfig(input, extensionRegistry);
+        return new InputAudioConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
index 8b3586b85e03..877de31f7e68 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
@@ -52,9 +52,6 @@ private Intent(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -537,9 +534,6 @@ private TrainingPhrase(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -861,9 +855,6 @@ private Part(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1780,7 +1771,7 @@ public Part parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Part(input, extensionRegistry);
+            return new Part(input, extensionRegistry);
         }
       };
 
@@ -2899,7 +2890,7 @@ public TrainingPhrase parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TrainingPhrase(input, extensionRegistry);
+          return new TrainingPhrase(input, extensionRegistry);
       }
     };
 
@@ -3128,9 +3119,6 @@ private Parameter(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4707,7 +4695,7 @@ public Parameter parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Parameter(input, extensionRegistry);
+          return new Parameter(input, extensionRegistry);
       }
     };
 
@@ -5060,9 +5048,6 @@ private Message(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5691,9 +5676,6 @@ private Text(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6258,7 +6240,7 @@ public Text parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Text(input, extensionRegistry);
+            return new Text(input, extensionRegistry);
         }
       };
 
@@ -6350,9 +6332,6 @@ private Image(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7009,7 +6988,7 @@ public Image parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Image(input, extensionRegistry);
+            return new Image(input, extensionRegistry);
         }
       };
 
@@ -7116,9 +7095,6 @@ private QuickReplies(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7840,7 +7816,7 @@ public QuickReplies parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new QuickReplies(input, extensionRegistry);
+            return new QuickReplies(input, extensionRegistry);
         }
       };
 
@@ -7994,9 +7970,6 @@ private Card(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8142,9 +8115,6 @@ private Button(
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           this();
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
           int mutable_bitField0_ = 0;
           com.google.protobuf.UnknownFieldSet.Builder unknownFields =
               com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8801,7 +8771,7 @@ public Button parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new Button(input, extensionRegistry);
+              return new Button(input, extensionRegistry);
           }
         };
 
@@ -9990,7 +9960,7 @@ public Card parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Card(input, extensionRegistry);
+            return new Card(input, extensionRegistry);
         }
       };
 
@@ -10105,9 +10075,6 @@ private SimpleResponse(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -10932,7 +10899,7 @@ public SimpleResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new SimpleResponse(input, extensionRegistry);
+            return new SimpleResponse(input, extensionRegistry);
         }
       };
 
@@ -11032,9 +10999,6 @@ private SimpleResponses(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -11815,7 +11779,7 @@ public SimpleResponses parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new SimpleResponses(input, extensionRegistry);
+            return new SimpleResponses(input, extensionRegistry);
         }
       };
 
@@ -11994,9 +11958,6 @@ private BasicCard(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12159,9 +12120,6 @@ private Button(
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           this();
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
           int mutable_bitField0_ = 0;
           com.google.protobuf.UnknownFieldSet.Builder unknownFields =
               com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12275,9 +12233,6 @@ private OpenUriAction(
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
             this();
-            if (extensionRegistry == null) {
-              throw new java.lang.NullPointerException();
-            }
             int mutable_bitField0_ = 0;
             com.google.protobuf.UnknownFieldSet.Builder unknownFields =
                 com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12773,7 +12728,7 @@ public OpenUriAction parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              return new OpenUriAction(input, extensionRegistry);
+                return new OpenUriAction(input, extensionRegistry);
             }
           };
 
@@ -13455,7 +13410,7 @@ public Button parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new Button(input, extensionRegistry);
+              return new Button(input, extensionRegistry);
           }
         };
 
@@ -14860,7 +14815,7 @@ public BasicCard parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new BasicCard(input, extensionRegistry);
+            return new BasicCard(input, extensionRegistry);
         }
       };
 
@@ -14932,9 +14887,6 @@ private Suggestion(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -15431,7 +15383,7 @@ public Suggestion parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Suggestion(input, extensionRegistry);
+            return new Suggestion(input, extensionRegistry);
         }
       };
 
@@ -15528,9 +15480,6 @@ private Suggestions(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -16308,7 +16257,7 @@ public Suggestions parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Suggestions(input, extensionRegistry);
+            return new Suggestions(input, extensionRegistry);
         }
       };
 
@@ -16401,9 +16350,6 @@ private LinkOutSuggestion(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -17061,7 +17007,7 @@ public LinkOutSuggestion parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new LinkOutSuggestion(input, extensionRegistry);
+            return new LinkOutSuggestion(input, extensionRegistry);
         }
       };
 
@@ -17177,9 +17123,6 @@ private ListSelect(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -17361,9 +17304,6 @@ private Item(
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           this();
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
           int mutable_bitField0_ = 0;
           com.google.protobuf.UnknownFieldSet.Builder unknownFields =
               com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -18471,7 +18411,7 @@ public Item parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new Item(input, extensionRegistry);
+              return new Item(input, extensionRegistry);
           }
         };
 
@@ -19364,7 +19304,7 @@ public ListSelect parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ListSelect(input, extensionRegistry);
+            return new ListSelect(input, extensionRegistry);
         }
       };
 
@@ -19461,9 +19401,6 @@ private CarouselSelect(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -19639,9 +19576,6 @@ private Item(
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           this();
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
           int mutable_bitField0_ = 0;
           com.google.protobuf.UnknownFieldSet.Builder unknownFields =
               com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -20749,7 +20683,7 @@ public Item parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new Item(input, extensionRegistry);
+              return new Item(input, extensionRegistry);
           }
         };
 
@@ -21491,7 +21425,7 @@ public CarouselSelect parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CarouselSelect(input, extensionRegistry);
+            return new CarouselSelect(input, extensionRegistry);
         }
       };
 
@@ -21605,9 +21539,6 @@ private SelectItemInfo(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -22350,7 +22281,7 @@ public SelectItemInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new SelectItemInfo(input, extensionRegistry);
+            return new SelectItemInfo(input, extensionRegistry);
         }
       };
 
@@ -25482,7 +25413,7 @@ public Message parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Message(input, extensionRegistry);
+          return new Message(input, extensionRegistry);
       }
     };
 
@@ -25576,9 +25507,6 @@ private FollowupIntentInfo(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -26242,7 +26170,7 @@ public FollowupIntentInfo parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FollowupIntentInfo(input, extensionRegistry);
+          return new FollowupIntentInfo(input, extensionRegistry);
       }
     };
 
@@ -30793,7 +30721,7 @@ public Intent parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Intent(input, extensionRegistry);
+        return new Intent(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentBatch.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentBatch.java
index 583bd58c8c4e..2aea2724e351 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentBatch.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentBatch.java
@@ -33,9 +33,6 @@ private IntentBatch(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public IntentBatch parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new IntentBatch(input, extensionRegistry);
+        return new IntentBatch(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentName.java
index 925de2a6ff80..01aafb2421bf 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("IntentName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "intent", intent);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentProto.java
index 3261da283575..590f1aea5edc 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentProto.java
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "o\032\034google/protobuf/struct.proto\"\363 \n\006Inte" +
       "nt\022\014\n\004name\030\001 \001(\t\022\024\n\014display_name\030\002 \001(\t\022F" +
       "\n\rwebhook_state\030\006 \001(\0162/.google.cloud.dia" +
-      "logflow.v2.Intent.WebhookState\022\020\n\010priori" +
+      "logflow.v2.Intent.WebhookState\022\020\n\010priori",
       "ty\030\003 \001(\005\022\023\n\013is_fallback\030\004 \001(\010\022\023\n\013ml_disa" +
       "bled\030\023 \001(\010\022\033\n\023input_context_names\030\007 \003(\t\022" +
       "\016\n\006events\030\010 \003(\t\022K\n\020training_phrases\030\t \003(" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "v2.Context\022\026\n\016reset_contexts\030\014 \001(\010\022@\n\npa" +
       "rameters\030\r \003(\0132,.google.cloud.dialogflow" +
       ".v2.Intent.Parameter\022<\n\010messages\030\016 \003(\0132*" +
-      ".google.cloud.dialogflow.v2.Intent.Messa" +
+      ".google.cloud.dialogflow.v2.Intent.Messa",
       "ge\022W\n\032default_response_platforms\030\017 \003(\01623" +
       ".google.cloud.dialogflow.v2.Intent.Messa" +
       "ge.Platform\022!\n\031root_followup_intent_name" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "tentInfo\032\317\002\n\016TrainingPhrase\022\014\n\004name\030\001 \001(" +
       "\t\022D\n\004type\030\002 \001(\01626.google.cloud.dialogflo" +
       "w.v2.Intent.TrainingPhrase.Type\022E\n\005parts" +
-      "\030\003 \003(\01326.google.cloud.dialogflow.v2.Inte" +
+      "\030\003 \003(\01326.google.cloud.dialogflow.v2.Inte",
       "nt.TrainingPhrase.Part\022\031\n\021times_added_co" +
       "unt\030\004 \001(\005\032N\n\004Part\022\014\n\004text\030\001 \001(\t\022\023\n\013entit" +
       "y_type\030\002 \001(\t\022\r\n\005alias\030\003 \001(\t\022\024\n\014user_defi" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "value\030\003 \001(\t\022\025\n\rdefault_value\030\004 \001(\t\022 \n\030en" +
       "tity_type_display_name\030\005 \001(\t\022\021\n\tmandator" +
       "y\030\006 \001(\010\022\017\n\007prompts\030\007 \003(\t\022\017\n\007is_list\030\010 \001(" +
-      "\010\032\232\025\n\007Message\022?\n\004text\030\001 \001(\0132/.google.clo" +
+      "\010\032\232\025\n\007Message\022?\n\004text\030\001 \001(\0132/.google.clo",
       "ud.dialogflow.v2.Intent.Message.TextH\000\022A" +
       "\n\005image\030\002 \001(\01320.google.cloud.dialogflow." +
       "v2.Intent.Message.ImageH\000\022P\n\rquick_repli" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "ssage.CardH\000\022*\n\007payload\030\005 \001(\0132\027.google.p" +
       "rotobuf.StructH\000\022V\n\020simple_responses\030\007 \001" +
       "(\0132:.google.cloud.dialogflow.v2.Intent.M" +
-      "essage.SimpleResponsesH\000\022J\n\nbasic_card\030\010" +
+      "essage.SimpleResponsesH\000\022J\n\nbasic_card\030\010",
       " \001(\01324.google.cloud.dialogflow.v2.Intent" +
       ".Message.BasicCardH\000\022M\n\013suggestions\030\t \001(" +
       "\01326.google.cloud.dialogflow.v2.Intent.Me" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "_select\030\013 \001(\01325.google.cloud.dialogflow." +
       "v2.Intent.Message.ListSelectH\000\022T\n\017carous" +
       "el_select\030\014 \001(\01329.google.cloud.dialogflo" +
-      "w.v2.Intent.Message.CarouselSelectH\000\022E\n\010" +
+      "w.v2.Intent.Message.CarouselSelectH\000\022E\n\010",
       "platform\030\006 \001(\01623.google.cloud.dialogflow" +
       ".v2.Intent.Message.Platform\032\024\n\004Text\022\014\n\004t" +
       "ext\030\001 \003(\t\0326\n\005Image\022\021\n\timage_uri\030\001 \001(\t\022\032\n" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "\t\022\021\n\timage_uri\030\003 \001(\t\022G\n\007buttons\030\004 \003(\01326." +
       "google.cloud.dialogflow.v2.Intent.Messag" +
       "e.Card.Button\032(\n\006Button\022\014\n\004text\030\001 \001(\t\022\020\n" +
-      "\010postback\030\002 \001(\t\032L\n\016SimpleResponse\022\026\n\016tex" +
+      "\010postback\030\002 \001(\t\032L\n\016SimpleResponse\022\026\n\016tex",
       "t_to_speech\030\001 \001(\t\022\014\n\004ssml\030\002 \001(\t\022\024\n\014displ" +
       "ay_text\030\003 \001(\t\032f\n\017SimpleResponses\022S\n\020simp" +
       "le_responses\030\001 \003(\01329.google.cloud.dialog" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "\001(\01320.google.cloud.dialogflow.v2.Intent." +
       "Message.Image\022L\n\007buttons\030\005 \003(\0132;.google." +
       "cloud.dialogflow.v2.Intent.Message.Basic" +
-      "Card.Button\032\231\001\n\006Button\022\r\n\005title\030\001 \001(\t\022b\n" +
+      "Card.Button\032\231\001\n\006Button\022\r\n\005title\030\001 \001(\t\022b\n",
       "\017open_uri_action\030\002 \001(\0132I.google.cloud.di" +
       "alogflow.v2.Intent.Message.BasicCard.But" +
       "ton.OpenUriAction\032\034\n\rOpenUriAction\022\013\n\003ur" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "gestion\032:\n\021LinkOutSuggestion\022\030\n\020destinat" +
       "ion_name\030\001 \001(\t\022\013\n\003uri\030\002 \001(\t\032\235\002\n\nListSele" +
       "ct\022\r\n\005title\030\001 \001(\t\022I\n\005items\030\002 \003(\0132:.googl" +
-      "e.cloud.dialogflow.v2.Intent.Message.Lis" +
+      "e.cloud.dialogflow.v2.Intent.Message.Lis",
       "tSelect.Item\032\264\001\n\004Item\022G\n\004info\030\001 \001(\01329.go" +
       "ogle.cloud.dialogflow.v2.Intent.Message." +
       "SelectItemInfo\022\r\n\005title\030\002 \001(\t\022\023\n\013descrip" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "loud.dialogflow.v2.Intent.Message.Carous" +
       "elSelect.Item\032\264\001\n\004Item\022G\n\004info\030\001 \001(\01329.g" +
       "oogle.cloud.dialogflow.v2.Intent.Message" +
-      ".SelectItemInfo\022\r\n\005title\030\002 \001(\t\022\023\n\013descri" +
+      ".SelectItemInfo\022\r\n\005title\030\002 \001(\t\022\023\n\013descri",
       "ption\030\003 \001(\t\022?\n\005image\030\004 \001(\01320.google.clou" +
       "d.dialogflow.v2.Intent.Message.Image\032/\n\016" +
       "SelectItemInfo\022\013\n\003key\030\001 \001(\t\022\020\n\010synonyms\030" +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "ER\020\007\022\025\n\021ACTIONS_ON_GOOGLE\020\010B\t\n\007message\032W" +
       "\n\022FollowupIntentInfo\022\034\n\024followup_intent_" +
       "name\030\001 \001(\t\022#\n\033parent_followup_intent_nam" +
-      "e\030\002 \001(\t\"t\n\014WebhookState\022\035\n\031WEBHOOK_STATE" +
+      "e\030\002 \001(\t\"t\n\014WebhookState\022\035\n\031WEBHOOK_STATE",
       "_UNSPECIFIED\020\000\022\031\n\025WEBHOOK_STATE_ENABLED\020" +
       "\001\022*\n&WEBHOOK_STATE_ENABLED_FOR_SLOT_FILL" +
       "ING\020\002\"\237\001\n\022ListIntentsRequest\022\016\n\006parent\030\001" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       "n\030\005 \001(\t\"c\n\023ListIntentsResponse\0223\n\007intent" +
       "s\030\001 \003(\0132\".google.cloud.dialogflow.v2.Int" +
       "ent\022\027\n\017next_page_token\030\002 \001(\t\"t\n\020GetInten" +
-      "tRequest\022\014\n\004name\030\001 \001(\t\022\025\n\rlanguage_code\030" +
+      "tRequest\022\014\n\004name\030\001 \001(\t\022\025\n\rlanguage_code\030",
       "\002 \001(\t\022;\n\013intent_view\030\003 \001(\0162&.google.clou" +
       "d.dialogflow.v2.IntentView\"\255\001\n\023CreateInt" +
       "entRequest\022\016\n\006parent\030\001 \001(\t\0222\n\006intent\030\002 \001" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       "ew\"\316\001\n\023UpdateIntentRequest\0222\n\006intent\030\001 \001" +
       "(\0132\".google.cloud.dialogflow.v2.Intent\022\025" +
       "\n\rlanguage_code\030\002 \001(\t\022/\n\013update_mask\030\003 \001" +
-      "(\0132\032.google.protobuf.FieldMask\022;\n\013intent" +
+      "(\0132\032.google.protobuf.FieldMask\022;\n\013intent",
       "_view\030\004 \001(\0162&.google.cloud.dialogflow.v2" +
       ".IntentView\"#\n\023DeleteIntentRequest\022\014\n\004na" +
       "me\030\001 \001(\t\"\244\002\n\031BatchUpdateIntentsRequest\022\016" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "nguage_code\030\004 \001(\t\022/\n\013update_mask\030\005 \001(\0132\032" +
       ".google.protobuf.FieldMask\022;\n\013intent_vie" +
       "w\030\006 \001(\0162&.google.cloud.dialogflow.v2.Int" +
-      "entViewB\016\n\014intent_batch\"Q\n\032BatchUpdateIn" +
+      "entViewB\016\n\014intent_batch\"Q\n\032BatchUpdateIn",
       "tentsResponse\0223\n\007intents\030\001 \003(\0132\".google." +
       "cloud.dialogflow.v2.Intent\"`\n\031BatchDelet" +
       "eIntentsRequest\022\016\n\006parent\030\001 \001(\t\0223\n\007inten" +
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "ntView\022\033\n\027INTENT_VIEW_UNSPECIFIED\020\000\022\024\n\020I" +
       "NTENT_VIEW_FULL\020\0012\330\010\n\007Intents\022\235\001\n\013ListIn" +
       "tents\022..google.cloud.dialogflow.v2.ListI" +
-      "ntentsRequest\032/.google.cloud.dialogflow." +
+      "ntentsRequest\032/.google.cloud.dialogflow.",
       "v2.ListIntentsResponse\"-\202\323\344\223\002\'\022%/v2/{par" +
       "ent=projects/*/agent}/intents\022\214\001\n\tGetInt" +
       "ent\022,.google.cloud.dialogflow.v2.GetInte" +
@@ -352,7 +352,7 @@ public static void registerAllExtensions(
       "loud.dialogflow.v2.CreateIntentRequest\032\"" +
       ".google.cloud.dialogflow.v2.Intent\"5\202\323\344\223" +
       "\002/\"%/v2/{parent=projects/*/agent}/intent" +
-      "s:\006intent\022\241\001\n\014UpdateIntent\022/.google.clou" +
+      "s:\006intent\022\241\001\n\014UpdateIntent\022/.google.clou",
       "d.dialogflow.v2.UpdateIntentRequest\032\".go" +
       "ogle.cloud.dialogflow.v2.Intent\"<\202\323\344\223\00262" +
       ",/v2/{intent.name=projects/*/agent/inten" +
@@ -362,7 +362,7 @@ public static void registerAllExtensions(
       "me=projects/*/agent/intents/*}\022\250\001\n\022Batch" +
       "UpdateIntents\0225.google.cloud.dialogflow." +
       "v2.BatchUpdateIntentsRequest\032\035.google.lo" +
-      "ngrunning.Operation\"<\202\323\344\223\0026\"1/v2/{parent" +
+      "ngrunning.Operation\"<\202\323\344\223\0026\"1/v2/{parent",
       "=projects/*/agent}/intents:batchUpdate:\001" +
       "*\022\250\001\n\022BatchDeleteIntents\0225.google.cloud." +
       "dialogflow.v2.BatchDeleteIntentsRequest\032" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsRequest.java
index 1d87eb14448d..ba345cd89402 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsRequest.java
@@ -35,9 +35,6 @@ private ListContextsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -771,7 +768,7 @@ public ListContextsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListContextsRequest(input, extensionRegistry);
+        return new ListContextsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsResponse.java
index c3fdc007dff0..94976a72f055 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListContextsResponse.java
@@ -34,9 +34,6 @@ private ListContextsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public ListContextsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListContextsResponse(input, extensionRegistry);
+        return new ListContextsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesRequest.java
index c1717d261f24..8012b54e9918 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesRequest.java
@@ -36,9 +36,6 @@ private ListEntityTypesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -954,7 +951,7 @@ public ListEntityTypesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListEntityTypesRequest(input, extensionRegistry);
+        return new ListEntityTypesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesResponse.java
index 29d7cbfef5f8..3002f2f91a82 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListEntityTypesResponse.java
@@ -34,9 +34,6 @@ private ListEntityTypesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public ListEntityTypesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListEntityTypesResponse(input, extensionRegistry);
+        return new ListEntityTypesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java
index 3b90aff11352..f01659b32807 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsRequest.java
@@ -37,9 +37,6 @@ private ListIntentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1065,7 +1062,7 @@ public ListIntentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListIntentsRequest(input, extensionRegistry);
+        return new ListIntentsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsResponse.java
index 1193382fd186..c69d9e025e44 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListIntentsResponse.java
@@ -34,9 +34,6 @@ private ListIntentsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public ListIntentsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListIntentsResponse(input, extensionRegistry);
+        return new ListIntentsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesRequest.java
index 0f86b87e1988..6162ee6ab6d5 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesRequest.java
@@ -35,9 +35,6 @@ private ListSessionEntityTypesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -771,7 +768,7 @@ public ListSessionEntityTypesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSessionEntityTypesRequest(input, extensionRegistry);
+        return new ListSessionEntityTypesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesResponse.java
index 7e42c1d43097..bd4560ec81d1 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ListSessionEntityTypesResponse.java
@@ -34,9 +34,6 @@ private ListSessionEntityTypesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public ListSessionEntityTypesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSessionEntityTypesResponse(input, extensionRegistry);
+        return new ListSessionEntityTypesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OriginalDetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OriginalDetectIntentRequest.java
index 1e10fb6b88b3..d7e309d24611 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OriginalDetectIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/OriginalDetectIntentRequest.java
@@ -34,9 +34,6 @@ private OriginalDetectIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -781,7 +778,7 @@ public OriginalDetectIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OriginalDetectIntentRequest(input, extensionRegistry);
+        return new OriginalDetectIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ProjectAgentName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ProjectAgentName.java
index 3e9c9fca53a6..55f3aa48e9c8 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ProjectAgentName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ProjectAgentName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectAgentName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ProjectName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ProjectName.java
index c0209d757e88..3bb8e86efde8 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryInput.java
index b29583b0bdcb..dfb11d203bec 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryInput.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryInput.java
@@ -36,9 +36,6 @@ private QueryInput(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1208,7 +1205,7 @@ public QueryInput parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryInput(input, extensionRegistry);
+        return new QueryInput(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParameters.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParameters.java
index e959b0c45f67..6adde6769a63 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParameters.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryParameters.java
@@ -36,9 +36,6 @@ private QueryParameters(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2045,7 +2042,7 @@ public QueryParameters parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryParameters(input, extensionRegistry);
+        return new QueryParameters(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java
index 25b603922af0..60b06836ca84 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/QueryResult.java
@@ -42,9 +42,6 @@ private QueryResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3399,7 +3396,7 @@ public QueryResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryResult(input, extensionRegistry);
+        return new QueryResult(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/RestoreAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/RestoreAgentRequest.java
index dec3615287c9..bc0aeca1b50f 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/RestoreAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/RestoreAgentRequest.java
@@ -33,9 +33,6 @@ private RestoreAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -930,7 +927,7 @@ public RestoreAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RestoreAgentRequest(input, extensionRegistry);
+        return new RestoreAgentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsRequest.java
index 8d4d61268291..93c422585085 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsRequest.java
@@ -35,9 +35,6 @@ private SearchAgentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -771,7 +768,7 @@ public SearchAgentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SearchAgentsRequest(input, extensionRegistry);
+        return new SearchAgentsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsResponse.java
index d0114472860f..f4c166f94507 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SearchAgentsResponse.java
@@ -34,9 +34,6 @@ private SearchAgentsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public SearchAgentsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SearchAgentsResponse(input, extensionRegistry);
+        return new SearchAgentsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java
index b1dd4268d124..cf003f4a03ce 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java
@@ -39,9 +39,6 @@ private SessionEntityType(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1281,7 +1278,7 @@ public SessionEntityType parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SessionEntityType(input, extensionRegistry);
+        return new SessionEntityType(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypeName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypeName.java
index 5740f5258e4a..6388be602f68 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypeName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypeName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("SessionEntityTypeName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "session", session, "entity_type", entityType);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypeProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypeProto.java
index 75769cc7418e..9f650622a1be 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypeProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypeProto.java
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "ype\022\014\n\004name\030\001 \001(\t\022^\n\024entity_override_mod" +
       "e\030\002 \001(\0162@.google.cloud.dialogflow.v2.Ses" +
       "sionEntityType.EntityOverrideMode\022?\n\010ent" +
-      "ities\030\003 \003(\0132-.google.cloud.dialogflow.v2" +
+      "ities\030\003 \003(\0132-.google.cloud.dialogflow.v2",
       ".EntityType.Entity\"\202\001\n\022EntityOverrideMod" +
       "e\022$\n ENTITY_OVERRIDE_MODE_UNSPECIFIED\020\000\022" +
       "!\n\035ENTITY_OVERRIDE_MODE_OVERRIDE\020\001\022#\n\037EN" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "\206\001\n\036ListSessionEntityTypesResponse\022K\n\024se" +
       "ssion_entity_types\030\001 \003(\0132-.google.cloud." +
       "dialogflow.v2.SessionEntityType\022\027\n\017next_" +
-      "page_token\030\002 \001(\t\"+\n\033GetSessionEntityType" +
+      "page_token\030\002 \001(\t\"+\n\033GetSessionEntityType",
       "Request\022\014\n\004name\030\001 \001(\t\"|\n\036CreateSessionEn" +
       "tityTypeRequest\022\016\n\006parent\030\001 \001(\t\022J\n\023sessi" +
       "on_entity_type\030\002 \001(\0132-.google.cloud.dial" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       ".SessionEntityType\022/\n\013update_mask\030\002 \001(\0132" +
       "\032.google.protobuf.FieldMask\".\n\036DeleteSes" +
       "sionEntityTypeRequest\022\014\n\004name\030\001 \001(\t2\231\010\n\022" +
-      "SessionEntityTypes\022\315\001\n\026ListSessionEntity" +
+      "SessionEntityTypes\022\315\001\n\026ListSessionEntity",
       "Types\0229.google.cloud.dialogflow.v2.ListS" +
       "essionEntityTypesRequest\032:.google.cloud." +
       "dialogflow.v2.ListSessionEntityTypesResp" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       ".GetSessionEntityTypeRequest\032-.google.cl" +
       "oud.dialogflow.v2.SessionEntityType\"<\202\323\344" +
       "\223\0026\0224/v2/{name=projects/*/agent/sessions" +
-      "/*/entityTypes/*}\022\327\001\n\027CreateSessionEntit" +
+      "/*/entityTypes/*}\022\327\001\n\027CreateSessionEntit",
       "yType\022:.google.cloud.dialogflow.v2.Creat" +
       "eSessionEntityTypeRequest\032-.google.cloud" +
       ".dialogflow.v2.SessionEntityType\"Q\202\323\344\223\002K" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "ialogflow.v2.UpdateSessionEntityTypeRequ" +
       "est\032-.google.cloud.dialogflow.v2.Session" +
       "EntityType\"e\202\323\344\223\002_2H/v2/{session_entity_" +
-      "type.name=projects/*/agent/sessions/*/en" +
+      "type.name=projects/*/agent/sessions/*/en",
       "tityTypes/*}:\023session_entity_type\022\253\001\n\027De" +
       "leteSessionEntityType\022:.google.cloud.dia" +
       "logflow.v2.DeleteSessionEntityTypeReques" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionName.java
index 655a32276e7b..774d50722835 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("SessionName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "session", session);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionProto.java
index 86b056dc8a86..e8d797ea89c9 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionProto.java
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "oogle/protobuf/struct.proto\032\027google/rpc/" +
       "status.proto\032\030google/type/latlng.proto\"\273" +
       "\001\n\023DetectIntentRequest\022\017\n\007session\030\001 \001(\t\022" +
-      "A\n\014query_params\030\002 \001(\0132+.google.cloud.dia" +
+      "A\n\014query_params\030\002 \001(\0132+.google.cloud.dia",
       "logflow.v2.QueryParameters\022;\n\013query_inpu" +
       "t\030\003 \001(\0132&.google.cloud.dialogflow.v2.Que" +
       "ryInput\022\023\n\013input_audio\030\005 \001(\014\"\226\001\n\024DetectI" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "\0132\022.google.rpc.Status\"\225\002\n\017QueryParameter" +
       "s\022\021\n\ttime_zone\030\001 \001(\t\022)\n\014geo_location\030\002 \001" +
       "(\0132\023.google.type.LatLng\0225\n\010contexts\030\003 \003(" +
-      "\0132#.google.cloud.dialogflow.v2.Context\022\026" +
+      "\0132#.google.cloud.dialogflow.v2.Context\022\026",
       "\n\016reset_contexts\030\004 \001(\010\022K\n\024session_entity" +
       "_types\030\005 \003(\0132-.google.cloud.dialogflow.v" +
       "2.SessionEntityType\022(\n\007payload\030\006 \001(\0132\027.g" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "2%.google.cloud.dialogflow.v2.TextInputH" +
       "\000\0227\n\005event\030\003 \001(\0132&.google.cloud.dialogfl" +
       "ow.v2.EventInputH\000B\007\n\005input\"\270\004\n\013QueryRes" +
-      "ult\022\022\n\nquery_text\030\001 \001(\t\022\025\n\rlanguage_code" +
+      "ult\022\022\n\nquery_text\030\001 \001(\t\022\025\n\rlanguage_code",
       "\030\017 \001(\t\022%\n\035speech_recognition_confidence\030" +
       "\002 \001(\002\022\016\n\006action\030\003 \001(\t\022+\n\nparameters\030\004 \001(" +
       "\0132\027.google.protobuf.Struct\022#\n\033all_requir" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "age\022\026\n\016webhook_source\030\010 \001(\t\0220\n\017webhook_p" +
       "ayload\030\t \001(\0132\027.google.protobuf.Struct\022<\n" +
       "\017output_contexts\030\n \003(\0132#.google.cloud.di" +
-      "alogflow.v2.Context\0222\n\006intent\030\013 \001(\0132\".go" +
+      "alogflow.v2.Context\0222\n\006intent\030\013 \001(\0132\".go",
       "ogle.cloud.dialogflow.v2.Intent\022#\n\033inten" +
       "t_detection_confidence\030\014 \001(\002\0220\n\017diagnost" +
       "ic_info\030\016 \001(\0132\027.google.protobuf.Struct\"\336" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "uery_input\030\003 \001(\0132&.google.cloud.dialogfl" +
       "ow.v2.QueryInput\022\030\n\020single_utterance\030\004 \001" +
       "(\010\022\023\n\013input_audio\030\006 \001(\014\"\363\001\n\035StreamingDet" +
-      "ectIntentResponse\022\023\n\013response_id\030\001 \001(\t\022R" +
+      "ectIntentResponse\022\023\n\013response_id\030\001 \001(\t\022R",
       "\n\022recognition_result\030\002 \001(\01326.google.clou" +
       "d.dialogflow.v2.StreamingRecognitionResu" +
       "lt\022=\n\014query_result\030\003 \001(\0132\'.google.cloud." +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "(\0162B.google.cloud.dialogflow.v2.Streamin" +
       "gRecognitionResult.MessageType\022\022\n\ntransc" +
       "ript\030\002 \001(\t\022\020\n\010is_final\030\003 \001(\010\022\022\n\nconfiden" +
-      "ce\030\004 \001(\002\"X\n\013MessageType\022\034\n\030MESSAGE_TYPE_" +
+      "ce\030\004 \001(\002\"X\n\013MessageType\022\034\n\030MESSAGE_TYPE_",
       "UNSPECIFIED\020\000\022\016\n\nTRANSCRIPT\020\001\022\033\n\027END_OF_" +
       "SINGLE_UTTERANCE\020\002\"\235\001\n\020InputAudioConfig\022" +
       "A\n\016audio_encoding\030\001 \001(\0162).google.cloud.d" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "\001 \001(\t\022\025\n\rlanguage_code\030\002 \001(\t\"^\n\nEventInp" +
       "ut\022\014\n\004name\030\001 \001(\t\022+\n\nparameters\030\002 \001(\0132\027.g" +
       "oogle.protobuf.Struct\022\025\n\rlanguage_code\030\003" +
-      " \001(\t*\373\001\n\rAudioEncoding\022\036\n\032AUDIO_ENCODING" +
+      " \001(\t*\373\001\n\rAudioEncoding\022\036\n\032AUDIO_ENCODING",
       "_UNSPECIFIED\020\000\022\034\n\030AUDIO_ENCODING_LINEAR_" +
       "16\020\001\022\027\n\023AUDIO_ENCODING_FLAC\020\002\022\030\n\024AUDIO_E" +
       "NCODING_MULAW\020\003\022\026\n\022AUDIO_ENCODING_AMR\020\004\022" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "ctIntent\022/.google.cloud.dialogflow.v2.De" +
       "tectIntentRequest\0320.google.cloud.dialogf" +
       "low.v2.DetectIntentResponse\"A\202\323\344\223\002;\"6/v2" +
-      "/{session=projects/*/agent/sessions/*}:d" +
+      "/{session=projects/*/agent/sessions/*}:d",
       "etectIntent:\001*\022\220\001\n\025StreamingDetectIntent" +
       "\0228.google.cloud.dialogflow.v2.StreamingD" +
       "etectIntentRequest\0329.google.cloud.dialog" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java
index 6f0855fabfe0..da285eead6f5 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java
@@ -42,9 +42,6 @@ private StreamingDetectIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1274,7 +1271,7 @@ public StreamingDetectIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingDetectIntentRequest(input, extensionRegistry);
+        return new StreamingDetectIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentResponse.java
index d6978ab7bca8..642f93f364ec 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentResponse.java
@@ -41,9 +41,6 @@ private StreamingDetectIntentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1241,7 +1238,7 @@ public StreamingDetectIntentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingDetectIntentResponse(input, extensionRegistry);
+        return new StreamingDetectIntentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResult.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResult.java
index 5948b4a51f50..f17877802f2a 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingRecognitionResult.java
@@ -55,9 +55,6 @@ private StreamingRecognitionResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1022,7 +1019,7 @@ public StreamingRecognitionResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognitionResult(input, extensionRegistry);
+        return new StreamingRecognitionResult(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextInput.java
index 8dd3d5d0e214..bf015b39b60b 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextInput.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TextInput.java
@@ -34,9 +34,6 @@ private TextInput(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -714,7 +711,7 @@ public TextInput parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextInput(input, extensionRegistry);
+        return new TextInput(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TrainAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TrainAgentRequest.java
index 5f035d0ed035..4dce693dfe4b 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TrainAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/TrainAgentRequest.java
@@ -33,9 +33,6 @@ private TrainAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public TrainAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TrainAgentRequest(input, extensionRegistry);
+        return new TrainAgentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateContextRequest.java
index 8cd0da7ceb2d..632e7c1c2f3e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateContextRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateContextRequest.java
@@ -32,9 +32,6 @@ private UpdateContextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -834,7 +831,7 @@ public UpdateContextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateContextRequest(input, extensionRegistry);
+        return new UpdateContextRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEntityTypeRequest.java
index 5fefac55466f..b170ec518899 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateEntityTypeRequest.java
@@ -33,9 +33,6 @@ private UpdateEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1029,7 +1026,7 @@ public UpdateEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateEntityTypeRequest(input, extensionRegistry);
+        return new UpdateEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateIntentRequest.java
index 6dd1632e81b6..294f27941122 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateIntentRequest.java
@@ -34,9 +34,6 @@ private UpdateIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1140,7 +1137,7 @@ public UpdateIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateIntentRequest(input, extensionRegistry);
+        return new UpdateIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateSessionEntityTypeRequest.java
index 981eb429fdf4..15c4ab49b391 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateSessionEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/UpdateSessionEntityTypeRequest.java
@@ -32,9 +32,6 @@ private UpdateSessionEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -858,7 +855,7 @@ public UpdateSessionEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateSessionEntityTypeRequest(input, extensionRegistry);
+        return new UpdateSessionEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookProto.java
index 015c1042e487..0ca8ce580e7e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "uf/struct.proto\"\326\001\n\016WebhookRequest\022\017\n\007se" +
       "ssion\030\004 \001(\t\022\023\n\013response_id\030\001 \001(\t\022=\n\014quer" +
       "y_result\030\002 \001(\0132\'.google.cloud.dialogflow" +
-      ".v2.QueryResult\022_\n\036original_detect_inten" +
+      ".v2.QueryResult\022_\n\036original_detect_inten",
       "t_request\030\003 \001(\01327.google.cloud.dialogflo" +
       "w.v2.OriginalDetectIntentRequest\"\263\002\n\017Web" +
       "hookResponse\022\030\n\020fulfillment_text\030\001 \001(\t\022H" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "buf.Struct\022<\n\017output_contexts\030\005 \003(\0132#.go" +
       "ogle.cloud.dialogflow.v2.Context\022D\n\024foll" +
       "owup_event_input\030\006 \001(\0132&.google.cloud.di" +
-      "alogflow.v2.EventInput\"W\n\033OriginalDetect" +
+      "alogflow.v2.EventInput\"W\n\033OriginalDetect",
       "IntentRequest\022\016\n\006source\030\001 \001(\t\022(\n\007payload" +
       "\030\003 \001(\0132\027.google.protobuf.StructB\233\001\n\036com." +
       "google.cloud.dialogflow.v2B\014WebhookProto" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookRequest.java
index a42f9fc84f2e..7c93a8f3b606 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookRequest.java
@@ -34,9 +34,6 @@ private WebhookRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1189,7 +1186,7 @@ public WebhookRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebhookRequest(input, extensionRegistry);
+        return new WebhookRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponse.java
index d0237a2e6d01..7d71aff65bac 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/WebhookResponse.java
@@ -36,9 +36,6 @@ private WebhookResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2336,7 +2333,7 @@ public WebhookResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebhookResponse(input, extensionRegistry);
+        return new WebhookResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Agent.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Agent.java
index f34354230b6a..89729308efa4 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Agent.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Agent.java
@@ -42,9 +42,6 @@ private Agent(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2035,7 +2032,7 @@ public Agent parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Agent(input, extensionRegistry);
+        return new Agent(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentName.java
index 7383a0608562..fb52e4d88662 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("AgentName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "agent", agent);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentProto.java
index 738a51cd5f2d..5cbc1493ca62 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "\003\n\005Agent\022\016\n\006parent\030\001 \001(\t\022\024\n\014display_name" +
       "\030\002 \001(\t\022\035\n\025default_language_code\030\003 \001(\t\022 \n" +
       "\030supported_language_codes\030\004 \003(\t\022\021\n\ttime_" +
-      "zone\030\005 \001(\t\022\023\n\013description\030\006 \001(\t\022\022\n\navata" +
+      "zone\030\005 \001(\t\022\023\n\013description\030\006 \001(\t\022\022\n\navata",
       "r_uri\030\007 \001(\t\022\026\n\016enable_logging\030\010 \001(\010\022D\n\nm" +
       "atch_mode\030\t \001(\01620.google.cloud.dialogflo" +
       "w.v2beta1.Agent.MatchMode\022 \n\030classificat" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "equest\022\016\n\006parent\030\001 \001(\t\"L\n\023SearchAgentsRe" +
       "quest\022\016\n\006parent\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005" +
       "\022\022\n\npage_token\030\003 \001(\t\"g\n\024SearchAgentsResp" +
-      "onse\0226\n\006agents\030\001 \003(\0132&.google.cloud.dial" +
+      "onse\0226\n\006agents\030\001 \003(\0132&.google.cloud.dial",
       "ogflow.v2beta1.Agent\022\027\n\017next_page_token\030" +
       "\002 \001(\t\"#\n\021TrainAgentRequest\022\016\n\006parent\030\001 \001" +
       "(\t\"7\n\022ExportAgentRequest\022\016\n\006parent\030\001 \001(\t" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "\016\n\006parent\030\001 \001(\t\022\023\n\tagent_uri\030\002 \001(\tH\000\022\027\n\r" +
       "agent_content\030\003 \001(\014H\000B\007\n\005agent\"\\\n\023Restor" +
       "eAgentRequest\022\016\n\006parent\030\001 \001(\t\022\023\n\tagent_u" +
-      "ri\030\002 \001(\tH\000\022\027\n\ragent_content\030\003 \001(\014H\000B\007\n\005a" +
+      "ri\030\002 \001(\tH\000\022\027\n\ragent_content\030\003 \001(\014H\000B\007\n\005a",
       "gent2\264\007\n\006Agents\022\220\001\n\010GetAgent\0220.google.cl" +
       "oud.dialogflow.v2beta1.GetAgentRequest\032&" +
       ".google.cloud.dialogflow.v2beta1.Agent\"*" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "le.cloud.dialogflow.v2beta1.SearchAgents" +
       "Response\"1\202\323\344\223\002+\022)/v2beta1/{parent=proje" +
       "cts/*}/agent:search\022\224\001\n\nTrainAgent\0222.goo" +
-      "gle.cloud.dialogflow.v2beta1.TrainAgentR" +
+      "gle.cloud.dialogflow.v2beta1.TrainAgentR",
       "equest\032\035.google.longrunning.Operation\"3\202" +
       "\323\344\223\002-\"(/v2beta1/{parent=projects/*}/agen" +
       "t:train:\001*\022\227\001\n\013ExportAgent\0223.google.clou" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "t:\001*\022\227\001\n\013ImportAgent\0223.google.cloud.dial" +
       "ogflow.v2beta1.ImportAgentRequest\032\035.goog" +
       "le.longrunning.Operation\"4\202\323\344\223\002.\")/v2bet" +
-      "a1/{parent=projects/*}/agent:import:\001*\022\232" +
+      "a1/{parent=projects/*}/agent:import:\001*\022\232",
       "\001\n\014RestoreAgent\0224.google.cloud.dialogflo" +
       "w.v2beta1.RestoreAgentRequest\032\035.google.l" +
       "ongrunning.Operation\"5\202\323\344\223\002/\"*/v2beta1/{" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java
index e21e7b22be8b..b9a98436bdb0 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java
@@ -35,9 +35,6 @@ private BatchCreateEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1161,7 +1158,7 @@ public BatchCreateEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchCreateEntitiesRequest(input, extensionRegistry);
+        return new BatchCreateEntitiesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java
index f100527ff239..a390c84270c6 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java
@@ -35,9 +35,6 @@ private BatchDeleteEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -974,7 +971,7 @@ public BatchDeleteEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchDeleteEntitiesRequest(input, extensionRegistry);
+        return new BatchDeleteEntitiesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntityTypesRequest.java
index 0e8f9fa05b04..d3a656c5ff9e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntityTypesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntityTypesRequest.java
@@ -34,9 +34,6 @@ private BatchDeleteEntityTypesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -778,7 +775,7 @@ public BatchDeleteEntityTypesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchDeleteEntityTypesRequest(input, extensionRegistry);
+        return new BatchDeleteEntityTypesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java
index 88d419c4c38e..b64d41d29b56 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java
@@ -34,9 +34,6 @@ private BatchDeleteIntentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public BatchDeleteIntentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchDeleteIntentsRequest(input, extensionRegistry);
+        return new BatchDeleteIntentsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java
index e72d6e4b8a00..d82ec796f5de 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java
@@ -35,9 +35,6 @@ private BatchUpdateEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1390,7 +1387,7 @@ public BatchUpdateEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateEntitiesRequest(input, extensionRegistry);
+        return new BatchUpdateEntitiesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesRequest.java
index 8310f2a14ce7..bf7d0d406097 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesRequest.java
@@ -34,9 +34,6 @@ private BatchUpdateEntityTypesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1473,7 +1470,7 @@ public BatchUpdateEntityTypesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateEntityTypesRequest(input, extensionRegistry);
+        return new BatchUpdateEntityTypesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesResponse.java
index de8e276961fa..5d76a9237602 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntityTypesResponse.java
@@ -33,9 +33,6 @@ private BatchUpdateEntityTypesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public BatchUpdateEntityTypesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateEntityTypesResponse(input, extensionRegistry);
+        return new BatchUpdateEntityTypesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsRequest.java
index f4df1fa6835c..10b44ff52c71 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsRequest.java
@@ -35,9 +35,6 @@ private BatchUpdateIntentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1577,7 +1574,7 @@ public BatchUpdateIntentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateIntentsRequest(input, extensionRegistry);
+        return new BatchUpdateIntentsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsResponse.java
index 6ea9918ddf33..845673e3f221 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateIntentsResponse.java
@@ -33,9 +33,6 @@ private BatchUpdateIntentsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public BatchUpdateIntentsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateIntentsResponse(input, extensionRegistry);
+        return new BatchUpdateIntentsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Context.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Context.java
index 29e9a3ddd6bb..94ac3527b5d4 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Context.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Context.java
@@ -34,9 +34,6 @@ private Context(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -926,7 +923,7 @@ public Context parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Context(input, extensionRegistry);
+        return new Context(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextName.java
index 6af5bcf33d4b..c1dcdf763eed 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ContextName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "session", session, "context", context);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextProto.java
index e68d1b94d441..eacdbe947f2e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "_count\030\002 \001(\005\022+\n\nparameters\030\003 \001(\0132\027.googl" +
       "e.protobuf.Struct\"L\n\023ListContextsRequest" +
       "\022\016\n\006parent\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\np" +
-      "age_token\030\003 \001(\t\"k\n\024ListContextsResponse\022" +
+      "age_token\030\003 \001(\t\"k\n\024ListContextsResponse\022",
       ":\n\010contexts\030\001 \003(\0132(.google.cloud.dialogf" +
       "low.v2beta1.Context\022\027\n\017next_page_token\030\002" +
       " \001(\t\"!\n\021GetContextRequest\022\014\n\004name\030\001 \001(\t\"" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "est\0229\n\007context\030\001 \001(\0132(.google.cloud.dial" +
       "ogflow.v2beta1.Context\022/\n\013update_mask\030\002 " +
       "\001(\0132\032.google.protobuf.FieldMask\"$\n\024Delet" +
-      "eContextRequest\022\014\n\004name\030\001 \001(\t\"*\n\030DeleteA" +
+      "eContextRequest\022\014\n\004name\030\001 \001(\t\"*\n\030DeleteA",
       "llContextsRequest\022\016\n\006parent\030\001 \001(\t2\313\014\n\010Co" +
       "ntexts\022\216\002\n\014ListContexts\0224.google.cloud.d" +
       "ialogflow.v2beta1.ListContextsRequest\0325." +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "\022M/v2beta1/{parent=projects/*/agent/envi" +
       "ronments/*/users/*/sessions/*}/contexts\022" +
       "\375\001\n\nGetContext\0222.google.cloud.dialogflow" +
-      ".v2beta1.GetContextRequest\032(.google.clou" +
+      ".v2beta1.GetContextRequest\032(.google.clou",
       "d.dialogflow.v2beta1.Context\"\220\001\202\323\344\223\002\211\001\0226" +
       "/v2beta1/{name=projects/*/agent/sessions" +
       "/*/contexts/*}ZO\022M/v2beta1/{name=project" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "tRequest\032(.google.cloud.dialogflow.v2bet" +
       "a1.Context\"\242\001\202\323\344\223\002\233\001\"6/v2beta1/{parent=p" +
       "rojects/*/agent/sessions/*}/contexts:\007co" +
-      "ntextZX\"M/v2beta1/{parent=projects/*/age" +
+      "ntextZX\"M/v2beta1/{parent=projects/*/age",
       "nt/environments/*/users/*/sessions/*}/co" +
       "ntexts:\007context\022\245\002\n\rUpdateContext\0225.goog" +
       "le.cloud.dialogflow.v2beta1.UpdateContex" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "s/*}:\007contextZ`2U/v2beta1/{context.name=" +
       "projects/*/agent/environments/*/users/*/" +
       "sessions/*/contexts/*}:\007context\022\361\001\n\rDele" +
-      "teContext\0225.google.cloud.dialogflow.v2be" +
+      "teContext\0225.google.cloud.dialogflow.v2be",
       "ta1.DeleteContextRequest\032\026.google.protob" +
       "uf.Empty\"\220\001\202\323\344\223\002\211\001*6/v2beta1/{name=proje" +
       "cts/*/agent/sessions/*/contexts/*}ZO*M/v" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "low.v2beta1.DeleteAllContextsRequest\032\026.g" +
       "oogle.protobuf.Empty\"\220\001\202\323\344\223\002\211\001*6/v2beta1" +
       "/{parent=projects/*/agent/sessions/*}/co" +
-      "ntextsZO*M/v2beta1/{parent=projects/*/ag" +
+      "ntextsZO*M/v2beta1/{parent=projects/*/ag",
       "ent/environments/*/users/*/sessions/*}/c" +
       "ontextsB\252\001\n#com.google.cloud.dialogflow." +
       "v2beta1B\014ContextProtoP\001ZIgoogle.golang.o" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateContextRequest.java
index f4c27d58fe82..18a93fbff696 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateContextRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateContextRequest.java
@@ -33,9 +33,6 @@ private CreateContextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -802,7 +799,7 @@ public CreateContextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateContextRequest(input, extensionRegistry);
+        return new CreateContextRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEntityTypeRequest.java
index ad5ad9c33c36..8f2962468ee6 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateEntityTypeRequest.java
@@ -34,9 +34,6 @@ private CreateEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -950,7 +947,7 @@ public CreateEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateEntityTypeRequest(input, extensionRegistry);
+        return new CreateEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java
index ad0974e642ea..9d261b7357e8 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java
@@ -35,9 +35,6 @@ private CreateIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1061,7 +1058,7 @@ public CreateIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateIntentRequest(input, extensionRegistry);
+        return new CreateIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java
index 15fda3ce50ac..fd051048102d 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java
@@ -33,9 +33,6 @@ private CreateSessionEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -802,7 +799,7 @@ public CreateSessionEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateSessionEntityTypeRequest(input, extensionRegistry);
+        return new CreateSessionEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAllContextsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAllContextsRequest.java
index 6ce8fbd1307b..844d5a393542 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAllContextsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteAllContextsRequest.java
@@ -33,9 +33,6 @@ private DeleteAllContextsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -573,7 +570,7 @@ public DeleteAllContextsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteAllContextsRequest(input, extensionRegistry);
+        return new DeleteAllContextsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteContextRequest.java
index 9466fba3eeaf..1e15c0a5da74 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteContextRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteContextRequest.java
@@ -33,9 +33,6 @@ private DeleteContextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -580,7 +577,7 @@ public DeleteContextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteContextRequest(input, extensionRegistry);
+        return new DeleteContextRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEntityTypeRequest.java
index 4c88e265222c..5b46c1c0a83d 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteEntityTypeRequest.java
@@ -33,9 +33,6 @@ private DeleteEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteEntityTypeRequest(input, extensionRegistry);
+        return new DeleteEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteIntentRequest.java
index b3f95cd8cc10..8bda7c4aca81 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteIntentRequest.java
@@ -33,9 +33,6 @@ private DeleteIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteIntentRequest(input, extensionRegistry);
+        return new DeleteIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteSessionEntityTypeRequest.java
index 950d954c7d97..5a735af5c909 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteSessionEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DeleteSessionEntityTypeRequest.java
@@ -33,9 +33,6 @@ private DeleteSessionEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -580,7 +577,7 @@ public DeleteSessionEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSessionEntityTypeRequest(input, extensionRegistry);
+        return new DeleteSessionEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java
index f636e93b5e83..116d309d3ec4 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java
@@ -34,9 +34,6 @@ private DetectIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1185,7 +1182,7 @@ public DetectIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DetectIntentRequest(input, extensionRegistry);
+        return new DetectIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentResponse.java
index aebd7db66179..5eb997d4b4d5 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentResponse.java
@@ -33,9 +33,6 @@ private DetectIntentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1008,7 +1005,7 @@ public DetectIntentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DetectIntentResponse(input, extensionRegistry);
+        return new DetectIntentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityType.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityType.java
index 93bdac9b1fd1..00369121817a 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityType.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityType.java
@@ -39,9 +39,6 @@ private EntityType(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -485,9 +482,6 @@ private Entity(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1257,7 +1251,7 @@ public Entity parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Entity(input, extensionRegistry);
+          return new Entity(input, extensionRegistry);
       }
     };
 
@@ -2536,7 +2530,7 @@ public EntityType parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityType(input, extensionRegistry);
+        return new EntityType(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeBatch.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeBatch.java
index c52291ded568..8f31621bc3ad 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeBatch.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeBatch.java
@@ -33,9 +33,6 @@ private EntityTypeBatch(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public EntityTypeBatch parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityTypeBatch(input, extensionRegistry);
+        return new EntityTypeBatch(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeName.java
index 32262b670f56..cf86d217eac6 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("EntityTypeName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "entity_type", entityType);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeProto.java
index 512e2af39fbf..a4c9fdb8bbf0 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeProto.java
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "roto\"\323\003\n\nEntityType\022\014\n\004name\030\001 \001(\t\022\024\n\014dis" +
       "play_name\030\002 \001(\t\022>\n\004kind\030\003 \001(\01620.google.c" +
       "loud.dialogflow.v2beta1.EntityType.Kind\022" +
-      "Z\n\023auto_expansion_mode\030\004 \001(\0162=.google.cl" +
+      "Z\n\023auto_expansion_mode\030\004 \001(\0162=.google.cl",
       "oud.dialogflow.v2beta1.EntityType.AutoEx" +
       "pansionMode\022D\n\010entities\030\006 \003(\01322.google.c" +
       "loud.dialogflow.v2beta1.EntityType.Entit" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "Mode\022#\n\037AUTO_EXPANSION_MODE_UNSPECIFIED\020" +
       "\000\022\037\n\033AUTO_EXPANSION_MODE_DEFAULT\020\001\"f\n\026Li" +
       "stEntityTypesRequest\022\016\n\006parent\030\001 \001(\t\022\025\n\r" +
-      "language_code\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022" +
+      "language_code\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022",
       "\n\npage_token\030\004 \001(\t\"u\n\027ListEntityTypesRes" +
       "ponse\022A\n\014entity_types\030\001 \003(\0132+.google.clo" +
       "ud.dialogflow.v2beta1.EntityType\022\027\n\017next" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "(\t\022@\n\013entity_type\030\002 \001(\0132+.google.cloud.d" +
       "ialogflow.v2beta1.EntityType\022\025\n\rlanguage" +
       "_code\030\003 \001(\t\"\243\001\n\027UpdateEntityTypeRequest\022" +
-      "@\n\013entity_type\030\001 \001(\0132+.google.cloud.dial" +
+      "@\n\013entity_type\030\001 \001(\0132+.google.cloud.dial",
       "ogflow.v2beta1.EntityType\022\025\n\rlanguage_co" +
       "de\030\002 \001(\t\022/\n\013update_mask\030\003 \001(\0132\032.google.p" +
       "rotobuf.FieldMask\"\'\n\027DeleteEntityTypeReq" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "ch_inline\030\003 \001(\01320.google.cloud.dialogflo" +
       "w.v2beta1.EntityTypeBatchH\000\022\025\n\rlanguage_" +
       "code\030\004 \001(\t\022/\n\013update_mask\030\005 \001(\0132\032.google" +
-      ".protobuf.FieldMaskB\023\n\021entity_type_batch" +
+      ".protobuf.FieldMaskB\023\n\021entity_type_batch",
       "\"c\n\036BatchUpdateEntityTypesResponse\022A\n\014en" +
       "tity_types\030\001 \003(\0132+.google.cloud.dialogfl" +
       "ow.v2beta1.EntityType\"J\n\035BatchDeleteEnti" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "(\01322.google.cloud.dialogflow.v2beta1.Ent" +
       "ityType.Entity\022\025\n\rlanguage_code\030\003 \001(\t\"\272\001" +
       "\n\032BatchUpdateEntitiesRequest\022\016\n\006parent\030\001" +
-      " \001(\t\022D\n\010entities\030\002 \003(\01322.google.cloud.di" +
+      " \001(\t\022D\n\010entities\030\002 \003(\01322.google.cloud.di",
       "alogflow.v2beta1.EntityType.Entity\022\025\n\rla" +
       "nguage_code\030\003 \001(\t\022/\n\013update_mask\030\004 \001(\0132\032" +
       ".google.protobuf.FieldMask\"Z\n\032BatchDelet" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "+.google.cloud.dialogflow.v2beta1.Entity" +
       "Type2\373\016\n\013EntityTypes\022\274\001\n\017ListEntityTypes" +
       "\0227.google.cloud.dialogflow.v2beta1.ListE" +
-      "ntityTypesRequest\0328.google.cloud.dialogf" +
+      "ntityTypesRequest\0328.google.cloud.dialogf",
       "low.v2beta1.ListEntityTypesResponse\"6\202\323\344" +
       "\223\0020\022./v2beta1/{parent=projects/*/agent}/" +
       "entityTypes\022\253\001\n\rGetEntityType\0225.google.c" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "ts/*/agent/entityTypes/*}\022\276\001\n\020CreateEnti" +
       "tyType\0228.google.cloud.dialogflow.v2beta1" +
       ".CreateEntityTypeRequest\032+.google.cloud." +
-      "dialogflow.v2beta1.EntityType\"C\202\323\344\223\002=\"./" +
+      "dialogflow.v2beta1.EntityType\"C\202\323\344\223\002=\"./",
       "v2beta1/{parent=projects/*/agent}/entity" +
       "Types:\013entity_type\022\312\001\n\020UpdateEntityType\022" +
       "8.google.cloud.dialogflow.v2beta1.Update" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "tyTypes/*}:\013entity_type\022\234\001\n\020DeleteEntity" +
       "Type\0228.google.cloud.dialogflow.v2beta1.D" +
       "eleteEntityTypeRequest\032\026.google.protobuf" +
-      ".Empty\"6\202\323\344\223\0020*./v2beta1/{name=projects/" +
+      ".Empty\"6\202\323\344\223\0020*./v2beta1/{name=projects/",
       "*/agent/entityTypes/*}\022\276\001\n\026BatchUpdateEn" +
       "tityTypes\022>.google.cloud.dialogflow.v2be" +
       "ta1.BatchUpdateEntityTypesRequest\032\035.goog" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "es\022>.google.cloud.dialogflow.v2beta1.Bat" +
       "chDeleteEntityTypesRequest\032\035.google.long" +
       "running.Operation\"E\202\323\344\223\002?\":/v2beta1/{par" +
-      "ent=projects/*/agent}/entityTypes:batchD" +
+      "ent=projects/*/agent}/entityTypes:batchD",
       "elete:\001*\022\303\001\n\023BatchCreateEntities\022;.googl" +
       "e.cloud.dialogflow.v2beta1.BatchCreateEn" +
       "titiesRequest\032\035.google.longrunning.Opera" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "cloud.dialogflow.v2beta1.BatchUpdateEnti" +
       "tiesRequest\032\035.google.longrunning.Operati" +
       "on\"P\202\323\344\223\002J\"E/v2beta1/{parent=projects/*/" +
-      "agent/entityTypes/*}/entities:batchUpdat" +
+      "agent/entityTypes/*}/entities:batchUpdat",
       "e:\001*\022\303\001\n\023BatchDeleteEntities\022;.google.cl" +
       "oud.dialogflow.v2beta1.BatchDeleteEntiti" +
       "esRequest\032\035.google.longrunning.Operation" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentContextName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentContextName.java
index fa8344304ffe..29f290f02e7a 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentContextName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentContextName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -149,14 +148,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("EnvironmentContextName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "environment", environment, "user", user, "session", session, "context", context);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentSessionEntityTypeName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentSessionEntityTypeName.java
index d58b9d9b4848..40f590c7972e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentSessionEntityTypeName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentSessionEntityTypeName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -149,14 +148,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("EnvironmentSessionEntityTypeName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "environment", environment, "user", user, "session", session, "entity_type", entityType);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentSessionName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentSessionName.java
index f2e30edeeeb5..23af55c0550e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentSessionName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentSessionName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -140,14 +139,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("EnvironmentSessionName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "environment", environment, "user", user, "session", session);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java
index 71344536289a..d4c3d7a75fd3 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java
@@ -38,9 +38,6 @@ private EventInput(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -944,7 +941,7 @@ public EventInput parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EventInput(input, extensionRegistry);
+        return new EventInput(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java
index c64aedd7411e..e4aae82e0595 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java
@@ -34,9 +34,6 @@ private ExportAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -707,7 +704,7 @@ public ExportAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExportAgentRequest(input, extensionRegistry);
+        return new ExportAgentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentResponse.java
index 906ab3ae0c1d..db028b4e9a18 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentResponse.java
@@ -32,9 +32,6 @@ private ExportAgentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -768,7 +765,7 @@ public ExportAgentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExportAgentResponse(input, extensionRegistry);
+        return new ExportAgentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAgentRequest.java
index f553d90f107e..4992ca11cd02 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetAgentRequest.java
@@ -33,9 +33,6 @@ private GetAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetAgentRequest(input, extensionRegistry);
+        return new GetAgentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetContextRequest.java
index c2e1a8d5b9b3..03b1644806c2 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetContextRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetContextRequest.java
@@ -33,9 +33,6 @@ private GetContextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -573,7 +570,7 @@ public GetContextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetContextRequest(input, extensionRegistry);
+        return new GetContextRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEntityTypeRequest.java
index f01561dd1cf5..8b417f5d9c1f 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetEntityTypeRequest.java
@@ -34,9 +34,6 @@ private GetEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -721,7 +718,7 @@ public GetEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetEntityTypeRequest(input, extensionRegistry);
+        return new GetEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetIntentRequest.java
index 3b730f1f0358..5fe17ef27f62 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetIntentRequest.java
@@ -35,9 +35,6 @@ private GetIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -832,7 +829,7 @@ public GetIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetIntentRequest(input, extensionRegistry);
+        return new GetIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetSessionEntityTypeRequest.java
index 16831c4c6e7d..1b1ff6d8cb9e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetSessionEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/GetSessionEntityTypeRequest.java
@@ -33,9 +33,6 @@ private GetSessionEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -580,7 +577,7 @@ public GetSessionEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSessionEntityTypeRequest(input, extensionRegistry);
+        return new GetSessionEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportAgentRequest.java
index 07cc3290000b..a7bbb1f1f334 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ImportAgentRequest.java
@@ -33,9 +33,6 @@ private ImportAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -930,7 +927,7 @@ public ImportAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImportAgentRequest(input, extensionRegistry);
+        return new ImportAgentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputAudioConfig.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputAudioConfig.java
index bd2d2f6d32a5..aef4a3ae9c85 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputAudioConfig.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/InputAudioConfig.java
@@ -36,9 +36,6 @@ private InputAudioConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1018,7 +1015,7 @@ public InputAudioConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InputAudioConfig(input, extensionRegistry);
+        return new InputAudioConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Intent.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Intent.java
index e7577670ec1c..794163a0e2ee 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Intent.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Intent.java
@@ -53,9 +53,6 @@ private Intent(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -543,9 +540,6 @@ private TrainingPhrase(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -867,9 +861,6 @@ private Part(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1786,7 +1777,7 @@ public Part parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Part(input, extensionRegistry);
+            return new Part(input, extensionRegistry);
         }
       };
 
@@ -2905,7 +2896,7 @@ public TrainingPhrase parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TrainingPhrase(input, extensionRegistry);
+          return new TrainingPhrase(input, extensionRegistry);
       }
     };
 
@@ -3134,9 +3125,6 @@ private Parameter(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4713,7 +4701,7 @@ public Parameter parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Parameter(input, extensionRegistry);
+          return new Parameter(input, extensionRegistry);
       }
     };
 
@@ -5066,9 +5054,6 @@ private Message(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5697,9 +5682,6 @@ private Text(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6264,7 +6246,7 @@ public Text parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Text(input, extensionRegistry);
+            return new Text(input, extensionRegistry);
         }
       };
 
@@ -6356,9 +6338,6 @@ private Image(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7015,7 +6994,7 @@ public Image parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Image(input, extensionRegistry);
+            return new Image(input, extensionRegistry);
         }
       };
 
@@ -7122,9 +7101,6 @@ private QuickReplies(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7846,7 +7822,7 @@ public QuickReplies parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new QuickReplies(input, extensionRegistry);
+            return new QuickReplies(input, extensionRegistry);
         }
       };
 
@@ -8000,9 +7976,6 @@ private Card(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8148,9 +8121,6 @@ private Button(
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           this();
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
           int mutable_bitField0_ = 0;
           com.google.protobuf.UnknownFieldSet.Builder unknownFields =
               com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8807,7 +8777,7 @@ public Button parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new Button(input, extensionRegistry);
+              return new Button(input, extensionRegistry);
           }
         };
 
@@ -9996,7 +9966,7 @@ public Card parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Card(input, extensionRegistry);
+            return new Card(input, extensionRegistry);
         }
       };
 
@@ -10111,9 +10081,6 @@ private SimpleResponse(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -10938,7 +10905,7 @@ public SimpleResponse parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new SimpleResponse(input, extensionRegistry);
+            return new SimpleResponse(input, extensionRegistry);
         }
       };
 
@@ -11038,9 +11005,6 @@ private SimpleResponses(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -11821,7 +11785,7 @@ public SimpleResponses parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new SimpleResponses(input, extensionRegistry);
+            return new SimpleResponses(input, extensionRegistry);
         }
       };
 
@@ -12000,9 +11964,6 @@ private BasicCard(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12165,9 +12126,6 @@ private Button(
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           this();
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
           int mutable_bitField0_ = 0;
           com.google.protobuf.UnknownFieldSet.Builder unknownFields =
               com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12281,9 +12239,6 @@ private OpenUriAction(
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
             this();
-            if (extensionRegistry == null) {
-              throw new java.lang.NullPointerException();
-            }
             int mutable_bitField0_ = 0;
             com.google.protobuf.UnknownFieldSet.Builder unknownFields =
                 com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12779,7 +12734,7 @@ public OpenUriAction parsePartialFrom(
                 com.google.protobuf.CodedInputStream input,
                 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
                 throws com.google.protobuf.InvalidProtocolBufferException {
-              return new OpenUriAction(input, extensionRegistry);
+                return new OpenUriAction(input, extensionRegistry);
             }
           };
 
@@ -13461,7 +13416,7 @@ public Button parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new Button(input, extensionRegistry);
+              return new Button(input, extensionRegistry);
           }
         };
 
@@ -14866,7 +14821,7 @@ public BasicCard parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new BasicCard(input, extensionRegistry);
+            return new BasicCard(input, extensionRegistry);
         }
       };
 
@@ -14938,9 +14893,6 @@ private Suggestion(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -15437,7 +15389,7 @@ public Suggestion parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Suggestion(input, extensionRegistry);
+            return new Suggestion(input, extensionRegistry);
         }
       };
 
@@ -15534,9 +15486,6 @@ private Suggestions(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -16314,7 +16263,7 @@ public Suggestions parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Suggestions(input, extensionRegistry);
+            return new Suggestions(input, extensionRegistry);
         }
       };
 
@@ -16407,9 +16356,6 @@ private LinkOutSuggestion(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -17067,7 +17013,7 @@ public LinkOutSuggestion parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new LinkOutSuggestion(input, extensionRegistry);
+            return new LinkOutSuggestion(input, extensionRegistry);
         }
       };
 
@@ -17183,9 +17129,6 @@ private ListSelect(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -17367,9 +17310,6 @@ private Item(
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           this();
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
           int mutable_bitField0_ = 0;
           com.google.protobuf.UnknownFieldSet.Builder unknownFields =
               com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -18477,7 +18417,7 @@ public Item parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new Item(input, extensionRegistry);
+              return new Item(input, extensionRegistry);
           }
         };
 
@@ -19370,7 +19310,7 @@ public ListSelect parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ListSelect(input, extensionRegistry);
+            return new ListSelect(input, extensionRegistry);
         }
       };
 
@@ -19467,9 +19407,6 @@ private CarouselSelect(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -19645,9 +19582,6 @@ private Item(
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           this();
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
           int mutable_bitField0_ = 0;
           com.google.protobuf.UnknownFieldSet.Builder unknownFields =
               com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -20755,7 +20689,7 @@ public Item parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new Item(input, extensionRegistry);
+              return new Item(input, extensionRegistry);
           }
         };
 
@@ -21497,7 +21431,7 @@ public CarouselSelect parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CarouselSelect(input, extensionRegistry);
+            return new CarouselSelect(input, extensionRegistry);
         }
       };
 
@@ -21611,9 +21545,6 @@ private SelectItemInfo(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -22356,7 +22287,7 @@ public SelectItemInfo parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new SelectItemInfo(input, extensionRegistry);
+            return new SelectItemInfo(input, extensionRegistry);
         }
       };
 
@@ -25488,7 +25419,7 @@ public Message parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Message(input, extensionRegistry);
+          return new Message(input, extensionRegistry);
       }
     };
 
@@ -25582,9 +25513,6 @@ private FollowupIntentInfo(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -26248,7 +26176,7 @@ public FollowupIntentInfo parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FollowupIntentInfo(input, extensionRegistry);
+          return new FollowupIntentInfo(input, extensionRegistry);
       }
     };
 
@@ -30908,7 +30836,7 @@ public Intent parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Intent(input, extensionRegistry);
+        return new Intent(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentBatch.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentBatch.java
index 6fbac2cd79e6..9457e6d554f1 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentBatch.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentBatch.java
@@ -33,9 +33,6 @@ private IntentBatch(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public IntentBatch parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new IntentBatch(input, extensionRegistry);
+        return new IntentBatch(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentName.java
index 590db2b10462..62950ce9ec84 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("IntentName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "intent", intent);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentProto.java
index d5fae1d40288..4055c2239861 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentProto.java
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "field_mask.proto\032\034google/protobuf/struct" +
       ".proto\"\247\"\n\006Intent\022\014\n\004name\030\001 \001(\t\022\024\n\014displ" +
       "ay_name\030\002 \001(\t\022K\n\rwebhook_state\030\006 \001(\01624.g" +
-      "oogle.cloud.dialogflow.v2beta1.Intent.We" +
+      "oogle.cloud.dialogflow.v2beta1.Intent.We",
       "bhookState\022\020\n\010priority\030\003 \001(\005\022\023\n\013is_fallb" +
       "ack\030\004 \001(\010\022\022\n\nml_enabled\030\005 \001(\010\022\023\n\013ml_disa" +
       "bled\030\023 \001(\010\022\033\n\023input_context_names\030\007 \003(\t\022" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "put_contexts\030\013 \003(\0132(.google.cloud.dialog" +
       "flow.v2beta1.Context\022\026\n\016reset_contexts\030\014" +
       " \001(\010\022E\n\nparameters\030\r \003(\01321.google.cloud." +
-      "dialogflow.v2beta1.Intent.Parameter\022A\n\010m" +
+      "dialogflow.v2beta1.Intent.Parameter\022A\n\010m",
       "essages\030\016 \003(\0132/.google.cloud.dialogflow." +
       "v2beta1.Intent.Message\022\\\n\032default_respon" +
       "se_platforms\030\017 \003(\01628.google.cloud.dialog" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "_intent_info\030\022 \003(\0132:.google.cloud.dialog" +
       "flow.v2beta1.Intent.FollowupIntentInfo\032\331" +
       "\002\n\016TrainingPhrase\022\014\n\004name\030\001 \001(\t\022I\n\004type\030" +
-      "\002 \001(\0162;.google.cloud.dialogflow.v2beta1." +
+      "\002 \001(\0162;.google.cloud.dialogflow.v2beta1.",
       "Intent.TrainingPhrase.Type\022J\n\005parts\030\003 \003(" +
       "\0132;.google.cloud.dialogflow.v2beta1.Inte" +
       "nt.TrainingPhrase.Part\022\031\n\021times_added_co" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "\013\n\007EXAMPLE\020\001\022\014\n\010TEMPLATE\020\002\032\254\001\n\tParameter" +
       "\022\014\n\004name\030\001 \001(\t\022\024\n\014display_name\030\002 \001(\t\022\r\n\005" +
       "value\030\003 \001(\t\022\025\n\rdefault_value\030\004 \001(\t\022 \n\030en" +
-      "tity_type_display_name\030\005 \001(\t\022\021\n\tmandator" +
+      "tity_type_display_name\030\005 \001(\t\022\021\n\tmandator",
       "y\030\006 \001(\010\022\017\n\007prompts\030\007 \003(\t\022\017\n\007is_list\030\010 \001(" +
       "\010\032\215\026\n\007Message\022D\n\004text\030\001 \001(\01324.google.clo" +
       "ud.dialogflow.v2beta1.Intent.Message.Tex" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "flow.v2beta1.Intent.Message.QuickReplies" +
       "H\000\022D\n\004card\030\004 \001(\01324.google.cloud.dialogfl" +
       "ow.v2beta1.Intent.Message.CardH\000\022*\n\007payl" +
-      "oad\030\005 \001(\0132\027.google.protobuf.StructH\000\022[\n\020" +
+      "oad\030\005 \001(\0132\027.google.protobuf.StructH\000\022[\n\020",
       "simple_responses\030\007 \001(\0132?.google.cloud.di" +
       "alogflow.v2beta1.Intent.Message.SimpleRe" +
       "sponsesH\000\022O\n\nbasic_card\030\010 \001(\01329.google.c" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       ".SuggestionsH\000\022`\n\023link_out_suggestion\030\n " +
       "\001(\0132A.google.cloud.dialogflow.v2beta1.In" +
       "tent.Message.LinkOutSuggestionH\000\022Q\n\013list" +
-      "_select\030\013 \001(\0132:.google.cloud.dialogflow." +
+      "_select\030\013 \001(\0132:.google.cloud.dialogflow.",
       "v2beta1.Intent.Message.ListSelectH\000\022Y\n\017c" +
       "arousel_select\030\014 \001(\0132>.google.cloud.dial" +
       "ogflow.v2beta1.Intent.Message.CarouselSe" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "ge_uri\030\001 \001(\t\022\032\n\022accessibility_text\030\002 \001(\t" +
       "\0324\n\014QuickReplies\022\r\n\005title\030\001 \001(\t\022\025\n\rquick" +
       "_replies\030\002 \003(\t\032\262\001\n\004Card\022\r\n\005title\030\001 \001(\t\022\020" +
-      "\n\010subtitle\030\002 \001(\t\022\021\n\timage_uri\030\003 \001(\t\022L\n\007b" +
+      "\n\010subtitle\030\002 \001(\t\022\021\n\timage_uri\030\003 \001(\t\022L\n\007b",
       "uttons\030\004 \003(\0132;.google.cloud.dialogflow.v" +
       "2beta1.Intent.Message.Card.Button\032(\n\006But" +
       "ton\022\014\n\004text\030\001 \001(\t\022\020\n\010postback\030\002 \001(\t\032L\n\016S" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       ".google.cloud.dialogflow.v2beta1.Intent." +
       "Message.SimpleResponse\032\376\002\n\tBasicCard\022\r\n\005" +
       "title\030\001 \001(\t\022\020\n\010subtitle\030\002 \001(\t\022\026\n\016formatt" +
-      "ed_text\030\003 \001(\t\022D\n\005image\030\004 \001(\01325.google.cl" +
+      "ed_text\030\003 \001(\t\022D\n\005image\030\004 \001(\01325.google.cl",
       "oud.dialogflow.v2beta1.Intent.Message.Im" +
       "age\022Q\n\007buttons\030\005 \003(\0132@.google.cloud.dial" +
       "ogflow.v2beta1.Intent.Message.BasicCard." +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "ton.OpenUriAction\032\034\n\rOpenUriAction\022\013\n\003ur" +
       "i\030\001 \001(\t\032\033\n\nSuggestion\022\r\n\005title\030\001 \001(\t\032^\n\013" +
       "Suggestions\022O\n\013suggestions\030\001 \003(\0132:.googl" +
-      "e.cloud.dialogflow.v2beta1.Intent.Messag" +
+      "e.cloud.dialogflow.v2beta1.Intent.Messag",
       "e.Suggestion\032:\n\021LinkOutSuggestion\022\030\n\020des" +
       "tination_name\030\001 \001(\t\022\013\n\003uri\030\002 \001(\t\032\254\002\n\nLis" +
       "tSelect\022\r\n\005title\030\001 \001(\t\022N\n\005items\030\002 \003(\0132?." +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "Intent.Message.SelectItemInfo\022\r\n\005title\030\002" +
       " \001(\t\022\023\n\013description\030\003 \001(\t\022D\n\005image\030\004 \001(\013" +
       "25.google.cloud.dialogflow.v2beta1.Inten" +
-      "t.Message.Image\032\245\002\n\016CarouselSelect\022R\n\005it" +
+      "t.Message.Image\032\245\002\n\016CarouselSelect\022R\n\005it",
       "ems\030\001 \003(\0132C.google.cloud.dialogflow.v2be" +
       "ta1.Intent.Message.CarouselSelect.Item\032\276" +
       "\001\n\004Item\022L\n\004info\030\001 \001(\0132>.google.cloud.dia" +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "ow.v2beta1.Intent.Message.Image\032/\n\016Selec" +
       "tItemInfo\022\013\n\003key\030\001 \001(\t\022\020\n\010synonyms\030\002 \003(\t" +
       "\"\213\001\n\010Platform\022\030\n\024PLATFORM_UNSPECIFIED\020\000\022" +
-      "\014\n\010FACEBOOK\020\001\022\t\n\005SLACK\020\002\022\014\n\010TELEGRAM\020\003\022\007" +
+      "\014\n\010FACEBOOK\020\001\022\t\n\005SLACK\020\002\022\014\n\010TELEGRAM\020\003\022\007",
       "\n\003KIK\020\004\022\t\n\005SKYPE\020\005\022\010\n\004LINE\020\006\022\t\n\005VIBER\020\007\022" +
       "\025\n\021ACTIONS_ON_GOOGLE\020\010B\t\n\007message\032W\n\022Fol" +
       "lowupIntentInfo\022\034\n\024followup_intent_name\030" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       "WEBHOOK_STATE_ENABLED_FOR_SLOT_FILLING\020\002" +
       "\"\244\001\n\022ListIntentsRequest\022\016\n\006parent\030\001 \001(\t\022" +
       "\025\n\rlanguage_code\030\002 \001(\t\022@\n\013intent_view\030\003 " +
-      "\001(\0162+.google.cloud.dialogflow.v2beta1.In" +
+      "\001(\0162+.google.cloud.dialogflow.v2beta1.In",
       "tentView\022\021\n\tpage_size\030\004 \001(\005\022\022\n\npage_toke" +
       "n\030\005 \001(\t\"h\n\023ListIntentsResponse\0228\n\007intent" +
       "s\030\001 \003(\0132\'.google.cloud.dialogflow.v2beta" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       ".cloud.dialogflow.v2beta1.IntentView\"\267\001\n" +
       "\023CreateIntentRequest\022\016\n\006parent\030\001 \001(\t\0227\n\006" +
       "intent\030\002 \001(\0132\'.google.cloud.dialogflow.v" +
-      "2beta1.Intent\022\025\n\rlanguage_code\030\003 \001(\t\022@\n\013" +
+      "2beta1.Intent\022\025\n\rlanguage_code\030\003 \001(\t\022@\n\013",
       "intent_view\030\004 \001(\0162+.google.cloud.dialogf" +
       "low.v2beta1.IntentView\"\330\001\n\023UpdateIntentR" +
       "equest\0227\n\006intent\030\001 \001(\0132\'.google.cloud.di" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "oogle.cloud.dialogflow.v2beta1.IntentVie" +
       "w\"#\n\023DeleteIntentRequest\022\014\n\004name\030\001 \001(\t\"\256" +
       "\002\n\031BatchUpdateIntentsRequest\022\016\n\006parent\030\001" +
-      " \001(\t\022\032\n\020intent_batch_uri\030\002 \001(\tH\000\022K\n\023inte" +
+      " \001(\t\022\032\n\020intent_batch_uri\030\002 \001(\tH\000\022K\n\023inte",
       "nt_batch_inline\030\003 \001(\0132,.google.cloud.dia" +
       "logflow.v2beta1.IntentBatchH\000\022\025\n\rlanguag" +
       "e_code\030\004 \001(\t\022/\n\013update_mask\030\005 \001(\0132\032.goog" +
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "tentsResponse\0228\n\007intents\030\001 \003(\0132\'.google." +
       "cloud.dialogflow.v2beta1.Intent\"e\n\031Batch" +
       "DeleteIntentsRequest\022\016\n\006parent\030\001 \001(\t\0228\n\007" +
-      "intents\030\002 \003(\0132\'.google.cloud.dialogflow." +
+      "intents\030\002 \003(\0132\'.google.cloud.dialogflow.",
       "v2beta1.Intent\"G\n\013IntentBatch\0228\n\007intents" +
       "\030\001 \003(\0132\'.google.cloud.dialogflow.v2beta1" +
       ".Intent*?\n\nIntentView\022\033\n\027INTENT_VIEW_UNS" +
@@ -352,7 +352,7 @@ public static void registerAllExtensions(
       "le.cloud.dialogflow.v2beta1.ListIntentsR" +
       "esponse\"2\202\323\344\223\002,\022*/v2beta1/{parent=projec" +
       "ts/*/agent}/intents\022\233\001\n\tGetIntent\0221.goog" +
-      "le.cloud.dialogflow.v2beta1.GetIntentReq" +
+      "le.cloud.dialogflow.v2beta1.GetIntentReq",
       "uest\032\'.google.cloud.dialogflow.v2beta1.I" +
       "ntent\"2\202\323\344\223\002,\022*/v2beta1/{name=projects/*" +
       "/agent/intents/*}\022\251\001\n\014CreateIntent\0224.goo" +
@@ -362,7 +362,7 @@ public static void registerAllExtensions(
       "ects/*/agent}/intents:\006intent\022\260\001\n\014Update" +
       "Intent\0224.google.cloud.dialogflow.v2beta1" +
       ".UpdateIntentRequest\032\'.google.cloud.dial" +
-      "ogflow.v2beta1.Intent\"A\202\323\344\223\002;21/v2beta1/" +
+      "ogflow.v2beta1.Intent\"A\202\323\344\223\002;21/v2beta1/",
       "{intent.name=projects/*/agent/intents/*}" +
       ":\006intent\022\220\001\n\014DeleteIntent\0224.google.cloud" +
       ".dialogflow.v2beta1.DeleteIntentRequest\032" +
@@ -372,7 +372,7 @@ public static void registerAllExtensions(
       "flow.v2beta1.BatchUpdateIntentsRequest\032\035" +
       ".google.longrunning.Operation\"A\202\323\344\223\002;\"6/" +
       "v2beta1/{parent=projects/*/agent}/intent" +
-      "s:batchUpdate:\001*\022\262\001\n\022BatchDeleteIntents\022" +
+      "s:batchUpdate:\001*\022\262\001\n\022BatchDeleteIntents\022",
       ":.google.cloud.dialogflow.v2beta1.BatchD" +
       "eleteIntentsRequest\032\035.google.longrunning" +
       ".Operation\"A\202\323\344\223\002;\"6/v2beta1/{parent=pro" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsRequest.java
index 2858ba3a4919..87d232ca4c27 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsRequest.java
@@ -35,9 +35,6 @@ private ListContextsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -806,7 +803,7 @@ public ListContextsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListContextsRequest(input, extensionRegistry);
+        return new ListContextsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsResponse.java
index 8eb1ddb2a8ac..55b135eb2dce 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListContextsResponse.java
@@ -34,9 +34,6 @@ private ListContextsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public ListContextsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListContextsResponse(input, extensionRegistry);
+        return new ListContextsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesRequest.java
index c8a436ba5381..5b1e08abb28e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesRequest.java
@@ -36,9 +36,6 @@ private ListEntityTypesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -954,7 +951,7 @@ public ListEntityTypesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListEntityTypesRequest(input, extensionRegistry);
+        return new ListEntityTypesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesResponse.java
index 1e94fbd19db6..5da302edb917 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListEntityTypesResponse.java
@@ -34,9 +34,6 @@ private ListEntityTypesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public ListEntityTypesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListEntityTypesResponse(input, extensionRegistry);
+        return new ListEntityTypesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java
index 3ee34ee09cd6..a5c3ddd96966 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsRequest.java
@@ -37,9 +37,6 @@ private ListIntentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1065,7 +1062,7 @@ public ListIntentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListIntentsRequest(input, extensionRegistry);
+        return new ListIntentsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsResponse.java
index e9575b2194ce..56906c7810dc 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListIntentsResponse.java
@@ -34,9 +34,6 @@ private ListIntentsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public ListIntentsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListIntentsResponse(input, extensionRegistry);
+        return new ListIntentsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesRequest.java
index 253bd49a1e67..2454623392a3 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesRequest.java
@@ -35,9 +35,6 @@ private ListSessionEntityTypesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -806,7 +803,7 @@ public ListSessionEntityTypesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSessionEntityTypesRequest(input, extensionRegistry);
+        return new ListSessionEntityTypesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesResponse.java
index 1cd43fe82840..64290ad11413 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ListSessionEntityTypesResponse.java
@@ -34,9 +34,6 @@ private ListSessionEntityTypesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public ListSessionEntityTypesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSessionEntityTypesResponse(input, extensionRegistry);
+        return new ListSessionEntityTypesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OriginalDetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OriginalDetectIntentRequest.java
index 940b6ef5d2d6..f7488167fb82 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OriginalDetectIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OriginalDetectIntentRequest.java
@@ -34,9 +34,6 @@ private OriginalDetectIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -781,7 +778,7 @@ public OriginalDetectIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OriginalDetectIntentRequest(input, extensionRegistry);
+        return new OriginalDetectIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ProjectAgentName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ProjectAgentName.java
index 1aebfb2faea4..6cf42a2aa08c 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ProjectAgentName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ProjectAgentName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectAgentName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ProjectName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ProjectName.java
index bfadd4e198eb..6031d9bdb34d 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java
index 29e7d40b122b..e926d0064014 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java
@@ -36,9 +36,6 @@ private QueryInput(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1208,7 +1205,7 @@ public QueryInput parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryInput(input, extensionRegistry);
+        return new QueryInput(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParameters.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParameters.java
index f0a8e0164c14..e16fdb4d5e37 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParameters.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryParameters.java
@@ -36,9 +36,6 @@ private QueryParameters(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2045,7 +2042,7 @@ public QueryParameters parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryParameters(input, extensionRegistry);
+        return new QueryParameters(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java
index ba508db57eb1..2f6bd364e245 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryResult.java
@@ -42,9 +42,6 @@ private QueryResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3399,7 +3396,7 @@ public QueryResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryResult(input, extensionRegistry);
+        return new QueryResult(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/RestoreAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/RestoreAgentRequest.java
index ed50e07975c4..17b315ac2593 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/RestoreAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/RestoreAgentRequest.java
@@ -33,9 +33,6 @@ private RestoreAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -930,7 +927,7 @@ public RestoreAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RestoreAgentRequest(input, extensionRegistry);
+        return new RestoreAgentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsRequest.java
index 73262cd7359b..fb2b535a3939 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsRequest.java
@@ -35,9 +35,6 @@ private SearchAgentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -771,7 +768,7 @@ public SearchAgentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SearchAgentsRequest(input, extensionRegistry);
+        return new SearchAgentsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsResponse.java
index 6b02e4236b44..b79294508fc5 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SearchAgentsResponse.java
@@ -34,9 +34,6 @@ private SearchAgentsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public SearchAgentsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SearchAgentsResponse(input, extensionRegistry);
+        return new SearchAgentsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityType.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityType.java
index 5f15ccf1f5dc..35143568f385 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityType.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityType.java
@@ -39,9 +39,6 @@ private SessionEntityType(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1323,7 +1320,7 @@ public SessionEntityType parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SessionEntityType(input, extensionRegistry);
+        return new SessionEntityType(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeName.java
index ffcb67bb6800..b5364d06f2ac 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("SessionEntityTypeName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "session", session, "entity_type", entityType);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeProto.java
index 040f77fe39d0..275d8de5c437 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeProto.java
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "\021SessionEntityType\022\014\n\004name\030\001 \001(\t\022c\n\024enti" +
       "ty_override_mode\030\002 \001(\0162E.google.cloud.di" +
       "alogflow.v2beta1.SessionEntityType.Entit" +
-      "yOverrideMode\022D\n\010entities\030\003 \003(\01322.google" +
+      "yOverrideMode\022D\n\010entities\030\003 \003(\01322.google",
       ".cloud.dialogflow.v2beta1.EntityType.Ent" +
       "ity\"\202\001\n\022EntityOverrideMode\022$\n ENTITY_OVE" +
       "RRIDE_MODE_UNSPECIFIED\020\000\022!\n\035ENTITY_OVERR" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       " \001(\005\022\022\n\npage_token\030\003 \001(\t\"\213\001\n\036ListSession" +
       "EntityTypesResponse\022P\n\024session_entity_ty" +
       "pes\030\001 \003(\01322.google.cloud.dialogflow.v2be" +
-      "ta1.SessionEntityType\022\027\n\017next_page_token" +
+      "ta1.SessionEntityType\022\027\n\017next_page_token",
       "\030\002 \001(\t\"+\n\033GetSessionEntityTypeRequest\022\014\n" +
       "\004name\030\001 \001(\t\"\201\001\n\036CreateSessionEntityTypeR" +
       "equest\022\016\n\006parent\030\001 \001(\t\022O\n\023session_entity" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "e\030\001 \001(\01322.google.cloud.dialogflow.v2beta" +
       "1.SessionEntityType\022/\n\013update_mask\030\002 \001(\013" +
       "2\032.google.protobuf.FieldMask\".\n\036DeleteSe" +
-      "ssionEntityTypeRequest\022\014\n\004name\030\001 \001(\t2\313\014\n" +
+      "ssionEntityTypeRequest\022\014\n\004name\030\001 \001(\t2\313\014\n",
       "\022SessionEntityTypes\022\262\002\n\026ListSessionEntit" +
       "yTypes\022>.google.cloud.dialogflow.v2beta1" +
       ".ListSessionEntityTypesRequest\032?.google." +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "ypesZR\022P/v2beta1/{parent=projects/*/agen" +
       "t/environments/*/users/*/sessions/*}/ent" +
       "ityTypes\022\241\002\n\024GetSessionEntityType\022<.goog" +
-      "le.cloud.dialogflow.v2beta1.GetSessionEn" +
+      "le.cloud.dialogflow.v2beta1.GetSessionEn",
       "tityTypeRequest\0322.google.cloud.dialogflo" +
       "w.v2beta1.SessionEntityType\"\226\001\202\323\344\223\002\217\001\0229/" +
       "v2beta1/{name=projects/*/agent/sessions/" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "tityType\022?.google.cloud.dialogflow.v2bet" +
       "a1.CreateSessionEntityTypeRequest\0322.goog" +
       "le.cloud.dialogflow.v2beta1.SessionEntit" +
-      "yType\"\300\001\202\323\344\223\002\271\001\"9/v2beta1/{parent=projec" +
+      "yType\"\300\001\202\323\344\223\002\271\001\"9/v2beta1/{parent=projec",
       "ts/*/agent/sessions/*}/entityTypes:\023sess" +
       "ion_entity_typeZg\"P/v2beta1/{parent=proj" +
       "ects/*/agent/environments/*/users/*/sess" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "tyTypeRequest\0322.google.cloud.dialogflow." +
       "v2beta1.SessionEntityType\"\350\001\202\323\344\223\002\341\0012M/v2" +
       "beta1/{session_entity_type.name=projects" +
-      "/*/agent/sessions/*/entityTypes/*}:\023sess" +
+      "/*/agent/sessions/*/entityTypes/*}:\023sess",
       "ion_entity_typeZ{2d/v2beta1/{session_ent" +
       "ity_type.name=projects/*/agent/environme" +
       "nts/*/users/*/sessions/*/entityTypes/*}:" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "le.protobuf.Empty\"\226\001\202\323\344\223\002\217\001*9/v2beta1/{n" +
       "ame=projects/*/agent/sessions/*/entityTy" +
       "pes/*}ZR*P/v2beta1/{name=projects/*/agen" +
-      "t/environments/*/users/*/sessions/*/enti" +
+      "t/environments/*/users/*/sessions/*/enti",
       "tyTypes/*}B\264\001\n#com.google.cloud.dialogfl" +
       "ow.v2beta1B\026SessionEntityTypeProtoP\001ZIgo" +
       "ogle.golang.org/genproto/googleapis/clou" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionName.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionName.java
index 3a8624fb6398..cb5065b8ad21 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionName.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("SessionName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "session", session);
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionProto.java
index ecc37a3f3691..205886aa222e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionProto.java
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "sion_entity_type.proto\032\034google/protobuf/" +
       "struct.proto\032\027google/rpc/status.proto\032\030g" +
       "oogle/type/latlng.proto\"\305\001\n\023DetectIntent" +
-      "Request\022\017\n\007session\030\001 \001(\t\022F\n\014query_params" +
+      "Request\022\017\n\007session\030\001 \001(\t\022F\n\014query_params",
       "\030\002 \001(\01320.google.cloud.dialogflow.v2beta1" +
       ".QueryParameters\022@\n\013query_input\030\003 \001(\0132+." +
       "google.cloud.dialogflow.v2beta1.QueryInp" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "beta1.QueryResult\022*\n\016webhook_status\030\003 \001(" +
       "\0132\022.google.rpc.Status\"\237\002\n\017QueryParameter" +
       "s\022\021\n\ttime_zone\030\001 \001(\t\022)\n\014geo_location\030\002 \001" +
-      "(\0132\023.google.type.LatLng\022:\n\010contexts\030\003 \003(" +
+      "(\0132\023.google.type.LatLng\022:\n\010contexts\030\003 \003(",
       "\0132(.google.cloud.dialogflow.v2beta1.Cont" +
       "ext\022\026\n\016reset_contexts\030\004 \001(\010\022P\n\024session_e" +
       "ntity_types\030\005 \003(\01322.google.cloud.dialogf" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "oud.dialogflow.v2beta1.InputAudioConfigH" +
       "\000\022:\n\004text\030\002 \001(\0132*.google.cloud.dialogflo" +
       "w.v2beta1.TextInputH\000\022<\n\005event\030\003 \001(\0132+.g" +
-      "oogle.cloud.dialogflow.v2beta1.EventInpu" +
+      "oogle.cloud.dialogflow.v2beta1.EventInpu",
       "tH\000B\007\n\005input\"\307\004\n\013QueryResult\022\022\n\nquery_te" +
       "xt\030\001 \001(\t\022\025\n\rlanguage_code\030\017 \001(\t\022%\n\035speec" +
       "h_recognition_confidence\030\002 \001(\002\022\016\n\006action" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "lfillment_messages\030\007 \003(\0132/.google.cloud." +
       "dialogflow.v2beta1.Intent.Message\022\026\n\016web" +
       "hook_source\030\010 \001(\t\0220\n\017webhook_payload\030\t \001" +
-      "(\0132\027.google.protobuf.Struct\022A\n\017output_co" +
+      "(\0132\027.google.protobuf.Struct\022A\n\017output_co",
       "ntexts\030\n \003(\0132(.google.cloud.dialogflow.v" +
       "2beta1.Context\0227\n\006intent\030\013 \001(\0132\'.google." +
       "cloud.dialogflow.v2beta1.Intent\022#\n\033inten" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "on\030\001 \001(\t\022F\n\014query_params\030\002 \001(\01320.google." +
       "cloud.dialogflow.v2beta1.QueryParameters" +
       "\022@\n\013query_input\030\003 \001(\0132+.google.cloud.dia" +
-      "logflow.v2beta1.QueryInput\022\030\n\020single_utt" +
+      "logflow.v2beta1.QueryInput\022\030\n\020single_utt",
       "erance\030\004 \001(\010\022\023\n\013input_audio\030\006 \001(\014\"\375\001\n\035St" +
       "reamingDetectIntentResponse\022\023\n\013response_" +
       "id\030\001 \001(\t\022W\n\022recognition_result\030\002 \001(\0132;.g" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "esult\022*\n\016webhook_status\030\004 \001(\0132\022.google.r" +
       "pc.Status\"\217\002\n\032StreamingRecognitionResult" +
       "\022]\n\014message_type\030\001 \001(\0162G.google.cloud.di" +
-      "alogflow.v2beta1.StreamingRecognitionRes" +
+      "alogflow.v2beta1.StreamingRecognitionRes",
       "ult.MessageType\022\022\n\ntranscript\030\002 \001(\t\022\020\n\010i" +
       "s_final\030\003 \001(\010\022\022\n\nconfidence\030\004 \001(\002\"X\n\013Mes" +
       "sageType\022\034\n\030MESSAGE_TYPE_UNSPECIFIED\020\000\022\016" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "a1.AudioEncoding\022\031\n\021sample_rate_hertz\030\002 " +
       "\001(\005\022\025\n\rlanguage_code\030\003 \001(\t\022\024\n\014phrase_hin" +
       "ts\030\004 \003(\t\"0\n\tTextInput\022\014\n\004text\030\001 \001(\t\022\025\n\rl" +
-      "anguage_code\030\002 \001(\t\"^\n\nEventInput\022\014\n\004name" +
+      "anguage_code\030\002 \001(\t\"^\n\nEventInput\022\014\n\004name",
       "\030\001 \001(\t\022+\n\nparameters\030\002 \001(\0132\027.google.prot" +
       "obuf.Struct\022\025\n\rlanguage_code\030\003 \001(\t*\373\001\n\rA" +
       "udioEncoding\022\036\n\032AUDIO_ENCODING_UNSPECIFI" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "NCODING_AMR_WB\020\005\022\033\n\027AUDIO_ENCODING_OGG_O" +
       "PUS\020\006\022)\n%AUDIO_ENCODING_SPEEX_WITH_HEADE" +
       "R_BYTE\020\0072\310\003\n\010Sessions\022\236\002\n\014DetectIntent\0224" +
-      ".google.cloud.dialogflow.v2beta1.DetectI" +
+      ".google.cloud.dialogflow.v2beta1.DetectI",
       "ntentRequest\0325.google.cloud.dialogflow.v" +
       "2beta1.DetectIntentResponse\"\240\001\202\323\344\223\002\231\001\";/" +
       "v2beta1/{session=projects/*/agent/sessio" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "mingDetectIntent\022=.google.cloud.dialogfl" +
       "ow.v2beta1.StreamingDetectIntentRequest\032" +
       ">.google.cloud.dialogflow.v2beta1.Stream" +
-      "ingDetectIntentResponse(\0010\001B\252\001\n#com.goog" +
+      "ingDetectIntentResponse(\0010\001B\252\001\n#com.goog",
       "le.cloud.dialogflow.v2beta1B\014SessionProt" +
       "oP\001ZIgoogle.golang.org/genproto/googleap" +
       "is/cloud/dialogflow/v2beta1;dialogflow\370\001" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java
index 865b176c5fe9..dcb4195d5ada 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java
@@ -42,9 +42,6 @@ private StreamingDetectIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1309,7 +1306,7 @@ public StreamingDetectIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingDetectIntentRequest(input, extensionRegistry);
+        return new StreamingDetectIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentResponse.java
index afa9054dde97..c0603315fe5b 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentResponse.java
@@ -41,9 +41,6 @@ private StreamingDetectIntentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1241,7 +1238,7 @@ public StreamingDetectIntentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingDetectIntentResponse(input, extensionRegistry);
+        return new StreamingDetectIntentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java
index 928cdf935eac..c0ac5a76866c 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingRecognitionResult.java
@@ -55,9 +55,6 @@ private StreamingRecognitionResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1022,7 +1019,7 @@ public StreamingRecognitionResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognitionResult(input, extensionRegistry);
+        return new StreamingRecognitionResult(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextInput.java
index 074b6eb8ead6..dcb34bc01546 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextInput.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TextInput.java
@@ -34,9 +34,6 @@ private TextInput(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -714,7 +711,7 @@ public TextInput parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextInput(input, extensionRegistry);
+        return new TextInput(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TrainAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TrainAgentRequest.java
index 899aee42caea..a822ebb2e085 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TrainAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/TrainAgentRequest.java
@@ -33,9 +33,6 @@ private TrainAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public TrainAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TrainAgentRequest(input, extensionRegistry);
+        return new TrainAgentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateContextRequest.java
index 2e9f2687c2c8..0f1050633cb7 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateContextRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateContextRequest.java
@@ -32,9 +32,6 @@ private UpdateContextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -834,7 +831,7 @@ public UpdateContextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateContextRequest(input, extensionRegistry);
+        return new UpdateContextRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEntityTypeRequest.java
index 9d3011bb946a..dee4a6016379 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateEntityTypeRequest.java
@@ -33,9 +33,6 @@ private UpdateEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1029,7 +1026,7 @@ public UpdateEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateEntityTypeRequest(input, extensionRegistry);
+        return new UpdateEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java
index 446ddcd2e4fa..e492f6f85f6b 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java
@@ -34,9 +34,6 @@ private UpdateIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1140,7 +1137,7 @@ public UpdateIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateIntentRequest(input, extensionRegistry);
+        return new UpdateIntentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java
index 4ab91ac3e97d..29c355af5483 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java
@@ -32,9 +32,6 @@ private UpdateSessionEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -918,7 +915,7 @@ public UpdateSessionEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateSessionEntityTypeRequest(input, extensionRegistry);
+        return new UpdateSessionEntityTypeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookProto.java
index 37563a7ad253..429a5f22c886 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "sion.proto\032\034google/protobuf/struct.proto" +
       "\"\340\001\n\016WebhookRequest\022\017\n\007session\030\004 \001(\t\022\023\n\013" +
       "response_id\030\001 \001(\t\022B\n\014query_result\030\002 \001(\0132" +
-      ",.google.cloud.dialogflow.v2beta1.QueryR" +
+      ",.google.cloud.dialogflow.v2beta1.QueryR",
       "esult\022d\n\036original_detect_intent_request\030" +
       "\003 \001(\0132<.google.cloud.dialogflow.v2beta1." +
       "OriginalDetectIntentRequest\"\302\002\n\017WebhookR" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "ce\030\003 \001(\t\022(\n\007payload\030\004 \001(\0132\027.google.proto" +
       "buf.Struct\022A\n\017output_contexts\030\005 \003(\0132(.go" +
       "ogle.cloud.dialogflow.v2beta1.Context\022I\n" +
-      "\024followup_event_input\030\006 \001(\0132+.google.clo" +
+      "\024followup_event_input\030\006 \001(\0132+.google.clo",
       "ud.dialogflow.v2beta1.EventInput\"W\n\033Orig" +
       "inalDetectIntentRequest\022\016\n\006source\030\001 \001(\t\022" +
       "(\n\007payload\030\003 \001(\0132\027.google.protobuf.Struc" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookRequest.java
index 3417425b879e..4ef6bb7becc6 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookRequest.java
@@ -34,9 +34,6 @@ private WebhookRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1189,7 +1186,7 @@ public WebhookRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebhookRequest(input, extensionRegistry);
+        return new WebhookRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookResponse.java
index c94087813bde..f31a4c3eafe3 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/WebhookResponse.java
@@ -36,9 +36,6 @@ private WebhookResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2336,7 +2333,7 @@ public WebhookResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebhookResponse(input, extensionRegistry);
+        return new WebhookResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Action.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Action.java
index f050d50fb8e5..d6ab38f3efe9 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Action.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Action.java
@@ -32,9 +32,6 @@ private Action(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -168,9 +165,6 @@ private SaveFindings(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -696,7 +690,7 @@ public SaveFindings parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SaveFindings(input, extensionRegistry);
+          return new SaveFindings(input, extensionRegistry);
       }
     };
 
@@ -774,9 +768,6 @@ private PublishToPubSub(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1294,7 +1285,7 @@ public PublishToPubSub parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PublishToPubSub(input, extensionRegistry);
+          return new PublishToPubSub(input, extensionRegistry);
       }
     };
 
@@ -1355,9 +1346,6 @@ private PublishSummaryToCscc(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -1707,7 +1695,7 @@ public PublishSummaryToCscc parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PublishSummaryToCscc(input, extensionRegistry);
+          return new PublishSummaryToCscc(input, extensionRegistry);
       }
     };
 
@@ -2807,7 +2795,7 @@ public Action parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Action(input, extensionRegistry);
+        return new Action(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/AnalyzeDataSourceRiskDetails.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/AnalyzeDataSourceRiskDetails.java
index 0d99f490cca9..4d3aa7e60f1b 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/AnalyzeDataSourceRiskDetails.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/AnalyzeDataSourceRiskDetails.java
@@ -32,9 +32,6 @@ private AnalyzeDataSourceRiskDetails(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -306,9 +303,6 @@ private NumericalStatsResult(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1570,7 +1564,7 @@ public NumericalStatsResult parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new NumericalStatsResult(input, extensionRegistry);
+          return new NumericalStatsResult(input, extensionRegistry);
       }
     };
 
@@ -1667,9 +1661,6 @@ private CategoricalStatsResult(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1843,9 +1834,6 @@ private CategoricalStatsHistogramBucket(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2941,7 +2929,7 @@ public CategoricalStatsHistogramBucket parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CategoricalStatsHistogramBucket(input, extensionRegistry);
+            return new CategoricalStatsHistogramBucket(input, extensionRegistry);
         }
       };
 
@@ -3683,7 +3671,7 @@ public CategoricalStatsResult parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CategoricalStatsResult(input, extensionRegistry);
+          return new CategoricalStatsResult(input, extensionRegistry);
       }
     };
 
@@ -3780,9 +3768,6 @@ private KAnonymityResult(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3936,9 +3921,6 @@ private KAnonymityEquivalenceClass(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4843,7 +4825,7 @@ public KAnonymityEquivalenceClass parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new KAnonymityEquivalenceClass(input, extensionRegistry);
+            return new KAnonymityEquivalenceClass(input, extensionRegistry);
         }
       };
 
@@ -4981,9 +4963,6 @@ private KAnonymityHistogramBucket(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6079,7 +6058,7 @@ public KAnonymityHistogramBucket parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new KAnonymityHistogramBucket(input, extensionRegistry);
+            return new KAnonymityHistogramBucket(input, extensionRegistry);
         }
       };
 
@@ -6821,7 +6800,7 @@ public KAnonymityResult parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new KAnonymityResult(input, extensionRegistry);
+          return new KAnonymityResult(input, extensionRegistry);
       }
     };
 
@@ -6918,9 +6897,6 @@ private LDiversityResult(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7123,9 +7099,6 @@ private LDiversityEquivalenceClass(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8511,7 +8484,7 @@ public LDiversityEquivalenceClass parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new LDiversityEquivalenceClass(input, extensionRegistry);
+            return new LDiversityEquivalenceClass(input, extensionRegistry);
         }
       };
 
@@ -8651,9 +8624,6 @@ private LDiversityHistogramBucket(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -9757,7 +9727,7 @@ public LDiversityHistogramBucket parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new LDiversityHistogramBucket(input, extensionRegistry);
+            return new LDiversityHistogramBucket(input, extensionRegistry);
         }
       };
 
@@ -10499,7 +10469,7 @@ public LDiversityResult parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new LDiversityResult(input, extensionRegistry);
+          return new LDiversityResult(input, extensionRegistry);
       }
     };
 
@@ -10632,9 +10602,6 @@ private KMapEstimationResult(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -10777,9 +10744,6 @@ private KMapEstimationQuasiIdValues(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -11634,7 +11598,7 @@ public KMapEstimationQuasiIdValues parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new KMapEstimationQuasiIdValues(input, extensionRegistry);
+            return new KMapEstimationQuasiIdValues(input, extensionRegistry);
         }
       };
 
@@ -11783,9 +11747,6 @@ private KMapEstimationHistogramBucket(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12892,7 +12853,7 @@ public KMapEstimationHistogramBucket parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new KMapEstimationHistogramBucket(input, extensionRegistry);
+            return new KMapEstimationHistogramBucket(input, extensionRegistry);
         }
       };
 
@@ -13796,7 +13757,7 @@ public KMapEstimationResult parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new KMapEstimationResult(input, extensionRegistry);
+          return new KMapEstimationResult(input, extensionRegistry);
       }
     };
 
@@ -15564,7 +15525,7 @@ public AnalyzeDataSourceRiskDetails parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeDataSourceRiskDetails(input, extensionRegistry);
+        return new AnalyzeDataSourceRiskDetails(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryKey.java
index efa4ba50a694..720d218e048b 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryKey.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryKey.java
@@ -33,9 +33,6 @@ private BigQueryKey(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -684,7 +681,7 @@ public BigQueryKey parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BigQueryKey(input, extensionRegistry);
+        return new BigQueryKey(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptions.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptions.java
index f736f8eb78bb..1b09579425c6 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptions.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptions.java
@@ -35,9 +35,6 @@ private BigQueryOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1363,7 +1360,7 @@ public BigQueryOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BigQueryOptions(input, extensionRegistry);
+        return new BigQueryOptions(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryTable.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryTable.java
index 6dce2b5159c5..3b8fb263e702 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryTable.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryTable.java
@@ -39,9 +39,6 @@ private BigQueryTable(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -856,7 +853,7 @@ public BigQueryTable parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BigQueryTable(input, extensionRegistry);
+        return new BigQueryTable(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BoundingBox.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BoundingBox.java
index 92636ae03245..bd23c5cd52d4 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BoundingBox.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BoundingBox.java
@@ -36,9 +36,6 @@ private BoundingBox(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -672,7 +669,7 @@ public BoundingBox parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BoundingBox(input, extensionRegistry);
+        return new BoundingBox(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BucketingConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BucketingConfig.java
index bb4015cd4b68..0386445905a1 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BucketingConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BucketingConfig.java
@@ -40,9 +40,6 @@ private BucketingConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -211,9 +208,6 @@ private Bucket(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1266,7 +1260,7 @@ public Bucket parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Bucket(input, extensionRegistry);
+          return new Bucket(input, extensionRegistry);
       }
     };
 
@@ -2015,7 +2009,7 @@ public BucketingConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BucketingConfig(input, extensionRegistry);
+        return new BucketingConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ByteContentItem.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ByteContentItem.java
index ac8b6044e227..9117e9b35f67 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ByteContentItem.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ByteContentItem.java
@@ -34,9 +34,6 @@ private ByteContentItem(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -707,7 +704,7 @@ public ByteContentItem parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ByteContentItem(input, extensionRegistry);
+        return new ByteContentItem(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CancelDlpJobRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CancelDlpJobRequest.java
index 3515151e80bc..a8f0f163b0b1 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CancelDlpJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CancelDlpJobRequest.java
@@ -33,9 +33,6 @@ private CancelDlpJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -531,7 +528,7 @@ public CancelDlpJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CancelDlpJobRequest(input, extensionRegistry);
+        return new CancelDlpJobRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharacterMaskConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharacterMaskConfig.java
index 4cfde45042a3..070f77e6733b 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharacterMaskConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharacterMaskConfig.java
@@ -41,9 +41,6 @@ private CharacterMaskConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1217,7 +1214,7 @@ public CharacterMaskConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CharacterMaskConfig(input, extensionRegistry);
+        return new CharacterMaskConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharsToIgnore.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharsToIgnore.java
index cd8901edb08a..26c074fe655d 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharsToIgnore.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharsToIgnore.java
@@ -33,9 +33,6 @@ private CharsToIgnore(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -879,7 +876,7 @@ public CharsToIgnore parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CharsToIgnore(input, extensionRegistry);
+        return new CharsToIgnore(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptions.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptions.java
index 9f911bc1426b..471bfd525af1 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptions.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptions.java
@@ -37,9 +37,6 @@ private CloudStorageOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -322,9 +319,6 @@ private FileSet(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -827,7 +821,7 @@ public FileSet parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FileSet(input, extensionRegistry);
+          return new FileSet(input, extensionRegistry);
       }
     };
 
@@ -1851,7 +1845,7 @@ public CloudStorageOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CloudStorageOptions(input, extensionRegistry);
+        return new CloudStorageOptions(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStoragePath.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStoragePath.java
index cad5bded62f2..60af0172decc 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStoragePath.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStoragePath.java
@@ -33,9 +33,6 @@ private CloudStoragePath(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public CloudStoragePath parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CloudStoragePath(input, extensionRegistry);
+        return new CloudStoragePath(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Color.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Color.java
index 5ae2521c6e3c..e62d05390ad7 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Color.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Color.java
@@ -35,9 +35,6 @@ private Color(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -607,7 +604,7 @@ public Color parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Color(input, extensionRegistry);
+        return new Color(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItem.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItem.java
index d4d0a43aa8c4..9fbc9d363d8c 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItem.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItem.java
@@ -32,9 +32,6 @@ private ContentItem(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1130,7 +1127,7 @@ public ContentItem parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ContentItem(input, extensionRegistry);
+        return new ContentItem(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentLocation.java
index a431aa8a9d78..888a65acd154 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentLocation.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentLocation.java
@@ -34,9 +34,6 @@ private ContentLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1803,7 +1800,7 @@ public ContentLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ContentLocation(input, extensionRegistry);
+        return new ContentLocation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDeidentifyTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDeidentifyTemplateRequest.java
index 57b912dad49e..80eef6749387 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDeidentifyTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDeidentifyTemplateRequest.java
@@ -34,9 +34,6 @@ private CreateDeidentifyTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -943,7 +940,7 @@ public CreateDeidentifyTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDeidentifyTemplateRequest(input, extensionRegistry);
+        return new CreateDeidentifyTemplateRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDlpJobRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDlpJobRequest.java
index 08a3d33af151..e7999b5fbb9b 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDlpJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDlpJobRequest.java
@@ -36,9 +36,6 @@ private CreateDlpJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1187,7 +1184,7 @@ public CreateDlpJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDlpJobRequest(input, extensionRegistry);
+        return new CreateDlpJobRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateInspectTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateInspectTemplateRequest.java
index 05c74ccdb76c..4980fb041383 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateInspectTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateInspectTemplateRequest.java
@@ -34,9 +34,6 @@ private CreateInspectTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -943,7 +940,7 @@ public CreateInspectTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateInspectTemplateRequest(input, extensionRegistry);
+        return new CreateInspectTemplateRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateJobTriggerRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateJobTriggerRequest.java
index e42f4d72c7b7..783c8021aef2 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateJobTriggerRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateJobTriggerRequest.java
@@ -34,9 +34,6 @@ private CreateJobTriggerRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -936,7 +933,7 @@ public CreateJobTriggerRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateJobTriggerRequest(input, extensionRegistry);
+        return new CreateJobTriggerRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoHashConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoHashConfig.java
index eec9e1ab2a55..7a4a644e6791 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoHashConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoHashConfig.java
@@ -37,9 +37,6 @@ private CryptoHashConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -615,7 +612,7 @@ public CryptoHashConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CryptoHashConfig(input, extensionRegistry);
+        return new CryptoHashConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoKey.java
index ad5f9f80653c..0859fb22c9b6 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoKey.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoKey.java
@@ -36,9 +36,6 @@ private CryptoKey(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1064,7 +1061,7 @@ public CryptoKey parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CryptoKey(input, extensionRegistry);
+        return new CryptoKey(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfig.java
index 392830d79eee..ba83d211274d 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfig.java
@@ -41,9 +41,6 @@ private CryptoReplaceFfxFpeConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2137,7 +2134,7 @@ public CryptoReplaceFfxFpeConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CryptoReplaceFfxFpeConfig(input, extensionRegistry);
+        return new CryptoReplaceFfxFpeConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CustomInfoType.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CustomInfoType.java
index 5f147de9885e..7e8474c1d3dc 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CustomInfoType.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CustomInfoType.java
@@ -35,9 +35,6 @@ private CustomInfoType(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -257,9 +254,6 @@ private Dictionary(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -407,9 +401,6 @@ private WordList(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1000,7 +991,7 @@ public WordList parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new WordList(input, extensionRegistry);
+            return new WordList(input, extensionRegistry);
         }
       };
 
@@ -1890,7 +1881,7 @@ public Dictionary parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Dictionary(input, extensionRegistry);
+          return new Dictionary(input, extensionRegistry);
       }
     };
 
@@ -1961,9 +1952,6 @@ private Regex(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2459,7 +2447,7 @@ public Regex parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Regex(input, extensionRegistry);
+          return new Regex(input, extensionRegistry);
       }
     };
 
@@ -2518,9 +2506,6 @@ private SurrogateType(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -2868,7 +2853,7 @@ public SurrogateType parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SurrogateType(input, extensionRegistry);
+          return new SurrogateType(input, extensionRegistry);
       }
     };
 
@@ -2949,9 +2934,6 @@ private DetectionRule(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3062,9 +3044,6 @@ private Proximity(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3553,7 +3532,7 @@ public Proximity parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Proximity(input, extensionRegistry);
+            return new Proximity(input, extensionRegistry);
         }
       };
 
@@ -3641,9 +3620,6 @@ private LikelihoodAdjustment(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4303,7 +4279,7 @@ public LikelihoodAdjustment parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new LikelihoodAdjustment(input, extensionRegistry);
+            return new LikelihoodAdjustment(input, extensionRegistry);
         }
       };
 
@@ -4452,9 +4428,6 @@ private HotwordRule(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5568,7 +5541,7 @@ public HotwordRule parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new HotwordRule(input, extensionRegistry);
+            return new HotwordRule(input, extensionRegistry);
         }
       };
 
@@ -6194,7 +6167,7 @@ public DetectionRule parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectionRule(input, extensionRegistry);
+          return new DetectionRule(input, extensionRegistry);
       }
     };
 
@@ -8114,7 +8087,7 @@ public CustomInfoType parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CustomInfoType(input, extensionRegistry);
+        return new CustomInfoType(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreKey.java
index be1c703ffaad..d9375f5b8f16 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreKey.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreKey.java
@@ -32,9 +32,6 @@ private DatastoreKey(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public DatastoreKey parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DatastoreKey(input, extensionRegistry);
+        return new DatastoreKey(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreOptions.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreOptions.java
index 8eb622c8b66e..b40497e6720c 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreOptions.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreOptions.java
@@ -32,9 +32,6 @@ private DatastoreOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -846,7 +843,7 @@ public DatastoreOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DatastoreOptions(input, extensionRegistry);
+        return new DatastoreOptions(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateShiftConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateShiftConfig.java
index fc16b416fea7..79da29303de6 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateShiftConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateShiftConfig.java
@@ -35,9 +35,6 @@ private DateShiftConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1131,7 +1128,7 @@ public DateShiftConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DateShiftConfig(input, extensionRegistry);
+        return new DateShiftConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateTime.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateTime.java
index 9dc009961a00..902c1edc943f 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateTime.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateTime.java
@@ -33,9 +33,6 @@ private DateTime(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -163,9 +160,6 @@ private TimeZone(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -580,7 +574,7 @@ public TimeZone parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TimeZone(input, extensionRegistry);
+          return new TimeZone(input, extensionRegistry);
       }
     };
 
@@ -1538,7 +1532,7 @@ public DateTime parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DateTime(input, extensionRegistry);
+        return new DateTime(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyConfig.java
index 308a43349013..7316173aba3e 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyConfig.java
@@ -32,9 +32,6 @@ private DeidentifyConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -984,7 +981,7 @@ public DeidentifyConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeidentifyConfig(input, extensionRegistry);
+        return new DeidentifyConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentRequest.java
index 0b604283fc34..30df5dc65cd8 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentRequest.java
@@ -35,9 +35,6 @@ private DeidentifyContentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1632,7 +1629,7 @@ public DeidentifyContentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeidentifyContentRequest(input, extensionRegistry);
+        return new DeidentifyContentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentResponse.java
index af1b3dbc51a0..9f8e107e42a7 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentResponse.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentResponse.java
@@ -32,9 +32,6 @@ private DeidentifyContentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -834,7 +831,7 @@ public DeidentifyContentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeidentifyContentResponse(input, extensionRegistry);
+        return new DeidentifyContentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyTemplate.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyTemplate.java
index 47d7bff6a12b..eac0b722b7d2 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyTemplate.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyTemplate.java
@@ -35,9 +35,6 @@ private DeidentifyTemplate(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1549,7 +1546,7 @@ public DeidentifyTemplate parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeidentifyTemplate(input, extensionRegistry);
+        return new DeidentifyTemplate(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDeidentifyTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDeidentifyTemplateRequest.java
index ed624c3b93c0..c30192b173f3 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDeidentifyTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDeidentifyTemplateRequest.java
@@ -33,9 +33,6 @@ private DeleteDeidentifyTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public DeleteDeidentifyTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteDeidentifyTemplateRequest(input, extensionRegistry);
+        return new DeleteDeidentifyTemplateRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDlpJobRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDlpJobRequest.java
index 52dd21ea700c..94a64d67a896 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDlpJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDlpJobRequest.java
@@ -33,9 +33,6 @@ private DeleteDlpJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -531,7 +528,7 @@ public DeleteDlpJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteDlpJobRequest(input, extensionRegistry);
+        return new DeleteDlpJobRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteInspectTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteInspectTemplateRequest.java
index 39e03244ba58..3bf757981ea4 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteInspectTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteInspectTemplateRequest.java
@@ -33,9 +33,6 @@ private DeleteInspectTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public DeleteInspectTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteInspectTemplateRequest(input, extensionRegistry);
+        return new DeleteInspectTemplateRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteJobTriggerRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteJobTriggerRequest.java
index eecb04d1cf9b..332e8e5676da 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteJobTriggerRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteJobTriggerRequest.java
@@ -33,9 +33,6 @@ private DeleteJobTriggerRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteJobTriggerRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteJobTriggerRequest(input, extensionRegistry);
+        return new DeleteJobTriggerRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpJob.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpJob.java
index e0e1cb7e54ad..e6539a195bf2 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpJob.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpJob.java
@@ -37,9 +37,6 @@ private DlpJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2788,7 +2785,7 @@ public DlpJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DlpJob(input, extensionRegistry);
+        return new DlpJob(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpJobName.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpJobName.java
index 86498ec5d02b..6d3048115d82 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpJobName.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpJobName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("DlpJobName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "dlp_job", dlpJob);
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java
index 230c5e95f850..9f2b1d7668e3 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java
@@ -677,7 +677,7 @@ public static void registerAllExtensions(
       "stamp.proto\032\027google/rpc/status.proto\032\026go" +
       "ogle/type/date.proto\032\033google/type/dayofw" +
       "eek.proto\032\033google/type/timeofday.proto\"\213" +
-      "\005\n\rInspectConfig\0223\n\ninfo_types\030\001 \003(\0132\037.g" +
+      "\005\n\rInspectConfig\0223\n\ninfo_types\030\001 \003(\0132\037.g",
       "oogle.privacy.dlp.v2.InfoType\0229\n\016min_lik" +
       "elihood\030\002 \001(\0162!.google.privacy.dlp.v2.Li" +
       "kelihood\022B\n\006limits\030\003 \001(\01322.google.privac" +
@@ -687,7 +687,7 @@ public static void registerAllExtensions(
       "gle.privacy.dlp.v2.CustomInfoType\022=\n\017con" +
       "tent_options\030\010 \003(\0162$.google.privacy.dlp." +
       "v2.ContentOption\032\221\002\n\rFindingLimits\022\035\n\025ma" +
-      "x_findings_per_item\030\001 \001(\005\022 \n\030max_finding" +
+      "x_findings_per_item\030\001 \001(\005\022 \n\030max_finding",
       "s_per_request\030\002 \001(\005\022d\n\032max_findings_per_" +
       "info_type\030\003 \003(\0132@.google.privacy.dlp.v2." +
       "InspectConfig.FindingLimits.InfoTypeLimi" +
@@ -697,7 +697,7 @@ public static void registerAllExtensions(
       "\030\001 \001(\01620.google.privacy.dlp.v2.ByteConte" +
       "ntItem.BytesType\022\014\n\004data\030\002 \001(\014\"~\n\tBytesT" +
       "ype\022\032\n\026BYTES_TYPE_UNSPECIFIED\020\000\022\t\n\005IMAGE" +
-      "\020\006\022\016\n\nIMAGE_JPEG\020\001\022\r\n\tIMAGE_BMP\020\002\022\r\n\tIMA" +
+      "\020\006\022\016\n\nIMAGE_JPEG\020\001\022\r\n\tIMAGE_BMP\020\002\022\r\n\tIMA",
       "GE_PNG\020\003\022\r\n\tIMAGE_SVG\020\004\022\r\n\tTEXT_UTF8\020\005\"\227" +
       "\001\n\013ContentItem\022\017\n\005value\030\003 \001(\tH\000\022-\n\005table" +
       "\030\004 \001(\0132\034.google.privacy.dlp.v2.TableH\000\022;" +
@@ -707,7 +707,7 @@ public static void registerAllExtensions(
       ".v2.FieldId\022.\n\004rows\030\002 \003(\0132 .google.priva" +
       "cy.dlp.v2.Table.Row\0323\n\003Row\022,\n\006values\030\001 \003" +
       "(\0132\034.google.privacy.dlp.v2.Value\"]\n\rInsp" +
-      "ectResult\0220\n\010findings\030\001 \003(\0132\036.google.pri" +
+      "ectResult\0220\n\010findings\030\001 \003(\0132\036.google.pri",
       "vacy.dlp.v2.Finding\022\032\n\022findings_truncate" +
       "d\030\002 \001(\010\"\235\002\n\007Finding\022\r\n\005quote\030\001 \001(\t\0222\n\tin" +
       "fo_type\030\002 \001(\0132\037.google.privacy.dlp.v2.In" +
@@ -717,7 +717,7 @@ public static void registerAllExtensions(
       "te_time\030\006 \001(\0132\032.google.protobuf.Timestam" +
       "p\0224\n\nquote_info\030\007 \001(\0132 .google.privacy.d" +
       "lp.v2.QuoteInfo\"\266\001\n\010Location\0220\n\nbyte_ran" +
-      "ge\030\001 \001(\0132\034.google.privacy.dlp.v2.Range\0225" +
+      "ge\030\001 \001(\0132\034.google.privacy.dlp.v2.Range\0225",
       "\n\017codepoint_range\030\002 \001(\0132\034.google.privacy" +
       ".dlp.v2.Range\022A\n\021content_locations\030\007 \003(\013" +
       "2&.google.privacy.dlp.v2.ContentLocation" +
@@ -727,7 +727,7 @@ public static void registerAllExtensions(
       "location\030\003 \001(\0132$.google.privacy.dlp.v2.I" +
       "mageLocationH\000\022D\n\021document_location\030\005 \001(" +
       "\0132\'.google.privacy.dlp.v2.DocumentLocati" +
-      "onH\000\0227\n\023container_timestamp\030\006 \001(\0132\032.goog" +
+      "onH\000\0227\n\023container_timestamp\030\006 \001(\0132\032.goog",
       "le.protobuf.Timestamp\022\031\n\021container_versi" +
       "on\030\007 \001(\tB\n\n\010location\"\'\n\020DocumentLocation" +
       "\022\023\n\013file_offset\030\001 \001(\003\"\266\001\n\016RecordLocation" +
@@ -737,7 +737,7 @@ public static void registerAllExtensions(
       "on\030\003 \001(\0132$.google.privacy.dlp.v2.TableLo" +
       "cation\"\"\n\rTableLocation\022\021\n\trow_index\030\001 \001" +
       "(\003\"#\n\005Range\022\r\n\005start\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\"" +
-      "K\n\rImageLocation\022:\n\016bounding_boxes\030\001 \003(\013" +
+      "K\n\rImageLocation\022:\n\016bounding_boxes\030\001 \003(\013",
       "2\".google.privacy.dlp.v2.BoundingBox\"G\n\013" +
       "BoundingBox\022\013\n\003top\030\001 \001(\005\022\014\n\004left\030\002 \001(\005\022\r" +
       "\n\005width\030\003 \001(\005\022\016\n\006height\030\004 \001(\005\"\251\003\n\022Redact" +
@@ -747,7 +747,7 @@ public static void registerAllExtensions(
       "\003(\0132>.google.privacy.dlp.v2.RedactImageR" +
       "equest.ImageRedactionConfig\0229\n\tbyte_item" +
       "\030\007 \001(\0132&.google.privacy.dlp.v2.ByteConte" +
-      "ntItem\032\250\001\n\024ImageRedactionConfig\0224\n\tinfo_" +
+      "ntItem\032\250\001\n\024ImageRedactionConfig\0224\n\tinfo_",
       "type\030\001 \001(\0132\037.google.privacy.dlp.v2.InfoT" +
       "ypeH\000\022\031\n\017redact_all_text\030\002 \001(\010H\000\0225\n\017reda" +
       "ction_color\030\003 \001(\0132\034.google.privacy.dlp.v" +
@@ -757,7 +757,7 @@ public static void registerAllExtensions(
       "xtracted_text\030\002 \001(\t\"\237\002\n\030DeidentifyConten" +
       "tRequest\022\016\n\006parent\030\001 \001(\t\022B\n\021deidentify_c" +
       "onfig\030\002 \001(\0132\'.google.privacy.dlp.v2.Deid" +
-      "entifyConfig\022<\n\016inspect_config\030\003 \001(\0132$.g" +
+      "entifyConfig\022<\n\016inspect_config\030\003 \001(\0132$.g",
       "oogle.privacy.dlp.v2.InspectConfig\0220\n\004it" +
       "em\030\004 \001(\0132\".google.privacy.dlp.v2.Content" +
       "Item\022\035\n\025inspect_template_name\030\005 \001(\t\022 \n\030d" +
@@ -767,7 +767,7 @@ public static void registerAllExtensions(
       "w\030\002 \001(\0132-.google.privacy.dlp.v2.Transfor" +
       "mationOverview\"\237\002\n\030ReidentifyContentRequ" +
       "est\022\016\n\006parent\030\001 \001(\t\022B\n\021reidentify_config" +
-      "\030\002 \001(\0132\'.google.privacy.dlp.v2.Deidentif" +
+      "\030\002 \001(\0132\'.google.privacy.dlp.v2.Deidentif",
       "yConfig\022<\n\016inspect_config\030\003 \001(\0132$.google" +
       ".privacy.dlp.v2.InspectConfig\0220\n\004item\030\004 " +
       "\001(\0132\".google.privacy.dlp.v2.ContentItem\022" +
@@ -777,7 +777,7 @@ public static void registerAllExtensions(
       "ivacy.dlp.v2.ContentItem\022?\n\010overview\030\002 \001" +
       "(\0132-.google.privacy.dlp.v2.Transformatio" +
       "nOverview\"\266\001\n\025InspectContentRequest\022\016\n\006p" +
-      "arent\030\001 \001(\t\022<\n\016inspect_config\030\002 \001(\0132$.go" +
+      "arent\030\001 \001(\t\022<\n\016inspect_config\030\002 \001(\0132$.go",
       "ogle.privacy.dlp.v2.InspectConfig\0220\n\004ite" +
       "m\030\003 \001(\0132\".google.privacy.dlp.v2.ContentI" +
       "tem\022\035\n\025inspect_template_name\030\004 \001(\t\"N\n\026In" +
@@ -787,7 +787,7 @@ public static void registerAllExtensions(
       "le.privacy.dlp.v2.BigQueryTableH\000\022N\n\rout" +
       "put_schema\030\003 \001(\01627.google.privacy.dlp.v2" +
       ".OutputStorageConfig.OutputSchema\"\220\001\n\014Ou" +
-      "tputSchema\022\035\n\031OUTPUT_SCHEMA_UNSPECIFIED\020" +
+      "tputSchema\022\035\n\031OUTPUT_SCHEMA_UNSPECIFIED\020",
       "\000\022\021\n\rBASIC_COLUMNS\020\001\022\017\n\013GCS_COLUMNS\020\002\022\025\n" +
       "\021DATASTORE_COLUMNS\020\003\022\025\n\021BIG_QUERY_COLUMN" +
       "S\020\004\022\017\n\013ALL_COLUMNS\020\005B\006\n\004type\"R\n\rInfoType" +
@@ -797,7 +797,7 @@ public static void registerAllExtensions(
       "ns\030\002 \001(\0132@.google.privacy.dlp.v2.Inspect" +
       "DataSourceDetails.RequestedOptions\022F\n\006re" +
       "sult\030\003 \001(\01326.google.privacy.dlp.v2.Inspe" +
-      "ctDataSourceDetails.Result\032\232\001\n\020Requested" +
+      "ctDataSourceDetails.Result\032\232\001\n\020Requested",
       "Options\022I\n\031snapshot_inspect_template\030\001 \001" +
       "(\0132&.google.privacy.dlp.v2.InspectTempla" +
       "te\022;\n\njob_config\030\003 \001(\0132\'.google.privacy." +
@@ -807,7 +807,7 @@ public static void registerAllExtensions(
       "gle.privacy.dlp.v2.InfoTypeStats\"{\n\023Info" +
       "TypeDescription\022\014\n\004name\030\001 \001(\t\022\024\n\014display" +
       "_name\030\002 \001(\t\022@\n\014supported_by\030\003 \003(\0162*.goog" +
-      "le.privacy.dlp.v2.InfoTypeSupportedBy\"=\n" +
+      "le.privacy.dlp.v2.InfoTypeSupportedBy\"=\n",
       "\024ListInfoTypesRequest\022\025\n\rlanguage_code\030\001" +
       " \001(\t\022\016\n\006filter\030\002 \001(\t\"W\n\025ListInfoTypesRes" +
       "ponse\022>\n\ninfo_types\030\001 \003(\0132*.google.priva" +
@@ -817,7 +817,7 @@ public static void registerAllExtensions(
       "\014source_table\030\002 \001(\0132$.google.privacy.dlp" +
       ".v2.BigQueryTable\022.\n\007actions\030\003 \003(\0132\035.goo" +
       "gle.privacy.dlp.v2.Action\"\330\014\n\rPrivacyMet" +
-      "ric\022[\n\026numerical_stats_config\030\001 \001(\01329.go" +
+      "ric\022[\n\026numerical_stats_config\030\001 \001(\01329.go",
       "ogle.privacy.dlp.v2.PrivacyMetric.Numeri" +
       "calStatsConfigH\000\022_\n\030categorical_stats_co" +
       "nfig\030\002 \001(\0132;.google.privacy.dlp.v2.Priva" +
@@ -827,7 +827,7 @@ public static void registerAllExtensions(
       "\n\022l_diversity_config\030\004 \001(\01325.google.priv" +
       "acy.dlp.v2.PrivacyMetric.LDiversityConfi" +
       "gH\000\022\\\n\027k_map_estimation_config\030\005 \001(\01329.g" +
-      "oogle.privacy.dlp.v2.PrivacyMetric.KMapE" +
+      "oogle.privacy.dlp.v2.PrivacyMetric.KMapE",
       "stimationConfigH\000\032E\n\024NumericalStatsConfi" +
       "g\022-\n\005field\030\001 \001(\0132\036.google.privacy.dlp.v2" +
       ".FieldId\032G\n\026CategoricalStatsConfig\022-\n\005fi" +
@@ -837,7 +837,7 @@ public static void registerAllExtensions(
       "ty_id\030\002 \001(\0132\037.google.privacy.dlp.v2.Enti" +
       "tyId\032\202\001\n\020LDiversityConfig\0221\n\tquasi_ids\030\001" +
       " \003(\0132\036.google.privacy.dlp.v2.FieldId\022;\n\023" +
-      "sensitive_attribute\030\002 \001(\0132\036.google.priva" +
+      "sensitive_attribute\030\002 \001(\0132\036.google.priva",
       "cy.dlp.v2.FieldId\032\350\005\n\024KMapEstimationConf" +
       "ig\022X\n\tquasi_ids\030\001 \003(\0132E.google.privacy.d" +
       "lp.v2.PrivacyMetric.KMapEstimationConfig" +
@@ -847,7 +847,7 @@ public static void registerAllExtensions(
       "uxiliaryTable\032\273\001\n\013TaggedField\022-\n\005field\030\001" +
       " \001(\0132\036.google.privacy.dlp.v2.FieldId\0224\n\t" +
       "info_type\030\002 \001(\0132\037.google.privacy.dlp.v2." +
-      "InfoTypeH\000\022\024\n\ncustom_tag\030\003 \001(\tH\000\022*\n\010infe" +
+      "InfoTypeH\000\022\024\n\ncustom_tag\030\003 \001(\tH\000\022*\n\010infe",
       "rred\030\004 \001(\0132\026.google.protobuf.EmptyH\000B\005\n\003" +
       "tag\032\276\002\n\016AuxiliaryTable\0223\n\005table\030\003 \001(\0132$." +
       "google.privacy.dlp.v2.BigQueryTable\022h\n\tq" +
@@ -857,7 +857,7 @@ public static void registerAllExtensions(
       "ncy\030\002 \001(\0132\036.google.privacy.dlp.v2.FieldI" +
       "d\032Q\n\014QuasiIdField\022-\n\005field\030\001 \001(\0132\036.googl" +
       "e.privacy.dlp.v2.FieldId\022\022\n\ncustom_tag\030\002" +
-      " \001(\tB\006\n\004type\"\214\030\n\034AnalyzeDataSourceRiskDe" +
+      " \001(\tB\006\n\004type\"\214\030\n\034AnalyzeDataSourceRiskDe",
       "tails\022F\n\030requested_privacy_metric\030\001 \001(\0132" +
       "$.google.privacy.dlp.v2.PrivacyMetric\022D\n" +
       "\026requested_source_table\030\002 \001(\0132$.google.p" +
@@ -867,7 +867,7 @@ public static void registerAllExtensions(
       "alStatsResultH\000\022n\n\030categorical_stats_res" +
       "ult\030\004 \001(\0132J.google.privacy.dlp.v2.Analyz" +
       "eDataSourceRiskDetails.CategoricalStatsR" +
-      "esultH\000\022b\n\022k_anonymity_result\030\005 \001(\0132D.go" +
+      "esultH\000\022b\n\022k_anonymity_result\030\005 \001(\0132D.go",
       "ogle.privacy.dlp.v2.AnalyzeDataSourceRis" +
       "kDetails.KAnonymityResultH\000\022b\n\022l_diversi" +
       "ty_result\030\006 \001(\0132D.google.privacy.dlp.v2." +
@@ -877,7 +877,7 @@ public static void registerAllExtensions(
       "ceRiskDetails.KMapEstimationResultH\000\032\257\001\n" +
       "\024NumericalStatsResult\022/\n\tmin_value\030\001 \001(\013" +
       "2\034.google.privacy.dlp.v2.Value\022/\n\tmax_va" +
-      "lue\030\002 \001(\0132\034.google.privacy.dlp.v2.Value\022" +
+      "lue\030\002 \001(\0132\034.google.privacy.dlp.v2.Value\022",
       "5\n\017quantile_values\030\004 \003(\0132\034.google.privac" +
       "y.dlp.v2.Value\032\215\003\n\026CategoricalStatsResul" +
       "t\022\225\001\n!value_frequency_histogram_buckets\030" +
@@ -887,7 +887,7 @@ public static void registerAllExtensions(
       "tegoricalStatsHistogramBucket\022#\n\033value_f" +
       "requency_lower_bound\030\001 \001(\003\022#\n\033value_freq" +
       "uency_upper_bound\030\002 \001(\003\022\023\n\013bucket_size\030\003" +
-      " \001(\003\022<\n\rbucket_values\030\004 \003(\0132%.google.pri" +
+      " \001(\003\022<\n\rbucket_values\030\004 \003(\0132%.google.pri",
       "vacy.dlp.v2.ValueFrequency\022\032\n\022bucket_val" +
       "ue_count\030\005 \001(\003\032\265\004\n\020KAnonymityResult\022\213\001\n#" +
       "equivalence_class_histogram_buckets\030\005 \003(" +
@@ -897,7 +897,7 @@ public static void registerAllExtensions(
       "ceClass\0226\n\020quasi_ids_values\030\001 \003(\0132\034.goog" +
       "le.privacy.dlp.v2.Value\022\036\n\026equivalence_c" +
       "lass_size\030\002 \001(\003\032\234\002\n\031KAnonymityHistogramB" +
-      "ucket\022*\n\"equivalence_class_size_lower_bo" +
+      "ucket\022*\n\"equivalence_class_size_lower_bo",
       "und\030\001 \001(\003\022*\n\"equivalence_class_size_uppe" +
       "r_bound\030\002 \001(\003\022\023\n\013bucket_size\030\003 \001(\003\022v\n\rbu" +
       "cket_values\030\004 \003(\0132_.google.privacy.dlp.v" +
@@ -907,7 +907,7 @@ public static void registerAllExtensions(
       "ult\022\223\001\n+sensitive_value_frequency_histog" +
       "ram_buckets\030\005 \003(\0132^.google.privacy.dlp.v" +
       "2.AnalyzeDataSourceRiskDetails.LDiversit" +
-      "yResult.LDiversityHistogramBucket\032\340\001\n\032LD" +
+      "yResult.LDiversityHistogramBucket\032\340\001\n\032LD",
       "iversityEquivalenceClass\0226\n\020quasi_ids_va" +
       "lues\030\001 \003(\0132\034.google.privacy.dlp.v2.Value" +
       "\022\036\n\026equivalence_class_size\030\002 \001(\003\022%\n\035num_" +
@@ -917,7 +917,7 @@ public static void registerAllExtensions(
       "gramBucket\022-\n%sensitive_value_frequency_" +
       "lower_bound\030\001 \001(\003\022-\n%sensitive_value_fre" +
       "quency_upper_bound\030\002 \001(\003\022\023\n\013bucket_size\030" +
-      "\003 \001(\003\022v\n\rbucket_values\030\004 \003(\0132_.google.pr" +
+      "\003 \001(\003\022v\n\rbucket_values\030\004 \003(\0132_.google.pr",
       "ivacy.dlp.v2.AnalyzeDataSourceRiskDetail" +
       "s.LDiversityResult.LDiversityEquivalence" +
       "Class\022\032\n\022bucket_value_count\030\005 \001(\003\032\225\004\n\024KM" +
@@ -927,7 +927,7 @@ public static void registerAllExtensions(
       "ionResult.KMapEstimationHistogramBucket\032" +
       "r\n\033KMapEstimationQuasiIdValues\0226\n\020quasi_" +
       "ids_values\030\001 \003(\0132\034.google.privacy.dlp.v2" +
-      ".Value\022\033\n\023estimated_anonymity\030\002 \001(\003\032\373\001\n\035" +
+      ".Value\022\033\n\023estimated_anonymity\030\002 \001(\003\032\373\001\n\035",
       "KMapEstimationHistogramBucket\022\025\n\rmin_ano" +
       "nymity\030\001 \001(\003\022\025\n\rmax_anonymity\030\002 \001(\003\022\023\n\013b" +
       "ucket_size\030\005 \001(\003\022{\n\rbucket_values\030\006 \003(\0132" +
@@ -937,7 +937,7 @@ public static void registerAllExtensions(
       "unt\030\007 \001(\003B\010\n\006result\"L\n\016ValueFrequency\022+\n" +
       "\005value\030\001 \001(\0132\034.google.privacy.dlp.v2.Val" +
       "ue\022\r\n\005count\030\002 \001(\003\"\263\002\n\005Value\022\027\n\rinteger_v" +
-      "alue\030\001 \001(\003H\000\022\025\n\013float_value\030\002 \001(\001H\000\022\026\n\014s" +
+      "alue\030\001 \001(\003H\000\022\025\n\013float_value\030\002 \001(\001H\000\022\026\n\014s",
       "tring_value\030\003 \001(\tH\000\022\027\n\rboolean_value\030\004 \001" +
       "(\010H\000\0225\n\017timestamp_value\030\005 \001(\0132\032.google.p" +
       "rotobuf.TimestampH\000\022,\n\ntime_value\030\006 \001(\0132" +
@@ -947,7 +947,7 @@ public static void registerAllExtensions(
       "\006\n\004type\"Q\n\tQuoteInfo\0224\n\tdate_time\030\002 \001(\0132" +
       "\037.google.privacy.dlp.v2.DateTimeH\000B\016\n\014pa" +
       "rsed_quote\"\337\001\n\010DateTime\022\037\n\004date\030\001 \001(\0132\021." +
-      "google.type.Date\022+\n\013day_of_week\030\002 \001(\0162\026." +
+      "google.type.Date\022+\n\013day_of_week\030\002 \001(\0162\026.",
       "google.type.DayOfWeek\022$\n\004time\030\003 \001(\0132\026.go" +
       "ogle.type.TimeOfDay\022;\n\ttime_zone\030\004 \001(\0132(" +
       ".google.privacy.dlp.v2.DateTime.TimeZone" +
@@ -957,7 +957,7 @@ public static void registerAllExtensions(
       "oTypeTransformationsH\000\022N\n\026record_transfo" +
       "rmations\030\002 \001(\0132,.google.privacy.dlp.v2.R" +
       "ecordTransformationsH\000B\020\n\016transformation" +
-      "\"\234\006\n\027PrimitiveTransformation\022C\n\016replace_" +
+      "\"\234\006\n\027PrimitiveTransformation\022C\n\016replace_",
       "config\030\001 \001(\0132).google.privacy.dlp.v2.Rep" +
       "laceValueConfigH\000\022<\n\rredact_config\030\002 \001(\013" +
       "2#.google.privacy.dlp.v2.RedactConfigH\000\022" +
@@ -967,7 +967,7 @@ public static void registerAllExtensions(
       "ogle.privacy.dlp.v2.CryptoReplaceFfxFpeC" +
       "onfigH\000\022V\n\033fixed_size_bucketing_config\030\005" +
       " \001(\0132/.google.privacy.dlp.v2.FixedSizeBu" +
-      "cketingConfigH\000\022B\n\020bucketing_config\030\006 \001(" +
+      "cketingConfigH\000\022B\n\020bucketing_config\030\006 \001(",
       "\0132&.google.privacy.dlp.v2.BucketingConfi" +
       "gH\000\022Y\n\035replace_with_info_type_config\030\007 \001" +
       "(\01320.google.privacy.dlp.v2.ReplaceWithIn" +
@@ -977,7 +977,7 @@ public static void registerAllExtensions(
       "rivacy.dlp.v2.CryptoHashConfigH\000\022C\n\021date" +
       "_shift_config\030\013 \001(\0132&.google.privacy.dlp" +
       ".v2.DateShiftConfigH\000B\020\n\016transformation\"" +
-      "\334\001\n\016TimePartConfig\022G\n\017part_to_extract\030\001 " +
+      "\334\001\n\016TimePartConfig\022G\n\017part_to_extract\030\001 ",
       "\001(\0162..google.privacy.dlp.v2.TimePartConf" +
       "ig.TimePart\"\200\001\n\010TimePart\022\031\n\025TIME_PART_UN" +
       "SPECIFIED\020\000\022\010\n\004YEAR\020\001\022\t\n\005MONTH\020\002\022\020\n\014DAY_" +
@@ -987,7 +987,7 @@ public static void registerAllExtensions(
       "dlp.v2.CryptoKey\"E\n\022ReplaceValueConfig\022/" +
       "\n\tnew_value\030\001 \001(\0132\034.google.privacy.dlp.v" +
       "2.Value\"\033\n\031ReplaceWithInfoTypeConfig\"\016\n\014" +
-      "RedactConfig\"\266\002\n\rCharsToIgnore\022\034\n\022charac" +
+      "RedactConfig\"\266\002\n\rCharsToIgnore\022\034\n\022charac",
       "ters_to_skip\030\001 \001(\tH\000\022_\n\033common_character" +
       "s_to_ignore\030\002 \001(\01628.google.privacy.dlp.v" +
       "2.CharsToIgnore.CommonCharsToIgnoreH\000\"\227\001" +
@@ -997,7 +997,7 @@ public static void registerAllExtensions(
       "\n\013PUNCTUATION\020\004\022\016\n\nWHITESPACE\020\005B\014\n\nchara" +
       "cters\"\243\001\n\023CharacterMaskConfig\022\031\n\021masking" +
       "_character\030\001 \001(\t\022\026\n\016number_to_mask\030\002 \001(\005" +
-      "\022\025\n\rreverse_order\030\003 \001(\010\022B\n\024characters_to" +
+      "\022\025\n\rreverse_order\030\003 \001(\010\022B\n\024characters_to",
       "_ignore\030\004 \003(\0132$.google.privacy.dlp.v2.Ch" +
       "arsToIgnore\"\225\001\n\030FixedSizeBucketingConfig" +
       "\0221\n\013lower_bound\030\001 \001(\0132\034.google.privacy.d" +
@@ -1007,7 +1007,7 @@ public static void registerAllExtensions(
       "2-.google.privacy.dlp.v2.BucketingConfig" +
       ".Bucket\032\227\001\n\006Bucket\022)\n\003min\030\001 \001(\0132\034.google" +
       ".privacy.dlp.v2.Value\022)\n\003max\030\002 \001(\0132\034.goo" +
-      "gle.privacy.dlp.v2.Value\0227\n\021replacement_" +
+      "gle.privacy.dlp.v2.Value\0227\n\021replacement_",
       "value\030\003 \001(\0132\034.google.privacy.dlp.v2.Valu" +
       "e\"\364\003\n\031CryptoReplaceFfxFpeConfig\0224\n\ncrypt" +
       "o_key\030\001 \001(\0132 .google.privacy.dlp.v2.Cryp" +
@@ -1017,7 +1017,7 @@ public static void registerAllExtensions(
       "FpeConfig.FfxCommonNativeAlphabetH\000\022\031\n\017c" +
       "ustom_alphabet\030\005 \001(\tH\000\022\017\n\005radix\030\006 \001(\005H\000\022" +
       "<\n\023surrogate_info_type\030\010 \001(\0132\037.google.pr" +
-      "ivacy.dlp.v2.InfoType\"\224\001\n\027FfxCommonNativ" +
+      "ivacy.dlp.v2.InfoType\"\224\001\n\027FfxCommonNativ",
       "eAlphabet\022*\n&FFX_COMMON_NATIVE_ALPHABET_" +
       "UNSPECIFIED\020\000\022\013\n\007NUMERIC\020\001\022\017\n\013HEXADECIMA" +
       "L\020\002\022\034\n\030UPPER_CASE_ALPHA_NUMERIC\020\003\022\021\n\rALP" +
@@ -1027,7 +1027,7 @@ public static void registerAllExtensions(
       "\0132).google.privacy.dlp.v2.UnwrappedCrypt" +
       "oKeyH\000\022A\n\013kms_wrapped\030\003 \001(\0132*.google.pri" +
       "vacy.dlp.v2.KmsWrappedCryptoKeyH\000B\010\n\006sou" +
-      "rce\"\"\n\022TransientCryptoKey\022\014\n\004name\030\001 \001(\t\"" +
+      "rce\"\"\n\022TransientCryptoKey\022\014\n\004name\030\001 \001(\t\"",
       "!\n\022UnwrappedCryptoKey\022\013\n\003key\030\001 \001(\014\"C\n\023Km" +
       "sWrappedCryptoKey\022\023\n\013wrapped_key\030\001 \001(\014\022\027" +
       "\n\017crypto_key_name\030\002 \001(\t\"\270\001\n\017DateShiftCon" +
@@ -1037,7 +1037,7 @@ public static void registerAllExtensions(
       " \001(\0132 .google.privacy.dlp.v2.CryptoKeyH\000" +
       "B\010\n\006method\"\233\002\n\027InfoTypeTransformations\022^" +
       "\n\017transformations\030\001 \003(\0132E.google.privacy" +
-      ".dlp.v2.InfoTypeTransformations.InfoType" +
+      ".dlp.v2.InfoTypeTransformations.InfoType",
       "Transformation\032\237\001\n\026InfoTypeTransformatio" +
       "n\0223\n\ninfo_types\030\001 \003(\0132\037.google.privacy.d" +
       "lp.v2.InfoType\022P\n\030primitive_transformati" +
@@ -1047,7 +1047,7 @@ public static void registerAllExtensions(
       ".FieldId\0229\n\tcondition\030\003 \001(\0132&.google.pri" +
       "vacy.dlp.v2.RecordCondition\022R\n\030primitive" +
       "_transformation\030\004 \001(\0132..google.privacy.d" +
-      "lp.v2.PrimitiveTransformationH\000\022S\n\031info_" +
+      "lp.v2.PrimitiveTransformationH\000\022S\n\031info_",
       "type_transformations\030\005 \001(\0132..google.priv" +
       "acy.dlp.v2.InfoTypeTransformationsH\000B\020\n\016" +
       "transformation\"\251\001\n\025RecordTransformations" +
@@ -1057,7 +1057,7 @@ public static void registerAllExtensions(
       "y.dlp.v2.RecordSuppression\"N\n\021RecordSupp" +
       "ression\0229\n\tcondition\030\001 \001(\0132&.google.priv" +
       "acy.dlp.v2.RecordCondition\"\322\004\n\017RecordCon" +
-      "dition\022G\n\013expressions\030\003 \001(\01322.google.pri" +
+      "dition\022G\n\013expressions\030\003 \001(\01322.google.pri",
       "vacy.dlp.v2.RecordCondition.Expressions\032" +
       "\244\001\n\tCondition\022-\n\005field\030\001 \001(\0132\036.google.pr" +
       "ivacy.dlp.v2.FieldId\022;\n\010operator\030\003 \001(\0162)" +
@@ -1077,7 +1077,7 @@ public static void registerAllExtensions(
       ".privacy.dlp.v2.TransformationSummary\"\237\005" +
       "\n\025TransformationSummary\0222\n\tinfo_type\030\001 \001" +
       "(\0132\037.google.privacy.dlp.v2.InfoType\022-\n\005f" +
-      "ield\030\002 \001(\0132\036.google.privacy.dlp.v2.Field" +
+      "ield\030\002 \001(\0132\036.google.privacy.dlp.v2.Field",
       "Id\022F\n\016transformation\030\003 \001(\0132..google.priv" +
       "acy.dlp.v2.PrimitiveTransformation\022I\n\025fi" +
       "eld_transformations\030\005 \003(\0132*.google.priva" +
@@ -1087,7 +1087,7 @@ public static void registerAllExtensions(
       "le.privacy.dlp.v2.TransformationSummary." +
       "SummaryResult\022\031\n\021transformed_bytes\030\007 \001(\003" +
       "\032\204\001\n\rSummaryResult\022\r\n\005count\030\001 \001(\003\022S\n\004cod" +
-      "e\030\002 \001(\0162E.google.privacy.dlp.v2.Transfor" +
+      "e\030\002 \001(\0162E.google.privacy.dlp.v2.Transfor",
       "mationSummary.TransformationResultCode\022\017" +
       "\n\007details\030\003 \001(\t\"^\n\030TransformationResultC" +
       "ode\022*\n&TRANSFORMATION_RESULT_CODE_UNSPEC" +
@@ -1097,7 +1097,7 @@ public static void registerAllExtensions(
       "\001\n\017InspectTemplate\022\014\n\004name\030\001 \001(\t\022\024\n\014disp" +
       "lay_name\030\002 \001(\t\022\023\n\013description\030\003 \001(\t\022/\n\013c" +
       "reate_time\030\004 \001(\0132\032.google.protobuf.Times" +
-      "tamp\022/\n\013update_time\030\005 \001(\0132\032.google.proto" +
+      "tamp\022/\n\013update_time\030\005 \001(\0132\032.google.proto",
       "buf.Timestamp\022<\n\016inspect_config\030\006 \001(\0132$." +
       "google.privacy.dlp.v2.InspectConfig\"\363\001\n\022" +
       "DeidentifyTemplate\022\014\n\004name\030\001 \001(\t\022\024\n\014disp" +
@@ -1107,7 +1107,7 @@ public static void registerAllExtensions(
       "buf.Timestamp\022B\n\021deidentify_config\030\006 \001(\013" +
       "2\'.google.privacy.dlp.v2.DeidentifyConfi" +
       "g\"\\\n\005Error\022#\n\007details\030\001 \001(\0132\022.google.rpc" +
-      ".Status\022.\n\ntimestamps\030\002 \003(\0132\032.google.pro" +
+      ".Status\022.\n\ntimestamps\030\002 \003(\0132\032.google.pro",
       "tobuf.Timestamp\"\333\004\n\nJobTrigger\022\014\n\004name\030\001" +
       " \001(\t\022\024\n\014display_name\030\002 \001(\t\022\023\n\013descriptio" +
       "n\030\003 \001(\t\022>\n\013inspect_job\030\004 \001(\0132\'.google.pr" +
@@ -1117,7 +1117,7 @@ public static void registerAllExtensions(
       "ivacy.dlp.v2.Error\022/\n\013create_time\030\007 \001(\0132" +
       "\032.google.protobuf.Timestamp\022/\n\013update_ti" +
       "me\030\010 \001(\0132\032.google.protobuf.Timestamp\0221\n\r" +
-      "last_run_time\030\t \001(\0132\032.google.protobuf.Ti" +
+      "last_run_time\030\t \001(\0132\032.google.protobuf.Ti",
       "mestamp\0228\n\006status\030\n \001(\0162(.google.privacy" +
       ".dlp.v2.JobTrigger.Status\032I\n\007Trigger\0223\n\010" +
       "schedule\030\001 \001(\0132\037.google.privacy.dlp.v2.S" +
@@ -1127,7 +1127,7 @@ public static void registerAllExtensions(
       "_findings\030\001 \001(\0132*.google.privacy.dlp.v2." +
       "Action.SaveFindingsH\000\022@\n\007pub_sub\030\002 \001(\0132-" +
       ".google.privacy.dlp.v2.Action.PublishToP" +
-      "ubSubH\000\022U\n\027publish_summary_to_cscc\030\003 \001(\013" +
+      "ubSubH\000\022U\n\027publish_summary_to_cscc\030\003 \001(\013",
       "22.google.privacy.dlp.v2.Action.PublishS" +
       "ummaryToCsccH\000\032Q\n\014SaveFindings\022A\n\routput" +
       "_config\030\001 \001(\0132*.google.privacy.dlp.v2.Ou" +
@@ -1137,7 +1137,7 @@ public static void registerAllExtensions(
       "\n\006parent\030\001 \001(\t\022@\n\020inspect_template\030\002 \001(\013" +
       "2&.google.privacy.dlp.v2.InspectTemplate" +
       "\022\023\n\013template_id\030\003 \001(\t\"\237\001\n\034UpdateInspectT" +
-      "emplateRequest\022\014\n\004name\030\001 \001(\t\022@\n\020inspect_" +
+      "emplateRequest\022\014\n\004name\030\001 \001(\t\022@\n\020inspect_",
       "template\030\002 \001(\0132&.google.privacy.dlp.v2.I" +
       "nspectTemplate\022/\n\013update_mask\030\003 \001(\0132\032.go" +
       "ogle.protobuf.FieldMask\")\n\031GetInspectTem" +
@@ -1147,7 +1147,7 @@ public static void registerAllExtensions(
       "InspectTemplatesResponse\022A\n\021inspect_temp" +
       "lates\030\001 \003(\0132&.google.privacy.dlp.v2.Insp" +
       "ectTemplate\022\027\n\017next_page_token\030\002 \001(\t\",\n\034" +
-      "DeleteInspectTemplateRequest\022\014\n\004name\030\001 \001" +
+      "DeleteInspectTemplateRequest\022\014\n\004name\030\001 \001",
       "(\t\"u\n\027CreateJobTriggerRequest\022\016\n\006parent\030" +
       "\001 \001(\t\0226\n\013job_trigger\030\002 \001(\0132!.google.priv" +
       "acy.dlp.v2.JobTrigger\022\022\n\ntrigger_id\030\003 \001(" +
@@ -1157,7 +1157,7 @@ public static void registerAllExtensions(
       "2\032.google.protobuf.FieldMask\"$\n\024GetJobTr" +
       "iggerRequest\022\014\n\004name\030\001 \001(\t\"\276\001\n\023CreateDlp" +
       "JobRequest\022\016\n\006parent\030\001 \001(\t\022>\n\013inspect_jo" +
-      "b\030\002 \001(\0132\'.google.privacy.dlp.v2.InspectJ" +
+      "b\030\002 \001(\0132\'.google.privacy.dlp.v2.InspectJ",
       "obConfigH\000\022@\n\010risk_job\030\003 \001(\0132,.google.pr" +
       "ivacy.dlp.v2.RiskAnalysisJobConfigH\000\022\016\n\006" +
       "job_id\030\004 \001(\tB\005\n\003job\"a\n\026ListJobTriggersRe" +
@@ -1167,7 +1167,7 @@ public static void registerAllExtensions(
       "s\030\001 \003(\0132!.google.privacy.dlp.v2.JobTrigg" +
       "er\022\027\n\017next_page_token\030\002 \001(\t\"\'\n\027DeleteJob" +
       "TriggerRequest\022\014\n\004name\030\001 \001(\t\"\335\001\n\020Inspect" +
-      "JobConfig\022<\n\016storage_config\030\001 \001(\0132$.goog" +
+      "JobConfig\022<\n\016storage_config\030\001 \001(\0132$.goog",
       "le.privacy.dlp.v2.StorageConfig\022<\n\016inspe" +
       "ct_config\030\002 \001(\0132$.google.privacy.dlp.v2." +
       "InspectConfig\022\035\n\025inspect_template_name\030\003" +
@@ -1177,7 +1177,7 @@ public static void registerAllExtensions(
       "obType\0225\n\005state\030\003 \001(\0162&.google.privacy.d" +
       "lp.v2.DlpJob.JobState\022K\n\014risk_details\030\004 " +
       "\001(\01323.google.privacy.dlp.v2.AnalyzeDataS" +
-      "ourceRiskDetailsH\000\022J\n\017inspect_details\030\005 " +
+      "ourceRiskDetailsH\000\022J\n\017inspect_details\030\005 ",
       "\001(\0132/.google.privacy.dlp.v2.InspectDataS" +
       "ourceDetailsH\000\022/\n\013create_time\030\006 \001(\0132\032.go" +
       "ogle.protobuf.Timestamp\022.\n\nstart_time\030\007 " +
@@ -1187,7 +1187,7 @@ public static void registerAllExtensions(
       "\034.google.privacy.dlp.v2.Error\"c\n\010JobStat" +
       "e\022\031\n\025JOB_STATE_UNSPECIFIED\020\000\022\013\n\007PENDING\020" +
       "\001\022\013\n\007RUNNING\020\002\022\010\n\004DONE\020\003\022\014\n\010CANCELED\020\004\022\n" +
-      "\n\006FAILED\020\005B\t\n\007details\" \n\020GetDlpJobReques" +
+      "\n\006FAILED\020\005B\t\n\007details\" \n\020GetDlpJobReques",
       "t\022\014\n\004name\030\001 \001(\t\"\214\001\n\022ListDlpJobsRequest\022\016" +
       "\n\006parent\030\004 \001(\t\022\016\n\006filter\030\001 \001(\t\022\021\n\tpage_s" +
       "ize\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022/\n\004type\030\005 " +
@@ -1197,7 +1197,7 @@ public static void registerAllExtensions(
       "token\030\002 \001(\t\"#\n\023CancelDlpJobRequest\022\014\n\004na" +
       "me\030\001 \001(\t\"#\n\023DeleteDlpJobRequest\022\014\n\004name\030" +
       "\001 \001(\t\"\216\001\n\037CreateDeidentifyTemplateReques" +
-      "t\022\016\n\006parent\030\001 \001(\t\022F\n\023deidentify_template" +
+      "t\022\016\n\006parent\030\001 \001(\t\022F\n\023deidentify_template",
       "\030\002 \001(\0132).google.privacy.dlp.v2.Deidentif" +
       "yTemplate\022\023\n\013template_id\030\003 \001(\t\"\250\001\n\037Updat" +
       "eDeidentifyTemplateRequest\022\014\n\004name\030\001 \001(\t" +
@@ -1207,7 +1207,7 @@ public static void registerAllExtensions(
       "k\",\n\034GetDeidentifyTemplateRequest\022\014\n\004nam" +
       "e\030\001 \001(\t\"W\n\036ListDeidentifyTemplatesReques" +
       "t\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n" +
-      "\tpage_size\030\003 \001(\005\"\203\001\n\037ListDeidentifyTempl" +
+      "\tpage_size\030\003 \001(\005\"\203\001\n\037ListDeidentifyTempl",
       "atesResponse\022G\n\024deidentify_templates\030\001 \003" +
       "(\0132).google.privacy.dlp.v2.DeidentifyTem" +
       "plate\022\027\n\017next_page_token\030\002 \001(\t\"/\n\037Delete" +
@@ -1217,7 +1217,7 @@ public static void registerAllExtensions(
       "\n\023InfoTypeSupportedBy\022\031\n\025ENUM_TYPE_UNSPE" +
       "CIFIED\020\000\022\013\n\007INSPECT\020\001\022\021\n\rRISK_ANALYSIS\020\002" +
       "*\273\001\n\022RelationalOperator\022#\n\037RELATIONAL_OP" +
-      "ERATOR_UNSPECIFIED\020\000\022\014\n\010EQUAL_TO\020\001\022\020\n\014NO" +
+      "ERATOR_UNSPECIFIED\020\000\022\014\n\010EQUAL_TO\020\001\022\020\n\014NO",
       "T_EQUAL_TO\020\002\022\020\n\014GREATER_THAN\020\003\022\r\n\tLESS_T" +
       "HAN\020\004\022\032\n\026GREATER_THAN_OR_EQUALS\020\005\022\027\n\023LES" +
       "S_THAN_OR_EQUALS\020\006\022\n\n\006EXISTS\020\007*R\n\nDlpJob" +
@@ -1227,7 +1227,7 @@ public static void registerAllExtensions(
       "ivacy.dlp.v2.InspectContentRequest\032-.goo" +
       "gle.privacy.dlp.v2.InspectContentRespons" +
       "e\"2\202\323\344\223\002,\"\'/v2/{parent=projects/*}/conte" +
-      "nt:inspect:\001*\022\225\001\n\013RedactImage\022).google.p" +
+      "nt:inspect:\001*\022\225\001\n\013RedactImage\022).google.p",
       "rivacy.dlp.v2.RedactImageRequest\032*.googl" +
       "e.privacy.dlp.v2.RedactImageResponse\"/\202\323" +
       "\344\223\002)\"$/v2/{parent=projects/*}/image:reda" +
@@ -1237,7 +1237,7 @@ public static void registerAllExtensions(
       "sponse\"5\202\323\344\223\002/\"*/v2/{parent=projects/*}/" +
       "content:deidentify:\001*\022\255\001\n\021ReidentifyCont" +
       "ent\022/.google.privacy.dlp.v2.ReidentifyCo" +
-      "ntentRequest\0320.google.privacy.dlp.v2.Rei" +
+      "ntentRequest\0320.google.privacy.dlp.v2.Rei",
       "dentifyContentResponse\"5\202\323\344\223\002/\"*/v2/{par" +
       "ent=projects/*}/content:reidentify:\001*\022\201\001" +
       "\n\rListInfoTypes\022+.google.privacy.dlp.v2." +
@@ -1247,7 +1247,7 @@ public static void registerAllExtensions(
       "ogle.privacy.dlp.v2.CreateInspectTemplat" +
       "eRequest\032&.google.privacy.dlp.v2.Inspect" +
       "Template\"g\202\323\344\223\002a\"-/v2/{parent=organizati" +
-      "ons/*}/inspectTemplates:\001*Z-\"(/v2/{paren" +
+      "ons/*}/inspectTemplates:\001*Z-\"(/v2/{paren",
       "t=projects/*}/inspectTemplates:\001*\022\335\001\n\025Up" +
       "dateInspectTemplate\0223.google.privacy.dlp" +
       ".v2.UpdateInspectTemplateRequest\032&.googl" +
@@ -1257,7 +1257,7 @@ public static void registerAllExtensions(
       "ctTemplates/*}:\001*\022\321\001\n\022GetInspectTemplate" +
       "\0220.google.privacy.dlp.v2.GetInspectTempl" +
       "ateRequest\032&.google.privacy.dlp.v2.Inspe" +
-      "ctTemplate\"a\202\323\344\223\002[\022-/v2/{name=organizati" +
+      "ctTemplate\"a\202\323\344\223\002[\022-/v2/{name=organizati",
       "ons/*/inspectTemplates/*}Z*\022(/v2/{name=p" +
       "rojects/*/inspectTemplates/*}\022\342\001\n\024ListIn" +
       "spectTemplates\0222.google.privacy.dlp.v2.L" +
@@ -1267,7 +1267,7 @@ public static void registerAllExtensions(
       "spectTemplatesZ*\022(/v2/{parent=projects/*" +
       "}/inspectTemplates\022\307\001\n\025DeleteInspectTemp" +
       "late\0223.google.privacy.dlp.v2.DeleteInspe" +
-      "ctTemplateRequest\032\026.google.protobuf.Empt" +
+      "ctTemplateRequest\032\026.google.protobuf.Empt",
       "y\"a\202\323\344\223\002[*-/v2/{name=organizations/*/ins" +
       "pectTemplates/*}Z**(/v2/{name=projects/*" +
       "/inspectTemplates/*}\022\354\001\n\030CreateDeidentif" +
@@ -1277,7 +1277,7 @@ public static void registerAllExtensions(
       "2/{parent=organizations/*}/deidentifyTem" +
       "plates:\001*Z0\"+/v2/{parent=projects/*}/dei" +
       "dentifyTemplates:\001*\022\354\001\n\030UpdateDeidentify" +
-      "Template\0226.google.privacy.dlp.v2.UpdateD" +
+      "Template\0226.google.privacy.dlp.v2.UpdateD",
       "eidentifyTemplateRequest\032).google.privac" +
       "y.dlp.v2.DeidentifyTemplate\"m\202\323\344\223\002g20/v2" +
       "/{name=organizations/*/deidentifyTemplat" +
@@ -1287,7 +1287,7 @@ public static void registerAllExtensions(
       "fyTemplateRequest\032).google.privacy.dlp.v" +
       "2.DeidentifyTemplate\"g\202\323\344\223\002a\0220/v2/{name=" +
       "organizations/*/deidentifyTemplates/*}Z-" +
-      "\022+/v2/{name=projects/*/deidentifyTemplat" +
+      "\022+/v2/{name=projects/*/deidentifyTemplat",
       "es/*}\022\361\001\n\027ListDeidentifyTemplates\0225.goog" +
       "le.privacy.dlp.v2.ListDeidentifyTemplate" +
       "sRequest\0326.google.privacy.dlp.v2.ListDei" +
@@ -1297,7 +1297,7 @@ public static void registerAllExtensions(
       "Templates\022\323\001\n\030DeleteDeidentifyTemplate\0226" +
       ".google.privacy.dlp.v2.DeleteDeidentifyT" +
       "emplateRequest\032\026.google.protobuf.Empty\"g" +
-      "\202\323\344\223\002a*0/v2/{name=organizations/*/deiden" +
+      "\202\323\344\223\002a*0/v2/{name=organizations/*/deiden",
       "tifyTemplates/*}Z-*+/v2/{name=projects/*" +
       "/deidentifyTemplates/*}\022\225\001\n\020CreateJobTri" +
       "gger\022..google.privacy.dlp.v2.CreateJobTr" +
@@ -1307,7 +1307,7 @@ public static void registerAllExtensions(
       "oogle.privacy.dlp.v2.UpdateJobTriggerReq" +
       "uest\032!.google.privacy.dlp.v2.JobTrigger\"" +
       ".\202\323\344\223\002(2#/v2/{name=projects/*/jobTrigger" +
-      "s/*}:\001*\022\214\001\n\rGetJobTrigger\022+.google.priva" +
+      "s/*}:\001*\022\214\001\n\rGetJobTrigger\022+.google.priva",
       "cy.dlp.v2.GetJobTriggerRequest\032!.google." +
       "privacy.dlp.v2.JobTrigger\"+\202\323\344\223\002%\022#/v2/{" +
       "name=projects/*/jobTriggers/*}\022\235\001\n\017ListJ" +
@@ -1317,7 +1317,7 @@ public static void registerAllExtensions(
       "parent=projects/*}/jobTriggers\022\207\001\n\020Delet" +
       "eJobTrigger\022..google.privacy.dlp.v2.Dele" +
       "teJobTriggerRequest\032\026.google.protobuf.Em" +
-      "pty\"+\202\323\344\223\002%*#/v2/{name=projects/*/jobTri" +
+      "pty\"+\202\323\344\223\002%*#/v2/{name=projects/*/jobTri",
       "ggers/*}\022\205\001\n\014CreateDlpJob\022*.google.priva" +
       "cy.dlp.v2.CreateDlpJobRequest\032\035.google.p" +
       "rivacy.dlp.v2.DlpJob\"*\202\323\344\223\002$\"\037/v2/{paren" +
@@ -1327,7 +1327,7 @@ public static void registerAllExtensions(
       "esponse\"\'\202\323\344\223\002!\022\037/v2/{parent=projects/*}" +
       "/dlpJobs\022|\n\tGetDlpJob\022\'.google.privacy.d" +
       "lp.v2.GetDlpJobRequest\032\035.google.privacy." +
-      "dlp.v2.DlpJob\"\'\202\323\344\223\002!\022\037/v2/{name=project" +
+      "dlp.v2.DlpJob\"\'\202\323\344\223\002!\022\037/v2/{name=project",
       "s/*/dlpJobs/*}\022{\n\014DeleteDlpJob\022*.google." +
       "privacy.dlp.v2.DeleteDlpJobRequest\032\026.goo" +
       "gle.protobuf.Empty\"\'\202\323\344\223\002!*\037/v2/{name=pr" +
@@ -1337,7 +1337,7 @@ public static void registerAllExtensions(
       "ame=projects/*/dlpJobs/*}:cancel:\001*B\215\001\n\031" +
       "com.google.privacy.dlp.v2B\010DlpProtoP\001Z8g" +
       "oogle.golang.org/genproto/googleapis/pri" +
-      "vacy/dlp/v2;dlp\252\002\023Google.Cloud.Dlp.V2\312\002\023" +
+      "vacy/dlp/v2;dlp\252\002\023Google.Cloud.Dlp.V2\312\002\023",
       "Google\\Cloud\\Dlp\\V2b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java
index c1f1d9849930..34c87a549bb2 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "2!.google.privacy.dlp.v2.Likelihood\022F\n\nd" +
       "ictionary\030\002 \001(\01320.google.privacy.dlp.v2." +
       "CustomInfoType.DictionaryH\000\022<\n\005regex\030\003 \001" +
-      "(\0132+.google.privacy.dlp.v2.CustomInfoTyp" +
+      "(\0132+.google.privacy.dlp.v2.CustomInfoTyp",
       "e.RegexH\000\022M\n\016surrogate_type\030\004 \001(\01323.goog" +
       "le.privacy.dlp.v2.CustomInfoType.Surroga" +
       "teTypeH\000\022L\n\017detection_rules\030\007 \003(\01323.goog" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "Dictionary.WordListH\000\022E\n\022cloud_storage_p" +
       "ath\030\003 \001(\0132\'.google.privacy.dlp.v2.CloudS" +
       "toragePathH\000\032\031\n\010WordList\022\r\n\005words\030\001 \003(\tB" +
-      "\010\n\006source\032\030\n\005Regex\022\017\n\007pattern\030\001 \001(\t\032\017\n\rS" +
+      "\010\n\006source\032\030\n\005Regex\022\017\n\007pattern\030\001 \001(\t\032\017\n\rS",
       "urrogateType\032\276\004\n\rDetectionRule\022W\n\014hotwor" +
       "d_rule\030\001 \001(\0132?.google.privacy.dlp.v2.Cus" +
       "tomInfoType.DetectionRule.HotwordRuleH\000\032" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "ivacy.dlp.v2.LikelihoodH\000\022\035\n\023relative_li" +
       "kelihood\030\002 \001(\005H\000B\014\n\nadjustment\032\214\002\n\013Hotwo" +
       "rdRule\022B\n\rhotword_regex\030\001 \001(\0132+.google.p" +
-      "rivacy.dlp.v2.CustomInfoType.Regex\022P\n\tpr" +
+      "rivacy.dlp.v2.CustomInfoType.Regex\022P\n\tpr",
       "oximity\030\002 \001(\0132=.google.privacy.dlp.v2.Cu" +
       "stomInfoType.DetectionRule.Proximity\022g\n\025" +
       "likelihood_adjustment\030\003 \001(\0132H.google.pri" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "\nproject_id\030\002 \001(\t\022\024\n\014namespace_id\030\004 \001(\t\"" +
       "\036\n\016KindExpression\022\014\n\004name\030\001 \001(\t\"\201\001\n\020Data" +
       "storeOptions\0228\n\014partition_id\030\001 \001(\0132\".goo" +
-      "gle.privacy.dlp.v2.PartitionId\0223\n\004kind\030\002" +
+      "gle.privacy.dlp.v2.PartitionId\0223\n\004kind\030\002",
       " \001(\0132%.google.privacy.dlp.v2.KindExpress" +
       "ion\"\375\002\n\023CloudStorageOptions\022D\n\010file_set\030" +
       "\001 \001(\01322.google.privacy.dlp.v2.CloudStora" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "\001(\01627.google.privacy.dlp.v2.CloudStorage" +
       "Options.SampleMethod\022\033\n\023files_limit_perc" +
       "ent\030\007 \001(\005\032\026\n\007FileSet\022\013\n\003url\030\001 \001(\t\"H\n\014Sam" +
-      "pleMethod\022\035\n\031SAMPLE_METHOD_UNSPECIFIED\020\000" +
+      "pleMethod\022\035\n\031SAMPLE_METHOD_UNSPECIFIED\020\000",
       "\022\007\n\003TOP\020\001\022\020\n\014RANDOM_START\020\002\" \n\020CloudStor" +
       "agePath\022\014\n\004path\030\001 \001(\t\"\266\002\n\017BigQueryOption" +
       "s\022=\n\017table_reference\030\001 \001(\0132$.google.priv" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "d\030\004 \001(\01623.google.privacy.dlp.v2.BigQuery" +
       "Options.SampleMethod\"H\n\014SampleMethod\022\035\n\031" +
       "SAMPLE_METHOD_UNSPECIFIED\020\000\022\007\n\003TOP\020\001\022\020\n\014" +
-      "RANDOM_START\020\002\"\232\004\n\rStorageConfig\022D\n\021data" +
+      "RANDOM_START\020\002\"\232\004\n\rStorageConfig\022D\n\021data",
       "store_options\030\002 \001(\0132\'.google.privacy.dlp" +
       ".v2.DatastoreOptionsH\000\022K\n\025cloud_storage_" +
       "options\030\003 \001(\0132*.google.privacy.dlp.v2.Cl" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "le.privacy.dlp.v2.StorageConfig.Timespan" +
       "Config\032\332\001\n\016TimespanConfig\022.\n\nstart_time\030" +
       "\001 \001(\0132\032.google.protobuf.Timestamp\022,\n\010end" +
-      "_time\030\002 \001(\0132\032.google.protobuf.Timestamp\022" +
+      "_time\030\002 \001(\0132\032.google.protobuf.Timestamp\022",
       "7\n\017timestamp_field\030\003 \001(\0132\036.google.privac" +
       "y.dlp.v2.FieldId\0221\n)enable_auto_populati" +
       "on_of_timespan_config\030\004 \001(\010B\006\n\004type\"`\n\013B" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "key\030\001 \001(\0132\032.google.privacy.dlp.v2.Key\"\273\001" +
       "\n\003Key\0228\n\014partition_id\030\001 \001(\0132\".google.pri" +
       "vacy.dlp.v2.PartitionId\0224\n\004path\030\002 \003(\0132&." +
-      "google.privacy.dlp.v2.Key.PathElement\032D\n" +
+      "google.privacy.dlp.v2.Key.PathElement\032D\n",
       "\013PathElement\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000" +
       "\022\016\n\004name\030\003 \001(\tH\000B\t\n\007id_type\"\216\001\n\tRecordKe" +
       "y\022<\n\rdatastore_key\030\002 \001(\0132#.google.privac" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       "_id\030\001 \001(\t\022\022\n\ndataset_id\030\002 \001(\t\022\020\n\010table_i" +
       "d\030\003 \001(\t\"9\n\010EntityId\022-\n\005field\030\001 \001(\0132\036.goo" +
       "gle.privacy.dlp.v2.FieldId*t\n\nLikelihood" +
-      "\022\032\n\026LIKELIHOOD_UNSPECIFIED\020\000\022\021\n\rVERY_UNL" +
+      "\022\032\n\026LIKELIHOOD_UNSPECIFIED\020\000\022\021\n\rVERY_UNL",
       "IKELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006L" +
       "IKELY\020\004\022\017\n\013VERY_LIKELY\020\005*E\n\010FileType\022\031\n\025" +
       "FILE_TYPE_UNSPECIFIED\020\000\022\017\n\013BINARY_FILE\020\001" +
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DocumentLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DocumentLocation.java
index e44848915e92..8cf94d8d935a 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DocumentLocation.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DocumentLocation.java
@@ -33,9 +33,6 @@ private DocumentLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -455,7 +452,7 @@ public DocumentLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DocumentLocation(input, extensionRegistry);
+        return new DocumentLocation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/EntityId.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/EntityId.java
index 66f61c263194..58bddf537fde 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/EntityId.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/EntityId.java
@@ -36,9 +36,6 @@ private EntityId(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -613,7 +610,7 @@ public EntityId parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityId(input, extensionRegistry);
+        return new EntityId(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Error.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Error.java
index a2a742bbf05f..e5094c1db271 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Error.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Error.java
@@ -35,9 +35,6 @@ private Error(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public Error parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Error(input, extensionRegistry);
+        return new Error(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldId.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldId.java
index cb159bd4b946..871a06095cf4 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldId.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldId.java
@@ -33,9 +33,6 @@ private FieldId(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -531,7 +528,7 @@ public FieldId parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FieldId(input, extensionRegistry);
+        return new FieldId(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldTransformation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldTransformation.java
index ed11cbc36a85..4557fd3dccce 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldTransformation.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldTransformation.java
@@ -33,9 +33,6 @@ private FieldTransformation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1701,7 +1698,7 @@ public FieldTransformation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FieldTransformation(input, extensionRegistry);
+        return new FieldTransformation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Finding.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Finding.java
index 8f8d651ada22..b76d8153dbe1 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Finding.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Finding.java
@@ -34,9 +34,6 @@ private Finding(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1622,7 +1619,7 @@ public Finding parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Finding(input, extensionRegistry);
+        return new Finding(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FixedSizeBucketingConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FixedSizeBucketingConfig.java
index 89ff1a70109f..f2041643dc4a 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FixedSizeBucketingConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FixedSizeBucketingConfig.java
@@ -43,9 +43,6 @@ private FixedSizeBucketingConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1003,7 +1000,7 @@ public FixedSizeBucketingConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FixedSizeBucketingConfig(input, extensionRegistry);
+        return new FixedSizeBucketingConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDeidentifyTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDeidentifyTemplateRequest.java
index e9c014d59df2..a4ca34ea01ce 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDeidentifyTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDeidentifyTemplateRequest.java
@@ -33,9 +33,6 @@ private GetDeidentifyTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public GetDeidentifyTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDeidentifyTemplateRequest(input, extensionRegistry);
+        return new GetDeidentifyTemplateRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDlpJobRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDlpJobRequest.java
index 5dfbf0ae60b9..b1ff90c4d18c 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDlpJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDlpJobRequest.java
@@ -33,9 +33,6 @@ private GetDlpJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -531,7 +528,7 @@ public GetDlpJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDlpJobRequest(input, extensionRegistry);
+        return new GetDlpJobRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetInspectTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetInspectTemplateRequest.java
index 522e08ead8b5..3a3a0b14151b 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetInspectTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetInspectTemplateRequest.java
@@ -33,9 +33,6 @@ private GetInspectTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public GetInspectTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetInspectTemplateRequest(input, extensionRegistry);
+        return new GetInspectTemplateRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetJobTriggerRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetJobTriggerRequest.java
index 36003538ecdf..8f4b004293cf 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetJobTriggerRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetJobTriggerRequest.java
@@ -33,9 +33,6 @@ private GetJobTriggerRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetJobTriggerRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetJobTriggerRequest(input, extensionRegistry);
+        return new GetJobTriggerRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ImageLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ImageLocation.java
index dbccfbea5d2d..06f6deea4b26 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ImageLocation.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ImageLocation.java
@@ -33,9 +33,6 @@ private ImageLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public ImageLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageLocation(input, extensionRegistry);
+        return new ImageLocation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoType.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoType.java
index 9be4992d43e3..a51bb53d24ad 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoType.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoType.java
@@ -33,9 +33,6 @@ private InfoType(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -531,7 +528,7 @@ public InfoType parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InfoType(input, extensionRegistry);
+        return new InfoType(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeDescription.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeDescription.java
index ea31c1b003e3..0087e1ace88c 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeDescription.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeDescription.java
@@ -35,9 +35,6 @@ private InfoTypeDescription(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -991,7 +988,7 @@ public InfoTypeDescription parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InfoTypeDescription(input, extensionRegistry);
+        return new InfoTypeDescription(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeStats.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeStats.java
index e3f9c38e2846..eafa669d09ec 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeStats.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeStats.java
@@ -33,9 +33,6 @@ private InfoTypeStats(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -680,7 +677,7 @@ public InfoTypeStats parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InfoTypeStats(input, extensionRegistry);
+        return new InfoTypeStats(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeTransformations.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeTransformations.java
index a1976078267f..90e53a44c20a 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeTransformations.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeTransformations.java
@@ -36,9 +36,6 @@ private InfoTypeTransformations(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -202,9 +199,6 @@ private InfoTypeTransformation(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1238,7 +1232,7 @@ public InfoTypeTransformation parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new InfoTypeTransformation(input, extensionRegistry);
+          return new InfoTypeTransformation(input, extensionRegistry);
       }
     };
 
@@ -2006,7 +2000,7 @@ public InfoTypeTransformations parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InfoTypeTransformations(input, extensionRegistry);
+        return new InfoTypeTransformations(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectConfig.java
index 443424bc7366..db069d3e7feb 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectConfig.java
@@ -40,9 +40,6 @@ private InspectConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -263,9 +260,6 @@ private FindingLimits(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -408,9 +402,6 @@ private InfoTypeLimit(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1091,7 +1082,7 @@ public InfoTypeLimit parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new InfoTypeLimit(input, extensionRegistry);
+            return new InfoTypeLimit(input, extensionRegistry);
         }
       };
 
@@ -1988,7 +1979,7 @@ public FindingLimits parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FindingLimits(input, extensionRegistry);
+          return new FindingLimits(input, extensionRegistry);
       }
     };
 
@@ -3891,7 +3882,7 @@ public InspectConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectConfig(input, extensionRegistry);
+        return new InspectConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentRequest.java
index 0010d793e778..41f0fe829384 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentRequest.java
@@ -34,9 +34,6 @@ private InspectContentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1184,7 +1181,7 @@ public InspectContentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectContentRequest(input, extensionRegistry);
+        return new InspectContentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentResponse.java
index 84ad62282701..e4dc22212ed5 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentResponse.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentResponse.java
@@ -32,9 +32,6 @@ private InspectContentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public InspectContentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectContentResponse(input, extensionRegistry);
+        return new InspectContentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectDataSourceDetails.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectDataSourceDetails.java
index 95cc0f3a3743..dd1aa0eb2578 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectDataSourceDetails.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectDataSourceDetails.java
@@ -32,9 +32,6 @@ private InspectDataSourceDetails(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -173,9 +170,6 @@ private RequestedOptions(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -935,7 +929,7 @@ public RequestedOptions parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new RequestedOptions(input, extensionRegistry);
+          return new RequestedOptions(input, extensionRegistry);
       }
     };
 
@@ -1053,9 +1047,6 @@ private Result(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2003,7 +1994,7 @@ public Result parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Result(input, extensionRegistry);
+          return new Result(input, extensionRegistry);
       }
     };
 
@@ -2753,7 +2744,7 @@ public InspectDataSourceDetails parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectDataSourceDetails(input, extensionRegistry);
+        return new InspectDataSourceDetails(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectJobConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectJobConfig.java
index ff53e566a90b..270f1c254cde 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectJobConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectJobConfig.java
@@ -30,9 +30,6 @@ private InspectJobConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1458,7 +1455,7 @@ public InspectJobConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectJobConfig(input, extensionRegistry);
+        return new InspectJobConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectResult.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectResult.java
index 6faab9f7d8ce..3ce3f6bcabfd 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectResult.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectResult.java
@@ -34,9 +34,6 @@ private InspectResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -911,7 +908,7 @@ public InspectResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectResult(input, extensionRegistry);
+        return new InspectResult(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectTemplate.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectTemplate.java
index 1b3885e8119a..85e619930ace 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectTemplate.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectTemplate.java
@@ -37,9 +37,6 @@ private InspectTemplate(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1553,7 +1550,7 @@ public InspectTemplate parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InspectTemplate(input, extensionRegistry);
+        return new InspectTemplate(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/JobTrigger.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/JobTrigger.java
index e14c575d77ec..53ea8c6d381e 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/JobTrigger.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/JobTrigger.java
@@ -38,9 +38,6 @@ private JobTrigger(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -391,9 +388,6 @@ private Trigger(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1055,7 +1049,7 @@ public Trigger parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Trigger(input, extensionRegistry);
+          return new Trigger(input, extensionRegistry);
       }
     };
 
@@ -3805,7 +3799,7 @@ public JobTrigger parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobTrigger(input, extensionRegistry);
+        return new JobTrigger(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Key.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Key.java
index b2dcf911d808..4669ed7d2e56 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Key.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Key.java
@@ -36,9 +36,6 @@ private Key(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -203,9 +200,6 @@ private PathElement(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1092,7 +1086,7 @@ public PathElement parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PathElement(input, extensionRegistry);
+          return new PathElement(input, extensionRegistry);
       }
     };
 
@@ -2241,7 +2235,7 @@ public Key parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Key(input, extensionRegistry);
+        return new Key(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KindExpression.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KindExpression.java
index 4033542a0378..6d3b529dbefc 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KindExpression.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KindExpression.java
@@ -33,9 +33,6 @@ private KindExpression(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -531,7 +528,7 @@ public KindExpression parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new KindExpression(input, extensionRegistry);
+        return new KindExpression(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KmsWrappedCryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KmsWrappedCryptoKey.java
index 9520e65b1642..7f039b783f6e 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KmsWrappedCryptoKey.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KmsWrappedCryptoKey.java
@@ -37,9 +37,6 @@ private KmsWrappedCryptoKey(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -614,7 +611,7 @@ public KmsWrappedCryptoKey parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new KmsWrappedCryptoKey(input, extensionRegistry);
+        return new KmsWrappedCryptoKey(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesRequest.java
index 43c18793ce8b..f23d5e464f5d 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesRequest.java
@@ -35,9 +35,6 @@ private ListDeidentifyTemplatesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -778,7 +775,7 @@ public ListDeidentifyTemplatesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeidentifyTemplatesRequest(input, extensionRegistry);
+        return new ListDeidentifyTemplatesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesResponse.java
index a6aa4d989f88..6e3dd28c1d3b 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesResponse.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesResponse.java
@@ -34,9 +34,6 @@ private ListDeidentifyTemplatesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public ListDeidentifyTemplatesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeidentifyTemplatesResponse(input, extensionRegistry);
+        return new ListDeidentifyTemplatesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsRequest.java
index a8a10b0a86e9..33b21ff3495b 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsRequest.java
@@ -37,9 +37,6 @@ private ListDlpJobsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1145,7 +1142,7 @@ public ListDlpJobsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDlpJobsRequest(input, extensionRegistry);
+        return new ListDlpJobsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsResponse.java
index 7cb8196d0b05..a973a6b89640 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsResponse.java
@@ -34,9 +34,6 @@ private ListDlpJobsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -971,7 +968,7 @@ public ListDlpJobsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDlpJobsResponse(input, extensionRegistry);
+        return new ListDlpJobsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesRequest.java
index 8f255267b5f3..20a2df1c63e3 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesRequest.java
@@ -34,9 +34,6 @@ private ListInfoTypesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -707,7 +704,7 @@ public ListInfoTypesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInfoTypesRequest(input, extensionRegistry);
+        return new ListInfoTypesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesResponse.java
index 6d6c1ea3b3f7..0d27ddcef7fa 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesResponse.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesResponse.java
@@ -33,9 +33,6 @@ private ListInfoTypesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public ListInfoTypesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInfoTypesResponse(input, extensionRegistry);
+        return new ListInfoTypesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesRequest.java
index 673fc37dc647..5f79bd81a117 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesRequest.java
@@ -35,9 +35,6 @@ private ListInspectTemplatesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -778,7 +775,7 @@ public ListInspectTemplatesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInspectTemplatesRequest(input, extensionRegistry);
+        return new ListInspectTemplatesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesResponse.java
index 6de44532b0b6..16700e7a1ab1 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesResponse.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesResponse.java
@@ -34,9 +34,6 @@ private ListInspectTemplatesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -978,7 +975,7 @@ public ListInspectTemplatesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInspectTemplatesResponse(input, extensionRegistry);
+        return new ListInspectTemplatesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersRequest.java
index 35360460013a..b1b7f289d27b 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersRequest.java
@@ -36,9 +36,6 @@ private ListJobTriggersRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -992,7 +989,7 @@ public ListJobTriggersRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListJobTriggersRequest(input, extensionRegistry);
+        return new ListJobTriggersRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersResponse.java
index fb03fb5befc3..b5103de64a5b 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersResponse.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersResponse.java
@@ -34,9 +34,6 @@ private ListJobTriggersResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -978,7 +975,7 @@ public ListJobTriggersResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListJobTriggersResponse(input, extensionRegistry);
+        return new ListJobTriggersResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Location.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Location.java
index cec049e6379a..85b6996faf71 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Location.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Location.java
@@ -33,9 +33,6 @@ private Location(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1369,7 +1366,7 @@ public Location parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Location(input, extensionRegistry);
+        return new Location(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationDeidentifyTemplateName.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationDeidentifyTemplateName.java
index 6a295964b7ab..119bb398660d 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationDeidentifyTemplateName.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationDeidentifyTemplateName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("OrganizationDeidentifyTemplateName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("organization", organization, "deidentify_template", deidentifyTemplate);
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationInspectTemplateName.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationInspectTemplateName.java
index 9a29297cc574..dac1e23db442 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationInspectTemplateName.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationInspectTemplateName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("OrganizationInspectTemplateName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("organization", organization, "inspect_template", inspectTemplate);
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationName.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationName.java
index bcc143459e07..38ef3804a1aa 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationName.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OrganizationName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("OrganizationName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("organization", organization);
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OutputStorageConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OutputStorageConfig.java
index 28757a9488d4..10c61928d580 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OutputStorageConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OutputStorageConfig.java
@@ -33,9 +33,6 @@ private OutputStorageConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1082,7 +1079,7 @@ public OutputStorageConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OutputStorageConfig(input, extensionRegistry);
+        return new OutputStorageConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PartitionId.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PartitionId.java
index b1201b61b5c0..c9669c5d7731 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PartitionId.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PartitionId.java
@@ -38,9 +38,6 @@ private PartitionId(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -694,7 +691,7 @@ public PartitionId parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartitionId(input, extensionRegistry);
+        return new PartitionId(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrimitiveTransformation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrimitiveTransformation.java
index e6938ce11185..968454b896a5 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrimitiveTransformation.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrimitiveTransformation.java
@@ -32,9 +32,6 @@ private PrimitiveTransformation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2484,7 +2481,7 @@ public PrimitiveTransformation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PrimitiveTransformation(input, extensionRegistry);
+        return new PrimitiveTransformation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrivacyMetric.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrivacyMetric.java
index 891f3ac385fc..1e21523e263b 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrivacyMetric.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrivacyMetric.java
@@ -32,9 +32,6 @@ private PrivacyMetric(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -209,9 +206,6 @@ private NumericalStatsConfig(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -795,7 +789,7 @@ public NumericalStatsConfig parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new NumericalStatsConfig(input, extensionRegistry);
+          return new NumericalStatsConfig(input, extensionRegistry);
       }
     };
 
@@ -882,9 +876,6 @@ private CategoricalStatsConfig(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1492,7 +1483,7 @@ public CategoricalStatsConfig parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CategoricalStatsConfig(input, extensionRegistry);
+          return new CategoricalStatsConfig(input, extensionRegistry);
       }
     };
 
@@ -1658,9 +1649,6 @@ private KAnonymityConfig(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2858,7 +2846,7 @@ public KAnonymityConfig parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new KAnonymityConfig(input, extensionRegistry);
+          return new KAnonymityConfig(input, extensionRegistry);
       }
     };
 
@@ -2990,9 +2978,6 @@ private LDiversityConfig(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4048,7 +4033,7 @@ public LDiversityConfig parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new LDiversityConfig(input, extensionRegistry);
+          return new LDiversityConfig(input, extensionRegistry);
       }
     };
 
@@ -4234,9 +4219,6 @@ private KMapEstimationConfig(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4452,9 +4434,6 @@ private TaggedField(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5849,7 +5828,7 @@ public TaggedField parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new TaggedField(input, extensionRegistry);
+            return new TaggedField(input, extensionRegistry);
         }
       };
 
@@ -6008,9 +5987,6 @@ private AuxiliaryTable(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6149,9 +6125,6 @@ private QuasiIdField(
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           this();
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
           int mutable_bitField0_ = 0;
           com.google.protobuf.UnknownFieldSet.Builder unknownFields =
               com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6801,7 +6774,7 @@ public QuasiIdField parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new QuasiIdField(input, extensionRegistry);
+              return new QuasiIdField(input, extensionRegistry);
           }
         };
 
@@ -8008,7 +7981,7 @@ public AuxiliaryTable parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new AuxiliaryTable(input, extensionRegistry);
+            return new AuxiliaryTable(input, extensionRegistry);
         }
       };
 
@@ -9412,7 +9385,7 @@ public KMapEstimationConfig parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new KMapEstimationConfig(input, extensionRegistry);
+          return new KMapEstimationConfig(input, extensionRegistry);
       }
     };
 
@@ -10748,7 +10721,7 @@ public PrivacyMetric parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PrivacyMetric(input, extensionRegistry);
+        return new PrivacyMetric(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectDeidentifyTemplateName.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectDeidentifyTemplateName.java
index a582cd8cf4f0..9334c3e41a3d 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectDeidentifyTemplateName.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectDeidentifyTemplateName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectDeidentifyTemplateName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "deidentify_template", deidentifyTemplate);
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectInspectTemplateName.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectInspectTemplateName.java
index a2a7ee8f4a04..48fceebe264d 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectInspectTemplateName.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectInspectTemplateName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectInspectTemplateName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "inspect_template", inspectTemplate);
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectJobTriggerName.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectJobTriggerName.java
index 1e9e2296e94b..4bcffff00edc 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectJobTriggerName.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectJobTriggerName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectJobTriggerName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "job_trigger", jobTrigger);
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectName.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectName.java
index 9b70ce33e304..f1bb83f3dc4f 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/QuoteInfo.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/QuoteInfo.java
index ed4d2c89497a..1c94778bc619 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/QuoteInfo.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/QuoteInfo.java
@@ -32,9 +32,6 @@ private QuoteInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -648,7 +645,7 @@ public QuoteInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QuoteInfo(input, extensionRegistry);
+        return new QuoteInfo(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Range.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Range.java
index 73307b0acf03..530b4b948701 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Range.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Range.java
@@ -34,9 +34,6 @@ private Range(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -526,7 +523,7 @@ public Range parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Range(input, extensionRegistry);
+        return new Range(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordCondition.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordCondition.java
index 9103aca5b4e6..880c3d27a82c 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordCondition.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordCondition.java
@@ -33,9 +33,6 @@ private RecordCondition(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -206,9 +203,6 @@ private Condition(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1132,7 +1126,7 @@ public Condition parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Condition(input, extensionRegistry);
+          return new Condition(input, extensionRegistry);
       }
     };
 
@@ -1209,9 +1203,6 @@ private Conditions(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1897,7 +1888,7 @@ public Conditions parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Conditions(input, extensionRegistry);
+          return new Conditions(input, extensionRegistry);
       }
     };
 
@@ -1984,9 +1975,6 @@ private Expressions(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2815,7 +2803,7 @@ public Expressions parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Expressions(input, extensionRegistry);
+          return new Expressions(input, extensionRegistry);
       }
     };
 
@@ -3350,7 +3338,7 @@ public RecordCondition parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecordCondition(input, extensionRegistry);
+        return new RecordCondition(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordKey.java
index d1155da0b11d..5150d170c7d8 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordKey.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordKey.java
@@ -32,9 +32,6 @@ private RecordKey(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -852,7 +849,7 @@ public RecordKey parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecordKey(input, extensionRegistry);
+        return new RecordKey(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordLocation.java
index f2b94f40aac3..60f719879b14 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordLocation.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordLocation.java
@@ -32,9 +32,6 @@ private RecordLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1063,7 +1060,7 @@ public RecordLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecordLocation(input, extensionRegistry);
+        return new RecordLocation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordSuppression.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordSuppression.java
index bd588e42ff43..dcb3aa7353f4 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordSuppression.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordSuppression.java
@@ -33,9 +33,6 @@ private RecordSuppression(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -619,7 +616,7 @@ public RecordSuppression parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecordSuppression(input, extensionRegistry);
+        return new RecordSuppression(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordTransformations.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordTransformations.java
index edc1b0afda88..eb2ee2ae00c6 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordTransformations.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordTransformations.java
@@ -35,9 +35,6 @@ private RecordTransformations(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1273,7 +1270,7 @@ public RecordTransformations parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecordTransformations(input, extensionRegistry);
+        return new RecordTransformations(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactConfig.java
index afc831249c2e..40fb8cf6d964 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactConfig.java
@@ -34,9 +34,6 @@ private RedactConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -379,7 +376,7 @@ public RedactConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RedactConfig(input, extensionRegistry);
+        return new RedactConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageRequest.java
index dd63eae45295..290f18da7a9b 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageRequest.java
@@ -35,9 +35,6 @@ private RedactImageRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -231,9 +228,6 @@ private ImageRedactionConfig(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1265,7 +1259,7 @@ public ImageRedactionConfig parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ImageRedactionConfig(input, extensionRegistry);
+          return new ImageRedactionConfig(input, extensionRegistry);
       }
     };
 
@@ -2591,7 +2585,7 @@ public RedactImageRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RedactImageRequest(input, extensionRegistry);
+        return new RedactImageRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageResponse.java
index 33eae428f3a3..ba8bf63e08dd 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageResponse.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageResponse.java
@@ -34,9 +34,6 @@ private RedactImageResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -622,7 +619,7 @@ public RedactImageResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RedactImageResponse(input, extensionRegistry);
+        return new RedactImageResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentRequest.java
index 059acbc62cc3..52b70e30fd06 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentRequest.java
@@ -35,9 +35,6 @@ private ReidentifyContentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1675,7 +1672,7 @@ public ReidentifyContentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReidentifyContentRequest(input, extensionRegistry);
+        return new ReidentifyContentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentResponse.java
index cca4a301596f..90084dea2225 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentResponse.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentResponse.java
@@ -32,9 +32,6 @@ private ReidentifyContentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -834,7 +831,7 @@ public ReidentifyContentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReidentifyContentResponse(input, extensionRegistry);
+        return new ReidentifyContentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceValueConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceValueConfig.java
index b711f4623e9e..6e277b732ca8 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceValueConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceValueConfig.java
@@ -32,9 +32,6 @@ private ReplaceValueConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public ReplaceValueConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReplaceValueConfig(input, extensionRegistry);
+        return new ReplaceValueConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceWithInfoTypeConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceWithInfoTypeConfig.java
index 6cec454459ca..8792e0e0ba46 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceWithInfoTypeConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceWithInfoTypeConfig.java
@@ -32,9 +32,6 @@ private ReplaceWithInfoTypeConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -375,7 +372,7 @@ public ReplaceWithInfoTypeConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReplaceWithInfoTypeConfig(input, extensionRegistry);
+        return new ReplaceWithInfoTypeConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RiskAnalysisJobConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RiskAnalysisJobConfig.java
index 0d32140f66f6..d36587fab84a 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RiskAnalysisJobConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RiskAnalysisJobConfig.java
@@ -33,9 +33,6 @@ private RiskAnalysisJobConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1297,7 +1294,7 @@ public RiskAnalysisJobConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RiskAnalysisJobConfig(input, extensionRegistry);
+        return new RiskAnalysisJobConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Schedule.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Schedule.java
index 9c7303c305b3..fb533fc458e6 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Schedule.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Schedule.java
@@ -32,9 +32,6 @@ private Schedule(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -756,7 +753,7 @@ public Schedule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Schedule(input, extensionRegistry);
+        return new Schedule(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StorageConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StorageConfig.java
index 64c22feada3a..c954b420775a 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StorageConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StorageConfig.java
@@ -32,9 +32,6 @@ private StorageConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -275,9 +272,6 @@ private TimespanConfig(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1477,7 +1471,7 @@ public TimespanConfig parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TimespanConfig(input, extensionRegistry);
+          return new TimespanConfig(input, extensionRegistry);
       }
     };
 
@@ -2745,7 +2739,7 @@ public StorageConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StorageConfig(input, extensionRegistry);
+        return new StorageConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Table.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Table.java
index aa4c01bc2f66..2c144de0c4f7 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Table.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Table.java
@@ -34,9 +34,6 @@ private Table(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -157,9 +154,6 @@ private Row(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -841,7 +835,7 @@ public Row parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Row(input, extensionRegistry);
+          return new Row(input, extensionRegistry);
       }
     };
 
@@ -1821,7 +1815,7 @@ public Table parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Table(input, extensionRegistry);
+        return new Table(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TableLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TableLocation.java
index e62a83c67aed..d590c2aacc9e 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TableLocation.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TableLocation.java
@@ -33,9 +33,6 @@ private TableLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -451,7 +448,7 @@ public TableLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TableLocation(input, extensionRegistry);
+        return new TableLocation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TimePartConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TimePartConfig.java
index 635121ebc850..3455cca5f636 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TimePartConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TimePartConfig.java
@@ -34,9 +34,6 @@ private TimePartConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -652,7 +649,7 @@ public TimePartConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TimePartConfig(input, extensionRegistry);
+        return new TimePartConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationOverview.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationOverview.java
index 9ce0f9352218..2a9db114640f 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationOverview.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationOverview.java
@@ -34,9 +34,6 @@ private TransformationOverview(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -891,7 +888,7 @@ public TransformationOverview parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransformationOverview(input, extensionRegistry);
+        return new TransformationOverview(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationSummary.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationSummary.java
index 3c7503157d7a..d04a93302b06 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationSummary.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationSummary.java
@@ -37,9 +37,6 @@ private TransformationSummary(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -345,9 +342,6 @@ private SummaryResult(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -991,7 +985,7 @@ public SummaryResult parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SummaryResult(input, extensionRegistry);
+          return new SummaryResult(input, extensionRegistry);
       }
     };
 
@@ -3047,7 +3041,7 @@ public TransformationSummary parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransformationSummary(input, extensionRegistry);
+        return new TransformationSummary(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransientCryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransientCryptoKey.java
index e61c200437a4..be252f794e96 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransientCryptoKey.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransientCryptoKey.java
@@ -34,9 +34,6 @@ private TransientCryptoKey(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -568,7 +565,7 @@ public TransientCryptoKey parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransientCryptoKey(input, extensionRegistry);
+        return new TransientCryptoKey(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UntypedDeidentifyTemplateName.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UntypedDeidentifyTemplateName.java
index ada27f82d0cb..dd15ba1ca292 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UntypedDeidentifyTemplateName.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UntypedDeidentifyTemplateName.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,14 +79,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UntypedDeidentifyTemplateName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return rawValue;
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UntypedInspectTemplateName.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UntypedInspectTemplateName.java
index 52cf95bf95fe..2bf049079922 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UntypedInspectTemplateName.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UntypedInspectTemplateName.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,14 +79,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UntypedInspectTemplateName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return rawValue;
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKey.java
index 68fcbce8fbc3..11835486b821 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKey.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKey.java
@@ -34,9 +34,6 @@ private UnwrappedCryptoKey(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -455,7 +452,7 @@ public UnwrappedCryptoKey parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UnwrappedCryptoKey(input, extensionRegistry);
+        return new UnwrappedCryptoKey(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateDeidentifyTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateDeidentifyTemplateRequest.java
index dda02e103868..1dfc0ce4bede 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateDeidentifyTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateDeidentifyTemplateRequest.java
@@ -33,9 +33,6 @@ private UpdateDeidentifyTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1003,7 +1000,7 @@ public UpdateDeidentifyTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateDeidentifyTemplateRequest(input, extensionRegistry);
+        return new UpdateDeidentifyTemplateRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateInspectTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateInspectTemplateRequest.java
index 6a9aee82c742..828f10884cf8 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateInspectTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateInspectTemplateRequest.java
@@ -33,9 +33,6 @@ private UpdateInspectTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1003,7 +1000,7 @@ public UpdateInspectTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateInspectTemplateRequest(input, extensionRegistry);
+        return new UpdateInspectTemplateRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateJobTriggerRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateJobTriggerRequest.java
index daa27aefdfb6..a04982ce8828 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateJobTriggerRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateJobTriggerRequest.java
@@ -33,9 +33,6 @@ private UpdateJobTriggerRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -996,7 +993,7 @@ public UpdateJobTriggerRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateJobTriggerRequest(input, extensionRegistry);
+        return new UpdateJobTriggerRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Value.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Value.java
index d01e6a98311b..44a5719a0ed7 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Value.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Value.java
@@ -37,9 +37,6 @@ private Value(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1546,7 +1543,7 @@ public Value parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Value(input, extensionRegistry);
+        return new Value(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ValueFrequency.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ValueFrequency.java
index fe41f94fc60c..cf3655cd3ac1 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ValueFrequency.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ValueFrequency.java
@@ -33,9 +33,6 @@ private ValueFrequency(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -680,7 +677,7 @@ public ValueFrequency parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ValueFrequency(input, extensionRegistry);
+        return new ValueFrequency(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/CommonProto.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/CommonProto.java
index 71a1f151e119..2c7232cbb3d2 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/CommonProto.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/CommonProto.java
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "p_id\030\002 \001(\t\022S\n\017tracking_issues\030\003 \003(\0132:.go" +
       "ogle.devtools.clouderrorreporting.v1beta" +
       "1.TrackingIssue\"\034\n\rTrackingIssue\022\013\n\003url\030" +
-      "\001 \001(\t\"\357\001\n\nErrorEvent\022.\n\nevent_time\030\001 \001(\013" +
+      "\001 \001(\t\"\357\001\n\nErrorEvent\022.\n\nevent_time\030\001 \001(\013",
       "2\032.google.protobuf.Timestamp\022T\n\017service_" +
       "context\030\002 \001(\0132;.google.devtools.clouderr" +
       "orreporting.v1beta1.ServiceContext\022\017\n\007me" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "(\t\022\017\n\007version\030\003 \001(\t\022\025\n\rresource_type\030\004 \001" +
       "(\t\"\311\001\n\014ErrorContext\022U\n\014http_request\030\001 \001(" +
       "\0132?.google.devtools.clouderrorreporting." +
-      "v1beta1.HttpRequestContext\022\014\n\004user\030\002 \001(\t" +
+      "v1beta1.HttpRequestContext\022\014\n\004user\030\002 \001(\t",
       "\022T\n\017report_location\030\003 \001(\0132;.google.devto" +
       "ols.clouderrorreporting.v1beta1.SourceLo" +
       "cation\"\210\001\n\022HttpRequestContext\022\016\n\006method\030" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "ion\022\021\n\tfile_path\030\001 \001(\t\022\023\n\013line_number\030\002 " +
       "\001(\005\022\025\n\rfunction_name\030\004 \001(\tB\354\001\n/com.googl" +
       "e.devtools.clouderrorreporting.v1beta1B\013" +
-      "CommonProtoP\001Z^google.golang.org/genprot" +
+      "CommonProtoP\001Z^google.golang.org/genprot",
       "o/googleapis/devtools/clouderrorreportin" +
       "g/v1beta1;clouderrorreporting\252\002#Google.C" +
       "loud.ErrorReporting.V1Beta1\312\002#Google\\Clo" +
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsRequest.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsRequest.java
index 6026d8f0a5b0..7dcbb819988f 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsRequest.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsRequest.java
@@ -33,9 +33,6 @@ private DeleteEventsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -559,7 +556,7 @@ public DeleteEventsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteEventsRequest(input, extensionRegistry);
+        return new DeleteEventsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsResponse.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsResponse.java
index 7711cdea4d89..d30b3b22cea5 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsResponse.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsResponse.java
@@ -32,9 +32,6 @@ private DeleteEventsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -375,7 +372,7 @@ public DeleteEventsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteEventsResponse(input, extensionRegistry);
+        return new DeleteEventsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorContext.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorContext.java
index 96314a693073..ae00581c4ea0 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorContext.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorContext.java
@@ -36,9 +36,6 @@ private ErrorContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1116,7 +1113,7 @@ public ErrorContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ErrorContext(input, extensionRegistry);
+        return new ErrorContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorEvent.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorEvent.java
index b30bc31ab44b..583286959f24 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorEvent.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorEvent.java
@@ -33,9 +33,6 @@ private ErrorEvent(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1242,7 +1239,7 @@ public ErrorEvent parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ErrorEvent(input, extensionRegistry);
+        return new ErrorEvent(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroup.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroup.java
index f88f8d4be0ad..53db8027af5a 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroup.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroup.java
@@ -35,9 +35,6 @@ private ErrorGroup(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1140,7 +1137,7 @@ public ErrorGroup parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ErrorGroup(input, extensionRegistry);
+        return new ErrorGroup(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceProto.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceProto.java
index ffcce50e6650..a8ef22bf952e 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceProto.java
@@ -42,7 +42,7 @@ public static void registerAllExtensions(
       "\001(\t\"\\\n\022UpdateGroupRequest\022F\n\005group\030\001 \001(\013" +
       "27.google.devtools.clouderrorreporting.v" +
       "1beta1.ErrorGroup2\216\003\n\021ErrorGroupService\022" +
-      "\264\001\n\010GetGroup\022<.google.devtools.clouderro" +
+      "\264\001\n\010GetGroup\022<.google.devtools.clouderro",
       "rreporting.v1beta1.GetGroupRequest\0327.goo" +
       "gle.devtools.clouderrorreporting.v1beta1" +
       ".ErrorGroup\"1\202\323\344\223\002+\022)/v1beta1/{group_nam" +
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "s.clouderrorreporting.v1beta1.ErrorGroup" +
       "\"8\202\323\344\223\0022\032)/v1beta1/{group.name=projects/" +
       "*/groups/*}:\005groupB\367\001\n/com.google.devtoo" +
-      "ls.clouderrorreporting.v1beta1B\026ErrorGro" +
+      "ls.clouderrorreporting.v1beta1B\026ErrorGro",
       "upServiceProtoP\001Z^google.golang.org/genp" +
       "roto/googleapis/devtools/clouderrorrepor" +
       "ting/v1beta1;clouderrorreporting\252\002#Googl" +
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupStats.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupStats.java
index 66c87daba248..3548431ba28b 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupStats.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupStats.java
@@ -38,9 +38,6 @@ private ErrorGroupStats(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2679,7 +2676,7 @@ public ErrorGroupStats parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ErrorGroupStats(input, extensionRegistry);
+        return new ErrorGroupStats(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceProto.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceProto.java
index a1b12446a5cc..a824b80172ff 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceProto.java
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "ogle/protobuf/timestamp.proto\"\241\004\n\025ListGr" +
       "oupStatsRequest\022\024\n\014project_name\030\001 \001(\t\022\020\n" +
       "\010group_id\030\002 \003(\t\022Y\n\016service_filter\030\003 \001(\0132" +
-      "A.google.devtools.clouderrorreporting.v1" +
+      "A.google.devtools.clouderrorreporting.v1",
       "beta1.ServiceContextFilter\022O\n\ntime_range" +
       "\030\005 \001(\0132;.google.devtools.clouderrorrepor" +
       "ting.v1beta1.QueryTimeRange\0227\n\024timed_cou" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "Alignment\0222\n\016alignment_time\030\010 \001(\0132\032.goog" +
       "le.protobuf.Timestamp\022K\n\005order\030\t \001(\0162<.g" +
       "oogle.devtools.clouderrorreporting.v1bet" +
-      "a1.ErrorGroupOrder\022\021\n\tpage_size\030\013 \001(\005\022\022\n" +
+      "a1.ErrorGroupOrder\022\021\n\tpage_size\030\013 \001(\005\022\022\n",
       "\npage_token\030\014 \001(\t\"\300\001\n\026ListGroupStatsResp" +
       "onse\022W\n\021error_group_stats\030\001 \003(\0132<.google" +
       ".devtools.clouderrorreporting.v1beta1.Er" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "p\030\001 \001(\01327.google.devtools.clouderrorrepo" +
       "rting.v1beta1.ErrorGroup\022\r\n\005count\030\002 \001(\003\022" +
       "\034\n\024affected_users_count\030\003 \001(\003\022M\n\014timed_c" +
-      "ounts\030\004 \003(\01327.google.devtools.clouderror" +
+      "ounts\030\004 \003(\01327.google.devtools.clouderror",
       "reporting.v1beta1.TimedCount\0223\n\017first_se" +
       "en_time\030\005 \001(\0132\032.google.protobuf.Timestam" +
       "p\0222\n\016last_seen_time\030\006 \001(\0132\032.google.proto" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "rvices\030\010 \001(\005\022O\n\016representative\030\t \001(\01327.g" +
       "oogle.devtools.clouderrorreporting.v1bet" +
       "a1.ErrorEvent\"y\n\nTimedCount\022\r\n\005count\030\001 \001" +
-      "(\003\022.\n\nstart_time\030\002 \001(\0132\032.google.protobuf" +
+      "(\003\022.\n\nstart_time\030\002 \001(\0132\032.google.protobuf",
       ".Timestamp\022,\n\010end_time\030\003 \001(\0132\032.google.pr" +
       "otobuf.Timestamp\"\216\002\n\021ListEventsRequest\022\024" +
       "\n\014project_name\030\001 \001(\t\022\020\n\010group_id\030\002 \001(\t\022Y" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "evtools.clouderrorreporting.v1beta1.Quer" +
       "yTimeRange\022\021\n\tpage_size\030\006 \001(\005\022\022\n\npage_to" +
       "ken\030\007 \001(\t\"\262\001\n\022ListEventsResponse\022M\n\014erro" +
-      "r_events\030\001 \003(\01327.google.devtools.clouder" +
+      "r_events\030\001 \003(\01327.google.devtools.clouder",
       "rorreporting.v1beta1.ErrorEvent\022\027\n\017next_" +
       "page_token\030\002 \001(\t\0224\n\020time_range_begin\030\004 \001" +
       "(\0132\032.google.protobuf.Timestamp\"\347\001\n\016Query" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "CIFIED\020\000\022\021\n\rPERIOD_1_HOUR\020\001\022\022\n\016PERIOD_6_" +
       "HOURS\020\002\022\020\n\014PERIOD_1_DAY\020\003\022\021\n\rPERIOD_1_WE" +
       "EK\020\004\022\022\n\016PERIOD_30_DAYS\020\005\"O\n\024ServiceConte" +
-      "xtFilter\022\017\n\007service\030\002 \001(\t\022\017\n\007version\030\003 \001" +
+      "xtFilter\022\017\n\007service\030\002 \001(\t\022\017\n\007version\030\003 \001",
       "(\t\022\025\n\rresource_type\030\004 \001(\t\"+\n\023DeleteEvent" +
       "sRequest\022\024\n\014project_name\030\001 \001(\t\"\026\n\024Delete" +
       "EventsResponse*u\n\023TimedCountAlignment\022%\n" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "P_ORDER_UNSPECIFIED\020\000\022\016\n\nCOUNT_DESC\020\001\022\022\n" +
       "\016LAST_SEEN_DESC\020\002\022\020\n\014CREATED_DESC\020\003\022\027\n\023A" +
       "FFECTED_USERS_DESC\020\0042\362\004\n\021ErrorStatsServi" +
-      "ce\022\320\001\n\016ListGroupStats\022B.google.devtools." +
+      "ce\022\320\001\n\016ListGroupStats\022B.google.devtools.",
       "clouderrorreporting.v1beta1.ListGroupSta" +
       "tsRequest\032C.google.devtools.clouderrorre" +
       "porting.v1beta1.ListGroupStatsResponse\"5" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "ventsRequest\032?.google.devtools.clouderro" +
       "rreporting.v1beta1.ListEventsResponse\"1\202" +
       "\323\344\223\002+\022)/v1beta1/{project_name=projects/*" +
-      "}/events\022\306\001\n\014DeleteEvents\022@.google.devto" +
+      "}/events\022\306\001\n\014DeleteEvents\022@.google.devto",
       "ols.clouderrorreporting.v1beta1.DeleteEv" +
       "entsRequest\032A.google.devtools.clouderror" +
       "reporting.v1beta1.DeleteEventsResponse\"1" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "ProtoP\001Z^google.golang.org/genproto/goog" +
       "leapis/devtools/clouderrorreporting/v1be" +
       "ta1;clouderrorreporting\252\002#Google.Cloud.E" +
-      "rrorReporting.V1Beta1\312\002#Google\\Cloud\\Err" +
+      "rrorReporting.V1Beta1\312\002#Google\\Cloud\\Err",
       "orReporting\\V1beta1b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/GetGroupRequest.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/GetGroupRequest.java
index 8931f13f4015..fb79fdd1147d 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/GetGroupRequest.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/GetGroupRequest.java
@@ -33,9 +33,6 @@ private GetGroupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -573,7 +570,7 @@ public GetGroupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetGroupRequest(input, extensionRegistry);
+        return new GetGroupRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/GroupName.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/GroupName.java
index e67aa0795661..f73c2ae6eb7a 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/GroupName.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/GroupName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("GroupName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "group", group);
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/HttpRequestContext.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/HttpRequestContext.java
index 4afd10104467..c7e1d7fe78ac 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/HttpRequestContext.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/HttpRequestContext.java
@@ -41,9 +41,6 @@ private HttpRequestContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1252,7 +1249,7 @@ public HttpRequestContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HttpRequestContext(input, extensionRegistry);
+        return new HttpRequestContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsRequest.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsRequest.java
index 4ba32760a943..baffd7370d96 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsRequest.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsRequest.java
@@ -36,9 +36,6 @@ private ListEventsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1449,7 +1446,7 @@ public ListEventsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListEventsRequest(input, extensionRegistry);
+        return new ListEventsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsResponse.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsResponse.java
index cadfb27b3d69..4f3787042288 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsResponse.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsResponse.java
@@ -34,9 +34,6 @@ private ListEventsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1214,7 +1211,7 @@ public ListEventsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListEventsResponse(input, extensionRegistry);
+        return new ListEventsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsRequest.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsRequest.java
index 7d42b07f2f3f..0c27c08684c5 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsRequest.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsRequest.java
@@ -38,9 +38,6 @@ private ListGroupStatsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2305,7 +2302,7 @@ public ListGroupStatsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListGroupStatsRequest(input, extensionRegistry);
+        return new ListGroupStatsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsResponse.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsResponse.java
index df34134863fb..f69fb284edd0 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsResponse.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsResponse.java
@@ -34,9 +34,6 @@ private ListGroupStatsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1250,7 +1247,7 @@ public ListGroupStatsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListGroupStatsResponse(input, extensionRegistry);
+        return new ListGroupStatsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ProjectName.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ProjectName.java
index ff3eb421d24e..ec0d69a21093 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/QueryTimeRange.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/QueryTimeRange.java
index a6d3e71d47fe..ee217f9780db 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/QueryTimeRange.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/QueryTimeRange.java
@@ -34,9 +34,6 @@ private QueryTimeRange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -685,7 +682,7 @@ public QueryTimeRange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryTimeRange(input, extensionRegistry);
+        return new QueryTimeRange(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventRequest.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventRequest.java
index d98608535447..d88793879228 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventRequest.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventRequest.java
@@ -33,9 +33,6 @@ private ReportErrorEventRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -781,7 +778,7 @@ public ReportErrorEventRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReportErrorEventRequest(input, extensionRegistry);
+        return new ReportErrorEventRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventResponse.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventResponse.java
index 0d2fe243a390..0183fdfe61f2 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventResponse.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventResponse.java
@@ -33,9 +33,6 @@ private ReportErrorEventResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -377,7 +374,7 @@ public ReportErrorEventResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReportErrorEventResponse(input, extensionRegistry);
+        return new ReportErrorEventResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceProto.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceProto.java
index 92f9797f54cd..03050c5ee946 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "\177\n\027ReportErrorEventRequest\022\024\n\014project_na" +
       "me\030\001 \001(\t\022N\n\005event\030\002 \001(\0132?.google.devtool" +
       "s.clouderrorreporting.v1beta1.ReportedEr" +
-      "rorEvent\"\032\n\030ReportErrorEventResponse\"\367\001\n" +
+      "rorEvent\"\032\n\030ReportErrorEventResponse\"\367\001\n",
       "\022ReportedErrorEvent\022.\n\nevent_time\030\001 \001(\0132" +
       "\032.google.protobuf.Timestamp\022T\n\017service_c" +
       "ontext\030\002 \001(\0132;.google.devtools.clouderro" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "ontext2\370\001\n\023ReportErrorsService\022\340\001\n\020Repor" +
       "tErrorEvent\022D.google.devtools.clouderror" +
       "reporting.v1beta1.ReportErrorEventReques" +
-      "t\032E.google.devtools.clouderrorreporting." +
+      "t\032E.google.devtools.clouderrorreporting.",
       "v1beta1.ReportErrorEventResponse\"?\202\323\344\223\0029" +
       "\"0/v1beta1/{project_name=projects/*}/eve" +
       "nts:report:\005eventB\371\001\n/com.google.devtool" +
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportedErrorEvent.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportedErrorEvent.java
index ea8e572a9a30..20ad60b1b894 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportedErrorEvent.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportedErrorEvent.java
@@ -33,9 +33,6 @@ private ReportedErrorEvent(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1263,7 +1260,7 @@ public ReportedErrorEvent parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReportedErrorEvent(input, extensionRegistry);
+        return new ReportedErrorEvent(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContext.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContext.java
index 9ed6006849ff..5703de39d953 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContext.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContext.java
@@ -36,9 +36,6 @@ private ServiceContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -906,7 +903,7 @@ public ServiceContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ServiceContext(input, extensionRegistry);
+        return new ServiceContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContextFilter.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContextFilter.java
index 572572fa461e..a7433d163258 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContextFilter.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContextFilter.java
@@ -38,9 +38,6 @@ private ServiceContextFilter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -868,7 +865,7 @@ public ServiceContextFilter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ServiceContextFilter(input, extensionRegistry);
+        return new ServiceContextFilter(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/SourceLocation.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/SourceLocation.java
index 45aa2c35e22f..4c73cba81843 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/SourceLocation.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/SourceLocation.java
@@ -39,9 +39,6 @@ private SourceLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -789,7 +786,7 @@ public SourceLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SourceLocation(input, extensionRegistry);
+        return new SourceLocation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TimedCount.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TimedCount.java
index 10ac77d1f488..7ed9f296d2ac 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TimedCount.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TimedCount.java
@@ -35,9 +35,6 @@ private TimedCount(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -913,7 +910,7 @@ public TimedCount parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TimedCount(input, extensionRegistry);
+        return new TimedCount(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TrackingIssue.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TrackingIssue.java
index 23e8eb965f7a..ab01f20ea591 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TrackingIssue.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TrackingIssue.java
@@ -33,9 +33,6 @@ private TrackingIssue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public TrackingIssue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TrackingIssue(input, extensionRegistry);
+        return new TrackingIssue(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/UpdateGroupRequest.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/UpdateGroupRequest.java
index f89354f9e330..9a3bf5cce94b 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/UpdateGroupRequest.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/UpdateGroupRequest.java
@@ -32,9 +32,6 @@ private UpdateGroupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public UpdateGroupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateGroupRequest(input, extensionRegistry);
+        return new UpdateGroupRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/AnyPathName.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/AnyPathName.java
index 787390082c5f..eb99fe4f26ea 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/AnyPathName.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/AnyPathName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -140,14 +139,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("AnyPathName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "database", database, "document", document, "any_path", anyPath);
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ArrayValue.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ArrayValue.java
index 05abcb695af6..9db63bfc1626 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ArrayValue.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ArrayValue.java
@@ -33,9 +33,6 @@ private ArrayValue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public ArrayValue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ArrayValue(input, extensionRegistry);
+        return new ArrayValue(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsRequest.java
index f075c799eacc..07547c6c990a 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsRequest.java
@@ -34,9 +34,6 @@ private BatchGetDocumentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1768,7 +1765,7 @@ public BatchGetDocumentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchGetDocumentsRequest(input, extensionRegistry);
+        return new BatchGetDocumentsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsResponse.java
index 5a4014ae03b5..5011b50781eb 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsResponse.java
@@ -33,9 +33,6 @@ private BatchGetDocumentsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1235,7 +1232,7 @@ public BatchGetDocumentsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchGetDocumentsResponse(input, extensionRegistry);
+        return new BatchGetDocumentsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionRequest.java
index 986ab5956ca8..da56a69ffa59 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionRequest.java
@@ -33,9 +33,6 @@ private BeginTransactionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -779,7 +776,7 @@ public BeginTransactionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BeginTransactionRequest(input, extensionRegistry);
+        return new BeginTransactionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionResponse.java
index 2a7be2671014..3ea8fd9b0213 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionResponse.java
@@ -33,9 +33,6 @@ private BeginTransactionResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -453,7 +450,7 @@ public BeginTransactionResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BeginTransactionResponse(input, extensionRegistry);
+        return new BeginTransactionResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitRequest.java
index 750a167685ac..d73b6b83bbeb 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitRequest.java
@@ -35,9 +35,6 @@ private CommitRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1078,7 +1075,7 @@ public CommitRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitRequest(input, extensionRegistry);
+        return new CommitRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitResponse.java
index b658d5f33318..893c6c4b0c11 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitResponse.java
@@ -33,9 +33,6 @@ private CommitResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1091,7 +1088,7 @@ public CommitResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitResponse(input, extensionRegistry);
+        return new CommitResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommonProto.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommonProto.java
index a2f1961b1db8..81ec3ade5f01 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommonProto.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommonProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "imestampH\000B\020\n\016condition_type\"\263\002\n\022Transac" +
       "tionOptions\022J\n\tread_only\030\002 \001(\01325.google." +
       "firestore.v1beta1.TransactionOptions.Rea" +
-      "dOnlyH\000\022L\n\nread_write\030\003 \001(\01326.google.fir" +
+      "dOnlyH\000\022L\n\nread_write\030\003 \001(\01326.google.fir",
       "estore.v1beta1.TransactionOptions.ReadWr" +
       "iteH\000\032&\n\tReadWrite\022\031\n\021retry_transaction\030" +
       "\001 \001(\014\032S\n\010ReadOnly\022/\n\tread_time\030\002 \001(\0132\032.g" +
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CreateDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CreateDocumentRequest.java
index 5082a423cc69..ab61e5b6f324 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CreateDocumentRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CreateDocumentRequest.java
@@ -35,9 +35,6 @@ private CreateDocumentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1344,7 +1341,7 @@ public CreateDocumentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDocumentRequest(input, extensionRegistry);
+        return new CreateDocumentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Cursor.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Cursor.java
index ccdff984127b..f298bd3a8e0e 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Cursor.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Cursor.java
@@ -34,9 +34,6 @@ private Cursor(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -941,7 +938,7 @@ public Cursor parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Cursor(input, extensionRegistry);
+        return new Cursor(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DatabaseRootName.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DatabaseRootName.java
index 9879cbf33d10..3139a5791b72 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DatabaseRootName.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DatabaseRootName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("DatabaseRootName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "database", database);
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DeleteDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DeleteDocumentRequest.java
index 50d5ab026792..10fa0522a6c2 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DeleteDocumentRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DeleteDocumentRequest.java
@@ -33,9 +33,6 @@ private DeleteDocumentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -779,7 +776,7 @@ public DeleteDocumentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteDocumentRequest(input, extensionRegistry);
+        return new DeleteDocumentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Document.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Document.java
index 5d9f1bd73a1c..085c37f8f4af 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Document.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Document.java
@@ -34,9 +34,6 @@ private Document(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1589,7 +1586,7 @@ public Document parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Document(input, extensionRegistry);
+        return new Document(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentChange.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentChange.java
index c3ae5e92fe68..79a46d8d1f3d 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentChange.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentChange.java
@@ -38,9 +38,6 @@ private DocumentChange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1027,7 +1024,7 @@ public DocumentChange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DocumentChange(input, extensionRegistry);
+        return new DocumentChange(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentDelete.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentDelete.java
index fb6f4500adf2..7a38c2145b18 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentDelete.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentDelete.java
@@ -38,9 +38,6 @@ private DocumentDelete(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -984,7 +981,7 @@ public DocumentDelete parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DocumentDelete(input, extensionRegistry);
+        return new DocumentDelete(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentMask.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentMask.java
index 325315adc449..17306fd5e8f9 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentMask.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentMask.java
@@ -37,9 +37,6 @@ private DocumentMask(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -621,7 +618,7 @@ public DocumentMask parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DocumentMask(input, extensionRegistry);
+        return new DocumentMask(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentPathName.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentPathName.java
index ee165c0bbf56..40335021d7f9 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentPathName.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentPathName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("DocumentPathName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "database", database, "document_path", documentPath);
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentProto.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentProto.java
index 4148458381b2..b8d5c4dcc282 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentProto.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentProto.java
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "irestore.v1beta1.Document.FieldsEntry\022/\n" +
       "\013create_time\030\003 \001(\0132\032.google.protobuf.Tim" +
       "estamp\022/\n\013update_time\030\004 \001(\0132\032.google.pro" +
-      "tobuf.Timestamp\032N\n\013FieldsEntry\022\013\n\003key\030\001 " +
+      "tobuf.Timestamp\032N\n\013FieldsEntry\022\013\n\003key\030\001 ",
       "\001(\t\022.\n\005value\030\002 \001(\0132\037.google.firestore.v1" +
       "beta1.Value:\0028\001\"\270\003\n\005Value\0220\n\nnull_value\030" +
       "\013 \001(\0162\032.google.protobuf.NullValueH\000\022\027\n\rb" +
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "mpH\000\022\026\n\014string_value\030\021 \001(\tH\000\022\025\n\013bytes_va" +
       "lue\030\022 \001(\014H\000\022\031\n\017reference_value\030\005 \001(\tH\000\022." +
       "\n\017geo_point_value\030\010 \001(\0132\023.google.type.La" +
-      "tLngH\000\022;\n\013array_value\030\t \001(\0132$.google.fir" +
+      "tLngH\000\022;\n\013array_value\030\t \001(\0132$.google.fir",
       "estore.v1beta1.ArrayValueH\000\0227\n\tmap_value" +
       "\030\006 \001(\0132\".google.firestore.v1beta1.MapVal" +
       "ueH\000B\014\n\nvalue_type\"=\n\nArrayValue\022/\n\006valu" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "\n\013FieldsEntry\022\013\n\003key\030\001 \001(\t\022.\n\005value\030\002 \001(" +
       "\0132\037.google.firestore.v1beta1.Value:\0028\001B\273" +
       "\001\n\034com.google.firestore.v1beta1B\rDocumen" +
-      "tProtoP\001ZAgoogle.golang.org/genproto/goo" +
+      "tProtoP\001ZAgoogle.golang.org/genproto/goo",
       "gleapis/firestore/v1beta1;firestore\242\002\004GC" +
       "FS\252\002\036Google.Cloud.Firestore.V1Beta1\312\002\036Go" +
       "ogle\\Cloud\\Firestore\\V1beta1b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRemove.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRemove.java
index 7bead3097d90..c2f377a47b2b 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRemove.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRemove.java
@@ -39,9 +39,6 @@ private DocumentRemove(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -986,7 +983,7 @@ public DocumentRemove parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DocumentRemove(input, extensionRegistry);
+        return new DocumentRemove(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRootName.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRootName.java
index ecc59e046da2..ad444f3d493b 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRootName.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRootName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("DocumentRootName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "database", database);
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentTransform.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentTransform.java
index e5507ea5df68..740f15f3f0de 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentTransform.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentTransform.java
@@ -34,9 +34,6 @@ private DocumentTransform(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -170,9 +167,6 @@ private FieldTransform(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -996,7 +990,7 @@ public FieldTransform parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FieldTransform(input, extensionRegistry);
+          return new FieldTransform(input, extensionRegistry);
       }
     };
 
@@ -1935,7 +1929,7 @@ public DocumentTransform parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DocumentTransform(input, extensionRegistry);
+        return new DocumentTransform(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ExistenceFilter.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ExistenceFilter.java
index f0aa167bbf9e..f80cae49451c 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ExistenceFilter.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ExistenceFilter.java
@@ -34,9 +34,6 @@ private ExistenceFilter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -532,7 +529,7 @@ public ExistenceFilter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExistenceFilter(input, extensionRegistry);
+        return new ExistenceFilter(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/FirestoreProto.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/FirestoreProto.java
index 00da6dafbe5e..f81f43290a5e 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/FirestoreProto.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/FirestoreProto.java
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "a1/write.proto\032\033google/protobuf/empty.pr" +
       "oto\032\037google/protobuf/timestamp.proto\032\027go" +
       "ogle/rpc/status.proto\"\270\001\n\022GetDocumentReq" +
-      "uest\022\014\n\004name\030\001 \001(\t\0224\n\004mask\030\002 \001(\0132&.googl" +
+      "uest\022\014\n\004name\030\001 \001(\t\0224\n\004mask\030\002 \001(\0132&.googl",
       "e.firestore.v1beta1.DocumentMask\022\025\n\013tran" +
       "saction\030\003 \001(\014H\000\022/\n\tread_time\030\005 \001(\0132\032.goo" +
       "gle.protobuf.TimestampH\000B\026\n\024consistency_" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "_by\030\006 \001(\t\0224\n\004mask\030\007 \001(\0132&.google.firesto" +
       "re.v1beta1.DocumentMask\022\025\n\013transaction\030\010" +
       " \001(\014H\000\022/\n\tread_time\030\n \001(\0132\032.google.proto" +
-      "buf.TimestampH\000\022\024\n\014show_missing\030\014 \001(\010B\026\n" +
+      "buf.TimestampH\000\022\024\n\014show_missing\030\014 \001(\010B\026\n",
       "\024consistency_selector\"g\n\025ListDocumentsRe" +
       "sponse\0225\n\tdocuments\030\001 \003(\0132\".google.fires" +
       "tore.v1beta1.Document\022\027\n\017next_page_token" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "firestore.v1beta1.Document\0224\n\004mask\030\005 \001(\013" +
       "2&.google.firestore.v1beta1.DocumentMask" +
       "\"\202\002\n\025UpdateDocumentRequest\0224\n\010document\030\001" +
-      " \001(\0132\".google.firestore.v1beta1.Document" +
+      " \001(\0132\".google.firestore.v1beta1.Document",
       "\022;\n\013update_mask\030\002 \001(\0132&.google.firestore" +
       ".v1beta1.DocumentMask\0224\n\004mask\030\003 \001(\0132&.go" +
       "ogle.firestore.v1beta1.DocumentMask\022@\n\020c" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "\030\002 \001(\0132&.google.firestore.v1beta1.Precon" +
       "dition\"\236\002\n\030BatchGetDocumentsRequest\022\020\n\010d" +
       "atabase\030\001 \001(\t\022\021\n\tdocuments\030\002 \003(\t\0224\n\004mask" +
-      "\030\003 \001(\0132&.google.firestore.v1beta1.Docume" +
+      "\030\003 \001(\0132&.google.firestore.v1beta1.Docume",
       "ntMask\022\025\n\013transaction\030\004 \001(\014H\000\022G\n\017new_tra" +
       "nsaction\030\005 \001(\0132,.google.firestore.v1beta" +
       "1.TransactionOptionsH\000\022/\n\tread_time\030\007 \001(" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "v1beta1.DocumentH\000\022\021\n\007missing\030\002 \001(\tH\000\022\023\n" +
       "\013transaction\030\003 \001(\014\022-\n\tread_time\030\004 \001(\0132\032." +
       "google.protobuf.TimestampB\010\n\006result\"j\n\027B" +
-      "eginTransactionRequest\022\020\n\010database\030\001 \001(\t" +
+      "eginTransactionRequest\022\020\n\010database\030\001 \001(\t",
       "\022=\n\007options\030\002 \001(\0132,.google.firestore.v1b" +
       "eta1.TransactionOptions\"/\n\030BeginTransact" +
       "ionResponse\022\023\n\013transaction\030\001 \001(\014\"g\n\rComm" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "rite_results\030\001 \003(\0132%.google.firestore.v1" +
       "beta1.WriteResult\022/\n\013commit_time\030\002 \001(\0132\032" +
       ".google.protobuf.Timestamp\"8\n\017RollbackRe" +
-      "quest\022\020\n\010database\030\001 \001(\t\022\023\n\013transaction\030\002" +
+      "quest\022\020\n\010database\030\001 \001(\t\022\023\n\013transaction\030\002",
       " \001(\014\"\237\002\n\017RunQueryRequest\022\016\n\006parent\030\001 \001(\t" +
       "\022E\n\020structured_query\030\002 \001(\0132).google.fire" +
       "store.v1beta1.StructuredQueryH\000\022\025\n\013trans" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "obuf.TimestampH\001B\014\n\nquery_typeB\026\n\024consis" +
       "tency_selector\"\245\001\n\020RunQueryResponse\022\023\n\013t" +
       "ransaction\030\002 \001(\014\0224\n\010document\030\001 \001(\0132\".goo" +
-      "gle.firestore.v1beta1.Document\022-\n\tread_t" +
+      "gle.firestore.v1beta1.Document\022-\n\tread_t",
       "ime\030\003 \001(\0132\032.google.protobuf.Timestamp\022\027\n" +
       "\017skipped_results\030\004 \001(\005\"\355\001\n\014WriteRequest\022" +
       "\020\n\010database\030\001 \001(\t\022\021\n\tstream_id\030\002 \001(\t\022/\n\006" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "est.LabelsEntry\032-\n\013LabelsEntry\022\013\n\003key\030\001 " +
       "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\247\001\n\rWriteResponse" +
       "\022\021\n\tstream_id\030\001 \001(\t\022\024\n\014stream_token\030\002 \001(" +
-      "\014\022<\n\rwrite_results\030\003 \003(\0132%.google.firest" +
+      "\014\022<\n\rwrite_results\030\003 \003(\0132%.google.firest",
       "ore.v1beta1.WriteResult\022/\n\013commit_time\030\004" +
       " \001(\0132\032.google.protobuf.Timestamp\"\367\001\n\rLis" +
       "tenRequest\022\020\n\010database\030\001 \001(\t\0226\n\nadd_targ" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       "equest.LabelsEntry\032-\n\013LabelsEntry\022\013\n\003key" +
       "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\017\n\rtarget_chan" +
       "ge\"\356\002\n\016ListenResponse\022?\n\rtarget_change\030\002" +
-      " \001(\0132&.google.firestore.v1beta1.TargetCh" +
+      " \001(\0132&.google.firestore.v1beta1.TargetCh",
       "angeH\000\022C\n\017document_change\030\003 \001(\0132(.google" +
       ".firestore.v1beta1.DocumentChangeH\000\022C\n\017d" +
       "ocument_delete\030\004 \001(\0132(.google.firestore." +
@@ -257,7 +257,7 @@ public static void registerAllExtensions(
       "irestore.v1beta1.ExistenceFilterH\000B\017\n\rre" +
       "sponse_type\"\260\003\n\006Target\022=\n\005query\030\002 \001(\0132,." +
       "google.firestore.v1beta1.Target.QueryTar" +
-      "getH\000\022E\n\tdocuments\030\003 \001(\01320.google.firest" +
+      "getH\000\022E\n\tdocuments\030\003 \001(\01320.google.firest",
       "ore.v1beta1.Target.DocumentsTargetH\000\022\026\n\014" +
       "resume_token\030\004 \001(\014H\001\022/\n\tread_time\030\013 \001(\0132" +
       "\032.google.protobuf.TimestampH\001\022\021\n\ttarget_" +
@@ -267,7 +267,7 @@ public static void registerAllExtensions(
       "google.firestore.v1beta1.StructuredQuery" +
       "H\000B\014\n\nquery_typeB\r\n\013target_typeB\r\n\013resum" +
       "e_type\"\257\002\n\014TargetChange\022S\n\022target_change" +
-      "_type\030\001 \001(\01627.google.firestore.v1beta1.T" +
+      "_type\030\001 \001(\01627.google.firestore.v1beta1.T",
       "argetChange.TargetChangeType\022\022\n\ntarget_i" +
       "ds\030\002 \003(\005\022!\n\005cause\030\003 \001(\0132\022.google.rpc.Sta" +
       "tus\022\024\n\014resume_token\030\004 \001(\014\022-\n\tread_time\030\006" +
@@ -277,7 +277,7 @@ public static void registerAllExtensions(
       "CollectionIdsRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\t" +
       "page_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"L\n\031L" +
       "istCollectionIdsResponse\022\026\n\016collection_i" +
-      "ds\030\001 \003(\t\022\027\n\017next_page_token\030\002 \001(\t2\255\022\n\tFi" +
+      "ds\030\001 \003(\t\022\027\n\017next_page_token\030\002 \001(\t2\255\022\n\tFi",
       "restore\022\236\001\n\013GetDocument\022,.google.firesto" +
       "re.v1beta1.GetDocumentRequest\032\".google.f" +
       "irestore.v1beta1.Document\"=\202\323\344\223\0027\0225/v1be" +
@@ -287,7 +287,7 @@ public static void registerAllExtensions(
       "gle.firestore.v1beta1.ListDocumentsRespo" +
       "nse\"O\202\323\344\223\002I\022G/v1beta1/{parent=projects/*" +
       "/databases/*/documents/*/**}/{collection" +
-      "_id}\022\276\001\n\016CreateDocument\022/.google.firesto" +
+      "_id}\022\276\001\n\016CreateDocument\022/.google.firesto",
       "re.v1beta1.CreateDocumentRequest\032\".googl" +
       "e.firestore.v1beta1.Document\"W\202\323\344\223\002Q\"E/v" +
       "1beta1/{parent=projects/*/databases/*/do" +
@@ -297,7 +297,7 @@ public static void registerAllExtensions(
       "tore.v1beta1.Document\"P\202\323\344\223\002J2>/v1beta1/" +
       "{document.name=projects/*/databases/*/do" +
       "cuments/*/**}:\010document\022\230\001\n\016DeleteDocume" +
-      "nt\022/.google.firestore.v1beta1.DeleteDocu" +
+      "nt\022/.google.firestore.v1beta1.DeleteDocu",
       "mentRequest\032\026.google.protobuf.Empty\"=\202\323\344" +
       "\223\0027*5/v1beta1/{name=projects/*/databases" +
       "/*/documents/*/**}\022\310\001\n\021BatchGetDocuments" +
@@ -307,7 +307,7 @@ public static void registerAllExtensions(
       "ta1/{database=projects/*/databases/*}/do" +
       "cuments:batchGet:\001*0\001\022\313\001\n\020BeginTransacti" +
       "on\0221.google.firestore.v1beta1.BeginTrans" +
-      "actionRequest\0322.google.firestore.v1beta1" +
+      "actionRequest\0322.google.firestore.v1beta1",
       ".BeginTransactionResponse\"P\202\323\344\223\002J\"E/v1be" +
       "ta1/{database=projects/*/databases/*}/do" +
       "cuments:beginTransaction:\001*\022\243\001\n\006Commit\022\'" +
@@ -317,7 +317,7 @@ public static void registerAllExtensions(
       "/databases/*}/documents:commit:\001*\022\227\001\n\010Ro" +
       "llback\022).google.firestore.v1beta1.Rollba" +
       "ckRequest\032\026.google.protobuf.Empty\"H\202\323\344\223\002" +
-      "B\"=/v1beta1/{database=projects/*/databas" +
+      "B\"=/v1beta1/{database=projects/*/databas",
       "es/*}/documents:rollback:\001*\022\253\001\n\010RunQuery" +
       "\022).google.firestore.v1beta1.RunQueryRequ" +
       "est\032*.google.firestore.v1beta1.RunQueryR" +
@@ -327,7 +327,7 @@ public static void registerAllExtensions(
       "riteRequest\032\'.google.firestore.v1beta1.W" +
       "riteResponse\"E\202\323\344\223\002?\":/v1beta1/{database" +
       "=projects/*/databases/*}/documents:write" +
-      ":\001*(\0010\001\022\247\001\n\006Listen\022\'.google.firestore.v1" +
+      ":\001*(\0010\001\022\247\001\n\006Listen\022\'.google.firestore.v1",
       "beta1.ListenRequest\032(.google.firestore.v" +
       "1beta1.ListenResponse\"F\202\323\344\223\002@\";/v1beta1/" +
       "{database=projects/*/databases/*}/docume" +
@@ -337,7 +337,7 @@ public static void registerAllExtensions(
       "istCollectionIdsResponse\"O\202\323\344\223\002I\"D/v1bet" +
       "a1/{parent=projects/*/databases/*/docume" +
       "nts}:listCollectionIds:\001*B\274\001\n\034com.google" +
-      ".firestore.v1beta1B\016FirestoreProtoP\001ZAgo" +
+      ".firestore.v1beta1B\016FirestoreProtoP\001ZAgo",
       "ogle.golang.org/genproto/googleapis/fire" +
       "store/v1beta1;firestore\242\002\004GCFS\252\002\036Google." +
       "Cloud.Firestore.V1Beta1\312\002\036Google\\Cloud\\F" +
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/GetDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/GetDocumentRequest.java
index 8387d4ade941..0aa951e92ee9 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/GetDocumentRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/GetDocumentRequest.java
@@ -33,9 +33,6 @@ private GetDocumentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1214,7 +1211,7 @@ public GetDocumentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDocumentRequest(input, extensionRegistry);
+        return new GetDocumentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsRequest.java
index be5dc152cdba..14dc747ac894 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsRequest.java
@@ -35,9 +35,6 @@ private ListCollectionIdsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -788,7 +785,7 @@ public ListCollectionIdsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListCollectionIdsRequest(input, extensionRegistry);
+        return new ListCollectionIdsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsResponse.java
index c8ba3b9cb2a2..7d8b84f67f8a 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsResponse.java
@@ -34,9 +34,6 @@ private ListCollectionIdsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -758,7 +755,7 @@ public ListCollectionIdsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListCollectionIdsResponse(input, extensionRegistry);
+        return new ListCollectionIdsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsRequest.java
index 7236774c490e..4f2b30947b8b 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsRequest.java
@@ -38,9 +38,6 @@ private ListDocumentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1883,7 +1880,7 @@ public ListDocumentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDocumentsRequest(input, extensionRegistry);
+        return new ListDocumentsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsResponse.java
index e835ce7e1bab..83b12e212b57 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsResponse.java
@@ -34,9 +34,6 @@ private ListDocumentsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -971,7 +968,7 @@ public ListDocumentsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDocumentsResponse(input, extensionRegistry);
+        return new ListDocumentsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenRequest.java
index eabd82a7bf00..8bdd48e47c12 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenRequest.java
@@ -33,9 +33,6 @@ private ListenRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1267,7 +1264,7 @@ public ListenRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListenRequest(input, extensionRegistry);
+        return new ListenRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenResponse.java
index e2433c804b71..da062a1df055 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenResponse.java
@@ -32,9 +32,6 @@ private ListenResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1752,7 +1749,7 @@ public ListenResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListenResponse(input, extensionRegistry);
+        return new ListenResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/MapValue.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/MapValue.java
index 339fc5165380..4def1a170016 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/MapValue.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/MapValue.java
@@ -32,9 +32,6 @@ private MapValue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -738,7 +735,7 @@ public MapValue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MapValue(input, extensionRegistry);
+        return new MapValue(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Precondition.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Precondition.java
index 9258e157ca8a..1b737936bb7b 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Precondition.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Precondition.java
@@ -32,9 +32,6 @@ private Precondition(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -801,7 +798,7 @@ public Precondition parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Precondition(input, extensionRegistry);
+        return new Precondition(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/QueryProto.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/QueryProto.java
index 54877cb56fb6..2fb320554437 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/QueryProto.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/QueryProto.java
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "dQuery.Projection\022J\n\004from\030\002 \003(\0132<.google" +
       ".firestore.v1beta1.StructuredQuery.Colle" +
       "ctionSelector\022?\n\005where\030\003 \001(\01320.google.fi" +
-      "restore.v1beta1.StructuredQuery.Filter\022A" +
+      "restore.v1beta1.StructuredQuery.Filter\022A",
       "\n\010order_by\030\004 \003(\0132/.google.firestore.v1be" +
       "ta1.StructuredQuery.Order\0222\n\010start_at\030\007 " +
       "\001(\0132 .google.firestore.v1beta1.Cursor\0220\n" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "nSelector\022\025\n\rcollection_id\030\002 \001(\t\022\027\n\017all_" +
       "descendants\030\003 \001(\010\032\214\002\n\006Filter\022U\n\020composit" +
       "e_filter\030\001 \001(\01329.google.firestore.v1beta" +
-      "1.StructuredQuery.CompositeFilterH\000\022M\n\014f" +
+      "1.StructuredQuery.CompositeFilterH\000\022M\n\014f",
       "ield_filter\030\002 \001(\01325.google.firestore.v1b" +
       "eta1.StructuredQuery.FieldFilterH\000\022M\n\014un" +
       "ary_filter\030\003 \001(\01325.google.firestore.v1be" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "ery.CompositeFilter.Operator\022A\n\007filters\030" +
       "\002 \003(\01320.google.firestore.v1beta1.Structu" +
       "redQuery.Filter\"-\n\010Operator\022\030\n\024OPERATOR_" +
-      "UNSPECIFIED\020\000\022\007\n\003AND\020\001\032\330\002\n\013FieldFilter\022G" +
+      "UNSPECIFIED\020\000\022\007\n\003AND\020\001\032\330\002\n\013FieldFilter\022G",
       "\n\005field\030\001 \001(\01328.google.firestore.v1beta1" +
       ".StructuredQuery.FieldReference\022J\n\002op\030\002 " +
       "\001(\0162>.google.firestore.v1beta1.Structure" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "SS_THAN\020\001\022\026\n\022LESS_THAN_OR_EQUAL\020\002\022\020\n\014GRE" +
       "ATER_THAN\020\003\022\031\n\025GREATER_THAN_OR_EQUAL\020\004\022\t" +
       "\n\005EQUAL\020\005\032\363\001\n\013UnaryFilter\022J\n\002op\030\001 \001(\0162>." +
-      "google.firestore.v1beta1.StructuredQuery" +
+      "google.firestore.v1beta1.StructuredQuery",
       ".UnaryFilter.Operator\022I\n\005field\030\002 \001(\01328.g" +
       "oogle.firestore.v1beta1.StructuredQuery." +
       "FieldReferenceH\000\"=\n\010Operator\022\030\n\024OPERATOR" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "ery.FieldReference\022F\n\tdirection\030\002 \001(\01623." +
       "google.firestore.v1beta1.StructuredQuery" +
       ".Direction\032$\n\016FieldReference\022\022\n\nfield_pa" +
-      "th\030\002 \001(\t\032V\n\nProjection\022H\n\006fields\030\002 \003(\01328" +
+      "th\030\002 \001(\t\032V\n\nProjection\022H\n\006fields\030\002 \003(\01328",
       ".google.firestore.v1beta1.StructuredQuer" +
       "y.FieldReference\"E\n\tDirection\022\031\n\025DIRECTI" +
       "ON_UNSPECIFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCE" +
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RollbackRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RollbackRequest.java
index a80bd992accf..3876f05aae5e 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RollbackRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RollbackRequest.java
@@ -34,9 +34,6 @@ private RollbackRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -615,7 +612,7 @@ public RollbackRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RollbackRequest(input, extensionRegistry);
+        return new RollbackRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryRequest.java
index aca7b6d30edf..8f39c0205ae0 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryRequest.java
@@ -33,9 +33,6 @@ private RunQueryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1597,7 +1594,7 @@ public RunQueryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RunQueryRequest(input, extensionRegistry);
+        return new RunQueryRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryResponse.java
index d15f1b066f11..e77a719cbca9 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryResponse.java
@@ -34,9 +34,6 @@ private RunQueryResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1073,7 +1070,7 @@ public RunQueryResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RunQueryResponse(input, extensionRegistry);
+        return new RunQueryResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/StructuredQuery.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/StructuredQuery.java
index 04698157d3a9..8f3efa2984d8 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/StructuredQuery.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/StructuredQuery.java
@@ -35,9 +35,6 @@ private StructuredQuery(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -375,9 +372,6 @@ private CollectionSelector(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -962,7 +956,7 @@ public CollectionSelector parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CollectionSelector(input, extensionRegistry);
+          return new CollectionSelector(input, extensionRegistry);
       }
     };
 
@@ -1091,9 +1085,6 @@ private Filter(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2259,7 +2250,7 @@ public Filter parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Filter(input, extensionRegistry);
+          return new Filter(input, extensionRegistry);
       }
     };
 
@@ -2379,9 +2370,6 @@ private CompositeFilter(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3413,7 +3401,7 @@ public CompositeFilter parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CompositeFilter(input, extensionRegistry);
+          return new CompositeFilter(input, extensionRegistry);
       }
     };
 
@@ -3533,9 +3521,6 @@ private FieldFilter(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4633,7 +4618,7 @@ public FieldFilter parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FieldFilter(input, extensionRegistry);
+          return new FieldFilter(input, extensionRegistry);
       }
     };
 
@@ -4730,9 +4715,6 @@ private UnaryFilter(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5639,7 +5621,7 @@ public UnaryFilter parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new UnaryFilter(input, extensionRegistry);
+          return new UnaryFilter(input, extensionRegistry);
       }
     };
 
@@ -5734,9 +5716,6 @@ private Order(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6417,7 +6396,7 @@ public Order parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Order(input, extensionRegistry);
+          return new Order(input, extensionRegistry);
       }
     };
 
@@ -6480,9 +6459,6 @@ private FieldReference(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6950,7 +6926,7 @@ public FieldReference parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FieldReference(input, extensionRegistry);
+          return new FieldReference(input, extensionRegistry);
       }
     };
 
@@ -7057,9 +7033,6 @@ private Projection(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7883,7 +7856,7 @@ public Projection parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Projection(input, extensionRegistry);
+          return new Projection(input, extensionRegistry);
       }
     };
 
@@ -10529,7 +10502,7 @@ public StructuredQuery parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StructuredQuery(input, extensionRegistry);
+        return new StructuredQuery(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Target.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Target.java
index e20e60f155d2..616ad6bfd49d 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Target.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Target.java
@@ -34,9 +34,6 @@ private Target(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -217,9 +214,6 @@ private DocumentsTarget(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -823,7 +817,7 @@ public DocumentsTarget parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DocumentsTarget(input, extensionRegistry);
+          return new DocumentsTarget(input, extensionRegistry);
       }
     };
 
@@ -931,9 +925,6 @@ private QueryTarget(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1784,7 +1775,7 @@ public QueryTarget parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new QueryTarget(input, extensionRegistry);
+          return new QueryTarget(input, extensionRegistry);
       }
     };
 
@@ -3211,7 +3202,7 @@ public Target parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Target(input, extensionRegistry);
+        return new Target(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TargetChange.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TargetChange.java
index 5b20b610697a..d6af6db1df98 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TargetChange.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TargetChange.java
@@ -35,9 +35,6 @@ private TargetChange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1553,7 +1550,7 @@ public TargetChange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TargetChange(input, extensionRegistry);
+        return new TargetChange(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TransactionOptions.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TransactionOptions.java
index 7fc00bc49500..a042411658c6 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TransactionOptions.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TransactionOptions.java
@@ -32,9 +32,6 @@ private TransactionOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -148,9 +145,6 @@ private ReadWrite(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -568,7 +562,7 @@ public ReadWrite parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadWrite(input, extensionRegistry);
+          return new ReadWrite(input, extensionRegistry);
       }
     };
 
@@ -650,9 +644,6 @@ private ReadOnly(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1326,7 +1317,7 @@ public ReadOnly parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadOnly(input, extensionRegistry);
+          return new ReadOnly(input, extensionRegistry);
       }
     };
 
@@ -2188,7 +2179,7 @@ public TransactionOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransactionOptions(input, extensionRegistry);
+        return new TransactionOptions(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/UpdateDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/UpdateDocumentRequest.java
index 22e8256dda2e..f02705d093ee 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/UpdateDocumentRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/UpdateDocumentRequest.java
@@ -32,9 +32,6 @@ private UpdateDocumentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1400,7 +1397,7 @@ public UpdateDocumentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateDocumentRequest(input, extensionRegistry);
+        return new UpdateDocumentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Value.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Value.java
index 691c45b82b6f..3d6abde784c8 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Value.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Value.java
@@ -32,9 +32,6 @@ private Value(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2381,7 +2378,7 @@ public Value parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Value(input, extensionRegistry);
+        return new Value(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Write.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Write.java
index f0a066acd840..4685f1fc5778 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Write.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Write.java
@@ -32,9 +32,6 @@ private Write(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1727,7 +1724,7 @@ public Write parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Write(input, extensionRegistry);
+        return new Write(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteProto.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteProto.java
index c24cb82386ff..f05ef4e73fb0 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteProto.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "le.firestore.v1beta1.DocumentH\000\022\020\n\006delet" +
       "e\030\002 \001(\tH\000\022@\n\ttransform\030\006 \001(\0132+.google.fi" +
       "restore.v1beta1.DocumentTransformH\000\022;\n\013u" +
-      "pdate_mask\030\003 \001(\0132&.google.firestore.v1be" +
+      "pdate_mask\030\003 \001(\0132&.google.firestore.v1be",
       "ta1.DocumentMask\022@\n\020current_document\030\004 \001" +
       "(\0132&.google.firestore.v1beta1.Preconditi" +
       "onB\013\n\toperation\"\332\002\n\021DocumentTransform\022\020\n" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "\022\022\n\nfield_path\030\001 \001(\t\022e\n\023set_to_server_va" +
       "lue\030\002 \001(\0162F.google.firestore.v1beta1.Doc" +
       "umentTransform.FieldTransform.ServerValu" +
-      "eH\000\"=\n\013ServerValue\022\034\n\030SERVER_VALUE_UNSPE" +
+      "eH\000\"=\n\013ServerValue\022\034\n\030SERVER_VALUE_UNSPE",
       "CIFIED\020\000\022\020\n\014REQUEST_TIME\020\001B\020\n\016transform_" +
       "type\"z\n\013WriteResult\022/\n\013update_time\030\001 \001(\013" +
       "2\032.google.protobuf.Timestamp\022:\n\021transfor" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "\022\022\n\ntarget_ids\030\005 \003(\005\022\032\n\022removed_target_i" +
       "ds\030\006 \003(\005\"m\n\016DocumentDelete\022\020\n\010document\030\001" +
       " \001(\t\022\032\n\022removed_target_ids\030\006 \003(\005\022-\n\tread" +
-      "_time\030\004 \001(\0132\032.google.protobuf.Timestamp\"" +
+      "_time\030\004 \001(\0132\032.google.protobuf.Timestamp\"",
       "m\n\016DocumentRemove\022\020\n\010document\030\001 \001(\t\022\032\n\022r" +
       "emoved_target_ids\030\002 \003(\005\022-\n\tread_time\030\004 \001" +
       "(\0132\032.google.protobuf.Timestamp\"3\n\017Existe" +
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteRequest.java
index b15a4bc8947b..b2747527772c 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteRequest.java
@@ -42,9 +42,6 @@ private WriteRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1687,7 +1684,7 @@ public WriteRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WriteRequest(input, extensionRegistry);
+        return new WriteRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResponse.java
index 72b5843b59f0..a4c6c6b84670 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResponse.java
@@ -35,9 +35,6 @@ private WriteResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1338,7 +1335,7 @@ public WriteResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WriteResponse(input, extensionRegistry);
+        return new WriteResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResult.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResult.java
index 714fd0790eb6..b7ab7a382015 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResult.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResult.java
@@ -33,9 +33,6 @@ private WriteResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1104,7 +1101,7 @@ public WriteResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WriteResult(input, extensionRegistry);
+        return new WriteResult(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java
index a82e76ebf101..9a0517a2abfc 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java
@@ -33,9 +33,6 @@ private CreateDeviceRegistryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -791,7 +788,7 @@ public CreateDeviceRegistryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDeviceRegistryRequest(input, extensionRegistry);
+        return new CreateDeviceRegistryRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java
index df24f77fc9ad..a2e9bdf19117 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java
@@ -33,9 +33,6 @@ private CreateDeviceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -798,7 +795,7 @@ public CreateDeviceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDeviceRequest(input, extensionRegistry);
+        return new CreateDeviceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java
index d32f91fac660..56d337b63d5f 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java
@@ -33,9 +33,6 @@ private DeleteDeviceRegistryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteDeviceRegistryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteDeviceRegistryRequest(input, extensionRegistry);
+        return new DeleteDeviceRegistryRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java
index a8ae61fc74bb..89fbe985830a 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java
@@ -33,9 +33,6 @@ private DeleteDeviceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public DeleteDeviceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteDeviceRequest(input, extensionRegistry);
+        return new DeleteDeviceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java
index b1db0d91f903..7e9e02be127f 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java
@@ -37,9 +37,6 @@ private Device(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4167,7 +4164,7 @@ public Device parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Device(input, extensionRegistry);
+        return new Device(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java
index 6040fc339e01..71ff144e373b 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java
@@ -34,9 +34,6 @@ private DeviceConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1106,7 +1103,7 @@ public DeviceConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeviceConfig(input, extensionRegistry);
+        return new DeviceConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java
index 7048acf6fa1d..799723d455ea 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java
@@ -32,9 +32,6 @@ private DeviceCredential(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1069,7 +1066,7 @@ public DeviceCredential parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeviceCredential(input, extensionRegistry);
+        return new DeviceCredential(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java
index 8091d15e9121..b7ea5b0c2d46 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "empty.proto\032 google/protobuf/field_mask." +
       "proto\032\037google/protobuf/timestamp.proto\"k" +
       "\n\033CreateDeviceRegistryRequest\022\016\n\006parent\030" +
-      "\001 \001(\t\022<\n\017device_registry\030\002 \001(\0132#.google." +
+      "\001 \001(\t\022<\n\017device_registry\030\002 \001(\0132#.google.",
       "cloud.iot.v1.DeviceRegistry\"(\n\030GetDevice" +
       "RegistryRequest\022\014\n\004name\030\001 \001(\t\"+\n\033DeleteD" +
       "eviceRegistryRequest\022\014\n\004name\030\001 \001(\t\"\214\001\n\033U" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "rotobuf.FieldMask\"T\n\033ListDeviceRegistrie" +
       "sRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\tpage_size\030\002 " +
       "\001(\005\022\022\n\npage_token\030\003 \001(\t\"w\n\034ListDeviceReg" +
-      "istriesResponse\022>\n\021device_registries\030\001 \003" +
+      "istriesResponse\022>\n\021device_registries\030\001 \003",
       "(\0132#.google.cloud.iot.v1.DeviceRegistry\022" +
       "\027\n\017next_page_token\030\002 \001(\t\"R\n\023CreateDevice" +
       "Request\022\016\n\006parent\030\001 \001(\t\022+\n\006device\030\002 \001(\0132" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "DeviceRequest\022+\n\006device\030\002 \001(\0132\033.google.c" +
       "loud.iot.v1.Device\022/\n\013update_mask\030\003 \001(\0132" +
       "\032.google.protobuf.FieldMask\"#\n\023DeleteDev" +
-      "iceRequest\022\014\n\004name\030\001 \001(\t\"\247\001\n\022ListDevices" +
+      "iceRequest\022\014\n\004name\030\001 \001(\t\"\247\001\n\022ListDevices",
       "Request\022\016\n\006parent\030\001 \001(\t\022\026\n\016device_num_id" +
       "s\030\002 \003(\004\022\022\n\ndevice_ids\030\003 \003(\t\022.\n\nfield_mas" +
       "k\030\004 \001(\0132\032.google.protobuf.FieldMask\022\021\n\tp" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "en\030\002 \001(\t\"`\n ModifyCloudToDeviceConfigReq" +
       "uest\022\014\n\004name\030\001 \001(\t\022\031\n\021version_to_update\030" +
       "\002 \001(\003\022\023\n\013binary_data\030\003 \001(\014\"E\n\037ListDevice" +
-      "ConfigVersionsRequest\022\014\n\004name\030\001 \001(\t\022\024\n\014n" +
+      "ConfigVersionsRequest\022\014\n\004name\030\001 \001(\t\022\024\n\014n",
       "um_versions\030\002 \001(\005\"]\n ListDeviceConfigVer" +
       "sionsResponse\0229\n\016device_configs\030\001 \003(\0132!." +
       "google.cloud.iot.v1.DeviceConfig\";\n\027List" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "iot.v1.DeviceState2\223\034\n\rDeviceManager\022\266\001\n" +
       "\024CreateDeviceRegistry\0220.google.cloud.iot" +
       ".v1.CreateDeviceRegistryRequest\032#.google" +
-      ".cloud.iot.v1.DeviceRegistry\"G\202\323\344\223\002A\"./v" +
+      ".cloud.iot.v1.DeviceRegistry\"G\202\323\344\223\002A\"./v",
       "1/{parent=projects/*/locations/*}/regist" +
       "ries:\017device_registry\022\237\001\n\021GetDeviceRegis" +
       "try\022-.google.cloud.iot.v1.GetDeviceRegis" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "Registry\0220.google.cloud.iot.v1.UpdateDev" +
       "iceRegistryRequest\032#.google.cloud.iot.v1" +
       ".DeviceRegistry\"W\202\323\344\223\002Q2>/v1/{device_reg" +
-      "istry.name=projects/*/locations/*/regist" +
+      "istry.name=projects/*/locations/*/regist",
       "ries/*}:\017device_registry\022\230\001\n\024DeleteDevic" +
       "eRegistry\0220.google.cloud.iot.v1.DeleteDe" +
       "viceRegistryRequest\032\026.google.protobuf.Em" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "istriesRequest\0321.google.cloud.iot.v1.Lis" +
       "tDeviceRegistriesResponse\"6\202\323\344\223\0020\022./v1/{" +
       "parent=projects/*/locations/*}/registrie" +
-      "s\022\237\001\n\014CreateDevice\022(.google.cloud.iot.v1" +
+      "s\022\237\001\n\014CreateDevice\022(.google.cloud.iot.v1",
       ".CreateDeviceRequest\032\033.google.cloud.iot." +
       "v1.Device\"H\202\323\344\223\002B\"8/v1/{parent=projects/" +
       "*/locations/*/registries/*}/devices:\006dev" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "ations/*/registries/*/devices/*}ZC\022A/v1/" +
       "{name=projects/*/locations/*/registries/" +
       "*/groups/*/devices/*}\022\374\001\n\014UpdateDevice\022(" +
-      ".google.cloud.iot.v1.UpdateDeviceRequest" +
+      ".google.cloud.iot.v1.UpdateDeviceRequest",
       "\032\033.google.cloud.iot.v1.Device\"\244\001\202\323\344\223\002\235\0012" +
       "?/v1/{device.name=projects/*/locations/*" +
       "/registries/*/devices/*}:\006deviceZR2H/v1/" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "teDeviceRequest\032\026.google.protobuf.Empty\"" +
       "\205\001\202\323\344\223\002\177*8/v1/{name=projects/*/locations" +
       "/*/registries/*/devices/*}ZC*A/v1/{name=" +
-      "projects/*/locations/*/registries/*/grou" +
+      "projects/*/locations/*/registries/*/grou",
       "ps/*/devices/*}\022\332\001\n\013ListDevices\022\'.google" +
       ".cloud.iot.v1.ListDevicesRequest\032(.googl" +
       "e.cloud.iot.v1.ListDevicesResponse\"x\202\323\344\223" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "\031ModifyCloudToDeviceConfig\0225.google.clou" +
       "d.iot.v1.ModifyCloudToDeviceConfigReques" +
       "t\032!.google.cloud.iot.v1.DeviceConfig\"\300\001\202" +
-      "\323\344\223\002\271\001\"R/v1/{name=projects/*/locations/*" +
+      "\323\344\223\002\271\001\"R/v1/{name=projects/*/locations/*",
       "/registries/*/devices/*}:modifyCloudToDe" +
       "viceConfig:\001*Z`\"[/v1/{name=projects/*/lo" +
       "cations/*/registries/*/groups/*/devices/" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "gle.cloud.iot.v1.ListDeviceConfigVersion" +
       "sResponse\"\244\001\202\323\344\223\002\235\001\022G/v1/{name=projects/" +
       "*/locations/*/registries/*/devices/*}/co" +
-      "nfigVersionsZR\022P/v1/{name=projects/*/loc" +
+      "nfigVersionsZR\022P/v1/{name=projects/*/loc",
       "ations/*/registries/*/groups/*/devices/*" +
       "}/configVersions\022\206\002\n\020ListDeviceStates\022,." +
       "google.cloud.iot.v1.ListDeviceStatesRequ" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "tatesZJ\022H/v1/{name=projects/*/locations/" +
       "*/registries/*/groups/*/devices/*}/state" +
       "s\022\346\001\n\014SetIamPolicy\022\".google.iam.v1.SetIa" +
-      "mPolicyRequest\032\025.google.iam.v1.Policy\"\232\001" +
+      "mPolicyRequest\032\025.google.iam.v1.Policy\"\232\001",
       "\202\323\344\223\002\223\001\"?/v1/{resource=projects/*/locati" +
       "ons/*/registries/*}:setIamPolicy:\001*ZM\"H/" +
       "v1/{resource=projects/*/locations/*/regi" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "\"?/v1/{resource=projects/*/locations/*/r" +
       "egistries/*}:getIamPolicy:\001*ZM\"H/v1/{res" +
       "ource=projects/*/locations/*/registries/" +
-      "*/groups/*}:getIamPolicy:\001*\022\222\002\n\022TestIamP" +
+      "*/groups/*}:getIamPolicy:\001*\022\222\002\n\022TestIamP",
       "ermissions\022(.google.iam.v1.TestIamPermis" +
       "sionsRequest\032).google.iam.v1.TestIamPerm" +
       "issionsResponse\"\246\001\202\323\344\223\002\237\001\"E/v1/{resource" +
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceName.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceName.java
index 309857e5c72f..b7a200733716 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceName.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -140,14 +139,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("DeviceName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "location", location, "registry", registry, "device", device);
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java
index 35db2d6c4457..fbe453b35764 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java
@@ -36,9 +36,6 @@ private DeviceRegistry(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2706,7 +2703,7 @@ public DeviceRegistry parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeviceRegistry(input, extensionRegistry);
+        return new DeviceRegistry(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java
index 758677668a7b..2cf58dec58fb 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java
@@ -33,9 +33,6 @@ private DeviceState(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -694,7 +691,7 @@ public DeviceState parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeviceState(input, extensionRegistry);
+        return new DeviceState(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java
index e6c71bfd0171..c9889747bc71 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java
@@ -34,9 +34,6 @@ private EventNotificationConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -714,7 +711,7 @@ public EventNotificationConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EventNotificationConfig(input, extensionRegistry);
+        return new EventNotificationConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java
index 836add77f3e4..4ec6ea7f0f95 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java
@@ -33,9 +33,6 @@ private GetDeviceRegistryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetDeviceRegistryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDeviceRegistryRequest(input, extensionRegistry);
+        return new GetDeviceRegistryRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java
index 0986487bd19e..fffd75593df5 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java
@@ -33,9 +33,6 @@ private GetDeviceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -786,7 +783,7 @@ public GetDeviceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDeviceRequest(input, extensionRegistry);
+        return new GetDeviceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java
index f7998b96c3fd..63c4d5ccf5fd 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java
@@ -33,9 +33,6 @@ private HttpConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -494,7 +491,7 @@ public HttpConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HttpConfig(input, extensionRegistry);
+        return new HttpConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java
index d0c7f5cd1c02..787816cb797d 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java
@@ -34,9 +34,6 @@ private ListDeviceConfigVersionsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -627,7 +624,7 @@ public ListDeviceConfigVersionsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeviceConfigVersionsRequest(input, extensionRegistry);
+        return new ListDeviceConfigVersionsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java
index 84a6696cd263..accee11e2e76 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java
@@ -33,9 +33,6 @@ private ListDeviceConfigVersionsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -836,7 +833,7 @@ public ListDeviceConfigVersionsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeviceConfigVersionsResponse(input, extensionRegistry);
+        return new ListDeviceConfigVersionsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java
index d8ba161856a5..e2cfc8803a7f 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java
@@ -35,9 +35,6 @@ private ListDeviceRegistriesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -793,7 +790,7 @@ public ListDeviceRegistriesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeviceRegistriesRequest(input, extensionRegistry);
+        return new ListDeviceRegistriesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java
index 6a44ef95e2ab..c9260ad41684 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java
@@ -34,9 +34,6 @@ private ListDeviceRegistriesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListDeviceRegistriesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeviceRegistriesResponse(input, extensionRegistry);
+        return new ListDeviceRegistriesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java
index 4ab9364ad7e1..8cf3acbf78d7 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java
@@ -34,9 +34,6 @@ private ListDeviceStatesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -627,7 +624,7 @@ public ListDeviceStatesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeviceStatesRequest(input, extensionRegistry);
+        return new ListDeviceStatesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java
index 8ab09ac94638..7c2f2e25f56a 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java
@@ -33,9 +33,6 @@ private ListDeviceStatesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -836,7 +833,7 @@ public ListDeviceStatesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeviceStatesResponse(input, extensionRegistry);
+        return new ListDeviceStatesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java
index 76dd6852954b..54311b33531a 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java
@@ -37,9 +37,6 @@ private ListDevicesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1508,7 +1505,7 @@ public ListDevicesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDevicesRequest(input, extensionRegistry);
+        return new ListDevicesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java
index 4e334c17b513..e99e8bc61dd6 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java
@@ -34,9 +34,6 @@ private ListDevicesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -978,7 +975,7 @@ public ListDevicesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDevicesResponse(input, extensionRegistry);
+        return new ListDevicesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/LocationName.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/LocationName.java
index b3667d2ce6f9..1ad1e1b33784 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/LocationName.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/LocationName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("LocationName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "location", location);
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java
index 76cfc68ad3a2..43c17341a105 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java
@@ -35,9 +35,6 @@ private ModifyCloudToDeviceConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -713,7 +710,7 @@ public ModifyCloudToDeviceConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ModifyCloudToDeviceConfigRequest(input, extensionRegistry);
+        return new ModifyCloudToDeviceConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java
index 8dd4fdd58ecb..c5115b17099f 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java
@@ -33,9 +33,6 @@ private MqttConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -494,7 +491,7 @@ public MqttConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MqttConfig(input, extensionRegistry);
+        return new MqttConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java
index 192fb886897b..089609a5f795 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java
@@ -34,9 +34,6 @@ private PublicKeyCertificate(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -871,7 +868,7 @@ public PublicKeyCertificate parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PublicKeyCertificate(input, extensionRegistry);
+        return new PublicKeyCertificate(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java
index beaafe72aaa8..771896e377c4 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java
@@ -34,9 +34,6 @@ private PublicKeyCredential(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -642,7 +639,7 @@ public PublicKeyCredential parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PublicKeyCredential(input, extensionRegistry);
+        return new PublicKeyCredential(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java
index b75a03536a27..d64845011e2e 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java
@@ -32,9 +32,6 @@ private RegistryCredential(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -696,7 +693,7 @@ public RegistryCredential parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RegistryCredential(input, extensionRegistry);
+        return new RegistryCredential(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryName.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryName.java
index d1f7f394ba38..fca55441b4b3 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryName.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("RegistryName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "location", location, "registry", registry);
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java
index 97b5949d3561..f23fa82c6ddc 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "v1.DeviceCredential\0227\n\023last_heartbeat_ti" +
       "me\030\007 \001(\0132\032.google.protobuf.Timestamp\0223\n\017" +
       "last_event_time\030\010 \001(\0132\032.google.protobuf." +
-      "Timestamp\0223\n\017last_state_time\030\024 \001(\0132\032.goo" +
+      "Timestamp\0223\n\017last_state_time\030\024 \001(\0132\032.goo",
       "gle.protobuf.Timestamp\0228\n\024last_config_ac" +
       "k_time\030\016 \001(\0132\032.google.protobuf.Timestamp" +
       "\0229\n\025last_config_send_time\030\022 \001(\0132\032.google" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "oogle.rpc.Status\0221\n\006config\030\r \001(\0132!.googl" +
       "e.cloud.iot.v1.DeviceConfig\022/\n\005state\030\020 \001" +
       "(\0132 .google.cloud.iot.v1.DeviceState\022;\n\010" +
-      "metadata\030\021 \003(\0132).google.cloud.iot.v1.Dev" +
+      "metadata\030\021 \003(\0132).google.cloud.iot.v1.Dev",
       "ice.MetadataEntry\032/\n\rMetadataEntry\022\013\n\003ke" +
       "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\367\002\n\016DeviceReg" +
       "istry\022\n\n\002id\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022P\n\032event" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "oud.iot.v1.StateNotificationConfig\0224\n\013mq" +
       "tt_config\030\004 \001(\0132\037.google.cloud.iot.v1.Mq" +
       "ttConfig\0224\n\013http_config\030\t \001(\0132\037.google.c" +
-      "loud.iot.v1.HttpConfig\022<\n\013credentials\030\010 " +
+      "loud.iot.v1.HttpConfig\022<\n\013credentials\030\010 ",
       "\003(\0132\'.google.cloud.iot.v1.RegistryCreden" +
       "tial\"H\n\nMqttConfig\022:\n\022mqtt_enabled_state" +
       "\030\001 \001(\0162\036.google.cloud.iot.v1.MqttState\"H" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "\030\002 \001(\t\022\031\n\021pubsub_topic_name\030\001 \001(\t\"4\n\027Sta" +
       "teNotificationConfig\022\031\n\021pubsub_topic_nam" +
       "e\030\001 \001(\t\"o\n\022RegistryCredential\022K\n\026public_" +
-      "key_certificate\030\001 \001(\0132).google.cloud.iot" +
+      "key_certificate\030\001 \001(\0132).google.cloud.iot",
       ".v1.PublicKeyCertificateH\000B\014\n\ncredential" +
       "\"\320\001\n\026X509CertificateDetails\022\016\n\006issuer\030\001 " +
       "\001(\t\022\017\n\007subject\030\002 \001(\t\022.\n\nstart_time\030\003 \001(\013" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "_type\030\006 \001(\t\"\257\001\n\024PublicKeyCertificate\022?\n\006" +
       "format\030\001 \001(\0162/.google.cloud.iot.v1.Publi" +
       "cKeyCertificateFormat\022\023\n\013certificate\030\002 \001" +
-      "(\t\022A\n\014x509_details\030\003 \001(\0132+.google.cloud." +
+      "(\t\022A\n\014x509_details\030\003 \001(\0132+.google.cloud.",
       "iot.v1.X509CertificateDetails\"\225\001\n\020Device" +
       "Credential\022>\n\npublic_key\030\002 \001(\0132(.google." +
       "cloud.iot.v1.PublicKeyCredentialH\000\0223\n\017ex" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "v1.PublicKeyFormat\022\013\n\003key\030\002 \001(\t\"\240\001\n\014Devi" +
       "ceConfig\022\017\n\007version\030\001 \001(\003\0225\n\021cloud_updat" +
       "e_time\030\002 \001(\0132\032.google.protobuf.Timestamp" +
-      "\0223\n\017device_ack_time\030\003 \001(\0132\032.google.proto" +
+      "\0223\n\017device_ack_time\030\003 \001(\0132\032.google.proto",
       "buf.Timestamp\022\023\n\013binary_data\030\004 \001(\014\"S\n\013De" +
       "viceState\022/\n\013update_time\030\001 \001(\0132\032.google." +
       "protobuf.Timestamp\022\023\n\013binary_data\030\002 \001(\014*" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "\n\014HTTP_ENABLED\020\001\022\021\n\rHTTP_DISABLED\020\002*e\n\032P" +
       "ublicKeyCertificateFormat\022-\n)UNSPECIFIED" +
       "_PUBLIC_KEY_CERTIFICATE_FORMAT\020\000\022\030\n\024X509" +
-      "_CERTIFICATE_PEM\020\001*v\n\017PublicKeyFormat\022!\n" +
+      "_CERTIFICATE_PEM\020\001*v\n\017PublicKeyFormat\022!\n",
       "\035UNSPECIFIED_PUBLIC_KEY_FORMAT\020\000\022\013\n\007RSA_" +
       "PEM\020\003\022\020\n\014RSA_X509_PEM\020\001\022\r\n\tES256_PEM\020\002\022\022" +
       "\n\016ES256_X509_PEM\020\004Bf\n\027com.google.cloud.i" +
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java
index 848e3573fd73..9cc7aed6afeb 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java
@@ -33,9 +33,6 @@ private StateNotificationConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public StateNotificationConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StateNotificationConfig(input, extensionRegistry);
+        return new StateNotificationConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java
index 1050afa6a4ca..b035e1e3c466 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java
@@ -32,9 +32,6 @@ private UpdateDeviceRegistryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -906,7 +903,7 @@ public UpdateDeviceRegistryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateDeviceRegistryRequest(input, extensionRegistry);
+        return new UpdateDeviceRegistryRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java
index 39b81a0b0d9a..89dd3d532993 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java
@@ -32,9 +32,6 @@ private UpdateDeviceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -906,7 +903,7 @@ public UpdateDeviceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateDeviceRequest(input, extensionRegistry);
+        return new UpdateDeviceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java
index 7535ad6cbc93..f44db303a783 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java
@@ -36,9 +36,6 @@ private X509CertificateDetails(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1454,7 +1451,7 @@ public X509CertificateDetails parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new X509CertificateDetails(input, extensionRegistry);
+        return new X509CertificateDetails(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesRequest.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesRequest.java
index c92d5ec1d860..e26b2f1cb31b 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesRequest.java
@@ -33,9 +33,6 @@ private AnalyzeEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -716,7 +713,7 @@ public AnalyzeEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitiesRequest(input, extensionRegistry);
+        return new AnalyzeEntitiesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesResponse.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesResponse.java
index a93d9f069f02..c07763ee40b7 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesResponse.java
@@ -34,9 +34,6 @@ private AnalyzeEntitiesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public AnalyzeEntitiesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitiesResponse(input, extensionRegistry);
+        return new AnalyzeEntitiesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentRequest.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentRequest.java
index e8cd3120942c..bde4b0e4bb72 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentRequest.java
@@ -33,9 +33,6 @@ private AnalyzeEntitySentimentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -716,7 +713,7 @@ public AnalyzeEntitySentimentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitySentimentRequest(input, extensionRegistry);
+        return new AnalyzeEntitySentimentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentResponse.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentResponse.java
index 9ab8aa02e8d2..6a26f096da30 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentResponse.java
@@ -34,9 +34,6 @@ private AnalyzeEntitySentimentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public AnalyzeEntitySentimentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitySentimentResponse(input, extensionRegistry);
+        return new AnalyzeEntitySentimentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentRequest.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentRequest.java
index 7d5ac39154ca..081f8dd87104 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentRequest.java
@@ -33,9 +33,6 @@ private AnalyzeSentimentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -716,7 +713,7 @@ public AnalyzeSentimentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSentimentRequest(input, extensionRegistry);
+        return new AnalyzeSentimentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentResponse.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentResponse.java
index db9d77e8fe7a..0f0949070968 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentResponse.java
@@ -34,9 +34,6 @@ private AnalyzeSentimentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1214,7 +1211,7 @@ public AnalyzeSentimentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSentimentResponse(input, extensionRegistry);
+        return new AnalyzeSentimentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxRequest.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxRequest.java
index eea489e54d7c..df6d3ba294a6 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxRequest.java
@@ -33,9 +33,6 @@ private AnalyzeSyntaxRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -716,7 +713,7 @@ public AnalyzeSyntaxRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSyntaxRequest(input, extensionRegistry);
+        return new AnalyzeSyntaxRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxResponse.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxResponse.java
index 709473bea912..8db3c4b46000 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxResponse.java
@@ -35,9 +35,6 @@ private AnalyzeSyntaxResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1420,7 +1417,7 @@ public AnalyzeSyntaxResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSyntaxResponse(input, extensionRegistry);
+        return new AnalyzeSyntaxResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextRequest.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextRequest.java
index 2a982c33c650..a0b4092b4d05 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextRequest.java
@@ -34,9 +34,6 @@ private AnnotateTextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -195,9 +192,6 @@ private Features(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -910,7 +904,7 @@ public Features parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Features(input, extensionRegistry);
+          return new Features(input, extensionRegistry);
       }
     };
 
@@ -1765,7 +1759,7 @@ public AnnotateTextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateTextRequest(input, extensionRegistry);
+        return new AnnotateTextRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextResponse.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextResponse.java
index 1cfbdefb3f51..9ec5396808f4 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextResponse.java
@@ -37,9 +37,6 @@ private AnnotateTextResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2646,7 +2643,7 @@ public AnnotateTextResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateTextResponse(input, extensionRegistry);
+        return new AnnotateTextResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java
index 661e464de9a6..24c4c3ca78ec 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java
@@ -34,9 +34,6 @@ private ClassificationCategory(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -612,7 +609,7 @@ public ClassificationCategory parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClassificationCategory(input, extensionRegistry);
+        return new ClassificationCategory(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextRequest.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextRequest.java
index ef51f8524f24..21227490fadb 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextRequest.java
@@ -32,9 +32,6 @@ private ClassifyTextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public ClassifyTextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClassifyTextRequest(input, extensionRegistry);
+        return new ClassifyTextRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextResponse.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextResponse.java
index f43e7826a2a9..73ea7ee357fd 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextResponse.java
@@ -33,9 +33,6 @@ private ClassifyTextResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public ClassifyTextResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClassifyTextResponse(input, extensionRegistry);
+        return new ClassifyTextResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/DependencyEdge.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/DependencyEdge.java
index ab493c474bd1..85c3e5beb141 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/DependencyEdge.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/DependencyEdge.java
@@ -36,9 +36,6 @@ private DependencyEdge(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2076,7 +2073,7 @@ public DependencyEdge parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DependencyEdge(input, extensionRegistry);
+        return new DependencyEdge(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Document.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Document.java
index ebe56dd17582..28ddfe314b65 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Document.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Document.java
@@ -35,9 +35,6 @@ private Document(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1288,7 +1285,7 @@ public Document parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Document(input, extensionRegistry);
+        return new Document(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java
index 286b6e9ac424..e1e3c6a08ec9 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java
@@ -38,9 +38,6 @@ private Entity(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2025,7 +2022,7 @@ public Entity parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Entity(input, extensionRegistry);
+        return new Entity(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/EntityMention.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/EntityMention.java
index c4bfb98864bd..4ad95693114d 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/EntityMention.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/EntityMention.java
@@ -34,9 +34,6 @@ private EntityMention(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1118,7 +1115,7 @@ public EntityMention parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityMention(input, extensionRegistry);
+        return new EntityMention(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceProto.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceProto.java
index 5d54e98179fd..5a2c3dbde19c 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceProto.java
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\016\n\nPLAIN_TEX" +
       "T\020\001\022\010\n\004HTML\020\002B\010\n\006source\"t\n\010Sentence\0220\n\004t" +
       "ext\030\001 \001(\0132\".google.cloud.language.v1.Tex" +
-      "tSpan\0226\n\tsentiment\030\002 \001(\0132#.google.cloud." +
+      "tSpan\0226\n\tsentiment\030\002 \001(\0132#.google.cloud.",
       "language.v1.Sentiment\"\276\003\n\006Entity\022\014\n\004name" +
       "\030\001 \001(\t\0223\n\004type\030\002 \001(\0162%.google.cloud.lang" +
       "uage.v1.Entity.Type\022@\n\010metadata\030\003 \003(\0132.." +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "on\0226\n\tsentiment\030\006 \001(\0132#.google.cloud.lan" +
       "guage.v1.Sentiment\032/\n\rMetadataEntry\022\013\n\003k" +
       "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"y\n\004Type\022\013\n\007U" +
-      "NKNOWN\020\000\022\n\n\006PERSON\020\001\022\014\n\010LOCATION\020\002\022\020\n\014OR" +
+      "NKNOWN\020\000\022\n\n\006PERSON\020\001\022\014\n\010LOCATION\020\002\022\020\n\014OR",
       "GANIZATION\020\003\022\t\n\005EVENT\020\004\022\017\n\013WORK_OF_ART\020\005" +
       "\022\021\n\rCONSUMER_GOOD\020\006\022\t\n\005OTHER\020\007\"\313\001\n\005Token" +
       "\0220\n\004text\030\001 \001(\0132\".google.cloud.language.v" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "age.v1.DependencyEdge\022\r\n\005lemma\030\004 \001(\t\"-\n\t" +
       "Sentiment\022\021\n\tmagnitude\030\002 \001(\002\022\r\n\005score\030\003 " +
       "\001(\002\"\243\020\n\014PartOfSpeech\0227\n\003tag\030\001 \001(\0162*.goog" +
-      "le.cloud.language.v1.PartOfSpeech.Tag\022=\n" +
+      "le.cloud.language.v1.PartOfSpeech.Tag\022=\n",
       "\006aspect\030\002 \001(\0162-.google.cloud.language.v1" +
       ".PartOfSpeech.Aspect\0229\n\004case\030\003 \001(\0162+.goo" +
       "gle.cloud.language.v1.PartOfSpeech.Case\022" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "r\0229\n\004mood\030\006 \001(\0162+.google.cloud.language." +
       "v1.PartOfSpeech.Mood\022=\n\006number\030\007 \001(\0162-.g" +
       "oogle.cloud.language.v1.PartOfSpeech.Num" +
-      "ber\022=\n\006person\030\010 \001(\0162-.google.cloud.langu" +
+      "ber\022=\n\006person\030\010 \001(\0162-.google.cloud.langu",
       "age.v1.PartOfSpeech.Person\022=\n\006proper\030\t \001" +
       "(\0162-.google.cloud.language.v1.PartOfSpee" +
       "ch.Proper\022G\n\013reciprocity\030\n \001(\01622.google." +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       ".google.cloud.language.v1.PartOfSpeech.V" +
       "oice\"\215\001\n\003Tag\022\013\n\007UNKNOWN\020\000\022\007\n\003ADJ\020\001\022\007\n\003AD" +
       "P\020\002\022\007\n\003ADV\020\003\022\010\n\004CONJ\020\004\022\007\n\003DET\020\005\022\010\n\004NOUN\020" +
-      "\006\022\007\n\003NUM\020\007\022\010\n\004PRON\020\010\022\007\n\003PRT\020\t\022\t\n\005PUNCT\020\n" +
+      "\006\022\007\n\003NUM\020\007\022\010\n\004PRON\020\010\022\007\n\003PRT\020\t\022\t\n\005PUNCT\020\n",
       "\022\010\n\004VERB\020\013\022\005\n\001X\020\014\022\t\n\005AFFIX\020\r\"O\n\006Aspect\022\022" +
       "\n\016ASPECT_UNKNOWN\020\000\022\016\n\nPERFECTIVE\020\001\022\020\n\014IM" +
       "PERFECTIVE\020\002\022\017\n\013PROGRESSIVE\020\003\"\370\001\n\004Case\022\020" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "VE\020\007\022\016\n\nNOMINATIVE\020\010\022\013\n\007OBLIQUE\020\t\022\r\n\tPAR" +
       "TITIVE\020\n\022\021\n\rPREPOSITIONAL\020\013\022\022\n\016REFLEXIVE" +
       "_CASE\020\014\022\021\n\rRELATIVE_CASE\020\r\022\014\n\010VOCATIVE\020\016" +
-      "\"\257\001\n\004Form\022\020\n\014FORM_UNKNOWN\020\000\022\014\n\010ADNOMIAL\020" +
+      "\"\257\001\n\004Form\022\020\n\014FORM_UNKNOWN\020\000\022\014\n\010ADNOMIAL\020",
       "\001\022\r\n\tAUXILIARY\020\002\022\022\n\016COMPLEMENTIZER\020\003\022\020\n\014" +
       "FINAL_ENDING\020\004\022\n\n\006GERUND\020\005\022\n\n\006REALIS\020\006\022\014" +
       "\n\010IRREALIS\020\007\022\t\n\005SHORT\020\010\022\010\n\004LONG\020\t\022\t\n\005ORD" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "ONDITIONAL_MOOD\020\001\022\016\n\nIMPERATIVE\020\002\022\016\n\nIND" +
       "ICATIVE\020\003\022\021\n\rINTERROGATIVE\020\004\022\013\n\007JUSSIVE\020" +
       "\005\022\017\n\013SUBJUNCTIVE\020\006\"@\n\006Number\022\022\n\016NUMBER_U" +
-      "NKNOWN\020\000\022\014\n\010SINGULAR\020\001\022\n\n\006PLURAL\020\002\022\010\n\004DU" +
+      "NKNOWN\020\000\022\014\n\010SINGULAR\020\001\022\n\n\006PLURAL\020\002\022\010\n\004DU",
       "AL\020\003\"T\n\006Person\022\022\n\016PERSON_UNKNOWN\020\000\022\t\n\005FI" +
       "RST\020\001\022\n\n\006SECOND\020\002\022\t\n\005THIRD\020\003\022\024\n\020REFLEXIV" +
       "E_PERSON\020\004\"8\n\006Proper\022\022\n\016PROPER_UNKNOWN\020\000" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "SE_UNKNOWN\020\000\022\025\n\021CONDITIONAL_TENSE\020\001\022\n\n\006F" +
       "UTURE\020\002\022\010\n\004PAST\020\003\022\013\n\007PRESENT\020\004\022\r\n\tIMPERF" +
       "ECT\020\005\022\016\n\nPLUPERFECT\020\006\"B\n\005Voice\022\021\n\rVOICE_" +
-      "UNKNOWN\020\000\022\n\n\006ACTIVE\020\001\022\r\n\tCAUSATIVE\020\002\022\013\n\007" +
+      "UNKNOWN\020\000\022\n\n\006ACTIVE\020\001\022\r\n\tCAUSATIVE\020\002\022\013\n\007",
       "PASSIVE\020\003\"\225\010\n\016DependencyEdge\022\030\n\020head_tok" +
       "en_index\030\001 \001(\005\022=\n\005label\030\002 \001(\0162..google.c" +
       "loud.language.v1.DependencyEdge.Label\"\251\007" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "\006\n\002CC\020\n\022\t\n\005CCOMP\020\013\022\010\n\004CONJ\020\014\022\t\n\005CSUBJ\020\r\022" +
       "\r\n\tCSUBJPASS\020\016\022\007\n\003DEP\020\017\022\007\n\003DET\020\020\022\r\n\tDISC" +
       "OURSE\020\021\022\010\n\004DOBJ\020\022\022\010\n\004EXPL\020\023\022\014\n\010GOESWITH\020" +
-      "\024\022\010\n\004IOBJ\020\025\022\010\n\004MARK\020\026\022\007\n\003MWE\020\027\022\007\n\003MWV\020\030\022" +
+      "\024\022\010\n\004IOBJ\020\025\022\010\n\004MARK\020\026\022\007\n\003MWE\020\027\022\007\n\003MWV\020\030\022",
       "\007\n\003NEG\020\031\022\006\n\002NN\020\032\022\014\n\010NPADVMOD\020\033\022\t\n\005NSUBJ\020" +
       "\034\022\r\n\tNSUBJPASS\020\035\022\007\n\003NUM\020\036\022\n\n\006NUMBER\020\037\022\005\n" +
       "\001P\020 \022\r\n\tPARATAXIS\020!\022\013\n\007PARTMOD\020\"\022\t\n\005PCOM" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "\020.\022\014\n\010QUANTMOD\020/\022\t\n\005RCMOD\0200\022\014\n\010RCMODREL\020" +
       "1\022\t\n\005RDROP\0202\022\007\n\003REF\0203\022\013\n\007REMNANT\0204\022\016\n\nRE" +
       "PARANDUM\0205\022\010\n\004ROOT\0206\022\010\n\004SNUM\0207\022\010\n\004SUFF\0208" +
-      "\022\010\n\004TMOD\0209\022\t\n\005TOPIC\020:\022\010\n\004VMOD\020;\022\014\n\010VOCAT" +
+      "\022\010\n\004TMOD\0209\022\t\n\005TOPIC\020:\022\010\n\004VMOD\020;\022\014\n\010VOCAT",
       "IVE\020<\022\t\n\005XCOMP\020=\022\n\n\006SUFFIX\020>\022\t\n\005TITLE\020?\022" +
       "\014\n\010ADVPHMOD\020@\022\013\n\007AUXCAUS\020A\022\t\n\005AUXVV\020B\022\t\n" +
       "\005DTMOD\020C\022\013\n\007FOREIGN\020D\022\006\n\002KW\020E\022\010\n\004LIST\020F\022" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "\003MES\020Q\022\t\n\005NCOMP\020R\"\347\001\n\rEntityMention\0220\n\004t" +
       "ext\030\001 \001(\0132\".google.cloud.language.v1.Tex" +
       "tSpan\022:\n\004type\030\002 \001(\0162,.google.cloud.langu" +
-      "age.v1.EntityMention.Type\0226\n\tsentiment\030\003" +
+      "age.v1.EntityMention.Type\0226\n\tsentiment\030\003",
       " \001(\0132#.google.cloud.language.v1.Sentimen" +
       "t\"0\n\004Type\022\020\n\014TYPE_UNKNOWN\020\000\022\n\n\006PROPER\020\001\022" +
       "\n\n\006COMMON\020\002\"1\n\010TextSpan\022\017\n\007content\030\001 \001(\t" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "nt\030\001 \001(\0132\".google.cloud.language.v1.Docu" +
       "ment\022=\n\rencoding_type\030\002 \001(\0162&.google.clo" +
       "ud.language.v1.EncodingType\"\244\001\n\030AnalyzeS" +
-      "entimentResponse\022?\n\022document_sentiment\030\001" +
+      "entimentResponse\022?\n\022document_sentiment\030\001",
       " \001(\0132#.google.cloud.language.v1.Sentimen" +
       "t\022\020\n\010language\030\002 \001(\t\0225\n\tsentences\030\003 \003(\0132\"" +
       ".google.cloud.language.v1.Sentence\"\224\001\n\035A" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       ".language.v1.EncodingType\"f\n\036AnalyzeEnti" +
       "tySentimentResponse\0222\n\010entities\030\001 \003(\0132 ." +
       "google.cloud.language.v1.Entity\022\020\n\010langu" +
-      "age\030\002 \001(\t\"\215\001\n\026AnalyzeEntitiesRequest\0224\n\010" +
+      "age\030\002 \001(\t\"\215\001\n\026AnalyzeEntitiesRequest\0224\n\010",
       "document\030\001 \001(\0132\".google.cloud.language.v" +
       "1.Document\022=\n\rencoding_type\030\002 \001(\0162&.goog" +
       "le.cloud.language.v1.EncodingType\"_\n\027Ana" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "ocument\030\001 \001(\0132\".google.cloud.language.v1" +
       ".Document\022=\n\rencoding_type\030\002 \001(\0162&.googl" +
       "e.cloud.language.v1.EncodingType\"\221\001\n\025Ana" +
-      "lyzeSyntaxResponse\0225\n\tsentences\030\001 \003(\0132\"." +
+      "lyzeSyntaxResponse\0225\n\tsentences\030\001 \003(\0132\".",
       "google.cloud.language.v1.Sentence\022/\n\006tok" +
       "ens\030\002 \003(\0132\037.google.cloud.language.v1.Tok" +
       "en\022\020\n\010language\030\003 \001(\t\"K\n\023ClassifyTextRequ" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "guage.v1.ClassificationCategory\"\360\002\n\023Anno" +
       "tateTextRequest\0224\n\010document\030\001 \001(\0132\".goog" +
       "le.cloud.language.v1.Document\022H\n\010feature" +
-      "s\030\002 \001(\01326.google.cloud.language.v1.Annot" +
+      "s\030\002 \001(\01326.google.cloud.language.v1.Annot",
       "ateTextRequest.Features\022=\n\rencoding_type" +
       "\030\003 \001(\0162&.google.cloud.language.v1.Encodi" +
       "ngType\032\231\001\n\010Features\022\026\n\016extract_syntax\030\001 " +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "(\010\"\313\002\n\024AnnotateTextResponse\0225\n\tsentences" +
       "\030\001 \003(\0132\".google.cloud.language.v1.Senten" +
       "ce\022/\n\006tokens\030\002 \003(\0132\037.google.cloud.langua" +
-      "ge.v1.Token\0222\n\010entities\030\003 \003(\0132 .google.c" +
+      "ge.v1.Token\0222\n\010entities\030\003 \003(\0132 .google.c",
       "loud.language.v1.Entity\022?\n\022document_sent" +
       "iment\030\004 \001(\0132#.google.cloud.language.v1.S" +
       "entiment\022\020\n\010language\030\005 \001(\t\022D\n\ncategories" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       "anguageService\022\244\001\n\020AnalyzeSentiment\0221.go" +
       "ogle.cloud.language.v1.AnalyzeSentimentR" +
       "equest\0322.google.cloud.language.v1.Analyz" +
-      "eSentimentResponse\")\202\323\344\223\002#\"\036/v1/document" +
+      "eSentimentResponse\")\202\323\344\223\002#\"\036/v1/document",
       "s:analyzeSentiment:\001*\022\240\001\n\017AnalyzeEntitie" +
       "s\0220.google.cloud.language.v1.AnalyzeEnti" +
       "tiesRequest\0321.google.cloud.language.v1.A" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       "nalyzeEntitySentimentRequest\0328.google.cl" +
       "oud.language.v1.AnalyzeEntitySentimentRe" +
       "sponse\"/\202\323\344\223\002)\"$/v1/documents:analyzeEnt" +
-      "itySentiment:\001*\022\230\001\n\rAnalyzeSyntax\022..goog" +
+      "itySentiment:\001*\022\230\001\n\rAnalyzeSyntax\022..goog",
       "le.cloud.language.v1.AnalyzeSyntaxReques" +
       "t\032/.google.cloud.language.v1.AnalyzeSynt" +
       "axResponse\"&\202\323\344\223\002 \"\033/v1/documents:analyz" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "se\"%\202\323\344\223\002\037\"\032/v1/documents:classifyText:\001" +
       "*\022\224\001\n\014AnnotateText\022-.google.cloud.langua" +
       "ge.v1.AnnotateTextRequest\032..google.cloud" +
-      ".language.v1.AnnotateTextResponse\"%\202\323\344\223\002" +
+      ".language.v1.AnnotateTextResponse\"%\202\323\344\223\002",
       "\037\"\032/v1/documents:annotateText:\001*Bx\n\034com." +
       "google.cloud.language.v1B\024LanguageServic" +
       "eProtoP\001Z@google.golang.org/genproto/goo" +
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/PartOfSpeech.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/PartOfSpeech.java
index 3450ba257e20..230eab48f4b0 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/PartOfSpeech.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/PartOfSpeech.java
@@ -46,9 +46,6 @@ private PartOfSpeech(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4122,7 +4119,7 @@ public PartOfSpeech parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartOfSpeech(input, extensionRegistry);
+        return new PartOfSpeech(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentence.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentence.java
index 6c6ae73008fb..d655e467d606 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentence.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentence.java
@@ -32,9 +32,6 @@ private Sentence(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -858,7 +855,7 @@ public Sentence parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Sentence(input, extensionRegistry);
+        return new Sentence(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentiment.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentiment.java
index 5ac156fe6d36..e752d53c333f 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentiment.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentiment.java
@@ -35,9 +35,6 @@ private Sentiment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -544,7 +541,7 @@ public Sentiment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Sentiment(input, extensionRegistry);
+        return new Sentiment(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/TextSpan.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/TextSpan.java
index b9c28f3c8494..a3fc06640e47 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/TextSpan.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/TextSpan.java
@@ -34,9 +34,6 @@ private TextSpan(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -609,7 +606,7 @@ public TextSpan parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextSpan(input, extensionRegistry);
+        return new TextSpan(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Token.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Token.java
index 8f946af99892..f554f6246ae8 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Token.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Token.java
@@ -33,9 +33,6 @@ private Token(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1218,7 +1215,7 @@ public Token parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Token(input, extensionRegistry);
+        return new Token(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesRequest.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesRequest.java
index 686524870c06..c63d96dd26cc 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesRequest.java
@@ -33,9 +33,6 @@ private AnalyzeEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -716,7 +713,7 @@ public AnalyzeEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitiesRequest(input, extensionRegistry);
+        return new AnalyzeEntitiesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesResponse.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesResponse.java
index 3e7cab8ca866..0b973a178885 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesResponse.java
@@ -34,9 +34,6 @@ private AnalyzeEntitiesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public AnalyzeEntitiesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitiesResponse(input, extensionRegistry);
+        return new AnalyzeEntitiesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentRequest.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentRequest.java
index 952b7f08a6a3..fa13602cf2c0 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentRequest.java
@@ -33,9 +33,6 @@ private AnalyzeEntitySentimentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -716,7 +713,7 @@ public AnalyzeEntitySentimentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitySentimentRequest(input, extensionRegistry);
+        return new AnalyzeEntitySentimentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentResponse.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentResponse.java
index 7ca42510903d..b9d853bfc5cd 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentResponse.java
@@ -34,9 +34,6 @@ private AnalyzeEntitySentimentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public AnalyzeEntitySentimentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitySentimentResponse(input, extensionRegistry);
+        return new AnalyzeEntitySentimentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentRequest.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentRequest.java
index 829cd6a2d1a0..1d0f2732e7b5 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentRequest.java
@@ -33,9 +33,6 @@ private AnalyzeSentimentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -723,7 +720,7 @@ public AnalyzeSentimentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSentimentRequest(input, extensionRegistry);
+        return new AnalyzeSentimentRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentResponse.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentResponse.java
index a91be21c659e..b00f991d5fbb 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentResponse.java
@@ -34,9 +34,6 @@ private AnalyzeSentimentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1214,7 +1211,7 @@ public AnalyzeSentimentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSentimentResponse(input, extensionRegistry);
+        return new AnalyzeSentimentResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxRequest.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxRequest.java
index a0de2c64e2f2..6ee60f828dd6 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxRequest.java
@@ -33,9 +33,6 @@ private AnalyzeSyntaxRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -716,7 +713,7 @@ public AnalyzeSyntaxRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSyntaxRequest(input, extensionRegistry);
+        return new AnalyzeSyntaxRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxResponse.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxResponse.java
index 04653cd8a719..fc05b4accbee 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxResponse.java
@@ -35,9 +35,6 @@ private AnalyzeSyntaxResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1420,7 +1417,7 @@ public AnalyzeSyntaxResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSyntaxResponse(input, extensionRegistry);
+        return new AnalyzeSyntaxResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextRequest.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextRequest.java
index 395d333ed933..c12bbd0d8055 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextRequest.java
@@ -34,9 +34,6 @@ private AnnotateTextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -195,9 +192,6 @@ private Features(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -910,7 +904,7 @@ public Features parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Features(input, extensionRegistry);
+          return new Features(input, extensionRegistry);
       }
     };
 
@@ -1765,7 +1759,7 @@ public AnnotateTextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateTextRequest(input, extensionRegistry);
+        return new AnnotateTextRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextResponse.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextResponse.java
index 7c2308fcb741..61802cede6bd 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextResponse.java
@@ -37,9 +37,6 @@ private AnnotateTextResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2646,7 +2643,7 @@ public AnnotateTextResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateTextResponse(input, extensionRegistry);
+        return new AnnotateTextResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassificationCategory.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassificationCategory.java
index b7da284ecb3c..4b580a1e3dbf 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassificationCategory.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassificationCategory.java
@@ -34,9 +34,6 @@ private ClassificationCategory(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -612,7 +609,7 @@ public ClassificationCategory parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClassificationCategory(input, extensionRegistry);
+        return new ClassificationCategory(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextRequest.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextRequest.java
index 2f7d1a6efbad..6e2e1c0532b7 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextRequest.java
@@ -32,9 +32,6 @@ private ClassifyTextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public ClassifyTextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClassifyTextRequest(input, extensionRegistry);
+        return new ClassifyTextRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextResponse.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextResponse.java
index d88f4a88d8b4..609b29b7c61f 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextResponse.java
@@ -33,9 +33,6 @@ private ClassifyTextResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public ClassifyTextResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClassifyTextResponse(input, extensionRegistry);
+        return new ClassifyTextResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/DependencyEdge.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/DependencyEdge.java
index 1b5da3940561..c7c524c7495c 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/DependencyEdge.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/DependencyEdge.java
@@ -34,9 +34,6 @@ private DependencyEdge(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2072,7 +2069,7 @@ public DependencyEdge parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DependencyEdge(input, extensionRegistry);
+        return new DependencyEdge(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Document.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Document.java
index e884a7b601c9..322139a99c21 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Document.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Document.java
@@ -35,9 +35,6 @@ private Document(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1288,7 +1285,7 @@ public Document parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Document(input, extensionRegistry);
+        return new Document(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Entity.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Entity.java
index 3d1a8d9473fb..210d1d95fe94 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Entity.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Entity.java
@@ -38,9 +38,6 @@ private Entity(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2025,7 +2022,7 @@ public Entity parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Entity(input, extensionRegistry);
+        return new Entity(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/EntityMention.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/EntityMention.java
index ca2ee8eba5b5..3b290641525d 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/EntityMention.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/EntityMention.java
@@ -34,9 +34,6 @@ private EntityMention(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1118,7 +1115,7 @@ public EntityMention parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityMention(input, extensionRegistry);
+        return new EntityMention(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceProto.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceProto.java
index 1be9f2899813..e72d5aa509e7 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceProto.java
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "google.cloud.language.v1beta2.Document.T" +
       "ype\022\021\n\007content\030\002 \001(\tH\000\022\031\n\017gcs_content_ur" +
       "i\030\003 \001(\tH\000\022\020\n\010language\030\004 \001(\t\"6\n\004Type\022\024\n\020T" +
-      "YPE_UNSPECIFIED\020\000\022\016\n\nPLAIN_TEXT\020\001\022\010\n\004HTM" +
+      "YPE_UNSPECIFIED\020\000\022\016\n\nPLAIN_TEXT\020\001\022\010\n\004HTM",
       "L\020\002B\010\n\006source\"~\n\010Sentence\0225\n\004text\030\001 \001(\0132" +
       "\'.google.cloud.language.v1beta2.TextSpan" +
       "\022;\n\tsentiment\030\002 \001(\0132(.google.cloud.langu" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "(\01323.google.cloud.language.v1beta2.Entit" +
       "y.MetadataEntry\022\020\n\010salience\030\004 \001(\002\022>\n\010men" +
       "tions\030\005 \003(\0132,.google.cloud.language.v1be" +
-      "ta2.EntityMention\022;\n\tsentiment\030\006 \001(\0132(.g" +
+      "ta2.EntityMention\022;\n\tsentiment\030\006 \001(\0132(.g",
       "oogle.cloud.language.v1beta2.Sentiment\032/" +
       "\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 " +
       "\001(\t:\0028\001\"y\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006PERSON\020\001" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "gle.cloud.language.v1beta2.TextSpan\022C\n\016p" +
       "art_of_speech\030\002 \001(\0132+.google.cloud.langu" +
       "age.v1beta2.PartOfSpeech\022F\n\017dependency_e" +
-      "dge\030\003 \001(\0132-.google.cloud.language.v1beta" +
+      "dge\030\003 \001(\0132-.google.cloud.language.v1beta",
       "2.DependencyEdge\022\r\n\005lemma\030\004 \001(\t\"-\n\tSenti" +
       "ment\022\021\n\tmagnitude\030\002 \001(\002\022\r\n\005score\030\003 \001(\002\"\337" +
       "\020\n\014PartOfSpeech\022<\n\003tag\030\001 \001(\0162/.google.cl" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "0.google.cloud.language.v1beta2.PartOfSp" +
       "eech.Case\022>\n\004form\030\004 \001(\01620.google.cloud.l" +
       "anguage.v1beta2.PartOfSpeech.Form\022B\n\006gen" +
-      "der\030\005 \001(\01622.google.cloud.language.v1beta" +
+      "der\030\005 \001(\01622.google.cloud.language.v1beta",
       "2.PartOfSpeech.Gender\022>\n\004mood\030\006 \001(\01620.go" +
       "ogle.cloud.language.v1beta2.PartOfSpeech" +
       ".Mood\022B\n\006number\030\007 \001(\01622.google.cloud.lan" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "google.cloud.language.v1beta2.PartOfSpee" +
       "ch.Proper\022L\n\013reciprocity\030\n \001(\01627.google." +
       "cloud.language.v1beta2.PartOfSpeech.Reci" +
-      "procity\022@\n\005tense\030\013 \001(\01621.google.cloud.la" +
+      "procity\022@\n\005tense\030\013 \001(\01621.google.cloud.la",
       "nguage.v1beta2.PartOfSpeech.Tense\022@\n\005voi" +
       "ce\030\014 \001(\01621.google.cloud.language.v1beta2" +
       ".PartOfSpeech.Voice\"\215\001\n\003Tag\022\013\n\007UNKNOWN\020\000" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "X\020\r\"O\n\006Aspect\022\022\n\016ASPECT_UNKNOWN\020\000\022\016\n\nPER" +
       "FECTIVE\020\001\022\020\n\014IMPERFECTIVE\020\002\022\017\n\013PROGRESSI" +
       "VE\020\003\"\370\001\n\004Case\022\020\n\014CASE_UNKNOWN\020\000\022\016\n\nACCUS" +
-      "ATIVE\020\001\022\r\n\tADVERBIAL\020\002\022\021\n\rCOMPLEMENTIVE\020" +
+      "ATIVE\020\001\022\r\n\tADVERBIAL\020\002\022\021\n\rCOMPLEMENTIVE\020",
       "\003\022\n\n\006DATIVE\020\004\022\014\n\010GENITIVE\020\005\022\020\n\014INSTRUMEN" +
       "TAL\020\006\022\014\n\010LOCATIVE\020\007\022\016\n\nNOMINATIVE\020\010\022\013\n\007O" +
       "BLIQUE\020\t\022\r\n\tPARTITIVE\020\n\022\021\n\rPREPOSITIONAL" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "EMENTIZER\020\003\022\020\n\014FINAL_ENDING\020\004\022\n\n\006GERUND\020" +
       "\005\022\n\n\006REALIS\020\006\022\014\n\010IRREALIS\020\007\022\t\n\005SHORT\020\010\022\010" +
       "\n\004LONG\020\t\022\t\n\005ORDER\020\n\022\014\n\010SPECIFIC\020\013\"E\n\006Gen" +
-      "der\022\022\n\016GENDER_UNKNOWN\020\000\022\014\n\010FEMININE\020\001\022\r\n" +
+      "der\022\022\n\016GENDER_UNKNOWN\020\000\022\014\n\010FEMININE\020\001\022\r\n",
       "\tMASCULINE\020\002\022\n\n\006NEUTER\020\003\"\177\n\004Mood\022\020\n\014MOOD" +
       "_UNKNOWN\020\000\022\024\n\020CONDITIONAL_MOOD\020\001\022\016\n\nIMPE" +
       "RATIVE\020\002\022\016\n\nINDICATIVE\020\003\022\021\n\rINTERROGATIV" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "UNKNOWN\020\000\022\t\n\005FIRST\020\001\022\n\n\006SECOND\020\002\022\t\n\005THIR" +
       "D\020\003\022\024\n\020REFLEXIVE_PERSON\020\004\"8\n\006Proper\022\022\n\016P" +
       "ROPER_UNKNOWN\020\000\022\n\n\006PROPER\020\001\022\016\n\nNOT_PROPE" +
-      "R\020\002\"J\n\013Reciprocity\022\027\n\023RECIPROCITY_UNKNOW" +
+      "R\020\002\"J\n\013Reciprocity\022\027\n\023RECIPROCITY_UNKNOW",
       "N\020\000\022\016\n\nRECIPROCAL\020\001\022\022\n\016NON_RECIPROCAL\020\002\"" +
       "s\n\005Tense\022\021\n\rTENSE_UNKNOWN\020\000\022\025\n\021CONDITION" +
       "AL_TENSE\020\001\022\n\n\006FUTURE\020\002\022\010\n\004PAST\020\003\022\013\n\007PRES" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "dge\022\030\n\020head_token_index\030\001 \001(\005\022B\n\005label\030\002" +
       " \001(\01623.google.cloud.language.v1beta2.Dep" +
       "endencyEdge.Label\"\251\007\n\005Label\022\013\n\007UNKNOWN\020\000" +
-      "\022\n\n\006ABBREV\020\001\022\t\n\005ACOMP\020\002\022\t\n\005ADVCL\020\003\022\n\n\006AD" +
+      "\022\n\n\006ABBREV\020\001\022\t\n\005ACOMP\020\002\022\t\n\005ADVCL\020\003\022\n\n\006AD",
       "VMOD\020\004\022\010\n\004AMOD\020\005\022\t\n\005APPOS\020\006\022\010\n\004ATTR\020\007\022\007\n" +
       "\003AUX\020\010\022\013\n\007AUXPASS\020\t\022\006\n\002CC\020\n\022\t\n\005CCOMP\020\013\022\010" +
       "\n\004CONJ\020\014\022\t\n\005CSUBJ\020\r\022\r\n\tCSUBJPASS\020\016\022\007\n\003DE" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "NPADVMOD\020\033\022\t\n\005NSUBJ\020\034\022\r\n\tNSUBJPASS\020\035\022\007\n\003" +
       "NUM\020\036\022\n\n\006NUMBER\020\037\022\005\n\001P\020 \022\r\n\tPARATAXIS\020!\022" +
       "\013\n\007PARTMOD\020\"\022\t\n\005PCOMP\020#\022\010\n\004POBJ\020$\022\010\n\004POS" +
-      "S\020%\022\013\n\007POSTNEG\020&\022\013\n\007PRECOMP\020\'\022\013\n\007PRECONJ" +
+      "S\020%\022\013\n\007POSTNEG\020&\022\013\n\007PRECOMP\020\'\022\013\n\007PRECONJ",
       "\020(\022\n\n\006PREDET\020)\022\010\n\004PREF\020*\022\010\n\004PREP\020+\022\t\n\005PR" +
       "ONL\020,\022\007\n\003PRT\020-\022\006\n\002PS\020.\022\014\n\010QUANTMOD\020/\022\t\n\005" +
       "RCMOD\0200\022\014\n\010RCMODREL\0201\022\t\n\005RDROP\0202\022\007\n\003REF\020" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "SUFFIX\020>\022\t\n\005TITLE\020?\022\014\n\010ADVPHMOD\020@\022\013\n\007AUX" +
       "CAUS\020A\022\t\n\005AUXVV\020B\022\t\n\005DTMOD\020C\022\013\n\007FOREIGN\020" +
       "D\022\006\n\002KW\020E\022\010\n\004LIST\020F\022\010\n\004NOMC\020G\022\014\n\010NOMCSUB" +
-      "J\020H\022\020\n\014NOMCSUBJPASS\020I\022\010\n\004NUMC\020J\022\007\n\003COP\020K" +
+      "J\020H\022\020\n\014NOMCSUBJPASS\020I\022\010\n\004NUMC\020J\022\007\n\003COP\020K",
       "\022\016\n\nDISLOCATED\020L\022\007\n\003ASP\020M\022\010\n\004GMOD\020N\022\010\n\004G" +
       "OBJ\020O\022\n\n\006INFMOD\020P\022\007\n\003MES\020Q\022\t\n\005NCOMP\020R\"\366\001" +
       "\n\rEntityMention\0225\n\004text\030\001 \001(\0132\'.google.c" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "gle.cloud.language.v1beta2.Sentiment\"0\n\004" +
       "Type\022\020\n\014TYPE_UNKNOWN\020\000\022\n\n\006PROPER\020\001\022\n\n\006CO" +
       "MMON\020\002\"1\n\010TextSpan\022\017\n\007content\030\001 \001(\t\022\024\n\014b" +
-      "egin_offset\030\002 \001(\005\":\n\026ClassificationCateg" +
+      "egin_offset\030\002 \001(\005\":\n\026ClassificationCateg",
       "ory\022\014\n\004name\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\"\230\001" +
       "\n\027AnalyzeSentimentRequest\0229\n\010document\030\001 " +
       "\001(\0132\'.google.cloud.language.v1beta2.Docu" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "ent\030\001 \001(\0132(.google.cloud.language.v1beta" +
       "2.Sentiment\022\020\n\010language\030\002 \001(\t\022:\n\tsentenc" +
       "es\030\003 \003(\0132\'.google.cloud.language.v1beta2" +
-      ".Sentence\"\236\001\n\035AnalyzeEntitySentimentRequ" +
+      ".Sentence\"\236\001\n\035AnalyzeEntitySentimentRequ",
       "est\0229\n\010document\030\001 \001(\0132\'.google.cloud.lan" +
       "guage.v1beta2.Document\022B\n\rencoding_type\030" +
       "\002 \001(\0162+.google.cloud.language.v1beta2.En" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "\227\001\n\026AnalyzeEntitiesRequest\0229\n\010document\030\001" +
       " \001(\0132\'.google.cloud.language.v1beta2.Doc" +
       "ument\022B\n\rencoding_type\030\002 \001(\0162+.google.cl" +
-      "oud.language.v1beta2.EncodingType\"d\n\027Ana" +
+      "oud.language.v1beta2.EncodingType\"d\n\027Ana",
       "lyzeEntitiesResponse\0227\n\010entities\030\001 \003(\0132%" +
       ".google.cloud.language.v1beta2.Entity\022\020\n" +
       "\010language\030\002 \001(\t\"\225\001\n\024AnalyzeSyntaxRequest" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "ingType\"\233\001\n\025AnalyzeSyntaxResponse\022:\n\tsen" +
       "tences\030\001 \003(\0132\'.google.cloud.language.v1b" +
       "eta2.Sentence\0224\n\006tokens\030\002 \003(\0132$.google.c" +
-      "loud.language.v1beta2.Token\022\020\n\010language\030" +
+      "loud.language.v1beta2.Token\022\020\n\010language\030",
       "\003 \001(\t\"P\n\023ClassifyTextRequest\0229\n\010document" +
       "\030\001 \001(\0132\'.google.cloud.language.v1beta2.D" +
       "ocument\"a\n\024ClassifyTextResponse\022I\n\ncateg" +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "oud.language.v1beta2.Document\022M\n\010feature" +
       "s\030\002 \001(\0132;.google.cloud.language.v1beta2." +
       "AnnotateTextRequest.Features\022B\n\rencoding" +
-      "_type\030\003 \001(\0162+.google.cloud.language.v1be" +
+      "_type\030\003 \001(\0162+.google.cloud.language.v1be",
       "ta2.EncodingType\032\231\001\n\010Features\022\026\n\016extract" +
       "_syntax\030\001 \001(\010\022\030\n\020extract_entities\030\002 \001(\010\022" +
       "\"\n\032extract_document_sentiment\030\003 \001(\010\022 \n\030e" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       ".v1beta2.Sentence\0224\n\006tokens\030\002 \003(\0132$.goog" +
       "le.cloud.language.v1beta2.Token\0227\n\010entit" +
       "ies\030\003 \003(\0132%.google.cloud.language.v1beta" +
-      "2.Entity\022D\n\022document_sentiment\030\004 \001(\0132(.g" +
+      "2.Entity\022D\n\022document_sentiment\030\004 \001(\0132(.g",
       "oogle.cloud.language.v1beta2.Sentiment\022\020" +
       "\n\010language\030\005 \001(\t\022I\n\ncategories\030\006 \003(\01325.g" +
       "oogle.cloud.language.v1beta2.Classificat" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       "cloud.language.v1beta2.AnalyzeSentimentR" +
       "equest\0327.google.cloud.language.v1beta2.A" +
       "nalyzeSentimentResponse\".\202\323\344\223\002(\"#/v1beta" +
-      "2/documents:analyzeSentiment:\001*\022\257\001\n\017Anal" +
+      "2/documents:analyzeSentiment:\001*\022\257\001\n\017Anal",
       "yzeEntities\0225.google.cloud.language.v1be" +
       "ta2.AnalyzeEntitiesRequest\0326.google.clou" +
       "d.language.v1beta2.AnalyzeEntitiesRespon" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "tySentimentRequest\032=.google.cloud.langua" +
       "ge.v1beta2.AnalyzeEntitySentimentRespons" +
       "e\"4\202\323\344\223\002.\")/v1beta2/documents:analyzeEnt" +
-      "itySentiment:\001*\022\247\001\n\rAnalyzeSyntax\0223.goog" +
+      "itySentiment:\001*\022\247\001\n\rAnalyzeSyntax\0223.goog",
       "le.cloud.language.v1beta2.AnalyzeSyntaxR" +
       "equest\0324.google.cloud.language.v1beta2.A" +
       "nalyzeSyntaxResponse\"+\202\323\344\223\002%\" /v1beta2/d" +
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "1beta2.ClassifyTextResponse\"*\202\323\344\223\002$\"\037/v1" +
       "beta2/documents:classifyText:\001*\022\243\001\n\014Anno" +
       "tateText\0222.google.cloud.language.v1beta2" +
-      ".AnnotateTextRequest\0323.google.cloud.lang" +
+      ".AnnotateTextRequest\0323.google.cloud.lang",
       "uage.v1beta2.AnnotateTextResponse\"*\202\323\344\223\002" +
       "$\"\037/v1beta2/documents:annotateText:\001*B\202\001" +
       "\n!com.google.cloud.language.v1beta2B\024Lan" +
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/PartOfSpeech.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/PartOfSpeech.java
index 67d07ed9e765..c176ac4840bd 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/PartOfSpeech.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/PartOfSpeech.java
@@ -44,9 +44,6 @@ private PartOfSpeech(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4118,7 +4115,7 @@ public PartOfSpeech parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartOfSpeech(input, extensionRegistry);
+        return new PartOfSpeech(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentence.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentence.java
index f70038a14825..12abe84076bf 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentence.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentence.java
@@ -32,9 +32,6 @@ private Sentence(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -858,7 +855,7 @@ public Sentence parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Sentence(input, extensionRegistry);
+        return new Sentence(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentiment.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentiment.java
index e02614e61ced..9d48453e5e12 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentiment.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentiment.java
@@ -35,9 +35,6 @@ private Sentiment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -544,7 +541,7 @@ public Sentiment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Sentiment(input, extensionRegistry);
+        return new Sentiment(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/TextSpan.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/TextSpan.java
index 282d550ef046..fbea42e389e5 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/TextSpan.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/TextSpan.java
@@ -34,9 +34,6 @@ private TextSpan(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -609,7 +606,7 @@ public TextSpan parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextSpan(input, extensionRegistry);
+        return new TextSpan(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Token.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Token.java
index 050ff3f4d894..95e3b8daf8b3 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Token.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Token.java
@@ -33,9 +33,6 @@ private Token(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1218,7 +1215,7 @@ public Token parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Token(input, extensionRegistry);
+        return new Token(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingExclusionName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingExclusionName.java
index b91fa35bdf18..5d91c79c216e 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingExclusionName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingExclusionName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("BillingExclusionName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("billing_account", billingAccount, "exclusion", exclusion);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingLogName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingLogName.java
index d437bb0135b9..1d9417d66d35 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingLogName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingLogName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("BillingLogName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("billing_account", billingAccount, "log", log);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingName.java
index 847b0eb3e92f..b403a04ba1e7 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("BillingName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("billing_account", billingAccount);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingSinkName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingSinkName.java
index 332145fee079..b186f70c03d0 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingSinkName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingSinkName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("BillingSinkName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("billing_account", billingAccount, "sink", sink);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java
index 9f61bec7c249..bbfe7165a6c1 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java
@@ -33,9 +33,6 @@ private CreateExclusionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -807,7 +804,7 @@ public CreateExclusionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateExclusionRequest(input, extensionRegistry);
+        return new CreateExclusionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java
index cc5a6e06a05b..f65cf01daa77 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java
@@ -33,9 +33,6 @@ private CreateLogMetricRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -786,7 +783,7 @@ public CreateLogMetricRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateLogMetricRequest(input, extensionRegistry);
+        return new CreateLogMetricRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java
index d2b76a787b3e..8cc1b5693ddb 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java
@@ -34,9 +34,6 @@ private CreateSinkRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -918,7 +915,7 @@ public CreateSinkRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateSinkRequest(input, extensionRegistry);
+        return new CreateSinkRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java
index 401fa96a2a9b..7bfd786684a0 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java
@@ -33,9 +33,6 @@ private DeleteExclusionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -566,7 +563,7 @@ public DeleteExclusionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteExclusionRequest(input, extensionRegistry);
+        return new DeleteExclusionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java
index 1bc434af0cb5..7499b31e2245 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java
@@ -33,9 +33,6 @@ private DeleteLogMetricRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteLogMetricRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteLogMetricRequest(input, extensionRegistry);
+        return new DeleteLogMetricRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java
index 2f7d243c0688..0ff95c5f34a1 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java
@@ -33,9 +33,6 @@ private DeleteLogRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -594,7 +591,7 @@ public DeleteLogRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteLogRequest(input, extensionRegistry);
+        return new DeleteLogRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java
index 44bf390eab11..a488fa6f350c 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java
@@ -33,9 +33,6 @@ private DeleteSinkRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -573,7 +570,7 @@ public DeleteSinkRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSinkRequest(input, extensionRegistry);
+        return new DeleteSinkRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderExclusionName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderExclusionName.java
index fa42a81884a4..3da0e9fed776 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderExclusionName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderExclusionName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("FolderExclusionName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("folder", folder, "exclusion", exclusion);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLogName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLogName.java
index cd4b6644f7f8..e1cda14200a5 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLogName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLogName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("FolderLogName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("folder", folder, "log", log);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java
index 068c1e2fdb17..3437a28b93c5 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("FolderName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("folder", folder);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderSinkName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderSinkName.java
index 667854dabe02..b96ceb30bed8 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderSinkName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderSinkName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("FolderSinkName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("folder", folder, "sink", sink);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java
index 07a28453c822..dab38bc9eee3 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java
@@ -33,9 +33,6 @@ private GetExclusionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -566,7 +563,7 @@ public GetExclusionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetExclusionRequest(input, extensionRegistry);
+        return new GetExclusionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java
index dfe219851d2f..8d13a7e8ab94 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java
@@ -33,9 +33,6 @@ private GetLogMetricRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetLogMetricRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetLogMetricRequest(input, extensionRegistry);
+        return new GetLogMetricRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java
index 46903bae84a7..3767b17fc053 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java
@@ -33,9 +33,6 @@ private GetSinkRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -566,7 +563,7 @@ public GetSinkRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSinkRequest(input, extensionRegistry);
+        return new GetSinkRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java
index 052bd618f0f7..4349841ec337 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java
@@ -35,9 +35,6 @@ private ListExclusionsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public ListExclusionsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListExclusionsRequest(input, extensionRegistry);
+        return new ListExclusionsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java
index 8ec5ebccadad..8267723b8d47 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java
@@ -34,9 +34,6 @@ private ListExclusionsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListExclusionsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListExclusionsResponse(input, extensionRegistry);
+        return new ListExclusionsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java
index 103bf7c4d1c1..02a136ccce45 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java
@@ -38,9 +38,6 @@ private ListLogEntriesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1600,7 +1597,7 @@ public ListLogEntriesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListLogEntriesRequest(input, extensionRegistry);
+        return new ListLogEntriesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java
index 6fd409b26e0d..1b883041b69e 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java
@@ -34,9 +34,6 @@ private ListLogEntriesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1073,7 +1070,7 @@ public ListLogEntriesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListLogEntriesResponse(input, extensionRegistry);
+        return new ListLogEntriesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java
index 527d5b5c013a..10ca988f6926 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java
@@ -35,9 +35,6 @@ private ListLogMetricsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -796,7 +793,7 @@ public ListLogMetricsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListLogMetricsRequest(input, extensionRegistry);
+        return new ListLogMetricsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java
index f697b3b9278c..56b9590191f7 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java
@@ -34,9 +34,6 @@ private ListLogMetricsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListLogMetricsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListLogMetricsResponse(input, extensionRegistry);
+        return new ListLogMetricsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java
index 8fee36c9a7b1..e68cdf52ca19 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java
@@ -35,9 +35,6 @@ private ListLogsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public ListLogsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListLogsRequest(input, extensionRegistry);
+        return new ListLogsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java
index 6cd4fdf42a78..52ce6088ee72 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java
@@ -34,9 +34,6 @@ private ListLogsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -798,7 +795,7 @@ public ListLogsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListLogsResponse(input, extensionRegistry);
+        return new ListLogsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java
index 361f9f3b4f5a..d541c0351439 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java
@@ -34,9 +34,6 @@ private ListMonitoredResourceDescriptorsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -634,7 +631,7 @@ public ListMonitoredResourceDescriptorsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListMonitoredResourceDescriptorsRequest(input, extensionRegistry);
+        return new ListMonitoredResourceDescriptorsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java
index 7fcfe51ac236..d65fd6978763 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java
@@ -34,9 +34,6 @@ private ListMonitoredResourceDescriptorsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListMonitoredResourceDescriptorsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListMonitoredResourceDescriptorsResponse(input, extensionRegistry);
+        return new ListMonitoredResourceDescriptorsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java
index 6a52edd4fb21..0481c46c6317 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java
@@ -35,9 +35,6 @@ private ListSinksRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public ListSinksRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSinksRequest(input, extensionRegistry);
+        return new ListSinksRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java
index 139502775f9a..bba086fb3ec0 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java
@@ -34,9 +34,6 @@ private ListSinksResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListSinksResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSinksResponse(input, extensionRegistry);
+        return new ListSinksResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java
index 9ff2198bfe69..03488e24f3b4 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java
@@ -37,9 +37,6 @@ private LogEntry(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3969,7 +3966,7 @@ public LogEntry parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LogEntry(input, extensionRegistry);
+        return new LogEntry(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java
index 7e96d49f5bf6..a8cd0003f86b 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java
@@ -37,9 +37,6 @@ private LogEntryOperation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -859,7 +856,7 @@ public LogEntryOperation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LogEntryOperation(input, extensionRegistry);
+        return new LogEntryOperation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java
index 1cb256fd6678..a55b84d83117 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "tobuf/struct.proto\032\037google/protobuf/time" +
       "stamp.proto\"\272\005\n\010LogEntry\022\020\n\010log_name\030\014 \001" +
       "(\t\022/\n\010resource\030\010 \001(\0132\035.google.api.Monito" +
-      "redResource\022-\n\rproto_payload\030\002 \001(\0132\024.goo" +
+      "redResource\022-\n\rproto_payload\030\002 \001(\0132\024.goo",
       "gle.protobuf.AnyH\000\022\026\n\014text_payload\030\003 \001(\t" +
       "H\000\022/\n\014json_payload\030\006 \001(\0132\027.google.protob" +
       "uf.StructH\000\022-\n\ttimestamp\030\t \001(\0132\032.google." +
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "erity\022\021\n\tinsert_id\030\004 \001(\t\0226\n\014http_request" +
       "\030\007 \001(\0132 .google.logging.type.HttpRequest" +
       "\0227\n\006labels\030\013 \003(\0132\'.google.logging.v2.Log" +
-      "Entry.LabelsEntry\0227\n\toperation\030\017 \001(\0132$.g" +
+      "Entry.LabelsEntry\0227\n\toperation\030\017 \001(\0132$.g",
       "oogle.logging.v2.LogEntryOperation\022\r\n\005tr" +
       "ace\030\026 \001(\t\022\017\n\007span_id\030\033 \001(\t\022B\n\017source_loc" +
       "ation\030\027 \001(\0132).google.logging.v2.LogEntry" +
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "\001(\t\022\r\n\005first\030\003 \001(\010\022\014\n\004last\030\004 \001(\010\"F\n\026LogE" +
       "ntrySourceLocation\022\014\n\004file\030\001 \001(\t\022\014\n\004line" +
       "\030\002 \001(\003\022\020\n\010function\030\003 \001(\tB\231\001\n\025com.google." +
-      "logging.v2B\rLogEntryProtoP\001Z8google.gola" +
+      "logging.v2B\rLogEntryProtoP\001Z8google.gola",
       "ng.org/genproto/googleapis/logging/v2;lo" +
       "gging\370\001\001\252\002\027Google.Cloud.Logging.V2\312\002\027Goo" +
       "gle\\Cloud\\Logging\\V2b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java
index b16f38eb8768..bcd091d2038b 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java
@@ -36,9 +36,6 @@ private LogEntrySourceLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -809,7 +806,7 @@ public LogEntrySourceLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LogEntrySourceLocation(input, extensionRegistry);
+        return new LogEntrySourceLocation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java
index d33cc0862eee..243d0ebce08c 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java
@@ -41,9 +41,6 @@ private LogExclusion(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public LogExclusion parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LogExclusion(input, extensionRegistry);
+        return new LogExclusion(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java
index 5002a5c06523..47afc7a9e5eb 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java
@@ -42,9 +42,6 @@ private LogMetric(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2582,7 +2579,7 @@ public LogMetric parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LogMetric(input, extensionRegistry);
+        return new LogMetric(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java
index 4845b50b0885..87c449c6ecfc 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java
@@ -42,9 +42,6 @@ private LogSink(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2025,7 +2022,7 @@ public LogSink parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LogSink(input, extensionRegistry);
+        return new LogSink(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingConfigProto.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingConfigProto.java
index 88a12ccba4fd..86c5ae34c9b2 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingConfigProto.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingConfigProto.java
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "er\030\005 \001(\t\022G\n\025output_version_format\030\006 \001(\0162" +
       "(.google.logging.v2.LogSink.VersionForma" +
       "t\022\027\n\017writer_identity\030\010 \001(\t\022\030\n\020include_ch" +
-      "ildren\030\t \001(\010\022.\n\nstart_time\030\n \001(\0132\032.googl" +
+      "ildren\030\t \001(\010\022.\n\nstart_time\030\n \001(\0132\032.googl",
       "e.protobuf.Timestamp\022,\n\010end_time\030\013 \001(\0132\032" +
       ".google.protobuf.Timestamp\"?\n\rVersionFor" +
       "mat\022\036\n\032VERSION_FORMAT_UNSPECIFIED\020\000\022\006\n\002V" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "(\0132\032.google.logging.v2.LogSink\022\027\n\017next_p" +
       "age_token\030\002 \001(\t\"#\n\016GetSinkRequest\022\021\n\tsin" +
       "k_name\030\001 \001(\t\"m\n\021CreateSinkRequest\022\016\n\006par" +
-      "ent\030\001 \001(\t\022(\n\004sink\030\002 \001(\0132\032.google.logging" +
+      "ent\030\001 \001(\t\022(\n\004sink\030\002 \001(\0132\032.google.logging",
       ".v2.LogSink\022\036\n\026unique_writer_identity\030\003 " +
       "\001(\010\"\241\001\n\021UpdateSinkRequest\022\021\n\tsink_name\030\001" +
       " \001(\t\022(\n\004sink\030\002 \001(\0132\032.google.logging.v2.L" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "e\030\001 \001(\t\"S\n\014LogExclusion\022\014\n\004name\030\001 \001(\t\022\023\n" +
       "\013description\030\002 \001(\t\022\016\n\006filter\030\003 \001(\t\022\020\n\010di" +
       "sabled\030\004 \001(\010\"N\n\025ListExclusionsRequest\022\016\n" +
-      "\006parent\030\001 \001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tpag" +
+      "\006parent\030\001 \001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tpag",
       "e_size\030\003 \001(\005\"f\n\026ListExclusionsResponse\0223" +
       "\n\nexclusions\030\001 \003(\0132\037.google.logging.v2.L" +
       "ogExclusion\022\027\n\017next_page_token\030\002 \001(\t\"#\n\023" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "clusion\"\213\001\n\026UpdateExclusionRequest\022\014\n\004na" +
       "me\030\001 \001(\t\0222\n\texclusion\030\002 \001(\0132\037.google.log" +
       "ging.v2.LogExclusion\022/\n\013update_mask\030\003 \001(" +
-      "\0132\032.google.protobuf.FieldMask\"&\n\026DeleteE" +
+      "\0132\032.google.protobuf.FieldMask\"&\n\026DeleteE",
       "xclusionRequest\022\014\n\004name\030\001 \001(\t2\200\n\n\017Config" +
       "ServiceV2\022v\n\tListSinks\022#.google.logging." +
       "v2.ListSinksRequest\032$.google.logging.v2." +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "ink\"#\202\323\344\223\002\035\022\033/v2/{sink_name=*/*/sinks/*}" +
       "\022t\n\nCreateSink\022$.google.logging.v2.Creat" +
       "eSinkRequest\032\032.google.logging.v2.LogSink" +
-      "\"$\202\323\344\223\002\036\"\026/v2/{parent=*/*}/sinks:\004sink\022y" +
+      "\"$\202\323\344\223\002\036\"\026/v2/{parent=*/*}/sinks:\004sink\022y",
       "\n\nUpdateSink\022$.google.logging.v2.UpdateS" +
       "inkRequest\032\032.google.logging.v2.LogSink\")" +
       "\202\323\344\223\002#\032\033/v2/{sink_name=*/*/sinks/*}:\004sin" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "istExclusions\022(.google.logging.v2.ListEx" +
       "clusionsRequest\032).google.logging.v2.List" +
       "ExclusionsResponse\"#\202\323\344\223\002\035\022\033/v2/{parent=" +
-      "*/*}/exclusions\022|\n\014GetExclusion\022&.google" +
+      "*/*}/exclusions\022|\n\014GetExclusion\022&.google",
       ".logging.v2.GetExclusionRequest\032\037.google" +
       ".logging.v2.LogExclusion\"#\202\323\344\223\002\035\022\033/v2/{n" +
       "ame=*/*/exclusions/*}\022\215\001\n\017CreateExclusio" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "usion\022\215\001\n\017UpdateExclusion\022).google.loggi" +
       "ng.v2.UpdateExclusionRequest\032\037.google.lo" +
       "gging.v2.LogExclusion\".\202\323\344\223\002(2\033/v2/{name" +
-      "=*/*/exclusions/*}:\texclusion\022y\n\017DeleteE" +
+      "=*/*/exclusions/*}:\texclusion\022y\n\017DeleteE",
       "xclusion\022).google.logging.v2.DeleteExclu" +
       "sionRequest\032\026.google.protobuf.Empty\"#\202\323\344" +
       "\223\002\035*\033/v2/{name=*/*/exclusions/*}B\236\001\n\025com" +
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java
index e51a3615a54f..0bd883db0038 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "\013description\030\002 \001(\t\022\016\n\006filter\030\003 \001(\t\0227\n\021me" +
       "tric_descriptor\030\005 \001(\0132\034.google.api.Metri" +
       "cDescriptor\022\027\n\017value_extractor\030\006 \001(\t\022K\n\020" +
-      "label_extractors\030\007 \003(\01321.google.logging." +
+      "label_extractors\030\007 \003(\01321.google.logging.",
       "v2.LogMetric.LabelExtractorsEntry\022>\n\016buc" +
       "ket_options\030\010 \001(\0132&.google.api.Distribut" +
       "ion.BucketOptions\0228\n\007version\030\004 \001(\0162\'.goo" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "\001\"N\n\025ListLogMetricsRequest\022\016\n\006parent\030\001 \001" +
       "(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(" +
       "\005\"`\n\026ListLogMetricsResponse\022-\n\007metrics\030\001" +
-      " \003(\0132\034.google.logging.v2.LogMetric\022\027\n\017ne" +
+      " \003(\0132\034.google.logging.v2.LogMetric\022\027\n\017ne",
       "xt_page_token\030\002 \001(\t\"*\n\023GetLogMetricReque" +
       "st\022\023\n\013metric_name\030\001 \001(\t\"V\n\026CreateLogMetr" +
       "icRequest\022\016\n\006parent\030\001 \001(\t\022,\n\006metric\030\002 \001(" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "tric\"-\n\026DeleteLogMetricRequest\022\023\n\013metric" +
       "_name\030\001 \001(\t2\324\005\n\020MetricsServiceV2\022\216\001\n\016Lis" +
       "tLogMetrics\022(.google.logging.v2.ListLogM" +
-      "etricsRequest\032).google.logging.v2.ListLo" +
+      "etricsRequest\032).google.logging.v2.ListLo",
       "gMetricsResponse\"\'\202\323\344\223\002!\022\037/v2/{parent=pr" +
       "ojects/*}/metrics\022\204\001\n\014GetLogMetric\022&.goo" +
       "gle.logging.v2.GetLogMetricRequest\032\034.goo" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "ogMetricRequest\032\034.google.logging.v2.LogM" +
       "etric\"/\202\323\344\223\002)\"\037/v2/{parent=projects/*}/m" +
       "etrics:\006metric\022\222\001\n\017UpdateLogMetric\022).goo" +
-      "gle.logging.v2.UpdateLogMetricRequest\032\034." +
+      "gle.logging.v2.UpdateLogMetricRequest\032\034.",
       "google.logging.v2.LogMetric\"6\202\323\344\223\0020\032&/v2" +
       "/{metric_name=projects/*/metrics/*}:\006met" +
       "ric\022\204\001\n\017DeleteLogMetric\022).google.logging" +
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingProto.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingProto.java
index aa8cb015383a..42f6d961c4ed 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingProto.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingProto.java
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "mp.proto\032\027google/rpc/status.proto\"$\n\020Del" +
       "eteLogRequest\022\020\n\010log_name\030\001 \001(\t\"\230\002\n\026Writ" +
       "eLogEntriesRequest\022\020\n\010log_name\030\001 \001(\t\022/\n\010" +
-      "resource\030\002 \001(\0132\035.google.api.MonitoredRes" +
+      "resource\030\002 \001(\0132\035.google.api.MonitoredRes",
       "ource\022E\n\006labels\030\003 \003(\01325.google.logging.v" +
       "2.WriteLogEntriesRequest.LabelsEntry\022,\n\007" +
       "entries\030\004 \003(\0132\033.google.logging.v2.LogEnt" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "sPartialErrors\022]\n\020log_entry_errors\030\001 \003(\013" +
       "2C.google.logging.v2.WriteLogEntriesPart" +
       "ialErrors.LogEntryErrorsEntry\032I\n\023LogEntr" +
-      "yErrorsEntry\022\013\n\003key\030\001 \001(\005\022!\n\005value\030\002 \001(\013" +
+      "yErrorsEntry\022\013\n\003key\030\001 \001(\005\022!\n\005value\030\002 \001(\013",
       "2\022.google.rpc.Status:\0028\001\"\215\001\n\025ListLogEntr" +
       "iesRequest\022\023\n\013project_ids\030\001 \003(\t\022\026\n\016resou" +
       "rce_names\030\010 \003(\t\022\016\n\006filter\030\002 \001(\t\022\020\n\010order" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "\022\027\n\017next_page_token\030\002 \001(\t\"P\n\'ListMonitor" +
       "edResourceDescriptorsRequest\022\021\n\tpage_siz" +
       "e\030\001 \001(\005\022\022\n\npage_token\030\002 \001(\t\"\212\001\n(ListMoni" +
-      "toredResourceDescriptorsResponse\022E\n\024reso" +
+      "toredResourceDescriptorsResponse\022E\n\024reso",
       "urce_descriptors\030\001 \003(\0132\'.google.api.Moni" +
       "toredResourceDescriptor\022\027\n\017next_page_tok" +
       "en\030\002 \001(\t\"H\n\017ListLogsRequest\022\016\n\006parent\030\001 " +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "rviceV2\022w\n\tDeleteLog\022#.google.logging.v2" +
       ".DeleteLogRequest\032\026.google.protobuf.Empt" +
       "y\"-\202\323\344\223\002\'*%/v2beta1/{log_name=projects/*" +
-      "/logs/*}\022\206\001\n\017WriteLogEntries\022).google.lo" +
+      "/logs/*}\022\206\001\n\017WriteLogEntries\022).google.lo",
       "gging.v2.WriteLogEntriesRequest\032*.google" +
       ".logging.v2.WriteLogEntriesResponse\"\034\202\323\344" +
       "\223\002\026\"\021/v2/entries:write:\001*\022\202\001\n\016ListLogEnt" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "\001\n ListMonitoredResourceDescriptors\022:.go" +
       "ogle.logging.v2.ListMonitoredResourceDes" +
       "criptorsRequest\032;.google.logging.v2.List" +
-      "MonitoredResourceDescriptorsResponse\"(\202\323" +
+      "MonitoredResourceDescriptorsResponse\"(\202\323",
       "\344\223\002\"\022 /v2/monitoredResourceDescriptors\022r" +
       "\n\010ListLogs\022\".google.logging.v2.ListLogsR" +
       "equest\032#.google.logging.v2.ListLogsRespo" +
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationExclusionName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationExclusionName.java
index 4303b0a08468..e19dc4eefaf3 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationExclusionName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationExclusionName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("OrganizationExclusionName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("organization", organization, "exclusion", exclusion);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLogName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLogName.java
index 3e36ac28eaff..691dc73e9270 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLogName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLogName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("OrganizationLogName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("organization", organization, "log", log);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java
index 9f5490254675..322dc2685a2b 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("OrganizationName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("organization", organization);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationSinkName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationSinkName.java
index b632cbd6a312..a25f549a408b 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationSinkName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationSinkName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("OrganizationSinkName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("organization", organization, "sink", sink);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectExclusionName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectExclusionName.java
index 71b45fb3e3b5..d0bf7491c2e8 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectExclusionName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectExclusionName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectExclusionName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "exclusion", exclusion);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectLogName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectLogName.java
index d6dd792b19e0..bf1565dc2a10 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectLogName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectLogName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectLogName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "log", log);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectMetricName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectMetricName.java
index 4c3d1307ecaa..83ab08397a5f 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectMetricName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectMetricName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectMetricName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "metric", metric);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java
index a2fc3c3233af..06d4cb3edb20 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectSinkName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectSinkName.java
index d904019f50fe..5068992567be 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectSinkName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectSinkName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectSinkName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "sink", sink);
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedExclusionName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedExclusionName.java
index defb47e86af0..64e8a2ace542 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedExclusionName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedExclusionName.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,14 +79,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UntypedExclusionName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return rawValue;
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedLogName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedLogName.java
index cae45308a882..08328e1ff432 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedLogName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedLogName.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,14 +79,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UntypedLogName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return rawValue;
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedMetricName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedMetricName.java
index c08d6d201997..7b061c6b125e 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedMetricName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedMetricName.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,14 +79,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UntypedMetricName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return rawValue;
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedParentName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedParentName.java
index 51c58bf59035..7653eb098351 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedParentName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedParentName.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,14 +79,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UntypedParentName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return rawValue;
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedSinkName.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedSinkName.java
index 40300901c46f..3b6a289aa82f 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedSinkName.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UntypedSinkName.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,14 +79,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UntypedSinkName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return rawValue;
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java
index 221e5ab18b70..4f64d149b867 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java
@@ -33,9 +33,6 @@ private UpdateExclusionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1096,7 +1093,7 @@ public UpdateExclusionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateExclusionRequest(input, extensionRegistry);
+        return new UpdateExclusionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java
index 902161933579..22996586022f 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java
@@ -33,9 +33,6 @@ private UpdateLogMetricRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -788,7 +785,7 @@ public UpdateLogMetricRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateLogMetricRequest(input, extensionRegistry);
+        return new UpdateLogMetricRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java
index ff0d6aec13b3..f9004154bd43 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java
@@ -34,9 +34,6 @@ private UpdateSinkRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1278,7 +1275,7 @@ public UpdateSinkRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateSinkRequest(input, extensionRegistry);
+        return new UpdateSinkRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java
index 69fa2da11347..f032eb954ed3 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java
@@ -32,9 +32,6 @@ private WriteLogEntriesPartialErrors(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -738,7 +735,7 @@ public WriteLogEntriesPartialErrors parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WriteLogEntriesPartialErrors(input, extensionRegistry);
+        return new WriteLogEntriesPartialErrors(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java
index cfa124e3ac7b..122ef9adc89d 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java
@@ -35,9 +35,6 @@ private WriteLogEntriesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2161,7 +2158,7 @@ public WriteLogEntriesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WriteLogEntriesRequest(input, extensionRegistry);
+        return new WriteLogEntriesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java
index 194929fd923c..cdae8e7349a7 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java
@@ -33,9 +33,6 @@ private WriteLogEntriesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -377,7 +374,7 @@ public WriteLogEntriesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WriteLogEntriesResponse(input, extensionRegistry);
+        return new WriteLogEntriesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Aggregation.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Aggregation.java
index 04754645347f..dc82280a418a 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Aggregation.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Aggregation.java
@@ -40,9 +40,6 @@ private Aggregation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2436,7 +2433,7 @@ public Aggregation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Aggregation(input, extensionRegistry);
+        return new Aggregation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicy.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicy.java
index b39146bef7b3..6e66104e2fbd 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicy.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicy.java
@@ -40,9 +40,6 @@ private AlertPolicy(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -449,9 +446,6 @@ private Documentation(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1137,7 +1131,7 @@ public Documentation parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Documentation(input, extensionRegistry);
+          return new Documentation(input, extensionRegistry);
       }
     };
 
@@ -1326,9 +1320,6 @@ private Condition(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1467,9 +1458,6 @@ private Trigger(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2067,7 +2055,7 @@ public Trigger parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Trigger(input, extensionRegistry);
+            return new Trigger(input, extensionRegistry);
         }
       };
 
@@ -2522,9 +2510,6 @@ private MetricThreshold(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5516,7 +5501,7 @@ public MetricThreshold parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new MetricThreshold(input, extensionRegistry);
+            return new MetricThreshold(input, extensionRegistry);
         }
       };
 
@@ -5766,9 +5751,6 @@ private MetricAbsence(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7501,7 +7483,7 @@ public MetricAbsence parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new MetricAbsence(input, extensionRegistry);
+            return new MetricAbsence(input, extensionRegistry);
         }
       };
 
@@ -8820,7 +8802,7 @@ public Condition parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Condition(input, extensionRegistry);
+          return new Condition(input, extensionRegistry);
       }
     };
 
@@ -11758,7 +11740,7 @@ public AlertPolicy parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AlertPolicy(input, extensionRegistry);
+        return new AlertPolicy(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicyConditionName.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicyConditionName.java
index cc32e0b1214a..92c8b7530e5a 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicyConditionName.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicyConditionName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("AlertPolicyConditionName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "alert_policy", alertPolicy, "condition", condition);
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicyName.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicyName.java
index f2c3f24dbd36..06d5209a8482 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicyName.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicyName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("AlertPolicyName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "alert_policy", alertPolicy);
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertProto.java
index 4ee2f2a315e6..63889369663c 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertProto.java
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "olicy\022\014\n\004name\030\001 \001(\t\022\024\n\014display_name\030\002 \001(" +
       "\t\022F\n\rdocumentation\030\r \001(\0132/.google.monito" +
       "ring.v3.AlertPolicy.Documentation\022F\n\013use" +
-      "r_labels\030\020 \003(\01321.google.monitoring.v3.Al" +
+      "r_labels\030\020 \003(\01321.google.monitoring.v3.Al",
       "ertPolicy.UserLabelsEntry\022?\n\nconditions\030" +
       "\014 \003(\0132+.google.monitoring.v3.AlertPolicy" +
       ".Condition\022I\n\010combiner\030\006 \001(\01627.google.mo" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "\t\022=\n\017creation_record\030\n \001(\0132$.google.moni" +
       "toring.v3.MutationRecord\022=\n\017mutation_rec" +
       "ord\030\013 \001(\0132$.google.monitoring.v3.Mutatio" +
-      "nRecord\0323\n\rDocumentation\022\017\n\007content\030\001 \001(" +
+      "nRecord\0323\n\rDocumentation\022\017\n\007content\030\001 \001(",
       "\t\022\021\n\tmime_type\030\002 \001(\t\032\370\006\n\tCondition\022\014\n\004na" +
       "me\030\014 \001(\t\022\024\n\014display_name\030\006 \001(\t\022Z\n\023condit" +
       "ion_threshold\030\001 \001(\0132;.google.monitoring." +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "AbsenceH\000\0325\n\007Trigger\022\017\n\005count\030\001 \001(\005H\000\022\021\n" +
       "\007percent\030\002 \001(\001H\000B\006\n\004type\032\201\003\n\017MetricThres" +
       "hold\022\016\n\006filter\030\002 \001(\t\0227\n\014aggregations\030\010 \003" +
-      "(\0132!.google.monitoring.v3.Aggregation\022\032\n" +
+      "(\0132!.google.monitoring.v3.Aggregation\022\032\n",
       "\022denominator_filter\030\t \001(\t\022C\n\030denominator" +
       "_aggregations\030\n \003(\0132!.google.monitoring." +
       "v3.Aggregation\0228\n\ncomparison\030\004 \001(\0162$.goo" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "3.google.monitoring.v3.AlertPolicy.Condi" +
       "tion.Trigger\032\313\001\n\rMetricAbsence\022\016\n\006filter" +
       "\030\001 \001(\t\0227\n\014aggregations\030\005 \003(\0132!.google.mo" +
-      "nitoring.v3.Aggregation\022+\n\010duration\030\002 \001(" +
+      "nitoring.v3.Aggregation\022+\n\010duration\030\002 \001(",
       "\0132\031.google.protobuf.Duration\022D\n\007trigger\030" +
       "\003 \001(\01323.google.monitoring.v3.AlertPolicy" +
       ".Condition.TriggerB\013\n\tcondition\0321\n\017UserL" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "H_MATCHING_RESOURCE\020\003B\242\001\n\030com.google.mon" +
       "itoring.v3B\nAlertProtoP\001Z>google.golang." +
       "org/genproto/googleapis/monitoring/v3;mo" +
-      "nitoring\252\002\032Google.Cloud.Monitoring.V3\312\002\032" +
+      "nitoring\252\002\032Google.Cloud.Monitoring.V3\312\002\032",
       "Google\\Cloud\\Monitoring\\V3b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertServiceProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertServiceProto.java
index 837023389d00..0f74cecc60f5 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertServiceProto.java
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "rt_policy\030\002 \001(\0132!.google.monitoring.v3.A" +
       "lertPolicy\"%\n\025GetAlertPolicyRequest\022\014\n\004n" +
       "ame\030\003 \001(\t\"q\n\030ListAlertPoliciesRequest\022\014\n" +
-      "\004name\030\004 \001(\t\022\016\n\006filter\030\005 \001(\t\022\020\n\010order_by\030" +
+      "\004name\030\004 \001(\t\022\016\n\006filter\030\005 \001(\t\022\020\n\010order_by\030",
       "\006 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003" +
       " \001(\t\"o\n\031ListAlertPoliciesResponse\0229\n\016ale" +
       "rt_policies\030\003 \003(\0132!.google.monitoring.v3" +
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "lert_policy\030\003 \001(\0132!.google.monitoring.v3" +
       ".AlertPolicy\"(\n\030DeleteAlertPolicyRequest" +
       "\022\014\n\004name\030\003 \001(\t2\256\006\n\022AlertPolicyService\022\241\001" +
-      "\n\021ListAlertPolicies\022..google.monitoring." +
+      "\n\021ListAlertPolicies\022..google.monitoring.",
       "v3.ListAlertPoliciesRequest\032/.google.mon" +
       "itoring.v3.ListAlertPoliciesResponse\"+\202\323" +
       "\344\223\002%\022#/v3/{name=projects/*}/alertPolicie" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "projects/*/alertPolicies/*}\022\241\001\n\021CreateAl" +
       "ertPolicy\022..google.monitoring.v3.CreateA" +
       "lertPolicyRequest\032!.google.monitoring.v3" +
-      ".AlertPolicy\"9\202\323\344\223\0023\"#/v3/{name=projects" +
+      ".AlertPolicy\"9\202\323\344\223\0023\"#/v3/{name=projects",
       "/*}/alertPolicies:\014alert_policy\022\212\001\n\021Dele" +
       "teAlertPolicy\022..google.monitoring.v3.Del" +
       "eteAlertPolicyRequest\032\026.google.protobuf." +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "st\032!.google.monitoring.v3.AlertPolicy\"H\202" +
       "\323\344\223\002B22/v3/{alert_policy.name=projects/*" +
       "/alertPolicies/*}:\014alert_policyB\251\001\n\030com." +
-      "google.monitoring.v3B\021AlertServiceProtoP" +
+      "google.monitoring.v3B\021AlertServiceProtoP",
       "\001Z>google.golang.org/genproto/googleapis" +
       "/monitoring/v3;monitoring\252\002\032Google.Cloud" +
       ".Monitoring.V3\312\002\032Google\\Cloud\\Monitoring" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CommonProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CommonProto.java
index 18cc10e0906b..f7bd6479c6ba 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CommonProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CommonProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "\003H\000\022\026\n\014double_value\030\003 \001(\001H\000\022\026\n\014string_va" +
       "lue\030\004 \001(\tH\000\0226\n\022distribution_value\030\005 \001(\0132" +
       "\030.google.api.DistributionH\000B\007\n\005value\"l\n\014" +
-      "TimeInterval\022,\n\010end_time\030\002 \001(\0132\032.google." +
+      "TimeInterval\022,\n\010end_time\030\002 \001(\0132\032.google.",
       "protobuf.Timestamp\022.\n\nstart_time\030\001 \001(\0132\032" +
       ".google.protobuf.Timestamp\"\255\007\n\013Aggregati" +
       "on\0223\n\020alignment_period\030\001 \001(\0132\031.google.pr" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "oogle.monitoring.v3.Aggregation.Reducer\022" +
       "\027\n\017group_by_fields\030\005 \003(\t\"\213\003\n\007Aligner\022\016\n\n" +
       "ALIGN_NONE\020\000\022\017\n\013ALIGN_DELTA\020\001\022\016\n\nALIGN_R" +
-      "ATE\020\002\022\025\n\021ALIGN_INTERPOLATE\020\003\022\024\n\020ALIGN_NE" +
+      "ATE\020\002\022\025\n\021ALIGN_INTERPOLATE\020\003\022\024\n\020ALIGN_NE",
       "XT_OLDER\020\004\022\r\n\tALIGN_MIN\020\n\022\r\n\tALIGN_MAX\020\013" +
       "\022\016\n\nALIGN_MEAN\020\014\022\017\n\013ALIGN_COUNT\020\r\022\r\n\tALI" +
       "GN_SUM\020\016\022\020\n\014ALIGN_STDDEV\020\017\022\024\n\020ALIGN_COUN" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "ENTILE_50\020\024\022\027\n\023ALIGN_PERCENTILE_05\020\025\022\030\n\024" +
       "ALIGN_PERCENT_CHANGE\020\027\"\261\002\n\007Reducer\022\017\n\013RE" +
       "DUCE_NONE\020\000\022\017\n\013REDUCE_MEAN\020\001\022\016\n\nREDUCE_M" +
-      "IN\020\002\022\016\n\nREDUCE_MAX\020\003\022\016\n\nREDUCE_SUM\020\004\022\021\n\r" +
+      "IN\020\002\022\016\n\nREDUCE_MAX\020\003\022\016\n\nREDUCE_SUM\020\004\022\021\n\r",
       "REDUCE_STDDEV\020\005\022\020\n\014REDUCE_COUNT\020\006\022\025\n\021RED" +
       "UCE_COUNT_TRUE\020\007\022\026\n\022REDUCE_COUNT_FALSE\020\017" +
       "\022\030\n\024REDUCE_FRACTION_TRUE\020\010\022\030\n\024REDUCE_PER" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "SON_UNSPECIFIED\020\000\022\021\n\rCOMPARISON_GT\020\001\022\021\n\r" +
       "COMPARISON_GE\020\002\022\021\n\rCOMPARISON_LT\020\003\022\021\n\rCO" +
       "MPARISON_LE\020\004\022\021\n\rCOMPARISON_EQ\020\005\022\021\n\rCOMP" +
-      "ARISON_NE\020\006*]\n\013ServiceTier\022\034\n\030SERVICE_TI" +
+      "ARISON_NE\020\006*]\n\013ServiceTier\022\034\n\030SERVICE_TI",
       "ER_UNSPECIFIED\020\000\022\026\n\022SERVICE_TIER_BASIC\020\001" +
       "\022\030\n\024SERVICE_TIER_PREMIUM\020\002B\243\001\n\030com.googl" +
       "e.monitoring.v3B\013CommonProtoP\001Z>google.g" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateAlertPolicyRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateAlertPolicyRequest.java
index ee5fd10b0e2f..7d494be19984 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateAlertPolicyRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateAlertPolicyRequest.java
@@ -33,9 +33,6 @@ private CreateAlertPolicyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -826,7 +823,7 @@ public CreateAlertPolicyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateAlertPolicyRequest(input, extensionRegistry);
+        return new CreateAlertPolicyRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateGroupRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateGroupRequest.java
index 3116ee84581b..0952822647a1 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateGroupRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateGroupRequest.java
@@ -34,9 +34,6 @@ private CreateGroupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -854,7 +851,7 @@ public CreateGroupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateGroupRequest(input, extensionRegistry);
+        return new CreateGroupRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateMetricDescriptorRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateMetricDescriptorRequest.java
index 47e40bedcb5f..290fe3546a8a 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateMetricDescriptorRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateMetricDescriptorRequest.java
@@ -33,9 +33,6 @@ private CreateMetricDescriptorRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -779,7 +776,7 @@ public CreateMetricDescriptorRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateMetricDescriptorRequest(input, extensionRegistry);
+        return new CreateMetricDescriptorRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateNotificationChannelRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateNotificationChannelRequest.java
index 8164f289828a..bb358507c05c 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateNotificationChannelRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateNotificationChannelRequest.java
@@ -33,9 +33,6 @@ private CreateNotificationChannelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -795,7 +792,7 @@ public CreateNotificationChannelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateNotificationChannelRequest(input, extensionRegistry);
+        return new CreateNotificationChannelRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesError.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesError.java
index 03f88babbccb..0d0935cdcdf4 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesError.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesError.java
@@ -32,9 +32,6 @@ private CreateTimeSeriesError(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -870,7 +867,7 @@ public CreateTimeSeriesError parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTimeSeriesError(input, extensionRegistry);
+        return new CreateTimeSeriesError(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesRequest.java
index 5e0a129cc2b3..60105e8fad69 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesRequest.java
@@ -34,9 +34,6 @@ private CreateTimeSeriesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1070,7 +1067,7 @@ public CreateTimeSeriesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTimeSeriesRequest(input, extensionRegistry);
+        return new CreateTimeSeriesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateUptimeCheckConfigRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateUptimeCheckConfigRequest.java
index c7bd340b42db..e8ede627a40e 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateUptimeCheckConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateUptimeCheckConfigRequest.java
@@ -33,9 +33,6 @@ private CreateUptimeCheckConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -767,7 +764,7 @@ public CreateUptimeCheckConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateUptimeCheckConfigRequest(input, extensionRegistry);
+        return new CreateUptimeCheckConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteAlertPolicyRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteAlertPolicyRequest.java
index f9b6aa36d740..1bc70169f8fd 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteAlertPolicyRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteAlertPolicyRequest.java
@@ -33,9 +33,6 @@ private DeleteAlertPolicyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public DeleteAlertPolicyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteAlertPolicyRequest(input, extensionRegistry);
+        return new DeleteAlertPolicyRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteGroupRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteGroupRequest.java
index 23a6feaaedc1..a989da39793d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteGroupRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteGroupRequest.java
@@ -33,9 +33,6 @@ private DeleteGroupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteGroupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteGroupRequest(input, extensionRegistry);
+        return new DeleteGroupRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteMetricDescriptorRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteMetricDescriptorRequest.java
index 853c19ab1b7b..ed4026d00e2e 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteMetricDescriptorRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteMetricDescriptorRequest.java
@@ -33,9 +33,6 @@ private DeleteMetricDescriptorRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -552,7 +549,7 @@ public DeleteMetricDescriptorRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteMetricDescriptorRequest(input, extensionRegistry);
+        return new DeleteMetricDescriptorRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteNotificationChannelRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteNotificationChannelRequest.java
index 23251970f9fd..b9e544f9e63d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteNotificationChannelRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteNotificationChannelRequest.java
@@ -34,9 +34,6 @@ private DeleteNotificationChannelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -625,7 +622,7 @@ public DeleteNotificationChannelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteNotificationChannelRequest(input, extensionRegistry);
+        return new DeleteNotificationChannelRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteUptimeCheckConfigRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteUptimeCheckConfigRequest.java
index 6aaa6576dee6..ebef65b57f5c 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteUptimeCheckConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteUptimeCheckConfigRequest.java
@@ -33,9 +33,6 @@ private DeleteUptimeCheckConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteUptimeCheckConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteUptimeCheckConfigRequest(input, extensionRegistry);
+        return new DeleteUptimeCheckConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetAlertPolicyRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetAlertPolicyRequest.java
index 418ba3c476d6..39c74eb15d4a 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetAlertPolicyRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetAlertPolicyRequest.java
@@ -33,9 +33,6 @@ private GetAlertPolicyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetAlertPolicyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetAlertPolicyRequest(input, extensionRegistry);
+        return new GetAlertPolicyRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetGroupRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetGroupRequest.java
index 87c869097858..7cf7cc52e6cf 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetGroupRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetGroupRequest.java
@@ -33,9 +33,6 @@ private GetGroupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetGroupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetGroupRequest(input, extensionRegistry);
+        return new GetGroupRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMetricDescriptorRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMetricDescriptorRequest.java
index a4d4e9df9381..560bff8b8ec1 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMetricDescriptorRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMetricDescriptorRequest.java
@@ -33,9 +33,6 @@ private GetMetricDescriptorRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -552,7 +549,7 @@ public GetMetricDescriptorRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetMetricDescriptorRequest(input, extensionRegistry);
+        return new GetMetricDescriptorRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMonitoredResourceDescriptorRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMonitoredResourceDescriptorRequest.java
index 5ec03c4e891a..4bb0ee9acb49 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMonitoredResourceDescriptorRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMonitoredResourceDescriptorRequest.java
@@ -33,9 +33,6 @@ private GetMonitoredResourceDescriptorRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -552,7 +549,7 @@ public GetMonitoredResourceDescriptorRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetMonitoredResourceDescriptorRequest(input, extensionRegistry);
+        return new GetMonitoredResourceDescriptorRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelDescriptorRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelDescriptorRequest.java
index f30b08be2a6a..0f88011b4cb4 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelDescriptorRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelDescriptorRequest.java
@@ -33,9 +33,6 @@ private GetNotificationChannelDescriptorRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetNotificationChannelDescriptorRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetNotificationChannelDescriptorRequest(input, extensionRegistry);
+        return new GetNotificationChannelDescriptorRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelRequest.java
index a3a05e996b71..3ed4e352da62 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelRequest.java
@@ -33,9 +33,6 @@ private GetNotificationChannelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetNotificationChannelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetNotificationChannelRequest(input, extensionRegistry);
+        return new GetNotificationChannelRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeRequest.java
index 6bd9632ebf23..1fcc501703b8 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeRequest.java
@@ -33,9 +33,6 @@ private GetNotificationChannelVerificationCodeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -870,7 +867,7 @@ public GetNotificationChannelVerificationCodeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetNotificationChannelVerificationCodeRequest(input, extensionRegistry);
+        return new GetNotificationChannelVerificationCodeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeResponse.java
index f72210a656eb..130cf0b68c25 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeResponse.java
@@ -33,9 +33,6 @@ private GetNotificationChannelVerificationCodeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -805,7 +802,7 @@ public GetNotificationChannelVerificationCodeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetNotificationChannelVerificationCodeResponse(input, extensionRegistry);
+        return new GetNotificationChannelVerificationCodeResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetUptimeCheckConfigRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetUptimeCheckConfigRequest.java
index 884f4f21b7d7..8eb62ec569ac 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetUptimeCheckConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetUptimeCheckConfigRequest.java
@@ -33,9 +33,6 @@ private GetUptimeCheckConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetUptimeCheckConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetUptimeCheckConfigRequest(input, extensionRegistry);
+        return new GetUptimeCheckConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Group.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Group.java
index f0a51842a165..c324dc9b1ac1 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Group.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Group.java
@@ -59,9 +59,6 @@ private Group(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1161,7 +1158,7 @@ public Group parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Group(input, extensionRegistry);
+        return new Group(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GroupName.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GroupName.java
index 34019d3646ef..57f2bb655898 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GroupName.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GroupName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("GroupName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "group", group);
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GroupServiceProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GroupServiceProto.java
index 5ea8fc465265..9c674b8e590b 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GroupServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GroupServiceProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "oupsRequest\022\014\n\004name\030\007 \001(\t\022\033\n\021children_of" +
       "_group\030\002 \001(\tH\000\022\034\n\022ancestors_of_group\030\003 \001" +
       "(\tH\000\022\036\n\024descendants_of_group\030\004 \001(\tH\000\022\021\n\t" +
-      "page_size\030\005 \001(\005\022\022\n\npage_token\030\006 \001(\tB\010\n\006f" +
+      "page_size\030\005 \001(\005\022\022\n\npage_token\030\006 \001(\tB\010\n\006f",
       "ilter\"Y\n\022ListGroupsResponse\022*\n\005group\030\001 \003" +
       "(\0132\033.google.monitoring.v3.Group\022\027\n\017next_" +
       "page_token\030\002 \001(\t\"\037\n\017GetGroupRequest\022\014\n\004n" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "teGroupRequest\022*\n\005group\030\002 \001(\0132\033.google.m" +
       "onitoring.v3.Group\022\025\n\rvalidate_only\030\003 \001(" +
       "\010\"\"\n\022DeleteGroupRequest\022\014\n\004name\030\003 \001(\t\"\224\001" +
-      "\n\027ListGroupMembersRequest\022\014\n\004name\030\007 \001(\t\022" +
+      "\n\027ListGroupMembersRequest\022\014\n\004name\030\007 \001(\t\022",
       "\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\022\016" +
       "\n\006filter\030\005 \001(\t\0224\n\010interval\030\006 \001(\0132\".googl" +
       "e.monitoring.v3.TimeInterval\"w\n\030ListGrou" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "ervice\022\205\001\n\nListGroups\022\'.google.monitorin" +
       "g.v3.ListGroupsRequest\032(.google.monitori" +
       "ng.v3.ListGroupsResponse\"$\202\323\344\223\002\036\022\034/v3/{n" +
-      "ame=projects/*}/groups\022v\n\010GetGroup\022%.goo" +
+      "ame=projects/*}/groups\022v\n\010GetGroup\022%.goo",
       "gle.monitoring.v3.GetGroupRequest\032\033.goog" +
       "le.monitoring.v3.Group\"&\202\323\344\223\002 \022\036/v3/{nam" +
       "e=projects/*/groups/*}\022\201\001\n\013CreateGroup\022(" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "pdateGroup\022(.google.monitoring.v3.Update" +
       "GroupRequest\032\033.google.monitoring.v3.Grou" +
       "p\"3\202\323\344\223\002-\032$/v3/{group.name=projects/*/gr" +
-      "oups/*}:\005group\022w\n\013DeleteGroup\022(.google.m" +
+      "oups/*}:\005group\022w\n\013DeleteGroup\022(.google.m",
       "onitoring.v3.DeleteGroupRequest\032\026.google" +
       ".protobuf.Empty\"&\202\323\344\223\002 *\036/v3/{name=proje" +
       "cts/*/groups/*}\022\241\001\n\020ListGroupMembers\022-.g" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "*/groups/*}/membersB\251\001\n\030com.google.monit" +
       "oring.v3B\021GroupServiceProtoP\001Z>google.go" +
       "lang.org/genproto/googleapis/monitoring/" +
-      "v3;monitoring\252\002\032Google.Cloud.Monitoring." +
+      "v3;monitoring\252\002\032Google.Cloud.Monitoring.",
       "V3\312\002\032Google\\Cloud\\Monitoring\\V3b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesRequest.java
index 1c3362994556..c8c490868725 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesRequest.java
@@ -37,9 +37,6 @@ private ListAlertPoliciesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1175,7 +1172,7 @@ public ListAlertPoliciesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListAlertPoliciesRequest(input, extensionRegistry);
+        return new ListAlertPoliciesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesResponse.java
index 40ebd6093b67..52dbd0e7223d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesResponse.java
@@ -34,9 +34,6 @@ private ListAlertPoliciesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListAlertPoliciesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListAlertPoliciesResponse(input, extensionRegistry);
+        return new ListAlertPoliciesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersRequest.java
index 2fcd2b3d539e..fd0a6afa6c92 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersRequest.java
@@ -36,9 +36,6 @@ private ListGroupMembersRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1236,7 +1233,7 @@ public ListGroupMembersRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListGroupMembersRequest(input, extensionRegistry);
+        return new ListGroupMembersRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersResponse.java
index 9cc05fea0fae..016f67a13b15 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersResponse.java
@@ -35,9 +35,6 @@ private ListGroupMembersResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1059,7 +1056,7 @@ public ListGroupMembersResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListGroupMembersResponse(input, extensionRegistry);
+        return new ListGroupMembersResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsRequest.java
index c1436c362718..7144252fde3b 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsRequest.java
@@ -35,9 +35,6 @@ private ListGroupsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1458,7 +1455,7 @@ public ListGroupsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListGroupsRequest(input, extensionRegistry);
+        return new ListGroupsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsResponse.java
index b22838913fae..14cdb995deb3 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsResponse.java
@@ -34,9 +34,6 @@ private ListGroupsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListGroupsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListGroupsResponse(input, extensionRegistry);
+        return new ListGroupsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsRequest.java
index c0a430e0fdce..b9d81ce32903 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsRequest.java
@@ -36,9 +36,6 @@ private ListMetricDescriptorsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -978,7 +975,7 @@ public ListMetricDescriptorsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListMetricDescriptorsRequest(input, extensionRegistry);
+        return new ListMetricDescriptorsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsResponse.java
index 3f6391125698..23fe1e71e7bd 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsResponse.java
@@ -34,9 +34,6 @@ private ListMetricDescriptorsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1008,7 +1005,7 @@ public ListMetricDescriptorsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListMetricDescriptorsResponse(input, extensionRegistry);
+        return new ListMetricDescriptorsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsRequest.java
index 3f4d87028560..1b5163def04c 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsRequest.java
@@ -36,9 +36,6 @@ private ListMonitoredResourceDescriptorsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -971,7 +968,7 @@ public ListMonitoredResourceDescriptorsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListMonitoredResourceDescriptorsRequest(input, extensionRegistry);
+        return new ListMonitoredResourceDescriptorsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsResponse.java
index b6d6e5684a31..4887616420c7 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsResponse.java
@@ -34,9 +34,6 @@ private ListMonitoredResourceDescriptorsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1008,7 +1005,7 @@ public ListMonitoredResourceDescriptorsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListMonitoredResourceDescriptorsResponse(input, extensionRegistry);
+        return new ListMonitoredResourceDescriptorsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsRequest.java
index 0a9ae63c90eb..7ef3fc33d87d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsRequest.java
@@ -35,9 +35,6 @@ private ListNotificationChannelDescriptorsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -824,7 +821,7 @@ public ListNotificationChannelDescriptorsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNotificationChannelDescriptorsRequest(input, extensionRegistry);
+        return new ListNotificationChannelDescriptorsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsResponse.java
index 4a1aaf9de4b1..0efc83998832 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsResponse.java
@@ -34,9 +34,6 @@ private ListNotificationChannelDescriptorsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1015,7 +1012,7 @@ public ListNotificationChannelDescriptorsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNotificationChannelDescriptorsResponse(input, extensionRegistry);
+        return new ListNotificationChannelDescriptorsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsRequest.java
index 744b3cbc82a4..51a4205ef748 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsRequest.java
@@ -37,9 +37,6 @@ private ListNotificationChannelsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1176,7 +1173,7 @@ public ListNotificationChannelsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNotificationChannelsRequest(input, extensionRegistry);
+        return new ListNotificationChannelsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsResponse.java
index bcda8119e8ba..e209a4824e0d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsResponse.java
@@ -34,9 +34,6 @@ private ListNotificationChannelsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -992,7 +989,7 @@ public ListNotificationChannelsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNotificationChannelsResponse(input, extensionRegistry);
+        return new ListNotificationChannelsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesRequest.java
index f073917a25a3..4b4863129591 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesRequest.java
@@ -38,9 +38,6 @@ private ListTimeSeriesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1891,7 +1888,7 @@ public ListTimeSeriesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTimeSeriesRequest(input, extensionRegistry);
+        return new ListTimeSeriesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesResponse.java
index 82d4a41a38c2..c7fcc446ea38 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesResponse.java
@@ -34,9 +34,6 @@ private ListTimeSeriesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListTimeSeriesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTimeSeriesResponse(input, extensionRegistry);
+        return new ListTimeSeriesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsRequest.java
index c15abeb2449d..e0bc95580ef5 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsRequest.java
@@ -35,9 +35,6 @@ private ListUptimeCheckConfigsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -793,7 +790,7 @@ public ListUptimeCheckConfigsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListUptimeCheckConfigsRequest(input, extensionRegistry);
+        return new ListUptimeCheckConfigsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsResponse.java
index 255dfec7e72b..8c718144d1b3 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsResponse.java
@@ -34,9 +34,6 @@ private ListUptimeCheckConfigsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -999,7 +996,7 @@ public ListUptimeCheckConfigsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListUptimeCheckConfigsResponse(input, extensionRegistry);
+        return new ListUptimeCheckConfigsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsRequest.java
index db264bc345d6..c03c95770211 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsRequest.java
@@ -34,9 +34,6 @@ private ListUptimeCheckIpsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -642,7 +639,7 @@ public ListUptimeCheckIpsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListUptimeCheckIpsRequest(input, extensionRegistry);
+        return new ListUptimeCheckIpsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsResponse.java
index f68efa7a7f28..d2c0b1c835e9 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsResponse.java
@@ -34,9 +34,6 @@ private ListUptimeCheckIpsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1029,7 +1026,7 @@ public ListUptimeCheckIpsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListUptimeCheckIpsResponse(input, extensionRegistry);
+        return new ListUptimeCheckIpsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricDescriptorName.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricDescriptorName.java
index f923e46dd07b..49be946331f1 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricDescriptorName.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricDescriptorName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("MetricDescriptorName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "metric_descriptor", metricDescriptor);
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricProto.java
index b67189c05401..c4bd7835467d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricProto.java
@@ -42,7 +42,7 @@ public static void registerAllExtensions(
       "e.monitoring.v3.TypedValue\"\210\002\n\nTimeSerie" +
       "s\022\"\n\006metric\030\001 \001(\0132\022.google.api.Metric\022/\n" +
       "\010resource\030\002 \001(\0132\035.google.api.MonitoredRe" +
-      "source\022<\n\013metric_kind\030\003 \001(\0162\'.google.api" +
+      "source\022<\n\013metric_kind\030\003 \001(\0162\'.google.api",
       ".MetricDescriptor.MetricKind\022:\n\nvalue_ty" +
       "pe\030\004 \001(\0162&.google.api.MetricDescriptor.V" +
       "alueType\022+\n\006points\030\005 \003(\0132\033.google.monito" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricServiceProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricServiceProto.java
index 6baa495a2935..ae4c0dac804a 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricServiceProto.java
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "obuf/empty.proto\032\027google/rpc/status.prot" +
       "o\"n\n\'ListMonitoredResourceDescriptorsReq" +
       "uest\022\014\n\004name\030\005 \001(\t\022\016\n\006filter\030\002 \001(\t\022\021\n\tpa" +
-      "ge_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"\212\001\n(Li" +
+      "ge_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"\212\001\n(Li",
       "stMonitoredResourceDescriptorsResponse\022E" +
       "\n\024resource_descriptors\030\001 \003(\0132\'.google.ap" +
       "i.MonitoredResourceDescriptor\022\027\n\017next_pa" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "ilter\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_t" +
       "oken\030\004 \001(\t\"r\n\035ListMetricDescriptorsRespo" +
       "nse\0228\n\022metric_descriptors\030\001 \003(\0132\034.google" +
-      ".api.MetricDescriptor\022\027\n\017next_page_token" +
+      ".api.MetricDescriptor\022\027\n\017next_page_token",
       "\030\002 \001(\t\"*\n\032GetMetricDescriptorRequest\022\014\n\004" +
       "name\030\003 \001(\t\"f\n\035CreateMetricDescriptorRequ" +
       "est\022\014\n\004name\030\003 \001(\t\0227\n\021metric_descriptor\030\002" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "\t\022\016\n\006filter\030\002 \001(\t\0224\n\010interval\030\004 \001(\0132\".go" +
       "ogle.monitoring.v3.TimeInterval\0226\n\013aggre" +
       "gation\030\005 \001(\0132!.google.monitoring.v3.Aggr" +
-      "egation\022\020\n\010order_by\030\006 \001(\t\022H\n\004view\030\007 \001(\0162" +
+      "egation\022\020\n\010order_by\030\006 \001(\t\022H\n\004view\030\007 \001(\0162",
       ":.google.monitoring.v3.ListTimeSeriesReq" +
       "uest.TimeSeriesView\022\021\n\tpage_size\030\010 \001(\005\022\022" +
       "\n\npage_token\030\t \001(\t\"\'\n\016TimeSeriesView\022\010\n\004" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "\002 \001(\t\"^\n\027CreateTimeSeriesRequest\022\014\n\004name" +
       "\030\003 \001(\t\0225\n\013time_series\030\002 \003(\0132 .google.mon" +
       "itoring.v3.TimeSeries\"r\n\025CreateTimeSerie" +
-      "sError\0225\n\013time_series\030\001 \001(\0132 .google.mon" +
+      "sError\0225\n\013time_series\030\001 \001(\0132 .google.mon",
       "itoring.v3.TimeSeries\022\"\n\006status\030\002 \001(\0132\022." +
       "google.rpc.Status2\365\n\n\rMetricService\022\335\001\n " +
       "ListMonitoredResourceDescriptors\022=.googl" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       ":\202\323\344\223\0024\0222/v3/{name=projects/*}/monitored" +
       "ResourceDescriptors\022\304\001\n\036GetMonitoredReso" +
       "urceDescriptor\022;.google.monitoring.v3.Ge" +
-      "tMonitoredResourceDescriptorRequest\032\'.go" +
+      "tMonitoredResourceDescriptorRequest\032\'.go",
       "ogle.api.MonitoredResourceDescriptor\"<\202\323" +
       "\344\223\0026\0224/v3/{name=projects/*/monitoredReso" +
       "urceDescriptors/*}\022\261\001\n\025ListMetricDescrip" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "v3/{name=projects/*}/metricDescriptors\022\231" +
       "\001\n\023GetMetricDescriptor\0220.google.monitori" +
       "ng.v3.GetMetricDescriptorRequest\032\034.googl" +
-      "e.api.MetricDescriptor\"2\202\323\344\223\002,\022*/v3/{nam" +
+      "e.api.MetricDescriptor\"2\202\323\344\223\002,\022*/v3/{nam",
       "e=projects/*/metricDescriptors/**}\022\257\001\n\026C" +
       "reateMetricDescriptor\0223.google.monitorin" +
       "g.v3.CreateMetricDescriptorRequest\032\034.goo" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "3.google.monitoring.v3.DeleteMetricDescr" +
       "iptorRequest\032\026.google.protobuf.Empty\"2\202\323" +
       "\344\223\002,**/v3/{name=projects/*/metricDescrip" +
-      "tors/**}\022\225\001\n\016ListTimeSeries\022+.google.mon" +
+      "tors/**}\022\225\001\n\016ListTimeSeries\022+.google.mon",
       "itoring.v3.ListTimeSeriesRequest\032,.googl" +
       "e.monitoring.v3.ListTimeSeriesResponse\"(" +
       "\202\323\344\223\002\"\022 /v3/{name=projects/*}/timeSeries" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "/*}/timeSeries:\001*B\252\001\n\030com.google.monitor" +
       "ing.v3B\022MetricServiceProtoP\001Z>google.gol" +
       "ang.org/genproto/googleapis/monitoring/v" +
-      "3;monitoring\252\002\032Google.Cloud.Monitoring.V" +
+      "3;monitoring\252\002\032Google.Cloud.Monitoring.V",
       "3\312\002\032Google\\Cloud\\Monitoring\\V3b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MonitoredResourceDescriptorName.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MonitoredResourceDescriptorName.java
index a5d8e4c3ae09..49a6b71f81c1 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MonitoredResourceDescriptorName.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MonitoredResourceDescriptorName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("MonitoredResourceDescriptorName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "monitored_resource_descriptor", monitoredResourceDescriptor);
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MutationRecord.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MutationRecord.java
index 25a53e6d5b08..b8367b33f952 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MutationRecord.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MutationRecord.java
@@ -33,9 +33,6 @@ private MutationRecord(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -760,7 +757,7 @@ public MutationRecord parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MutationRecord(input, extensionRegistry);
+        return new MutationRecord(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannel.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannel.java
index b1c9a0567261..6c685b3bd559 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannel.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannel.java
@@ -41,9 +41,6 @@ private NotificationChannel(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2439,7 +2436,7 @@ public NotificationChannel parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NotificationChannel(input, extensionRegistry);
+        return new NotificationChannel(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelDescriptor.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelDescriptor.java
index 73bf914f0e6a..3e58c7dee9d6 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelDescriptor.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelDescriptor.java
@@ -40,9 +40,6 @@ private NotificationChannelDescriptor(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1845,7 +1842,7 @@ public NotificationChannelDescriptor parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NotificationChannelDescriptor(input, extensionRegistry);
+        return new NotificationChannelDescriptor(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelDescriptorName.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelDescriptorName.java
index 9b9ce3f3bb3d..5f369af9284d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelDescriptorName.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelDescriptorName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("NotificationChannelDescriptorName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "channel_descriptor", channelDescriptor);
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelName.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelName.java
index b59546dcc4ad..9a7280af0945 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelName.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("NotificationChannelName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "notification_channel", notificationChannel);
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationProto.java
index e8b4eeba4edf..0768021d75ac 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "\030\001 \001(\t\022\024\n\014display_name\030\002 \001(\t\022\023\n\013descript" +
       "ion\030\003 \001(\t\022+\n\006labels\030\004 \003(\0132\033.google.api.L" +
       "abelDescriptor\022:\n\017supported_tiers\030\005 \003(\0162" +
-      "!.google.monitoring.v3.ServiceTier\"\266\004\n\023N" +
+      "!.google.monitoring.v3.ServiceTier\"\266\004\n\023N",
       "otificationChannel\022\014\n\004type\030\001 \001(\t\022\014\n\004name" +
       "\030\006 \001(\t\022\024\n\014display_name\030\003 \001(\t\022\023\n\013descript" +
       "ion\030\004 \001(\t\022E\n\006labels\030\005 \003(\01325.google.monit" +
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "\022Y\n\023verification_status\030\t \001(\0162<.google.m" +
       "onitoring.v3.NotificationChannel.Verific" +
       "ationStatus\022+\n\007enabled\030\013 \001(\0132\032.google.pr" +
-      "otobuf.BoolValue\032-\n\013LabelsEntry\022\013\n\003key\030\001" +
+      "otobuf.BoolValue\032-\n\013LabelsEntry\022\013\n\003key\030\001",
       " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0321\n\017UserLabelsEnt" +
       "ry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"W\n\022Ve" +
       "rificationStatus\022#\n\037VERIFICATION_STATUS_" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationServiceProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationServiceProto.java
index c5441fe9a563..5e336815a1d3 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationServiceProto.java
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "\n)ListNotificationChannelDescriptorsRequ" +
       "est\022\014\n\004name\030\004 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\n" +
       "page_token\030\003 \001(\t\"\227\001\n*ListNotificationCha" +
-      "nnelDescriptorsResponse\022P\n\023channel_descr" +
+      "nnelDescriptorsResponse\022P\n\023channel_descr",
       "iptors\030\001 \003(\01323.google.monitoring.v3.Noti" +
       "ficationChannelDescriptor\022\027\n\017next_page_t" +
       "oken\030\002 \001(\t\"7\n\'GetNotificationChannelDesc" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "itoring.v3.NotificationChannel\"x\n\037ListNo" +
       "tificationChannelsRequest\022\014\n\004name\030\005 \001(\t\022" +
       "\016\n\006filter\030\006 \001(\t\022\020\n\010order_by\030\007 \001(\t\022\021\n\tpag" +
-      "e_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"\205\001\n Lis" +
+      "e_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"\205\001\n Lis",
       "tNotificationChannelsResponse\022H\n\025notific" +
       "ation_channels\030\003 \003(\0132).google.monitoring" +
       ".v3.NotificationChannel\022\027\n\017next_page_tok" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "le.protobuf.FieldMask\022G\n\024notification_ch" +
       "annel\030\003 \001(\0132).google.monitoring.v3.Notif" +
       "icationChannel\"?\n DeleteNotificationChan" +
-      "nelRequest\022\014\n\004name\030\003 \001(\t\022\r\n\005force\030\005 \001(\010\"" +
+      "nelRequest\022\014\n\004name\030\003 \001(\t\022\r\n\005force\030\005 \001(\010\"",
       ">\n.SendNotificationChannelVerificationCo" +
       "deRequest\022\014\n\004name\030\001 \001(\t\"n\n-GetNotificati" +
       "onChannelVerificationCodeRequest\022\014\n\004name" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "/\n\013expire_time\030\002 \001(\0132\032.google.protobuf.T" +
       "imestamp\">\n VerifyNotificationChannelReq" +
       "uest\022\014\n\004name\030\001 \001(\t\022\014\n\004code\030\002 \001(\t2\273\020\n\032Not" +
-      "ificationChannelService\022\345\001\n\"ListNotifica" +
+      "ificationChannelService\022\345\001\n\"ListNotifica",
       "tionChannelDescriptors\022?.google.monitori" +
       "ng.v3.ListNotificationChannelDescriptors" +
       "Request\032@.google.monitoring.v3.ListNotif" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "elDescriptor\022=.google.monitoring.v3.GetN" +
       "otificationChannelDescriptorRequest\0323.go" +
       "ogle.monitoring.v3.NotificationChannelDe" +
-      "scriptor\">\202\323\344\223\0028\0226/v3/{name=projects/*/n" +
+      "scriptor\">\202\323\344\223\0028\0226/v3/{name=projects/*/n",
       "otificationChannelDescriptors/*}\022\275\001\n\030Lis" +
       "tNotificationChannels\0225.google.monitorin" +
       "g.v3.ListNotificationChannelsRequest\0326.g" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "tionChannel\0223.google.monitoring.v3.GetNo" +
       "tificationChannelRequest\032).google.monito" +
       "ring.v3.NotificationChannel\"4\202\323\344\223\002.\022,/v3" +
-      "/{name=projects/*/notificationChannels/*" +
+      "/{name=projects/*/notificationChannels/*",
       "}\022\310\001\n\031CreateNotificationChannel\0226.google" +
       ".monitoring.v3.CreateNotificationChannel" +
       "Request\032).google.monitoring.v3.Notificat" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "gle.monitoring.v3.UpdateNotificationChan" +
       "nelRequest\032).google.monitoring.v3.Notifi" +
       "cationChannel\"_\202\323\344\223\002Y2A/v3/{notification" +
-      "_channel.name=projects/*/notificationCha" +
+      "_channel.name=projects/*/notificationCha",
       "nnels/*}:\024notification_channel\022\241\001\n\031Delet" +
       "eNotificationChannel\0226.google.monitoring" +
       ".v3.DeleteNotificationChannelRequest\032\026.g" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       ".google.monitoring.v3.SendNotificationCh" +
       "annelVerificationCodeRequest\032\026.google.pr" +
       "otobuf.Empty\"L\202\323\344\223\002F\"A/v3/{name=projects" +
-      "/*/notificationChannels/*}:sendVerificat" +
+      "/*/notificationChannels/*}:sendVerificat",
       "ionCode:\001*\022\200\002\n&GetNotificationChannelVer" +
       "ificationCode\022C.google.monitoring.v3.Get" +
       "NotificationChannelVerificationCodeReque" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "els/*}:getVerificationCode:\001*\022\276\001\n\031Verify" +
       "NotificationChannel\0226.google.monitoring." +
       "v3.VerifyNotificationChannelRequest\032).go" +
-      "ogle.monitoring.v3.NotificationChannel\">" +
+      "ogle.monitoring.v3.NotificationChannel\">",
       "\202\323\344\223\0028\"3/v3/{name=projects/*/notificatio" +
       "nChannels/*}:verify:\001*B\260\001\n\030com.google.mo" +
       "nitoring.v3B\030NotificationServiceProtoP\001Z" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Point.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Point.java
index 9ec1e071aff3..d16daa7328d9 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Point.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Point.java
@@ -32,9 +32,6 @@ private Point(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -918,7 +915,7 @@ public Point parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Point(input, extensionRegistry);
+        return new Point(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ProjectName.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ProjectName.java
index 2e84ed58ea9f..7f0338ac3ab1 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/SendNotificationChannelVerificationCodeRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/SendNotificationChannelVerificationCodeRequest.java
index 57335e4f030e..16727bcdfab4 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/SendNotificationChannelVerificationCodeRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/SendNotificationChannelVerificationCodeRequest.java
@@ -33,9 +33,6 @@ private SendNotificationChannelVerificationCodeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -531,7 +528,7 @@ public SendNotificationChannelVerificationCodeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SendNotificationChannelVerificationCodeRequest(input, extensionRegistry);
+        return new SendNotificationChannelVerificationCodeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeInterval.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeInterval.java
index 7301bc4c8c6a..4d513a9ff73b 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeInterval.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeInterval.java
@@ -34,9 +34,6 @@ private TimeInterval(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -862,7 +859,7 @@ public TimeInterval parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TimeInterval(input, extensionRegistry);
+        return new TimeInterval(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeSeries.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeSeries.java
index 56822257b944..994768b0fa2c 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeSeries.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeSeries.java
@@ -38,9 +38,6 @@ private TimeSeries(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1741,7 +1738,7 @@ public TimeSeries parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TimeSeries(input, extensionRegistry);
+        return new TimeSeries(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TypedValue.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TypedValue.java
index c1c052e60f94..8753d40e2531 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TypedValue.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TypedValue.java
@@ -32,9 +32,6 @@ private TypedValue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1155,7 +1152,7 @@ public TypedValue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TypedValue(input, extensionRegistry);
+        return new TypedValue(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateAlertPolicyRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateAlertPolicyRequest.java
index 6521741718b9..3f02f25bac2d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateAlertPolicyRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateAlertPolicyRequest.java
@@ -32,9 +32,6 @@ private UpdateAlertPolicyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1074,7 +1071,7 @@ public UpdateAlertPolicyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateAlertPolicyRequest(input, extensionRegistry);
+        return new UpdateAlertPolicyRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateGroupRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateGroupRequest.java
index 67fbd95c501d..89281fa082c4 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateGroupRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateGroupRequest.java
@@ -33,9 +33,6 @@ private UpdateGroupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -692,7 +689,7 @@ public UpdateGroupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateGroupRequest(input, extensionRegistry);
+        return new UpdateGroupRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateNotificationChannelRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateNotificationChannelRequest.java
index dfe43472edc2..2b5d6e70da21 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateNotificationChannelRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateNotificationChannelRequest.java
@@ -32,9 +32,6 @@ private UpdateNotificationChannelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -870,7 +867,7 @@ public UpdateNotificationChannelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateNotificationChannelRequest(input, extensionRegistry);
+        return new UpdateNotificationChannelRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateUptimeCheckConfigRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateUptimeCheckConfigRequest.java
index cb58c821ea9e..9345c6e26b2e 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateUptimeCheckConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateUptimeCheckConfigRequest.java
@@ -32,9 +32,6 @@ private UpdateUptimeCheckConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -942,7 +939,7 @@ public UpdateUptimeCheckConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateUptimeCheckConfigRequest(input, extensionRegistry);
+        return new UpdateUptimeCheckConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfig.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfig.java
index a3df342efbd4..a3b78ad2bb93 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfig.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfig.java
@@ -38,9 +38,6 @@ private UptimeCheckConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -300,9 +297,6 @@ private ResourceGroup(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -916,7 +910,7 @@ public ResourceGroup parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ResourceGroup(input, extensionRegistry);
+          return new ResourceGroup(input, extensionRegistry);
       }
     };
 
@@ -1140,9 +1134,6 @@ private HttpCheck(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1316,9 +1307,6 @@ private BasicAuthentication(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1970,7 +1958,7 @@ public BasicAuthentication parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new BasicAuthentication(input, extensionRegistry);
+            return new BasicAuthentication(input, extensionRegistry);
         }
       };
 
@@ -3275,7 +3263,7 @@ public HttpCheck parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new HttpCheck(input, extensionRegistry);
+          return new HttpCheck(input, extensionRegistry);
       }
     };
 
@@ -3339,9 +3327,6 @@ private TcpCheck(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3764,7 +3749,7 @@ public TcpCheck parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TcpCheck(input, extensionRegistry);
+          return new TcpCheck(input, extensionRegistry);
       }
     };
 
@@ -3837,9 +3822,6 @@ private ContentMatcher(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4337,7 +4319,7 @@ public ContentMatcher parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ContentMatcher(input, extensionRegistry);
+          return new ContentMatcher(input, extensionRegistry);
       }
     };
 
@@ -4486,9 +4468,6 @@ private InternalChecker(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5607,7 +5586,7 @@ public InternalChecker parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new InternalChecker(input, extensionRegistry);
+          return new InternalChecker(input, extensionRegistry);
       }
     };
 
@@ -9090,7 +9069,7 @@ public UptimeCheckConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UptimeCheckConfig(input, extensionRegistry);
+        return new UptimeCheckConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfigName.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfigName.java
index e7ad621b20d3..2bcf133bb551 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfigName.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfigName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UptimeCheckConfigName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "uptime_check_config", uptimeCheckConfig);
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckIp.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckIp.java
index ba583bc7052e..05dc70f28937 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckIp.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckIp.java
@@ -36,9 +36,6 @@ private UptimeCheckIp(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -841,7 +838,7 @@ public UptimeCheckIp parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UptimeCheckIp(input, extensionRegistry);
+        return new UptimeCheckIp(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeProto.java
index f287b964e09e..01f135072b74 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "rceH\000\022O\n\016resource_group\030\004 \001(\01325.google.m" +
       "onitoring.v3.UptimeCheckConfig.ResourceG" +
       "roupH\000\022G\n\nhttp_check\030\005 \001(\01321.google.moni" +
-      "toring.v3.UptimeCheckConfig.HttpCheckH\001\022" +
+      "toring.v3.UptimeCheckConfig.HttpCheckH\001\022",
       "E\n\ttcp_check\030\006 \001(\01320.google.monitoring.v" +
       "3.UptimeCheckConfig.TcpCheckH\001\022)\n\006period" +
       "\030\007 \001(\0132\031.google.protobuf.Duration\022*\n\007tim" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "A\n\020selected_regions\030\n \003(\0162\'.google.monit" +
       "oring.v3.UptimeCheckRegion\022R\n\021internal_c" +
       "heckers\030\016 \003(\01327.google.monitoring.v3.Upt" +
-      "imeCheckConfig.InternalChecker\032a\n\rResour" +
+      "imeCheckConfig.InternalChecker\032a\n\rResour",
       "ceGroup\022\020\n\010group_id\030\001 \001(\t\022>\n\rresource_ty" +
       "pe\030\002 \001(\0162\'.google.monitoring.v3.GroupRes" +
       "ourceType\032\344\002\n\tHttpCheck\022\017\n\007use_ssl\030\001 \001(\010" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "\n\014mask_headers\030\005 \001(\010\022O\n\007headers\030\006 \003(\0132>." +
       "google.monitoring.v3.UptimeCheckConfig.H" +
       "ttpCheck.HeadersEntry\0329\n\023BasicAuthentica" +
-      "tion\022\020\n\010username\030\001 \001(\t\022\020\n\010password\030\002 \001(\t" +
+      "tion\022\020\n\010username\030\001 \001(\t\022\020\n\010password\030\002 \001(\t",
       "\032.\n\014HeadersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002" +
       " \001(\t:\0028\001\032\030\n\010TcpCheck\022\014\n\004port\030\001 \001(\005\032!\n\016Co" +
       "ntentMatcher\022\017\n\007content\030\001 \001(\t\032r\n\017Interna" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "\022check_request_type\"n\n\rUptimeCheckIp\0227\n\006" +
       "region\030\001 \001(\0162\'.google.monitoring.v3.Upti" +
       "meCheckRegion\022\020\n\010location\030\002 \001(\t\022\022\n\nip_ad" +
-      "dress\030\003 \001(\t*e\n\021UptimeCheckRegion\022\026\n\022REGI" +
+      "dress\030\003 \001(\t*e\n\021UptimeCheckRegion\022\026\n\022REGI",
       "ON_UNSPECIFIED\020\000\022\007\n\003USA\020\001\022\n\n\006EUROPE\020\002\022\021\n" +
       "\rSOUTH_AMERICA\020\003\022\020\n\014ASIA_PACIFIC\020\004*[\n\021Gr" +
       "oupResourceType\022\035\n\031RESOURCE_TYPE_UNSPECI" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeServiceProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeServiceProto.java
index 06f9d0fb1a25..2d2ff36481a7 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeServiceProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(" +
       "\t\"\200\001\n\036ListUptimeCheckConfigsResponse\022E\n\024" +
       "uptime_check_configs\030\001 \003(\0132\'.google.moni" +
-      "toring.v3.UptimeCheckConfig\022\027\n\017next_page" +
+      "toring.v3.UptimeCheckConfig\022\027\n\017next_page",
       "_token\030\002 \001(\t\"+\n\033GetUptimeCheckConfigRequ" +
       "est\022\014\n\004name\030\001 \001(\t\"v\n\036CreateUptimeCheckCo" +
       "nfigRequest\022\016\n\006parent\030\001 \001(\t\022D\n\023uptime_ch" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "le.protobuf.FieldMask\022D\n\023uptime_check_co" +
       "nfig\030\003 \001(\0132\'.google.monitoring.v3.Uptime" +
       "CheckConfig\".\n\036DeleteUptimeCheckConfigRe" +
-      "quest\022\014\n\004name\030\001 \001(\t\"B\n\031ListUptimeCheckIp" +
+      "quest\022\014\n\004name\030\001 \001(\t\"B\n\031ListUptimeCheckIp",
       "sRequest\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_toke" +
       "n\030\003 \001(\t\"t\n\032ListUptimeCheckIpsResponse\022=\n" +
       "\020uptime_check_ips\030\001 \003(\0132#.google.monitor" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "istUptimeCheckConfigsRequest\0324.google.mo" +
       "nitoring.v3.ListUptimeCheckConfigsRespon" +
       "se\"2\202\323\344\223\002,\022*/v3/{parent=projects/*}/upti" +
-      "meCheckConfigs\022\246\001\n\024GetUptimeCheckConfig\022" +
+      "meCheckConfigs\022\246\001\n\024GetUptimeCheckConfig\022",
       "1.google.monitoring.v3.GetUptimeCheckCon" +
       "figRequest\032\'.google.monitoring.v3.Uptime" +
       "CheckConfig\"2\202\323\344\223\002,\022*/v3/{name=projects/" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "oring.v3.UptimeCheckConfig\"G\202\323\344\223\002A\"*/v3/" +
       "{parent=projects/*}/uptimeCheckConfigs:\023" +
       "uptime_check_config\022\325\001\n\027UpdateUptimeChec" +
-      "kConfig\0224.google.monitoring.v3.UpdateUpt" +
+      "kConfig\0224.google.monitoring.v3.UpdateUpt",
       "imeCheckConfigRequest\032\'.google.monitorin" +
       "g.v3.UptimeCheckConfig\"[\202\323\344\223\002U2>/v3/{upt" +
       "ime_check_config.name=projects/*/uptimeC" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "google.protobuf.Empty\"2\202\323\344\223\002,**/v3/{name" +
       "=projects/*/uptimeCheckConfigs/*}\022\223\001\n\022Li" +
       "stUptimeCheckIps\022/.google.monitoring.v3." +
-      "ListUptimeCheckIpsRequest\0320.google.monit" +
+      "ListUptimeCheckIpsRequest\0320.google.monit",
       "oring.v3.ListUptimeCheckIpsResponse\"\032\202\323\344" +
       "\223\002\024\022\022/v3/uptimeCheckIpsB\252\001\n\030com.google.m" +
       "onitoring.v3B\022UptimeServiceProtoP\001Z>goog" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/VerifyNotificationChannelRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/VerifyNotificationChannelRequest.java
index df184289070b..1014012d646a 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/VerifyNotificationChannelRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/VerifyNotificationChannelRequest.java
@@ -34,9 +34,6 @@ private VerifyNotificationChannelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -728,7 +725,7 @@ public VerifyNotificationChannelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VerifyNotificationChannelRequest(input, extensionRegistry);
+        return new VerifyNotificationChannelRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/FingerprintName.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/FingerprintName.java
index b68edf0ee371..7033d1d43c2b 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/FingerprintName.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/FingerprintName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("FingerprintName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("user", user, "fingerprint", fingerprint);
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/OsLoginProto.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/OsLoginProto.java
index 052302785367..0e26f9be2732 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/OsLoginProto.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/OsLoginProto.java
@@ -193,9 +193,6 @@ private PosixAccount(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1690,7 +1687,7 @@ public PosixAccount parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PosixAccount(input, extensionRegistry);
+          return new PosixAccount(input, extensionRegistry);
       }
     };
 
@@ -1794,9 +1791,6 @@ private SshPublicKey(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2534,7 +2528,7 @@ public SshPublicKey parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SshPublicKey(input, extensionRegistry);
+          return new SshPublicKey(input, extensionRegistry);
       }
     };
 
@@ -2581,7 +2575,7 @@ public com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey getDefaultInsta
       "tem_id\030\010 \001(\t\022\022\n\naccount_id\030\t \001(\t\"N\n\014SshP" +
       "ublicKey\022\013\n\003key\030\001 \001(\t\022\034\n\024expiration_time" +
       "_usec\030\002 \001(\003\022\023\n\013fingerprint\030\003 \001(\tB\256\001\n\037com" +
-      ".google.cloud.oslogin.commonB\014OsLoginPro" +
+      ".google.cloud.oslogin.commonB\014OsLoginPro",
       "toZAgoogle.golang.org/genproto/googleapi" +
       "s/cloud/oslogin/common;common\252\002\033Google.C" +
       "loud.OsLogin.Common\312\002\033Google\\Cloud\\OsLog" +
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/ProjectName.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/ProjectName.java
index 518d0f415a59..0ba99ae6c5d7 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("user", user, "project", project);
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/UserName.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/UserName.java
index 0dc1d4fd7bec..3d956e6acecd 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/UserName.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/UserName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UserName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("user", user);
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeletePosixAccountRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeletePosixAccountRequest.java
index 54aee41c2e12..f6516c88072a 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeletePosixAccountRequest.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeletePosixAccountRequest.java
@@ -33,9 +33,6 @@ private DeletePosixAccountRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public DeletePosixAccountRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeletePosixAccountRequest(input, extensionRegistry);
+        return new DeletePosixAccountRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeleteSshPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeleteSshPublicKeyRequest.java
index 10bfb8f23cb6..bb6d79e584be 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeleteSshPublicKeyRequest.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeleteSshPublicKeyRequest.java
@@ -33,9 +33,6 @@ private DeleteSshPublicKeyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public DeleteSshPublicKeyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSshPublicKeyRequest(input, extensionRegistry);
+        return new DeleteSshPublicKeyRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/FingerprintName.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/FingerprintName.java
index a47f81bc82d4..784d1f4da012 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/FingerprintName.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/FingerprintName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("FingerprintName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("user", user, "fingerprint", fingerprint);
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetLoginProfileRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetLoginProfileRequest.java
index 6d5c14c4b404..fe2429499d0d 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetLoginProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetLoginProfileRequest.java
@@ -33,9 +33,6 @@ private GetLoginProfileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -531,7 +528,7 @@ public GetLoginProfileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetLoginProfileRequest(input, extensionRegistry);
+        return new GetLoginProfileRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetSshPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetSshPublicKeyRequest.java
index 17f757c1ea32..5ac8b51a37fe 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetSshPublicKeyRequest.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetSshPublicKeyRequest.java
@@ -33,9 +33,6 @@ private GetSshPublicKeyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public GetSshPublicKeyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSshPublicKeyRequest(input, extensionRegistry);
+        return new GetSshPublicKeyRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyRequest.java
index e5da69b9829f..484de37d27a1 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyRequest.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyRequest.java
@@ -34,9 +34,6 @@ private ImportSshPublicKeyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -915,7 +912,7 @@ public ImportSshPublicKeyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImportSshPublicKeyRequest(input, extensionRegistry);
+        return new ImportSshPublicKeyRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyResponse.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyResponse.java
index 2ab1e75c15bb..90b79c168b06 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyResponse.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyResponse.java
@@ -32,9 +32,6 @@ private ImportSshPublicKeyResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public ImportSshPublicKeyResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImportSshPublicKeyResponse(input, extensionRegistry);
+        return new ImportSshPublicKeyResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/LoginProfile.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/LoginProfile.java
index 902e0871d985..8170a8c90ccd 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/LoginProfile.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/LoginProfile.java
@@ -36,9 +36,6 @@ private LoginProfile(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1368,7 +1365,7 @@ public LoginProfile parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LoginProfile(input, extensionRegistry);
+        return new LoginProfile(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/OsLoginProto.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/OsLoginProto.java
index d7ed6ad8b5b6..d3730b15db07 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/OsLoginProto.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/OsLoginProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "accounts\030\002 \003(\0132).google.cloud.oslogin.co" +
       "mmon.PosixAccount\022Q\n\017ssh_public_keys\030\003 \003" +
       "(\01328.google.cloud.oslogin.v1.LoginProfil" +
-      "e.SshPublicKeysEntry\022\021\n\tsuspended\030\004 \001(\010\032" +
+      "e.SshPublicKeysEntry\022\021\n\tsuspended\030\004 \001(\010\032",
       "_\n\022SshPublicKeysEntry\022\013\n\003key\030\001 \001(\t\0228\n\005va" +
       "lue\030\002 \001(\0132).google.cloud.oslogin.common." +
       "SshPublicKey:\0028\001\")\n\031DeletePosixAccountRe" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "yRequest\022\014\n\004name\030\001 \001(\t\"\202\001\n\031ImportSshPubl" +
       "icKeyRequest\022\016\n\006parent\030\001 \001(\t\022A\n\016ssh_publ" +
       "ic_key\030\002 \001(\0132).google.cloud.oslogin.comm" +
-      "on.SshPublicKey\022\022\n\nproject_id\030\003 \001(\t\"Z\n\032I" +
+      "on.SshPublicKey\022\022\n\nproject_id\030\003 \001(\t\"Z\n\032I",
       "mportSshPublicKeyResponse\022<\n\rlogin_profi" +
       "le\030\001 \001(\0132%.google.cloud.oslogin.v1.Login" +
       "Profile\"\235\001\n\031UpdateSshPublicKeyRequest\022\014\n" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "eldMask2\315\007\n\016OsLoginService\022\207\001\n\022DeletePos" +
       "ixAccount\0222.google.cloud.oslogin.v1.Dele" +
       "tePosixAccountRequest\032\026.google.protobuf." +
-      "Empty\"%\202\323\344\223\002\037*\035/v1/{name=users/*/project" +
+      "Empty\"%\202\323\344\223\002\037*\035/v1/{name=users/*/project",
       "s/*}\022\214\001\n\022DeleteSshPublicKey\0222.google.clo" +
       "ud.oslogin.v1.DeleteSshPublicKeyRequest\032" +
       "\026.google.protobuf.Empty\"*\202\323\344\223\002$*\"/v1/{na" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "v1.LoginProfile\"\'\202\323\344\223\002!\022\037/v1/{name=users" +
       "/*}/loginProfile\022\231\001\n\017GetSshPublicKey\022/.g" +
       "oogle.cloud.oslogin.v1.GetSshPublicKeyRe" +
-      "quest\032).google.cloud.oslogin.common.SshP" +
+      "quest\032).google.cloud.oslogin.common.SshP",
       "ublicKey\"*\202\323\344\223\002$\022\"/v1/{name=users/*/sshP" +
       "ublicKeys/*}\022\276\001\n\022ImportSshPublicKey\0222.go" +
       "ogle.cloud.oslogin.v1.ImportSshPublicKey" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "c_key\022\257\001\n\022UpdateSshPublicKey\0222.google.cl" +
       "oud.oslogin.v1.UpdateSshPublicKeyRequest" +
       "\032).google.cloud.oslogin.common.SshPublic" +
-      "Key\":\202\323\344\223\00242\"/v1/{name=users/*/sshPublic" +
+      "Key\":\202\323\344\223\00242\"/v1/{name=users/*/sshPublic",
       "Keys/*}:\016ssh_public_keyB\241\001\n\033com.google.c" +
       "loud.oslogin.v1B\014OsLoginProtoP\001Z>google." +
       "golang.org/genproto/googleapis/cloud/osl" +
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ProjectName.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ProjectName.java
index d636024fc720..193db45726db 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("user", user, "project", project);
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UpdateSshPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UpdateSshPublicKeyRequest.java
index 1af4c72b4804..87ef2570f9bd 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UpdateSshPublicKeyRequest.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UpdateSshPublicKeyRequest.java
@@ -33,9 +33,6 @@ private UpdateSshPublicKeyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1003,7 +1000,7 @@ public UpdateSshPublicKeyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateSshPublicKeyRequest(input, extensionRegistry);
+        return new UpdateSshPublicKeyRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UserName.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UserName.java
index f09b5d935ff2..576492627786 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UserName.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UserName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UserName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("user", user);
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java
index b6f38ea1d079..70c45825b8ac 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java
@@ -34,9 +34,6 @@ private AcknowledgeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -778,7 +775,7 @@ public AcknowledgeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AcknowledgeRequest(input, extensionRegistry);
+        return new AcknowledgeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java
index f6374d302c9a..701cff6bc463 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java
@@ -34,9 +34,6 @@ private CreateSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -770,7 +767,7 @@ public CreateSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateSnapshotRequest(input, extensionRegistry);
+        return new CreateSnapshotRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java
index 6b92fdcea2b9..8e05d5535139 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java
@@ -33,9 +33,6 @@ private DeleteSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSnapshotRequest(input, extensionRegistry);
+        return new DeleteSnapshotRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java
index 67c8fe3977f4..2712f7b0aedd 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java
@@ -33,9 +33,6 @@ private DeleteSubscriptionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteSubscriptionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSubscriptionRequest(input, extensionRegistry);
+        return new DeleteSubscriptionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java
index 31e7001affad..893570ab861f 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java
@@ -33,9 +33,6 @@ private DeleteTopicRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteTopicRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteTopicRequest(input, extensionRegistry);
+        return new DeleteTopicRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeletedTopic.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeletedTopic.java
index b8026eb550c2..6a01b4ff09a0 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeletedTopic.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeletedTopic.java
@@ -15,7 +15,6 @@
 package com.google.pubsub.v1;
 
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 
@@ -52,14 +51,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("DeletedTopic.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return FIXED_VALUE;
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSubscriptionRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSubscriptionRequest.java
index 37448712e4db..750eaf5a9d13 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSubscriptionRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSubscriptionRequest.java
@@ -33,9 +33,6 @@ private GetSubscriptionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetSubscriptionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSubscriptionRequest(input, extensionRegistry);
+        return new GetSubscriptionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetTopicRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetTopicRequest.java
index ee0049e46ff7..413a9aec9a73 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetTopicRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetTopicRequest.java
@@ -33,9 +33,6 @@ private GetTopicRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetTopicRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetTopicRequest(input, extensionRegistry);
+        return new GetTopicRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsRequest.java
index cdee470682ec..5b2ce8d90217 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsRequest.java
@@ -35,9 +35,6 @@ private ListSnapshotsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -781,7 +778,7 @@ public ListSnapshotsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSnapshotsRequest(input, extensionRegistry);
+        return new ListSnapshotsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsResponse.java
index 3b313dfe5f30..33757b43367f 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsResponse.java
@@ -34,9 +34,6 @@ private ListSnapshotsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -978,7 +975,7 @@ public ListSnapshotsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSnapshotsResponse(input, extensionRegistry);
+        return new ListSnapshotsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsRequest.java
index 006c976c8b4c..5100a0e14cbc 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsRequest.java
@@ -35,9 +35,6 @@ private ListSubscriptionsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -781,7 +778,7 @@ public ListSubscriptionsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSubscriptionsRequest(input, extensionRegistry);
+        return new ListSubscriptionsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsResponse.java
index 504ee6f7c8a3..e5d36b843a19 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsResponse.java
@@ -34,9 +34,6 @@ private ListSubscriptionsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListSubscriptionsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSubscriptionsResponse(input, extensionRegistry);
+        return new ListSubscriptionsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsRequest.java
index ad2c68df8b0a..56eed7315bb3 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsRequest.java
@@ -35,9 +35,6 @@ private ListTopicSubscriptionsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -781,7 +778,7 @@ public ListTopicSubscriptionsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTopicSubscriptionsRequest(input, extensionRegistry);
+        return new ListTopicSubscriptionsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsResponse.java
index b4065286bf25..4c2d99a2dd7e 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsResponse.java
@@ -34,9 +34,6 @@ private ListTopicSubscriptionsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -772,7 +769,7 @@ public ListTopicSubscriptionsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTopicSubscriptionsResponse(input, extensionRegistry);
+        return new ListTopicSubscriptionsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsRequest.java
index 3d3f28c59587..d3805cecf8f1 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsRequest.java
@@ -35,9 +35,6 @@ private ListTopicsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -781,7 +778,7 @@ public ListTopicsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTopicsRequest(input, extensionRegistry);
+        return new ListTopicsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsResponse.java
index e0666d18ae08..2bfb90b1de3b 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsResponse.java
@@ -34,9 +34,6 @@ private ListTopicsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -978,7 +975,7 @@ public ListTopicsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTopicsResponse(input, extensionRegistry);
+        return new ListTopicsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyAckDeadlineRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyAckDeadlineRequest.java
index a33954d319a8..90da0e1ed7d7 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyAckDeadlineRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyAckDeadlineRequest.java
@@ -35,9 +35,6 @@ private ModifyAckDeadlineRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -863,7 +860,7 @@ public ModifyAckDeadlineRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ModifyAckDeadlineRequest(input, extensionRegistry);
+        return new ModifyAckDeadlineRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyPushConfigRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyPushConfigRequest.java
index f448e439183c..2e2df6cdb5f4 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyPushConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyPushConfigRequest.java
@@ -33,9 +33,6 @@ private ModifyPushConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -815,7 +812,7 @@ public ModifyPushConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ModifyPushConfigRequest(input, extensionRegistry);
+        return new ModifyPushConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectName.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectName.java
index f9ef6a4eab23..ff6b421e7f8b 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectSnapshotName.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectSnapshotName.java
index 7ee9e5a041cb..c0cbcd22cf9f 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectSnapshotName.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectSnapshotName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectSnapshotName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "snapshot", snapshot);
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectSubscriptionName.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectSubscriptionName.java
index 203e4360f83f..7d864b366273 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectSubscriptionName.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectSubscriptionName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectSubscriptionName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "subscription", subscription);
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectTopicName.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectTopicName.java
index 5438e96e5cb7..d154b2aaf5e1 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectTopicName.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectTopicName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectTopicName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "topic", topic);
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishRequest.java
index a95e30a40df7..83bb1a7a6410 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishRequest.java
@@ -34,9 +34,6 @@ private PublishRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -978,7 +975,7 @@ public PublishRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PublishRequest(input, extensionRegistry);
+        return new PublishRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishResponse.java
index d59fd9694aaf..f5a167742930 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishResponse.java
@@ -33,9 +33,6 @@ private PublishResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -626,7 +623,7 @@ public PublishResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PublishResponse(input, extensionRegistry);
+        return new PublishResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubMessage.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubMessage.java
index 4910321a2293..8229f3bd9ccc 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubMessage.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubMessage.java
@@ -35,9 +35,6 @@ private PubsubMessage(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1205,7 +1202,7 @@ public PubsubMessage parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PubsubMessage(input, extensionRegistry);
+        return new PubsubMessage(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubProto.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubProto.java
index 707fe8b41799..ec1e675466fa 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubProto.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubProto.java
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "\030\002 \003(\0132#.google.pubsub.v1.Topic.LabelsEn" +
       "try\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value" +
       "\030\002 \001(\t:\0028\001\"\333\001\n\rPubsubMessage\022\014\n\004data\030\001 \001" +
-      "(\014\022C\n\nattributes\030\002 \003(\0132/.google.pubsub.v" +
+      "(\014\022C\n\nattributes\030\002 \003(\0132/.google.pubsub.v",
       "1.PubsubMessage.AttributesEntry\022\022\n\nmessa" +
       "ge_id\030\003 \001(\t\0220\n\014publish_time\030\004 \001(\0132\032.goog" +
       "le.protobuf.Timestamp\0321\n\017AttributesEntry" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "v1.Topic\022/\n\013update_mask\030\002 \001(\0132\032.google.p" +
       "rotobuf.FieldMask\"R\n\016PublishRequest\022\r\n\005t" +
       "opic\030\001 \001(\t\0221\n\010messages\030\002 \003(\0132\037.google.pu" +
-      "bsub.v1.PubsubMessage\"&\n\017PublishResponse" +
+      "bsub.v1.PubsubMessage\"&\n\017PublishResponse",
       "\022\023\n\013message_ids\030\001 \003(\t\"K\n\021ListTopicsReque" +
       "st\022\017\n\007project\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022" +
       "\n\npage_token\030\003 \001(\t\"V\n\022ListTopicsResponse" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       "ge_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"P\n\036Lis" +
       "tTopicSubscriptionsResponse\022\025\n\rsubscript" +
       "ions\030\001 \003(\t\022\027\n\017next_page_token\030\002 \001(\t\"#\n\022D" +
-      "eleteTopicRequest\022\r\n\005topic\030\001 \001(\t\"\305\002\n\014Sub" +
+      "eleteTopicRequest\022\r\n\005topic\030\001 \001(\t\"\305\002\n\014Sub",
       "scription\022\014\n\004name\030\001 \001(\t\022\r\n\005topic\030\002 \001(\t\0221" +
       "\n\013push_config\030\004 \001(\0132\034.google.pubsub.v1.P" +
       "ushConfig\022\034\n\024ack_deadline_seconds\030\005 \001(\005\022" +
@@ -257,7 +257,7 @@ public static void registerAllExtensions(
       "ubsub.v1.Subscription.LabelsEntry\032-\n\013Lab" +
       "elsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001" +
       "\"\230\001\n\nPushConfig\022\025\n\rpush_endpoint\030\001 \001(\t\022@" +
-      "\n\nattributes\030\002 \003(\0132,.google.pubsub.v1.Pu" +
+      "\n\nattributes\030\002 \003(\0132,.google.pubsub.v1.Pu",
       "shConfig.AttributesEntry\0321\n\017AttributesEn" +
       "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"S\n\017R" +
       "eceivedMessage\022\016\n\006ack_id\030\001 \001(\t\0220\n\007messag" +
@@ -267,7 +267,7 @@ public static void registerAllExtensions(
       "\n\014subscription\030\001 \001(\0132\036.google.pubsub.v1." +
       "Subscription\022/\n\013update_mask\030\002 \001(\0132\032.goog" +
       "le.protobuf.FieldMask\"R\n\030ListSubscriptio" +
-      "nsRequest\022\017\n\007project\030\001 \001(\t\022\021\n\tpage_size\030" +
+      "nsRequest\022\017\n\007project\030\001 \001(\t\022\021\n\tpage_size\030",
       "\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"k\n\031ListSubscri" +
       "ptionsResponse\0225\n\rsubscriptions\030\001 \003(\0132\036." +
       "google.pubsub.v1.Subscription\022\027\n\017next_pa" +
@@ -277,7 +277,7 @@ public static void registerAllExtensions(
       "sh_config\030\002 \001(\0132\034.google.pubsub.v1.PushC" +
       "onfig\"U\n\013PullRequest\022\024\n\014subscription\030\001 \001" +
       "(\t\022\032\n\022return_immediately\030\002 \001(\010\022\024\n\014max_me" +
-      "ssages\030\003 \001(\005\"L\n\014PullResponse\022<\n\021received" +
+      "ssages\030\003 \001(\005\"L\n\014PullResponse\022<\n\021received",
       "_messages\030\001 \003(\0132!.google.pubsub.v1.Recei" +
       "vedMessage\"_\n\030ModifyAckDeadlineRequest\022\024" +
       "\n\014subscription\030\001 \001(\t\022\017\n\007ack_ids\030\004 \003(\t\022\034\n" +
@@ -287,7 +287,7 @@ public static void registerAllExtensions(
       "scription\030\001 \001(\t\022\017\n\007ack_ids\030\002 \003(\t\022\037\n\027modi" +
       "fy_deadline_seconds\030\003 \003(\005\022\037\n\027modify_dead" +
       "line_ack_ids\030\004 \003(\t\022#\n\033stream_ack_deadlin" +
-      "e_seconds\030\005 \001(\005\"U\n\025StreamingPullResponse" +
+      "e_seconds\030\005 \001(\005\"U\n\025StreamingPullResponse",
       "\022<\n\021received_messages\030\001 \003(\0132!.google.pub" +
       "sub.v1.ReceivedMessage\";\n\025CreateSnapshot" +
       "Request\022\014\n\004name\030\001 \001(\t\022\024\n\014subscription\030\002 " +
@@ -297,7 +297,7 @@ public static void registerAllExtensions(
       "ask\"\277\001\n\010Snapshot\022\014\n\004name\030\001 \001(\t\022\r\n\005topic\030" +
       "\002 \001(\t\022/\n\013expire_time\030\003 \001(\0132\032.google.prot" +
       "obuf.Timestamp\0226\n\006labels\030\004 \003(\0132&.google." +
-      "pubsub.v1.Snapshot.LabelsEntry\032-\n\013Labels" +
+      "pubsub.v1.Snapshot.LabelsEntry\032-\n\013Labels",
       "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"N\n" +
       "\024ListSnapshotsRequest\022\017\n\007project\030\001 \001(\t\022\021" +
       "\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"_\n" +
@@ -307,7 +307,7 @@ public static void registerAllExtensions(
       "\020\n\010snapshot\030\001 \001(\t\"m\n\013SeekRequest\022\024\n\014subs" +
       "cription\030\001 \001(\t\022*\n\004time\030\002 \001(\0132\032.google.pr" +
       "otobuf.TimestampH\000\022\022\n\010snapshot\030\003 \001(\tH\000B\010" +
-      "\n\006target\"\016\n\014SeekResponse2\367\020\n\nSubscriber\022" +
+      "\n\006target\"\016\n\014SeekResponse2\367\020\n\nSubscriber\022",
       "\206\001\n\022CreateSubscription\022\036.google.pubsub.v" +
       "1.Subscription\032\036.google.pubsub.v1.Subscr" +
       "iption\"0\202\323\344\223\002*\032%/v1/{name=projects/*/sub" +
@@ -317,7 +317,7 @@ public static void registerAllExtensions(
       "/v1/{subscription=projects/*/subscriptio" +
       "ns/*}\022\240\001\n\022UpdateSubscription\022+.google.pu" +
       "bsub.v1.UpdateSubscriptionRequest\032\036.goog" +
-      "le.pubsub.v1.Subscription\"=\202\323\344\223\002722/v1/{" +
+      "le.pubsub.v1.Subscription\"=\202\323\344\223\002722/v1/{",
       "subscription.name=projects/*/subscriptio" +
       "ns/*}:\001*\022\234\001\n\021ListSubscriptions\022*.google." +
       "pubsub.v1.ListSubscriptionsRequest\032+.goo" +
@@ -327,7 +327,7 @@ public static void registerAllExtensions(
       "pubsub.v1.DeleteSubscriptionRequest\032\026.go" +
       "ogle.protobuf.Empty\"5\202\323\344\223\002/*-/v1/{subscr" +
       "iption=projects/*/subscriptions/*}\022\243\001\n\021M" +
-      "odifyAckDeadline\022*.google.pubsub.v1.Modi" +
+      "odifyAckDeadline\022*.google.pubsub.v1.Modi",
       "fyAckDeadlineRequest\032\026.google.protobuf.E" +
       "mpty\"J\202\323\344\223\002D\"?/v1/{subscription=projects" +
       "/*/subscriptions/*}:modifyAckDeadline:\001*" +
@@ -337,7 +337,7 @@ public static void registerAllExtensions(
       "scriptions/*}:acknowledge:\001*\022\204\001\n\004Pull\022\035." +
       "google.pubsub.v1.PullRequest\032\036.google.pu" +
       "bsub.v1.PullResponse\"=\202\323\344\223\0027\"2/v1/{subsc" +
-      "ription=projects/*/subscriptions/*}:pull" +
+      "ription=projects/*/subscriptions/*}:pull",
       ":\001*\022d\n\rStreamingPull\022&.google.pubsub.v1." +
       "StreamingPullRequest\032\'.google.pubsub.v1." +
       "StreamingPullResponse(\0010\001\022\240\001\n\020ModifyPush" +
@@ -347,7 +347,7 @@ public static void registerAllExtensions(
       "tions/*}:modifyPushConfig:\001*\022\214\001\n\rListSna" +
       "pshots\022&.google.pubsub.v1.ListSnapshotsR" +
       "equest\032\'.google.pubsub.v1.ListSnapshotsR" +
-      "esponse\"*\202\323\344\223\002$\022\"/v1/{project=projects/*" +
+      "esponse\"*\202\323\344\223\002$\022\"/v1/{project=projects/*",
       "}/snapshots\022\203\001\n\016CreateSnapshot\022\'.google." +
       "pubsub.v1.CreateSnapshotRequest\032\032.google" +
       ".pubsub.v1.Snapshot\",\202\323\344\223\002&\032!/v1/{name=p" +
@@ -357,7 +357,7 @@ public static void registerAllExtensions(
       "/2*/v1/{snapshot.name=projects/*/snapsho" +
       "ts/*}:\001*\022\200\001\n\016DeleteSnapshot\022\'.google.pub" +
       "sub.v1.DeleteSnapshotRequest\032\026.google.pr" +
-      "otobuf.Empty\"-\202\323\344\223\002\'*%/v1/{snapshot=proj" +
+      "otobuf.Empty\"-\202\323\344\223\002\'*%/v1/{snapshot=proj",
       "ects/*/snapshots/*}\022\204\001\n\004Seek\022\035.google.pu" +
       "bsub.v1.SeekRequest\032\036.google.pubsub.v1.S" +
       "eekResponse\"=\202\323\344\223\0027\"2/v1/{subscription=p" +
@@ -367,7 +367,7 @@ public static void registerAllExtensions(
       "#\032\036/v1/{name=projects/*/topics/*}:\001*\022}\n\013" +
       "UpdateTopic\022$.google.pubsub.v1.UpdateTop" +
       "icRequest\032\027.google.pubsub.v1.Topic\"/\202\323\344\223" +
-      "\002)2$/v1/{topic.name=projects/*/topics/*}" +
+      "\002)2$/v1/{topic.name=projects/*/topics/*}",
       ":\001*\022\202\001\n\007Publish\022 .google.pubsub.v1.Publi" +
       "shRequest\032!.google.pubsub.v1.PublishResp" +
       "onse\"2\202\323\344\223\002,\"\'/v1/{topic=projects/*/topi" +
@@ -377,7 +377,7 @@ public static void registerAllExtensions(
       "topics/*}\022\200\001\n\nListTopics\022#.google.pubsub" +
       ".v1.ListTopicsRequest\032$.google.pubsub.v1" +
       ".ListTopicsResponse\"\'\202\323\344\223\002!\022\037/v1/{projec" +
-      "t=projects/*}/topics\022\262\001\n\026ListTopicSubscr" +
+      "t=projects/*}/topics\022\262\001\n\026ListTopicSubscr",
       "iptions\022/.google.pubsub.v1.ListTopicSubs" +
       "criptionsRequest\0320.google.pubsub.v1.List" +
       "TopicSubscriptionsResponse\"5\202\323\344\223\002/\022-/v1/" +
@@ -387,7 +387,7 @@ public static void registerAllExtensions(
       "\202\323\344\223\002!*\037/v1/{topic=projects/*/topics/*}B" +
       "\222\001\n\024com.google.pubsub.v1B\013PubsubProtoP\001Z" +
       "6google.golang.org/genproto/googleapis/p" +
-      "ubsub/v1;pubsub\370\001\001\252\002\026Google.Cloud.PubSub" +
+      "ubsub/v1;pubsub\370\001\001\252\002\026Google.Cloud.PubSub",
       ".V1\312\002\026Google\\Cloud\\PubSub\\V1b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java
index c01a02625b10..aaeecd93372b 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java
@@ -35,9 +35,6 @@ private PullRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -711,7 +708,7 @@ public PullRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PullRequest(input, extensionRegistry);
+        return new PullRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullResponse.java
index 3a4694f88ce5..a8c84a96529d 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullResponse.java
@@ -33,9 +33,6 @@ private PullResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -882,7 +879,7 @@ public PullResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PullResponse(input, extensionRegistry);
+        return new PullResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PushConfig.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PushConfig.java
index fbb7e018afa9..e0bfc14b592f 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PushConfig.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PushConfig.java
@@ -33,9 +33,6 @@ private PushConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1024,7 +1021,7 @@ public PushConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PushConfig(input, extensionRegistry);
+        return new PushConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ReceivedMessage.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ReceivedMessage.java
index dec18356e9b0..c50f2bfa1310 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ReceivedMessage.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ReceivedMessage.java
@@ -33,9 +33,6 @@ private ReceivedMessage(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -760,7 +757,7 @@ public ReceivedMessage parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReceivedMessage(input, extensionRegistry);
+        return new ReceivedMessage(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekRequest.java
index 9d12081522f7..d2d2b68dbb11 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekRequest.java
@@ -33,9 +33,6 @@ private SeekRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1167,7 +1164,7 @@ public SeekRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SeekRequest(input, extensionRegistry);
+        return new SeekRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekResponse.java
index 7a3eda234ba4..deb1a5a59eed 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekResponse.java
@@ -28,9 +28,6 @@ private SeekResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -367,7 +364,7 @@ public SeekResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SeekResponse(input, extensionRegistry);
+        return new SeekResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Snapshot.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Snapshot.java
index 65f04e684884..66a922773e78 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Snapshot.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Snapshot.java
@@ -34,9 +34,6 @@ private Snapshot(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1332,7 +1329,7 @@ public Snapshot parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Snapshot(input, extensionRegistry);
+        return new Snapshot(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullRequest.java
index 1c9fff29b171..ff90912ace24 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullRequest.java
@@ -39,9 +39,6 @@ private StreamingPullRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1494,7 +1491,7 @@ public StreamingPullRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingPullRequest(input, extensionRegistry);
+        return new StreamingPullRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullResponse.java
index 6f32fa1685f3..4e460e8a2b17 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullResponse.java
@@ -34,9 +34,6 @@ private StreamingPullResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -815,7 +812,7 @@ public StreamingPullResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingPullResponse(input, extensionRegistry);
+        return new StreamingPullResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Subscription.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Subscription.java
index fad189d8082b..9655e72b010e 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Subscription.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Subscription.java
@@ -36,9 +36,6 @@ private Subscription(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1826,7 +1823,7 @@ public Subscription parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Subscription(input, extensionRegistry);
+        return new Subscription(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java
index 6ebdc7c1d2e5..533ce2e2c867 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java
@@ -33,9 +33,6 @@ private Topic(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -887,7 +884,7 @@ public Topic parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Topic(input, extensionRegistry);
+        return new Topic(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UntypedTopicName.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UntypedTopicName.java
index 7197c0348d87..b04f54c5c139 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UntypedTopicName.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UntypedTopicName.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -80,14 +79,6 @@ public String getFieldValue(String fieldName) {
     return valueMap.get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("UntypedTopicName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return rawValue;
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSnapshotRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSnapshotRequest.java
index 865b574fe79d..4b59d63f5922 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSnapshotRequest.java
@@ -32,9 +32,6 @@ private UpdateSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -846,7 +843,7 @@ public UpdateSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateSnapshotRequest(input, extensionRegistry);
+        return new UpdateSnapshotRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSubscriptionRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSubscriptionRequest.java
index 44bc150560ba..c15df7942b7d 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSubscriptionRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSubscriptionRequest.java
@@ -32,9 +32,6 @@ private UpdateSubscriptionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -846,7 +843,7 @@ public UpdateSubscriptionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateSubscriptionRequest(input, extensionRegistry);
+        return new UpdateSubscriptionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateTopicRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateTopicRequest.java
index cbe32588bc66..674500dd8cfb 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateTopicRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateTopicRequest.java
@@ -32,9 +32,6 @@ private UpdateTopicRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -846,7 +843,7 @@ public UpdateTopicRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateTopicRequest(input, extensionRegistry);
+        return new UpdateTopicRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java
index 200a261d78e8..d8c4dc026e70 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "isplay_name\030\002 \001(\t\022@\n\006labels\030\003 \003(\01320.goog" +
       "le.cloud.redis.v1beta1.Instance.LabelsEn" +
       "try\022\023\n\013location_id\030\004 \001(\t\022\037\n\027alternative_" +
-      "location_id\030\005 \001(\t\022\025\n\rredis_version\030\007 \001(\t" +
+      "location_id\030\005 \001(\t\022\025\n\rredis_version\030\007 \001(\t",
       "\022\031\n\021reserved_ip_range\030\t \001(\t\022\014\n\004host\030\n \001(" +
       "\t\022\014\n\004port\030\013 \001(\005\022\033\n\023current_location_id\030\014" +
       " \001(\t\022/\n\013create_time\030\r \001(\0132\032.google.proto" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "6.google.cloud.redis.v1beta1.Instance.Re" +
       "disConfigsEntry\0227\n\004tier\030\021 \001(\0162).google.c" +
       "loud.redis.v1beta1.Instance.Tier\022\026\n\016memo" +
-      "ry_size_gb\030\022 \001(\005\022\032\n\022authorized_network\030\024" +
+      "ry_size_gb\030\022 \001(\005\022\032\n\022authorized_network\030\024",
       " \001(\t\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu" +
       "e\030\002 \001(\t:\0028\001\0323\n\021RedisConfigsEntry\022\013\n\003key\030" +
       "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"s\n\005State\022\025\n\021STA" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "SPECIFIED\020\000\022\t\n\005BASIC\020\001\022\017\n\013STANDARD_HA\020\003\"" +
       "M\n\024ListInstancesRequest\022\016\n\006parent\030\001 \001(\t\022" +
       "\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"i" +
-      "\n\025ListInstancesResponse\0227\n\tinstances\030\001 \003" +
+      "\n\025ListInstancesResponse\0227\n\tinstances\030\001 \003",
       "(\0132$.google.cloud.redis.v1beta1.Instance" +
       "\022\027\n\017next_page_token\030\002 \001(\t\"\"\n\022GetInstance" +
       "Request\022\014\n\004name\030\001 \001(\t\"t\n\025CreateInstanceR" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "quest\022/\n\013update_mask\030\001 \001(\0132\032.google.prot" +
       "obuf.FieldMask\0226\n\010instance\030\002 \001(\0132$.googl" +
       "e.cloud.redis.v1beta1.Instance\"%\n\025Delete" +
-      "InstanceRequest\022\014\n\004name\030\001 \001(\t\"\316\001\n\020Locati" +
+      "InstanceRequest\022\014\n\004name\030\001 \001(\t\"\316\001\n\020Locati",
       "onMetadata\022Y\n\017available_zones\030\001 \003(\0132@.go" +
       "ogle.cloud.redis.v1beta1.LocationMetadat" +
       "a.AvailableZonesEntry\032_\n\023AvailableZonesE" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "stances\0220.google.cloud.redis.v1beta1.Lis" +
       "tInstancesRequest\0321.google.cloud.redis.v" +
       "1beta1.ListInstancesResponse\":\202\323\344\223\0024\0222/v" +
-      "1beta1/{parent=projects/*/locations/*}/i" +
+      "1beta1/{parent=projects/*/locations/*}/i",
       "nstances\022\237\001\n\013GetInstance\022..google.cloud." +
       "redis.v1beta1.GetInstanceRequest\032$.googl" +
       "e.cloud.redis.v1beta1.Instance\":\202\323\344\223\0024\0222" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "\032\035.google.longrunning.Operation\"D\202\323\344\223\002>\"" +
       "2/v1beta1/{parent=projects/*/locations/*" +
       "}/instances:\010instance\022\261\001\n\016UpdateInstance" +
-      "\0221.google.cloud.redis.v1beta1.UpdateInst" +
+      "\0221.google.cloud.redis.v1beta1.UpdateInst",
       "anceRequest\032\035.google.longrunning.Operati" +
       "on\"M\202\323\344\223\002G2;/v1beta1/{instance.name=proj" +
       "ects/*/locations/*/instances/*}:\010instanc" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "/{name=projects/*/locations/*/instances/" +
       "*}B\177\n\036com.google.cloud.redis.v1beta1B\032Cl" +
       "oudRedisServiceBetaProtoP\001Z?google.golan" +
-      "g.org/genproto/googleapis/cloud/redis/v1" +
+      "g.org/genproto/googleapis/cloud/redis/v1",
       "beta1;redisb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java
index 56a6b12756fb..d745a53d2bc6 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java
@@ -34,9 +34,6 @@ private CreateInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -971,7 +968,7 @@ public CreateInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateInstanceRequest(input, extensionRegistry);
+        return new CreateInstanceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java
index 1b5365ea21f3..f15a313d9770 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java
@@ -33,9 +33,6 @@ private DeleteInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public DeleteInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteInstanceRequest(input, extensionRegistry);
+        return new DeleteInstanceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java
index db517813a34f..44f705b13ce1 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java
@@ -33,9 +33,6 @@ private GetInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public GetInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetInstanceRequest(input, extensionRegistry);
+        return new GetInstanceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java
index ad98640e31ec..2682d0dc5366 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java
@@ -46,9 +46,6 @@ private Instance(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3705,7 +3702,7 @@ public Instance parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Instance(input, extensionRegistry);
+        return new Instance(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceName.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceName.java
index 5c58eba35d0a..4a3e24ada175 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceName.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/InstanceName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("InstanceName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "location", location, "instance", instance);
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java
index 0a6d555080a7..c3b5caa8553d 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java
@@ -35,9 +35,6 @@ private ListInstancesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -801,7 +798,7 @@ public ListInstancesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstancesRequest(input, extensionRegistry);
+        return new ListInstancesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java
index 9b017df46889..02bc1b058c68 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java
@@ -34,9 +34,6 @@ private ListInstancesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1162,7 +1159,7 @@ public ListInstancesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstancesResponse(input, extensionRegistry);
+        return new ListInstancesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadata.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadata.java
index 3ca322c73c60..a95b6f3af113 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadata.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadata.java
@@ -35,9 +35,6 @@ private LocationMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -733,7 +730,7 @@ public LocationMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LocationMetadata(input, extensionRegistry);
+        return new LocationMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationName.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationName.java
index 8c7985f17ef4..ec746144a133 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationName.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("LocationName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "location", location);
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequest.java
index ab093dd55e05..202432e34715 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequest.java
@@ -32,9 +32,6 @@ private UpdateInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -918,7 +915,7 @@ public UpdateInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateInstanceRequest(input, extensionRegistry);
+        return new UpdateInstanceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadata.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadata.java
index ca22ac749972..e589f9fa60de 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadata.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadata.java
@@ -33,9 +33,6 @@ private ZoneMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -377,7 +374,7 @@ public ZoneMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ZoneMetadata(input, extensionRegistry);
+        return new ZoneMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java
index d13bde17d11b..627d388315ad 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java
@@ -34,9 +34,6 @@ private CreateDatabaseMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -533,7 +530,7 @@ public CreateDatabaseMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDatabaseMetadata(input, extensionRegistry);
+        return new CreateDatabaseMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java
index 0b72a65d4223..2c09f083e21c 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java
@@ -35,9 +35,6 @@ private CreateDatabaseRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -987,7 +984,7 @@ public CreateDatabaseRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDatabaseRequest(input, extensionRegistry);
+        return new CreateDatabaseRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java
index 9446d9b37996..497ef2c9d393 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java
@@ -34,9 +34,6 @@ private Database(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -807,7 +804,7 @@ public Database parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Database(input, extensionRegistry);
+        return new Database(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DatabaseName.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DatabaseName.java
index 0006fba65ff1..b55b680af38e 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DatabaseName.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DatabaseName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("DatabaseName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance", instance, "database", database);
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java
index b920c5b675e1..29796aec2ac5 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java
@@ -33,9 +33,6 @@ private DropDatabaseRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -531,7 +528,7 @@ public DropDatabaseRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DropDatabaseRequest(input, extensionRegistry);
+        return new DropDatabaseRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java
index 0701b6212d0b..58adcb34a720 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java
@@ -33,9 +33,6 @@ private GetDatabaseDdlRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -531,7 +528,7 @@ public GetDatabaseDdlRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDatabaseDdlRequest(input, extensionRegistry);
+        return new GetDatabaseDdlRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlResponse.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlResponse.java
index 139b2e34c9e5..a9c71a736a2a 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlResponse.java
@@ -33,9 +33,6 @@ private GetDatabaseDdlResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -613,7 +610,7 @@ public GetDatabaseDdlResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDatabaseDdlResponse(input, extensionRegistry);
+        return new GetDatabaseDdlResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java
index f73cf7c9a528..34de6339ce73 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java
@@ -33,9 +33,6 @@ private GetDatabaseRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetDatabaseRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDatabaseRequest(input, extensionRegistry);
+        return new GetDatabaseRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/InstanceName.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/InstanceName.java
index b3618f92244b..a6d85988b151 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/InstanceName.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/InstanceName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("InstanceName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance", instance);
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesRequest.java
index 362ddbda1cb8..775f8739f1df 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesRequest.java
@@ -35,9 +35,6 @@ private ListDatabasesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -785,7 +782,7 @@ public ListDatabasesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDatabasesRequest(input, extensionRegistry);
+        return new ListDatabasesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesResponse.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesResponse.java
index 316f001e8653..d2593c24e3d4 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesResponse.java
@@ -34,9 +34,6 @@ private ListDatabasesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListDatabasesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDatabasesResponse(input, extensionRegistry);
+        return new ListDatabasesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/SpannerDatabaseAdminProto.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/SpannerDatabaseAdminProto.java
index 5eceb522b1d0..b798be9ec9a2 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/SpannerDatabaseAdminProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/SpannerDatabaseAdminProto.java
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "f/empty.proto\032\037google/protobuf/timestamp" +
       ".proto\"\222\001\n\010Database\022\014\n\004name\030\001 \001(\t\022?\n\005sta" +
       "te\030\002 \001(\01620.google.spanner.admin.database" +
-      ".v1.Database.State\"7\n\005State\022\025\n\021STATE_UNS" +
+      ".v1.Database.State\"7\n\005State\022\025\n\021STATE_UNS",
       "PECIFIED\020\000\022\014\n\010CREATING\020\001\022\t\n\005READY\020\002\"M\n\024L" +
       "istDatabasesRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\tp" +
       "age_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"o\n\025Li" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "abaseRequest\022\016\n\006parent\030\001 \001(\t\022\030\n\020create_s" +
       "tatement\030\002 \001(\t\022\030\n\020extra_statements\030\003 \003(\t" +
       "\"*\n\026CreateDatabaseMetadata\022\020\n\010database\030\001" +
-      " \001(\t\"\"\n\022GetDatabaseRequest\022\014\n\004name\030\001 \001(\t" +
+      " \001(\t\"\"\n\022GetDatabaseRequest\022\014\n\004name\030\001 \001(\t",
       "\"V\n\030UpdateDatabaseDdlRequest\022\020\n\010database" +
       "\030\001 \001(\t\022\022\n\nstatements\030\002 \003(\t\022\024\n\014operation_" +
       "id\030\003 \001(\t\"x\n\031UpdateDatabaseDdlMetadata\022\020\n" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "abase\030\001 \001(\t\")\n\025GetDatabaseDdlRequest\022\020\n\010" +
       "database\030\001 \001(\t\",\n\026GetDatabaseDdlResponse" +
       "\022\022\n\nstatements\030\001 \003(\t2\225\014\n\rDatabaseAdmin\022\267" +
-      "\001\n\rListDatabases\0226.google.spanner.admin." +
+      "\001\n\rListDatabases\0226.google.spanner.admin.",
       "database.v1.ListDatabasesRequest\0327.googl" +
       "e.spanner.admin.database.v1.ListDatabase" +
       "sResponse\"5\202\323\344\223\002/\022-/v1/{parent=projects/" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "g.Operation\"8\202\323\344\223\0022\"-/v1/{parent=project" +
       "s/*/instances/*}/databases:\001*\022\246\001\n\013GetDat" +
       "abase\0224.google.spanner.admin.database.v1" +
-      ".GetDatabaseRequest\032*.google.spanner.adm" +
+      ".GetDatabaseRequest\032*.google.spanner.adm",
       "in.database.v1.Database\"5\202\323\344\223\002/\022-/v1/{na" +
       "me=projects/*/instances/*/databases/*}\022\260" +
       "\001\n\021UpdateDatabaseDdl\022:.google.spanner.ad" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "tabases/*}/ddl:\001*\022\230\001\n\014DropDatabase\0225.goo" +
       "gle.spanner.admin.database.v1.DropDataba" +
       "seRequest\032\026.google.protobuf.Empty\"9\202\323\344\223\002" +
-      "3*1/v1/{database=projects/*/instances/*/" +
+      "3*1/v1/{database=projects/*/instances/*/",
       "databases/*}\022\302\001\n\016GetDatabaseDdl\0227.google" +
       ".spanner.admin.database.v1.GetDatabaseDd" +
       "lRequest\0328.google.spanner.admin.database" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "v1.SetIamPolicyRequest\032\025.google.iam.v1.P" +
       "olicy\"I\202\323\344\223\002C\">/v1/{resource=projects/*/" +
       "instances/*/databases/*}:setIamPolicy:\001*" +
-      "\022\224\001\n\014GetIamPolicy\022\".google.iam.v1.GetIam" +
+      "\022\224\001\n\014GetIamPolicy\022\".google.iam.v1.GetIam",
       "PolicyRequest\032\025.google.iam.v1.Policy\"I\202\323" +
       "\344\223\002C\">/v1/{resource=projects/*/instances" +
       "/*/databases/*}:getIamPolicy:\001*\022\272\001\n\022Test" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "ce=projects/*/instances/*/databases/*}:t" +
       "estIamPermissions:\001*B\337\001\n$com.google.span" +
       "ner.admin.database.v1B\031SpannerDatabaseAd" +
-      "minProtoP\001ZHgoogle.golang.org/genproto/g" +
+      "minProtoP\001ZHgoogle.golang.org/genproto/g",
       "oogleapis/spanner/admin/database/v1;data" +
       "base\252\002&Google.Cloud.Spanner.Admin.Databa" +
       "se.V1\312\002&Google\\Cloud\\Spanner\\Admin\\Datab" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlMetadata.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlMetadata.java
index 2d977d795aa1..93f35dffa6eb 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlMetadata.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlMetadata.java
@@ -36,9 +36,6 @@ private UpdateDatabaseDdlMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1254,7 +1251,7 @@ public UpdateDatabaseDdlMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateDatabaseDdlMetadata(input, extensionRegistry);
+        return new UpdateDatabaseDdlMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlRequest.java
index ff154714399a..eec60588ede0 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlRequest.java
@@ -49,9 +49,6 @@ private UpdateDatabaseDdlRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1053,7 +1050,7 @@ public UpdateDatabaseDdlRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateDatabaseDdlRequest(input, extensionRegistry);
+        return new UpdateDatabaseDdlRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceMetadata.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceMetadata.java
index d14901fd4402..dcc9f6b56eed 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceMetadata.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceMetadata.java
@@ -33,9 +33,6 @@ private CreateInstanceMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1342,7 +1339,7 @@ public CreateInstanceMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateInstanceMetadata(input, extensionRegistry);
+        return new CreateInstanceMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceRequest.java
index 0bf47a317cbf..1e6b5944cce9 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceRequest.java
@@ -34,9 +34,6 @@ private CreateInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -948,7 +945,7 @@ public CreateInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateInstanceRequest(input, extensionRegistry);
+        return new CreateInstanceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/DeleteInstanceRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/DeleteInstanceRequest.java
index 125fa92895a7..cf804b0d04ec 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/DeleteInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/DeleteInstanceRequest.java
@@ -33,9 +33,6 @@ private DeleteInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public DeleteInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteInstanceRequest(input, extensionRegistry);
+        return new DeleteInstanceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceConfigRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceConfigRequest.java
index 875024a65dee..1935657449e1 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceConfigRequest.java
@@ -34,9 +34,6 @@ private GetInstanceConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -540,7 +537,7 @@ public GetInstanceConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetInstanceConfigRequest(input, extensionRegistry);
+        return new GetInstanceConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceRequest.java
index ccf6abcd355b..b140931e8c66 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceRequest.java
@@ -33,9 +33,6 @@ private GetInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GetInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetInstanceRequest(input, extensionRegistry);
+        return new GetInstanceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java
index ac263887fcc2..3446ecd114d3 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java
@@ -37,9 +37,6 @@ private Instance(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1764,7 +1761,7 @@ public Instance parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Instance(input, extensionRegistry);
+        return new Instance(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfig.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfig.java
index 7179f2642355..b3a76cc91ff6 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfig.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfig.java
@@ -35,9 +35,6 @@ private InstanceConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -702,7 +699,7 @@ public InstanceConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InstanceConfig(input, extensionRegistry);
+        return new InstanceConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfigName.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfigName.java
index fb0c84087d1e..4e915da8d63a 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfigName.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfigName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("InstanceConfigName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance_config", instanceConfig);
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceName.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceName.java
index 3a3603a3b128..3b702f7f0faf 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceName.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("InstanceName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance", instance);
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsRequest.java
index a4138bc05c9b..fe59e9f76b8b 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsRequest.java
@@ -35,9 +35,6 @@ private ListInstanceConfigsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -792,7 +789,7 @@ public ListInstanceConfigsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstanceConfigsRequest(input, extensionRegistry);
+        return new ListInstanceConfigsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsResponse.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsResponse.java
index 4e0fa70ac22c..3114377c2dac 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsResponse.java
@@ -34,9 +34,6 @@ private ListInstanceConfigsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListInstanceConfigsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstanceConfigsResponse(input, extensionRegistry);
+        return new ListInstanceConfigsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesRequest.java
index 5e11149fb27c..b53a505d60b8 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesRequest.java
@@ -36,9 +36,6 @@ private ListInstancesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1045,7 +1042,7 @@ public ListInstancesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstancesRequest(input, extensionRegistry);
+        return new ListInstancesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesResponse.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesResponse.java
index f5bf0adca6e6..ef6b1156cbea 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesResponse.java
@@ -34,9 +34,6 @@ private ListInstancesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListInstancesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstancesResponse(input, extensionRegistry);
+        return new ListInstancesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ProjectName.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ProjectName.java
index 8d047d744e2f..234d9fc7b1bf 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java
index 63cefbced136..e599b2ccc6d0 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "f/empty.proto\032 google/protobuf/field_mas" +
       "k.proto\032\037google/protobuf/timestamp.proto" +
       "\"4\n\016InstanceConfig\022\014\n\004name\030\001 \001(\t\022\024\n\014disp" +
-      "lay_name\030\002 \001(\t\"\303\002\n\010Instance\022\014\n\004name\030\001 \001(" +
+      "lay_name\030\002 \001(\t\"\303\002\n\010Instance\022\014\n\004name\030\001 \001(",
       "\t\022\016\n\006config\030\002 \001(\t\022\024\n\014display_name\030\003 \001(\t\022" +
       "\022\n\nnode_count\030\005 \001(\005\022?\n\005state\030\006 \001(\01620.goo" +
       "gle.spanner.admin.instance.v1.Instance.S" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "\0028\001\"7\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\014\n\010C" +
       "REATING\020\001\022\t\n\005READY\020\002\"S\n\032ListInstanceConf" +
       "igsRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\tpage_size\030" +
-      "\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"\202\001\n\033ListInstan" +
+      "\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"\202\001\n\033ListInstan",
       "ceConfigsResponse\022J\n\020instance_configs\030\001 " +
       "\003(\01320.google.spanner.admin.instance.v1.I" +
       "nstanceConfig\022\027\n\017next_page_token\030\002 \001(\t\"(" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "\013instance_id\030\002 \001(\t\022<\n\010instance\030\003 \001(\0132*.g" +
       "oogle.spanner.admin.instance.v1.Instance" +
       "\"]\n\024ListInstancesRequest\022\016\n\006parent\030\001 \001(\t" +
-      "\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022" +
+      "\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022",
       "\016\n\006filter\030\004 \001(\t\"o\n\025ListInstancesResponse" +
       "\022=\n\tinstances\030\001 \003(\0132*.google.spanner.adm" +
       "in.instance.v1.Instance\022\027\n\017next_page_tok" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "oogle.protobuf.FieldMask\"%\n\025DeleteInstan" +
       "ceRequest\022\014\n\004name\030\001 \001(\t\"\345\001\n\026CreateInstan" +
       "ceMetadata\022<\n\010instance\030\001 \001(\0132*.google.sp" +
-      "anner.admin.instance.v1.Instance\022.\n\nstar" +
+      "anner.admin.instance.v1.Instance\022.\n\nstar",
       "t_time\030\002 \001(\0132\032.google.protobuf.Timestamp" +
       "\022/\n\013cancel_time\030\003 \001(\0132\032.google.protobuf." +
       "Timestamp\022,\n\010end_time\030\004 \001(\0132\032.google.pro" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       " \001(\0132\032.google.protobuf.Timestamp\022/\n\013canc" +
       "el_time\030\003 \001(\0132\032.google.protobuf.Timestam" +
       "p\022,\n\010end_time\030\004 \001(\0132\032.google.protobuf.Ti" +
-      "mestamp2\346\014\n\rInstanceAdmin\022\303\001\n\023ListInstan" +
+      "mestamp2\346\014\n\rInstanceAdmin\022\303\001\n\023ListInstan",
       "ceConfigs\022<.google.spanner.admin.instanc" +
       "e.v1.ListInstanceConfigsRequest\032=.google" +
       ".spanner.admin.instance.v1.ListInstanceC" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       ".GetInstanceConfigRequest\0320.google.spann" +
       "er.admin.instance.v1.InstanceConfig\"/\202\323\344" +
       "\223\002)\022\'/v1/{name=projects/*/instanceConfig" +
-      "s/*}\022\253\001\n\rListInstances\0226.google.spanner." +
+      "s/*}\022\253\001\n\rListInstances\0226.google.spanner.",
       "admin.instance.v1.ListInstancesRequest\0327" +
       ".google.spanner.admin.instance.v1.ListIn" +
       "stancesResponse\")\202\323\344\223\002#\022!/v1/{parent=pro" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       ".v1.Instance\")\202\323\344\223\002#\022!/v1/{name=projects" +
       "/*/instances/*}\022\226\001\n\016CreateInstance\0227.goo" +
       "gle.spanner.admin.instance.v1.CreateInst" +
-      "anceRequest\032\035.google.longrunning.Operati" +
+      "anceRequest\032\035.google.longrunning.Operati",
       "on\",\202\323\344\223\002&\"!/v1/{parent=projects/*}/inst" +
       "ances:\001*\022\237\001\n\016UpdateInstance\0227.google.spa" +
       "nner.admin.instance.v1.UpdateInstanceReq" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "panner.admin.instance.v1.DeleteInstanceR" +
       "equest\032\026.google.protobuf.Empty\")\202\323\344\223\002#*!" +
       "/v1/{name=projects/*/instances/*}\022\210\001\n\014Se" +
-      "tIamPolicy\022\".google.iam.v1.SetIamPolicyR" +
+      "tIamPolicy\022\".google.iam.v1.SetIamPolicyR",
       "equest\032\025.google.iam.v1.Policy\"=\202\323\344\223\0027\"2/" +
       "v1/{resource=projects/*/instances/*}:set" +
       "IamPolicy:\001*\022\210\001\n\014GetIamPolicy\022\".google.i" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "IamPermissions\022(.google.iam.v1.TestIamPe" +
       "rmissionsRequest\032).google.iam.v1.TestIam" +
       "PermissionsResponse\"C\202\323\344\223\002=\"8/v1/{resour" +
-      "ce=projects/*/instances/*}:testIamPermis" +
+      "ce=projects/*/instances/*}:testIamPermis",
       "sions:\001*B\337\001\n$com.google.spanner.admin.in" +
       "stance.v1B\031SpannerInstanceAdminProtoP\001ZH" +
       "google.golang.org/genproto/googleapis/sp" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceMetadata.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceMetadata.java
index a60284c2baec..73f37986ac67 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceMetadata.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceMetadata.java
@@ -33,9 +33,6 @@ private UpdateInstanceMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1330,7 +1327,7 @@ public UpdateInstanceMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateInstanceMetadata(input, extensionRegistry);
+        return new UpdateInstanceMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceRequest.java
index 62e403455dfc..5d19c79b9b64 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceRequest.java
@@ -32,9 +32,6 @@ private UpdateInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -882,7 +879,7 @@ public UpdateInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateInstanceRequest(input, extensionRegistry);
+        return new UpdateInstanceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java
index a0442a322a59..7f2f87790af7 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java
@@ -33,9 +33,6 @@ private BeginTransactionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -760,7 +757,7 @@ public BeginTransactionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BeginTransactionRequest(input, extensionRegistry);
+        return new BeginTransactionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java
index 0f47dda43ed1..63d08a354d1a 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java
@@ -34,9 +34,6 @@ private CommitRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1524,7 +1521,7 @@ public CommitRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitRequest(input, extensionRegistry);
+        return new CommitRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
index 83b128f7ca37..f9515517176b 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
@@ -32,9 +32,6 @@ private CommitResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public CommitResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitResponse(input, extensionRegistry);
+        return new CommitResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java
index c5a3ba5e39db..754271d527ad 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java
@@ -33,9 +33,6 @@ private CreateSessionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -760,7 +757,7 @@ public CreateSessionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateSessionRequest(input, extensionRegistry);
+        return new CreateSessionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DatabaseName.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DatabaseName.java
index 5766e39ce51a..812530abd41d 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DatabaseName.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DatabaseName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("DatabaseName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance", instance, "database", database);
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java
index d1b4de5f4873..b8b962d91a69 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java
@@ -33,9 +33,6 @@ private DeleteSessionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -531,7 +528,7 @@ public DeleteSessionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSessionRequest(input, extensionRegistry);
+        return new DeleteSessionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
index 0e846b65835d..0e98592542e6 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
@@ -38,9 +38,6 @@ private ExecuteSqlRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2117,7 +2114,7 @@ public ExecuteSqlRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExecuteSqlRequest(input, extensionRegistry);
+        return new ExecuteSqlRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java
index 3a5b561f9fef..db787f7feac5 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java
@@ -33,9 +33,6 @@ private GetSessionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -531,7 +528,7 @@ public GetSessionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSessionRequest(input, extensionRegistry);
+        return new GetSessionRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java
index 75e291cab27b..f7e84ecf6679 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java
@@ -91,9 +91,6 @@ private KeyRange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1686,7 +1683,7 @@ public KeyRange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new KeyRange(input, extensionRegistry);
+        return new KeyRange(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java
index e498fbe0c9f9..bb41e26e73f3 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java
@@ -40,9 +40,6 @@ private KeySet(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1436,7 +1433,7 @@ public KeySet parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new KeySet(input, extensionRegistry);
+        return new KeySet(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
index 69abe598b1fd..ed750411ee2e 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
@@ -42,7 +42,7 @@ public static void registerAllExtensions(
       " \001(\0132\032.google.protobuf.ListValueH\001\022.\n\010en" +
       "d_open\030\004 \001(\0132\032.google.protobuf.ListValue" +
       "H\001B\020\n\016start_key_typeB\016\n\014end_key_type\"l\n\006" +
-      "KeySet\022(\n\004keys\030\001 \003(\0132\032.google.protobuf.L" +
+      "KeySet\022(\n\004keys\030\001 \003(\0132\032.google.protobuf.L",
       "istValue\022+\n\006ranges\030\002 \003(\0132\033.google.spanne" +
       "r.v1.KeyRange\022\013\n\003all\030\003 \001(\010B\222\001\n\025com.googl" +
       "e.spanner.v1B\tKeysProtoP\001Z8google.golang" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java
index fcf19b63d0d4..96abc593d82a 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java
@@ -36,9 +36,6 @@ private ListSessionsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -975,7 +972,7 @@ public ListSessionsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSessionsRequest(input, extensionRegistry);
+        return new ListSessionsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java
index 6f67b619eefa..eb8175453ad5 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java
@@ -34,9 +34,6 @@ private ListSessionsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListSessionsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSessionsResponse(input, extensionRegistry);
+        return new ListSessionsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java
index a3159e675ab3..1fd97977fa35 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java
@@ -34,9 +34,6 @@ private Mutation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -330,9 +327,6 @@ private Write(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1689,7 +1683,7 @@ public Write parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Write(input, extensionRegistry);
+          return new Write(input, extensionRegistry);
       }
     };
 
@@ -1791,9 +1785,6 @@ private Delete(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2542,7 +2533,7 @@ public Delete parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Delete(input, extensionRegistry);
+          return new Delete(input, extensionRegistry);
       }
     };
 
@@ -4216,7 +4207,7 @@ public Mutation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Mutation(input, extensionRegistry);
+        return new Mutation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
index f4f4520157e1..02bbed72b70f 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "er.v1.Mutation.WriteH\000\022=\n\020insert_or_upda" +
       "te\030\003 \001(\0132!.google.spanner.v1.Mutation.Wr" +
       "iteH\000\0224\n\007replace\030\004 \001(\0132!.google.spanner." +
-      "v1.Mutation.WriteH\000\0224\n\006delete\030\005 \001(\0132\".go" +
+      "v1.Mutation.WriteH\000\0224\n\006delete\030\005 \001(\0132\".go",
       "ogle.spanner.v1.Mutation.DeleteH\000\032S\n\005Wri" +
       "te\022\r\n\005table\030\001 \001(\t\022\017\n\007columns\030\002 \003(\t\022*\n\006va" +
       "lues\030\003 \003(\0132\032.google.protobuf.ListValue\032C" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java
index cd8675a853fc..2aa0dba01c97 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java
@@ -37,9 +37,6 @@ private PartialResultSet(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2836,7 +2833,7 @@ public PartialResultSet parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartialResultSet(input, extensionRegistry);
+        return new PartialResultSet(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java
index 1c34f1f69682..ff9c082f67c2 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java
@@ -34,9 +34,6 @@ private Partition(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -463,7 +460,7 @@ public Partition parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Partition(input, extensionRegistry);
+        return new Partition(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java
index ca7f07b13c22..1760eaa2a208 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java
@@ -35,9 +35,6 @@ private PartitionOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -568,7 +565,7 @@ public PartitionOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartitionOptions(input, extensionRegistry);
+        return new PartitionOptions(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java
index a7410da6b4f4..9796f848351b 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java
@@ -34,9 +34,6 @@ private PartitionQueryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1927,7 +1924,7 @@ public PartitionQueryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartitionQueryRequest(input, extensionRegistry);
+        return new PartitionQueryRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java
index 5c74e59694d6..b9f8db06824e 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java
@@ -36,9 +36,6 @@ private PartitionReadRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1854,7 +1851,7 @@ public PartitionReadRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartitionReadRequest(input, extensionRegistry);
+        return new PartitionReadRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java
index 770161874bba..c3f0de0e8ec1 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java
@@ -34,9 +34,6 @@ private PartitionResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1047,7 +1044,7 @@ public PartitionResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartitionResponse(input, extensionRegistry);
+        return new PartitionResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java
index 68955d5e8f8a..b3de4d36d0f4 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java
@@ -36,9 +36,6 @@ private PlanNode(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -397,9 +394,6 @@ private ChildLink(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1193,7 +1187,7 @@ public ChildLink parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ChildLink(input, extensionRegistry);
+          return new ChildLink(input, extensionRegistry);
       }
     };
 
@@ -1339,9 +1333,6 @@ private ShortRepresentation(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2203,7 +2194,7 @@ public ShortRepresentation parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ShortRepresentation(input, extensionRegistry);
+          return new ShortRepresentation(input, extensionRegistry);
       }
     };
 
@@ -4052,7 +4043,7 @@ public PlanNode parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PlanNode(input, extensionRegistry);
+        return new PlanNode(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java
index bf4fa2c8dcfd..56fd9b3baee5 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java
@@ -33,9 +33,6 @@ private QueryPlan(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -859,7 +856,7 @@ public QueryPlan parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryPlan(input, extensionRegistry);
+        return new QueryPlan(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
index 464479925fe3..6acef748bb78 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "gle.spanner.v1.PlanNode.ChildLink\022M\n\024sho" +
       "rt_representation\030\005 \001(\0132/.google.spanner" +
       ".v1.PlanNode.ShortRepresentation\022)\n\010meta" +
-      "data\030\006 \001(\0132\027.google.protobuf.Struct\0220\n\017e" +
+      "data\030\006 \001(\0132\027.google.protobuf.Struct\0220\n\017e",
       "xecution_stats\030\007 \001(\0132\027.google.protobuf.S" +
       "truct\032@\n\tChildLink\022\023\n\013child_index\030\001 \001(\005\022" +
       "\014\n\004type\030\002 \001(\t\022\020\n\010variable\030\003 \001(\t\032\262\001\n\023Shor" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "y\0321\n\017SubqueriesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" +
       "ue\030\002 \001(\005:\0028\001\"8\n\004Kind\022\024\n\020KIND_UNSPECIFIED" +
       "\020\000\022\016\n\nRELATIONAL\020\001\022\n\n\006SCALAR\020\002\"<\n\tQueryP" +
-      "lan\022/\n\nplan_nodes\030\001 \003(\0132\033.google.spanner" +
+      "lan\022/\n\nplan_nodes\030\001 \003(\0132\033.google.spanner",
       ".v1.PlanNodeB\227\001\n\025com.google.spanner.v1B\016" +
       "QueryPlanProtoP\001Z8google.golang.org/genp" +
       "roto/googleapis/spanner/v1;spanner\252\002\027Goo" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java
index 899c9c6c102b..46b017d100b3 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java
@@ -40,9 +40,6 @@ private ReadRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1944,7 +1941,7 @@ public ReadRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadRequest(input, extensionRegistry);
+        return new ReadRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java
index 222ea8d90c4b..eaeaaf441080 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java
@@ -34,9 +34,6 @@ private ResultSet(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1415,7 +1412,7 @@ public ResultSet parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ResultSet(input, extensionRegistry);
+        return new ResultSet(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java
index 52d004771850..88d7a5ad477d 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java
@@ -32,9 +32,6 @@ private ResultSetMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -918,7 +915,7 @@ public ResultSetMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ResultSetMetadata(input, extensionRegistry);
+        return new ResultSetMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
index 03323009f4bc..7adc5fe6dd9a 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "data\030\001 \001(\0132$.google.spanner.v1.ResultSet" +
       "Metadata\022(\n\004rows\030\002 \003(\0132\032.google.protobuf" +
       ".ListValue\0220\n\005stats\030\003 \001(\0132!.google.spann" +
-      "er.v1.ResultSetStats\"\321\001\n\020PartialResultSe" +
+      "er.v1.ResultSetStats\"\321\001\n\020PartialResultSe",
       "t\0226\n\010metadata\030\001 \001(\0132$.google.spanner.v1." +
       "ResultSetMetadata\022&\n\006values\030\002 \003(\0132\026.goog" +
       "le.protobuf.Value\022\025\n\rchunked_value\030\003 \001(\010" +
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       ".spanner.v1.StructType\0223\n\013transaction\030\002 " +
       "\001(\0132\036.google.spanner.v1.Transaction\"p\n\016R" +
       "esultSetStats\0220\n\nquery_plan\030\001 \001(\0132\034.goog" +
-      "le.spanner.v1.QueryPlan\022,\n\013query_stats\030\002" +
+      "le.spanner.v1.QueryPlan\022,\n\013query_stats\030\002",
       " \001(\0132\027.google.protobuf.StructB\232\001\n\025com.go" +
       "ogle.spanner.v1B\016ResultSetProtoP\001Z8googl" +
       "e.golang.org/genproto/googleapis/spanner" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java
index 2d066e685ac8..b84fecbacef7 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java
@@ -32,9 +32,6 @@ private ResultSetStats(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -918,7 +915,7 @@ public ResultSetStats parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ResultSetStats(input, extensionRegistry);
+        return new ResultSetStats(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java
index bab5b4ccb1bd..739f293cb6bf 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java
@@ -34,9 +34,6 @@ private RollbackRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -608,7 +605,7 @@ public RollbackRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RollbackRequest(input, extensionRegistry);
+        return new RollbackRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java
index 2a772cdb1699..51d0f7c48301 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java
@@ -33,9 +33,6 @@ private Session(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1395,7 +1392,7 @@ public Session parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Session(input, extensionRegistry);
+        return new Session(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SessionName.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SessionName.java
index 9be500d608bb..4a93138e08b1 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SessionName.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SessionName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -140,14 +139,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("SessionName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance", instance, "database", database, "session", session);
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
index 2f3ca6d3e93f..b5557d4ceda6 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "google/spanner/v1/result_set.proto\032#goog" +
       "le/spanner/v1/transaction.proto\032\034google/" +
       "spanner/v1/type.proto\"U\n\024CreateSessionRe" +
-      "quest\022\020\n\010database\030\001 \001(\t\022+\n\007session\030\002 \001(\013" +
+      "quest\022\020\n\010database\030\001 \001(\t\022+\n\007session\030\002 \001(\013",
       "2\032.google.spanner.v1.Session\"\356\001\n\007Session" +
       "\022\014\n\004name\030\001 \001(\t\0226\n\006labels\030\002 \003(\0132&.google." +
       "spanner.v1.Session.LabelsEntry\022/\n\013create" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"!\n\021GetSess" +
       "ionRequest\022\014\n\004name\030\001 \001(\t\"^\n\023ListSessions" +
       "Request\022\020\n\010database\030\001 \001(\t\022\021\n\tpage_size\030\002" +
-      " \001(\005\022\022\n\npage_token\030\003 \001(\t\022\016\n\006filter\030\004 \001(\t" +
+      " \001(\005\022\022\n\npage_token\030\003 \001(\t\022\016\n\006filter\030\004 \001(\t",
       "\"]\n\024ListSessionsResponse\022,\n\010sessions\030\001 \003" +
       "(\0132\032.google.spanner.v1.Session\022\027\n\017next_p" +
       "age_token\030\002 \001(\t\"$\n\024DeleteSessionRequest\022" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "\030\003 \001(\t\022\'\n\006params\030\004 \001(\0132\027.google.protobuf" +
       ".Struct\022I\n\013param_types\030\005 \003(\01324.google.sp" +
       "anner.v1.ExecuteSqlRequest.ParamTypesEnt" +
-      "ry\022\024\n\014resume_token\030\006 \001(\014\022B\n\nquery_mode\030\007" +
+      "ry\022\024\n\014resume_token\030\006 \001(\014\022B\n\nquery_mode\030\007",
       " \001(\0162..google.spanner.v1.ExecuteSqlReque" +
       "st.QueryMode\022\027\n\017partition_token\030\010 \001(\014\032J\n" +
       "\017ParamTypesEntry\022\013\n\003key\030\001 \001(\t\022&\n\005value\030\002" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "bytes\030\001 \001(\003\022\026\n\016max_partitions\030\002 \001(\003\"\366\002\n\025" +
       "PartitionQueryRequest\022\017\n\007session\030\001 \001(\t\022;" +
       "\n\013transaction\030\002 \001(\0132&.google.spanner.v1." +
-      "TransactionSelector\022\013\n\003sql\030\003 \001(\t\022\'\n\006para" +
+      "TransactionSelector\022\013\n\003sql\030\003 \001(\t\022\'\n\006para",
       "ms\030\004 \001(\0132\027.google.protobuf.Struct\022M\n\013par" +
       "am_types\030\005 \003(\01328.google.spanner.v1.Parti" +
       "tionQueryRequest.ParamTypesEntry\022>\n\021part" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       ".v1.Type:\0028\001\"\377\001\n\024PartitionReadRequest\022\017\n" +
       "\007session\030\001 \001(\t\022;\n\013transaction\030\002 \001(\0132&.go" +
       "ogle.spanner.v1.TransactionSelector\022\r\n\005t" +
-      "able\030\003 \001(\t\022\r\n\005index\030\004 \001(\t\022\017\n\007columns\030\005 \003" +
+      "able\030\003 \001(\t\022\r\n\005index\030\004 \001(\t\022\017\n\007columns\030\005 \003",
       "(\t\022*\n\007key_set\030\006 \001(\0132\031.google.spanner.v1." +
       "KeySet\022>\n\021partition_options\030\t \001(\0132#.goog" +
       "le.spanner.v1.PartitionOptions\"$\n\tPartit" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "2\036.google.spanner.v1.Transaction\"\364\001\n\013Rea" +
       "dRequest\022\017\n\007session\030\001 \001(\t\022;\n\013transaction" +
       "\030\002 \001(\0132&.google.spanner.v1.TransactionSe" +
-      "lector\022\r\n\005table\030\003 \001(\t\022\r\n\005index\030\004 \001(\t\022\017\n\007" +
+      "lector\022\r\n\005table\030\003 \001(\t\022\r\n\005index\030\004 \001(\t\022\017\n\007",
       "columns\030\005 \003(\t\022*\n\007key_set\030\006 \001(\0132\031.google." +
       "spanner.v1.KeySet\022\r\n\005limit\030\010 \001(\003\022\024\n\014resu" +
       "me_token\030\t \001(\014\022\027\n\017partition_token\030\n \001(\014\"" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "\007session\030\001 \001(\t\022\030\n\016transaction_id\030\002 \001(\014H\000" +
       "\022G\n\026single_use_transaction\030\003 \001(\0132%.googl" +
       "e.spanner.v1.TransactionOptionsH\000\022.\n\tmut" +
-      "ations\030\004 \003(\0132\033.google.spanner.v1.Mutatio" +
+      "ations\030\004 \003(\0132\033.google.spanner.v1.Mutatio",
       "nB\r\n\013transaction\"F\n\016CommitResponse\0224\n\020co" +
       "mmit_timestamp\030\001 \001(\0132\032.google.protobuf.T" +
       "imestamp\":\n\017RollbackRequest\022\017\n\007session\030\001" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "Session\"E\202\323\344\223\002?\":/v1/{database=projects/" +
       "*/instances/*/databases/*}/sessions:\001*\022\220" +
       "\001\n\nGetSession\022$.google.spanner.v1.GetSes" +
-      "sionRequest\032\032.google.spanner.v1.Session\"" +
+      "sionRequest\032\032.google.spanner.v1.Session\"",
       "@\202\323\344\223\002:\0228/v1/{name=projects/*/instances/" +
       "*/databases/*/sessions/*}\022\243\001\n\014ListSessio" +
       "ns\022&.google.spanner.v1.ListSessionsReque" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "teSession\022\'.google.spanner.v1.DeleteSess" +
       "ionRequest\032\026.google.protobuf.Empty\"@\202\323\344\223" +
       "\002:*8/v1/{name=projects/*/instances/*/dat" +
-      "abases/*/sessions/*}\022\243\001\n\nExecuteSql\022$.go" +
+      "abases/*/sessions/*}\022\243\001\n\nExecuteSql\022$.go",
       "ogle.spanner.v1.ExecuteSqlRequest\032\034.goog" +
       "le.spanner.v1.ResultSet\"Q\202\323\344\223\002K\"F/v1/{se" +
       "ssion=projects/*/instances/*/databases/*" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "ltSet\"Z\202\323\344\223\002T\"O/v1/{session=projects/*/i" +
       "nstances/*/databases/*/sessions/*}:execu" +
       "teStreamingSql:\001*0\001\022\221\001\n\004Read\022\036.google.sp" +
-      "anner.v1.ReadRequest\032\034.google.spanner.v1" +
+      "anner.v1.ReadRequest\032\034.google.spanner.v1",
       ".ResultSet\"K\202\323\344\223\002E\"@/v1/{session=project" +
       "s/*/instances/*/databases/*/sessions/*}:" +
       "read:\001*\022\254\001\n\rStreamingRead\022\036.google.spann" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "/*}:streamingRead:\001*0\001\022\267\001\n\020BeginTransact" +
       "ion\022*.google.spanner.v1.BeginTransaction" +
       "Request\032\036.google.spanner.v1.Transaction\"" +
-      "W\202\323\344\223\002Q\"L/v1/{session=projects/*/instanc" +
+      "W\202\323\344\223\002Q\"L/v1/{session=projects/*/instanc",
       "es/*/databases/*/sessions/*}:beginTransa" +
       "ction:\001*\022\234\001\n\006Commit\022 .google.spanner.v1." +
       "CommitRequest\032!.google.spanner.v1.Commit" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       ".RollbackRequest\032\026.google.protobuf.Empty" +
       "\"O\202\323\344\223\002I\"D/v1/{session=projects/*/instan" +
       "ces/*/databases/*/sessions/*}:rollback:\001" +
-      "*\022\267\001\n\016PartitionQuery\022(.google.spanner.v1" +
+      "*\022\267\001\n\016PartitionQuery\022(.google.spanner.v1",
       ".PartitionQueryRequest\032$.google.spanner." +
       "v1.PartitionResponse\"U\202\323\344\223\002O\"J/v1/{sessi" +
       "on=projects/*/instances/*/databases/*/se" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "onse\"T\202\323\344\223\002N\"I/v1/{session=projects/*/in" +
       "stances/*/databases/*/sessions/*}:partit" +
       "ionRead:\001*B\225\001\n\025com.google.spanner.v1B\014Sp" +
-      "annerProtoP\001Z8google.golang.org/genproto" +
+      "annerProtoP\001Z8google.golang.org/genproto",
       "/googleapis/spanner/v1;spanner\252\002\027Google." +
       "Cloud.Spanner.V1\312\002\027Google\\Cloud\\Spanner\\" +
       "V1b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructType.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructType.java
index 40ec57dca635..5015086195c6 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructType.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructType.java
@@ -33,9 +33,6 @@ private StructType(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -179,9 +176,6 @@ private Field(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -948,7 +942,7 @@ public Field parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Field(input, extensionRegistry);
+          return new Field(input, extensionRegistry);
       }
     };
 
@@ -1805,7 +1799,7 @@ public StructType parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StructType(input, extensionRegistry);
+        return new StructType(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java
index 29ec6c63bd52..11117a914895 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java
@@ -33,9 +33,6 @@ private Transaction(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -754,7 +751,7 @@ public Transaction parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Transaction(input, extensionRegistry);
+        return new Transaction(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java
index 64a79ee4c36e..154f28eb87aa 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java
@@ -199,9 +199,6 @@ private TransactionOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -306,9 +303,6 @@ private ReadWrite(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -650,7 +644,7 @@ public ReadWrite parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadWrite(input, extensionRegistry);
+          return new ReadWrite(input, extensionRegistry);
       }
     };
 
@@ -924,9 +918,6 @@ private ReadOnly(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2911,7 +2902,7 @@ public ReadOnly parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadOnly(input, extensionRegistry);
+          return new ReadOnly(input, extensionRegistry);
       }
     };
 
@@ -4012,7 +4003,7 @@ public TransactionOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransactionOptions(input, extensionRegistry);
+        return new TransactionOptions(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
index 7b6500bb2cbb..564f783cae68 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "iteH\000\022C\n\tread_only\030\002 \001(\0132..google.spanne" +
       "r.v1.TransactionOptions.ReadOnlyH\000\032\013\n\tRe" +
       "adWrite\032\250\002\n\010ReadOnly\022\020\n\006strong\030\001 \001(\010H\000\0228" +
-      "\n\022min_read_timestamp\030\002 \001(\0132\032.google.prot" +
+      "\n\022min_read_timestamp\030\002 \001(\0132\032.google.prot",
       "obuf.TimestampH\000\0222\n\rmax_staleness\030\003 \001(\0132" +
       "\031.google.protobuf.DurationH\000\0224\n\016read_tim" +
       "estamp\030\004 \001(\0132\032.google.protobuf.Timestamp" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "ansaction\022\n\n\002id\030\001 \001(\014\0222\n\016read_timestamp\030" +
       "\002 \001(\0132\032.google.protobuf.Timestamp\"\244\001\n\023Tr" +
       "ansactionSelector\022;\n\nsingle_use\030\001 \001(\0132%." +
-      "google.spanner.v1.TransactionOptionsH\000\022\014" +
+      "google.spanner.v1.TransactionOptionsH\000\022\014",
       "\n\002id\030\002 \001(\014H\000\0226\n\005begin\030\003 \001(\0132%.google.spa" +
       "nner.v1.TransactionOptionsH\000B\n\n\010selector" +
       "B\231\001\n\025com.google.spanner.v1B\020TransactionP" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java
index 64552135db7f..def26a6861b5 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java
@@ -35,9 +35,6 @@ private TransactionSelector(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1093,7 +1090,7 @@ public TransactionSelector parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransactionSelector(input, extensionRegistry);
+        return new TransactionSelector(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java
index e23aa5a06598..809503aa0a61 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java
@@ -34,9 +34,6 @@ private Type(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -971,7 +968,7 @@ public Type parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Type(input, extensionRegistry);
+        return new Type(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
index 8125a0200c6b..111633f69b26 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "StructType\0223\n\006fields\030\001 \003(\0132#.google.span" +
       "ner.v1.StructType.Field\032<\n\005Field\022\014\n\004name" +
       "\030\001 \001(\t\022%\n\004type\030\002 \001(\0132\027.google.spanner.v1" +
-      ".Type*\216\001\n\010TypeCode\022\031\n\025TYPE_CODE_UNSPECIF" +
+      ".Type*\216\001\n\010TypeCode\022\031\n\025TYPE_CODE_UNSPECIF",
       "IED\020\000\022\010\n\004BOOL\020\001\022\t\n\005INT64\020\002\022\013\n\007FLOAT64\020\003\022" +
       "\r\n\tTIMESTAMP\020\004\022\010\n\004DATE\020\005\022\n\n\006STRING\020\006\022\t\n\005" +
       "BYTES\020\007\022\t\n\005ARRAY\020\010\022\n\n\006STRUCT\020\tB\222\001\n\025com.g" +
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeMetadata.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeMetadata.java
index 49d25a9e79b3..5b3dc9c8c8e8 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeMetadata.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeMetadata.java
@@ -35,9 +35,6 @@ private LongRunningRecognizeMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -916,7 +913,7 @@ public LongRunningRecognizeMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LongRunningRecognizeMetadata(input, extensionRegistry);
+        return new LongRunningRecognizeMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeRequest.java
index e21e11a66000..98ddf30fc438 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeRequest.java
@@ -33,9 +33,6 @@ private LongRunningRecognizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -848,7 +845,7 @@ public LongRunningRecognizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LongRunningRecognizeRequest(input, extensionRegistry);
+        return new LongRunningRecognizeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponse.java
index add5c116a0ec..d7544914bebc 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponse.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponse.java
@@ -37,9 +37,6 @@ private LongRunningRecognizeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -844,7 +841,7 @@ public LongRunningRecognizeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LongRunningRecognizeResponse(input, extensionRegistry);
+        return new LongRunningRecognizeResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudio.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudio.java
index 58c8bc33572b..ea2a48111f79 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudio.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudio.java
@@ -35,9 +35,6 @@ private RecognitionAudio(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -766,7 +763,7 @@ public RecognitionAudio parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognitionAudio(input, extensionRegistry);
+        return new RecognitionAudio(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfig.java
index 60835cbfdd72..dacb2b984a6e 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfig.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfig.java
@@ -40,9 +40,6 @@ private RecognitionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1736,7 +1733,7 @@ public RecognitionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognitionConfig(input, extensionRegistry);
+        return new RecognitionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeRequest.java
index 1e0c205f7144..2769b538033d 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeRequest.java
@@ -32,9 +32,6 @@ private RecognizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -846,7 +843,7 @@ public RecognizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognizeRequest(input, extensionRegistry);
+        return new RecognizeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponse.java
index 7923e92835b7..e212bba5c1ab 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponse.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponse.java
@@ -35,9 +35,6 @@ private RecognizeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -840,7 +837,7 @@ public RecognizeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognizeResponse(input, extensionRegistry);
+        return new RecognizeResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContext.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContext.java
index b721ecaaee68..fb7dbc0a6fd5 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContext.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContext.java
@@ -34,9 +34,6 @@ private SpeechContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -667,7 +664,7 @@ public SpeechContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechContext(input, extensionRegistry);
+        return new SpeechContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechProto.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechProto.java
index ddf58b5f1623..13e4b7a22f5f 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechProto.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechProto.java
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "tatus.proto\"\206\001\n\020RecognizeRequest\0229\n\006conf" +
       "ig\030\001 \001(\0132).google.cloud.speech.v1.Recogn" +
       "itionConfig\0227\n\005audio\030\002 \001(\0132(.google.clou" +
-      "d.speech.v1.RecognitionAudio\"\221\001\n\033LongRun" +
+      "d.speech.v1.RecognitionAudio\"\221\001\n\033LongRun",
       "ningRecognizeRequest\0229\n\006config\030\001 \001(\0132).g" +
       "oogle.cloud.speech.v1.RecognitionConfig\022" +
       "7\n\005audio\030\002 \001(\0132(.google.cloud.speech.v1." +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "nfigH\000\022\027\n\raudio_content\030\002 \001(\014H\000B\023\n\021strea" +
       "ming_request\"\212\001\n\032StreamingRecognitionCon" +
       "fig\0229\n\006config\030\001 \001(\0132).google.cloud.speec" +
-      "h.v1.RecognitionConfig\022\030\n\020single_utteran" +
+      "h.v1.RecognitionConfig\022\030\n\020single_utteran",
       "ce\030\002 \001(\010\022\027\n\017interim_results\030\003 \001(\010\"\264\003\n\021Re" +
       "cognitionConfig\022I\n\010encoding\030\001 \001(\01627.goog" +
       "le.cloud.speech.v1.RecognitionConfig.Aud" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "ch_contexts\030\006 \003(\0132%.google.cloud.speech." +
       "v1.SpeechContext\022 \n\030enable_word_time_off" +
       "sets\030\010 \001(\010\"\213\001\n\rAudioEncoding\022\030\n\024ENCODING" +
-      "_UNSPECIFIED\020\000\022\014\n\010LINEAR16\020\001\022\010\n\004FLAC\020\002\022\t" +
+      "_UNSPECIFIED\020\000\022\014\n\010LINEAR16\020\001\022\010\n\004FLAC\020\002\022\t",
       "\n\005MULAW\020\003\022\007\n\003AMR\020\004\022\n\n\006AMR_WB\020\005\022\014\n\010OGG_OP" +
       "US\020\006\022\032\n\026SPEEX_WITH_HEADER_BYTE\020\007\" \n\rSpee" +
       "chContext\022\017\n\007phrases\030\001 \003(\t\"D\n\020Recognitio" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "SpeechRecognitionResult\"`\n\034LongRunningRe" +
       "cognizeResponse\022@\n\007results\030\002 \003(\0132/.googl" +
       "e.cloud.speech.v1.SpeechRecognitionResul" +
-      "t\"\236\001\n\034LongRunningRecognizeMetadata\022\030\n\020pr" +
+      "t\"\236\001\n\034LongRunningRecognizeMetadata\022\030\n\020pr",
       "ogress_percent\030\001 \001(\005\022.\n\nstart_time\030\002 \001(\013" +
       "2\032.google.protobuf.Timestamp\0224\n\020last_upd" +
       "ate_time\030\003 \001(\0132\032.google.protobuf.Timesta" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "RecognitionResult\022]\n\021speech_event_type\030\004" +
       " \001(\0162B.google.cloud.speech.v1.StreamingR" +
       "ecognizeResponse.SpeechEventType\"L\n\017Spee" +
-      "chEventType\022\034\n\030SPEECH_EVENT_UNSPECIFIED\020" +
+      "chEventType\022\034\n\030SPEECH_EVENT_UNSPECIFIED\020",
       "\000\022\033\n\027END_OF_SINGLE_UTTERANCE\020\001\"\215\001\n\032Strea" +
       "mingRecognitionResult\022J\n\014alternatives\030\001 " +
       "\003(\01324.google.cloud.speech.v1.SpeechRecog" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "peech.v1.SpeechRecognitionAlternative\"w\n" +
       "\034SpeechRecognitionAlternative\022\022\n\ntranscr" +
       "ipt\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\022/\n\005words\030\003" +
-      " \003(\0132 .google.cloud.speech.v1.WordInfo\"t" +
+      " \003(\0132 .google.cloud.speech.v1.WordInfo\"t",
       "\n\010WordInfo\022-\n\nstart_time\030\001 \001(\0132\031.google." +
       "protobuf.Duration\022+\n\010end_time\030\002 \001(\0132\031.go" +
       "ogle.protobuf.Duration\022\014\n\004word\030\003 \001(\t2\246\003\n" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "speech:recognize:\001*\022\226\001\n\024LongRunningRecog" +
       "nize\0223.google.cloud.speech.v1.LongRunnin" +
       "gRecognizeRequest\032\035.google.longrunning.O" +
-      "peration\"*\202\323\344\223\002$\"\037/v1/speech:longrunning" +
+      "peration\"*\202\323\344\223\002$\"\037/v1/speech:longrunning",
       "recognize:\001*\022\177\n\022StreamingRecognize\0221.goo" +
       "gle.cloud.speech.v1.StreamingRecognizeRe" +
       "quest\0322.google.cloud.speech.v1.Streaming" +
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionAlternative.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionAlternative.java
index d408d8e8740a..a1dc43829af1 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionAlternative.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionAlternative.java
@@ -35,9 +35,6 @@ private SpeechRecognitionAlternative(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1068,7 +1065,7 @@ public SpeechRecognitionAlternative parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechRecognitionAlternative(input, extensionRegistry);
+        return new SpeechRecognitionAlternative(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResult.java
index fe0a6af73991..cdedb296a6de 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResult.java
@@ -33,9 +33,6 @@ private SpeechRecognitionResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -882,7 +879,7 @@ public SpeechRecognitionResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechRecognitionResult(input, extensionRegistry);
+        return new SpeechRecognitionResult(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionConfig.java
index 645355f73588..a792ec57ead3 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionConfig.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionConfig.java
@@ -35,9 +35,6 @@ private StreamingRecognitionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public StreamingRecognitionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognitionConfig(input, extensionRegistry);
+        return new StreamingRecognitionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResult.java
index d44ea24e2b2b..5c0cf9de7607 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResult.java
@@ -36,9 +36,6 @@ private StreamingRecognitionResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1025,7 +1022,7 @@ public StreamingRecognitionResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognitionResult(input, extensionRegistry);
+        return new StreamingRecognitionResult(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequest.java
index 9a5bea10a1a1..582fcdacd2ec 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequest.java
@@ -36,9 +36,6 @@ private StreamingRecognizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -847,7 +844,7 @@ public StreamingRecognizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognizeRequest(input, extensionRegistry);
+        return new StreamingRecognizeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponse.java
index e8ce16dbbf45..f0f420ebf5df 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponse.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponse.java
@@ -69,9 +69,6 @@ private StreamingRecognizeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1437,7 +1434,7 @@ public StreamingRecognizeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognizeResponse(input, extensionRegistry);
+        return new StreamingRecognizeResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java
index 1b8e05d7e2d4..3f34f42a3326 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java
@@ -35,9 +35,6 @@ private WordInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1113,7 +1110,7 @@ public WordInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WordInfo(input, extensionRegistry);
+        return new WordInfo(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/AsyncRecognizeMetadata.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/AsyncRecognizeMetadata.java
index b8c3b368fedf..1e3adadd4de6 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/AsyncRecognizeMetadata.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/AsyncRecognizeMetadata.java
@@ -35,9 +35,6 @@ private AsyncRecognizeMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -916,7 +913,7 @@ public AsyncRecognizeMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncRecognizeMetadata(input, extensionRegistry);
+        return new AsyncRecognizeMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/AsyncRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/AsyncRecognizeRequest.java
index 7f0456fabd59..3cc25fcd8dfa 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/AsyncRecognizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/AsyncRecognizeRequest.java
@@ -32,9 +32,6 @@ private AsyncRecognizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -846,7 +843,7 @@ public AsyncRecognizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncRecognizeRequest(input, extensionRegistry);
+        return new AsyncRecognizeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/AsyncRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/AsyncRecognizeResponse.java
index ac2582a2a95f..378dfcbc831a 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/AsyncRecognizeResponse.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/AsyncRecognizeResponse.java
@@ -36,9 +36,6 @@ private AsyncRecognizeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -842,7 +839,7 @@ public AsyncRecognizeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncRecognizeResponse(input, extensionRegistry);
+        return new AsyncRecognizeResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/RecognitionAudio.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/RecognitionAudio.java
index aa2954f4c4b7..f216a43c6262 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/RecognitionAudio.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/RecognitionAudio.java
@@ -35,9 +35,6 @@ private RecognitionAudio(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -766,7 +763,7 @@ public RecognitionAudio parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognitionAudio(input, extensionRegistry);
+        return new RecognitionAudio(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/RecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/RecognitionConfig.java
index e5b0dd38326e..c8336151ed8a 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/RecognitionConfig.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/RecognitionConfig.java
@@ -38,9 +38,6 @@ private RecognitionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1379,7 +1376,7 @@ public RecognitionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognitionConfig(input, extensionRegistry);
+        return new RecognitionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechContext.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechContext.java
index a63245d1a335..5955ed928478 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechContext.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechContext.java
@@ -34,9 +34,6 @@ private SpeechContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -667,7 +664,7 @@ public SpeechContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechContext(input, extensionRegistry);
+        return new SpeechContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechProto.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechProto.java
index 1972cf84c176..7933ef48844d 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechProto.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechProto.java
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "yncRecognizeRequest\022>\n\006config\030\001 \001(\0132..go" +
       "ogle.cloud.speech.v1beta1.RecognitionCon" +
       "fig\022<\n\005audio\030\002 \001(\0132-.google.cloud.speech" +
-      ".v1beta1.RecognitionAudio\"\225\001\n\025AsyncRecog" +
+      ".v1beta1.RecognitionAudio\"\225\001\n\025AsyncRecog",
       "nizeRequest\022>\n\006config\030\001 \001(\0132..google.clo" +
       "ud.speech.v1beta1.RecognitionConfig\022<\n\005a" +
       "udio\030\002 \001(\0132-.google.cloud.speech.v1beta1" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "tionConfigH\000\022\027\n\raudio_content\030\002 \001(\014H\000B\023\n" +
       "\021streaming_request\"\217\001\n\032StreamingRecognit" +
       "ionConfig\022>\n\006config\030\001 \001(\0132..google.cloud" +
-      ".speech.v1beta1.RecognitionConfig\022\030\n\020sin" +
+      ".speech.v1beta1.RecognitionConfig\022\030\n\020sin",
       "gle_utterance\030\002 \001(\010\022\027\n\017interim_results\030\003" +
       " \001(\010\"\352\002\n\021RecognitionConfig\022N\n\010encoding\030\001" +
       " \001(\0162<.google.cloud.speech.v1beta1.Recog" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "(\010\022B\n\016speech_context\030\006 \001(\0132*.google.clou" +
       "d.speech.v1beta1.SpeechContext\"a\n\rAudioE" +
       "ncoding\022\030\n\024ENCODING_UNSPECIFIED\020\000\022\014\n\010LIN" +
-      "EAR16\020\001\022\010\n\004FLAC\020\002\022\t\n\005MULAW\020\003\022\007\n\003AMR\020\004\022\n\n" +
+      "EAR16\020\001\022\010\n\004FLAC\020\002\022\t\n\005MULAW\020\003\022\007\n\003AMR\020\004\022\n\n",
       "\006AMR_WB\020\005\" \n\rSpeechContext\022\017\n\007phrases\030\001 " +
       "\003(\t\"D\n\020RecognitionAudio\022\021\n\007content\030\001 \001(\014" +
       "H\000\022\r\n\003uri\030\002 \001(\tH\000B\016\n\014audio_source\"^\n\025Syn" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "esults\030\002 \003(\01324.google.cloud.speech.v1bet" +
       "a1.SpeechRecognitionResult\"\230\001\n\026AsyncReco" +
       "gnizeMetadata\022\030\n\020progress_percent\030\001 \001(\005\022" +
-      ".\n\nstart_time\030\002 \001(\0132\032.google.protobuf.Ti" +
+      ".\n\nstart_time\030\002 \001(\0132\032.google.protobuf.Ti",
       "mestamp\0224\n\020last_update_time\030\003 \001(\0132\032.goog" +
       "le.protobuf.Timestamp\"\205\003\n\032StreamingRecog" +
       "nizeResponse\022!\n\005error\030\001 \001(\0132\022.google.rpc" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "pe\030\004 \001(\0162F.google.cloud.speech.v1beta1.S" +
       "treamingRecognizeResponse.EndpointerType" +
       "\"\202\001\n\016EndpointerType\022 \n\034ENDPOINTER_EVENT_" +
-      "UNSPECIFIED\020\000\022\023\n\017START_OF_SPEECH\020\001\022\021\n\rEN" +
+      "UNSPECIFIED\020\000\022\023\n\017START_OF_SPEECH\020\001\022\021\n\rEN",
       "D_OF_SPEECH\020\002\022\020\n\014END_OF_AUDIO\020\003\022\024\n\020END_O" +
       "F_UTTERANCE\020\004\"\222\001\n\032StreamingRecognitionRe" +
       "sult\022O\n\014alternatives\030\001 \003(\01329.google.clou" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "tives\030\001 \003(\01329.google.cloud.speech.v1beta" +
       "1.SpeechRecognitionAlternative\"F\n\034Speech" +
       "RecognitionAlternative\022\022\n\ntranscript\030\001 \001" +
-      "(\t\022\022\n\nconfidence\030\002 \001(\0022\310\003\n\006Speech\022\240\001\n\rSy" +
+      "(\t\022\022\n\nconfidence\030\002 \001(\0022\310\003\n\006Speech\022\240\001\n\rSy",
       "ncRecognize\0221.google.cloud.speech.v1beta" +
       "1.SyncRecognizeRequest\0322.google.cloud.sp" +
       "eech.v1beta1.SyncRecognizeResponse\"(\202\323\344\223" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "grunning.Operation\")\202\323\344\223\002#\"\036/v1beta1/spe" +
       "ech:asyncrecognize:\001*\022\211\001\n\022StreamingRecog" +
       "nize\0226.google.cloud.speech.v1beta1.Strea" +
-      "mingRecognizeRequest\0327.google.cloud.spee" +
+      "mingRecognizeRequest\0327.google.cloud.spee",
       "ch.v1beta1.StreamingRecognizeResponse(\0010" +
       "\001Bs\n\037com.google.cloud.speech.v1beta1B\013Sp" +
       "eechProtoP\001ZAgoogle.golang.org/genproto/" +
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechRecognitionAlternative.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechRecognitionAlternative.java
index 96354b26b489..bc9a532cb874 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechRecognitionAlternative.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechRecognitionAlternative.java
@@ -34,9 +34,6 @@ private SpeechRecognitionAlternative(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -632,7 +629,7 @@ public SpeechRecognitionAlternative parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechRecognitionAlternative(input, extensionRegistry);
+        return new SpeechRecognitionAlternative(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechRecognitionResult.java
index e7cba2f86edf..846a0c368da6 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SpeechRecognitionResult.java
@@ -33,9 +33,6 @@ private SpeechRecognitionResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -836,7 +833,7 @@ public SpeechRecognitionResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechRecognitionResult(input, extensionRegistry);
+        return new SpeechRecognitionResult(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognitionConfig.java
index 9f130b024f4c..3487846814d2 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognitionConfig.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognitionConfig.java
@@ -35,9 +35,6 @@ private StreamingRecognitionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public StreamingRecognitionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognitionConfig(input, extensionRegistry);
+        return new StreamingRecognitionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognitionResult.java
index 4b0590949270..529ab8b07b67 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognitionResult.java
@@ -36,9 +36,6 @@ private StreamingRecognitionResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1025,7 +1022,7 @@ public StreamingRecognitionResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognitionResult(input, extensionRegistry);
+        return new StreamingRecognitionResult(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognizeRequest.java
index 747c8fe15500..9c800ee4fdd9 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognizeRequest.java
@@ -36,9 +36,6 @@ private StreamingRecognizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -847,7 +844,7 @@ public StreamingRecognizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognizeRequest(input, extensionRegistry);
+        return new StreamingRecognizeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognizeResponse.java
index dd7b7534a1c3..8818a3573429 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognizeResponse.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/StreamingRecognizeResponse.java
@@ -78,9 +78,6 @@ private StreamingRecognizeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1600,7 +1597,7 @@ public StreamingRecognizeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognizeResponse(input, extensionRegistry);
+        return new StreamingRecognizeResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SyncRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SyncRecognizeRequest.java
index 60551b654a99..f9b928b58e73 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SyncRecognizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SyncRecognizeRequest.java
@@ -32,9 +32,6 @@ private SyncRecognizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -846,7 +843,7 @@ public SyncRecognizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SyncRecognizeRequest(input, extensionRegistry);
+        return new SyncRecognizeRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SyncRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SyncRecognizeResponse.java
index d5311d3d7117..0b5c7dfd3f93 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SyncRecognizeResponse.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1beta1/src/main/java/com/google/cloud/speech/v1beta1/SyncRecognizeResponse.java
@@ -35,9 +35,6 @@ private SyncRecognizeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -840,7 +837,7 @@ public SyncRecognizeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SyncRecognizeResponse(input, extensionRegistry);
+        return new SyncRecognizeResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java
index 321ef1b3ea24..39f5f589a4ed 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java
@@ -37,9 +37,6 @@ private AudioConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -860,7 +857,7 @@ public AudioConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AudioConfig(input, extensionRegistry);
+        return new AudioConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java
index c76ded93fa8f..1a75939a17b2 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java
@@ -33,9 +33,6 @@ private ListVoicesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -580,7 +577,7 @@ public ListVoicesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListVoicesRequest(input, extensionRegistry);
+        return new ListVoicesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java
index cecca6db7d9b..8a3973592ee0 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java
@@ -33,9 +33,6 @@ private ListVoicesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public ListVoicesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListVoicesResponse(input, extensionRegistry);
+        return new ListVoicesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java
index 7096500138b4..10200a5411c8 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java
@@ -35,9 +35,6 @@ private SynthesisInput(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -835,7 +832,7 @@ public SynthesisInput parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SynthesisInput(input, extensionRegistry);
+        return new SynthesisInput(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java
index bd0b1c6f228d..e00b67b862d1 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java
@@ -32,9 +32,6 @@ private SynthesizeSpeechRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1063,7 +1060,7 @@ public SynthesizeSpeechRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SynthesizeSpeechRequest(input, extensionRegistry);
+        return new SynthesizeSpeechRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java
index 19ea28eb872b..c553352af295 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java
@@ -33,9 +33,6 @@ private SynthesizeSpeechResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -465,7 +462,7 @@ public SynthesizeSpeechResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SynthesizeSpeechResponse(input, extensionRegistry);
+        return new SynthesizeSpeechResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java
index b06155ef6cd8..842a6eb1a0b1 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "anguage_codes\030\001 \003(\t\022\014\n\004name\030\002 \001(\t\022B\n\013ssm" +
       "l_gender\030\003 \001(\0162-.google.cloud.texttospee" +
       "ch.v1.SsmlVoiceGender\022!\n\031natural_sample_" +
-      "rate_hertz\030\004 \001(\005\"\332\001\n\027SynthesizeSpeechReq" +
+      "rate_hertz\030\004 \001(\005\"\332\001\n\027SynthesizeSpeechReq",
       "uest\022;\n\005input\030\001 \001(\0132,.google.cloud.textt" +
       "ospeech.v1.SynthesisInput\022A\n\005voice\030\002 \001(\013" +
       "22.google.cloud.texttospeech.v1.VoiceSel" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "\002 \001(\tH\000B\016\n\014input_source\"\177\n\024VoiceSelectio" +
       "nParams\022\025\n\rlanguage_code\030\001 \001(\t\022\014\n\004name\030\002" +
       " \001(\t\022B\n\013ssml_gender\030\003 \001(\0162-.google.cloud" +
-      ".texttospeech.v1.SsmlVoiceGender\"\253\001\n\013Aud" +
+      ".texttospeech.v1.SsmlVoiceGender\"\253\001\n\013Aud",
       "ioConfig\022C\n\016audio_encoding\030\001 \001(\0162+.googl" +
       "e.cloud.texttospeech.v1.AudioEncoding\022\025\n" +
       "\rspeaking_rate\030\002 \001(\001\022\r\n\005pitch\030\003 \001(\001\022\026\n\016v" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "SSML_VOICE_GENDER_UNSPECIFIED\020\000\022\010\n\004MALE\020" +
       "\001\022\n\n\006FEMALE\020\002\022\013\n\007NEUTRAL\020\003*T\n\rAudioEncod" +
       "ing\022\036\n\032AUDIO_ENCODING_UNSPECIFIED\020\000\022\014\n\010L" +
-      "INEAR16\020\001\022\007\n\003MP3\020\002\022\014\n\010OGG_OPUS\020\0032\270\002\n\014Tex" +
+      "INEAR16\020\001\022\007\n\003MP3\020\002\022\014\n\010OGG_OPUS\020\0032\270\002\n\014Tex",
       "tToSpeech\022\203\001\n\nListVoices\022/.google.cloud." +
       "texttospeech.v1.ListVoicesRequest\0320.goog" +
       "le.cloud.texttospeech.v1.ListVoicesRespo" +
@@ -100,12 +100,11 @@ public static void registerAllExtensions(
       "eech\0225.google.cloud.texttospeech.v1.Synt" +
       "hesizeSpeechRequest\0326.google.cloud.textt" +
       "ospeech.v1.SynthesizeSpeechResponse\"\036\202\323\344" +
-      "\223\002\030\"\023/v1/text:synthesize:\001*B\302\001\n com.goog" +
+      "\223\002\030\"\023/v1/text:synthesize:\001*B\204\001\n com.goog" +
       "le.cloud.texttospeech.v1B\021TextToSpeechPr" +
-      "otoP\001ZHgoogle.golang.org/genproto/google" +
+      "otoP\001ZHgoogle.golang.org/genproto/google",
       "apis/cloud/texttospeech/v1;texttospeech\370" +
-      "\001\001\252\002\034Google.Cloud.TextToSpeech.V1\312\002\034Goog" +
-      "le\\Cloud\\TextToSpeech\\V1b\006proto3"
+      "\001\001b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java
index 63b486b6e0d4..40d09f9fbc7c 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java
@@ -36,9 +36,6 @@ private Voice(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -969,7 +966,7 @@ public Voice parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Voice(input, extensionRegistry);
+        return new Voice(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java
index 27475c7dfbfc..94e5efda6535 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java
@@ -35,9 +35,6 @@ private VoiceSelectionParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -902,7 +899,7 @@ public VoiceSelectionParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VoiceSelectionParams(input, extensionRegistry);
+        return new VoiceSelectionParams(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto
index 0ccbde389214..102ff37e9d9a 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/proto/google/cloud/texttospeech/v1/cloud_tts.proto
@@ -19,12 +19,10 @@ package google.cloud.texttospeech.v1;
 import "google/api/annotations.proto";
 
 option cc_enable_arenas = true;
-option csharp_namespace = "Google.Cloud.TextToSpeech.V1";
 option go_package = "google.golang.org/genproto/googleapis/cloud/texttospeech/v1;texttospeech";
 option java_multiple_files = true;
 option java_outer_classname = "TextToSpeechProto";
 option java_package = "com.google.cloud.texttospeech.v1";
-option php_namespace = "Google\\Cloud\\TextToSpeech\\V1";
 
 
 // Service that implements Google Cloud Text-to-Speech API.
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java
index e30ba0198ea8..ba402d361f61 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java
@@ -37,9 +37,6 @@ private AudioConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -860,7 +857,7 @@ public AudioConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AudioConfig(input, extensionRegistry);
+        return new AudioConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java
index 41c463103f1d..f4ec95410551 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java
@@ -33,9 +33,6 @@ private ListVoicesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -580,7 +577,7 @@ public ListVoicesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListVoicesRequest(input, extensionRegistry);
+        return new ListVoicesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java
index a34acd05af56..b93c97ad1fb5 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java
@@ -33,9 +33,6 @@ private ListVoicesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public ListVoicesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListVoicesResponse(input, extensionRegistry);
+        return new ListVoicesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java
index b457d15bf4fe..ada5664d9a58 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java
@@ -35,9 +35,6 @@ private SynthesisInput(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -835,7 +832,7 @@ public SynthesisInput parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SynthesisInput(input, extensionRegistry);
+        return new SynthesisInput(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java
index 42a6d8b765c7..56255e34aec1 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java
@@ -32,9 +32,6 @@ private SynthesizeSpeechRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1063,7 +1060,7 @@ public SynthesizeSpeechRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SynthesizeSpeechRequest(input, extensionRegistry);
+        return new SynthesizeSpeechRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java
index 245480f2f391..1e6e92790212 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java
@@ -33,9 +33,6 @@ private SynthesizeSpeechResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -465,7 +462,7 @@ public SynthesizeSpeechResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SynthesizeSpeechResponse(input, extensionRegistry);
+        return new SynthesizeSpeechResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechProto.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechProto.java
index dd92e0a22c0b..adb30db18b8d 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechProto.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "\"\231\001\n\005Voice\022\026\n\016language_codes\030\001 \003(\t\022\014\n\004na" +
       "me\030\002 \001(\t\022G\n\013ssml_gender\030\003 \001(\01622.google.c" +
       "loud.texttospeech.v1beta1.SsmlVoiceGende" +
-      "r\022!\n\031natural_sample_rate_hertz\030\004 \001(\005\"\351\001\n" +
+      "r\022!\n\031natural_sample_rate_hertz\030\004 \001(\005\"\351\001\n",
       "\027SynthesizeSpeechRequest\022@\n\005input\030\001 \001(\0132" +
       "1.google.cloud.texttospeech.v1beta1.Synt" +
       "hesisInput\022F\n\005voice\030\002 \001(\01327.google.cloud" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "hesisInput\022\016\n\004text\030\001 \001(\tH\000\022\016\n\004ssml\030\002 \001(\t" +
       "H\000B\016\n\014input_source\"\204\001\n\024VoiceSelectionPar" +
       "ams\022\025\n\rlanguage_code\030\001 \001(\t\022\014\n\004name\030\002 \001(\t" +
-      "\022G\n\013ssml_gender\030\003 \001(\01622.google.cloud.tex" +
+      "\022G\n\013ssml_gender\030\003 \001(\01622.google.cloud.tex",
       "ttospeech.v1beta1.SsmlVoiceGender\"\260\001\n\013Au" +
       "dioConfig\022H\n\016audio_encoding\030\001 \001(\01620.goog" +
       "le.cloud.texttospeech.v1beta1.AudioEncod" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "\022\025\n\raudio_content\030\001 \001(\014*W\n\017SsmlVoiceGend" +
       "er\022!\n\035SSML_VOICE_GENDER_UNSPECIFIED\020\000\022\010\n" +
       "\004MALE\020\001\022\n\n\006FEMALE\020\002\022\013\n\007NEUTRAL\020\003*T\n\rAudi" +
-      "oEncoding\022\036\n\032AUDIO_ENCODING_UNSPECIFIED\020" +
+      "oEncoding\022\036\n\032AUDIO_ENCODING_UNSPECIFIED\020",
       "\000\022\014\n\010LINEAR16\020\001\022\007\n\003MP3\020\002\022\014\n\010OGG_OPUS\020\0032\326" +
       "\002\n\014TextToSpeech\022\222\001\n\nListVoices\0224.google." +
       "cloud.texttospeech.v1beta1.ListVoicesReq" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       ".texttospeech.v1beta1.SynthesizeSpeechRe" +
       "quest\032;.google.cloud.texttospeech.v1beta" +
       "1.SynthesizeSpeechResponse\"#\202\323\344\223\002\035\"\030/v1b" +
-      "eta1/text:synthesize:\001*B\216\001\n%com.google.c" +
+      "eta1/text:synthesize:\001*B\216\001\n%com.google.c",
       "loud.texttospeech.v1beta1B\021TextToSpeechP" +
       "rotoP\001ZMgoogle.golang.org/genproto/googl" +
       "eapis/cloud/texttospeech/v1beta1;texttos" +
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java
index 7862b304f73e..03968d5b2517 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java
@@ -36,9 +36,6 @@ private Voice(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -969,7 +966,7 @@ public Voice parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Voice(input, extensionRegistry);
+        return new Voice(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java
index fc5af02ab7fa..71896f3c5051 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java
@@ -35,9 +35,6 @@ private VoiceSelectionParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -902,7 +899,7 @@ public VoiceSelectionParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VoiceSelectionParams(input, extensionRegistry);
+        return new VoiceSelectionParams(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/GetTraceRequest.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/GetTraceRequest.java
index c0caaff345ed..eefecbfbeb05 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/GetTraceRequest.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/GetTraceRequest.java
@@ -34,9 +34,6 @@ private GetTraceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -686,7 +683,7 @@ public GetTraceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetTraceRequest(input, extensionRegistry);
+        return new GetTraceRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesRequest.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesRequest.java
index e577a0c5cf5d..4fce4b9f7e85 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesRequest.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesRequest.java
@@ -39,9 +39,6 @@ private ListTracesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2099,7 +2096,7 @@ public ListTracesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTracesRequest(input, extensionRegistry);
+        return new ListTracesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesResponse.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesResponse.java
index 0dee9c7000ae..e6ef12a182dc 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesResponse.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesResponse.java
@@ -34,9 +34,6 @@ private ListTracesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -985,7 +982,7 @@ public ListTracesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTracesResponse(input, extensionRegistry);
+        return new ListTracesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/PatchTracesRequest.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/PatchTracesRequest.java
index 25bbee5684d1..dbfc6835cdfd 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/PatchTracesRequest.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/PatchTracesRequest.java
@@ -33,9 +33,6 @@ private PatchTracesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -760,7 +757,7 @@ public PatchTracesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PatchTracesRequest(input, extensionRegistry);
+        return new PatchTracesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Trace.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Trace.java
index 6e075bc0ce1f..e4a4d6c53791 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Trace.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Trace.java
@@ -37,9 +37,6 @@ private Trace(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1137,7 +1134,7 @@ public Trace parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Trace(input, extensionRegistry);
+        return new Trace(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceProto.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceProto.java
index cb92a042494a..1fe323cb09c9 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceProto.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "vtools.cloudtrace.v1.TraceSpan\">\n\006Traces" +
       "\0224\n\006traces\030\001 \003(\0132$.google.devtools.cloud" +
       "trace.v1.Trace\"\235\003\n\tTraceSpan\022\017\n\007span_id\030" +
-      "\001 \001(\006\022?\n\004kind\030\002 \001(\01621.google.devtools.cl" +
+      "\001 \001(\006\022?\n\004kind\030\002 \001(\01621.google.devtools.cl",
       "oudtrace.v1.TraceSpan.SpanKind\022\014\n\004name\030\003" +
       " \001(\t\022.\n\nstart_time\030\004 \001(\0132\032.google.protob" +
       "uf.Timestamp\022,\n\010end_time\030\005 \001(\0132\032.google." +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "lsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"" +
       "E\n\010SpanKind\022\031\n\025SPAN_KIND_UNSPECIFIED\020\000\022\016" +
       "\n\nRPC_SERVER\020\001\022\016\n\nRPC_CLIENT\020\002\"\347\002\n\021ListT" +
-      "racesRequest\022\022\n\nproject_id\030\001 \001(\t\022G\n\004view" +
+      "racesRequest\022\022\n\nproject_id\030\001 \001(\t\022G\n\004view",
       "\030\002 \001(\01629.google.devtools.cloudtrace.v1.L" +
       "istTracesRequest.ViewType\022\021\n\tpage_size\030\003" +
       " \001(\005\022\022\n\npage_token\030\004 \001(\t\022.\n\nstart_time\030\005" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "Type\022\031\n\025VIEW_TYPE_UNSPECIFIED\020\000\022\013\n\007MINIM" +
       "AL\020\001\022\014\n\010ROOTSPAN\020\002\022\014\n\010COMPLETE\020\003\"c\n\022List" +
       "TracesResponse\0224\n\006traces\030\001 \003(\0132$.google." +
-      "devtools.cloudtrace.v1.Trace\022\027\n\017next_pag" +
+      "devtools.cloudtrace.v1.Trace\022\027\n\017next_pag",
       "e_token\030\002 \001(\t\"7\n\017GetTraceRequest\022\022\n\nproj" +
       "ect_id\030\001 \001(\t\022\020\n\010trace_id\030\002 \001(\t\"_\n\022PatchT" +
       "racesRequest\022\022\n\nproject_id\030\001 \001(\t\0225\n\006trac" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "esRequest\0321.google.devtools.cloudtrace.v" +
       "1.ListTracesResponse\"(\202\323\344\223\002\"\022 /v1/projec" +
       "ts/{project_id}/traces\022\225\001\n\010GetTrace\022..go" +
-      "ogle.devtools.cloudtrace.v1.GetTraceRequ" +
+      "ogle.devtools.cloudtrace.v1.GetTraceRequ",
       "est\032$.google.devtools.cloudtrace.v1.Trac" +
       "e\"3\202\323\344\223\002-\022+/v1/projects/{project_id}/tra" +
       "ces/{trace_id}\022\212\001\n\013PatchTraces\0221.google." +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "com.google.devtools.cloudtrace.v1B\nTrace" +
       "ProtoP\001ZGgoogle.golang.org/genproto/goog" +
       "leapis/devtools/cloudtrace/v1;cloudtrace" +
-      "\252\002\025Google.Cloud.Trace.V1\312\002\025Google\\Cloud\\" +
+      "\252\002\025Google.Cloud.Trace.V1\312\002\025Google\\Cloud\\",
       "Trace\\V1b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceSpan.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceSpan.java
index bf8923384b3d..e49e2b97d491 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceSpan.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceSpan.java
@@ -40,9 +40,6 @@ private TraceSpan(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2109,7 +2106,7 @@ public TraceSpan parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TraceSpan(input, extensionRegistry);
+        return new TraceSpan(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Traces.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Traces.java
index 71a3a9cbb62d..f92c76216cd1 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Traces.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Traces.java
@@ -33,9 +33,6 @@ private Traces(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public Traces parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Traces(input, extensionRegistry);
+        return new Traces(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java
index 4de1db58d869..48999883a7fe 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java
@@ -32,9 +32,6 @@ private AttributeValue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -874,7 +871,7 @@ public AttributeValue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AttributeValue(input, extensionRegistry);
+        return new AttributeValue(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/BatchWriteSpansRequest.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/BatchWriteSpansRequest.java
index d9ae03deba46..93acca79ebdf 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/BatchWriteSpansRequest.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/BatchWriteSpansRequest.java
@@ -34,9 +34,6 @@ private BatchWriteSpansRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1001,7 +998,7 @@ public BatchWriteSpansRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchWriteSpansRequest(input, extensionRegistry);
+        return new BatchWriteSpansRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Module.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Module.java
index c09a2bed6fb6..b3ff38736d52 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Module.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Module.java
@@ -32,9 +32,6 @@ private Module(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -858,7 +855,7 @@ public Module parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Module(input, extensionRegistry);
+        return new Module(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/ProjectName.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/ProjectName.java
index df8719850d65..2ace84e9b88f 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Span.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Span.java
index c1b4cdd088da..b148d271b600 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Span.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Span.java
@@ -40,9 +40,6 @@ private Span(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -362,9 +359,6 @@ private Attributes(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1174,7 +1168,7 @@ public Attributes parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Attributes(input, extensionRegistry);
+          return new Attributes(input, extensionRegistry);
       }
     };
 
@@ -1303,9 +1297,6 @@ private TimeEvent(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1478,9 +1469,6 @@ private Annotation(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2304,7 +2292,7 @@ public Annotation parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Annotation(input, extensionRegistry);
+            return new Annotation(input, extensionRegistry);
         }
       };
 
@@ -2409,9 +2397,6 @@ private MessageEvent(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3239,7 +3224,7 @@ public MessageEvent parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new MessageEvent(input, extensionRegistry);
+            return new MessageEvent(input, extensionRegistry);
         }
       };
 
@@ -4317,7 +4302,7 @@ public TimeEvent parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TimeEvent(input, extensionRegistry);
+          return new TimeEvent(input, extensionRegistry);
       }
     };
 
@@ -4438,9 +4423,6 @@ private TimeEvents(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5377,7 +5359,7 @@ public TimeEvents parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TimeEvents(input, extensionRegistry);
+          return new TimeEvents(input, extensionRegistry);
       }
     };
 
@@ -5516,9 +5498,6 @@ private Link(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6658,7 +6637,7 @@ public Link parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Link(input, extensionRegistry);
+          return new Link(input, extensionRegistry);
       }
     };
 
@@ -6767,9 +6746,6 @@ private Links(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7628,7 +7604,7 @@ public Links parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Links(input, extensionRegistry);
+          return new Links(input, extensionRegistry);
       }
     };
 
@@ -10789,7 +10765,7 @@ public Span parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Span(input, extensionRegistry);
+        return new Span(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/SpanName.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/SpanName.java
index 359258fac27f..ae1ca4003d62 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/SpanName.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/SpanName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("SpanName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "trace", trace, "span", span);
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/StackTrace.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/StackTrace.java
index f9867282def5..23c489249cdd 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/StackTrace.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/StackTrace.java
@@ -33,9 +33,6 @@ private StackTrace(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -287,9 +284,6 @@ private StackFrame(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1976,7 +1970,7 @@ public StackFrame parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new StackFrame(input, extensionRegistry);
+          return new StackFrame(input, extensionRegistry);
       }
     };
 
@@ -2085,9 +2079,6 @@ private StackFrames(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2949,7 +2940,7 @@ public StackFrames parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new StackFrames(input, extensionRegistry);
+          return new StackFrames(input, extensionRegistry);
       }
     };
 
@@ -3576,7 +3567,7 @@ public StackTrace parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StackTrace(input, extensionRegistry);
+        return new StackTrace(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TraceProto.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TraceProto.java
index 6082924361a2..119e7fa5766b 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TraceProto.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TraceProto.java
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "rent_span_id\030\003 \001(\t\022F\n\014display_name\030\004 \001(\013" +
       "20.google.devtools.cloudtrace.v2.Truncat" +
       "ableString\022.\n\nstart_time\030\005 \001(\0132\032.google." +
-      "protobuf.Timestamp\022,\n\010end_time\030\006 \001(\0132\032.g" +
+      "protobuf.Timestamp\022,\n\010end_time\030\006 \001(\0132\032.g",
       "oogle.protobuf.Timestamp\022B\n\nattributes\030\007" +
       " \001(\0132..google.devtools.cloudtrace.v2.Spa" +
       "n.Attributes\022>\n\013stack_trace\030\010 \001(\0132).goog" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "2).google.devtools.cloudtrace.v2.Span.Li" +
       "nks\022\"\n\006status\030\013 \001(\0132\022.google.rpc.Status\022" +
       "?\n\033same_process_as_parent_span\030\014 \001(\0132\032.g" +
-      "oogle.protobuf.BoolValue\0225\n\020child_span_c" +
+      "oogle.protobuf.BoolValue\0225\n\020child_span_c",
       "ount\030\r \001(\0132\033.google.protobuf.Int32Value\032" +
       "\353\001\n\nAttributes\022W\n\rattribute_map\030\001 \003(\0132@." +
       "google.devtools.cloudtrace.v2.Span.Attri" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "ools.cloudtrace.v2.AttributeValue:\0028\001\032\337\004" +
       "\n\tTimeEvent\022(\n\004time\030\001 \001(\0132\032.google.proto" +
       "buf.Timestamp\022N\n\nannotation\030\002 \001(\01328.goog" +
-      "le.devtools.cloudtrace.v2.Span.TimeEvent" +
+      "le.devtools.cloudtrace.v2.Span.TimeEvent",
       ".AnnotationH\000\022S\n\rmessage_event\030\003 \001(\0132:.g" +
       "oogle.devtools.cloudtrace.v2.Span.TimeEv" +
       "ent.MessageEventH\000\032\227\001\n\nAnnotation\022E\n\013des" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "n.Attributes\032\337\001\n\014MessageEvent\022M\n\004type\030\001 " +
       "\001(\0162?.google.devtools.cloudtrace.v2.Span" +
       ".TimeEvent.MessageEvent.Type\022\n\n\002id\030\002 \001(\003" +
-      "\022\037\n\027uncompressed_size_bytes\030\003 \001(\003\022\035\n\025com" +
+      "\022\037\n\027uncompressed_size_bytes\030\003 \001(\003\022\035\n\025com",
       "pressed_size_bytes\030\004 \001(\003\"4\n\004Type\022\024\n\020TYPE" +
       "_UNSPECIFIED\020\000\022\010\n\004SENT\020\001\022\014\n\010RECEIVED\020\002B\007" +
       "\n\005value\032\230\001\n\nTimeEvents\022A\n\ntime_event\030\001 \003" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "(\005\032\367\001\n\004Link\022\020\n\010trace_id\030\001 \001(\t\022\017\n\007span_id" +
       "\030\002 \001(\t\022;\n\004type\030\003 \001(\0162-.google.devtools.c" +
       "loudtrace.v2.Span.Link.Type\022B\n\nattribute" +
-      "s\030\004 \001(\0132..google.devtools.cloudtrace.v2." +
+      "s\030\004 \001(\0132..google.devtools.cloudtrace.v2.",
       "Span.Attributes\"K\n\004Type\022\024\n\020TYPE_UNSPECIF" +
       "IED\020\000\022\025\n\021CHILD_LINKED_SPAN\020\001\022\026\n\022PARENT_L" +
       "INKED_SPAN\020\002\032\\\n\005Links\0226\n\004link\030\001 \003(\0132(.go" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "tools.cloudtrace.v2.TruncatableStringH\000\022" +
       "\023\n\tint_value\030\002 \001(\003H\000\022\024\n\nbool_value\030\003 \001(\010" +
       "H\000B\007\n\005value\"\211\005\n\nStackTrace\022K\n\014stack_fram" +
-      "es\030\001 \001(\01325.google.devtools.cloudtrace.v2" +
+      "es\030\001 \001(\01325.google.devtools.cloudtrace.v2",
       ".StackTrace.StackFrames\022\033\n\023stack_trace_h" +
       "ash_id\030\002 \001(\003\032\236\003\n\nStackFrame\022G\n\rfunction_" +
       "name\030\001 \001(\01320.google.devtools.cloudtrace." +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "\01320.google.devtools.cloudtrace.v2.Trunca" +
       "tableString\022\023\n\013line_number\030\004 \001(\003\022\025\n\rcolu" +
       "mn_number\030\005 \001(\003\022:\n\013load_module\030\006 \001(\0132%.g" +
-      "oogle.devtools.cloudtrace.v2.Module\022H\n\016s" +
+      "oogle.devtools.cloudtrace.v2.Module\022H\n\016s",
       "ource_version\030\007 \001(\01320.google.devtools.cl" +
       "oudtrace.v2.TruncatableString\032p\n\013StackFr" +
       "ames\022C\n\005frame\030\001 \003(\01324.google.devtools.cl" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "v2.TruncatableString\022B\n\010build_id\030\002 \001(\01320" +
       ".google.devtools.cloudtrace.v2.Truncatab" +
       "leString\"@\n\021TruncatableString\022\r\n\005value\030\001" +
-      " \001(\t\022\034\n\024truncated_byte_count\030\002 \001(\005B\252\001\n!c" +
+      " \001(\t\022\034\n\024truncated_byte_count\030\002 \001(\005B\252\001\n!c",
       "om.google.devtools.cloudtrace.v2B\nTraceP" +
       "rotoP\001ZGgoogle.golang.org/genproto/googl" +
       "eapis/devtools/cloudtrace/v2;cloudtrace\252" +
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TracingProto.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TracingProto.java
index 8d8c12f0f4af..0035c5cdaae0 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TracingProto.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TracingProto.java
@@ -37,7 +37,7 @@ public static void registerAllExtensions(
       "\004name\030\001 \001(\t\0222\n\005spans\030\002 \003(\0132#.google.devt" +
       "ools.cloudtrace.v2.Span2\257\002\n\014TraceService" +
       "\022\224\001\n\017BatchWriteSpans\0225.google.devtools.c" +
-      "loudtrace.v2.BatchWriteSpansRequest\032\026.go" +
+      "loudtrace.v2.BatchWriteSpansRequest\032\026.go",
       "ogle.protobuf.Empty\"2\202\323\344\223\002,\"\'/v2/{name=p" +
       "rojects/*}/traces:batchWrite:\001*\022\207\001\n\nCrea" +
       "teSpan\022#.google.devtools.cloudtrace.v2.S" +
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TruncatableString.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TruncatableString.java
index 064ded91cc9a..67922d39350e 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TruncatableString.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TruncatableString.java
@@ -34,9 +34,6 @@ private TruncatableString(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -644,7 +641,7 @@ public TruncatableString parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TruncatableString(input, extensionRegistry);
+        return new TruncatableString(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoProgress.java
index c7849be2a6a5..2a5ae39caa2d 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoProgress.java
@@ -35,9 +35,6 @@ private AnnotateVideoProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public AnnotateVideoProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoProgress(input, extensionRegistry);
+        return new AnnotateVideoProgress(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoRequest.java
index cd318c671059..125353fdb312 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoRequest.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoRequest.java
@@ -37,9 +37,6 @@ private AnnotateVideoRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1572,7 +1569,7 @@ public AnnotateVideoRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoRequest(input, extensionRegistry);
+        return new AnnotateVideoRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoResponse.java
index 851335748a1a..bcf7a3df6d4e 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoResponse.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoResponse.java
@@ -35,9 +35,6 @@ private AnnotateVideoResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public AnnotateVideoResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoResponse(input, extensionRegistry);
+        return new AnnotateVideoResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/Entity.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/Entity.java
index 34e8cf28d2ea..aa48a86b39de 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/Entity.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/Entity.java
@@ -35,9 +35,6 @@ private Entity(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -855,7 +852,7 @@ public Entity parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Entity(input, extensionRegistry);
+        return new Entity(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentAnnotation.java
index a8c6a09b0a9c..e4c5aeaac040 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentAnnotation.java
@@ -35,9 +35,6 @@ private ExplicitContentAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public ExplicitContentAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentAnnotation(input, extensionRegistry);
+        return new ExplicitContentAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentDetectionConfig.java
index 2d6e3c8d5341..1b2e77d826e2 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentDetectionConfig.java
@@ -33,9 +33,6 @@ private ExplicitContentDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public ExplicitContentDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentDetectionConfig(input, extensionRegistry);
+        return new ExplicitContentDetectionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentFrame.java
index a874f4ee696b..f32515a24bc6 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentFrame.java
@@ -33,9 +33,6 @@ private ExplicitContentFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -728,7 +725,7 @@ public ExplicitContentFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentFrame(input, extensionRegistry);
+        return new ExplicitContentFrame(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceAnnotation.java
index a42cd9434800..267fda2b6e36 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceAnnotation.java
@@ -35,9 +35,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1328,7 +1325,7 @@ public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceDetectionConfig.java
index 41bbdc0b2843..cc057326f5b4 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceDetectionConfig.java
@@ -34,9 +34,6 @@ private FaceDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -620,7 +617,7 @@ public FaceDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceDetectionConfig(input, extensionRegistry);
+        return new FaceDetectionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceFrame.java
index d3d9bdbf5d6c..fc8b3345fc1c 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceFrame.java
@@ -33,9 +33,6 @@ private FaceFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1103,7 +1100,7 @@ public FaceFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceFrame(input, extensionRegistry);
+        return new FaceFrame(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceSegment.java
index 6505566955a9..8aab63729591 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceSegment.java
@@ -32,9 +32,6 @@ private FaceSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public FaceSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceSegment(input, extensionRegistry);
+        return new FaceSegment(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelAnnotation.java
index f6819f78a37f..a8227df47c84 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelAnnotation.java
@@ -35,9 +35,6 @@ private LabelAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1984,7 +1981,7 @@ public LabelAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelAnnotation(input, extensionRegistry);
+        return new LabelAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelDetectionConfig.java
index d60e2e042979..99a65c824943 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelDetectionConfig.java
@@ -35,9 +35,6 @@ private LabelDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -753,7 +750,7 @@ public LabelDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelDetectionConfig(input, extensionRegistry);
+        return new LabelDetectionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelFrame.java
index af015fd1edb6..7a89b7e7fd24 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelFrame.java
@@ -33,9 +33,6 @@ private LabelFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -694,7 +691,7 @@ public LabelFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelFrame(input, extensionRegistry);
+        return new LabelFrame(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelSegment.java
index 45f8319ec6c1..355570125b33 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelSegment.java
@@ -33,9 +33,6 @@ private LabelSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -682,7 +679,7 @@ public LabelSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelSegment(input, extensionRegistry);
+        return new LabelSegment(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingBox.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingBox.java
index 2054c4a382e9..39e6f6303d66 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingBox.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingBox.java
@@ -38,9 +38,6 @@ private NormalizedBoundingBox(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -688,7 +685,7 @@ public NormalizedBoundingBox parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NormalizedBoundingBox(input, extensionRegistry);
+        return new NormalizedBoundingBox(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ShotChangeDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ShotChangeDetectionConfig.java
index 3fffe7730ea4..894a90436dc3 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ShotChangeDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ShotChangeDetectionConfig.java
@@ -33,9 +33,6 @@ private ShotChangeDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public ShotChangeDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ShotChangeDetectionConfig(input, extensionRegistry);
+        return new ShotChangeDetectionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationProgress.java
index b04416eeb9e2..c15ce718939f 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationProgress.java
@@ -34,9 +34,6 @@ private VideoAnnotationProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1074,7 +1071,7 @@ public VideoAnnotationProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationProgress(input, extensionRegistry);
+        return new VideoAnnotationProgress(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationResults.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationResults.java
index db4bfb96659f..39967c55ae4b 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationResults.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationResults.java
@@ -38,9 +38,6 @@ private VideoAnnotationResults(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3257,7 +3254,7 @@ public VideoAnnotationResults parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationResults(input, extensionRegistry);
+        return new VideoAnnotationResults(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoContext.java
index d375362d4ec0..5f11200b4fca 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoContext.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoContext.java
@@ -33,9 +33,6 @@ private VideoContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1778,7 +1775,7 @@ public VideoContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoContext(input, extensionRegistry);
+        return new VideoContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceProto.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceProto.java
index 8f1c0530c092..c407e4a7bf55 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceProto.java
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "status.proto\"\357\001\n\024AnnotateVideoRequest\022\021\n" +
       "\tinput_uri\030\001 \001(\t\022\025\n\rinput_content\030\006 \001(\014\022" +
       "<\n\010features\030\002 \003(\0162*.google.cloud.videoin" +
-      "telligence.v1.Feature\022F\n\rvideo_context\030\003" +
+      "telligence.v1.Feature\022F\n\rvideo_context\030\003",
       " \001(\0132/.google.cloud.videointelligence.v1" +
       ".VideoContext\022\022\n\noutput_uri\030\004 \001(\t\022\023\n\013loc" +
       "ation_id\030\005 \001(\t\"\323\003\n\014VideoContext\022A\n\010segme" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "nce.v1.LabelDetectionConfig\022b\n\034shot_chan" +
       "ge_detection_config\030\003 \001(\0132<.google.cloud" +
       ".videointelligence.v1.ShotChangeDetectio" +
-      "nConfig\022l\n!explicit_content_detection_co" +
+      "nConfig\022l\n!explicit_content_detection_co",
       "nfig\030\004 \001(\0132A.google.cloud.videointellige" +
       "nce.v1.ExplicitContentDetectionConfig\022U\n" +
       "\025face_detection_config\030\005 \001(\01326.google.cl" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "intelligence.v1.LabelDetectionMode\022\031\n\021st" +
       "ationary_camera\030\002 \001(\010\022\r\n\005model\030\003 \001(\t\"*\n\031" +
       "ShotChangeDetectionConfig\022\r\n\005model\030\001 \001(\t" +
-      "\"/\n\036ExplicitContentDetectionConfig\022\r\n\005mo" +
+      "\"/\n\036ExplicitContentDetectionConfig\022\r\n\005mo",
       "del\030\001 \001(\t\"D\n\023FaceDetectionConfig\022\r\n\005mode" +
       "l\030\001 \001(\t\022\036\n\026include_bounding_boxes\030\002 \001(\010\"" +
       "x\n\014VideoSegment\0224\n\021start_time_offset\030\001 \001" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "gle.cloud.videointelligence.v1.VideoSegm" +
       "ent\022\022\n\nconfidence\030\002 \001(\002\"P\n\nLabelFrame\022.\n" +
       "\013time_offset\030\001 \001(\0132\031.google.protobuf.Dur" +
-      "ation\022\022\n\nconfidence\030\002 \001(\002\"G\n\006Entity\022\021\n\te" +
+      "ation\022\022\n\nconfidence\030\002 \001(\002\"G\n\006Entity\022\021\n\te",
       "ntity_id\030\001 \001(\t\022\023\n\013description\030\002 \001(\t\022\025\n\rl" +
       "anguage_code\030\003 \001(\t\"\224\002\n\017LabelAnnotation\0229" +
       "\n\006entity\030\001 \001(\0132).google.cloud.videointel" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       ".videointelligence.v1.LabelSegment\022=\n\006fr" +
       "ames\030\004 \003(\0132-.google.cloud.videointellige" +
       "nce.v1.LabelFrame\"\225\001\n\024ExplicitContentFra" +
-      "me\022.\n\013time_offset\030\001 \001(\0132\031.google.protobu" +
+      "me\022.\n\013time_offset\030\001 \001(\0132\031.google.protobu",
       "f.Duration\022M\n\026pornography_likelihood\030\002 \001" +
       "(\0162-.google.cloud.videointelligence.v1.L" +
       "ikelihood\"d\n\031ExplicitContentAnnotation\022G" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "\001(\002\022\r\n\005right\030\003 \001(\002\022\016\n\006bottom\030\004 \001(\002\"O\n\013Fa" +
       "ceSegment\022@\n\007segment\030\001 \001(\0132/.google.clou" +
       "d.videointelligence.v1.VideoSegment\"\230\001\n\t" +
-      "FaceFrame\022[\n\031normalized_bounding_boxes\030\001" +
+      "FaceFrame\022[\n\031normalized_bounding_boxes\030\001",
       " \003(\01328.google.cloud.videointelligence.v1" +
       ".NormalizedBoundingBox\022.\n\013time_offset\030\002 " +
       "\001(\0132\031.google.protobuf.Duration\"\243\001\n\016FaceA" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "cloud.videointelligence.v1.FaceFrame\"\301\004\n" +
       "\026VideoAnnotationResults\022\021\n\tinput_uri\030\001 \001" +
       "(\t\022U\n\031segment_label_annotations\030\002 \003(\01322." +
-      "google.cloud.videointelligence.v1.LabelA" +
+      "google.cloud.videointelligence.v1.LabelA",
       "nnotation\022R\n\026shot_label_annotations\030\003 \003(" +
       "\01322.google.cloud.videointelligence.v1.La" +
       "belAnnotation\022S\n\027frame_label_annotations" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       ".FaceAnnotation\022I\n\020shot_annotations\030\006 \003(" +
       "\0132/.google.cloud.videointelligence.v1.Vi" +
       "deoSegment\022Y\n\023explicit_annotation\030\007 \001(\0132" +
-      "<.google.cloud.videointelligence.v1.Expl" +
+      "<.google.cloud.videointelligence.v1.Expl",
       "icitContentAnnotation\022!\n\005error\030\t \001(\0132\022.g" +
       "oogle.rpc.Status\"n\n\025AnnotateVideoRespons" +
       "e\022U\n\022annotation_results\030\001 \003(\01329.google.c" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "\005\022.\n\nstart_time\030\003 \001(\0132\032.google.protobuf." +
       "Timestamp\022/\n\013update_time\030\004 \001(\0132\032.google." +
       "protobuf.Timestamp\"p\n\025AnnotateVideoProgr" +
-      "ess\022W\n\023annotation_progress\030\001 \003(\0132:.googl" +
+      "ess\022W\n\023annotation_progress\030\001 \003(\0132:.googl",
       "e.cloud.videointelligence.v1.VideoAnnota" +
       "tionProgress*\206\001\n\007Feature\022\027\n\023FEATURE_UNSP" +
       "ECIFIED\020\000\022\023\n\017LABEL_DETECTION\020\001\022\031\n\025SHOT_C" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "ECIFIED\020\000\022\r\n\tSHOT_MODE\020\001\022\016\n\nFRAME_MODE\020\002" +
       "\022\027\n\023SHOT_AND_FRAME_MODE\020\003*t\n\nLikelihood\022" +
       "\032\n\026LIKELIHOOD_UNSPECIFIED\020\000\022\021\n\rVERY_UNLI" +
-      "KELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LI" +
+      "KELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LI",
       "KELY\020\004\022\017\n\013VERY_LIKELY\020\0052\244\001\n\030VideoIntelli" +
       "genceService\022\207\001\n\rAnnotateVideo\0227.google." +
       "cloud.videointelligence.v1.AnnotateVideo" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "ntelligenceServiceProtoP\001ZRgoogle.golang" +
       ".org/genproto/googleapis/cloud/videointe" +
       "lligence/v1;videointelligence\252\002!Google.C" +
-      "loud.VideoIntelligence.V1\312\002!Google\\Cloud" +
+      "loud.VideoIntelligence.V1\312\002!Google\\Cloud",
       "\\VideoIntelligence\\V1b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoSegment.java
index 6fd0bc480b42..6d52ff692c66 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoSegment.java
@@ -32,9 +32,6 @@ private VideoSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -858,7 +855,7 @@ public VideoSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoSegment(input, extensionRegistry);
+        return new VideoSegment(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoProgress.java
index afff8c254be9..b5db845c5bb7 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoProgress.java
@@ -35,9 +35,6 @@ private AnnotateVideoProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public AnnotateVideoProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoProgress(input, extensionRegistry);
+        return new AnnotateVideoProgress(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoRequest.java
index 5d5564c6ed8d..3b91c30b7fe6 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoRequest.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoRequest.java
@@ -37,9 +37,6 @@ private AnnotateVideoRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1649,7 +1646,7 @@ public AnnotateVideoRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoRequest(input, extensionRegistry);
+        return new AnnotateVideoRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoResponse.java
index 969bee9991bf..ac38e7c55d61 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoResponse.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoResponse.java
@@ -35,9 +35,6 @@ private AnnotateVideoResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public AnnotateVideoResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoResponse(input, extensionRegistry);
+        return new AnnotateVideoResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/BoundingBox.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/BoundingBox.java
index d95452621c0f..355c5be6f465 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/BoundingBox.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/BoundingBox.java
@@ -36,9 +36,6 @@ private BoundingBox(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -672,7 +669,7 @@ public BoundingBox parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BoundingBox(input, extensionRegistry);
+        return new BoundingBox(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceAnnotation.java
index 7bf277a0e090..a01242dac9f3 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceAnnotation.java
@@ -35,9 +35,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1452,7 +1449,7 @@ public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceLocation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceLocation.java
index 0a16e6be4138..72263f6c7898 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceLocation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceLocation.java
@@ -33,9 +33,6 @@ private FaceLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -680,7 +677,7 @@ public FaceLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceLocation(input, extensionRegistry);
+        return new FaceLocation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelAnnotation.java
index af90c5cd43f7..7e67d5ee5b48 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelAnnotation.java
@@ -35,9 +35,6 @@ private LabelAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1126,7 +1123,7 @@ public LabelAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelAnnotation(input, extensionRegistry);
+        return new LabelAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelLocation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelLocation.java
index 93c37b5c0a1b..5809618cf496 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelLocation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelLocation.java
@@ -34,9 +34,6 @@ private LabelLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -829,7 +826,7 @@ public LabelLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelLocation(input, extensionRegistry);
+        return new LabelLocation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/SafeSearchAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/SafeSearchAnnotation.java
index cd2de3ff31f6..cfd747c36969 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/SafeSearchAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/SafeSearchAnnotation.java
@@ -42,9 +42,6 @@ private SafeSearchAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1021,7 +1018,7 @@ public SafeSearchAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SafeSearchAnnotation(input, extensionRegistry);
+        return new SafeSearchAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationProgress.java
index 8fb006345c52..b254846e0cd6 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationProgress.java
@@ -34,9 +34,6 @@ private VideoAnnotationProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1074,7 +1071,7 @@ public VideoAnnotationProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationProgress(input, extensionRegistry);
+        return new VideoAnnotationProgress(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationResults.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationResults.java
index 97d3a3532aa3..acbc8fb44f77 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationResults.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationResults.java
@@ -37,9 +37,6 @@ private VideoAnnotationResults(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2524,7 +2521,7 @@ public VideoAnnotationResults parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationResults(input, extensionRegistry);
+        return new VideoAnnotationResults(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoContext.java
index 4fca9f5179bc..e3c6b3c9e625 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoContext.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoContext.java
@@ -39,9 +39,6 @@ private VideoContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1714,7 +1711,7 @@ public VideoContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoContext(input, extensionRegistry);
+        return new VideoContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceProto.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceProto.java
index 445cded9cc75..c11823b89f06 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceProto.java
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "ateVideoRequest\022\021\n\tinput_uri\030\001 \001(\t\022\025\n\rin" +
       "put_content\030\006 \001(\t\022A\n\010features\030\002 \003(\0162/.go" +
       "ogle.cloud.videointelligence.v1beta1.Fea" +
-      "ture\022K\n\rvideo_context\030\003 \001(\01324.google.clo" +
+      "ture\022K\n\rvideo_context\030\003 \001(\01324.google.clo",
       "ud.videointelligence.v1beta1.VideoContex" +
       "t\022\022\n\noutput_uri\030\004 \001(\t\022\023\n\013location_id\030\005 \001" +
       "(\t\"\322\002\n\014VideoContext\022F\n\010segments\030\001 \003(\01324." +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "a1.LabelDetectionMode\022\031\n\021stationary_came" +
       "ra\030\003 \001(\010\022\035\n\025label_detection_model\030\004 \001(\t\022" +
       "\034\n\024face_detection_model\030\005 \001(\t\022#\n\033shot_ch" +
-      "ange_detection_model\030\006 \001(\t\022#\n\033safe_searc" +
+      "ange_detection_model\030\006 \001(\t\022#\n\033safe_searc",
       "h_detection_model\030\007 \001(\t\"B\n\014VideoSegment\022" +
       "\031\n\021start_time_offset\030\001 \001(\003\022\027\n\017end_time_o" +
       "ffset\030\002 \001(\003\"\255\001\n\rLabelLocation\022E\n\007segment" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "lligence.v1beta1.LabelLevel\"\207\001\n\017LabelAnn" +
       "otation\022\023\n\013description\030\001 \001(\t\022\025\n\rlanguage" +
       "_code\030\002 \001(\t\022H\n\tlocations\030\003 \003(\01325.google." +
-      "cloud.videointelligence.v1beta1.LabelLoc" +
+      "cloud.videointelligence.v1beta1.LabelLoc",
       "ation\"\375\002\n\024SafeSearchAnnotation\022A\n\005adult\030" +
       "\001 \001(\01622.google.cloud.videointelligence.v" +
       "1beta1.Likelihood\022A\n\005spoof\030\002 \001(\01622.googl" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "lent\030\004 \001(\01622.google.cloud.videointellige" +
       "nce.v1beta1.Likelihood\022@\n\004racy\030\005 \001(\01622.g" +
       "oogle.cloud.videointelligence.v1beta1.Li" +
-      "kelihood\022\023\n\013time_offset\030\006 \001(\003\"G\n\013Boundin" +
+      "kelihood\022\023\n\013time_offset\030\006 \001(\003\"G\n\013Boundin",
       "gBox\022\014\n\004left\030\001 \001(\005\022\r\n\005right\030\002 \001(\005\022\016\n\006bot" +
       "tom\030\003 \001(\005\022\013\n\003top\030\004 \001(\005\"n\n\014FaceLocation\022I" +
       "\n\014bounding_box\030\001 \001(\01323.google.cloud.vide" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "cloud.videointelligence.v1beta1.VideoSeg" +
       "ment\022G\n\tlocations\030\003 \003(\01324.google.cloud.v" +
       "ideointelligence.v1beta1.FaceLocation\"\243\003" +
-      "\n\026VideoAnnotationResults\022\021\n\tinput_uri\030\001 " +
+      "\n\026VideoAnnotationResults\022\021\n\tinput_uri\030\001 ",
       "\001(\t\022R\n\021label_annotations\030\002 \003(\01327.google." +
       "cloud.videointelligence.v1beta1.LabelAnn" +
       "otation\022P\n\020face_annotations\030\003 \003(\01326.goog" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "eoSegment\022]\n\027safe_search_annotations\030\006 \003" +
       "(\0132<.google.cloud.videointelligence.v1be" +
       "ta1.SafeSearchAnnotation\022!\n\005error\030\005 \001(\0132" +
-      "\022.google.rpc.Status\"s\n\025AnnotateVideoResp" +
+      "\022.google.rpc.Status\"s\n\025AnnotateVideoResp",
       "onse\022Z\n\022annotation_results\030\001 \003(\0132>.googl" +
       "e.cloud.videointelligence.v1beta1.VideoA" +
       "nnotationResults\"\247\001\n\027VideoAnnotationProg" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       ".google.protobuf.Timestamp\"u\n\025AnnotateVi" +
       "deoProgress\022\\\n\023annotation_progress\030\001 \003(\013" +
       "2?.google.cloud.videointelligence.v1beta" +
-      "1.VideoAnnotationProgress*\201\001\n\007Feature\022\027\n" +
+      "1.VideoAnnotationProgress*\201\001\n\007Feature\022\027\n",
       "\023FEATURE_UNSPECIFIED\020\000\022\023\n\017LABEL_DETECTIO" +
       "N\020\001\022\022\n\016FACE_DETECTION\020\002\022\031\n\025SHOT_CHANGE_D" +
       "ETECTION\020\003\022\031\n\025SAFE_SEARCH_DETECTION\020\004*n\n" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "tectionMode\022$\n LABEL_DETECTION_MODE_UNSP" +
       "ECIFIED\020\000\022\r\n\tSHOT_MODE\020\001\022\016\n\nFRAME_MODE\020\002" +
       "\022\027\n\023SHOT_AND_FRAME_MODE\020\003*e\n\nLikelihood\022" +
-      "\013\n\007UNKNOWN\020\000\022\021\n\rVERY_UNLIKELY\020\001\022\014\n\010UNLIK" +
+      "\013\n\007UNKNOWN\020\000\022\021\n\rVERY_UNLIKELY\020\001\022\014\n\010UNLIK",
       "ELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIKELY\020\004\022\017\n\013VERY_" +
       "LIKELY\020\0052\256\001\n\030VideoIntelligenceService\022\221\001" +
       "\n\rAnnotateVideo\022<.google.cloud.videointe" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       ".cloud.videointelligence.v1beta1B\035VideoI" +
       "ntelligenceServiceProtoP\001ZWgoogle.golang" +
       ".org/genproto/googleapis/cloud/videointe" +
-      "lligence/v1beta1;videointelligence\252\002&Goo" +
+      "lligence/v1beta1;videointelligence\252\002&Goo",
       "gle.Cloud.VideoIntelligence.V1Beta1\312\002&Go" +
       "ogle\\Cloud\\VideoIntelligence\\V1beta1b\006pr" +
       "oto3"
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoSegment.java
index 481c3754a419..81f8355f4f6a 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoSegment.java
@@ -34,9 +34,6 @@ private VideoSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -526,7 +523,7 @@ public VideoSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoSegment(input, extensionRegistry);
+        return new VideoSegment(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoProgress.java
index 77e386aa13d3..65c4e26a91d4 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoProgress.java
@@ -35,9 +35,6 @@ private AnnotateVideoProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public AnnotateVideoProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoProgress(input, extensionRegistry);
+        return new AnnotateVideoProgress(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoRequest.java
index 64996dd51f81..e4d7dc7195d1 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoRequest.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoRequest.java
@@ -37,9 +37,6 @@ private AnnotateVideoRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1572,7 +1569,7 @@ public AnnotateVideoRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoRequest(input, extensionRegistry);
+        return new AnnotateVideoRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoResponse.java
index 0c619b09952d..e4a0777e6c74 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoResponse.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoResponse.java
@@ -35,9 +35,6 @@ private AnnotateVideoResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public AnnotateVideoResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoResponse(input, extensionRegistry);
+        return new AnnotateVideoResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/Entity.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/Entity.java
index 4e1af076c4fb..d630fd56f843 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/Entity.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/Entity.java
@@ -35,9 +35,6 @@ private Entity(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -855,7 +852,7 @@ public Entity parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Entity(input, extensionRegistry);
+        return new Entity(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentAnnotation.java
index afac45d5a41b..9f6c8af61abf 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentAnnotation.java
@@ -35,9 +35,6 @@ private ExplicitContentAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public ExplicitContentAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentAnnotation(input, extensionRegistry);
+        return new ExplicitContentAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentDetectionConfig.java
index 1cd32f48e34b..73ce34ef268d 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentDetectionConfig.java
@@ -33,9 +33,6 @@ private ExplicitContentDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public ExplicitContentDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentDetectionConfig(input, extensionRegistry);
+        return new ExplicitContentDetectionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentFrame.java
index 9eaa719c067b..20bde768f1e2 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentFrame.java
@@ -33,9 +33,6 @@ private ExplicitContentFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -728,7 +725,7 @@ public ExplicitContentFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentFrame(input, extensionRegistry);
+        return new ExplicitContentFrame(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceAnnotation.java
index 2757704da715..322add054250 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceAnnotation.java
@@ -35,9 +35,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1328,7 +1325,7 @@ public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceDetectionConfig.java
index aa27bc56c7c8..360cdd968096 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceDetectionConfig.java
@@ -34,9 +34,6 @@ private FaceDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -620,7 +617,7 @@ public FaceDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceDetectionConfig(input, extensionRegistry);
+        return new FaceDetectionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceFrame.java
index d9d0cee07281..3d561ebdb346 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceFrame.java
@@ -33,9 +33,6 @@ private FaceFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1103,7 +1100,7 @@ public FaceFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceFrame(input, extensionRegistry);
+        return new FaceFrame(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceSegment.java
index 0a66f2f689cc..9cb84f3759f0 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceSegment.java
@@ -32,9 +32,6 @@ private FaceSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public FaceSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceSegment(input, extensionRegistry);
+        return new FaceSegment(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelAnnotation.java
index b628e9c194b6..d7ad4b4d8561 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelAnnotation.java
@@ -35,9 +35,6 @@ private LabelAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1984,7 +1981,7 @@ public LabelAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelAnnotation(input, extensionRegistry);
+        return new LabelAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelDetectionConfig.java
index 8aff8f1e057f..2326c9b4bbe2 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelDetectionConfig.java
@@ -35,9 +35,6 @@ private LabelDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -753,7 +750,7 @@ public LabelDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelDetectionConfig(input, extensionRegistry);
+        return new LabelDetectionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelFrame.java
index bfd7a7fdde80..644883f78ef7 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelFrame.java
@@ -33,9 +33,6 @@ private LabelFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -694,7 +691,7 @@ public LabelFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelFrame(input, extensionRegistry);
+        return new LabelFrame(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelSegment.java
index da63d18238a9..ef205323489b 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelSegment.java
@@ -33,9 +33,6 @@ private LabelSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -682,7 +679,7 @@ public LabelSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelSegment(input, extensionRegistry);
+        return new LabelSegment(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/NormalizedBoundingBox.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/NormalizedBoundingBox.java
index 235209ad57d1..d66f9bff9f79 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/NormalizedBoundingBox.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/NormalizedBoundingBox.java
@@ -38,9 +38,6 @@ private NormalizedBoundingBox(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -688,7 +685,7 @@ public NormalizedBoundingBox parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NormalizedBoundingBox(input, extensionRegistry);
+        return new NormalizedBoundingBox(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ShotChangeDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ShotChangeDetectionConfig.java
index 6b2a19cde250..316475e0a84f 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ShotChangeDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ShotChangeDetectionConfig.java
@@ -33,9 +33,6 @@ private ShotChangeDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public ShotChangeDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ShotChangeDetectionConfig(input, extensionRegistry);
+        return new ShotChangeDetectionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationProgress.java
index 837076bbfc92..9ff8fe127114 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationProgress.java
@@ -34,9 +34,6 @@ private VideoAnnotationProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1074,7 +1071,7 @@ public VideoAnnotationProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationProgress(input, extensionRegistry);
+        return new VideoAnnotationProgress(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationResults.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationResults.java
index 75fc326b43c5..4b2b67c936b1 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationResults.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationResults.java
@@ -38,9 +38,6 @@ private VideoAnnotationResults(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3257,7 +3254,7 @@ public VideoAnnotationResults parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationResults(input, extensionRegistry);
+        return new VideoAnnotationResults(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoContext.java
index 8512be0b7773..afc3dec3a9ab 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoContext.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoContext.java
@@ -33,9 +33,6 @@ private VideoContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1778,7 +1775,7 @@ public VideoContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoContext(input, extensionRegistry);
+        return new VideoContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceProto.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceProto.java
index 30b0c58e3805..170d6593630d 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceProto.java
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "oogle/rpc/status.proto\"\371\001\n\024AnnotateVideo" +
       "Request\022\021\n\tinput_uri\030\001 \001(\t\022\025\n\rinput_cont" +
       "ent\030\006 \001(\014\022A\n\010features\030\002 \003(\0162/.google.clo" +
-      "ud.videointelligence.v1beta2.Feature\022K\n\r" +
+      "ud.videointelligence.v1beta2.Feature\022K\n\r",
       "video_context\030\003 \001(\01324.google.cloud.video" +
       "intelligence.v1beta2.VideoContext\022\022\n\nout" +
       "put_uri\030\004 \001(\t\022\023\n\013location_id\030\005 \001(\t\"\354\003\n\014V" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "ogle.cloud.videointelligence.v1beta2.Lab" +
       "elDetectionConfig\022g\n\034shot_change_detecti" +
       "on_config\030\003 \001(\0132A.google.cloud.videointe" +
-      "lligence.v1beta2.ShotChangeDetectionConf" +
+      "lligence.v1beta2.ShotChangeDetectionConf",
       "ig\022q\n!explicit_content_detection_config\030" +
       "\004 \001(\0132F.google.cloud.videointelligence.v" +
       "1beta2.ExplicitContentDetectionConfig\022Z\n" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "bel_detection_mode\030\001 \001(\0162:.google.cloud." +
       "videointelligence.v1beta2.LabelDetection" +
       "Mode\022\031\n\021stationary_camera\030\002 \001(\010\022\r\n\005model" +
-      "\030\003 \001(\t\"*\n\031ShotChangeDetectionConfig\022\r\n\005m" +
+      "\030\003 \001(\t\"*\n\031ShotChangeDetectionConfig\022\r\n\005m",
       "odel\030\001 \001(\t\"/\n\036ExplicitContentDetectionCo" +
       "nfig\022\r\n\005model\030\001 \001(\t\"D\n\023FaceDetectionConf" +
       "ig\022\r\n\005model\030\001 \001(\t\022\036\n\026include_bounding_bo" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "uf.Duration\"i\n\014LabelSegment\022E\n\007segment\030\001" +
       " \001(\01324.google.cloud.videointelligence.v1" +
       "beta2.VideoSegment\022\022\n\nconfidence\030\002 \001(\002\"P" +
-      "\n\nLabelFrame\022.\n\013time_offset\030\001 \001(\0132\031.goog" +
+      "\n\nLabelFrame\022.\n\013time_offset\030\001 \001(\0132\031.goog",
       "le.protobuf.Duration\022\022\n\nconfidence\030\002 \001(\002" +
       "\"G\n\006Entity\022\021\n\tentity_id\030\001 \001(\t\022\023\n\013descrip" +
       "tion\030\002 \001(\t\022\025\n\rlanguage_code\030\003 \001(\t\"\250\002\n\017La" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "videointelligence.v1beta2.Entity\022F\n\010segm" +
       "ents\030\003 \003(\01324.google.cloud.videointellige" +
       "nce.v1beta2.LabelSegment\022B\n\006frames\030\004 \003(\013" +
-      "22.google.cloud.videointelligence.v1beta" +
+      "22.google.cloud.videointelligence.v1beta",
       "2.LabelFrame\"\232\001\n\024ExplicitContentFrame\022.\n" +
       "\013time_offset\030\001 \001(\0132\031.google.protobuf.Dur" +
       "ation\022R\n\026pornography_likelihood\030\002 \001(\01622." +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "ligence.v1beta2.ExplicitContentFrame\"Q\n\025" +
       "NormalizedBoundingBox\022\014\n\004left\030\001 \001(\002\022\013\n\003t" +
       "op\030\002 \001(\002\022\r\n\005right\030\003 \001(\002\022\016\n\006bottom\030\004 \001(\002\"" +
-      "T\n\013FaceSegment\022E\n\007segment\030\001 \001(\01324.google" +
+      "T\n\013FaceSegment\022E\n\007segment\030\001 \001(\01324.google",
       ".cloud.videointelligence.v1beta2.VideoSe" +
       "gment\"\235\001\n\tFaceFrame\022`\n\031normalized_boundi" +
       "ng_boxes\030\001 \003(\0132=.google.cloud.videointel" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "\001(\014\022E\n\010segments\030\002 \003(\01323.google.cloud.vid" +
       "eointelligence.v1beta2.FaceSegment\022A\n\006fr" +
       "ames\030\003 \003(\01321.google.cloud.videointellige" +
-      "nce.v1beta2.FaceFrame\"\337\004\n\026VideoAnnotatio" +
+      "nce.v1beta2.FaceFrame\"\337\004\n\026VideoAnnotatio",
       "nResults\022\021\n\tinput_uri\030\001 \001(\t\022Z\n\031segment_l" +
       "abel_annotations\030\002 \003(\01327.google.cloud.vi" +
       "deointelligence.v1beta2.LabelAnnotation\022" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "\01327.google.cloud.videointelligence.v1bet" +
       "a2.LabelAnnotation\022P\n\020face_annotations\030\005" +
       " \003(\01326.google.cloud.videointelligence.v1" +
-      "beta2.FaceAnnotation\022N\n\020shot_annotations" +
+      "beta2.FaceAnnotation\022N\n\020shot_annotations",
       "\030\006 \003(\01324.google.cloud.videointelligence." +
       "v1beta2.VideoSegment\022^\n\023explicit_annotat" +
       "ion\030\007 \001(\0132A.google.cloud.videointelligen" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       " \003(\0132>.google.cloud.videointelligence.v1" +
       "beta2.VideoAnnotationResults\"\247\001\n\027VideoAn" +
       "notationProgress\022\021\n\tinput_uri\030\001 \001(\t\022\030\n\020p" +
-      "rogress_percent\030\002 \001(\005\022.\n\nstart_time\030\003 \001(" +
+      "rogress_percent\030\002 \001(\005\022.\n\nstart_time\030\003 \001(",
       "\0132\032.google.protobuf.Timestamp\022/\n\013update_" +
       "time\030\004 \001(\0132\032.google.protobuf.Timestamp\"u" +
       "\n\025AnnotateVideoProgress\022\\\n\023annotation_pr" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "BEL_DETECTION\020\001\022\031\n\025SHOT_CHANGE_DETECTION" +
       "\020\002\022\036\n\032EXPLICIT_CONTENT_DETECTION\020\003\022\022\n\016FA" +
       "CE_DETECTION\020\004*r\n\022LabelDetectionMode\022$\n " +
-      "LABEL_DETECTION_MODE_UNSPECIFIED\020\000\022\r\n\tSH" +
+      "LABEL_DETECTION_MODE_UNSPECIFIED\020\000\022\r\n\tSH",
       "OT_MODE\020\001\022\016\n\nFRAME_MODE\020\002\022\027\n\023SHOT_AND_FR" +
       "AME_MODE\020\003*t\n\nLikelihood\022\032\n\026LIKELIHOOD_U" +
       "NSPECIFIED\020\000\022\021\n\rVERY_UNLIKELY\020\001\022\014\n\010UNLIK" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "lligence.v1beta2.AnnotateVideoRequest\032\035." +
       "google.longrunning.Operation\"#\202\323\344\223\002\035\"\030/v" +
       "1beta2/videos:annotate:\001*B\370\001\n*com.google" +
-      ".cloud.videointelligence.v1beta2B\035VideoI" +
+      ".cloud.videointelligence.v1beta2B\035VideoI",
       "ntelligenceServiceProtoP\001ZWgoogle.golang" +
       ".org/genproto/googleapis/cloud/videointe" +
       "lligence/v1beta2;videointelligence\252\002&Goo" +
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoSegment.java
index 74d4a0605ecb..88e952c193d0 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoSegment.java
@@ -32,9 +32,6 @@ private VideoSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -858,7 +855,7 @@ public VideoSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoSegment(input, extensionRegistry);
+        return new VideoSegment(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoProgress.java
index 12d6ae1a35ec..b1a3acb632ce 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoProgress.java
@@ -35,9 +35,6 @@ private AnnotateVideoProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public AnnotateVideoProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoProgress(input, extensionRegistry);
+        return new AnnotateVideoProgress(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoRequest.java
index be80bb0a4011..715fd750d022 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoRequest.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoRequest.java
@@ -37,9 +37,6 @@ private AnnotateVideoRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1572,7 +1569,7 @@ public AnnotateVideoRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoRequest(input, extensionRegistry);
+        return new AnnotateVideoRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoResponse.java
index b518c8dbc3b2..f7830bd5c092 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoResponse.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoResponse.java
@@ -35,9 +35,6 @@ private AnnotateVideoResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public AnnotateVideoResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoResponse(input, extensionRegistry);
+        return new AnnotateVideoResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/Entity.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/Entity.java
index 6130e90bac13..192f2a41090c 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/Entity.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/Entity.java
@@ -35,9 +35,6 @@ private Entity(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -855,7 +852,7 @@ public Entity parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Entity(input, extensionRegistry);
+        return new Entity(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentAnnotation.java
index c5b7534426da..b6d54a78c96a 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentAnnotation.java
@@ -35,9 +35,6 @@ private ExplicitContentAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,7 +814,7 @@ public ExplicitContentAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentAnnotation(input, extensionRegistry);
+        return new ExplicitContentAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentDetectionConfig.java
index 6a4c29fbaf51..e207b8079545 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentDetectionConfig.java
@@ -33,9 +33,6 @@ private ExplicitContentDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public ExplicitContentDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentDetectionConfig(input, extensionRegistry);
+        return new ExplicitContentDetectionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentFrame.java
index b4cd1b429136..66976f4040bc 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentFrame.java
@@ -33,9 +33,6 @@ private ExplicitContentFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -728,7 +725,7 @@ public ExplicitContentFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentFrame(input, extensionRegistry);
+        return new ExplicitContentFrame(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelAnnotation.java
index 1070ce2564ca..ca28b82bdae2 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelAnnotation.java
@@ -35,9 +35,6 @@ private LabelAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1984,7 +1981,7 @@ public LabelAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelAnnotation(input, extensionRegistry);
+        return new LabelAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelDetectionConfig.java
index dc9b3d3550f9..7911ddf85366 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelDetectionConfig.java
@@ -35,9 +35,6 @@ private LabelDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -753,7 +750,7 @@ public LabelDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelDetectionConfig(input, extensionRegistry);
+        return new LabelDetectionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelFrame.java
index 7f75b1e1dc43..98601f40c42f 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelFrame.java
@@ -33,9 +33,6 @@ private LabelFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -694,7 +691,7 @@ public LabelFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelFrame(input, extensionRegistry);
+        return new LabelFrame(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelSegment.java
index b3699c57712e..1971b71500d3 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelSegment.java
@@ -33,9 +33,6 @@ private LabelSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -682,7 +679,7 @@ public LabelSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelSegment(input, extensionRegistry);
+        return new LabelSegment(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/NormalizedBoundingBox.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/NormalizedBoundingBox.java
index 4415dc2c1da2..5e32306e943e 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/NormalizedBoundingBox.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/NormalizedBoundingBox.java
@@ -38,9 +38,6 @@ private NormalizedBoundingBox(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -688,7 +685,7 @@ public NormalizedBoundingBox parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NormalizedBoundingBox(input, extensionRegistry);
+        return new NormalizedBoundingBox(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ShotChangeDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ShotChangeDetectionConfig.java
index 143338a655d2..892c40e31907 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ShotChangeDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ShotChangeDetectionConfig.java
@@ -33,9 +33,6 @@ private ShotChangeDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public ShotChangeDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ShotChangeDetectionConfig(input, extensionRegistry);
+        return new ShotChangeDetectionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechContext.java
index 4f49f38e1a77..1d295005931c 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechContext.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechContext.java
@@ -34,9 +34,6 @@ private SpeechContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -667,7 +664,7 @@ public SpeechContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechContext(input, extensionRegistry);
+        return new SpeechContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechRecognitionAlternative.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechRecognitionAlternative.java
index df8240aa34cf..2da35c224755 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechRecognitionAlternative.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechRecognitionAlternative.java
@@ -35,9 +35,6 @@ private SpeechRecognitionAlternative(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1068,7 +1065,7 @@ public SpeechRecognitionAlternative parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechRecognitionAlternative(input, extensionRegistry);
+        return new SpeechRecognitionAlternative(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscription.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscription.java
index e08bf39ca161..5d2d570d4c91 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscription.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscription.java
@@ -33,9 +33,6 @@ private SpeechTranscription(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -882,7 +879,7 @@ public SpeechTranscription parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechTranscription(input, extensionRegistry);
+        return new SpeechTranscription(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscriptionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscriptionConfig.java
index f913dc6c3f80..fc0c5c1d5233 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscriptionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscriptionConfig.java
@@ -37,9 +37,6 @@ private SpeechTranscriptionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1385,7 +1382,7 @@ public SpeechTranscriptionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechTranscriptionConfig(input, extensionRegistry);
+        return new SpeechTranscriptionConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationProgress.java
index 63d02624507a..54a7358117fd 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationProgress.java
@@ -34,9 +34,6 @@ private VideoAnnotationProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1074,7 +1071,7 @@ public VideoAnnotationProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationProgress(input, extensionRegistry);
+        return new VideoAnnotationProgress(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationResults.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationResults.java
index eeb462d5d555..7981de60c1aa 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationResults.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationResults.java
@@ -38,9 +38,6 @@ private VideoAnnotationResults(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3257,7 +3254,7 @@ public VideoAnnotationResults parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationResults(input, extensionRegistry);
+        return new VideoAnnotationResults(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoContext.java
index 1bb84009830b..b1658ed1f16e 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoContext.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoContext.java
@@ -33,9 +33,6 @@ private VideoContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1778,7 +1775,7 @@ public VideoContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoContext(input, extensionRegistry);
+        return new VideoContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceProto.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceProto.java
index 8c4089d2e24f..bb383a39c926 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceProto.java
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "o\032\027google/rpc/status.proto\"\375\001\n\024AnnotateV" +
       "ideoRequest\022\021\n\tinput_uri\030\001 \001(\t\022\025\n\rinput_" +
       "content\030\006 \001(\014\022C\n\010features\030\002 \003(\01621.google" +
-      ".cloud.videointelligence.v1p1beta1.Featu" +
+      ".cloud.videointelligence.v1p1beta1.Featu",
       "re\022M\n\rvideo_context\030\003 \001(\01326.google.cloud" +
       ".videointelligence.v1p1beta1.VideoContex" +
       "t\022\022\n\noutput_uri\030\004 \001(\t\022\023\n\013location_id\030\005 \001" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "\002 \001(\0132>.google.cloud.videointelligence.v" +
       "1p1beta1.LabelDetectionConfig\022i\n\034shot_ch" +
       "ange_detection_config\030\003 \001(\0132C.google.clo" +
-      "ud.videointelligence.v1p1beta1.ShotChang" +
+      "ud.videointelligence.v1p1beta1.ShotChang",
       "eDetectionConfig\022s\n!explicit_content_det" +
       "ection_config\030\004 \001(\0132H.google.cloud.video" +
       "intelligence.v1p1beta1.ExplicitContentDe" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "\234\001\n\024LabelDetectionConfig\022Z\n\024label_detect" +
       "ion_mode\030\001 \001(\0162<.google.cloud.videointel" +
       "ligence.v1p1beta1.LabelDetectionMode\022\031\n\021" +
-      "stationary_camera\030\002 \001(\010\022\r\n\005model\030\003 \001(\t\"*" +
+      "stationary_camera\030\002 \001(\010\022\r\n\005model\030\003 \001(\t\"*",
       "\n\031ShotChangeDetectionConfig\022\r\n\005model\030\001 \001" +
       "(\t\"/\n\036ExplicitContentDetectionConfig\022\r\n\005" +
       "model\030\001 \001(\t\"x\n\014VideoSegment\0224\n\021start_tim" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "\030\001 \001(\01326.google.cloud.videointelligence." +
       "v1p1beta1.VideoSegment\022\022\n\nconfidence\030\002 \001" +
       "(\002\"P\n\nLabelFrame\022.\n\013time_offset\030\001 \001(\0132\031." +
-      "google.protobuf.Duration\022\022\n\nconfidence\030\002" +
+      "google.protobuf.Duration\022\022\n\nconfidence\030\002",
       " \001(\002\"G\n\006Entity\022\021\n\tentity_id\030\001 \001(\t\022\023\n\013des" +
       "cription\030\002 \001(\t\022\025\n\rlanguage_code\030\003 \001(\t\"\260\002" +
       "\n\017LabelAnnotation\022@\n\006entity\030\001 \001(\01320.goog" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "\022H\n\010segments\030\003 \003(\01326.google.cloud.videoi" +
       "ntelligence.v1p1beta1.LabelSegment\022D\n\006fr" +
       "ames\030\004 \003(\01324.google.cloud.videointellige" +
-      "nce.v1p1beta1.LabelFrame\"\234\001\n\024ExplicitCon" +
+      "nce.v1p1beta1.LabelFrame\"\234\001\n\024ExplicitCon",
       "tentFrame\022.\n\013time_offset\030\001 \001(\0132\031.google." +
       "protobuf.Duration\022T\n\026pornography_likelih" +
       "ood\030\002 \001(\01624.google.cloud.videointelligen" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "ContentFrame\"Q\n\025NormalizedBoundingBox\022\014\n" +
       "\004left\030\001 \001(\002\022\013\n\003top\030\002 \001(\002\022\r\n\005right\030\003 \001(\002\022" +
       "\016\n\006bottom\030\004 \001(\002\"\365\004\n\026VideoAnnotationResul" +
-      "ts\022\021\n\tinput_uri\030\001 \001(\t\022\\\n\031segment_label_a" +
+      "ts\022\021\n\tinput_uri\030\001 \001(\t\022\\\n\031segment_label_a",
       "nnotations\030\002 \003(\01329.google.cloud.videoint" +
       "elligence.v1p1beta1.LabelAnnotation\022Y\n\026s" +
       "hot_label_annotations\030\003 \003(\01329.google.clo" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "a1.LabelAnnotation\022P\n\020shot_annotations\030\006" +
       " \003(\01326.google.cloud.videointelligence.v1" +
       "p1beta1.VideoSegment\022`\n\023explicit_annotat" +
-      "ion\030\007 \001(\0132C.google.cloud.videointelligen" +
+      "ion\030\007 \001(\0132C.google.cloud.videointelligen",
       "ce.v1p1beta1.ExplicitContentAnnotation\022\\" +
       "\n\025speech_transcriptions\030\013 \003(\0132=.google.c" +
       "loud.videointelligence.v1p1beta1.SpeechT" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "ointelligence.v1p1beta1.VideoAnnotationR" +
       "esults\"\247\001\n\027VideoAnnotationProgress\022\021\n\tin" +
       "put_uri\030\001 \001(\t\022\030\n\020progress_percent\030\002 \001(\005\022" +
-      ".\n\nstart_time\030\003 \001(\0132\032.google.protobuf.Ti" +
+      ".\n\nstart_time\030\003 \001(\0132\032.google.protobuf.Ti",
       "mestamp\022/\n\013update_time\030\004 \001(\0132\032.google.pr" +
       "otobuf.Timestamp\"w\n\025AnnotateVideoProgres" +
       "s\022^\n\023annotation_progress\030\001 \003(\0132A.google." +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "ternatives\030\002 \001(\005\022\030\n\020filter_profanity\030\003 \001" +
       "(\010\022P\n\017speech_contexts\030\004 \003(\01327.google.clo" +
       "ud.videointelligence.v1p1beta1.SpeechCon" +
-      "text\022\024\n\014audio_tracks\030\006 \003(\005\" \n\rSpeechCont" +
+      "text\022\024\n\014audio_tracks\030\006 \003(\005\" \n\rSpeechCont",
       "ext\022\017\n\007phrases\030\001 \003(\t\"s\n\023SpeechTranscript" +
       "ion\022\\\n\014alternatives\030\001 \003(\0132F.google.cloud" +
       ".videointelligence.v1p1beta1.SpeechRecog" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       ".videointelligence.v1p1beta1.WordInfo\"t\n" +
       "\010WordInfo\022-\n\nstart_time\030\001 \001(\0132\031.google.p" +
       "rotobuf.Duration\022+\n\010end_time\030\002 \001(\0132\031.goo" +
-      "gle.protobuf.Duration\022\014\n\004word\030\003 \001(\t*\214\001\n\007" +
+      "gle.protobuf.Duration\022\014\n\004word\030\003 \001(\t*\214\001\n\007",
       "Feature\022\027\n\023FEATURE_UNSPECIFIED\020\000\022\023\n\017LABE" +
       "L_DETECTION\020\001\022\031\n\025SHOT_CHANGE_DETECTION\020\002" +
       "\022\036\n\032EXPLICIT_CONTENT_DETECTION\020\003\022\030\n\024SPEE" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "D_FRAME_MODE\020\003*t\n\nLikelihood\022\032\n\026LIKELIHO" +
       "OD_UNSPECIFIED\020\000\022\021\n\rVERY_UNLIKELY\020\001\022\014\n\010U" +
       "NLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIKELY\020\004\022\017\n\013V" +
-      "ERY_LIKELY\020\0052\262\001\n\030VideoIntelligenceServic" +
+      "ERY_LIKELY\020\0052\262\001\n\030VideoIntelligenceServic",
       "e\022\225\001\n\rAnnotateVideo\022>.google.cloud.video" +
       "intelligence.v1p1beta1.AnnotateVideoRequ" +
       "est\032\035.google.longrunning.Operation\"%\202\323\344\223" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "gle.golang.org/genproto/googleapis/cloud" +
       "/videointelligence/v1p1beta1;videointell" +
       "igence\252\002(Google.Cloud.VideoIntelligence." +
-      "V1P1Beta1\312\002(Google\\Cloud\\VideoIntelligen" +
+      "V1P1Beta1\312\002(Google\\Cloud\\VideoIntelligen",
       "ce\\V1p1beta1b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoSegment.java
index 80a24127fec6..77c39cb73b55 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoSegment.java
@@ -32,9 +32,6 @@ private VideoSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -858,7 +855,7 @@ public VideoSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoSegment(input, extensionRegistry);
+        return new VideoSegment(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/WordInfo.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/WordInfo.java
index 86b0090b0e9c..11d7e6ae4fee 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/WordInfo.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/WordInfo.java
@@ -35,9 +35,6 @@ private WordInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1065,7 +1062,7 @@ public WordInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WordInfo(input, extensionRegistry);
+        return new WordInfo(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponse.java
index 2ac0c3be8fee..193d22ebf171 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponse.java
@@ -34,9 +34,6 @@ private AnnotateFileResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1047,7 +1044,7 @@ public AnnotateFileResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateFileResponse(input, extensionRegistry);
+        return new AnnotateFileResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageRequest.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageRequest.java
index 81ba68bf99da..ec383d63a23f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageRequest.java
@@ -34,9 +34,6 @@ private AnnotateImageRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1276,7 +1273,7 @@ public AnnotateImageRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageRequest(input, extensionRegistry);
+        return new AnnotateImageRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponse.java
index 5fd304e6d65e..e92b8b9dc8cf 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponse.java
@@ -37,9 +37,6 @@ private AnnotateImageResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4231,7 +4228,7 @@ public AnnotateImageResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageResponse(input, extensionRegistry);
+        return new AnnotateImageResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequest.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequest.java
index e2c3b337f233..8fa41a1819c0 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequest.java
@@ -33,9 +33,6 @@ private AsyncAnnotateFileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1503,7 +1500,7 @@ public AsyncAnnotateFileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncAnnotateFileRequest(input, extensionRegistry);
+        return new AsyncAnnotateFileRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponse.java
index ec0014e39824..2fc2b07e48f3 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponse.java
@@ -32,9 +32,6 @@ private AsyncAnnotateFileResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public AsyncAnnotateFileResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncAnnotateFileResponse(input, extensionRegistry);
+        return new AsyncAnnotateFileResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequest.java
index df368dd99d37..d4b0da2bec37 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequest.java
@@ -34,9 +34,6 @@ private AsyncBatchAnnotateFilesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -815,7 +812,7 @@ public AsyncBatchAnnotateFilesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncBatchAnnotateFilesRequest(input, extensionRegistry);
+        return new AsyncBatchAnnotateFilesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponse.java
index 3107b23f498b..496793d6fc0e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponse.java
@@ -33,9 +33,6 @@ private AsyncBatchAnnotateFilesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -836,7 +833,7 @@ public AsyncBatchAnnotateFilesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncBatchAnnotateFilesResponse(input, extensionRegistry);
+        return new AsyncBatchAnnotateFilesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesRequest.java
index b3050f19e82c..871c8c8da84e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesRequest.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public BatchAnnotateImagesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesRequest(input, extensionRegistry);
+        return new BatchAnnotateImagesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesResponse.java
index 38a35e07daba..172e57c7102c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesResponse.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public BatchAnnotateImagesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesResponse(input, extensionRegistry);
+        return new BatchAnnotateImagesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Block.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Block.java
index 7b07b4fefff5..f3d1719fd11d 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Block.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Block.java
@@ -35,9 +35,6 @@ private Block(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1816,7 +1813,7 @@ public Block parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Block(input, extensionRegistry);
+        return new Block(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPoly.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPoly.java
index 25f4ec64b791..a7f639e698fe 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPoly.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPoly.java
@@ -34,9 +34,6 @@ private BoundingPoly(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1248,7 +1245,7 @@ public BoundingPoly parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BoundingPoly(input, extensionRegistry);
+        return new BoundingPoly(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ColorInfo.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ColorInfo.java
index 415be71e7889..2997d72534be 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ColorInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ColorInfo.java
@@ -35,9 +35,6 @@ private ColorInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -765,7 +762,7 @@ public ColorInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ColorInfo(input, extensionRegistry);
+        return new ColorInfo(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHint.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHint.java
index 092bd9f0ed02..6d27f44192c1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHint.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHint.java
@@ -34,9 +34,6 @@ private CropHint(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -775,7 +772,7 @@ public CropHint parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHint(input, extensionRegistry);
+        return new CropHint(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsAnnotation.java
index fe64db555f41..fb443ec7f357 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsAnnotation.java
@@ -33,9 +33,6 @@ private CropHintsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public CropHintsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsAnnotation(input, extensionRegistry);
+        return new CropHintsAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsParams.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsParams.java
index c9d08811cfff..44c2569fb62e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsParams.java
@@ -33,9 +33,6 @@ private CropHintsParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -624,7 +621,7 @@ public CropHintsParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsParams(input, extensionRegistry);
+        return new CropHintsParams(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/DominantColorsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/DominantColorsAnnotation.java
index 1b3dd3859166..c5e970506b7f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/DominantColorsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/DominantColorsAnnotation.java
@@ -33,9 +33,6 @@ private DominantColorsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public DominantColorsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DominantColorsAnnotation(input, extensionRegistry);
+        return new DominantColorsAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/EntityAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/EntityAnnotation.java
index 2e94fa9391ba..3a1dc2b903ab 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/EntityAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/EntityAnnotation.java
@@ -40,9 +40,6 @@ private EntityAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2356,7 +2353,7 @@ public EntityAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityAnnotation(input, extensionRegistry);
+        return new EntityAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/FaceAnnotation.java
index be7b0ed370d8..b19e995070c1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/FaceAnnotation.java
@@ -45,9 +45,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -271,9 +268,6 @@ private Landmark(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1636,7 +1630,7 @@ public Landmark parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Landmark(input, extensionRegistry);
+          return new Landmark(input, extensionRegistry);
       }
     };
 
@@ -4048,7 +4042,7 @@ public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Feature.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Feature.java
index 87d958606a03..ffde7eaef358 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Feature.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Feature.java
@@ -37,9 +37,6 @@ private Feature(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1019,7 +1016,7 @@ public Feature parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Feature(input, extensionRegistry);
+        return new Feature(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestination.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestination.java
index 101cf4784e3e..92edcdad4409 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestination.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestination.java
@@ -33,9 +33,6 @@ private GcsDestination(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -608,7 +605,7 @@ public GcsDestination parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsDestination(input, extensionRegistry);
+        return new GcsDestination(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSource.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSource.java
index 58f68067640e..594e497fd726 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSource.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSource.java
@@ -33,9 +33,6 @@ private GcsSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GcsSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsSource(input, extensionRegistry);
+        return new GcsSource(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GeometryProto.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GeometryProto.java
index 106c89d581aa..dd57ef5f9e08 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GeometryProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GeometryProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "le.cloud.vision.v1.NormalizedVertex\"+\n\010P" +
       "osition\022\t\n\001x\030\001 \001(\002\022\t\n\001y\030\002 \001(\002\022\t\n\001z\030\003 \001(\002" +
       "Bn\n\032com.google.cloud.vision.v1B\rGeometry" +
-      "ProtoP\001Z\n\022blu" +
       "rred_likelihood\030\016 \001(\0162\".google.cloud.vis" +
-      "ion.v1.Likelihood\022?\n\023headwear_likelihood" +
+      "ion.v1.Likelihood\022?\n\023headwear_likelihood",
       "\030\017 \001(\0162\".google.cloud.vision.v1.Likeliho" +
       "od\032\271\007\n\010Landmark\022B\n\004type\030\003 \001(\01624.google.c" +
       "loud.vision.v1.FaceAnnotation.Landmark.T" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "EFT_OF_LEFT_EYEBROW\020\003\022\031\n\025RIGHT_OF_LEFT_E" +
       "YEBROW\020\004\022\031\n\025LEFT_OF_RIGHT_EYEBROW\020\005\022\032\n\026R" +
       "IGHT_OF_RIGHT_EYEBROW\020\006\022\031\n\025MIDPOINT_BETW" +
-      "EEN_EYES\020\007\022\014\n\010NOSE_TIP\020\010\022\r\n\tUPPER_LIP\020\t\022" +
+      "EEN_EYES\020\007\022\014\n\010NOSE_TIP\020\010\022\r\n\tUPPER_LIP\020\t\022",
       "\r\n\tLOWER_LIP\020\n\022\016\n\nMOUTH_LEFT\020\013\022\017\n\013MOUTH_" +
       "RIGHT\020\014\022\020\n\014MOUTH_CENTER\020\r\022\025\n\021NOSE_BOTTOM" +
       "_RIGHT\020\016\022\024\n\020NOSE_BOTTOM_LEFT\020\017\022\026\n\022NOSE_B" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       "ER\020\024\022\032\n\026RIGHT_EYE_TOP_BOUNDARY\020\025\022\032\n\026RIGH" +
       "T_EYE_RIGHT_CORNER\020\026\022\035\n\031RIGHT_EYE_BOTTOM" +
       "_BOUNDARY\020\027\022\031\n\025RIGHT_EYE_LEFT_CORNER\020\030\022\037" +
-      "\n\033LEFT_EYEBROW_UPPER_MIDPOINT\020\031\022 \n\034RIGHT" +
+      "\n\033LEFT_EYEBROW_UPPER_MIDPOINT\020\031\022 \n\034RIGHT",
       "_EYEBROW_UPPER_MIDPOINT\020\032\022\024\n\020LEFT_EAR_TR" +
       "AGION\020\033\022\025\n\021RIGHT_EAR_TRAGION\020\034\022\022\n\016LEFT_E" +
       "YE_PUPIL\020\035\022\023\n\017RIGHT_EYE_PUPIL\020\036\022\025\n\021FOREH" +
@@ -257,7 +257,7 @@ public static void registerAllExtensions(
       ".type.LatLng\"=\n\010Property\022\014\n\004name\030\001 \001(\t\022\r" +
       "\n\005value\030\002 \001(\t\022\024\n\014uint64_value\030\003 \001(\004\"\247\002\n\020" +
       "EntityAnnotation\022\013\n\003mid\030\001 \001(\t\022\016\n\006locale\030" +
-      "\002 \001(\t\022\023\n\013description\030\003 \001(\t\022\r\n\005score\030\004 \001(" +
+      "\002 \001(\t\022\023\n\013description\030\003 \001(\t\022\r\n\005score\030\004 \001(",
       "\002\022\022\n\nconfidence\030\005 \001(\002\022\022\n\ntopicality\030\006 \001(" +
       "\002\022;\n\rbounding_poly\030\007 \001(\0132$.google.cloud." +
       "vision.v1.BoundingPoly\0227\n\tlocations\030\010 \003(" +
@@ -267,7 +267,7 @@ public static void registerAllExtensions(
       "\n\005adult\030\001 \001(\0162\".google.cloud.vision.v1.L" +
       "ikelihood\0221\n\005spoof\030\002 \001(\0162\".google.cloud." +
       "vision.v1.Likelihood\0223\n\007medical\030\003 \001(\0162\"." +
-      "google.cloud.vision.v1.Likelihood\0224\n\010vio" +
+      "google.cloud.vision.v1.Likelihood\0224\n\010vio",
       "lence\030\004 \001(\0162\".google.cloud.vision.v1.Lik" +
       "elihood\0220\n\004racy\030\t \001(\0162\".google.cloud.vis" +
       "ion.v1.Likelihood\"a\n\013LatLongRect\022(\n\013min_" +
@@ -277,7 +277,7 @@ public static void registerAllExtensions(
       "olor\022\r\n\005score\030\002 \001(\002\022\026\n\016pixel_fraction\030\003 " +
       "\001(\002\"M\n\030DominantColorsAnnotation\0221\n\006color" +
       "s\030\001 \003(\0132!.google.cloud.vision.v1.ColorIn" +
-      "fo\"\\\n\017ImageProperties\022I\n\017dominant_colors" +
+      "fo\"\\\n\017ImageProperties\022I\n\017dominant_colors",
       "\030\001 \001(\01320.google.cloud.vision.v1.Dominant" +
       "ColorsAnnotation\"x\n\010CropHint\022;\n\rbounding" +
       "_poly\030\001 \001(\0132$.google.cloud.vision.v1.Bou" +
@@ -287,7 +287,7 @@ public static void registerAllExtensions(
       "ion.v1.CropHint\"(\n\017CropHintsParams\022\025\n\ras" +
       "pect_ratios\030\001 \003(\002\"1\n\022WebDetectionParams\022" +
       "\033\n\023include_geo_results\030\002 \001(\010\"\360\001\n\014ImageCo" +
-      "ntext\022:\n\rlat_long_rect\030\001 \001(\0132#.google.cl" +
+      "ntext\022:\n\rlat_long_rect\030\001 \001(\0132#.google.cl",
       "oud.vision.v1.LatLongRect\022\026\n\016language_hi" +
       "nts\030\002 \003(\t\022B\n\021crop_hints_params\030\004 \001(\0132\'.g" +
       "oogle.cloud.vision.v1.CropHintsParams\022H\n" +
@@ -297,7 +297,7 @@ public static void registerAllExtensions(
       ".cloud.vision.v1.Image\0221\n\010features\030\002 \003(\013" +
       "2\037.google.cloud.vision.v1.Feature\022;\n\rima" +
       "ge_context\030\003 \001(\0132$.google.cloud.vision.v" +
-      "1.ImageContext\":\n\026ImageAnnotationContext" +
+      "1.ImageContext\":\n\026ImageAnnotationContext",
       "\022\013\n\003uri\030\001 \001(\t\022\023\n\013page_number\030\002 \001(\005\"\275\006\n\025A" +
       "nnotateImageResponse\022@\n\020face_annotations" +
       "\030\001 \003(\0132&.google.cloud.vision.v1.FaceAnno" +
@@ -307,7 +307,7 @@ public static void registerAllExtensions(
       "vision.v1.EntityAnnotation\022C\n\021label_anno" +
       "tations\030\004 \003(\0132(.google.cloud.vision.v1.E" +
       "ntityAnnotation\022B\n\020text_annotations\030\005 \003(" +
-      "\0132(.google.cloud.vision.v1.EntityAnnotat" +
+      "\0132(.google.cloud.vision.v1.EntityAnnotat",
       "ion\022D\n\024full_text_annotation\030\014 \001(\0132&.goog" +
       "le.cloud.vision.v1.TextAnnotation\022L\n\026saf" +
       "e_search_annotation\030\006 \001(\0132,.google.cloud" +
@@ -317,7 +317,7 @@ public static void registerAllExtensions(
       "nts_annotation\030\013 \001(\0132+.google.cloud.visi" +
       "on.v1.CropHintsAnnotation\022;\n\rweb_detecti" +
       "on\030\r \001(\0132$.google.cloud.vision.v1.WebDet" +
-      "ection\022!\n\005error\030\t \001(\0132\022.google.rpc.Statu" +
+      "ection\022!\n\005error\030\t \001(\0132\022.google.rpc.Statu",
       "s\022?\n\007context\030\025 \001(\0132..google.cloud.vision" +
       ".v1.ImageAnnotationContext\"\223\001\n\024AnnotateF" +
       "ileResponse\0229\n\014input_config\030\001 \001(\0132#.goog" +
@@ -327,7 +327,7 @@ public static void registerAllExtensions(
       "equest\022>\n\010requests\030\001 \003(\0132,.google.cloud." +
       "vision.v1.AnnotateImageRequest\"_\n\033BatchA" +
       "nnotateImagesResponse\022@\n\tresponses\030\001 \003(\013" +
-      "2-.google.cloud.vision.v1.AnnotateImageR" +
+      "2-.google.cloud.vision.v1.AnnotateImageR",
       "esponse\"\202\002\n\030AsyncAnnotateFileRequest\0229\n\014" +
       "input_config\030\001 \001(\0132#.google.cloud.vision" +
       ".v1.InputConfig\0221\n\010features\030\002 \003(\0132\037.goog" +
@@ -337,7 +337,7 @@ public static void registerAllExtensions(
       "cloud.vision.v1.OutputConfig\"X\n\031AsyncAnn" +
       "otateFileResponse\022;\n\routput_config\030\001 \001(\013" +
       "2$.google.cloud.vision.v1.OutputConfig\"d" +
-      "\n\036AsyncBatchAnnotateFilesRequest\022B\n\010requ" +
+      "\n\036AsyncBatchAnnotateFilesRequest\022B\n\010requ",
       "ests\030\001 \003(\01320.google.cloud.vision.v1.Asyn" +
       "cAnnotateFileRequest\"g\n\037AsyncBatchAnnota" +
       "teFilesResponse\022D\n\tresponses\030\001 \003(\01321.goo" +
@@ -347,7 +347,7 @@ public static void registerAllExtensions(
       "ime_type\030\002 \001(\t\"c\n\014OutputConfig\022?\n\017gcs_de" +
       "stination\030\001 \001(\0132&.google.cloud.vision.v1" +
       ".GcsDestination\022\022\n\nbatch_size\030\002 \001(\005\"\030\n\tG" +
-      "csSource\022\013\n\003uri\030\001 \001(\t\"\035\n\016GcsDestination\022" +
+      "csSource\022\013\n\003uri\030\001 \001(\t\"\035\n\016GcsDestination\022",
       "\013\n\003uri\030\001 \001(\t\"\210\002\n\021OperationMetadata\022>\n\005st" +
       "ate\030\001 \001(\0162/.google.cloud.vision.v1.Opera" +
       "tionMetadata.State\022/\n\013create_time\030\005 \001(\0132" +
@@ -357,7 +357,7 @@ public static void registerAllExtensions(
       "\001\022\013\n\007RUNNING\020\002\022\010\n\004DONE\020\003\022\r\n\tCANCELLED\020\004*" +
       "e\n\nLikelihood\022\013\n\007UNKNOWN\020\000\022\021\n\rVERY_UNLIK" +
       "ELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIK" +
-      "ELY\020\004\022\017\n\013VERY_LIKELY\020\0052\315\002\n\016ImageAnnotato" +
+      "ELY\020\004\022\017\n\013VERY_LIKELY\020\0052\315\002\n\016ImageAnnotato",
       "r\022\236\001\n\023BatchAnnotateImages\0222.google.cloud" +
       ".vision.v1.BatchAnnotateImagesRequest\0323." +
       "google.cloud.vision.v1.BatchAnnotateImag" +
@@ -367,7 +367,7 @@ public static void registerAllExtensions(
       "equest\032\035.google.longrunning.Operation\"\'\202" +
       "\323\344\223\002!\"\034/v1/files:asyncBatchAnnotate:\001*Bt" +
       "\n\032com.google.cloud.vision.v1B\023ImageAnnot" +
-      "atorProtoP\001Z.googl" +
       "e.cloud.vision.v1.TextAnnotation.Detecte" +
-      "dBreak.BreakType\022\021\n\tis_prefix\030\002 \001(\010\"c\n\tB" +
+      "dBreak.BreakType\022\021\n\tis_prefix\030\002 \001(\010\"c\n\tB",
       "reakType\022\013\n\007UNKNOWN\020\000\022\t\n\005SPACE\020\001\022\016\n\nSURE" +
       "_SPACE\020\002\022\022\n\016EOL_SURE_SPACE\020\003\022\n\n\006HYPHEN\020\004" +
       "\022\016\n\nLINE_BREAK\020\005\032\261\001\n\014TextProperty\022S\n\022det" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "sion.v1.TextAnnotation.DetectedBreak\"\257\001\n" +
       "\004Page\022E\n\010property\030\001 \001(\01323.google.cloud.v" +
       "ision.v1.TextAnnotation.TextProperty\022\r\n\005" +
-      "width\030\002 \001(\005\022\016\n\006height\030\003 \001(\005\022-\n\006blocks\030\004 " +
+      "width\030\002 \001(\005\022\016\n\006height\030\003 \001(\005\022-\n\006blocks\030\004 ",
       "\003(\0132\035.google.cloud.vision.v1.Block\022\022\n\nco" +
       "nfidence\030\005 \001(\002\"\346\002\n\005Block\022E\n\010property\030\001 \001" +
       "(\01323.google.cloud.vision.v1.TextAnnotati" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       ".Paragraph\022;\n\nblock_type\030\004 \001(\0162\'.google." +
       "cloud.vision.v1.Block.BlockType\022\022\n\nconfi" +
       "dence\030\005 \001(\002\"R\n\tBlockType\022\013\n\007UNKNOWN\020\000\022\010\n" +
-      "\004TEXT\020\001\022\t\n\005TABLE\020\002\022\013\n\007PICTURE\020\003\022\t\n\005RULER" +
+      "\004TEXT\020\001\022\t\n\005TABLE\020\002\022\013\n\007PICTURE\020\003\022\t\n\005RULER",
       "\020\004\022\013\n\007BARCODE\020\005\"\317\001\n\tParagraph\022E\n\010propert" +
       "y\030\001 \001(\01323.google.cloud.vision.v1.TextAnn" +
       "otation.TextProperty\022:\n\014bounding_box\030\002 \001" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "operty\030\001 \001(\01323.google.cloud.vision.v1.Te" +
       "xtAnnotation.TextProperty\022:\n\014bounding_bo" +
       "x\030\002 \001(\0132$.google.cloud.vision.v1.Boundin" +
-      "gPoly\022/\n\007symbols\030\003 \003(\0132\036.google.cloud.vi" +
+      "gPoly\022/\n\007symbols\030\003 \003(\0132\036.google.cloud.vi",
       "sion.v1.Symbol\022\022\n\nconfidence\030\004 \001(\002\"\255\001\n\006S" +
       "ymbol\022E\n\010property\030\001 \001(\01323.google.cloud.v" +
       "ision.v1.TextAnnotation.TextProperty\022:\n\014" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Vertex.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Vertex.java
index 775fe8925810..d021cee489cb 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Vertex.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Vertex.java
@@ -35,9 +35,6 @@ private Vertex(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -526,7 +523,7 @@ public Vertex parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Vertex(input, extensionRegistry);
+        return new Vertex(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetection.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetection.java
index 84eaa7b80e9d..3f52389c3206 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetection.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetection.java
@@ -38,9 +38,6 @@ private WebDetection(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -237,9 +234,6 @@ private WebEntity(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -969,7 +963,7 @@ public WebEntity parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebEntity(input, extensionRegistry);
+          return new WebEntity(input, extensionRegistry);
       }
     };
 
@@ -1050,9 +1044,6 @@ private WebImage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1624,7 +1615,7 @@ public WebImage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebImage(input, extensionRegistry);
+          return new WebImage(input, extensionRegistry);
       }
     };
 
@@ -1834,9 +1825,6 @@ private WebPage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3527,7 +3515,7 @@ public WebPage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebPage(input, extensionRegistry);
+          return new WebPage(input, extensionRegistry);
       }
     };
 
@@ -3621,9 +3609,6 @@ private WebLabel(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4287,7 +4272,7 @@ public WebLabel parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebLabel(input, extensionRegistry);
+          return new WebLabel(input, extensionRegistry);
       }
     };
 
@@ -7208,7 +7193,7 @@ public WebDetection parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetection(input, extensionRegistry);
+        return new WebDetection(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionParams.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionParams.java
index fdb1ebcae052..1974745f6507 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionParams.java
@@ -33,9 +33,6 @@ private WebDetectionParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -451,7 +448,7 @@ public WebDetectionParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetectionParams(input, extensionRegistry);
+        return new WebDetectionParams(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionProto.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionProto.java
index c7cb6880f81f..319fda9cf820 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       ".WebDetection.WebImage\022N\n\027partial_matchi" +
       "ng_images\030\003 \003(\0132-.google.cloud.vision.v1" +
       ".WebDetection.WebImage\022P\n\032pages_with_mat" +
-      "ching_images\030\004 \003(\0132,.google.cloud.vision" +
+      "ching_images\030\004 \003(\0132,.google.cloud.vision",
       ".v1.WebDetection.WebPage\022N\n\027visually_sim" +
       "ilar_images\030\006 \003(\0132-.google.cloud.vision." +
       "v1.WebDetection.WebImage\022H\n\021best_guess_l" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "\030\003 \001(\t\032&\n\010WebImage\022\013\n\003url\030\001 \001(\t\022\r\n\005score" +
       "\030\002 \001(\002\032\326\001\n\007WebPage\022\013\n\003url\030\001 \001(\t\022\r\n\005score" +
       "\030\002 \001(\002\022\022\n\npage_title\030\003 \001(\t\022K\n\024full_match" +
-      "ing_images\030\004 \003(\0132-.google.cloud.vision.v" +
+      "ing_images\030\004 \003(\0132-.google.cloud.vision.v",
       "1.WebDetection.WebImage\022N\n\027partial_match" +
       "ing_images\030\005 \003(\0132-.google.cloud.vision.v" +
       "1.WebDetection.WebImage\0320\n\010WebLabel\022\r\n\005l" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Word.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Word.java
index 13b3d63eb97b..b2eb5c24b0e3 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Word.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Word.java
@@ -34,9 +34,6 @@ private Word(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1542,7 +1539,7 @@ public Word parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Word(input, extensionRegistry);
+        return new Word(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageRequest.java
index 2036f3455c38..7178f2354c8a 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageRequest.java
@@ -34,9 +34,6 @@ private AnnotateImageRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1276,7 +1273,7 @@ public AnnotateImageRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageRequest(input, extensionRegistry);
+        return new AnnotateImageRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageResponse.java
index 4d7b8267c49f..0ff690ddecc6 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageResponse.java
@@ -37,9 +37,6 @@ private AnnotateImageResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3990,7 +3987,7 @@ public AnnotateImageResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageResponse(input, extensionRegistry);
+        return new AnnotateImageResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesRequest.java
index 9736a5a8d768..a3f36986a050 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesRequest.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public BatchAnnotateImagesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesRequest(input, extensionRegistry);
+        return new BatchAnnotateImagesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesResponse.java
index dee143ee0a66..34d317c8e857 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesResponse.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public BatchAnnotateImagesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesResponse(input, extensionRegistry);
+        return new BatchAnnotateImagesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Block.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Block.java
index 4cdae61917fd..0d1f9f374e3f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Block.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Block.java
@@ -35,9 +35,6 @@ private Block(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1816,7 +1813,7 @@ public Block parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Block(input, extensionRegistry);
+        return new Block(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BoundingPoly.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BoundingPoly.java
index 05bf38c0adce..f762fd926a0e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BoundingPoly.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BoundingPoly.java
@@ -33,9 +33,6 @@ private BoundingPoly(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public BoundingPoly parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BoundingPoly(input, extensionRegistry);
+        return new BoundingPoly(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ColorInfo.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ColorInfo.java
index 087b899872dd..985c0e034713 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ColorInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ColorInfo.java
@@ -35,9 +35,6 @@ private ColorInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -765,7 +762,7 @@ public ColorInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ColorInfo(input, extensionRegistry);
+        return new ColorInfo(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHint.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHint.java
index e07d7a843b2e..1be308ee32f5 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHint.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHint.java
@@ -34,9 +34,6 @@ private CropHint(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -775,7 +772,7 @@ public CropHint parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHint(input, extensionRegistry);
+        return new CropHint(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsAnnotation.java
index ee7aeb9c3863..856f01da2396 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsAnnotation.java
@@ -33,9 +33,6 @@ private CropHintsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public CropHintsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsAnnotation(input, extensionRegistry);
+        return new CropHintsAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsParams.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsParams.java
index aba68df606e8..0db9cbdb97c7 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsParams.java
@@ -33,9 +33,6 @@ private CropHintsParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -624,7 +621,7 @@ public CropHintsParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsParams(input, extensionRegistry);
+        return new CropHintsParams(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/DominantColorsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/DominantColorsAnnotation.java
index 767e17b7a1d5..7a3d79c416c9 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/DominantColorsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/DominantColorsAnnotation.java
@@ -33,9 +33,6 @@ private DominantColorsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public DominantColorsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DominantColorsAnnotation(input, extensionRegistry);
+        return new DominantColorsAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/EntityAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/EntityAnnotation.java
index 176c2e49d1fd..150fd5ec803d 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/EntityAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/EntityAnnotation.java
@@ -40,9 +40,6 @@ private EntityAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2345,7 +2342,7 @@ public EntityAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityAnnotation(input, extensionRegistry);
+        return new EntityAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/FaceAnnotation.java
index b664523a00a0..fa31b4ff8b63 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/FaceAnnotation.java
@@ -45,9 +45,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -271,9 +268,6 @@ private Landmark(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1636,7 +1630,7 @@ public Landmark parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Landmark(input, extensionRegistry);
+          return new Landmark(input, extensionRegistry);
       }
     };
 
@@ -4048,7 +4042,7 @@ public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Feature.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Feature.java
index 3d27c91fa74e..fcdb4fa867c2 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Feature.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Feature.java
@@ -38,9 +38,6 @@ private Feature(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1009,7 +1006,7 @@ public Feature parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Feature(input, extensionRegistry);
+        return new Feature(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Image.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Image.java
index 3eb3bbba35cf..436a27f62aa6 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Image.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Image.java
@@ -33,9 +33,6 @@ private Image(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -714,7 +711,7 @@ public Image parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Image(input, extensionRegistry);
+        return new Image(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorProto.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorProto.java
index 9f1c08e6f2cc..ea6afd6533b3 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorProto.java
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "eta1/web_detection.proto\032\027google/rpc/sta" +
       "tus.proto\032\027google/type/color.proto\032\030goog" +
       "le/type/latlng.proto\"\341\002\n\007Feature\0229\n\004type" +
-      "\030\001 \001(\0162+.google.cloud.vision.v1p1beta1.F" +
+      "\030\001 \001(\0162+.google.cloud.vision.v1p1beta1.F",
       "eature.Type\022\023\n\013max_results\030\002 \001(\005\022\r\n\005mode" +
       "l\030\003 \001(\t\"\366\001\n\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\022" +
       "\n\016FACE_DETECTION\020\001\022\026\n\022LANDMARK_DETECTION" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "\024\n\020IMAGE_PROPERTIES\020\007\022\016\n\nCROP_HINTS\020\t\022\021\n" +
       "\rWEB_DETECTION\020\n\"7\n\013ImageSource\022\025\n\rgcs_i" +
       "mage_uri\030\001 \001(\t\022\021\n\timage_uri\030\002 \001(\t\"T\n\005Ima" +
-      "ge\022\017\n\007content\030\001 \001(\014\022:\n\006source\030\002 \001(\0132*.go" +
+      "ge\022\017\n\007content\030\001 \001(\014\022:\n\006source\030\002 \001(\0132*.go",
       "ogle.cloud.vision.v1p1beta1.ImageSource\"" +
       "\233\016\n\016FaceAnnotation\022B\n\rbounding_poly\030\001 \001(" +
       "\0132+.google.cloud.vision.v1p1beta1.Boundi" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "1p1beta1.FaceAnnotation.Landmark\022\022\n\nroll" +
       "_angle\030\004 \001(\002\022\021\n\tpan_angle\030\005 \001(\002\022\022\n\ntilt_" +
       "angle\030\006 \001(\002\022\034\n\024detection_confidence\030\007 \001(" +
-      "\002\022\036\n\026landmarking_confidence\030\010 \001(\002\022A\n\016joy" +
+      "\002\022\036\n\026landmarking_confidence\030\010 \001(\002\022A\n\016joy",
       "_likelihood\030\t \001(\0162).google.cloud.vision." +
       "v1p1beta1.Likelihood\022D\n\021sorrow_likelihoo" +
       "d\030\n \001(\0162).google.cloud.vision.v1p1beta1." +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "oud.vision.v1p1beta1.Likelihood\022K\n\030under" +
       "_exposed_likelihood\030\r \001(\0162).google.cloud" +
       ".vision.v1p1beta1.Likelihood\022E\n\022blurred_" +
-      "likelihood\030\016 \001(\0162).google.cloud.vision.v" +
+      "likelihood\030\016 \001(\0162).google.cloud.vision.v",
       "1p1beta1.Likelihood\022F\n\023headwear_likeliho" +
       "od\030\017 \001(\0162).google.cloud.vision.v1p1beta1" +
       ".Likelihood\032\307\007\n\010Landmark\022I\n\004type\030\003 \001(\0162;" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "\006\n\004Type\022\024\n\020UNKNOWN_LANDMARK\020\000\022\014\n\010LEFT_EY" +
       "E\020\001\022\r\n\tRIGHT_EYE\020\002\022\030\n\024LEFT_OF_LEFT_EYEBR" +
       "OW\020\003\022\031\n\025RIGHT_OF_LEFT_EYEBROW\020\004\022\031\n\025LEFT_" +
-      "OF_RIGHT_EYEBROW\020\005\022\032\n\026RIGHT_OF_RIGHT_EYE" +
+      "OF_RIGHT_EYEBROW\020\005\022\032\n\026RIGHT_OF_RIGHT_EYE",
       "BROW\020\006\022\031\n\025MIDPOINT_BETWEEN_EYES\020\007\022\014\n\010NOS" +
       "E_TIP\020\010\022\r\n\tUPPER_LIP\020\t\022\r\n\tLOWER_LIP\020\n\022\016\n" +
       "\nMOUTH_LEFT\020\013\022\017\n\013MOUTH_RIGHT\020\014\022\020\n\014MOUTH_" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "HT_CORNER\020\022\022\034\n\030LEFT_EYE_BOTTOM_BOUNDARY\020" +
       "\023\022\030\n\024LEFT_EYE_LEFT_CORNER\020\024\022\032\n\026RIGHT_EYE" +
       "_TOP_BOUNDARY\020\025\022\032\n\026RIGHT_EYE_RIGHT_CORNE" +
-      "R\020\026\022\035\n\031RIGHT_EYE_BOTTOM_BOUNDARY\020\027\022\031\n\025RI" +
+      "R\020\026\022\035\n\031RIGHT_EYE_BOTTOM_BOUNDARY\020\027\022\031\n\025RI",
       "GHT_EYE_LEFT_CORNER\020\030\022\037\n\033LEFT_EYEBROW_UP" +
       "PER_MIDPOINT\020\031\022 \n\034RIGHT_EYEBROW_UPPER_MI" +
       "DPOINT\020\032\022\024\n\020LEFT_EAR_TRAGION\020\033\022\025\n\021RIGHT_" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "\n\021CHIN_RIGHT_GONION\020\"\"4\n\014LocationInfo\022$\n" +
       "\007lat_lng\030\001 \001(\0132\023.google.type.LatLng\"=\n\010P" +
       "roperty\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022\024\n\014" +
-      "uint64_value\030\003 \001(\004\"\274\002\n\020EntityAnnotation\022" +
+      "uint64_value\030\003 \001(\004\"\274\002\n\020EntityAnnotation\022",
       "\013\n\003mid\030\001 \001(\t\022\016\n\006locale\030\002 \001(\t\022\023\n\013descript" +
       "ion\030\003 \001(\t\022\r\n\005score\030\004 \001(\002\022\022\n\nconfidence\030\005" +
       " \001(\002\022\022\n\ntopicality\030\006 \001(\002\022B\n\rbounding_pol" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "properties\030\t \003(\0132\'.google.cloud.vision.v" +
       "1p1beta1.Property\"\274\002\n\024SafeSearchAnnotati" +
       "on\0228\n\005adult\030\001 \001(\0162).google.cloud.vision." +
-      "v1p1beta1.Likelihood\0228\n\005spoof\030\002 \001(\0162).go" +
+      "v1p1beta1.Likelihood\0228\n\005spoof\030\002 \001(\0162).go",
       "ogle.cloud.vision.v1p1beta1.Likelihood\022:" +
       "\n\007medical\030\003 \001(\0162).google.cloud.vision.v1" +
       "p1beta1.Likelihood\022;\n\010violence\030\004 \001(\0162).g" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "at_lng\030\001 \001(\0132\023.google.type.LatLng\022(\n\013max" +
       "_lat_lng\030\002 \001(\0132\023.google.type.LatLng\"U\n\tC" +
       "olorInfo\022!\n\005color\030\001 \001(\0132\022.google.type.Co" +
-      "lor\022\r\n\005score\030\002 \001(\002\022\026\n\016pixel_fraction\030\003 \001" +
+      "lor\022\r\n\005score\030\002 \001(\002\022\026\n\016pixel_fraction\030\003 \001",
       "(\002\"T\n\030DominantColorsAnnotation\0228\n\006colors" +
       "\030\001 \003(\0132(.google.cloud.vision.v1p1beta1.C" +
       "olorInfo\"c\n\017ImageProperties\022P\n\017dominant_" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "vision.v1p1beta1.BoundingPoly\022\022\n\nconfide" +
       "nce\030\002 \001(\002\022\033\n\023importance_fraction\030\003 \001(\002\"R" +
       "\n\023CropHintsAnnotation\022;\n\ncrop_hints\030\001 \003(" +
-      "\0132\'.google.cloud.vision.v1p1beta1.CropHi" +
+      "\0132\'.google.cloud.vision.v1p1beta1.CropHi",
       "nt\"(\n\017CropHintsParams\022\025\n\raspect_ratios\030\001" +
       " \003(\002\"1\n\022WebDetectionParams\022\033\n\023include_ge" +
       "o_results\030\002 \001(\010\"\205\002\n\014ImageContext\022A\n\rlat_" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "cloud.vision.v1p1beta1.CropHintsParams\022O" +
       "\n\024web_detection_params\030\006 \001(\01321.google.cl" +
       "oud.vision.v1p1beta1.WebDetectionParams\"" +
-      "\311\001\n\024AnnotateImageRequest\0223\n\005image\030\001 \001(\0132" +
+      "\311\001\n\024AnnotateImageRequest\0223\n\005image\030\001 \001(\0132",
       "$.google.cloud.vision.v1p1beta1.Image\0228\n" +
       "\010features\030\002 \003(\0132&.google.cloud.vision.v1" +
       "p1beta1.Feature\022B\n\rimage_context\030\003 \001(\0132+" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "p1beta1.FaceAnnotation\022M\n\024landmark_annot" +
       "ations\030\002 \003(\0132/.google.cloud.vision.v1p1b" +
       "eta1.EntityAnnotation\022I\n\020logo_annotation" +
-      "s\030\003 \003(\0132/.google.cloud.vision.v1p1beta1." +
+      "s\030\003 \003(\0132/.google.cloud.vision.v1p1beta1.",
       "EntityAnnotation\022J\n\021label_annotations\030\004 " +
       "\003(\0132/.google.cloud.vision.v1p1beta1.Enti" +
       "tyAnnotation\022I\n\020text_annotations\030\005 \003(\0132/" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "tion\022S\n\026safe_search_annotation\030\006 \001(\01323.g" +
       "oogle.cloud.vision.v1p1beta1.SafeSearchA" +
       "nnotation\022S\n\033image_properties_annotation" +
-      "\030\010 \001(\0132..google.cloud.vision.v1p1beta1.I" +
+      "\030\010 \001(\0132..google.cloud.vision.v1p1beta1.I",
       "mageProperties\022Q\n\025crop_hints_annotation\030" +
       "\013 \001(\01322.google.cloud.vision.v1p1beta1.Cr" +
       "opHintsAnnotation\022B\n\rweb_detection\030\r \001(\013" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "ts\030\001 \003(\01323.google.cloud.vision.v1p1beta1" +
       ".AnnotateImageRequest\"f\n\033BatchAnnotateIm" +
       "agesResponse\022G\n\tresponses\030\001 \003(\01324.google" +
-      ".cloud.vision.v1p1beta1.AnnotateImageRes" +
+      ".cloud.vision.v1p1beta1.AnnotateImageRes",
       "ponse*e\n\nLikelihood\022\013\n\007UNKNOWN\020\000\022\021\n\rVERY" +
       "_UNLIKELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022" +
       "\n\n\006LIKELY\020\004\022\017\n\013VERY_LIKELY\020\0052\306\001\n\016ImageAn" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "a1.BatchAnnotateImagesResponse\"%\202\323\344\223\002\037\"\032" +
       "/v1p1beta1/images:annotate:\001*B\202\001\n!com.go" +
       "ogle.cloud.vision.v1p1beta1B\023ImageAnnota" +
-      "torProtoP\001ZCgoogle.golang.org/genproto/g" +
+      "torProtoP\001ZCgoogle.golang.org/genproto/g",
       "oogleapis/cloud/vision/v1p1beta1;vision\370" +
       "\001\001b\006proto3"
     };
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageContext.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageContext.java
index e14182a756c4..745e1226ac94 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageContext.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageContext.java
@@ -33,9 +33,6 @@ private ImageContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1381,7 +1378,7 @@ public ImageContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageContext(input, extensionRegistry);
+        return new ImageContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageProperties.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageProperties.java
index c689e3b892e4..abd06142bded 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageProperties.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageProperties.java
@@ -32,9 +32,6 @@ private ImageProperties(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public ImageProperties parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageProperties(input, extensionRegistry);
+        return new ImageProperties(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageSource.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageSource.java
index 6a75da18750b..c91902fc73b1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageSource.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageSource.java
@@ -34,9 +34,6 @@ private ImageSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -784,7 +781,7 @@ public ImageSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageSource(input, extensionRegistry);
+        return new ImageSource(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LatLongRect.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LatLongRect.java
index e7abac82316d..d79b964609cc 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LatLongRect.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LatLongRect.java
@@ -32,9 +32,6 @@ private LatLongRect(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -834,7 +831,7 @@ public LatLongRect parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LatLongRect(input, extensionRegistry);
+        return new LatLongRect(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LocationInfo.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LocationInfo.java
index cbcb8f097263..87b39e5a1d75 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LocationInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LocationInfo.java
@@ -32,9 +32,6 @@ private LocationInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public LocationInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LocationInfo(input, extensionRegistry);
+        return new LocationInfo(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Page.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Page.java
index 1b526e89c178..4585b644e514 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Page.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Page.java
@@ -36,9 +36,6 @@ private Page(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1270,7 +1267,7 @@ public Page parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Page(input, extensionRegistry);
+        return new Page(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Paragraph.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Paragraph.java
index 7bc9be6e4742..b06bbbfa9e8c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Paragraph.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Paragraph.java
@@ -34,9 +34,6 @@ private Paragraph(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1519,7 +1516,7 @@ public Paragraph parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Paragraph(input, extensionRegistry);
+        return new Paragraph(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Position.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Position.java
index 84aa8007a64f..c8d9a1ceae60 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Position.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Position.java
@@ -37,9 +37,6 @@ private Position(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -611,7 +608,7 @@ public Position parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Position(input, extensionRegistry);
+        return new Position(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Property.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Property.java
index aee9ed0ec5c4..82633a2c9afd 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Property.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Property.java
@@ -35,9 +35,6 @@ private Property(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -761,7 +758,7 @@ public Property parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Property(input, extensionRegistry);
+        return new Property(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/SafeSearchAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/SafeSearchAnnotation.java
index 1735d7d8b2ad..21281f1e22d4 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/SafeSearchAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/SafeSearchAnnotation.java
@@ -39,9 +39,6 @@ private SafeSearchAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -984,7 +981,7 @@ public SafeSearchAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SafeSearchAnnotation(input, extensionRegistry);
+        return new SafeSearchAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Symbol.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Symbol.java
index e47d954af673..3ae3965b90d8 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Symbol.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Symbol.java
@@ -34,9 +34,6 @@ private Symbol(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1234,7 +1231,7 @@ public Symbol parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Symbol(input, extensionRegistry);
+        return new Symbol(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotation.java
index 721f6049417e..4f4609a948f1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotation.java
@@ -41,9 +41,6 @@ private TextAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -170,9 +167,6 @@ private DetectedLanguage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -758,7 +752,7 @@ public DetectedLanguage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectedLanguage(input, extensionRegistry);
+          return new DetectedLanguage(input, extensionRegistry);
       }
     };
 
@@ -838,9 +832,6 @@ private DetectedBreak(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1554,7 +1545,7 @@ public DetectedBreak parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectedBreak(input, extensionRegistry);
+          return new DetectedBreak(input, extensionRegistry);
       }
     };
 
@@ -1676,9 +1667,6 @@ private TextProperty(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2688,7 +2676,7 @@ public TextProperty parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TextProperty(input, extensionRegistry);
+          return new TextProperty(input, extensionRegistry);
       }
     };
 
@@ -3588,7 +3576,7 @@ public TextAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextAnnotation(input, extensionRegistry);
+        return new TextAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotationProto.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotationProto.java
index 9c36d352429c..1d13c1eaaea4 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotationProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotationProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "\002 \001(\t\032=\n\020DetectedLanguage\022\025\n\rlanguage_co" +
       "de\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\032\334\001\n\rDetecte" +
       "dBreak\022S\n\004type\030\001 \001(\0162E.google.cloud.visi" +
-      "on.v1p1beta1.TextAnnotation.DetectedBrea" +
+      "on.v1p1beta1.TextAnnotation.DetectedBrea",
       "k.BreakType\022\021\n\tis_prefix\030\002 \001(\010\"c\n\tBreakT" +
       "ype\022\013\n\007UNKNOWN\020\000\022\t\n\005SPACE\020\001\022\016\n\nSURE_SPAC" +
       "E\020\002\022\022\n\016EOL_SURE_SPACE\020\003\022\n\n\006HYPHEN\020\004\022\016\n\nL" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "\022S\n\016detected_break\030\002 \001(\0132;.google.cloud." +
       "vision.v1p1beta1.TextAnnotation.Detected" +
       "Break\"\275\001\n\004Page\022L\n\010property\030\001 \001(\0132:.googl" +
-      "e.cloud.vision.v1p1beta1.TextAnnotation." +
+      "e.cloud.vision.v1p1beta1.TextAnnotation.",
       "TextProperty\022\r\n\005width\030\002 \001(\005\022\016\n\006height\030\003 " +
       "\001(\005\0224\n\006blocks\030\004 \003(\0132$.google.cloud.visio" +
       "n.v1p1beta1.Block\022\022\n\nconfidence\030\005 \001(\002\"\202\003" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "ud.vision.v1p1beta1.BoundingPoly\022<\n\npara" +
       "graphs\030\003 \003(\0132(.google.cloud.vision.v1p1b" +
       "eta1.Paragraph\022B\n\nblock_type\030\004 \001(\0162..goo" +
-      "gle.cloud.vision.v1p1beta1.Block.BlockTy" +
+      "gle.cloud.vision.v1p1beta1.Block.BlockTy",
       "pe\022\022\n\nconfidence\030\005 \001(\002\"R\n\tBlockType\022\013\n\007U" +
       "NKNOWN\020\000\022\010\n\004TEXT\020\001\022\t\n\005TABLE\020\002\022\013\n\007PICTURE" +
       "\020\003\022\t\n\005RULER\020\004\022\013\n\007BARCODE\020\005\"\344\001\n\tParagraph" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "on.v1p1beta1.BoundingPoly\0222\n\005words\030\003 \003(\013" +
       "2#.google.cloud.vision.v1p1beta1.Word\022\022\n" +
       "\nconfidence\030\004 \001(\002\"\343\001\n\004Word\022L\n\010property\030\001" +
-      " \001(\0132:.google.cloud.vision.v1p1beta1.Tex" +
+      " \001(\0132:.google.cloud.vision.v1p1beta1.Tex",
       "tAnnotation.TextProperty\022A\n\014bounding_box" +
       "\030\002 \001(\0132+.google.cloud.vision.v1p1beta1.B" +
       "oundingPoly\0226\n\007symbols\030\003 \003(\0132%.google.cl" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "ion.TextProperty\022A\n\014bounding_box\030\002 \001(\0132+" +
       ".google.cloud.vision.v1p1beta1.BoundingP" +
       "oly\022\014\n\004text\030\003 \001(\t\022\022\n\nconfidence\030\004 \001(\002B\202\001" +
-      "\n!com.google.cloud.vision.v1p1beta1B\023Tex" +
+      "\n!com.google.cloud.vision.v1p1beta1B\023Tex",
       "tAnnotationProtoP\001ZCgoogle.golang.org/ge" +
       "nproto/googleapis/cloud/vision/v1p1beta1" +
       ";vision\370\001\001b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Vertex.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Vertex.java
index 33e02cac346f..167d6f7d7bb6 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Vertex.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Vertex.java
@@ -35,9 +35,6 @@ private Vertex(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -526,7 +523,7 @@ public Vertex parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Vertex(input, extensionRegistry);
+        return new Vertex(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetection.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetection.java
index 6b77a12c5152..55ccd018ede1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetection.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetection.java
@@ -38,9 +38,6 @@ private WebDetection(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -237,9 +234,6 @@ private WebEntity(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -969,7 +963,7 @@ public WebEntity parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebEntity(input, extensionRegistry);
+          return new WebEntity(input, extensionRegistry);
       }
     };
 
@@ -1050,9 +1044,6 @@ private WebImage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1624,7 +1615,7 @@ public WebImage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebImage(input, extensionRegistry);
+          return new WebImage(input, extensionRegistry);
       }
     };
 
@@ -1834,9 +1825,6 @@ private WebPage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3527,7 +3515,7 @@ public WebPage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebPage(input, extensionRegistry);
+          return new WebPage(input, extensionRegistry);
       }
     };
 
@@ -3621,9 +3609,6 @@ private WebLabel(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4287,7 +4272,7 @@ public WebLabel parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebLabel(input, extensionRegistry);
+          return new WebLabel(input, extensionRegistry);
       }
     };
 
@@ -7208,7 +7193,7 @@ public WebDetection parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetection(input, extensionRegistry);
+        return new WebDetection(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionParams.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionParams.java
index 7aed308e2fb5..47e025db8a3f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionParams.java
@@ -33,9 +33,6 @@ private WebDetectionParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -451,7 +448,7 @@ public WebDetectionParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetectionParams(input, extensionRegistry);
+        return new WebDetectionParams(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionProto.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionProto.java
index d9c671c9192d..b2c743a32b40 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "oogle.cloud.vision.v1p1beta1.WebDetectio" +
       "n.WebImage\022U\n\027partial_matching_images\030\003 " +
       "\003(\01324.google.cloud.vision.v1p1beta1.WebD" +
-      "etection.WebImage\022W\n\032pages_with_matching" +
+      "etection.WebImage\022W\n\032pages_with_matching",
       "_images\030\004 \003(\01323.google.cloud.vision.v1p1" +
       "beta1.WebDetection.WebPage\022U\n\027visually_s" +
       "imilar_images\030\006 \003(\01324.google.cloud.visio" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "bEntity\022\021\n\tentity_id\030\001 \001(\t\022\r\n\005score\030\002 \001(" +
       "\002\022\023\n\013description\030\003 \001(\t\032&\n\010WebImage\022\013\n\003ur" +
       "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\032\344\001\n\007WebPage\022\013\n\003ur" +
-      "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\022\022\n\npage_title\030\003 \001" +
+      "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\022\022\n\npage_title\030\003 \001",
       "(\t\022R\n\024full_matching_images\030\004 \003(\01324.googl" +
       "e.cloud.vision.v1p1beta1.WebDetection.We" +
       "bImage\022U\n\027partial_matching_images\030\005 \003(\0132" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Word.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Word.java
index fae581822c87..f78287bb1dab 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Word.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Word.java
@@ -34,9 +34,6 @@ private Word(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1542,7 +1539,7 @@ public Word parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Word(input, extensionRegistry);
+        return new Word(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateFileResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateFileResponse.java
index 4acc6126d5c6..196a7e03215a 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateFileResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateFileResponse.java
@@ -34,9 +34,6 @@ private AnnotateFileResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1047,7 +1044,7 @@ public AnnotateFileResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateFileResponse(input, extensionRegistry);
+        return new AnnotateFileResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageRequest.java
index 37396fb5e407..a5dda029e9dc 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageRequest.java
@@ -34,9 +34,6 @@ private AnnotateImageRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1276,7 +1273,7 @@ public AnnotateImageRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageRequest(input, extensionRegistry);
+        return new AnnotateImageRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageResponse.java
index b7c7a630562d..87cf739c2e99 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageResponse.java
@@ -37,9 +37,6 @@ private AnnotateImageResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4231,7 +4228,7 @@ public AnnotateImageResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageResponse(input, extensionRegistry);
+        return new AnnotateImageResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileRequest.java
index e143ad6a7dcf..c014b45d62e2 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileRequest.java
@@ -33,9 +33,6 @@ private AsyncAnnotateFileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1503,7 +1500,7 @@ public AsyncAnnotateFileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncAnnotateFileRequest(input, extensionRegistry);
+        return new AsyncAnnotateFileRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileResponse.java
index 6e8fd2e15dcb..140dcc81301f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileResponse.java
@@ -32,9 +32,6 @@ private AsyncAnnotateFileResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public AsyncAnnotateFileResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncAnnotateFileResponse(input, extensionRegistry);
+        return new AsyncAnnotateFileResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesRequest.java
index 41e208bc0ffc..21cb8238a079 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesRequest.java
@@ -34,9 +34,6 @@ private AsyncBatchAnnotateFilesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -815,7 +812,7 @@ public AsyncBatchAnnotateFilesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncBatchAnnotateFilesRequest(input, extensionRegistry);
+        return new AsyncBatchAnnotateFilesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesResponse.java
index 2a77b49e3d01..4f2463056b02 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesResponse.java
@@ -33,9 +33,6 @@ private AsyncBatchAnnotateFilesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -836,7 +833,7 @@ public AsyncBatchAnnotateFilesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncBatchAnnotateFilesResponse(input, extensionRegistry);
+        return new AsyncBatchAnnotateFilesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesRequest.java
index ee2871370ce1..74fe9a0df824 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesRequest.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public BatchAnnotateImagesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesRequest(input, extensionRegistry);
+        return new BatchAnnotateImagesRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesResponse.java
index e59f1717a09f..045ad94b135a 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesResponse.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public BatchAnnotateImagesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesResponse(input, extensionRegistry);
+        return new BatchAnnotateImagesResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Block.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Block.java
index 48023de9611f..bdb6410e43bf 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Block.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Block.java
@@ -35,9 +35,6 @@ private Block(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1816,7 +1813,7 @@ public Block parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Block(input, extensionRegistry);
+        return new Block(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BoundingPoly.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BoundingPoly.java
index 5a4fec6e2412..8b4e632d7c1f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BoundingPoly.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BoundingPoly.java
@@ -34,9 +34,6 @@ private BoundingPoly(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1248,7 +1245,7 @@ public BoundingPoly parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BoundingPoly(input, extensionRegistry);
+        return new BoundingPoly(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ColorInfo.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ColorInfo.java
index a81772911593..db54d7eb7b55 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ColorInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ColorInfo.java
@@ -35,9 +35,6 @@ private ColorInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -765,7 +762,7 @@ public ColorInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ColorInfo(input, extensionRegistry);
+        return new ColorInfo(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHint.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHint.java
index 142393409bd0..8f8f00eeecdd 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHint.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHint.java
@@ -34,9 +34,6 @@ private CropHint(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -775,7 +772,7 @@ public CropHint parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHint(input, extensionRegistry);
+        return new CropHint(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsAnnotation.java
index 5891c763dd70..23344c9a1d89 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsAnnotation.java
@@ -33,9 +33,6 @@ private CropHintsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public CropHintsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsAnnotation(input, extensionRegistry);
+        return new CropHintsAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsParams.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsParams.java
index 0f5f11d197b0..15c96c5c3835 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsParams.java
@@ -33,9 +33,6 @@ private CropHintsParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -624,7 +621,7 @@ public CropHintsParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsParams(input, extensionRegistry);
+        return new CropHintsParams(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/DominantColorsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/DominantColorsAnnotation.java
index f9d7c1ed88f9..359402bc7e3a 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/DominantColorsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/DominantColorsAnnotation.java
@@ -33,9 +33,6 @@ private DominantColorsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public DominantColorsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DominantColorsAnnotation(input, extensionRegistry);
+        return new DominantColorsAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/EntityAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/EntityAnnotation.java
index c7434c35f7af..2cb194f35038 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/EntityAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/EntityAnnotation.java
@@ -40,9 +40,6 @@ private EntityAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2356,7 +2353,7 @@ public EntityAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityAnnotation(input, extensionRegistry);
+        return new EntityAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/FaceAnnotation.java
index 3fcdc7102fbb..e749c001ff22 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/FaceAnnotation.java
@@ -45,9 +45,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -271,9 +268,6 @@ private Landmark(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1636,7 +1630,7 @@ public Landmark parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Landmark(input, extensionRegistry);
+          return new Landmark(input, extensionRegistry);
       }
     };
 
@@ -4048,7 +4042,7 @@ public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Feature.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Feature.java
index 287b28aa4343..279934713476 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Feature.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Feature.java
@@ -37,9 +37,6 @@ private Feature(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1019,7 +1016,7 @@ public Feature parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Feature(input, extensionRegistry);
+        return new Feature(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsDestination.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsDestination.java
index 724f6a8b5e28..bfac61efffce 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsDestination.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsDestination.java
@@ -33,9 +33,6 @@ private GcsDestination(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -608,7 +605,7 @@ public GcsDestination parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsDestination(input, extensionRegistry);
+        return new GcsDestination(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsSource.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsSource.java
index 59caf2e98622..460dbb9622f8 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsSource.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsSource.java
@@ -33,9 +33,6 @@ private GcsSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -538,7 +535,7 @@ public GcsSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsSource(input, extensionRegistry);
+        return new GcsSource(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GeometryProto.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GeometryProto.java
index ab205d764955..ad42c4af3a2e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GeometryProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GeometryProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "vertices\030\002 \003(\0132/.google.cloud.vision.v1p" +
       "2beta1.NormalizedVertex\"+\n\010Position\022\t\n\001x" +
       "\030\001 \001(\002\022\t\n\001y\030\002 \001(\002\022\t\n\001z\030\003 \001(\002B|\n!com.goog" +
-      "le.cloud.vision.v1p2beta1B\rGeometryProto" +
+      "le.cloud.vision.v1p2beta1B\rGeometryProto",
       "P\001ZCgoogle.golang.org/genproto/googleapi" +
       "s/cloud/vision/v1p2beta1;vision\370\001\001b\006prot" +
       "o3"
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Image.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Image.java
index d283ae93d35f..540f5194405e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Image.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Image.java
@@ -33,9 +33,6 @@ private Image(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -714,7 +711,7 @@ public Image parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Image(input, extensionRegistry);
+        return new Image(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotationContext.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotationContext.java
index 15a5a2a33a83..c946f25c34fd 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotationContext.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotationContext.java
@@ -35,9 +35,6 @@ private ImageAnnotationContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -611,7 +608,7 @@ public ImageAnnotationContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageAnnotationContext(input, extensionRegistry);
+        return new ImageAnnotationContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorProto.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorProto.java
index ffd6355588f9..1fcaa69fc00c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorProto.java
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "eta1/web_detection.proto\032#google/longrun" +
       "ning/operations.proto\032\037google/protobuf/t" +
       "imestamp.proto\032\027google/rpc/status.proto\032" +
-      "\027google/type/color.proto\032\030google/type/la" +
+      "\027google/type/color.proto\032\030google/type/la",
       "tlng.proto\"\341\002\n\007Feature\0229\n\004type\030\001 \001(\0162+.g" +
       "oogle.cloud.vision.v1p2beta1.Feature.Typ" +
       "e\022\023\n\013max_results\030\002 \001(\005\022\r\n\005model\030\003 \001(\t\"\366\001" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "T_DETECTION\020\005\022\033\n\027DOCUMENT_TEXT_DETECTION" +
       "\020\013\022\031\n\025SAFE_SEARCH_DETECTION\020\006\022\024\n\020IMAGE_P" +
       "ROPERTIES\020\007\022\016\n\nCROP_HINTS\020\t\022\021\n\rWEB_DETEC" +
-      "TION\020\n\"7\n\013ImageSource\022\025\n\rgcs_image_uri\030\001" +
+      "TION\020\n\"7\n\013ImageSource\022\025\n\rgcs_image_uri\030\001",
       " \001(\t\022\021\n\timage_uri\030\002 \001(\t\"T\n\005Image\022\017\n\007cont" +
       "ent\030\001 \001(\014\022:\n\006source\030\002 \001(\0132*.google.cloud" +
       ".vision.v1p2beta1.ImageSource\"\233\016\n\016FaceAn" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "sion.v1p2beta1.BoundingPoly\022I\n\tlandmarks" +
       "\030\003 \003(\01326.google.cloud.vision.v1p2beta1.F" +
       "aceAnnotation.Landmark\022\022\n\nroll_angle\030\004 \001" +
-      "(\002\022\021\n\tpan_angle\030\005 \001(\002\022\022\n\ntilt_angle\030\006 \001(" +
+      "(\002\022\021\n\tpan_angle\030\005 \001(\002\022\022\n\ntilt_angle\030\006 \001(",
       "\002\022\034\n\024detection_confidence\030\007 \001(\002\022\036\n\026landm" +
       "arking_confidence\030\010 \001(\002\022A\n\016joy_likelihoo" +
       "d\030\t \001(\0162).google.cloud.vision.v1p2beta1." +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "d.vision.v1p2beta1.Likelihood\022F\n\023surpris" +
       "e_likelihood\030\014 \001(\0162).google.cloud.vision" +
       ".v1p2beta1.Likelihood\022K\n\030under_exposed_l" +
-      "ikelihood\030\r \001(\0162).google.cloud.vision.v1" +
+      "ikelihood\030\r \001(\0162).google.cloud.vision.v1",
       "p2beta1.Likelihood\022E\n\022blurred_likelihood" +
       "\030\016 \001(\0162).google.cloud.vision.v1p2beta1.L" +
       "ikelihood\022F\n\023headwear_likelihood\030\017 \001(\0162)" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "mark.Type\0229\n\010position\030\004 \001(\0132\'.google.clo" +
       "ud.vision.v1p2beta1.Position\"\264\006\n\004Type\022\024\n" +
       "\020UNKNOWN_LANDMARK\020\000\022\014\n\010LEFT_EYE\020\001\022\r\n\tRIG" +
-      "HT_EYE\020\002\022\030\n\024LEFT_OF_LEFT_EYEBROW\020\003\022\031\n\025RI" +
+      "HT_EYE\020\002\022\030\n\024LEFT_OF_LEFT_EYEBROW\020\003\022\031\n\025RI",
       "GHT_OF_LEFT_EYEBROW\020\004\022\031\n\025LEFT_OF_RIGHT_E" +
       "YEBROW\020\005\022\032\n\026RIGHT_OF_RIGHT_EYEBROW\020\006\022\031\n\025" +
       "MIDPOINT_BETWEEN_EYES\020\007\022\014\n\010NOSE_TIP\020\010\022\r\n" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       "T\020\017\022\026\n\022NOSE_BOTTOM_CENTER\020\020\022\031\n\025LEFT_EYE_" +
       "TOP_BOUNDARY\020\021\022\031\n\025LEFT_EYE_RIGHT_CORNER\020" +
       "\022\022\034\n\030LEFT_EYE_BOTTOM_BOUNDARY\020\023\022\030\n\024LEFT_" +
-      "EYE_LEFT_CORNER\020\024\022\032\n\026RIGHT_EYE_TOP_BOUND" +
+      "EYE_LEFT_CORNER\020\024\022\032\n\026RIGHT_EYE_TOP_BOUND",
       "ARY\020\025\022\032\n\026RIGHT_EYE_RIGHT_CORNER\020\026\022\035\n\031RIG" +
       "HT_EYE_BOTTOM_BOUNDARY\020\027\022\031\n\025RIGHT_EYE_LE" +
       "FT_CORNER\020\030\022\037\n\033LEFT_EYEBROW_UPPER_MIDPOI" +
@@ -257,7 +257,7 @@ public static void registerAllExtensions(
       "IL\020\036\022\025\n\021FOREHEAD_GLABELLA\020\037\022\021\n\rCHIN_GNAT" +
       "HION\020 \022\024\n\020CHIN_LEFT_GONION\020!\022\025\n\021CHIN_RIG" +
       "HT_GONION\020\"\"4\n\014LocationInfo\022$\n\007lat_lng\030\001" +
-      " \001(\0132\023.google.type.LatLng\"=\n\010Property\022\014\n" +
+      " \001(\0132\023.google.type.LatLng\"=\n\010Property\022\014\n",
       "\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022\024\n\014uint64_val" +
       "ue\030\003 \001(\004\"\274\002\n\020EntityAnnotation\022\013\n\003mid\030\001 \001" +
       "(\t\022\016\n\006locale\030\002 \001(\t\022\023\n\013description\030\003 \001(\t\022" +
@@ -267,7 +267,7 @@ public static void registerAllExtensions(
       "ly\022>\n\tlocations\030\010 \003(\0132+.google.cloud.vis" +
       "ion.v1p2beta1.LocationInfo\022;\n\nproperties" +
       "\030\t \003(\0132\'.google.cloud.vision.v1p2beta1.P" +
-      "roperty\"\274\002\n\024SafeSearchAnnotation\0228\n\005adul" +
+      "roperty\"\274\002\n\024SafeSearchAnnotation\0228\n\005adul",
       "t\030\001 \001(\0162).google.cloud.vision.v1p2beta1." +
       "Likelihood\0228\n\005spoof\030\002 \001(\0162).google.cloud" +
       ".vision.v1p2beta1.Likelihood\022:\n\007medical\030" +
@@ -277,7 +277,7 @@ public static void registerAllExtensions(
       "\001(\0162).google.cloud.vision.v1p2beta1.Like" +
       "lihood\"a\n\013LatLongRect\022(\n\013min_lat_lng\030\001 \001" +
       "(\0132\023.google.type.LatLng\022(\n\013max_lat_lng\030\002" +
-      " \001(\0132\023.google.type.LatLng\"U\n\tColorInfo\022!" +
+      " \001(\0132\023.google.type.LatLng\"U\n\tColorInfo\022!",
       "\n\005color\030\001 \001(\0132\022.google.type.Color\022\r\n\005sco" +
       "re\030\002 \001(\002\022\026\n\016pixel_fraction\030\003 \001(\002\"T\n\030Domi" +
       "nantColorsAnnotation\0228\n\006colors\030\001 \003(\0132(.g" +
@@ -287,7 +287,7 @@ public static void registerAllExtensions(
       "antColorsAnnotation\"\177\n\010CropHint\022B\n\rbound" +
       "ing_poly\030\001 \001(\0132+.google.cloud.vision.v1p" +
       "2beta1.BoundingPoly\022\022\n\nconfidence\030\002 \001(\002\022" +
-      "\033\n\023importance_fraction\030\003 \001(\002\"R\n\023CropHint" +
+      "\033\n\023importance_fraction\030\003 \001(\002\"R\n\023CropHint",
       "sAnnotation\022;\n\ncrop_hints\030\001 \003(\0132\'.google" +
       ".cloud.vision.v1p2beta1.CropHint\"(\n\017Crop" +
       "HintsParams\022\025\n\raspect_ratios\030\001 \003(\002\"1\n\022We" +
@@ -297,7 +297,7 @@ public static void registerAllExtensions(
       "tLongRect\022\026\n\016language_hints\030\002 \003(\t\022I\n\021cro" +
       "p_hints_params\030\004 \001(\0132..google.cloud.visi" +
       "on.v1p2beta1.CropHintsParams\022O\n\024web_dete" +
-      "ction_params\030\006 \001(\01321.google.cloud.vision" +
+      "ction_params\030\006 \001(\01321.google.cloud.vision",
       ".v1p2beta1.WebDetectionParams\"\311\001\n\024Annota" +
       "teImageRequest\0223\n\005image\030\001 \001(\0132$.google.c" +
       "loud.vision.v1p2beta1.Image\0228\n\010features\030" +
@@ -307,7 +307,7 @@ public static void registerAllExtensions(
       "geAnnotationContext\022\013\n\003uri\030\001 \001(\t\022\023\n\013page" +
       "_number\030\002 \001(\005\"\212\007\n\025AnnotateImageResponse\022" +
       "G\n\020face_annotations\030\001 \003(\0132-.google.cloud" +
-      ".vision.v1p2beta1.FaceAnnotation\022M\n\024land" +
+      ".vision.v1p2beta1.FaceAnnotation\022M\n\024land",
       "mark_annotations\030\002 \003(\0132/.google.cloud.vi" +
       "sion.v1p2beta1.EntityAnnotation\022I\n\020logo_" +
       "annotations\030\003 \003(\0132/.google.cloud.vision." +
@@ -317,7 +317,7 @@ public static void registerAllExtensions(
       "ns\030\005 \003(\0132/.google.cloud.vision.v1p2beta1" +
       ".EntityAnnotation\022K\n\024full_text_annotatio" +
       "n\030\014 \001(\0132-.google.cloud.vision.v1p2beta1." +
-      "TextAnnotation\022S\n\026safe_search_annotation" +
+      "TextAnnotation\022S\n\026safe_search_annotation",
       "\030\006 \001(\01323.google.cloud.vision.v1p2beta1.S" +
       "afeSearchAnnotation\022S\n\033image_properties_" +
       "annotation\030\010 \001(\0132..google.cloud.vision.v" +
@@ -327,7 +327,7 @@ public static void registerAllExtensions(
       "tion\030\r \001(\0132+.google.cloud.vision.v1p2bet" +
       "a1.WebDetection\022!\n\005error\030\t \001(\0132\022.google." +
       "rpc.Status\022F\n\007context\030\025 \001(\01325.google.clo" +
-      "ud.vision.v1p2beta1.ImageAnnotationConte" +
+      "ud.vision.v1p2beta1.ImageAnnotationConte",
       "xt\"\241\001\n\024AnnotateFileResponse\022@\n\014input_con" +
       "fig\030\001 \001(\0132*.google.cloud.vision.v1p2beta" +
       "1.InputConfig\022G\n\tresponses\030\002 \003(\01324.googl" +
@@ -337,7 +337,7 @@ public static void registerAllExtensions(
       "2beta1.AnnotateImageRequest\"f\n\033BatchAnno" +
       "tateImagesResponse\022G\n\tresponses\030\001 \003(\01324." +
       "google.cloud.vision.v1p2beta1.AnnotateIm" +
-      "ageResponse\"\236\002\n\030AsyncAnnotateFileRequest" +
+      "ageResponse\"\236\002\n\030AsyncAnnotateFileRequest",
       "\022@\n\014input_config\030\001 \001(\0132*.google.cloud.vi" +
       "sion.v1p2beta1.InputConfig\0228\n\010features\030\002" +
       " \003(\0132&.google.cloud.vision.v1p2beta1.Fea" +
@@ -347,7 +347,7 @@ public static void registerAllExtensions(
       "p2beta1.OutputConfig\"_\n\031AsyncAnnotateFil" +
       "eResponse\022B\n\routput_config\030\001 \001(\0132+.googl" +
       "e.cloud.vision.v1p2beta1.OutputConfig\"k\n" +
-      "\036AsyncBatchAnnotateFilesRequest\022I\n\010reque" +
+      "\036AsyncBatchAnnotateFilesRequest\022I\n\010reque",
       "sts\030\001 \003(\01327.google.cloud.vision.v1p2beta" +
       "1.AsyncAnnotateFileRequest\"n\n\037AsyncBatch" +
       "AnnotateFilesResponse\022K\n\tresponses\030\001 \003(\013" +
@@ -357,7 +357,7 @@ public static void registerAllExtensions(
       "beta1.GcsSource\022\021\n\tmime_type\030\002 \001(\t\"j\n\014Ou" +
       "tputConfig\022F\n\017gcs_destination\030\001 \001(\0132-.go" +
       "ogle.cloud.vision.v1p2beta1.GcsDestinati" +
-      "on\022\022\n\nbatch_size\030\002 \001(\005\"\030\n\tGcsSource\022\013\n\003u" +
+      "on\022\022\n\nbatch_size\030\002 \001(\005\"\030\n\tGcsSource\022\013\n\003u",
       "ri\030\001 \001(\t\"\035\n\016GcsDestination\022\013\n\003uri\030\001 \001(\t\"" +
       "\217\002\n\021OperationMetadata\022E\n\005state\030\001 \001(\01626.g" +
       "oogle.cloud.vision.v1p2beta1.OperationMe" +
@@ -367,7 +367,7 @@ public static void registerAllExtensions(
       "\025\n\021STATE_UNSPECIFIED\020\000\022\013\n\007CREATED\020\001\022\013\n\007R" +
       "UNNING\020\002\022\010\n\004DONE\020\003\022\r\n\tCANCELLED\020\004*e\n\nLik" +
       "elihood\022\013\n\007UNKNOWN\020\000\022\021\n\rVERY_UNLIKELY\020\001\022" +
-      "\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIKELY\020\004\022" +
+      "\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIKELY\020\004\022",
       "\017\n\013VERY_LIKELY\020\0052\360\002\n\016ImageAnnotator\022\263\001\n\023" +
       "BatchAnnotateImages\0229.google.cloud.visio" +
       "n.v1p2beta1.BatchAnnotateImagesRequest\032:" +
@@ -377,7 +377,7 @@ public static void registerAllExtensions(
       "Files\022=.google.cloud.vision.v1p2beta1.As" +
       "yncBatchAnnotateFilesRequest\032\035.google.lo" +
       "ngrunning.Operation\".\202\323\344\223\002(\"#/v1p2beta1/" +
-      "files:asyncBatchAnnotate:\001*B\202\001\n!com.goog" +
+      "files:asyncBatchAnnotate:\001*B\202\001\n!com.goog",
       "le.cloud.vision.v1p2beta1B\023ImageAnnotato" +
       "rProtoP\001ZCgoogle.golang.org/genproto/goo" +
       "gleapis/cloud/vision/v1p2beta1;vision\370\001\001" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageContext.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageContext.java
index 140821ad933a..6c4a68ab69a0 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageContext.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageContext.java
@@ -33,9 +33,6 @@ private ImageContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1381,7 +1378,7 @@ public ImageContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageContext(input, extensionRegistry);
+        return new ImageContext(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageProperties.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageProperties.java
index 4d524b86027f..6477a96d8b0e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageProperties.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageProperties.java
@@ -32,9 +32,6 @@ private ImageProperties(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public ImageProperties parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageProperties(input, extensionRegistry);
+        return new ImageProperties(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageSource.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageSource.java
index f6a45b07726c..36daf5ba2282 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageSource.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageSource.java
@@ -34,9 +34,6 @@ private ImageSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -805,7 +802,7 @@ public ImageSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageSource(input, extensionRegistry);
+        return new ImageSource(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/InputConfig.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/InputConfig.java
index 53c42aa4b3a6..4f23a1bc2212 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/InputConfig.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/InputConfig.java
@@ -33,9 +33,6 @@ private InputConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -767,7 +764,7 @@ public InputConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InputConfig(input, extensionRegistry);
+        return new InputConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LatLongRect.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LatLongRect.java
index c036468cc877..c288c4d0dc64 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LatLongRect.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LatLongRect.java
@@ -32,9 +32,6 @@ private LatLongRect(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -834,7 +831,7 @@ public LatLongRect parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LatLongRect(input, extensionRegistry);
+        return new LatLongRect(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LocationInfo.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LocationInfo.java
index 1185221c6f8d..6153ca20b6c4 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LocationInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LocationInfo.java
@@ -32,9 +32,6 @@ private LocationInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -605,7 +602,7 @@ public LocationInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LocationInfo(input, extensionRegistry);
+        return new LocationInfo(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/NormalizedVertex.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/NormalizedVertex.java
index 1c7c8db5abf4..619d3d49dcfb 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/NormalizedVertex.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/NormalizedVertex.java
@@ -36,9 +36,6 @@ private NormalizedVertex(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -534,7 +531,7 @@ public NormalizedVertex parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NormalizedVertex(input, extensionRegistry);
+        return new NormalizedVertex(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OperationMetadata.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OperationMetadata.java
index 801bb1b5e052..e1803dd5aadf 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OperationMetadata.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OperationMetadata.java
@@ -33,9 +33,6 @@ private OperationMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1114,7 +1111,7 @@ public OperationMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OperationMetadata(input, extensionRegistry);
+        return new OperationMetadata(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OutputConfig.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OutputConfig.java
index bff29ee1bee7..cde6efe58caf 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OutputConfig.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OutputConfig.java
@@ -33,9 +33,6 @@ private OutputConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -707,7 +704,7 @@ public OutputConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OutputConfig(input, extensionRegistry);
+        return new OutputConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Page.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Page.java
index 40198f4b42d8..723c2bd45dfa 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Page.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Page.java
@@ -36,9 +36,6 @@ private Page(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1278,7 +1275,7 @@ public Page parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Page(input, extensionRegistry);
+        return new Page(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Paragraph.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Paragraph.java
index c9697a154209..aab5a4d01eb3 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Paragraph.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Paragraph.java
@@ -34,9 +34,6 @@ private Paragraph(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1519,7 +1516,7 @@ public Paragraph parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Paragraph(input, extensionRegistry);
+        return new Paragraph(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Position.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Position.java
index 736873f2739e..9ee97d758c5e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Position.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Position.java
@@ -37,9 +37,6 @@ private Position(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -611,7 +608,7 @@ public Position parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Position(input, extensionRegistry);
+        return new Position(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Property.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Property.java
index 4cb43e3ba673..057de3283e8b 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Property.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Property.java
@@ -35,9 +35,6 @@ private Property(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -761,7 +758,7 @@ public Property parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Property(input, extensionRegistry);
+        return new Property(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/SafeSearchAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/SafeSearchAnnotation.java
index 25b7446ba72b..aa0e32b620a0 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/SafeSearchAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/SafeSearchAnnotation.java
@@ -39,9 +39,6 @@ private SafeSearchAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -984,7 +981,7 @@ public SafeSearchAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SafeSearchAnnotation(input, extensionRegistry);
+        return new SafeSearchAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Symbol.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Symbol.java
index a306d29534c0..b9336b982366 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Symbol.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Symbol.java
@@ -34,9 +34,6 @@ private Symbol(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1234,7 +1231,7 @@ public Symbol parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Symbol(input, extensionRegistry);
+        return new Symbol(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotation.java
index 2a977c5914ad..931ff73bdbe4 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotation.java
@@ -40,9 +40,6 @@ private TextAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -169,9 +166,6 @@ private DetectedLanguage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -757,7 +751,7 @@ public DetectedLanguage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectedLanguage(input, extensionRegistry);
+          return new DetectedLanguage(input, extensionRegistry);
       }
     };
 
@@ -837,9 +831,6 @@ private DetectedBreak(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1553,7 +1544,7 @@ public DetectedBreak parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectedBreak(input, extensionRegistry);
+          return new DetectedBreak(input, extensionRegistry);
       }
     };
 
@@ -1675,9 +1666,6 @@ private TextProperty(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2687,7 +2675,7 @@ public TextProperty parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TextProperty(input, extensionRegistry);
+          return new TextProperty(input, extensionRegistry);
       }
     };
 
@@ -3586,7 +3574,7 @@ public TextAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextAnnotation(input, extensionRegistry);
+        return new TextAnnotation(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotationProto.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotationProto.java
index 027024e183f6..6db97a5e7dbd 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotationProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotationProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "\002 \001(\t\032=\n\020DetectedLanguage\022\025\n\rlanguage_co" +
       "de\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\032\334\001\n\rDetecte" +
       "dBreak\022S\n\004type\030\001 \001(\0162E.google.cloud.visi" +
-      "on.v1p2beta1.TextAnnotation.DetectedBrea" +
+      "on.v1p2beta1.TextAnnotation.DetectedBrea",
       "k.BreakType\022\021\n\tis_prefix\030\002 \001(\010\"c\n\tBreakT" +
       "ype\022\013\n\007UNKNOWN\020\000\022\t\n\005SPACE\020\001\022\016\n\nSURE_SPAC" +
       "E\020\002\022\022\n\016EOL_SURE_SPACE\020\003\022\n\n\006HYPHEN\020\004\022\016\n\nL" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "\022S\n\016detected_break\030\002 \001(\0132;.google.cloud." +
       "vision.v1p2beta1.TextAnnotation.Detected" +
       "Break\"\275\001\n\004Page\022L\n\010property\030\001 \001(\0132:.googl" +
-      "e.cloud.vision.v1p2beta1.TextAnnotation." +
+      "e.cloud.vision.v1p2beta1.TextAnnotation.",
       "TextProperty\022\r\n\005width\030\002 \001(\005\022\016\n\006height\030\003 " +
       "\001(\005\0224\n\006blocks\030\004 \003(\0132$.google.cloud.visio" +
       "n.v1p2beta1.Block\022\022\n\nconfidence\030\005 \001(\002\"\202\003" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "ud.vision.v1p2beta1.BoundingPoly\022<\n\npara" +
       "graphs\030\003 \003(\0132(.google.cloud.vision.v1p2b" +
       "eta1.Paragraph\022B\n\nblock_type\030\004 \001(\0162..goo" +
-      "gle.cloud.vision.v1p2beta1.Block.BlockTy" +
+      "gle.cloud.vision.v1p2beta1.Block.BlockTy",
       "pe\022\022\n\nconfidence\030\005 \001(\002\"R\n\tBlockType\022\013\n\007U" +
       "NKNOWN\020\000\022\010\n\004TEXT\020\001\022\t\n\005TABLE\020\002\022\013\n\007PICTURE" +
       "\020\003\022\t\n\005RULER\020\004\022\013\n\007BARCODE\020\005\"\344\001\n\tParagraph" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "on.v1p2beta1.BoundingPoly\0222\n\005words\030\003 \003(\013" +
       "2#.google.cloud.vision.v1p2beta1.Word\022\022\n" +
       "\nconfidence\030\004 \001(\002\"\343\001\n\004Word\022L\n\010property\030\001" +
-      " \001(\0132:.google.cloud.vision.v1p2beta1.Tex" +
+      " \001(\0132:.google.cloud.vision.v1p2beta1.Tex",
       "tAnnotation.TextProperty\022A\n\014bounding_box" +
       "\030\002 \001(\0132+.google.cloud.vision.v1p2beta1.B" +
       "oundingPoly\0226\n\007symbols\030\003 \003(\0132%.google.cl" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "ion.TextProperty\022A\n\014bounding_box\030\002 \001(\0132+" +
       ".google.cloud.vision.v1p2beta1.BoundingP" +
       "oly\022\014\n\004text\030\003 \001(\t\022\022\n\nconfidence\030\004 \001(\002B\202\001" +
-      "\n!com.google.cloud.vision.v1p2beta1B\023Tex" +
+      "\n!com.google.cloud.vision.v1p2beta1B\023Tex",
       "tAnnotationProtoP\001ZCgoogle.golang.org/ge" +
       "nproto/googleapis/cloud/vision/v1p2beta1" +
       ";vision\370\001\001b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Vertex.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Vertex.java
index 03162ad00790..97f6e1907800 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Vertex.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Vertex.java
@@ -35,9 +35,6 @@ private Vertex(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -526,7 +523,7 @@ public Vertex parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Vertex(input, extensionRegistry);
+        return new Vertex(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetection.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetection.java
index 4dad80a59abc..8b3ab6409bb8 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetection.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetection.java
@@ -38,9 +38,6 @@ private WebDetection(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -237,9 +234,6 @@ private WebEntity(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -969,7 +963,7 @@ public WebEntity parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebEntity(input, extensionRegistry);
+          return new WebEntity(input, extensionRegistry);
       }
     };
 
@@ -1050,9 +1044,6 @@ private WebImage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1624,7 +1615,7 @@ public WebImage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebImage(input, extensionRegistry);
+          return new WebImage(input, extensionRegistry);
       }
     };
 
@@ -1834,9 +1825,6 @@ private WebPage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3527,7 +3515,7 @@ public WebPage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebPage(input, extensionRegistry);
+          return new WebPage(input, extensionRegistry);
       }
     };
 
@@ -3621,9 +3609,6 @@ private WebLabel(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4287,7 +4272,7 @@ public WebLabel parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebLabel(input, extensionRegistry);
+          return new WebLabel(input, extensionRegistry);
       }
     };
 
@@ -7208,7 +7193,7 @@ public WebDetection parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetection(input, extensionRegistry);
+        return new WebDetection(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionParams.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionParams.java
index 201863a9d41f..0e3b3188afd0 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionParams.java
@@ -33,9 +33,6 @@ private WebDetectionParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -451,7 +448,7 @@ public WebDetectionParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetectionParams(input, extensionRegistry);
+        return new WebDetectionParams(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionProto.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionProto.java
index 69b531681fcd..c247c4852afb 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "oogle.cloud.vision.v1p2beta1.WebDetectio" +
       "n.WebImage\022U\n\027partial_matching_images\030\003 " +
       "\003(\01324.google.cloud.vision.v1p2beta1.WebD" +
-      "etection.WebImage\022W\n\032pages_with_matching" +
+      "etection.WebImage\022W\n\032pages_with_matching",
       "_images\030\004 \003(\01323.google.cloud.vision.v1p2" +
       "beta1.WebDetection.WebPage\022U\n\027visually_s" +
       "imilar_images\030\006 \003(\01324.google.cloud.visio" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "bEntity\022\021\n\tentity_id\030\001 \001(\t\022\r\n\005score\030\002 \001(" +
       "\002\022\023\n\013description\030\003 \001(\t\032&\n\010WebImage\022\013\n\003ur" +
       "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\032\344\001\n\007WebPage\022\013\n\003ur" +
-      "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\022\022\n\npage_title\030\003 \001" +
+      "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\022\022\n\npage_title\030\003 \001",
       "(\t\022R\n\024full_matching_images\030\004 \003(\01324.googl" +
       "e.cloud.vision.v1p2beta1.WebDetection.We" +
       "bImage\022U\n\027partial_matching_images\030\005 \003(\0132" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Word.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Word.java
index f1c097251943..c9c63076475c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Word.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Word.java
@@ -34,9 +34,6 @@ private Word(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1542,7 +1539,7 @@ public Word parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Word(input, extensionRegistry);
+        return new Word(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrl.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrl.java
index fe32d8503539..4f7d5cd041a8 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrl.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrl.java
@@ -37,9 +37,6 @@ private CrawledUrl(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -873,7 +870,7 @@ public CrawledUrl parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CrawledUrl(input, extensionRegistry);
+        return new CrawledUrl(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequest.java
index bb048f596bd8..5cf31ef9d6d1 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequest.java
@@ -33,9 +33,6 @@ private CreateScanConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -786,7 +783,7 @@ public CreateScanConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateScanConfigRequest(input, extensionRegistry);
+        return new CreateScanConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequest.java
index aa5a8a6f74a2..bb3bad33b98e 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequest.java
@@ -33,9 +33,6 @@ private DeleteScanConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public DeleteScanConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteScanConfigRequest(input, extensionRegistry);
+        return new DeleteScanConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Finding.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Finding.java
index 3f43a76611ca..8e06f773d98c 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Finding.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Finding.java
@@ -43,9 +43,6 @@ private Finding(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3238,7 +3235,7 @@ public Finding parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Finding(input, extensionRegistry);
+        return new Finding(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingAddonProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingAddonProto.java
index 1252f031c817..4fba4427b390 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingAddonProto.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingAddonProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "content_type\030\001 \001(\t\022\024\n\014resource_url\030\002 \001(\t" +
       "\"/\n\024VulnerableParameters\022\027\n\017parameter_na" +
       "mes\030\001 \003(\t\"2\n\003Xss\022\024\n\014stack_traces\030\001 \003(\t\022\025" +
-      "\n\rerror_message\030\002 \001(\tB\235\001\n+com.google.clo" +
+      "\n\rerror_message\030\002 \001(\tB\235\001\n+com.google.clo",
       "ud.websecurityscanner.v1alphaB\021FindingAd" +
       "donProtoP\001ZYgoogle.golang.org/genproto/g" +
       "oogleapis/cloud/websecurityscanner/v1alp" +
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingName.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingName.java
index ca7999bfc192..6784c7cdd0be 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingName.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -140,14 +139,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("FindingName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "scan_config", scanConfig, "scan_run", scanRun, "finding", finding);
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingProto.java
index 5e456375cbbe..90388205dd8a 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingProto.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingProto.java
@@ -37,7 +37,7 @@ public static void registerAllExtensions(
       "ogle.cloud.websecurityscanner.v1alpha.Fi" +
       "nding.FindingType\022\023\n\013http_method\030\003 \001(\t\022\022" +
       "\n\nfuzzed_url\030\004 \001(\t\022\014\n\004body\030\005 \001(\t\022\023\n\013desc" +
-      "ription\030\006 \001(\t\022\030\n\020reproduction_url\030\007 \001(\t\022" +
+      "ription\030\006 \001(\t\022\030\n\020reproduction_url\030\007 \001(\t\022",
       "\021\n\tframe_url\030\010 \001(\t\022\021\n\tfinal_url\030\t \001(\t\022\023\n" +
       "\013tracking_id\030\n \001(\t\022R\n\020outdated_library\030\013" +
       " \001(\01328.google.cloud.websecurityscanner.v" +
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "able_parameters\030\r \001(\0132=.google.cloud.web" +
       "securityscanner.v1alpha.VulnerableParame" +
       "ters\0229\n\003xss\030\016 \001(\0132,.google.cloud.websecu" +
-      "rityscanner.v1alpha.Xss\"\241\001\n\013FindingType\022" +
+      "rityscanner.v1alpha.Xss\"\241\001\n\013FindingType\022",
       "\034\n\030FINDING_TYPE_UNSPECIFIED\020\000\022\021\n\rMIXED_C" +
       "ONTENT\020\001\022\024\n\020OUTDATED_LIBRARY\020\002\022\021\n\rROSETT" +
       "A_FLASH\020\005\022\020\n\014XSS_CALLBACK\020\003\022\r\n\tXSS_ERROR" +
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStats.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStats.java
index ea62d55e4765..c407ffe597eb 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStats.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStats.java
@@ -35,9 +35,6 @@ private FindingTypeStats(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -574,7 +571,7 @@ public FindingTypeStats parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FindingTypeStats(input, extensionRegistry);
+        return new FindingTypeStats(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsProto.java
index d5309ac0ab9f..4300713df313 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsProto.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsProto.java
@@ -37,7 +37,7 @@ public static void registerAllExtensions(
       "gle.cloud.websecurityscanner.v1alpha.Fin" +
       "ding.FindingType\022\025\n\rfinding_count\030\002 \001(\005B" +
       "\241\001\n+com.google.cloud.websecurityscanner." +
-      "v1alphaB\025FindingTypeStatsProtoP\001ZYgoogle" +
+      "v1alphaB\025FindingTypeStatsProtoP\001ZYgoogle",
       ".golang.org/genproto/googleapis/cloud/we" +
       "bsecurityscanner/v1alpha;websecurityscan" +
       "nerb\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequest.java
index addbdb521a1d..a15edd2411f0 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequest.java
@@ -33,9 +33,6 @@ private GetFindingRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -552,7 +549,7 @@ public GetFindingRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetFindingRequest(input, extensionRegistry);
+        return new GetFindingRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequest.java
index ad10f3992be6..f846808dc531 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequest.java
@@ -33,9 +33,6 @@ private GetScanConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public GetScanConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetScanConfigRequest(input, extensionRegistry);
+        return new GetScanConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequest.java
index 19cc53e6ddec..a4b3406b1013 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequest.java
@@ -33,9 +33,6 @@ private GetScanRunRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -552,7 +549,7 @@ public GetScanRunRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetScanRunRequest(input, extensionRegistry);
+        return new GetScanRunRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequest.java
index c253351658b7..9a4d1e0e1b65 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequest.java
@@ -35,9 +35,6 @@ private ListCrawledUrlsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -803,7 +800,7 @@ public ListCrawledUrlsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListCrawledUrlsRequest(input, extensionRegistry);
+        return new ListCrawledUrlsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponse.java
index 38907231b551..d73f92542fb0 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponse.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponse.java
@@ -34,9 +34,6 @@ private ListCrawledUrlsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -978,7 +975,7 @@ public ListCrawledUrlsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListCrawledUrlsResponse(input, extensionRegistry);
+        return new ListCrawledUrlsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequest.java
index 5203f54361cd..6bcd0a072ed3 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequest.java
@@ -33,9 +33,6 @@ private ListFindingTypeStatsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -552,7 +549,7 @@ public ListFindingTypeStatsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListFindingTypeStatsRequest(input, extensionRegistry);
+        return new ListFindingTypeStatsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponse.java
index 55d2f451e6c2..d84f8b5e2649 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponse.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponse.java
@@ -33,9 +33,6 @@ private ListFindingTypeStatsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -813,7 +810,7 @@ public ListFindingTypeStatsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListFindingTypeStatsResponse(input, extensionRegistry);
+        return new ListFindingTypeStatsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequest.java
index 56035cf9446c..a2a7cf247978 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequest.java
@@ -36,9 +36,6 @@ private ListFindingsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -979,7 +976,7 @@ public ListFindingsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListFindingsRequest(input, extensionRegistry);
+        return new ListFindingsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponse.java
index cccafabdce8a..60f562b4f8fd 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponse.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponse.java
@@ -34,9 +34,6 @@ private ListFindingsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -978,7 +975,7 @@ public ListFindingsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListFindingsResponse(input, extensionRegistry);
+        return new ListFindingsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequest.java
index 5a8077796603..cef69e219eee 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequest.java
@@ -35,9 +35,6 @@ private ListScanConfigsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -796,7 +793,7 @@ public ListScanConfigsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListScanConfigsRequest(input, extensionRegistry);
+        return new ListScanConfigsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponse.java
index 91fe68f11066..6b118abd7525 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponse.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponse.java
@@ -34,9 +34,6 @@ private ListScanConfigsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -978,7 +975,7 @@ public ListScanConfigsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListScanConfigsResponse(input, extensionRegistry);
+        return new ListScanConfigsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequest.java
index ce8219ef88da..e7e454f615ba 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequest.java
@@ -35,9 +35,6 @@ private ListScanRunsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -796,7 +793,7 @@ public ListScanRunsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListScanRunsRequest(input, extensionRegistry);
+        return new ListScanRunsRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponse.java
index 588e428b11b5..8dd35d515f3b 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponse.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponse.java
@@ -34,9 +34,6 @@ private ListScanRunsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -978,7 +975,7 @@ public ListScanRunsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListScanRunsResponse(input, extensionRegistry);
+        return new ListScanRunsResponse(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibrary.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibrary.java
index d2f5418cfb6d..eea02cc5325a 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibrary.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibrary.java
@@ -35,9 +35,6 @@ private OutdatedLibrary(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -913,7 +910,7 @@ public OutdatedLibrary parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OutdatedLibrary(input, extensionRegistry);
+        return new OutdatedLibrary(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ProjectName.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ProjectName.java
index e716b18c758c..83fe68e04baa 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ProjectName.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ProjectName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -113,14 +112,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ProjectName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project);
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfig.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfig.java
index 81b5e84c1810..ff9327af81cb 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfig.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfig.java
@@ -39,9 +39,6 @@ private ScanConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -557,9 +554,6 @@ private Authentication(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -709,9 +703,6 @@ private GoogleAccount(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1389,7 +1380,7 @@ public GoogleAccount parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new GoogleAccount(input, extensionRegistry);
+            return new GoogleAccount(input, extensionRegistry);
         }
       };
 
@@ -1508,9 +1499,6 @@ private CustomAccount(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2349,7 +2337,7 @@ public CustomAccount parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CustomAccount(input, extensionRegistry);
+            return new CustomAccount(input, extensionRegistry);
         }
       };
 
@@ -3211,7 +3199,7 @@ public Authentication parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Authentication(input, extensionRegistry);
+          return new Authentication(input, extensionRegistry);
       }
     };
 
@@ -3308,9 +3296,6 @@ private Schedule(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3994,7 +3979,7 @@ public Schedule parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Schedule(input, extensionRegistry);
+          return new Schedule(input, extensionRegistry);
       }
     };
 
@@ -5996,7 +5981,7 @@ public ScanConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ScanConfig(input, extensionRegistry);
+        return new ScanConfig(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigName.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigName.java
index 077b0d17f311..3cd02787c5ba 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigName.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -122,14 +121,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ScanConfigName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "scan_config", scanConfig);
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigProto.java
index 97cacbf2db6f..2bebbc2d7baf 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigProto.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "ing_urls\030\004 \003(\t\022Z\n\016authentication\030\005 \001(\0132B" +
       ".google.cloud.websecurityscanner.v1alpha" +
       ".ScanConfig.Authentication\022Q\n\nuser_agent" +
-      "\030\006 \001(\0162=.google.cloud.websecurityscanner" +
+      "\030\006 \001(\0162=.google.cloud.websecurityscanner",
       ".v1alpha.ScanConfig.UserAgent\022\032\n\022blackli" +
       "st_patterns\030\007 \003(\t\022N\n\010schedule\030\010 \001(\0132<.go" +
       "ogle.cloud.websecurityscanner.v1alpha.Sc" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "entication\022j\n\016google_account\030\001 \001(\0132P.goo" +
       "gle.cloud.websecurityscanner.v1alpha.Sca" +
       "nConfig.Authentication.GoogleAccountH\000\022j" +
-      "\n\016custom_account\030\002 \001(\0132P.google.cloud.we" +
+      "\n\016custom_account\030\002 \001(\0132P.google.cloud.we",
       "bsecurityscanner.v1alpha.ScanConfig.Auth" +
       "entication.CustomAccountH\000\0323\n\rGoogleAcco" +
       "unt\022\020\n\010username\030\001 \001(\t\022\020\n\010password\030\002 \001(\t\032" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       " \001(\0132\032.google.protobuf.Timestamp\022\036\n\026inte" +
       "rval_duration_days\030\002 \001(\005\"`\n\tUserAgent\022\032\n" +
       "\026USER_AGENT_UNSPECIFIED\020\000\022\020\n\014CHROME_LINU" +
-      "X\020\001\022\022\n\016CHROME_ANDROID\020\002\022\021\n\rSAFARI_IPHONE" +
+      "X\020\001\022\022\n\016CHROME_ANDROID\020\002\022\021\n\rSAFARI_IPHONE",
       "\020\003\"N\n\016TargetPlatform\022\037\n\033TARGET_PLATFORM_" +
       "UNSPECIFIED\020\000\022\016\n\nAPP_ENGINE\020\001\022\013\n\007COMPUTE" +
       "\020\002B\233\001\n+com.google.cloud.websecurityscann" +
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRun.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRun.java
index 79d8a4fc866b..5b74198f2be4 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRun.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRun.java
@@ -39,9 +39,6 @@ private ScanRun(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1940,7 +1937,7 @@ public ScanRun parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ScanRun(input, extensionRegistry);
+        return new ScanRun(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunName.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunName.java
index 787bce3f3dc9..1e1a10f40af1 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunName.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunName.java
@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,14 +130,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /**
-   * @deprecated This method is only present to satisfy the ResourceName interface.
-   */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("ScanRunName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "scan_config", scanConfig, "scan_run", scanRun);
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunProto.java
index b3fb403b5615..15867ad68338 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunProto.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunProto.java
@@ -37,7 +37,7 @@ public static void registerAllExtensions(
       "anner.v1alpha.ScanRun.ExecutionState\022R\n\014" +
       "result_state\030\003 \001(\0162<.google.cloud.websec" +
       "urityscanner.v1alpha.ScanRun.ResultState" +
-      "\022.\n\nstart_time\030\004 \001(\0132\032.google.protobuf.T" +
+      "\022.\n\nstart_time\030\004 \001(\0132\032.google.protobuf.T",
       "imestamp\022,\n\010end_time\030\005 \001(\0132\032.google.prot" +
       "obuf.Timestamp\022\032\n\022urls_crawled_count\030\006 \001" +
       "(\003\022\031\n\021urls_tested_count\030\007 \001(\003\022\033\n\023has_vul" +
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "\002\022\014\n\010FINISHED\020\003\"O\n\013ResultState\022\034\n\030RESULT" +
       "_STATE_UNSPECIFIED\020\000\022\013\n\007SUCCESS\020\001\022\t\n\005ERR" +
       "OR\020\002\022\n\n\006KILLED\020\003B\230\001\n+com.google.cloud.we" +
-      "bsecurityscanner.v1alphaB\014ScanRunProtoP\001" +
+      "bsecurityscanner.v1alphaB\014ScanRunProtoP\001",
       "ZYgoogle.golang.org/genproto/googleapis/" +
       "cloud/websecurityscanner/v1alpha;websecu" +
       "rityscannerb\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequest.java
index ed36e662ebc2..81f4c11afc02 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequest.java
@@ -33,9 +33,6 @@ private StartScanRunRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -545,7 +542,7 @@ public StartScanRunRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StartScanRunRequest(input, extensionRegistry);
+        return new StartScanRunRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequest.java
index 37d725242093..092d7d91cc56 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequest.java
@@ -33,9 +33,6 @@ private StopScanRunRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -552,7 +549,7 @@ public StopScanRunRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StopScanRunRequest(input, extensionRegistry);
+        return new StopScanRunRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequest.java
index 1368cd873ece..1a89abb09765 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequest.java
@@ -32,9 +32,6 @@ private UpdateScanConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -906,7 +903,7 @@ public UpdateScanConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateScanConfigRequest(input, extensionRegistry);
+        return new UpdateScanConfigRequest(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResource.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResource.java
index 84e1ea10efe5..46e50e89559c 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResource.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResource.java
@@ -35,9 +35,6 @@ private ViolatingResource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -688,7 +685,7 @@ public ViolatingResource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ViolatingResource(input, extensionRegistry);
+        return new ViolatingResource(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParameters.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParameters.java
index d292edc9c856..8a8e95fdbb03 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParameters.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParameters.java
@@ -33,9 +33,6 @@ private VulnerableParameters(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -600,7 +597,7 @@ public VulnerableParameters parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VulnerableParameters(input, extensionRegistry);
+        return new VulnerableParameters(input, extensionRegistry);
     }
   };
 
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerProto.java
index 643d134bdf38..86748c2e64db 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerProto.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerProto.java
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "finding.proto\032@google/cloud/websecuritys" +
       "canner/v1alpha/finding_type_stats.proto\032" +
       "9google/cloud/websecurityscanner/v1alpha" +
-      "/scan_config.proto\0326google/cloud/websecu" +
+      "/scan_config.proto\0326google/cloud/websecu",
       "rityscanner/v1alpha/scan_run.proto\032\033goog" +
       "le/protobuf/empty.proto\032 google/protobuf" +
       "/field_mask.proto\"s\n\027CreateScanConfigReq" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "t\022\014\n\004name\030\001 \001(\t\"$\n\024GetScanConfigRequest\022" +
       "\014\n\004name\030\001 \001(\t\"O\n\026ListScanConfigsRequest\022" +
       "\016\n\006parent\030\001 \001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tp" +
-      "age_size\030\003 \001(\005\"\224\001\n\027UpdateScanConfigReque" +
+      "age_size\030\003 \001(\005\"\224\001\n\027UpdateScanConfigReque",
       "st\022H\n\013scan_config\030\002 \001(\01323.google.cloud.w" +
       "ebsecurityscanner.v1alpha.ScanConfig\022/\n\013" +
       "update_mask\030\003 \001(\0132\032.google.protobuf.Fiel" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "_token\030\002 \001(\t\"#\n\023StartScanRunRequest\022\014\n\004n" +
       "ame\030\001 \001(\t\"!\n\021GetScanRunRequest\022\014\n\004name\030\001" +
       " \001(\t\"L\n\023ListScanRunsRequest\022\016\n\006parent\030\001 " +
-      "\001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tpage_size\030\003 \001" +
+      "\001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tpage_size\030\003 \001",
       "(\005\"t\n\024ListScanRunsResponse\022C\n\tscan_runs\030" +
       "\001 \003(\01320.google.cloud.websecurityscanner." +
       "v1alpha.ScanRun\022\027\n\017next_page_token\030\002 \001(\t" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "\027ListCrawledUrlsResponse\022I\n\014crawled_urls" +
       "\030\001 \003(\01323.google.cloud.websecurityscanner" +
       ".v1alpha.CrawledUrl\022\027\n\017next_page_token\030\002" +
-      " \001(\t\"!\n\021GetFindingRequest\022\014\n\004name\030\001 \001(\t\"" +
+      " \001(\t\"!\n\021GetFindingRequest\022\014\n\004name\030\001 \001(\t\"",
       "\\\n\023ListFindingsRequest\022\016\n\006parent\030\001 \001(\t\022\016" +
       "\n\006filter\030\002 \001(\t\022\022\n\npage_token\030\003 \001(\t\022\021\n\tpa" +
       "ge_size\030\004 \001(\005\"s\n\024ListFindingsResponse\022B\n" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "t\022\016\n\006parent\030\001 \001(\t\"u\n\034ListFindingTypeStat" +
       "sResponse\022U\n\022finding_type_stats\030\001 \003(\01329." +
       "google.cloud.websecurityscanner.v1alpha." +
-      "FindingTypeStats2\320\024\n\022WebSecurityScanner\022" +
+      "FindingTypeStats2\320\024\n\022WebSecurityScanner\022",
       "\310\001\n\020CreateScanConfig\022@.google.cloud.webs" +
       "ecurityscanner.v1alpha.CreateScanConfigR" +
       "equest\0323.google.cloud.websecurityscanner" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "ebsecurityscanner.v1alpha.DeleteScanConf" +
       "igRequest\032\026.google.protobuf.Empty\"0\202\323\344\223\002" +
       "**(/v1alpha/{name=projects/*/scanConfigs" +
-      "/*}\022\265\001\n\rGetScanConfig\022=.google.cloud.web" +
+      "/*}\022\265\001\n\rGetScanConfig\022=.google.cloud.web",
       "securityscanner.v1alpha.GetScanConfigReq" +
       "uest\0323.google.cloud.websecurityscanner.v" +
       "1alpha.ScanConfig\"0\202\323\344\223\002*\022(/v1alpha/{nam" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "e.cloud.websecurityscanner.v1alpha.ListS" +
       "canConfigsResponse\"0\202\323\344\223\002*\022(/v1alpha/{pa" +
       "rent=projects/*}/scanConfigs\022\324\001\n\020UpdateS" +
-      "canConfig\022@.google.cloud.websecurityscan" +
+      "canConfig\022@.google.cloud.websecurityscan",
       "ner.v1alpha.UpdateScanConfigRequest\0323.go" +
       "ogle.cloud.websecurityscanner.v1alpha.Sc" +
       "anConfig\"I\202\323\344\223\002C24/v1alpha/{scan_config." +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "st\0320.google.cloud.websecurityscanner.v1a" +
       "lpha.ScanRun\"9\202\323\344\223\0023\"./v1alpha/{name=pro" +
       "jects/*/scanConfigs/*}:start:\001*\022\267\001\n\nGetS" +
-      "canRun\022:.google.cloud.websecurityscanner" +
+      "canRun\022:.google.cloud.websecurityscanner",
       ".v1alpha.GetScanRunRequest\0320.google.clou" +
       "d.websecurityscanner.v1alpha.ScanRun\";\202\323" +
       "\344\223\0025\0223/v1alpha/{name=projects/*/scanConf" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "ityscanner.v1alpha.ListScanRunsResponse\"" +
       ";\202\323\344\223\0025\0223/v1alpha/{parent=projects/*/sca" +
       "nConfigs/*}/scanRuns\022\301\001\n\013StopScanRun\022;.g" +
-      "oogle.cloud.websecurityscanner.v1alpha.S" +
+      "oogle.cloud.websecurityscanner.v1alpha.S",
       "topScanRunRequest\0320.google.cloud.websecu" +
       "rityscanner.v1alpha.ScanRun\"C\202\323\344\223\002=\"8/v1" +
       "alpha/{name=projects/*/scanConfigs/*/sca" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "securityscanner.v1alpha.ListCrawledUrlsR" +
       "esponse\"I\202\323\344\223\002C\022A/v1alpha/{parent=projec" +
       "ts/*/scanConfigs/*/scanRuns/*}/crawledUr" +
-      "ls\022\302\001\n\nGetFinding\022:.google.cloud.websecu" +
+      "ls\022\302\001\n\nGetFinding\022:.google.cloud.websecu",
       "rityscanner.v1alpha.GetFindingRequest\0320." +
       "google.cloud.websecurityscanner.v1alpha." +
       "Finding\"F\202\323\344\223\002@\022>/v1alpha/{name=projects" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       ".google.cloud.websecurityscanner.v1alpha" +
       ".ListFindingsResponse\"F\202\323\344\223\002@\022>/v1alpha/" +
       "{parent=projects/*/scanConfigs/*/scanRun" +
-      "s/*}/findings\022\363\001\n\024ListFindingTypeStats\022D" +
+      "s/*}/findings\022\363\001\n\024ListFindingTypeStats\022D",
       ".google.cloud.websecurityscanner.v1alpha" +
       ".ListFindingTypeStatsRequest\032E.google.cl" +
       "oud.websecurityscanner.v1alpha.ListFindi" +
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Xss.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Xss.java
index fa21fa1534d1..624872197119 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Xss.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Xss.java
@@ -34,9 +34,6 @@ private Xss(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -758,7 +755,7 @@ public Xss parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Xss(input, extensionRegistry);
+        return new Xss(input, extensionRegistry);
     }
   };
 
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index d5bb627b2b13..d418263ab2f4 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -145,33 +145,33 @@
       
         com.google.api
         api-common
-        1.5.0
+        1.6.0
       
       
         com.google.api
         gax
-        1.25.0
+        1.27.0
       
       
         com.google.api
         gax-grpc
-        1.25.0
+        1.27.0
       
       
         com.google.api
         gax-grpc
-        1.25.0
+        1.27.0
         testlib
       
       
         com.google.api
         gax-httpjson
-        0.42.0
+        0.44.0
       
       
         com.google.api
         gax-httpjson
-        0.42.0
+        0.44.0
         testlib
       
       
diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/InstanceName.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/InstanceName.java
index 8465d5eb8e92..ed64f7375dd6 100644
--- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/InstanceName.java
+++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/InstanceName.java
@@ -17,7 +17,6 @@
 
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.resourcenames.ResourceName;
-import com.google.api.resourcenames.ResourceNameType;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
@@ -117,12 +116,6 @@ public String getFieldValue(String fieldName) {
     return getFieldValuesMap().get(fieldName);
   }
 
-  /** @deprecated This method is only present to satisfy the ResourceName interface. */
-  @Deprecated
-  public ResourceNameType getType() {
-    throw new UnsupportedOperationException("InstanceName.getType() not supported");
-  }
-
   @Override
   public String toString() {
     return PATH_TEMPLATE.instantiate("project", project, "instance", instance);
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index baf14606a0b2..0419a4170c21 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -156,7 +156,7 @@
     google-cloud-clients
     0.49.1-alpha-SNAPSHOT
     1.23.0
-    1.25.0
+    1.27.0
     0.9.1
     1.10.1
     2.0.7.Final
@@ -273,7 +273,7 @@
       
         com.google.code.findbugs
         jsr305
-        3.0.1
+        3.0.2
       
       
         com.google.protobuf